ntwb / wordpress

src/wp-admin/update-core.php

Indentation +7 added lines, -7 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 /**
- * Update Core administration panel.
- *
- * @package WordPress
- * @subpackage Administration
- */
+												 * Update Core administration panel.
+												 *
+												 * @package WordPress
+												 * @subpackage Administration
+												 */
 
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
@@ -105,10 +105,10 @@ 
 			submit_button( __('Bring back this update'), 'button', '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>';
+		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>';
 

Spacing +240 added lines, -240 removed lines

@@ -7,20 +7,20 @@ 
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-wp_enqueue_style( 'plugin-install' );
-wp_enqueue_script( 'plugin-install' );
-wp_enqueue_script( 'updates' );
+wp_enqueue_style('plugin-install');
+wp_enqueue_script('plugin-install');
+wp_enqueue_script('updates');
 add_thickbox();
 
-if ( is_multisite() && ! is_network_admin() ) {
-	wp_redirect( network_admin_url( 'update-core.php' ) );
+if (is_multisite() && ! is_network_admin()) {
+	wp_redirect(network_admin_url('update-core.php'));
 	exit();
 }
 
-if ( ! current_user_can( 'update_core' ) && ! current_user_can( 'update_themes' ) && ! current_user_can( 'update_plugins' ) )
-	wp_die( __( 'You do not have sufficient permissions to update this site.' ) );
+if ( ! current_user_can('update_core') && ! current_user_can('update_themes') && ! current_user_can('update_plugins'))
+	wp_die(__('You do not have sufficient permissions to update this site.'));
 
 /**
  *
@@ -32,50 +32,50 @@ 
  *
  * @param object $update
  */
-function list_core_update( $update ) {
+function list_core_update($update) {
  	global $wp_local_package, $wpdb, $wp_version;
   	static $first_pass = true;
 
- 	if ( 'en_US' == $update->locale && 'en_US' == get_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 ) )
+ 	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 );
+ 		$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;
-	if ( 'development' == $update->response ) {
+	if ('development' == $update->response) {
 		$message = __('You are using a development version of WordPress. You can update to the latest nightly build automatically or download the nightly build and install it manually:');
 		$download = __('Download nightly build');
 	} else {
-		if ( $current ) {
-			$message = sprintf( __( 'If you need to re-install version %s, you can do so here or download the package and re-install manually:' ), $version_string );
+		if ($current) {
+			$message = sprintf(__('If you need to re-install version %s, you can do so here or download the package and re-install manually:'), $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
-				$mysql_compat = version_compare( $mysql_version, $update->mysql_version, '>=' );
-
-			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 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. 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 MySQL version %2$s or higher. You are running version %3$s.'), $update->current, $update->mysql_version, $mysql_version );
+				$mysql_compat = version_compare($mysql_version, $update->mysql_version, '>=');
+
+			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 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. 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 MySQL version %2$s or higher. You are running version %3$s.'), $update->current, $update->mysql_version, $mysql_version);
 			else
-				$message = 	sprintf(__('You can update to <a href="https://codex.wordpress.org/Version_%1$s">WordPress %2$s</a> automatically or download the package and install it manually:'), $update->current, $version_string);
-			if ( !$mysql_compat || !$php_compat )
+				$message = sprintf(__('You can update to <a href="https://codex.wordpress.org/Version_%1$s">WordPress %2$s</a> automatically or download the package and install it manually:'), $update->current, $version_string);
+			if ( ! $mysql_compat || ! $php_compat)
 				$show_buttons = false;
 		}
 		$download = sprintf(__('Download %s'), $version_string);
@@ -84,31 +84,31 @@ 
 	echo '<p>';
 	echo $message;
 	echo '</p>';
-	echo '<form method="post" action="' . $form_action . '" name="upgrade" class="upgrade">';
+	echo '<form method="post" action="'.$form_action.'" name="upgrade" class="upgrade">';
 	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"/>';
-	if ( $show_buttons ) {
-		if ( $first_pass ) {
-			submit_button( $submit, $current ? 'button' : 'primary regular', 'upgrade', false );
+	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 ? 'button' : 'primary regular', 'upgrade', false);
 			$first_pass = false;
 		} else {
-			submit_button( $submit, 'button', 'upgrade', false );
+			submit_button($submit, 'button', 'upgrade', false);
 		}
-		echo '&nbsp;<a href="' . esc_url( $update->download ) . '" class="button">' . $download . '</a>&nbsp;';
+		echo '&nbsp;<a href="'.esc_url($update->download).'" class="button">'.$download.'</a>&nbsp;';
 	}
-	if ( 'en_US' != $update->locale )
-		if ( !isset( $update->dismissed ) || !$update->dismissed )
-			submit_button( __('Hide this update'), 'button', 'dismiss', false );
+	if ('en_US' != $update->locale)
+		if ( ! isset($update->dismissed) || ! $update->dismissed)
+			submit_button(__('Hide this update'), 'button', 'dismiss', false);
 		else
-			submit_button( __('Bring back this update'), 'button', 'undismiss', false );
+			submit_button(__('Bring back this update'), 'button', 'undismiss', false);
 	echo '</p>';
-	if ( 'en_US' != $update->locale && ( !isset($wp_local_package) || $wp_local_package != $update->locale ) )
+	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>';
+	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 '</form>';
 
@@ -118,8 +118,8 @@ 
  * @since 2.7.0
  */
 function dismissed_updates() {
-	$dismissed = get_core_updates( array( 'dismissed' => true, 'available' => false ) );
-	if ( $dismissed ) {
+	$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'));
@@ -135,9 +135,9 @@ 
 	<?php
 		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) {
+		foreach ((array) $dismissed as $update) {
 			echo '<li>';
-			list_core_update( $update );
+			list_core_update($update);
 			echo '</li>';
 		}
 		echo '</ul>';
@@ -158,22 +158,22 @@ 
 
 	$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.');
 
-		if ( wp_http_supports( array( 'ssl' ) ) ) {
-			require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
+		if (wp_http_supports(array('ssl'))) {
+			require_once ABSPATH.'wp-admin/includes/class-wp-upgrader.php';
 			$upgrader = new WP_Automatic_Updater;
 			$future_minor_update = (object) array(
-				'current'       => $wp_version . '.1.next.minor',
-				'version'       => $wp_version . '.1.next.minor',
+				'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 )
-				echo ' ' . __( 'Future security updates will be applied automatically.' );
+			$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 {
@@ -182,33 +182,33 @@ 
 		echo '</p></div>';
 
 		echo '<h2 class="response">';
-		_e( 'An updated version of WordPress is available.' );
+		_e('An updated version of WordPress is available.');
 		echo '</h2>';
 	}
 
-	if ( isset( $updates[0] ) && $updates[0]->response == 'development' ) {
-		require_once ABSPATH . 'wp-admin/includes/class-wp-upgrader.php';
+	if (isset($updates[0]) && $updates[0]->response == 'development') {
+		require_once ABSPATH.'wp-admin/includes/class-wp-upgrader.php';
 		$upgrader = new WP_Automatic_Updater;
-		if ( wp_http_supports( 'ssl' ) && $upgrader->should_update( 'core', $updates[0], ABSPATH ) ) {
+		if (wp_http_supports('ssl') && $upgrader->should_update('core', $updates[0], ABSPATH)) {
 			echo '<div class="updated inline"><p>';
-			echo '<strong>' . __( 'BETA TESTERS:' ) . '</strong> ' . __( 'This site is set up to install updates of future beta versions automatically.' );
+			echo '<strong>'.__('BETA TESTERS:').'</strong> '.__('This site is set up to install updates of future beta versions automatically.');
 			echo '</p></div>';
 		}
 	}
 
 	echo '<ul class="core-updates">';
-	foreach ( (array) $updates as $update ) {
+	foreach ((array) $updates as $update) {
 		echo '<li>';
-		list_core_update( $update );
+		list_core_update($update);
 		echo '</li>';
 	}
 	echo '</ul>';
 	// Don't show the maintenance mode notice when we are only showing a single re-install option.
-	if ( $updates && ( count( $updates ) > 1 || $updates[0]->response != 'latest' ) ) {
-		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>';
+	if ($updates && (count($updates) > 1 || $updates[0]->response != 'latest')) {
+		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>';
 	}
 	dismissed_updates();
 }
@@ -222,77 +222,77 @@ 
 
 	$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>';
-		echo '<p>' . __( 'Your plugins are all up to date.' ) . '</p>';
+	if (empty($plugins)) {
+		echo '<h2>'.__('Plugins').'</h2>';
+		echo '<p>'.__('Your plugins are all up to date.').'</p>';
 		return;
 	}
 	$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
 		$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">
+<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>
 <table class="widefat updates-table" id="update-plugins-table">
 	<thead>
 	<tr>
 		<td class="manage-column check-column"><input type="checkbox" id="plugins-select-all" /></td>
-		<td class="manage-column"><label for="plugins-select-all"><?php _e( 'Select All' ); ?></label></td>
+		<td class="manage-column"><label for="plugins-select-all"><?php _e('Select All'); ?></label></td>
 	</tr>
 	</thead>
 
 	<tbody class="plugins">
 <?php
-	foreach ( (array) $plugins as $plugin_file => $plugin_data ) {
+	foreach ((array) $plugins as $plugin_file => $plugin_data) {
 		// 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}) ) {
+		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);
+			$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);
+			$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} ) ) {
+		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);
+				$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);
+				$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);
+		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_name = sprintf( '<span class="screen-reader-text">%1$s</span>', esc_attr( $plugin_data->Name ) );
+		$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_name = sprintf('<span class="screen-reader-text">%1$s</span>', esc_attr($plugin_data->Name));
 		/* translators: 1: Plugin name 2: Plugin version */
-		$details_text = sprintf( __( 'View %1$s version %2$s details.' ), $details_name, $plugin_data->update->new_version );
-		$details = sprintf( '<a href="%1$s" class="thickbox open-plugin-details-modal">%2$s</a>', esc_url( $details_url ), $details_text );
-		$checkbox_id =  "checkbox_" . md5( $plugin_data->Name );
+		$details_text = sprintf(__('View %1$s version %2$s details.'), $details_name, $plugin_data->update->new_version);
+		$details = sprintf('<a href="%1$s" class="thickbox open-plugin-details-modal">%2$s</a>', esc_url($details_url), $details_text);
+		$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 ); ?>" />
+				<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' ),
+					printf(__('Select %s'),
 						$plugin_data->Name
 					);
 				?></label>
@@ -301,11 +301,11 @@ 
 				<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.' ),
+					printf(__('You have version %1$s installed. Update to %2$s.'),
 						$plugin_data->Version,
 						$plugin_data->update->new_version
 					);
-					echo ' ' . $details . $compat . $upgrade_notice;
+					echo ' '.$details.$compat.$upgrade_notice;
 				?>
 			</p></td>
 		</tr>
@@ -317,7 +317,7 @@ 
 	<tfoot>
 	<tr>
 		<td class="manage-column check-column"><input type="checkbox" id="plugins-select-all-2" /></td>
-		<td class="manage-column"><label for="plugins-select-all-2"><?php _e( 'Select All' ); ?></label></td>
+		<td class="manage-column"><label for="plugins-select-all-2"><?php _e('Select All'); ?></label></td>
 	</tr>
 	</tfoot>
 </table>
@@ -331,50 +331,50 @@ 
  */
 function list_theme_updates() {
 	$themes = get_theme_updates();
-	if ( empty( $themes ) ) {
-		echo '<h2>' . __( 'Themes' ) . '</h2>';
-		echo '<p>' . __( 'Your themes are all up to date.' ) . '</p>';
+	if (empty($themes)) {
+		echo '<h2>'.__('Themes').'</h2>';
+		echo '<p>'.__('Your themes are all up to date.').'</p>';
 		return;
 	}
 
 	$form_action = 'update-core.php?action=do-theme-upgrade';
 ?>
-<h2><?php _e( 'Themes' ); ?></h2>
-<p><?php _e( 'The following themes have new versions available. Check the ones you want to update and then click &#8220;Update Themes&#8221;.' ); ?></p>
-<p><?php printf( __( '<strong>Please Note:</strong> Any customizations you have made to theme files will be lost. Please consider using <a href="%s">child themes</a> for modifications.' ), __( 'https://codex.wordpress.org/Child_Themes' ) ); ?></p>
-<form method="post" action="<?php echo esc_url( $form_action ); ?>" name="upgrade-themes" class="upgrade">
+<h2><?php _e('Themes'); ?></h2>
+<p><?php _e('The following themes have new versions available. Check the ones you want to update and then click &#8220;Update Themes&#8221;.'); ?></p>
+<p><?php printf(__('<strong>Please Note:</strong> Any customizations you have made to theme files will be lost. Please consider using <a href="%s">child themes</a> for modifications.'), __('https://codex.wordpress.org/Child_Themes')); ?></p>
+<form method="post" action="<?php echo esc_url($form_action); ?>" name="upgrade-themes" class="upgrade">
 <?php wp_nonce_field('upgrade-core'); ?>
 <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>
 		<td class="manage-column check-column"><input type="checkbox" id="themes-select-all" /></td>
-		<td class="manage-column"><label for="themes-select-all"><?php _e( 'Select All' ); ?></label></td>
+		<td class="manage-column"><label for="themes-select-all"><?php _e('Select All'); ?></label></td>
 	</tr>
 	</thead>
 
 	<tbody class="plugins">
 <?php
-	foreach ( $themes as $stylesheet => $theme ) {
-		$checkbox_id = 'checkbox_' . md5( $theme->get( 'Name' ) );
+	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 ); ?>" />
+				<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' )
+					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>
+				<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' ),
+					printf(__('You have version %1$s installed. Update to %2$s.'),
+						$theme->display('Version'),
 						$theme->update['new_version']
 					);
 				?>
@@ -388,7 +388,7 @@ 
 	<tfoot>
 	<tr>
 		<td class="manage-column check-column"><input type="checkbox" id="themes-select-all-2" /></td>
-		<td class="manage-column"><label for="themes-select-all-2"><?php _e( 'Select All' ); ?></label></td>
+		<td class="manage-column"><label for="themes-select-all-2"><?php _e('Select All'); ?></label></td>
 	</tr>
 	</tfoot>
 </table>
@@ -402,21 +402,21 @@ 
  */
 function list_translation_updates() {
 	$updates = wp_get_translation_updates();
-	if ( ! $updates ) {
-		if ( 'en_US' != get_locale() ) {
-			echo '<h2>' . __( 'Translations' ) . '</h2>';
-			echo '<p>' . __( 'Your translations are all up to date.' ) . '</p>';
+	if ( ! $updates) {
+		if ('en_US' != get_locale()) {
+			echo '<h2>'.__('Translations').'</h2>';
+			echo '<p>'.__('Your translations are all up to date.').'</p>';
 		}
 		return;
 	}
 
 	$form_action = 'update-core.php?action=do-translation-upgrade';
 	?>
-	<h2><?php _e( 'Translations' ); ?></h2>
-	<form method="post" action="<?php echo esc_url( $form_action ); ?>" name="upgrade-translations" class="upgrade">
-		<p><?php _e( 'New translations are available.' ); ?></p>
-		<?php wp_nonce_field( 'upgrade-translations' ); ?>
-		<p><input class="button" type="submit" value="<?php esc_attr_e( 'Update Translations' ); ?>" name="upgrade" /></p>
+	<h2><?php _e('Translations'); ?></h2>
+	<form method="post" action="<?php echo esc_url($form_action); ?>" name="upgrade-translations" class="upgrade">
+		<p><?php _e('New translations are available.'); ?></p>
+		<?php wp_nonce_field('upgrade-translations'); ?>
+		<p><input class="button" type="submit" value="<?php esc_attr_e('Update Translations'); ?>" name="upgrade" /></p>
 	</form>
 	<?php
 }
@@ -430,76 +430,76 @@ 
  *
  * @param bool $reinstall
  */
-function do_core_upgrade( $reinstall = false ) {
+function do_core_upgrade($reinstall = false) {
 	global $wp_filesystem;
 
-	include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
+	include_once(ABSPATH.'wp-admin/includes/class-wp-upgrader.php');
 
-	if ( $reinstall )
+	if ($reinstall)
 		$url = 'update-core.php?action=do-core-reinstall';
 	else
 		$url = 'update-core.php?action=do-core-upgrade';
 	$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.
-	$allow_relaxed_file_ownership = ! $reinstall && isset( $update->new_files ) && ! $update->new_files;
+	$allow_relaxed_file_ownership = ! $reinstall && isset($update->new_files) && ! $update->new_files;
 
 ?>
 	<div class="wrap">
-	<h1><?php _e( 'Update WordPress' ); ?></h1>
+	<h1><?php _e('Update WordPress'); ?></h1>
 <?php
 
-	if ( false === ( $credentials = request_filesystem_credentials( $url, '', false, ABSPATH, array( 'version', 'locale' ), $allow_relaxed_file_ownership ) ) ) {
+	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 ) ) {
+	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 );
+		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 )
+	if ($wp_filesystem->errors->get_error_code()) {
+		foreach ($wp_filesystem->errors->get_error_messages() as $message)
 			show_message($message);
 		echo '</div>';
 		return;
 	}
 
-	if ( $reinstall )
+	if ($reinstall)
 		$update->response = 'reinstall';
 
-	add_filter( 'update_feedback', 'show_message' );
+	add_filter('update_feedback', 'show_message');
 
 	$upgrader = new Core_Upgrader();
-	$result = $upgrader->upgrade( $update, array(
+	$result = $upgrader->upgrade($update, array(
 		'allow_relaxed_file_ownership' => $allow_relaxed_file_ownership
-	) );
+	));
 
-	if ( is_wp_error($result) ) {
+	if (is_wp_error($result)) {
 		show_message($result);
-		if ( 'up_to_date' != $result->get_error_code() && 'locked' != $result->get_error_code() )
-			show_message( __('Installation Failed') );
+		if ('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( '<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>' );
+	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>');
 	?>
 	</div>
 	<script type="text/javascript">
-	window.location = '<?php echo self_admin_url( 'about.php?updated' ); ?>';
+	window.location = '<?php echo self_admin_url('about.php?updated'); ?>';
 	</script>
 	<?php
 }
@@ -508,13 +508,13 @@ 
  * @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') );
+	dismiss_core_update($update);
+	wp_redirect(wp_nonce_url('update-core.php?action=upgrade-core', 'upgrade-core'));
 	exit;
 }
 
@@ -522,21 +522,21 @@ 
  * @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') );
+	undismiss_core_update($version, $locale);
+	wp_redirect(wp_nonce_url('update-core.php?action=upgrade-core', 'upgrade-core'));
 	exit;
 }
 
 $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'] ) ) {
+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';
 }
@@ -544,47 +544,47 @@ 
 $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>';
+$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(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'overview',
-	'title'   => __( '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>';
+$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>';
 
-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>';
+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(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'how-to-update',
-	'title'   => __( 'How to Update' ),
+	'title'   => __('How to Update'),
 	'content' => $updates_howto
-) );
+));
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __( '<a href="https://codex.wordpress.org/Dashboard_Updates_Screen" target="_blank">Documentation on Updating WordPress</a>' ) . '</p>' .
-	'<p>' . __( '<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>' ) . '</p>'
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Dashboard_Updates_Screen" target="_blank">Documentation on Updating WordPress</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>'
 );
 
-if ( 'upgrade-core' == $action ) {
+if ('upgrade-core' == $action) {
 	// Force a update check when requested
-	$force_check = ! empty( $_GET['force-check'] );
-	wp_version_check( array(), $force_check );
+	$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>
+	<h1><?php _e('WordPress Updates'); ?></h1>
 	<?php
-	if ( $upgrade_error ) {
+	if ($upgrade_error) {
 		echo '<div class="error"><p>';
-		if ( $upgrade_error == 'themes' )
+		if ($upgrade_error == 'themes')
 			_e('Please select one or more themes to update.');
 		else
 			_e('Please select one or more plugins to update.');
@@ -593,129 +593,129 @@ 
 
 	echo '<p>';
 	/* translators: %1 date, %2 time. */
-	printf( __( 'Last checked on %1$s at %2$s.' ), date_i18n( __( 'F j, Y' ) ), date_i18n( __( 'g:i a' ) ) );
-	echo ' &nbsp; <a class="button" href="' . esc_url( self_admin_url('update-core.php?force-check=1') ) . '">' . __( 'Check Again' ) . '</a>';
+	printf(__('Last checked on %1$s at %2$s.'), date_i18n(__('F j, Y')), date_i18n(__('g:i a')));
+	echo ' &nbsp; <a class="button" href="'.esc_url(self_admin_url('update-core.php?force-check=1')).'">'.__('Check Again').'</a>';
 	echo '</p>';
 
-	if ( $core = current_user_can( 'update_core' ) )
+	if ($core = current_user_can('update_core'))
 		core_upgrade_preamble();
-	if ( $plugins = current_user_can( 'update_plugins' ) )
+	if ($plugins = current_user_can('update_plugins'))
 		list_plugin_updates();
-	if ( $themes = current_user_can( 'update_themes' ) )
+	if ($themes = current_user_can('update_themes'))
 		list_theme_updates();
-	if ( $core || $plugins || $themes )
+	if ($core || $plugins || $themes)
 		list_translation_updates();
-	unset( $core, $plugins, $themes );
+	unset($core, $plugins, $themes);
 	/**
 	 * Fires after the core, plugin, and theme update tables.
 	 *
 	 * @since 2.9.0
 	 */
-	do_action( 'core_upgrade_preamble' );
+	do_action('core_upgrade_preamble');
 	echo '</div>';
-	include(ABSPATH . 'wp-admin/admin-footer.php');
+	include(ABSPATH.'wp-admin/admin-footer.php');
 
-} elseif ( 'do-core-upgrade' == $action || 'do-core-reinstall' == $action ) {
+} elseif ('do-core-upgrade' == $action || 'do-core-reinstall' == $action) {
 
-	if ( ! current_user_can( 'update_core' ) )
-		wp_die( __( 'You do not have sufficient permissions to update this site.' ) );
+	if ( ! current_user_can('update_core'))
+		wp_die(__('You do not have sufficient permissions to update this site.'));
 
 	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
 		$reinstall = false;
 
-	if ( isset( $_POST['upgrade'] ) )
+	if (isset($_POST['upgrade']))
 		do_core_upgrade($reinstall);
 
-	include(ABSPATH . 'wp-admin/admin-footer.php');
+	include(ABSPATH.'wp-admin/admin-footer.php');
 
-} elseif ( 'do-plugin-upgrade' == $action ) {
+} elseif ('do-plugin-upgrade' == $action) {
 
-	if ( ! current_user_can( 'update_plugins' ) )
-		wp_die( __( 'You do not have sufficient permissions to update this site.' ) );
+	if ( ! current_user_can('update_plugins'))
+		wp_die(__('You do not have sufficient permissions to update this site.'));
 
 	check_admin_referer('upgrade-core');
 
-	if ( isset( $_GET['plugins'] ) ) {
-		$plugins = explode( ',', $_GET['plugins'] );
-	} elseif ( isset( $_POST['checked'] ) ) {
+	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 = 'update.php?action=update-selected&plugins='.urlencode(implode(',', $plugins));
 	$url = wp_nonce_url($url, 'bulk-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 '<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>';
-	include(ABSPATH . 'wp-admin/admin-footer.php');
+	include(ABSPATH.'wp-admin/admin-footer.php');
 
-} elseif ( 'do-theme-upgrade' == $action ) {
+} elseif ('do-theme-upgrade' == $action) {
 
-	if ( ! current_user_can( 'update_themes' ) )
-		wp_die( __( 'You do not have sufficient permissions to update this site.' ) );
+	if ( ! current_user_can('update_themes'))
+		wp_die(__('You do not have sufficient permissions to update this site.'));
 
 	check_admin_referer('upgrade-core');
 
-	if ( isset( $_GET['themes'] ) ) {
-		$themes = explode( ',', $_GET['themes'] );
-	} elseif ( isset( $_POST['checked'] ) ) {
+	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 = 'update.php?action=update-selected-themes&themes='.urlencode(implode(',', $themes));
 	$url = wp_nonce_url($url, 'bulk-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>
+		<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>
 	</div>
 	<?php
-	include(ABSPATH . 'wp-admin/admin-footer.php');
+	include(ABSPATH.'wp-admin/admin-footer.php');
 
-} elseif ( 'do-translation-upgrade' == $action ) {
+} elseif ('do-translation-upgrade' == $action) {
 
-	if ( ! current_user_can( 'update_core' ) && ! current_user_can( 'update_plugins' ) && ! current_user_can( 'update_themes' ) )
-		wp_die( __( 'You do not have sufficient permissions to update this site.' ) );
+	if ( ! current_user_can('update_core') && ! current_user_can('update_plugins') && ! current_user_can('update_themes'))
+		wp_die(__('You do not have sufficient permissions to update this site.'));
 
-	check_admin_referer( 'upgrade-translations' );
+	check_admin_referer('upgrade-translations');
 
-	require_once( ABSPATH . 'wp-admin/admin-header.php' );
-	include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
+	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' );
+	$title = __('Update Translations');
 	$context = WP_LANG_DIR;
 
-	$upgrader = new Language_Pack_Upgrader( new Language_Pack_Upgrader_Skin( compact( 'url', 'nonce', 'title', 'context' ) ) );
+	$upgrader = new Language_Pack_Upgrader(new Language_Pack_Upgrader_Skin(compact('url', 'nonce', 'title', 'context')));
 	$result = $upgrader->bulk_upgrade();
 
-	require_once( ABSPATH . 'wp-admin/admin-footer.php' );
+	require_once(ABSPATH.'wp-admin/admin-footer.php');
 
 } else {
 	/**
@@ -727,5 +727,5 @@ 
 	 *
 	 * @since 3.2.0
 	 */
-	do_action( "update-core-custom_{$action}" );
+	do_action("update-core-custom_{$action}");
 }

Braces +112 added lines, -82 removed lines

@@ -19,8 +19,9 @@ 
 	exit();
 }
 
-if ( ! current_user_can( 'update_core' ) && ! current_user_can( 'update_themes' ) && ! current_user_can( 'update_plugins' ) )
+if ( ! current_user_can( 'update_core' ) && ! current_user_can( 'update_themes' ) && ! current_user_can( 'update_plugins' ) ) {
 	wp_die( __( 'You do not have sufficient permissions to update this site.' ) );
+}
 
 /**
  *
@@ -36,17 +37,20 @@ 
  	global $wp_local_package, $wpdb, $wp_version;
   	static $first_pass = true;
 
- 	if ( 'en_US' == $update->locale && 'en_US' == get_locale() )
- 		$version_string = $update->current;
+ 	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 );
+ 	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 )
-		$current = true;
+	if ( !isset($update->response) || 'latest' == $update->response ) {
+			$current = true;
+	}
 	$submit = __('Update Now');
 	$form_action = 'update-core.php?action=do-core-upgrade';
 	$php_version    = phpversion();
@@ -62,21 +66,24 @@ 
 			$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 ) )
-				$mysql_compat = true;
-			else
-				$mysql_compat = version_compare( $mysql_version, $update->mysql_version, '>=' );
-
-			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 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. 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 MySQL version %2$s or higher. You are running version %3$s.'), $update->current, $update->mysql_version, $mysql_version );
-			else
-				$message = 	sprintf(__('You can update to <a href="https://codex.wordpress.org/Version_%1$s">WordPress %2$s</a> automatically or download the package and install it manually:'), $update->current, $version_string);
-			if ( !$mysql_compat || !$php_compat )
-				$show_buttons = false;
+			if ( file_exists( WP_CONTENT_DIR . '/db.php' ) && empty( $wpdb->is_mysql ) ) {
+							$mysql_compat = true;
+			} else {
+							$mysql_compat = version_compare( $mysql_version, $update->mysql_version, '>=' );
+			}
+
+			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 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. 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 MySQL version %2$s or higher. You are running version %3$s.'), $update->current, $update->mysql_version, $mysql_version );
+			} else {
+							$message = 	sprintf(__('You can update to <a href="https://codex.wordpress.org/Version_%1$s">WordPress %2$s</a> automatically or download the package and install it manually:'), $update->current, $version_string);
+			}
+			if ( !$mysql_compat || !$php_compat ) {
+							$show_buttons = false;
+			}
 		}
 		$download = sprintf(__('Download %s'), $version_string);
 	}
@@ -98,14 +105,16 @@ 
 		}
 		echo '&nbsp;<a href="' . esc_url( $update->download ) . '" class="button">' . $download . '</a>&nbsp;';
 	}
-	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'), 'button', 'dismiss', false );
-		else
-			submit_button( __('Bring back this update'), 'button', 'undismiss', false );
+	} else {
+					submit_button( __('Bring back this update'), 'button', '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>';
+	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>';
@@ -172,8 +181,9 @@ 
 				'mysql_version' => $required_mysql_version,
 			);
 			$should_auto_update = $upgrader->should_update( 'core', $future_minor_update, ABSPATH );
-			if ( $should_auto_update )
-				echo ' ' . __( 'Future security updates will be applied automatically.' );
+			if ( $should_auto_update ) {
+							echo ' ' . __( 'Future security updates will be applied automatically.' );
+			}
 		}
 		echo '</h2>';
 	} else {
@@ -232,10 +242,11 @@ 
 	$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, '=') )
-		$core_update_version = false;
-	else
-		$core_update_version = $core_updates[0]->current;
+	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 {
+			$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>
@@ -435,17 +446,19 @@ 
 
 	include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
 
-	if ( $reinstall )
-		$url = 'update-core.php?action=do-core-reinstall';
-	else
-		$url = 'update-core.php?action=do-core-upgrade';
+	if ( $reinstall ) {
+			$url = 'update-core.php?action=do-core-reinstall';
+	} else {
+			$url = 'update-core.php?action=do-core-upgrade';
+	}
 	$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 )
-		return;
+	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.
@@ -469,14 +482,16 @@ 
 	}
 
 	if ( $wp_filesystem->errors->get_error_code() ) {
-		foreach ( $wp_filesystem->errors->get_error_messages() as $message )
-			show_message($message);
+		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' );
 
@@ -487,8 +502,9 @@ 
 
 	if ( is_wp_error($result) ) {
 		show_message($result);
-		if ( 'up_to_date' != $result->get_error_code() && 'locked' != $result->get_error_code() )
-			show_message( __('Installation Failed') );
+		if ( 'up_to_date' != $result->get_error_code() && 'locked' != $result->get_error_code() ) {
+					show_message( __('Installation Failed') );
+		}
 		echo '</div>';
 		return;
 	}
@@ -511,8 +527,9 @@ 
 	$version = isset( $_POST['version'] )? $_POST['version'] : false;
 	$locale = isset( $_POST['locale'] )? $_POST['locale'] : 'en_US';
 	$update = find_core_update( $version, $locale );
-	if ( !$update )
-		return;
+	if ( !$update ) {
+			return;
+	}
 	dismiss_core_update( $update );
 	wp_redirect( wp_nonce_url('update-core.php?action=upgrade-core', 'upgrade-core') );
 	exit;
@@ -525,8 +542,9 @@ 
 	$version = isset( $_POST['version'] )? $_POST['version'] : false;
 	$locale = isset( $_POST['locale'] )? $_POST['locale'] : 'en_US';
 	$update = find_core_update( $version, $locale );
-	if ( !$update )
-		return;
+	if ( !$update ) {
+			return;
+	}
 	undismiss_core_update( $version, $locale );
 	wp_redirect( wp_nonce_url('update-core.php?action=upgrade-core', 'upgrade-core') );
 	exit;
@@ -584,10 +602,11 @@ 
 	<?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>';
 	}
 
@@ -597,14 +616,18 @@ 
 	echo ' &nbsp; <a class="button" href="' . esc_url( self_admin_url('update-core.php?force-check=1') ) . '">' . __( 'Check Again' ) . '</a>';
 	echo '</p>';
 
-	if ( $core = current_user_can( 'update_core' ) )
-		core_upgrade_preamble();
-	if ( $plugins = current_user_can( 'update_plugins' ) )
-		list_plugin_updates();
-	if ( $themes = current_user_can( 'update_themes' ) )
-		list_theme_updates();
-	if ( $core || $plugins || $themes )
-		list_translation_updates();
+	if ( $core = current_user_can( 'update_core' ) ) {
+			core_upgrade_preamble();
+	}
+	if ( $plugins = current_user_can( 'update_plugins' ) ) {
+			list_plugin_updates();
+	}
+	if ( $themes = current_user_can( 'update_themes' ) ) {
+			list_theme_updates();
+	}
+	if ( $core || $plugins || $themes ) {
+			list_translation_updates();
+	}
 	unset( $core, $plugins, $themes );
 	/**
 	 * Fires after the core, plugin, and theme update tables.
@@ -617,32 +640,37 @@ 
 
 } elseif ( 'do-core-upgrade' == $action || 'do-core-reinstall' == $action ) {
 
-	if ( ! current_user_can( 'update_core' ) )
-		wp_die( __( 'You do not have sufficient permissions to update this site.' ) );
+	if ( ! current_user_can( 'update_core' ) ) {
+			wp_die( __( 'You do not have sufficient permissions to update this site.' ) );
+	}
 
 	check_admin_referer('upgrade-core');
 
 	// Do the (un)dismiss actions before headers, so that they can redirect.
-	if ( isset( $_POST['dismiss'] ) )
-		do_dismiss_core_update();
-	elseif ( isset( $_POST['undismiss'] ) )
-		do_undismiss_core_update();
+	if ( isset( $_POST['dismiss'] ) ) {
+			do_dismiss_core_update();
+	} elseif ( isset( $_POST['undismiss'] ) ) {
+			do_undismiss_core_update();
+	}
 
 	require_once(ABSPATH . 'wp-admin/admin-header.php');
-	if ( 'do-core-reinstall' == $action )
-		$reinstall = true;
-	else
-		$reinstall = false;
+	if ( 'do-core-reinstall' == $action ) {
+			$reinstall = true;
+	} else {
+			$reinstall = false;
+	}
 
-	if ( isset( $_POST['upgrade'] ) )
-		do_core_upgrade($reinstall);
+	if ( isset( $_POST['upgrade'] ) ) {
+			do_core_upgrade($reinstall);
+	}
 
 	include(ABSPATH . 'wp-admin/admin-footer.php');
 
 } elseif ( 'do-plugin-upgrade' == $action ) {
 
-	if ( ! current_user_can( 'update_plugins' ) )
-		wp_die( __( 'You do not have sufficient permissions to update this site.' ) );
+	if ( ! current_user_can( 'update_plugins' ) ) {
+			wp_die( __( 'You do not have sufficient permissions to update this site.' ) );
+	}
 
 	check_admin_referer('upgrade-core');
 
@@ -669,8 +697,9 @@ 
 
 } elseif ( 'do-theme-upgrade' == $action ) {
 
-	if ( ! current_user_can( 'update_themes' ) )
-		wp_die( __( 'You do not have sufficient permissions to update this site.' ) );
+	if ( ! current_user_can( 'update_themes' ) ) {
+			wp_die( __( 'You do not have sufficient permissions to update this site.' ) );
+	}
 
 	check_admin_referer('upgrade-core');
 
@@ -699,8 +728,9 @@ 
 
 } elseif ( 'do-translation-upgrade' == $action ) {
 
-	if ( ! current_user_can( 'update_core' ) && ! current_user_can( 'update_plugins' ) && ! current_user_can( 'update_themes' ) )
-		wp_die( __( 'You do not have sufficient permissions to update this site.' ) );
+	if ( ! current_user_can( 'update_core' ) && ! current_user_can( 'update_plugins' ) && ! current_user_can( 'update_themes' ) ) {
+			wp_die( __( 'You do not have sufficient permissions to update this site.' ) );
+	}
 
 	check_admin_referer( 'upgrade-translations' );
 

src/wp-admin/custom-header.php

Indentation +6 added lines, -6 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 /**
- * The custom header image script.
- *
- * @package WordPress
- * @subpackage Administration
- */
+	 * The custom header image script.
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 */
 
 /**
  * The custom header image class.
@@ -42,7 +42,7 @@ 
 
 	/**
 	 * Used to trigger a success message when settings updated and set to true.
- 	 *
+	 *
 	 * @since 3.0.0
 	 * @access private
 	 * @var bool

Spacing +368 added lines, -368 removed lines

@@ -60,12 +60,12 @@ 
 		$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('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'));
 	}
 
 	/**
@@ -74,18 +74,18 @@ 
 	 * @since 2.1.0
 	 */
 	public function init() {
-		$page = add_theme_page( __( 'Header' ), __( 'Header' ), 'edit_theme_options', 'custom-header', array( $this, 'admin_page' ) );
-		if ( ! $page ) {
+		$page = add_theme_page(__('Header'), __('Header'), 'edit_theme_options', 'custom-header', array($this, 'admin_page'));
+		if ( ! $page) {
 			return;
 		}
 
-		add_action( "admin_print_scripts-$page", array( $this, 'js_includes' ) );
-		add_action( "admin_print_styles-$page", array( $this, 'css_includes' ) );
-		add_action( "admin_head-$page", array( $this, 'help' ) );
-		add_action( "admin_head-$page", array( $this, 'take_action' ), 50 );
-		add_action( "admin_head-$page", array( $this, 'js' ), 50 );
-		if ( $this->admin_header_callback ) {
-			add_action( "admin_head-$page", $this->admin_header_callback, 51 );
+		add_action("admin_print_scripts-$page", array($this, 'js_includes'));
+		add_action("admin_print_styles-$page", array($this, 'css_includes'));
+		add_action("admin_head-$page", array($this, 'help'));
+		add_action("admin_head-$page", array($this, 'take_action'), 50);
+		add_action("admin_head-$page", array($this, 'js'), 50);
+		if ($this->admin_header_callback) {
+			add_action("admin_head-$page", $this->admin_header_callback, 51);
 		}
 	}
 
@@ -95,37 +95,37 @@ 
 	 * @since 3.0.0
 	 */
 	public function help() {
-		get_current_screen()->add_help_tab( array(
+		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>'
-		) );
+				'<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(
+		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>'
-		) );
+				'<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(
+		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>'
-		) );
+				'<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>' .
-			'<p>' . __( '<a href="https://codex.wordpress.org/Appearance_Header_Screen" target="_blank">Documentation on Custom Header</a>' ) . '</p>' .
-			'<p>' . __( '<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>' ) . '</p>'
+			'<p><strong>'.__('For more information:').'</strong></p>'.
+			'<p>'.__('<a href="https://codex.wordpress.org/Appearance_Header_Screen" target="_blank">Documentation on Custom Header</a>').'</p>'.
+			'<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>'
 		);
 	}
 
@@ -137,13 +137,13 @@ 
 	 * @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' ) )
+		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;
 
@@ -158,12 +158,12 @@ 
 	public function js_includes() {
 		$step = $this->step();
 
-		if ( ( 1 == $step || 3 == $step ) ) {
+		if ((1 == $step || 3 == $step)) {
 			wp_enqueue_media();
-			wp_enqueue_script( 'custom-header' );
-			if ( current_theme_supports( 'custom-header', 'header-text' ) )
-				wp_enqueue_script( 'wp-color-picker' );
-		} elseif ( 2 == $step ) {
+			wp_enqueue_script('custom-header');
+			if (current_theme_supports('custom-header', 'header-text'))
+				wp_enqueue_script('wp-color-picker');
+		} elseif (2 == $step) {
 			wp_enqueue_script('imgareaselect');
 		}
 	}
@@ -176,9 +176,9 @@ 
 	public function css_includes() {
 		$step = $this->step();
 
-		if ( ( 1 == $step || 3 == $step ) && current_theme_supports( 'custom-header', 'header-text' ) )
-			wp_enqueue_style( 'wp-color-picker' );
-		elseif ( 2 == $step )
+		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');
 	}
 
@@ -188,42 +188,42 @@ 
 	 * @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;
 
-		if ( isset( $_POST['resetheader'] ) ) {
-			check_admin_referer( 'custom-header-options', '_wpnonce-custom-header-options' );
+		if (isset($_POST['resetheader'])) {
+			check_admin_referer('custom-header-options', '_wpnonce-custom-header-options');
 			$this->reset_header_image();
 			return;
 		}
 
-		if ( isset( $_POST['removeheader'] ) ) {
-			check_admin_referer( 'custom-header-options', '_wpnonce-custom-header-options' );
+		if (isset($_POST['removeheader'])) {
+			check_admin_referer('custom-header-options', '_wpnonce-custom-header-options');
 			$this->remove_header_image();
 			return;
 		}
 
-		if ( isset( $_POST['text-color'] ) && ! isset( $_POST['display-header-text'] ) ) {
-			check_admin_referer( 'custom-header-options', '_wpnonce-custom-header-options' );
-			set_theme_mod( 'header_textcolor', 'blank' );
-		} elseif ( isset( $_POST['text-color'] ) ) {
-			check_admin_referer( 'custom-header-options', '_wpnonce-custom-header-options' );
-			$_POST['text-color'] = str_replace( '#', '', $_POST['text-color'] );
+		if (isset($_POST['text-color']) && ! isset($_POST['display-header-text'])) {
+			check_admin_referer('custom-header-options', '_wpnonce-custom-header-options');
+			set_theme_mod('header_textcolor', 'blank');
+		} 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 )
+			if (strlen($color) == 6 || strlen($color) == 3)
 				set_theme_mod('header_textcolor', $color);
-			elseif ( ! $color )
-				set_theme_mod( 'header_textcolor', 'blank' );
+			elseif ( ! $color)
+				set_theme_mod('header_textcolor', 'blank');
 		}
 
-		if ( isset( $_POST['default-header'] ) ) {
-			check_admin_referer( 'custom-header-options', '_wpnonce-custom-header-options' );
-			$this->set_header_image( $_POST['default-header'] );
+		if (isset($_POST['default-header'])) {
+			check_admin_referer('custom-header-options', '_wpnonce-custom-header-options');
+			$this->set_header_image($_POST['default-header']);
 			return;
 		}
 	}
@@ -238,19 +238,19 @@ 
 	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 ) ) {
+		if ( ! empty($this->default_headers)) {
 			return;
 		}
 
 		$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);
 		}
 	}
 
@@ -265,33 +265,33 @@ 
 	 * @param string $type The header type. One of 'default' (for the Uploaded Images control)
 	 *                     or 'uploaded' (for the Uploaded Images control).
 	 */
-	public function show_header_selector( $type = 'default' ) {
-		if ( 'default' == $type ) {
+	public function show_header_selector($type = 'default') {
+		if ('default' == $type) {
 			$headers = $this->default_headers;
 		} else {
 			$headers = get_uploaded_header_images();
 			$type = 'uploaded';
 		}
 
-		if ( 1 < count( $headers ) ) {
+		if (1 < count($headers)) {
 			echo '<div class="random-header">';
-			echo '<label><input name="default-header" type="radio" value="random-' . $type . '-image"' . checked( is_random_header_image( $type ), true, false ) . ' />';
-			_e( '<strong>Random:</strong> Show a different image on each page.' );
+			echo '<label><input name="default-header" type="radio" value="random-'.$type.'-image"'.checked(is_random_header_image($type), true, false).' />';
+			_e('<strong>Random:</strong> Show a different image on each page.');
 			echo '</label>';
 			echo '</div>';
 		}
 
 		echo '<div class="available-headers">';
-		foreach ( $headers as $header_key => $header ) {
+		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_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 ) . ' />';
+			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>';
@@ -304,9 +304,9 @@ 
 	 */
 	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();
 	}
 
@@ -317,10 +317,10 @@ 
 	 */
 	public function js_1() {
 		$default_color = '';
-		if ( current_theme_supports( 'custom-header', 'default-text-color' ) ) {
-			$default_color = get_theme_support( 'custom-header', 'default-text-color' );
-			if ( $default_color && false === strpos( $default_color, '#' ) ) {
-				$default_color = '#' . $default_color;
+		if (current_theme_supports('custom-header', 'default-text-color')) {
+			$default_color = get_theme_support('custom-header', 'default-text-color');
+			if ($default_color && false === strpos($default_color, '#')) {
+				$default_color = '#'.$default_color;
 			}
 		}
 		?>
@@ -362,7 +362,7 @@ 
 			}
 		});
 		$('#display-header-text').click( toggle_text );
-		<?php if ( ! display_header_text() ) : ?>
+		<?php if ( ! display_header_text()) : ?>
 		toggle_text();
 		<?php endif; ?>
 	});
@@ -386,8 +386,8 @@ 
 	}
 
 	jQuery(document).ready(function() {
-		var xinit = <?php echo absint( get_theme_support( 'custom-header', 'width' ) ); ?>;
-		var yinit = <?php echo absint( get_theme_support( 'custom-header', 'height' ) ); ?>;
+		var xinit = <?php echo absint(get_theme_support('custom-header', 'width')); ?>;
+		var yinit = <?php echo absint(get_theme_support('custom-header', 'height')); ?>;
 		var ratio = xinit / yinit;
 		var ximg = jQuery('img#upload').width();
 		var yimg = jQuery('img#upload').height();
@@ -411,19 +411,19 @@ 
 			x2: xinit,
 			y2: yinit,
 			<?php
-			if ( ! current_theme_supports( 'custom-header', 'flex-height' ) && ! current_theme_supports( 'custom-header', 'flex-width' ) ) {
+			if ( ! current_theme_supports('custom-header', 'flex-height') && ! current_theme_supports('custom-header', 'flex-width')) {
 			?>
 			aspectRatio: xinit + ':' + yinit,
 			<?php
 			}
-			if ( ! current_theme_supports( 'custom-header', 'flex-height' ) ) {
+			if ( ! current_theme_supports('custom-header', 'flex-height')) {
 			?>
-			maxHeight: <?php echo get_theme_support( 'custom-header', 'height' ); ?>,
+			maxHeight: <?php echo get_theme_support('custom-header', 'height'); ?>,
 			<?php
 			}
-			if ( ! current_theme_supports( 'custom-header', 'flex-width' ) ) {
+			if ( ! current_theme_supports('custom-header', 'flex-width')) {
 			?>
-			maxWidth: <?php echo get_theme_support( 'custom-header', 'width' ); ?>,
+			maxWidth: <?php echo get_theme_support('custom-header', 'width'); ?>,
 			<?php
 			}
 			?>
@@ -453,144 +453,144 @@ 
 ?>
 
 <div class="wrap">
-<h1><?php _e( 'Custom Header' ); ?></h1>
+<h1><?php _e('Custom Header'); ?></h1>
 
-<?php if ( current_user_can( 'customize' ) ) { ?>
+<?php if (current_user_can('customize')) { ?>
 <div class="notice notice-info hide-if-no-customize">
 	<p>
 		<?php
 		printf(
-			__( 'You can now manage and live-preview Custom Header in the <a href="%1$s">Customizer</a>.' ),
-			admin_url( 'customize.php?autofocus[control]=header_image' )
+			__('You can now manage and live-preview Custom Header in the <a href="%1$s">Customizer</a>.'),
+			admin_url('customize.php?autofocus[control]=header_image')
 		);
 		?>
 	</p>
 </div>
 <?php } ?>
 
-<?php if ( ! empty( $this->updated ) ) { ?>
+<?php if ( ! empty($this->updated)) { ?>
 <div id="message" class="updated">
-<p><?php printf( __( 'Header updated. <a href="%s">Visit your site</a> to see how it looks.' ), home_url( '/' ) ); ?></p>
+<p><?php printf(__('Header updated. <a href="%s">Visit your site</a> to see how it looks.'), home_url('/')); ?></p>
 </div>
 <?php } ?>
 
-<h3><?php _e( 'Header Image' ); ?></h3>
+<h3><?php _e('Header Image'); ?></h3>
 
 <table class="form-table">
 <tbody>
 
-<?php if ( get_custom_header() || display_header_text() ) : ?>
+<?php if (get_custom_header() || display_header_text()) : ?>
 <tr>
-<th scope="row"><?php _e( 'Preview' ); ?></th>
+<th scope="row"><?php _e('Preview'); ?></th>
 <td>
 	<?php
-	if ( $this->admin_image_div_callback ) {
-		call_user_func( $this->admin_image_div_callback );
+	if ($this->admin_image_div_callback) {
+		call_user_func($this->admin_image_div_callback);
 	} else {
 		$custom_header = get_custom_header();
 		$header_image = get_header_image();
 
-		if ( $header_image ) {
-			$header_image_style = 'background-image:url(' . esc_url( $header_image ) . ');';
-		}  else {
+		if ($header_image) {
+			$header_image_style = 'background-image:url('.esc_url($header_image).');';
+		} else {
 			$header_image_style = '';
 		}
 
-		if ( $custom_header->width )
-			$header_image_style .= 'max-width:' . $custom_header->width . 'px;';
-		if ( $custom_header->height )
-			$header_image_style .= 'height:' . $custom_header->height . 'px;';
+		if ($custom_header->width)
+			$header_image_style .= 'max-width:'.$custom_header->width.'px;';
+		if ($custom_header->height)
+			$header_image_style .= 'height:'.$custom_header->height.'px;';
 	?>
 	<div id="headimg" style="<?php echo $header_image_style; ?>">
 		<?php
-		if ( display_header_text() )
-			$style = ' style="color:#' . get_header_textcolor() . ';"';
+		if (display_header_text())
+			$style = ' style="color:#'.get_header_textcolor().';"';
 		else
 			$style = ' style="display:none;"';
 		?>
-		<h1><a id="name" class="displaying-header-text" <?php echo $style; ?> onclick="return false;" href="<?php bloginfo('url'); ?>" tabindex="-1"><?php bloginfo( 'name' ); ?></a></h1>
-		<div id="desc" class="displaying-header-text" <?php echo $style; ?>><?php bloginfo( 'description' ); ?></div>
+		<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 } ?>
 </td>
 </tr>
 <?php endif; ?>
 
-<?php if ( current_user_can( 'upload_files' ) && current_theme_supports( 'custom-header', 'uploads' ) ) : ?>
+<?php if (current_user_can('upload_files') && current_theme_supports('custom-header', 'uploads')) : ?>
 <tr>
-<th scope="row"><?php _e( 'Select Image' ); ?></th>
+<th scope="row"><?php _e('Select Image'); ?></th>
 <td>
-	<p><?php _e( 'You can select an image to be shown at the top of your site by uploading from your computer or choosing from your media library. After selecting an image you will be able to crop it.' ); ?><br />
+	<p><?php _e('You can select an image to be shown at the top of your site by uploading from your computer or choosing from your media library. After selecting an image you will be able to crop it.'); ?><br />
 	<?php
-	if ( ! current_theme_supports( 'custom-header', 'flex-height' ) && ! current_theme_supports( 'custom-header', 'flex-width' ) ) {
-		printf( __( 'Images of exactly <strong>%1$d &times; %2$d pixels</strong> will be used as-is.' ) . '<br />', get_theme_support( 'custom-header', 'width' ), get_theme_support( 'custom-header', 'height' ) );
-	} elseif ( current_theme_supports( 'custom-header', 'flex-height' ) ) {
-		if ( ! current_theme_supports( 'custom-header', 'flex-width' ) )
+	if ( ! current_theme_supports('custom-header', 'flex-height') && ! current_theme_supports('custom-header', 'flex-width')) {
+		printf(__('Images of exactly <strong>%1$d &times; %2$d pixels</strong> will be used as-is.').'<br />', get_theme_support('custom-header', 'width'), get_theme_support('custom-header', 'height'));
+	} elseif (current_theme_supports('custom-header', 'flex-height')) {
+		if ( ! current_theme_supports('custom-header', 'flex-width'))
 			printf(
 				/* translators: %s: size in pixels */
-				__( 'Images should be at least %s wide.' ) . ' ',
+				__('Images should be at least %s wide.').' ',
 				sprintf(
 					/* translators: %d: custom header width */
-					'<strong>' . __( '%d pixels' ) . '</strong>',
-					get_theme_support( 'custom-header', 'width' )
+					'<strong>'.__('%d pixels').'</strong>',
+					get_theme_support('custom-header', 'width')
 				)
 			);
-	} elseif ( current_theme_supports( 'custom-header', 'flex-width' ) ) {
-		if ( ! current_theme_supports( 'custom-header', 'flex-height' ) )
+	} elseif (current_theme_supports('custom-header', 'flex-width')) {
+		if ( ! current_theme_supports('custom-header', 'flex-height'))
 			printf(
 				/* translators: %s: size in pixels */
-				__( 'Images should be at least %s tall.' ) . ' ',
+				__('Images should be at least %s tall.').' ',
 				sprintf(
 					/* translators: %d: custom header height */
-					'<strong>' . __( '%d pixels' ) . '</strong>',
-					get_theme_support( 'custom-header', 'height' )
+					'<strong>'.__('%d pixels').'</strong>',
+					get_theme_support('custom-header', 'height')
 				)
 			);
 	}
-	if ( current_theme_supports( 'custom-header', 'flex-height' ) || current_theme_supports( 'custom-header', 'flex-width' ) ) {
-		if ( current_theme_supports( 'custom-header', 'width' ) )
+	if (current_theme_supports('custom-header', 'flex-height') || current_theme_supports('custom-header', 'flex-width')) {
+		if (current_theme_supports('custom-header', 'width'))
 			printf(
 				/* translators: %s: size in pixels */
-				__( 'Suggested width is %s.' ) . ' ',
+				__('Suggested width is %s.').' ',
 				sprintf(
 					/* translators: %d: custom header width */
-					'<strong>' . __( '%d pixels' ) . '</strong>',
-					get_theme_support( 'custom-header', 'width' )
+					'<strong>'.__('%d pixels').'</strong>',
+					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.' ) . ' ',
+				__('Suggested height is %s.').' ',
 				sprintf(
 					/* translators: %d: custom header height */
-					'<strong>' . __( '%d pixels' ) . '</strong>',
-					get_theme_support( 'custom-header', 'height' )
+					'<strong>'.__('%d pixels').'</strong>',
+					get_theme_support('custom-header', 'height')
 				)
 			);
 	}
 	?></p>
-	<form enctype="multipart/form-data" id="upload-form" class="wp-upload-form" method="post" action="<?php echo esc_url( add_query_arg( 'step', 2 ) ) ?>">
+	<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 />
+		<label for="upload"><?php _e('Choose an image from your computer:'); ?></label><br />
 		<input type="file" id="upload" name="import" />
 		<input type="hidden" name="action" value="save" />
-		<?php wp_nonce_field( 'custom-header-upload', '_wpnonce-custom-header-upload' ); ?>
-		<?php submit_button( __( 'Upload' ), 'button', 'submit', false ); ?>
+		<?php wp_nonce_field('custom-header-upload', '_wpnonce-custom-header-upload'); ?>
+		<?php submit_button(__('Upload'), 'button', 'submit', false); ?>
 	</p>
 	<?php
-		$modal_update_href = esc_url( add_query_arg( array(
+		$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') ) );
+		), admin_url('themes.php')));
 	?>
 	<p>
-		<label for="choose-from-library-link"><?php _e( 'Or choose an image from your media library:' ); ?></label><br />
+		<label for="choose-from-library-link"><?php _e('Or choose an image from your media library:'); ?></label><br />
 		<button id="choose-from-library-link" class="button"
-			data-update-link="<?php echo esc_attr( $modal_update_href ); ?>"
-			data-choose="<?php esc_attr_e( 'Choose a Custom Header' ); ?>"
-			data-update="<?php esc_attr_e( 'Set as header' ); ?>"><?php _e( 'Choose Image' ); ?></button>
+			data-update-link="<?php echo esc_attr($modal_update_href); ?>"
+			data-choose="<?php esc_attr_e('Choose a Custom Header'); ?>"
+			data-update="<?php esc_attr_e('Set as header'); ?>"><?php _e('Choose Image'); ?></button>
 	</p>
 	</form>
 </td>
@@ -599,97 +599,97 @@ 
 </tbody>
 </table>
 
-<form method="post" action="<?php echo esc_url( add_query_arg( 'step', 1 ) ) ?>">
-<?php submit_button( null, 'screen-reader-text', 'save-header-options', false ); ?>
+<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>
-	<?php if ( get_uploaded_header_images() ) : ?>
+	<?php if (get_uploaded_header_images()) : ?>
 <tr>
-<th scope="row"><?php _e( 'Uploaded Images' ); ?></th>
+<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' );
+		$this->show_header_selector('uploaded');
 	?>
 </td>
 </tr>
 	<?php endif;
-	if ( ! empty( $this->default_headers ) ) : ?>
+	if ( ! empty($this->default_headers)) : ?>
 <tr>
-<th scope="row"><?php _e( 'Default Images' ); ?></th>
+<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 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('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() ) : ?>
+	if (get_header_image()) : ?>
 <tr>
-<th scope="row"><?php _e( 'Remove Image' ); ?></th>
+<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>
-	<?php submit_button( __( 'Remove Header Image' ), 'button', 'removeheader', false ); ?>
+	<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'), 'button', 'removeheader', false); ?>
 </td>
 </tr>
 	<?php endif;
 
-	$default_image = get_theme_support( 'custom-header', 'default-image' );
-	if ( $default_image && get_header_image() != $default_image ) : ?>
+	$default_image = get_theme_support('custom-header', 'default-image');
+	if ($default_image && get_header_image() != $default_image) : ?>
 <tr>
-<th scope="row"><?php _e( 'Reset Image' ); ?></th>
+<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>
-	<?php submit_button( __( 'Restore Original Header Image' ), 'button', 'resetheader', false ); ?>
+	<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'), 'button', 'resetheader', false); ?>
 </td>
 </tr>
 	<?php endif; ?>
 </tbody>
 </table>
 
-<?php if ( current_theme_supports( 'custom-header', 'header-text' ) ) : ?>
+<?php if (current_theme_supports('custom-header', 'header-text')) : ?>
 
-<h3><?php _e( 'Header Text' ); ?></h3>
+<h3><?php _e('Header Text'); ?></h3>
 
 <table class="form-table">
 <tbody>
 <tr>
-<th scope="row"><?php _e( 'Header Text' ); ?></th>
+<th scope="row"><?php _e('Header Text'); ?></th>
 <td>
 	<p>
-	<label><input type="checkbox" name="display-header-text" id="display-header-text"<?php checked( display_header_text() ); ?> /> <?php _e( 'Show header text with your image.' ); ?></label>
+	<label><input type="checkbox" name="display-header-text" id="display-header-text"<?php checked(display_header_text()); ?> /> <?php _e('Show header text with your image.'); ?></label>
 	</p>
 </td>
 </tr>
 
 <tr class="displaying-header-text">
-<th scope="row"><?php _e( 'Text Color' ); ?></th>
+<th scope="row"><?php _e('Text Color'); ?></th>
 <td>
 	<p>
 	<?php
 	$default_color = '';
-	if ( current_theme_supports( 'custom-header', 'default-text-color' ) ) {
-		$default_color = get_theme_support( 'custom-header', 'default-text-color' );
-		if ( $default_color && false === strpos( $default_color, '#' ) ) {
-			$default_color = '#' . $default_color;
+	if (current_theme_supports('custom-header', 'default-text-color')) {
+		$default_color = get_theme_support('custom-header', 'default-text-color');
+		if ($default_color && false === strpos($default_color, '#')) {
+			$default_color = '#'.$default_color;
 		}
 	}
 
-	$default_color_attr = $default_color ? ' data-default-color="' . esc_attr( $default_color ) . '"' : '';
+	$default_color_attr = $default_color ? ' data-default-color="'.esc_attr($default_color).'"' : '';
 
-	$header_textcolor = display_header_text() ? get_header_textcolor() : get_theme_support( 'custom-header', 'default-text-color' );
-	if ( $header_textcolor && false === strpos( $header_textcolor, '#' ) ) {
-		$header_textcolor = '#' . $header_textcolor;
+	$header_textcolor = display_header_text() ? get_header_textcolor() : get_theme_support('custom-header', 'default-text-color');
+	if ($header_textcolor && false === strpos($header_textcolor, '#')) {
+		$header_textcolor = '#'.$header_textcolor;
 	}
 
-	echo '<input type="text" name="text-color" id="text-color" value="' . esc_attr( $header_textcolor ) . '"' . $default_color_attr . ' />';
-	if ( $default_color ) {
-		echo ' <span class="description hide-if-js">' . sprintf( _x( 'Default: %s', 'color' ), esc_html( $default_color ) ) . '</span>';
+	echo '<input type="text" name="text-color" id="text-color" value="'.esc_attr($header_textcolor).'"'.$default_color_attr.' />';
+	if ($default_color) {
+		echo ' <span class="description hide-if-js">'.sprintf(_x('Default: %s', 'color'), esc_html($default_color)).'</span>';
 	}
 	?>
 	</p>
@@ -704,11 +704,11 @@ 
  *
  * @since 3.1.0
  */
-do_action( 'custom_header_options' );
+do_action('custom_header_options');
 
-wp_nonce_field( 'custom-header-options', '_wpnonce-custom-header-options' ); ?>
+wp_nonce_field('custom-header-options', '_wpnonce-custom-header-options'); ?>
 
-<?php submit_button( null, 'primary', 'save-header-options' ); ?>
+<?php submit_button(null, 'primary', 'save-header-options'); ?>
 </form>
 </div>
 
@@ -721,53 +721,53 @@ 
 	 */
 	public function step_2() {
 		check_admin_referer('custom-header-upload', '_wpnonce-custom-header-upload');
-		if ( ! current_theme_supports( 'custom-header', 'uploads' ) ) {
+		if ( ! current_theme_supports('custom-header', 'uploads')) {
 			wp_die(
-				'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-				'<p>' . __( 'The current theme does not support uploading a custom header image.' ) . '</p>',
+				'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+				'<p>'.__('The current theme does not support uploading a custom header image.').'</p>',
 				403
 			);
 		}
 
-		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' );
+		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];
-		} elseif ( isset( $_POST ) ) {
+		} elseif (isset($_POST)) {
 			$data = $this->step_2_manage_upload();
 			$attachment_id = $data['attachment_id'];
 			$file = $data['file'];
 			$url = $data['url'];
 		}
 
-		if ( file_exists( $file ) ) {
-			list( $width, $height, $type, $attr ) = getimagesize( $file );
+		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;
-			unset( $data );
+			$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' ) )
-			$max_width = max( $max_width, get_theme_support( 'custom-header', 'max-width' ) );
-		$max_width = max( $max_width, get_theme_support( 'custom-header', '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' ) )
+		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'))
 		{
 			// Add the meta-data
-			if ( file_exists( $file ) )
-				wp_update_attachment_metadata( $attachment_id, wp_generate_attachment_metadata( $attachment_id, $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' ) );
+			$this->set_header_image(compact('url', 'attachment_id', 'width', 'height'));
 
 			/**
 			 * Fires after the header image is set or an error is returned.
@@ -777,17 +777,17 @@ 
 			 * @param string $file          Path to the file.
 			 * @param int    $attachment_id Attachment ID.
 			 */
-			do_action( 'wp_create_file_in_uploads', $file, $attachment_id ); // For replication
+			do_action('wp_create_file_in_uploads', $file, $attachment_id); // For replication
 
 			return $this->finished();
-		} elseif ( $width > $max_width ) {
+		} 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 ) )
-				wp_die( __( 'Image could not be processed. Please go back and try again.' ), __( 'Image Processing Error' ) );
+			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
+			$image = apply_filters('wp_create_file_in_uploads', $image, $attachment_id); // For replication
 
 			$url = str_replace(basename($url), basename($image), $url);
 			$width = $width / $oitar;
@@ -798,32 +798,32 @@ 
 		?>
 
 <div class="wrap">
-<h1><?php _e( 'Crop Header Image' ); ?></h1>
+<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>
+	<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="" />
+		<img src="<?php echo esc_url($url); ?>" id="upload" width="<?php echo $width; ?>" height="<?php echo $height; ?>" alt="" />
 	</div>
 
 	<input type="hidden" name="x1" id="x1" value="0"/>
 	<input type="hidden" name="y1" id="y1" value="0"/>
-	<input type="hidden" name="width" id="width" value="<?php echo esc_attr( $width ); ?>"/>
-	<input type="hidden" name="height" id="height" value="<?php echo esc_attr( $height ); ?>"/>
-	<input type="hidden" name="attachment_id" id="attachment_id" value="<?php echo esc_attr( $attachment_id ); ?>" />
-	<input type="hidden" name="oitar" id="oitar" value="<?php echo esc_attr( $oitar ); ?>" />
-	<?php if ( empty( $_POST ) && isset( $_GET['file'] ) ) { ?>
+	<input type="hidden" name="width" id="width" value="<?php echo esc_attr($width); ?>"/>
+	<input type="hidden" name="height" id="height" value="<?php echo esc_attr($height); ?>"/>
+	<input type="hidden" name="attachment_id" id="attachment_id" value="<?php echo esc_attr($attachment_id); ?>" />
+	<input type="hidden" name="oitar" id="oitar" value="<?php echo esc_attr($oitar); ?>" />
+	<?php if (empty($_POST) && isset($_GET['file'])) { ?>
 	<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 submit_button(__('Crop and Publish'), 'primary', 'submit', false); ?>
 	<?php
-	if ( isset( $oitar ) && 1 == $oitar && ( current_theme_supports( 'custom-header', 'flex-height' ) || current_theme_supports( 'custom-header', 'flex-width' ) ) )
-		submit_button( __( 'Skip Cropping, Publish Image as Is' ), 'secondary', 'skip-cropping', false );
+	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'), 'secondary', 'skip-cropping', false);
 	?>
 	</p>
 </form>
@@ -841,14 +841,14 @@ 
 		$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_die( __( 'The uploaded file is not a valid image. Please try again.' ) );
+		$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);
 
-		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'];
@@ -865,8 +865,8 @@ 
 		);
 
 		// Save the data
-		$attachment_id = wp_insert_attachment( $object, $file );
-		return compact( 'attachment_id', 'file', 'filename', 'url', 'type' );
+		$attachment_id = wp_insert_attachment($object, $file);
+		return compact('attachment_id', 'file', 'filename', 'url', 'type');
 	}
 
 	/**
@@ -877,73 +877,73 @@ 
 	 *              for retrieving the header image URL.
 	 */
 	public function step_3() {
-		check_admin_referer( 'custom-header-crop-image' );
+		check_admin_referer('custom-header-crop-image');
 
-		if ( ! current_theme_supports( 'custom-header', 'uploads' ) ) {
+		if ( ! current_theme_supports('custom-header', 'uploads')) {
 			wp_die(
-				'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-				'<p>' . __( 'The current theme does not support uploading a custom header image.' ) . '</p>',
+				'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+				'<p>'.__('The current theme does not support uploading a custom header image.').'</p>',
 				403
 			);
 		}
 
-		if ( ! empty( $_POST['skip-cropping'] ) && ! ( current_theme_supports( 'custom-header', 'flex-height' ) || current_theme_supports( 'custom-header', 'flex-width' ) ) ) {
+		if ( ! empty($_POST['skip-cropping']) && ! (current_theme_supports('custom-header', 'flex-height') || current_theme_supports('custom-header', 'flex-width'))) {
 			wp_die(
-				'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-				'<p>' . __( 'The current theme does not support a flexible sized header image.' ) . '</p>',
+				'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+				'<p>'.__('The current theme does not support a flexible sized header image.').'</p>',
 				403
 			);
 		}
 
-		if ( $_POST['oitar'] > 1 ) {
+		if ($_POST['oitar'] > 1) {
 			$_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'] );
+		$attachment_id = absint($_POST['attachment_id']);
 		$original = get_attached_file($attachment_id);
 
-		$dimensions = $this->get_header_dimensions( array(
+		$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'] ) )
-			$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'] ) )
-			$cropped = _copy_image_file( $attachment_id );
+		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']))
+			$cropped = _copy_image_file($attachment_id);
 		else
-			$cropped = get_attached_file( $attachment_id );
+			$cropped = get_attached_file($attachment_id);
 
-		if ( ! $cropped || is_wp_error( $cropped ) )
-			wp_die( __( 'Image could not be processed. Please go back and try again.' ), __( 'Image Processing Error' ) );
+		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
+		$cropped = apply_filters('wp_create_file_in_uploads', $cropped, $attachment_id); // For replication
 
-		$object = $this->create_attachment_object( $cropped, $attachment_id );
+		$object = $this->create_attachment_object($cropped, $attachment_id);
 
-		if ( ! empty( $_POST['create-new-attachment'] ) )
-			unset( $object['ID'] );
+		if ( ! empty($_POST['create-new-attachment']))
+			unset($object['ID']);
 
 		// Update the attachment
-		$attachment_id = $this->insert_attachment( $object, $cropped );
+		$attachment_id = $this->insert_attachment($object, $cropped);
 
-		$url = wp_get_attachment_url( $attachment_id );
-		$this->set_header_image( compact( 'url', 'attachment_id', 'width', 'height' ) );
+		$url = wp_get_attachment_url($attachment_id);
+		$this->set_header_image(compact('url', 'attachment_id', 'width', 'height'));
 
 		// Cleanup.
-		$medium = str_replace( basename( $original ), 'midsize-' . basename( $original ), $original );
-		if ( file_exists( $medium ) ) {
-			wp_delete_file( $medium );
+		$medium = str_replace(basename($original), 'midsize-'.basename($original), $original);
+		if (file_exists($medium)) {
+			wp_delete_file($medium);
 		}
 
-		if ( empty( $_POST['create-new-attachment'] ) && empty( $_POST['skip-cropping'] ) ) {
-			wp_delete_file( $original );
+		if (empty($_POST['create-new-attachment']) && empty($_POST['skip-cropping'])) {
+			wp_delete_file($original);
 		}
 
 		return $this->finished();
@@ -965,12 +965,12 @@ 
 	 * @since 2.1.0
 	 */
 	public function admin_page() {
-		if ( ! current_user_can('edit_theme_options') )
+		if ( ! current_user_can('edit_theme_options'))
 			wp_die(__('You do not have permission 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
 			$this->step_1();
@@ -984,7 +984,7 @@ 
 	 * @param array $form_fields
 	 * @return array $form_fields
 	 */
-	public function attachment_fields_to_edit( $form_fields ) {
+	public function attachment_fields_to_edit($form_fields) {
 		return $form_fields;
 	}
 
@@ -996,7 +996,7 @@ 
 	 * @param array $tabs
 	 * @return array $tabs
 	 */
-	public function filter_upload_tabs( $tabs ) {
+	public function filter_upload_tabs($tabs) {
 		return $tabs;
 	}
 
@@ -1012,13 +1012,13 @@ 
 	 * 	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 ) ) {
+	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'] );
+			$choice['url'] = esc_url_raw($choice['url']);
 
 			$header_image_data = (object) array(
 				'attachment_id' => $choice['attachment_id'],
@@ -1028,32 +1028,32 @@ 
 				'width'         => $choice['width'],
 			);
 
-			update_post_meta( $choice['attachment_id'], '_wp_attachment_is_custom_header', get_stylesheet() );
-			set_theme_mod( 'header_image', $choice['url'] );
-			set_theme_mod( 'header_image_data', $header_image_data );
+			update_post_meta($choice['attachment_id'], '_wp_attachment_is_custom_header', get_stylesheet());
+			set_theme_mod('header_image', $choice['url']);
+			set_theme_mod('header_image_data', $header_image_data);
 			return;
 		}
 
-		if ( in_array( $choice, array( 'remove-header', 'random-default-image', 'random-uploaded-image' ) ) ) {
-			set_theme_mod( 'header_image', $choice );
-			remove_theme_mod( 'header_image_data' );
+		if (in_array($choice, array('remove-header', 'random-default-image', 'random-uploaded-image'))) {
+			set_theme_mod('header_image', $choice);
+			remove_theme_mod('header_image_data');
 			return;
 		}
 
 		$uploaded = get_uploaded_header_images();
-		if ( $uploaded && isset( $uploaded[ $choice ] ) ) {
-			$header_image_data = $uploaded[ $choice ];
+		if ($uploaded && isset($uploaded[$choice])) {
+			$header_image_data = $uploaded[$choice];
 
 		} else {
 			$this->process_default_headers();
-			if ( isset( $this->default_headers[ $choice ] ) )
-				$header_image_data = $this->default_headers[ $choice ];
+			if (isset($this->default_headers[$choice]))
+				$header_image_data = $this->default_headers[$choice];
 			else
 				return;
 		}
 
-		set_theme_mod( 'header_image', esc_url_raw( $header_image_data['url'] ) );
-		set_theme_mod( 'header_image_data', $header_image_data );
+		set_theme_mod('header_image', esc_url_raw($header_image_data['url']));
+		set_theme_mod('header_image_data', $header_image_data);
 	}
 
 	/**
@@ -1062,7 +1062,7 @@ 
 	 * @since 3.4.0
 	 */
 	final public function remove_header_image() {
-		$this->set_header_image( 'remove-header' );
+		$this->set_header_image('remove-header');
 	}
 
 	/**
@@ -1074,24 +1074,24 @@ 
 	 */
 	final public function reset_header_image() {
 		$this->process_default_headers();
-		$default = get_theme_support( 'custom-header', 'default-image' );
+		$default = get_theme_support('custom-header', 'default-image');
 
-		if ( ! $default ) {
+		if ( ! $default) {
 			$this->remove_header_image();
 			return;
 		}
-		$default = sprintf( $default, get_template_directory_uri(), get_stylesheet_directory_uri() );
+		$default = sprintf($default, get_template_directory_uri(), get_stylesheet_directory_uri());
 
 		$default_data = array();
-		foreach ( $this->default_headers as $header => $details ) {
-			if ( $details['url'] == $default ) {
+		foreach ($this->default_headers as $header => $details) {
+			if ($details['url'] == $default) {
 				$default_data = $details;
 				break;
 			}
 		}
 
-		set_theme_mod( 'header_image', $default );
-		set_theme_mod( 'header_image_data', (object) $default_data );
+		set_theme_mod('header_image', $default);
+		set_theme_mod('header_image_data', (object) $default_data);
 	}
 
 	/**
@@ -1100,41 +1100,41 @@ 
 	 * @param array $dimensions
 	 * @return array dst_height and dst_width of header image.
 	 */
-	final public function get_header_dimensions( $dimensions ) {
+	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' );
-		$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 );
+		$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);
 
 		// For flex, limit size of image displayed to 1500px unless theme says otherwise
-		if ( $has_flex_width ) {
+		if ($has_flex_width) {
 			$max_width = 1500;
 		}
 
-		if ( $has_max_width ) {
-			$max_width = max( $max_width, get_theme_support( 'custom-header', 'max-width' ) );
+		if ($has_max_width) {
+			$max_width = max($max_width, get_theme_support('custom-header', 'max-width'));
 		}
-		$max_width = max( $max_width, $theme_width );
+		$max_width = max($max_width, $theme_width);
 
-		if ( $has_flex_height && ( ! $has_flex_width || $width > $max_width ) ) {
-			$dst['dst_height'] = absint( $height * ( $max_width / $width ) );
+		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 {
 			$dst['dst_height'] = $theme_height;
 		}
 
-		if ( $has_flex_width && ( ! $has_flex_height || $width > $max_width ) ) {
-			$dst['dst_width'] = absint( $width * ( $max_width / $width ) );
+		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 {
@@ -1152,13 +1152,13 @@ 
 	 *
 	 * @return array Attachment object.
 	 */
-	final public function create_attachment_object( $cropped, $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 );
+	final public function create_attachment_object($cropped, $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);
 
-		$size = @getimagesize( $cropped );
-		$image_type = ( $size ) ? $size['mime'] : 'image/jpeg';
+		$size = @getimagesize($cropped);
+		$image_type = ($size) ? $size['mime'] : 'image/jpeg';
 
 		$object = array(
 			'ID' => $parent_attachment_id,
@@ -1179,9 +1179,9 @@ 
 	 *
 	 * @return int Attachment ID.
 	 */
-	final public function insert_attachment( $object, $cropped ) {
-		$attachment_id = wp_insert_attachment( $object, $cropped );
-		$metadata = wp_generate_attachment_metadata( $attachment_id, $cropped );
+	final public function insert_attachment($object, $cropped) {
+		$attachment_id = wp_insert_attachment($object, $cropped);
+		$metadata = wp_generate_attachment_metadata($attachment_id, $cropped);
 		/**
 		 * Filter the header image attachment metadata.
 		 *
@@ -1191,8 +1191,8 @@ 
 		 *
 		 * @param array $metadata Attachment metadata.
 		 */
-		$metadata = apply_filters( 'wp_header_image_attachment_metadata', $metadata );
-		wp_update_attachment_metadata( $attachment_id, $metadata );
+		$metadata = apply_filters('wp_header_image_attachment_metadata', $metadata);
+		wp_update_attachment_metadata($attachment_id, $metadata);
 		return $attachment_id;
 	}
 
@@ -1201,24 +1201,24 @@ 
 	 * new object. Returns JSON-encoded object details.
 	 */
 	public function ajax_header_crop() {
-		check_ajax_referer( 'image_editor-' . $_POST['id'], 'nonce' );
+		check_ajax_referer('image_editor-'.$_POST['id'], 'nonce');
 
-		if ( ! current_user_can( 'edit_theme_options' ) ) {
+		if ( ! current_user_can('edit_theme_options')) {
 			wp_send_json_error();
 		}
 
-		if ( ! current_theme_supports( 'custom-header', 'uploads' ) ) {
+		if ( ! current_theme_supports('custom-header', 'uploads')) {
 			wp_send_json_error();
 		}
 
 		$crop_details = $_POST['cropDetails'];
 
-		$dimensions = $this->get_header_dimensions( array(
+		$dimensions = $this->get_header_dimensions(array(
 			'height' => $crop_details['height'],
 			'width'  => $crop_details['width'],
-		) );
+		));
 
-		$attachment_id = absint( $_POST['id'] );
+		$attachment_id = absint($_POST['id']);
 
 		$cropped = wp_crop_image(
 			$attachment_id,
@@ -1230,25 +1230,25 @@ 
 			(int) $dimensions['dst_height']
 		);
 
-		if ( ! $cropped || is_wp_error( $cropped ) ) {
-			wp_send_json_error( array( 'message' => __( 'Image could not be processed. Please go back and try again.' ) ) );
+		if ( ! $cropped || is_wp_error($cropped)) {
+			wp_send_json_error(array('message' => __('Image could not be processed. Please go back and try again.')));
 		}
 
 		/** This filter is documented in wp-admin/custom-header.php */
-		$cropped = apply_filters( 'wp_create_file_in_uploads', $cropped, $attachment_id ); // For replication
+		$cropped = apply_filters('wp_create_file_in_uploads', $cropped, $attachment_id); // For replication
 
-		$object = $this->create_attachment_object( $cropped, $attachment_id );
+		$object = $this->create_attachment_object($cropped, $attachment_id);
 
-		unset( $object['ID'] );
+		unset($object['ID']);
 
-		$new_attachment_id = $this->insert_attachment( $object, $cropped );
+		$new_attachment_id = $this->insert_attachment($object, $cropped);
 
 		$object['attachment_id'] = $new_attachment_id;
-		$object['url']           = wp_get_attachment_url( $new_attachment_id );;
+		$object['url']           = wp_get_attachment_url($new_attachment_id); ;
 		$object['width']         = $dimensions['dst_width'];
 		$object['height']        = $dimensions['dst_height'];
 
-		wp_send_json_success( $object );
+		wp_send_json_success($object);
 	}
 
 	/**
@@ -1259,20 +1259,20 @@ 
 	 * Media Manager, even if s/he doesn't save that change.
 	 */
 	public function ajax_header_add() {
-		check_ajax_referer( 'header-add', 'nonce' );
+		check_ajax_referer('header-add', 'nonce');
 
-		if ( ! current_user_can( 'edit_theme_options' ) ) {
+		if ( ! current_user_can('edit_theme_options')) {
 			wp_send_json_error();
 		}
 
-		$attachment_id = absint( $_POST['attachment_id'] );
-		if ( $attachment_id < 1 ) {
+		$attachment_id = absint($_POST['attachment_id']);
+		if ($attachment_id < 1) {
 			wp_send_json_error();
 		}
 
-		$key = '_wp_attachment_custom_header_last_used_' . get_stylesheet();
-		update_post_meta( $attachment_id, $key, time() );
-		update_post_meta( $attachment_id, '_wp_attachment_is_custom_header', get_stylesheet() );
+		$key = '_wp_attachment_custom_header_last_used_'.get_stylesheet();
+		update_post_meta($attachment_id, $key, time());
+		update_post_meta($attachment_id, '_wp_attachment_is_custom_header', get_stylesheet());
 
 		wp_send_json_success();
 	}
@@ -1285,20 +1285,20 @@ 
 	 * choice in the Customizer's Header tool.
 	 */
 	public function ajax_header_remove() {
-		check_ajax_referer( 'header-remove', 'nonce' );
+		check_ajax_referer('header-remove', 'nonce');
 
-		if ( ! current_user_can( 'edit_theme_options' ) ) {
+		if ( ! current_user_can('edit_theme_options')) {
 			wp_send_json_error();
 		}
 
-		$attachment_id = absint( $_POST['attachment_id'] );
-		if ( $attachment_id < 1 ) {
+		$attachment_id = absint($_POST['attachment_id']);
+		if ($attachment_id < 1) {
 			wp_send_json_error();
 		}
 
-		$key = '_wp_attachment_custom_header_last_used_' . get_stylesheet();
-		delete_post_meta( $attachment_id, $key );
-		delete_post_meta( $attachment_id, '_wp_attachment_is_custom_header', get_stylesheet() );
+		$key = '_wp_attachment_custom_header_last_used_'.get_stylesheet();
+		delete_post_meta($attachment_id, $key);
+		delete_post_meta($attachment_id, '_wp_attachment_is_custom_header', get_stylesheet());
 
 		wp_send_json_success();
 	}
@@ -1307,16 +1307,16 @@ 
 	 *
 	 * @param WP_Customize_Manager $wp_customize
 	 */
-	public function customize_set_last_used( $wp_customize ) {
-		$data = $wp_customize->get_setting( 'header_image_data' )->post_value();
+	public function customize_set_last_used($wp_customize) {
+		$data = $wp_customize->get_setting('header_image_data')->post_value();
 
-		if ( ! isset( $data['attachment_id'] ) ) {
+		if ( ! isset($data['attachment_id'])) {
 			return;
 		}
 
 		$attachment_id = $data['attachment_id'];
-		$key = '_wp_attachment_custom_header_last_used_' . get_stylesheet();
-		update_post_meta( $attachment_id, $key, time() );
+		$key = '_wp_attachment_custom_header_last_used_'.get_stylesheet();
+		update_post_meta($attachment_id, $key, time());
 	}
 
 	/**
@@ -1327,23 +1327,23 @@ 
 		$this->process_default_headers();
 
 		// Get the default image if there is one.
-		$default = get_theme_support( 'custom-header', 'default-image' );
+		$default = get_theme_support('custom-header', 'default-image');
 
-		if ( ! $default ) { // If not,
+		if ( ! $default) { // If not,
 			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 ) {
-			if ( $h['url'] === $default ) {
+		foreach ($this->default_headers as $k => $h) {
+			if ($h['url'] === $default) {
 				$already_has_default = true;
 				break;
 			}
 		}
 
-		if ( $already_has_default ) {
+		if ($already_has_default) {
 			return $this->default_headers;
 		}
 
@@ -1356,7 +1356,7 @@ 
 		);
 
 		// The rest of the set comes after.
-		return array_merge( $header_images, $this->default_headers );
+		return array_merge($header_images, $this->default_headers);
 	}
 
 	/**
@@ -1365,13 +1365,13 @@ 
 	 */
 	public function get_uploaded_header_images() {
 		$header_images = get_uploaded_header_images();
-		$timestamp_key = '_wp_attachment_custom_header_last_used_' . get_stylesheet();
+		$timestamp_key = '_wp_attachment_custom_header_last_used_'.get_stylesheet();
 		$alt_text_key = '_wp_attachment_image_alt';
 
-		foreach ( $header_images as &$header_image ) {
-			$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 ] : '';
+		foreach ($header_images as &$header_image) {
+			$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] : '';
 		}
 
 		return $header_images;

Braces +121 added lines, -91 removed lines

@@ -137,15 +137,17 @@ 
 	 * @return int Current step
 	 */
 	public function step() {
-		if ( ! isset( $_GET['step'] ) )
-			return 1;
+		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 1;
+		}
 
 		return $step;
 	}
@@ -161,8 +163,9 @@ 
 		if ( ( 1 == $step || 3 == $step ) ) {
 			wp_enqueue_media();
 			wp_enqueue_script( 'custom-header' );
-			if ( current_theme_supports( 'custom-header', 'header-text' ) )
-				wp_enqueue_script( 'wp-color-picker' );
+			if ( current_theme_supports( 'custom-header', 'header-text' ) ) {
+							wp_enqueue_script( 'wp-color-picker' );
+			}
 		} elseif ( 2 == $step ) {
 			wp_enqueue_script('imgareaselect');
 		}
@@ -176,10 +179,11 @@ 
 	public function css_includes() {
 		$step = $this->step();
 
-		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');
+		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');
+		}
 	}
 
 	/**
@@ -188,11 +192,13 @@ 
 	 * @since 2.6.0
 	 */
 	public function take_action() {
-		if ( ! current_user_can('edit_theme_options') )
-			return;
+		if ( ! current_user_can('edit_theme_options') ) {
+					return;
+		}
 
-		if ( empty( $_POST ) )
-			return;
+		if ( empty( $_POST ) ) {
+					return;
+		}
 
 		$this->updated = true;
 
@@ -215,10 +221,11 @@ 
 			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 )
-				set_theme_mod( 'header_textcolor', 'blank' );
+			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'] ) ) {
@@ -238,8 +245,9 @@ 
 	public function process_default_headers() {
 		global $_wp_default_headers;
 
-		if ( !isset($_wp_default_headers) )
-			return;
+		if ( !isset($_wp_default_headers) ) {
+					return;
+		}
 
 		if ( ! empty( $this->default_headers ) ) {
 			return;
@@ -289,8 +297,9 @@ 
 			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'] ) )
-				$width = ' width="230"';
+			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 '</div>';
 		}
@@ -304,10 +313,11 @@ 
 	 */
 	public function js() {
 		$step = $this->step();
-		if ( ( 1 == $step || 3 == $step ) && current_theme_supports( 'custom-header', 'header-text' ) )
-			$this->js_1();
-		elseif ( 2 == $step )
-			$this->js_2();
+		if ( ( 1 == $step || 3 == $step ) && current_theme_supports( 'custom-header', 'header-text' ) ) {
+					$this->js_1();
+		} elseif ( 2 == $step ) {
+					$this->js_2();
+		}
 	}
 
 	/**
@@ -492,21 +502,24 @@ 
 
 		if ( $header_image ) {
 			$header_image_style = 'background-image:url(' . esc_url( $header_image ) . ');';
-		}  else {
+		} else {
 			$header_image_style = '';
 		}
 
-		if ( $custom_header->width )
-			$header_image_style .= 'max-width:' . $custom_header->width . 'px;';
-		if ( $custom_header->height )
-			$header_image_style .= 'height:' . $custom_header->height . 'px;';
+		if ( $custom_header->width ) {
+					$header_image_style .= 'max-width:' . $custom_header->width . 'px;';
+		}
+		if ( $custom_header->height ) {
+					$header_image_style .= 'height:' . $custom_header->height . 'px;';
+		}
 	?>
 	<div id="headimg" style="<?php echo $header_image_style; ?>">
 		<?php
-		if ( display_header_text() )
-			$style = ' style="color:#' . get_header_textcolor() . ';"';
-		else
-			$style = ' style="display:none;"';
+		if ( display_header_text() ) {
+					$style = ' style="color:#' . get_header_textcolor() . ';"';
+		} else {
+					$style = ' style="display:none;"';
+		}
 		?>
 		<h1><a id="name" class="displaying-header-text" <?php echo $style; ?> onclick="return false;" href="<?php bloginfo('url'); ?>" tabindex="-1"><?php bloginfo( 'name' ); ?></a></h1>
 		<div id="desc" class="displaying-header-text" <?php echo $style; ?>><?php bloginfo( 'description' ); ?></div>
@@ -525,8 +538,8 @@ 
 	if ( ! current_theme_supports( 'custom-header', 'flex-height' ) && ! current_theme_supports( 'custom-header', 'flex-width' ) ) {
 		printf( __( 'Images of exactly <strong>%1$d &times; %2$d pixels</strong> will be used as-is.' ) . '<br />', get_theme_support( 'custom-header', 'width' ), get_theme_support( 'custom-header', 'height' ) );
 	} elseif ( current_theme_supports( 'custom-header', 'flex-height' ) ) {
-		if ( ! current_theme_supports( 'custom-header', 'flex-width' ) )
-			printf(
+		if ( ! current_theme_supports( 'custom-header', 'flex-width' ) ) {
+					printf(
 				/* translators: %s: size in pixels */
 				__( 'Images should be at least %s wide.' ) . ' ',
 				sprintf(
@@ -535,9 +548,10 @@ 
 					get_theme_support( 'custom-header', 'width' )
 				)
 			);
+		}
 	} elseif ( current_theme_supports( 'custom-header', 'flex-width' ) ) {
-		if ( ! current_theme_supports( 'custom-header', 'flex-height' ) )
-			printf(
+		if ( ! current_theme_supports( 'custom-header', 'flex-height' ) ) {
+					printf(
 				/* translators: %s: size in pixels */
 				__( 'Images should be at least %s tall.' ) . ' ',
 				sprintf(
@@ -546,10 +560,11 @@ 
 					get_theme_support( 'custom-header', 'height' )
 				)
 			);
+		}
 	}
 	if ( current_theme_supports( 'custom-header', 'flex-height' ) || current_theme_supports( 'custom-header', 'flex-width' ) ) {
-		if ( current_theme_supports( 'custom-header', 'width' ) )
-			printf(
+		if ( current_theme_supports( 'custom-header', 'width' ) ) {
+					printf(
 				/* translators: %s: size in pixels */
 				__( 'Suggested width is %s.' ) . ' ',
 				sprintf(
@@ -558,8 +573,9 @@ 
 					get_theme_support( 'custom-header', 'width' )
 				)
 			);
-		if ( current_theme_supports( 'custom-header', 'height' ) )
-			printf(
+		}
+		if ( current_theme_supports( 'custom-header', 'height' ) ) {
+					printf(
 				/* translators: %s: size in pixels */
 				__( 'Suggested height is %s.' ) . ' ',
 				sprintf(
@@ -568,6 +584,7 @@ 
 					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 ) ) ?>">
@@ -620,9 +637,12 @@ 
 <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: ?>
+<?php else {
+	: ?>
 	<p><?php _e( 'You can use one of these cool headers or show a random one on each page.' ) ?></p>
-<?php endif; ?>
+<?php endif;
+}
+?>
 	<?php
 		$this->show_header_selector( 'default' );
 	?>
@@ -752,11 +772,13 @@ 
 
 		$max_width = 0;
 		// For flex, limit size of image displayed to 1500px unless theme says otherwise
-		if ( current_theme_supports( 'custom-header', 'flex-width' ) )
-			$max_width = 1500;
+		if ( current_theme_supports( 'custom-header', 'flex-width' ) ) {
+					$max_width = 1500;
+		}
 
-		if ( current_theme_supports( 'custom-header', 'max-width' ) )
-			$max_width = max( $max_width, get_theme_support( '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
@@ -764,8 +786,9 @@ 
 			&& $width == get_theme_support( 'custom-header', 'width' ) && $height == get_theme_support( 'custom-header', 'height' ) )
 		{
 			// Add the meta-data
-			if ( file_exists( $file ) )
-				wp_update_attachment_metadata( $attachment_id, wp_generate_attachment_metadata( $attachment_id, $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' ) );
 
@@ -783,8 +806,9 @@ 
 		} 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 ) )
-				wp_die( __( 'Image could not be processed. Please go back and try again.' ), __( 'Image Processing Error' ) );
+			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
@@ -822,8 +846,9 @@ 
 	<p class="submit">
 	<?php submit_button( __( 'Crop and Publish' ), 'primary', 'submit', false ); ?>
 	<?php
-	if ( isset( $oitar ) && 1 == $oitar && ( current_theme_supports( 'custom-header', 'flex-height' ) || current_theme_supports( 'custom-header', 'flex-width' ) ) )
-		submit_button( __( 'Skip Cropping, Publish Image as Is' ), 'secondary', 'skip-cropping', false );
+	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' ), 'secondary', 'skip-cropping', false );
+	}
 	?>
 	</p>
 </form>
@@ -842,13 +867,15 @@ 
 
 		$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_die( __( 'The uploaded file is not a valid image. Please try again.' ) );
+		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);
 
-		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'];
@@ -912,23 +939,26 @@ 
 		$height = $dimensions['dst_height'];
 		$width = $dimensions['dst_width'];
 
-		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'] ) )
-			$cropped = _copy_image_file( $attachment_id );
-		else
-			$cropped = get_attached_file( $attachment_id );
+		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'] ) ) {
+					$cropped = _copy_image_file( $attachment_id );
+		} else {
+					$cropped = get_attached_file( $attachment_id );
+		}
 
-		if ( ! $cropped || is_wp_error( $cropped ) )
-			wp_die( __( 'Image could not be processed. Please go back and try again.' ), __( 'Image Processing Error' ) );
+		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'] ) )
-			unset( $object['ID'] );
+		if ( ! empty( $_POST['create-new-attachment'] ) ) {
+					unset( $object['ID'] );
+		}
 
 		// Update the attachment
 		$attachment_id = $this->insert_attachment( $object, $cropped );
@@ -965,15 +995,17 @@ 
 	 * @since 2.1.0
 	 */
 	public function admin_page() {
-		if ( ! current_user_can('edit_theme_options') )
-			wp_die(__('You do not have permission to customize headers.'));
+		if ( ! current_user_can('edit_theme_options') ) {
+					wp_die(__('You do not have permission to customize headers.'));
+		}
 		$step = $this->step();
-		if ( 2 == $step )
-			$this->step_2();
-		elseif ( 3 == $step )
-			$this->step_3();
-		else
-			$this->step_1();
+		if ( 2 == $step ) {
+					$this->step_2();
+		} elseif ( 3 == $step ) {
+					$this->step_3();
+		} else {
+					$this->step_1();
+		}
 	}
 
 	/**
@@ -1015,8 +1047,9 @@ 
 	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'] ) )
-				return;
+			if ( ! isset( $choice['attachment_id'] ) || ! isset( $choice['url'] ) ) {
+							return;
+			}
 
 			$choice['url'] = esc_url_raw( $choice['url'] );
 
@@ -1046,10 +1079,11 @@ 
 
 		} else {
 			$this->process_default_headers();
-			if ( isset( $this->default_headers[ $choice ] ) )
-				$header_image_data = $this->default_headers[ $choice ];
-			else
-				return;
+			if ( isset( $this->default_headers[ $choice ] ) ) {
+							$header_image_data = $this->default_headers[ $choice ];
+			} else {
+							return;
+			}
 		}
 
 		set_theme_mod( 'header_image', esc_url_raw( $header_image_data['url'] ) );
@@ -1123,21 +1157,17 @@ 
 
 		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;
 		}
 

src/wp-admin/theme-editor.php

Switch Indentation +67 added lines, -67 removed lines

@@ -107,60 +107,60 @@ 
 $scrollto = isset( $_REQUEST['scrollto'] ) ? (int) $_REQUEST['scrollto'] : 0;
 
 switch( $action ) {
-case 'update':
-	check_admin_referer( 'edit-theme_' . $file . $stylesheet );
-	$newcontent = wp_unslash( $_POST['newcontent'] );
-	$location = 'theme-editor.php?file=' . urlencode( $relative_file ) . '&theme=' . urlencode( $stylesheet ) . '&scrollto=' . $scrollto;
-	if ( is_writeable( $file ) ) {
-		// is_writable() not always reliable, check return value. see comments @ http://uk.php.net/is_writable
-		$f = fopen( $file, 'w+' );
-		if ( $f !== false ) {
-			fwrite( $f, $newcontent );
-			fclose( $f );
-			$location .= '&updated=true';
-			$theme->cache_delete();
+	case 'update':
+		check_admin_referer( 'edit-theme_' . $file . $stylesheet );
+		$newcontent = wp_unslash( $_POST['newcontent'] );
+		$location = 'theme-editor.php?file=' . urlencode( $relative_file ) . '&theme=' . urlencode( $stylesheet ) . '&scrollto=' . $scrollto;
+		if ( is_writeable( $file ) ) {
+			// is_writable() not always reliable, check return value. see comments @ http://uk.php.net/is_writable
+			$f = fopen( $file, 'w+' );
+			if ( $f !== false ) {
+				fwrite( $f, $newcontent );
+				fclose( $f );
+				$location .= '&updated=true';
+				$theme->cache_delete();
+			}
 		}
-	}
-	wp_redirect( $location );
-	exit;
+		wp_redirect( $location );
+		exit;
 
-default:
+	default:
 
-	require_once( ABSPATH . 'wp-admin/admin-header.php' );
+		require_once( ABSPATH . 'wp-admin/admin-header.php' );
 
-	update_recently_edited( $file );
+		update_recently_edited( $file );
 
-	if ( ! is_file( $file ) )
-		$error = true;
+		if ( ! is_file( $file ) )
+			$error = true;
 
-	$content = '';
-	if ( ! $error && filesize( $file ) > 0 ) {
-		$f = fopen($file, 'r');
-		$content = fread($f, filesize($file));
+		$content = '';
+		if ( ! $error && filesize( $file ) > 0 ) {
+			$f = fopen($file, 'r');
+			$content = fread($f, filesize($file));
 
-		if ( '.php' == substr( $file, strrpos( $file, '.' ) ) ) {
-			$functions = wp_doc_link_parse( $content );
+			if ( '.php' == substr( $file, strrpos( $file, '.' ) ) ) {
+				$functions = wp_doc_link_parse( $content );
 
-			$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>';
+				$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>';
+				}
+				$docs_select .= '</select>';
 			}
-			$docs_select .= '</select>';
-		}
 
-		$content = esc_textarea( $content );
-	}
+			$content = esc_textarea( $content );
+		}
 
-	if ( isset( $_GET['updated'] ) ) : ?>
- <div id="message" class="updated notice is-dismissible"><p><?php _e( 'File edited successfully.' ) ?></p></div>
-<?php endif;
+		if ( isset( $_GET['updated'] ) ) : ?>
+	 <div id="message" class="updated notice is-dismissible"><p><?php _e( 'File edited successfully.' ) ?></p></div>
+	<?php endif;
 
-$description = get_file_description( $relative_file );
-$file_show = array_search( $file, array_filter( $allowed_files ) );
-if ( $description != $file_show )
-	$description .= ' <span>(' . $file_show . ')</span>';
-?>
+	$description = get_file_description( $relative_file );
+	$file_show = array_search( $file, array_filter( $allowed_files ) );
+	if ( $description != $file_show )
+		$description .= ' <span>(' . $file_show . ')</span>';
+	?>
 <div class="wrap">
 <h1><?php echo esc_html( $title ); ?></h1>
 
@@ -173,38 +173,38 @@ 
 		<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() )
-		continue;
+	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() )
+			continue;
 
-	$selected = $a_stylesheet == $stylesheet ? ' selected="selected"' : '';
-	echo "\n\t" . '<option value="' . esc_attr( $a_stylesheet ) . '"' . $selected . '>' . $a_theme->display('Name') . '</option>';
+		$selected = $a_stylesheet == $stylesheet ? ' selected="selected"' : '';
+		echo "\n\t" . '<option value="' . esc_attr( $a_stylesheet ) . '"' . $selected . '>' . $a_theme->display('Name') . '</option>';
 }
-?>
-		</select>
+	?>
+			</select>
 		<?php submit_button( __( 'Select' ), 'button', 'Submit', false ); ?>
 	</form>
 </div>
 <br class="clear" />
 </div>
 <?php
-if ( $theme->errors() )
-	echo '<div class="error"><p><strong>' . __( 'This theme is broken.' ) . '</strong> ' . $theme->errors()->get_error_message() . '</p></div>';
-?>
-	<div id="templateside">
-<?php
-if ( $allowed_files ) :
-	$previous_file_type = '';
-
-	foreach ( $allowed_files as $filename => $absolute_filename ) :
-		$file_type = substr( $filename, strrpos( $filename, '.' ) );
-
-		if ( $file_type !== $previous_file_type ) {
-			if ( '' !== $previous_file_type ) {
-				echo "\t</ul>\n";
-			}
-
-			switch ( $file_type ) {
+	if ( $theme->errors() )
+		echo '<div class="error"><p><strong>' . __( 'This theme is broken.' ) . '</strong> ' . $theme->errors()->get_error_message() . '</p></div>';
+	?>
+		<div id="templateside">
+	<?php
+	if ( $allowed_files ) :
+		$previous_file_type = '';
+
+		foreach ( $allowed_files as $filename => $absolute_filename ) :
+			$file_type = substr( $filename, strrpos( $filename, '.' ) );
+
+			if ( $file_type !== $previous_file_type ) {
+				if ( '' !== $previous_file_type ) {
+					echo "\t</ul>\n";
+				}
+
+				switch ( $file_type ) {
 				case '.php':
 					if ( $has_templates || $theme->parent() ) :
 						echo "\t<h2>" . __( 'Templates' ) . "</h2>\n";
@@ -225,7 +225,7 @@ 
 					/* translators: %s: file extension */
 					echo "\t<h2>" . sprintf( __( '%s files' ), $file_type ) . "</h2>\n";
 					break;
-			}
+				}
 
 			echo "\t<ul>\n";
 		}

Spacing +109 added lines, -109 removed lines

@@ -7,63 +7,63 @@ 
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( is_multisite() && ! is_network_admin() ) {
-	wp_redirect( network_admin_url( 'theme-editor.php' ) );
+if (is_multisite() && ! is_network_admin()) {
+	wp_redirect(network_admin_url('theme-editor.php'));
 	exit();
 }
 
-if ( !current_user_can('edit_themes') )
+if ( ! current_user_can('edit_themes'))
 	wp_die('<p>'.__('You do not have sufficient permissions to edit templates for this site.').'</p>');
 
 $title = __("Edit Themes");
 $parent_file = 'themes.php';
 
-get_current_screen()->add_help_tab( array(
+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 Select. A list then appears of the theme'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="newcontent-description">' . __( 'In the editing area the Tab key enters a tab character. To move below this area by pressing Tab, press the Esc key followed by the Tab key. In some cases the Esc key will need to be pressed twice before the Tab key will allow you to continue.' ) . '</p>
-	<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>
-	<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" target="_blank">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>' : '' )
-) );
+	'<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 Select. A list then appears of the theme'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="newcontent-description">' . __('In the editing area the Tab key enters a tab character. To move below this area by pressing Tab, press the Esc key followed by the Tab key. In some cases the Esc key will need to be pressed twice before the Tab key will allow you to continue.').'</p>
+	<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>
+	<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" target="_blank">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" target="_blank">Documentation on Theme Development</a>') . '</p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Using_Themes" target="_blank">Documentation on Using Themes</a>') . '</p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Editing_Files" target="_blank">Documentation on Editing Files</a>') . '</p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Template_Tags" target="_blank">Documentation on Template Tags</a>') . '</p>' .
-	'<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Theme_Development" target="_blank">Documentation on Theme Development</a>').'</p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Using_Themes" target="_blank">Documentation on Using Themes</a>').'</p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Editing_Files" target="_blank">Documentation on Editing Files</a>').'</p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Template_Tags" target="_blank">Documentation on Template Tags</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>'
 );
 
-wp_reset_vars( array( 'action', 'error', 'file', 'theme' ) );
+wp_reset_vars(array('action', 'error', 'file', 'theme'));
 
-if ( $theme ) {
+if ($theme) {
 	$stylesheet = $theme;
 } else {
 	$stylesheet = get_stylesheet();
 }
 
-$theme = wp_get_theme( $stylesheet );
+$theme = wp_get_theme($stylesheet);
 
-if ( ! $theme->exists() ) {
-	wp_die( __( 'The requested theme does not exist.' ) );
+if ( ! $theme->exists()) {
+	wp_die(__('The requested theme does not exist.'));
 }
 
-if ( $theme->errors() && 'theme_no_stylesheet' == $theme->errors()->get_error_code() ) {
-	wp_die( __( 'The requested theme does not exist.' ) . ' ' . $theme->errors()->get_error_message() );
+if ($theme->errors() && 'theme_no_stylesheet' == $theme->errors()->get_error_code()) {
+	wp_die(__('The requested theme does not exist.').' '.$theme->errors()->get_error_message());
 }
 
 $allowed_files = $style_files = array();
 $has_templates = false;
-$default_types = array( 'php', 'css' );
+$default_types = array('php', 'css');
 
 /**
  * Filter the list of file types allowed for editing in the Theme editor.
@@ -73,208 +73,208 @@ 
  * @param array    $default_types List of file types. Default types include 'php' and 'css'.
  * @param WP_Theme $theme         The current Theme object.
  */
-$file_types = apply_filters( 'wp_theme_editor_filetypes', $default_types, $theme );
+$file_types = apply_filters('wp_theme_editor_filetypes', $default_types, $theme);
 
 // Ensure that default types are still there.
-$file_types = array_unique( array_merge( $file_types, $default_types ) );
+$file_types = array_unique(array_merge($file_types, $default_types));
 
-foreach ( $file_types as $type ) {
-	switch ( $type ) {
+foreach ($file_types as $type) {
+	switch ($type) {
 		case 'php':
-			$allowed_files += $theme->get_files( 'php', 1 );
-			$has_templates = ! empty( $allowed_files );
+			$allowed_files += $theme->get_files('php', 1);
+			$has_templates = ! empty($allowed_files);
 			break;
 		case 'css':
-			$style_files = $theme->get_files( 'css' );
+			$style_files = $theme->get_files('css');
 			$allowed_files['style.css'] = $style_files['style.css'];
 			$allowed_files += $style_files;
 			break;
 		default:
-			$allowed_files += $theme->get_files( $type );
+			$allowed_files += $theme->get_files($type);
 			break;
 	}
 }
 
-if ( empty( $file ) ) {
+if (empty($file)) {
 	$relative_file = 'style.css';
 	$file = $allowed_files['style.css'];
 } else {
 	$relative_file = $file;
-	$file = $theme->get_stylesheet_directory() . '/' . $relative_file;
+	$file = $theme->get_stylesheet_directory().'/'.$relative_file;
 }
 
-validate_file_to_edit( $file, $allowed_files );
-$scrollto = isset( $_REQUEST['scrollto'] ) ? (int) $_REQUEST['scrollto'] : 0;
+validate_file_to_edit($file, $allowed_files);
+$scrollto = isset($_REQUEST['scrollto']) ? (int) $_REQUEST['scrollto'] : 0;
 
-switch( $action ) {
+switch ($action) {
 case 'update':
-	check_admin_referer( 'edit-theme_' . $file . $stylesheet );
-	$newcontent = wp_unslash( $_POST['newcontent'] );
-	$location = 'theme-editor.php?file=' . urlencode( $relative_file ) . '&theme=' . urlencode( $stylesheet ) . '&scrollto=' . $scrollto;
-	if ( is_writeable( $file ) ) {
+	check_admin_referer('edit-theme_'.$file.$stylesheet);
+	$newcontent = wp_unslash($_POST['newcontent']);
+	$location = 'theme-editor.php?file='.urlencode($relative_file).'&theme='.urlencode($stylesheet).'&scrollto='.$scrollto;
+	if (is_writeable($file)) {
 		// is_writable() not always reliable, check return value. see comments @ http://uk.php.net/is_writable
-		$f = fopen( $file, 'w+' );
-		if ( $f !== false ) {
-			fwrite( $f, $newcontent );
-			fclose( $f );
+		$f = fopen($file, 'w+');
+		if ($f !== false) {
+			fwrite($f, $newcontent);
+			fclose($f);
 			$location .= '&updated=true';
 			$theme->cache_delete();
 		}
 	}
-	wp_redirect( $location );
+	wp_redirect($location);
 	exit;
 
 default:
 
-	require_once( ABSPATH . 'wp-admin/admin-header.php' );
+	require_once(ABSPATH.'wp-admin/admin-header.php');
 
-	update_recently_edited( $file );
+	update_recently_edited($file);
 
-	if ( ! is_file( $file ) )
+	if ( ! is_file($file))
 		$error = true;
 
 	$content = '';
-	if ( ! $error && filesize( $file ) > 0 ) {
+	if ( ! $error && filesize($file) > 0) {
 		$f = fopen($file, 'r');
 		$content = fread($f, filesize($file));
 
-		if ( '.php' == substr( $file, strrpos( $file, '.' ) ) ) {
-			$functions = wp_doc_link_parse( $content );
+		if ('.php' == substr($file, strrpos($file, '.'))) {
+			$functions = wp_doc_link_parse($content);
 
 			$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>';
+			$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>';
 			}
 			$docs_select .= '</select>';
 		}
 
-		$content = esc_textarea( $content );
+		$content = esc_textarea($content);
 	}
 
-	if ( isset( $_GET['updated'] ) ) : ?>
- <div id="message" class="updated notice is-dismissible"><p><?php _e( 'File edited successfully.' ) ?></p></div>
+	if (isset($_GET['updated'])) : ?>
+ <div id="message" class="updated notice is-dismissible"><p><?php _e('File edited successfully.') ?></p></div>
 <?php endif;
 
-$description = get_file_description( $relative_file );
-$file_show = array_search( $file, array_filter( $allowed_files ) );
-if ( $description != $file_show )
-	$description .= ' <span>(' . $file_show . ')</span>';
+$description = get_file_description($relative_file);
+$file_show = array_search($file, array_filter($allowed_files));
+if ($description != $file_show)
+	$description .= ' <span>('.$file_show.')</span>';
 ?>
 <div class="wrap">
-<h1><?php echo esc_html( $title ); ?></h1>
+<h1><?php echo esc_html($title); ?></h1>
 
 <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="post">
 		<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() )
+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())
 		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>
-		<?php submit_button( __( 'Select' ), 'button', 'Submit', false ); ?>
+		<?php submit_button(__('Select'), 'button', 'Submit', false); ?>
 	</form>
 </div>
 <br class="clear" />
 </div>
 <?php
-if ( $theme->errors() )
-	echo '<div class="error"><p><strong>' . __( 'This theme is broken.' ) . '</strong> ' . $theme->errors()->get_error_message() . '</p></div>';
+if ($theme->errors())
+	echo '<div class="error"><p><strong>'.__('This theme is broken.').'</strong> '.$theme->errors()->get_error_message().'</p></div>';
 ?>
 	<div id="templateside">
 <?php
-if ( $allowed_files ) :
+if ($allowed_files) :
 	$previous_file_type = '';
 
-	foreach ( $allowed_files as $filename => $absolute_filename ) :
-		$file_type = substr( $filename, strrpos( $filename, '.' ) );
+	foreach ($allowed_files as $filename => $absolute_filename) :
+		$file_type = substr($filename, strrpos($filename, '.'));
 
-		if ( $file_type !== $previous_file_type ) {
-			if ( '' !== $previous_file_type ) {
+		if ($file_type !== $previous_file_type) {
+			if ('' !== $previous_file_type) {
 				echo "\t</ul>\n";
 			}
 
-			switch ( $file_type ) {
+			switch ($file_type) {
 				case '.php':
-					if ( $has_templates || $theme->parent() ) :
-						echo "\t<h2>" . __( 'Templates' ) . "</h2>\n";
-						if ( $theme->parent() ) {
-							echo '<p class="howto">' . 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' )
+					if ($has_templates || $theme->parent()) :
+						echo "\t<h2>".__('Templates')."</h2>\n";
+						if ($theme->parent()) {
+							echo '<p class="howto">'.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')
 								)
-							) . "</p>\n";
+							)."</p>\n";
 						}
 					endif;
 					break;
 				case '.css':
-					echo "\t<h2>" . _x( 'Styles', 'Theme stylesheets in theme editor' ) . "</h2>\n";
+					echo "\t<h2>"._x('Styles', 'Theme stylesheets in theme editor')."</h2>\n";
 					break;
 				default:
 					/* translators: %s: file extension */
-					echo "\t<h2>" . sprintf( __( '%s files' ), $file_type ) . "</h2>\n";
+					echo "\t<h2>".sprintf(__('%s files'), $file_type)."</h2>\n";
 					break;
 			}
 
 			echo "\t<ul>\n";
 		}
 		
-		$file_description = get_file_description( $filename );
-		if ( $filename !== basename( $absolute_filename ) || $file_description !== $filename ) {
-			$file_description .= '<br /><span class="nonessential">(' . $filename . ')</span>';
+		$file_description = get_file_description($filename);
+		if ($filename !== basename($absolute_filename) || $file_description !== $filename) {
+			$file_description .= '<br /><span class="nonessential">('.$filename.')</span>';
 		}
 
-		if ( $absolute_filename === $file ) {
-			$file_description = '<span class="highlight">' . $file_description . '</span>';
+		if ($absolute_filename === $file) {
+			$file_description = '<span class="highlight">'.$file_description.'</span>';
 		}
 
 		$previous_file_type = $file_type;
 ?>
-		<li><a href="theme-editor.php?file=<?php echo urlencode( $filename ) ?>&amp;theme=<?php echo urlencode( $stylesheet ) ?>"><?php echo $file_description; ?></a></li>
+		<li><a href="theme-editor.php?file=<?php echo urlencode($filename) ?>&amp;theme=<?php echo urlencode($stylesheet) ?>"><?php echo $file_description; ?></a></li>
 <?php
 	endforeach;
 ?>
 </ul>
 <?php endif; ?>
 </div>
-<?php if ( $error ) :
-	echo '<div class="error"><p>' . __('Oops, no such file exists! Double check the name and try again, merci.') . '</p></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 : ?>
 	<form name="template" id="template" action="theme-editor.php" method="post">
-	<?php wp_nonce_field( 'edit-theme_' . $file . $stylesheet ); ?>
+	<?php wp_nonce_field('edit-theme_'.$file.$stylesheet); ?>
 		<div><textarea cols="70" rows="30" name="newcontent" id="newcontent" aria-describedby="newcontent-description"><?php echo $content; ?></textarea>
 		<input type="hidden" name="action" value="update" />
-		<input type="hidden" name="file" value="<?php echo esc_attr( $relative_file ); ?>" />
-		<input type="hidden" name="theme" value="<?php echo esc_attr( $theme->get_stylesheet() ); ?>" />
+		<input type="hidden" name="file" value="<?php echo esc_attr($relative_file); ?>" />
+		<input type="hidden" name="theme" value="<?php echo esc_attr($theme->get_stylesheet()); ?>" />
 		<input type="hidden" name="scrollto" id="scrollto" value="<?php echo $scrollto; ?>" />
 		</div>
-	<?php if ( ! empty( $functions ) ) : ?>
+	<?php if ( ! empty($functions)) : ?>
 		<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_locale() ) ?>&amp;version=<?php echo urlencode( $wp_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_locale()) ?>&amp;version=<?php echo urlencode($wp_version) ?>&amp;redirect=true'); }" />
 		</div>
 	<?php endif; ?>
 
 		<div>
-		<?php if ( is_child_theme() && $theme->get_stylesheet() == get_template() ) : ?>
-			<p><?php if ( is_writeable( $file ) ) { ?><strong><?php _e( 'Caution:' ); ?></strong><?php } ?>
-			<?php _e( 'This is a file in your current parent theme.' ); ?></p>
+		<?php if (is_child_theme() && $theme->get_stylesheet() == get_template()) : ?>
+			<p><?php if (is_writeable($file)) { ?><strong><?php _e('Caution:'); ?></strong><?php } ?>
+			<?php _e('This is a file in your current parent theme.'); ?></p>
 		<?php endif; ?>
 <?php
-	if ( is_writeable( $file ) ) :
-		submit_button( __( 'Update File' ), 'primary', 'submit', true );
+	if (is_writeable($file)) :
+		submit_button(__('Update File'), 'primary', 'submit', true);
 	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>
 <?php endif; ?>
@@ -295,4 +295,4 @@ 
 break;
 }
 
-include(ABSPATH . 'wp-admin/admin-footer.php' );
+include(ABSPATH.'wp-admin/admin-footer.php');

Braces +26 added lines, -12 removed lines

@@ -14,8 +14,9 @@ 
 	exit();
 }
 
-if ( !current_user_can('edit_themes') )
+if ( !current_user_can('edit_themes') ) {
 	wp_die('<p>'.__('You do not have sufficient permissions to edit templates for this site.').'</p>');
+}
 
 $title = __("Edit Themes");
 $parent_file = 'themes.php';
@@ -130,8 +131,9 @@ 
 
 	update_recently_edited( $file );
 
-	if ( ! is_file( $file ) )
-		$error = true;
+	if ( ! is_file( $file ) ) {
+			$error = true;
+	}
 
 	$content = '';
 	if ( ! $error && filesize( $file ) > 0 ) {
@@ -158,15 +160,19 @@ 
 
 $description = get_file_description( $relative_file );
 $file_show = array_search( $file, array_filter( $allowed_files ) );
-if ( $description != $file_show )
+if ( $description != $file_show ) {
 	$description .= ' <span>(' . $file_show . ')</span>';
+}
 ?>
 <div class="wrap">
 <h1><?php echo esc_html( $title ); ?></h1>
 
 <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="post">
@@ -174,8 +180,9 @@ 
 		<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() )
-		continue;
+	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>';
@@ -188,8 +195,9 @@ 
 <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">
 <?php
@@ -250,9 +258,12 @@ 
 </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 : ?>
+else {
+	: ?>
 	<form name="template" id="template" action="theme-editor.php" method="post">
-	<?php wp_nonce_field( 'edit-theme_' . $file . $stylesheet ); ?>
+	<?php wp_nonce_field( 'edit-theme_' . $file . $stylesheet );
+}
+?>
 		<div><textarea cols="70" rows="30" name="newcontent" id="newcontent" aria-describedby="newcontent-description"><?php echo $content; ?></textarea>
 		<input type="hidden" name="action" value="update" />
 		<input type="hidden" name="file" value="<?php echo esc_attr( $relative_file ); ?>" />
@@ -275,8 +286,11 @@ 
 <?php
 	if ( is_writeable( $file ) ) :
 		submit_button( __( 'Update File' ), 'primary', 'submit', true );
-	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>
+	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>
 <?php endif; ?>
 		</div>
 	</form>

src/wp-admin/load-scripts.php

Spacing +25 added lines, -25 removed lines

@@ -8,61 +8,61 @@
 error_reporting(0);
 
 /** Set ABSPATH for execution */
-define( 'ABSPATH', dirname(dirname(__FILE__)) . '/' );
-define( 'WPINC', 'wp-includes' );
+define('ABSPATH', dirname(dirname(__FILE__)).'/');
+define('WPINC', 'wp-includes');
 
 $load = $_GET['load'];
-if ( is_array( $load ) )
-	$load = implode( '', $load );
+if (is_array($load))
+	$load = implode('', $load);
 
-$load = preg_replace( '/[^a-z0-9,_-]+/i', '', $load );
-$load = array_unique( explode( ',', $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' );
+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 = '';
 
 $wp_scripts = new WP_Scripts();
 wp_default_scripts($wp_scripts);
 
-if ( isset( $_SERVER['HTTP_IF_NONE_MATCH'] ) && stripslashes( $_SERVER['HTTP_IF_NONE_MATCH'] ) === $wp_version ) {
+if (isset($_SERVER['HTTP_IF_NONE_MATCH']) && stripslashes($_SERVER['HTTP_IF_NONE_MATCH']) === $wp_version) {
 	$protocol = $_SERVER['SERVER_PROTOCOL'];
-	if ( ! in_array( $protocol, array( 'HTTP/1.1', 'HTTP/2', 'HTTP/2.0' ) ) ) {
+	if ( ! in_array($protocol, array('HTTP/1.1', 'HTTP/2', 'HTTP/2.0'))) {
 		$protocol = 'HTTP/1.0';
 	}
-	header( "$protocol 304 Not Modified" );
+	header("$protocol 304 Not Modified");
 	exit();
 }
 
-foreach ( $load as $handle ) {
-	if ( !array_key_exists($handle, $wp_scripts->registered) )
+foreach ($load as $handle) {
+	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('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']) ) {
+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 ) {
+	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') ) {
+		$out = gzdeflate($out, 3);
+	} elseif (false !== stripos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') && function_exists('gzencode')) {
 		header('Content-Encoding: gzip');
-		$out = gzencode( $out, 3 );
+		$out = gzencode($out, 3);
 	}
 }
 

Braces +7 added lines, -4 removed lines

@@ -12,14 +12,16 @@ 
 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' );
@@ -43,8 +45,9 @@ 
 }
 
 foreach ( $load as $handle ) {
-	if ( !array_key_exists($handle, $wp_scripts->registered) )
-		continue;
+	if ( !array_key_exists($handle, $wp_scripts->registered) ) {
+			continue;
+	}
 
 	$path = ABSPATH . $wp_scripts->registered[$handle]->src;
 	$out .= get_file($path) . "\n";

src/wp-admin/edit.php

Indentation +2 added lines, -2 removed lines

@@ -268,7 +268,7 @@ 
 $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.' ) :
-	                   _n( '%s post not updated, somebody is editing it.', '%s posts not updated, somebody is editing them.', $bulk_counts['locked'] ),
+					   _n( '%s post not updated, somebody is editing it.', '%s posts not updated, somebody is editing them.', $bulk_counts['locked'] ),
 	'deleted'   => _n( '%s post permanently deleted.', '%s posts permanently deleted.', $bulk_counts['deleted'] ),
 	'trashed'   => _n( '%s post moved to the Trash.', '%s posts moved to the Trash.', $bulk_counts['trashed'] ),
 	'untrashed' => _n( '%s post restored from the Trash.', '%s posts restored from the Trash.', $bulk_counts['untrashed'] ),
@@ -276,7 +276,7 @@ 
 $bulk_messages['page'] = array(
 	'updated'   => _n( '%s page updated.', '%s pages updated.', $bulk_counts['updated'] ),
 	'locked'    => ( 1 == $bulk_counts['locked'] ) ? __( '1 page not updated, somebody is editing it.' ) :
-	                   _n( '%s page not updated, somebody is editing it.', '%s pages not updated, somebody is editing them.', $bulk_counts['locked'] ),
+					   _n( '%s page not updated, somebody is editing it.', '%s pages not updated, somebody is editing them.', $bulk_counts['locked'] ),
 	'deleted'   => _n( '%s page permanently deleted.', '%s pages permanently deleted.', $bulk_counts['deleted'] ),
 	'trashed'   => _n( '%s page moved to the Trash.', '%s pages moved to the Trash.', $bulk_counts['trashed'] ),
 	'untrashed' => _n( '%s page restored from the Trash.', '%s pages restored from the Trash.', $bulk_counts['untrashed'] ),

Spacing +145 added lines, -147 removed lines

@@ -7,17 +7,17 @@ 
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( ! $typenow )
-	wp_die( __( 'Invalid post type' ) );
+if ( ! $typenow)
+	wp_die(__('Invalid post type'));
 
-if ( ! in_array( $typenow, get_post_types( array( 'show_ui' => true ) ) ) ) {
-	wp_die( __( 'You are not allowed to edit posts in this post type.' ) );
+if ( ! in_array($typenow, get_post_types(array('show_ui' => true)))) {
+	wp_die(__('You are not allowed to edit posts in this post type.'));
 }
 
-if ( 'attachment' === $typenow ) {
-	if ( wp_redirect( admin_url( 'upload.php' ) ) ) {
+if ('attachment' === $typenow) {
+	if (wp_redirect(admin_url('upload.php'))) {
 		exit;
 	}
 }
@@ -29,15 +29,15 @@ 
 global $post_type, $post_type_object;
 
 $post_type = $typenow;
-$post_type_object = get_post_type_object( $post_type );
+$post_type_object = get_post_type_object($post_type);
 
-if ( ! $post_type_object )
-	wp_die( __( 'Invalid post type' ) );
+if ( ! $post_type_object)
+	wp_die(__('Invalid post type'));
 
-if ( ! current_user_can( $post_type_object->cap->edit_posts ) ) {
+if ( ! current_user_can($post_type_object->cap->edit_posts)) {
 	wp_die(
-		'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-		'<p>' . __( 'You are not allowed to edit posts in this post type.' ) . '</p>',
+		'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+		'<p>'.__('You are not allowed to edit posts in this post type.').'</p>',
 		403
 	);
 }
@@ -46,15 +46,15 @@ 
 $pagenum = $wp_list_table->get_pagenum();
 
 // Back-compat for viewing comments of an entry
-foreach ( array( 'p', 'attachment_id', 'page_id' ) as $_redirect ) {
-	if ( ! empty( $_REQUEST[ $_redirect ] ) ) {
-		wp_redirect( admin_url( 'edit-comments.php?p=' . absint( $_REQUEST[ $_redirect ] ) ) );
+foreach (array('p', 'attachment_id', 'page_id') as $_redirect) {
+	if ( ! empty($_REQUEST[$_redirect])) {
+		wp_redirect(admin_url('edit-comments.php?p='.absint($_REQUEST[$_redirect])));
 		exit;
 	}
 }
-unset( $_redirect );
+unset($_redirect);
 
-if ( 'post' != $post_type ) {
+if ('post' != $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";
@@ -66,66 +66,66 @@ 
 
 $doaction = $wp_list_table->current_action();
 
-if ( $doaction ) {
+if ($doaction) {
 	check_admin_referer('bulk-posts');
 
-	$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 = 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 ( 'delete_all' == $doaction ) {
+	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']);
 		// 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 ) );
+		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));
 		}
 		$doaction = 'delete';
-	} elseif ( isset( $_REQUEST['media'] ) ) {
+	} elseif (isset($_REQUEST['media'])) {
 		$post_ids = $_REQUEST['media'];
-	} elseif ( isset( $_REQUEST['ids'] ) ) {
-		$post_ids = explode( ',', $_REQUEST['ids'] );
-	} elseif ( !empty( $_REQUEST['post'] ) ) {
+	} elseif (isset($_REQUEST['ids'])) {
+		$post_ids = explode(',', $_REQUEST['ids']);
+	} elseif ( ! empty($_REQUEST['post'])) {
 		$post_ids = array_map('intval', $_REQUEST['post']);
 	}
 
-	if ( !isset( $post_ids ) ) {
-		wp_redirect( $sendback );
+	if ( ! isset($post_ids)) {
+		wp_redirect($sendback);
 		exit;
 	}
 
-	switch ( $doaction ) {
+	switch ($doaction) {
 		case 'trash':
 			$trashed = $locked = 0;
 
-			foreach ( (array) $post_ids as $post_id ) {
-				if ( !current_user_can( 'delete_post', $post_id) )
-					wp_die( __('You are not allowed to move this item to the Trash.') );
+			foreach ((array) $post_ids as $post_id) {
+				if ( ! current_user_can('delete_post', $post_id))
+					wp_die(__('You are not allowed to move this item to the Trash.'));
 
-				if ( wp_check_post_lock( $post_id ) ) {
+				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( __('You are not allowed to restore this item from the Trash.') );
+			foreach ((array) $post_ids as $post_id) {
+				if ( ! current_user_can('delete_post', $post_id))
+					wp_die(__('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++;
 			}
@@ -133,43 +133,43 @@ 
 			break;
 		case 'delete':
 			$deleted = 0;
-			foreach ( (array) $post_ids as $post_id ) {
+			foreach ((array) $post_ids as $post_id) {
 				$post_del = get_post($post_id);
 
-				if ( !current_user_can( 'delete_post', $post_id ) )
-					wp_die( __('You are not allowed to delete this item.') );
+				if ( ! current_user_can('delete_post', $post_id))
+					wp_die(__('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 ($post_del->post_type == 'attachment') {
+					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);
 			break;
 		case 'edit':
-			if ( isset($_REQUEST['bulk_edit']) ) {
+			if (isset($_REQUEST['bulk_edit'])) {
 				$done = bulk_edit_posts($_REQUEST);
 
-				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 );
+				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);
 				}
 			}
 			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);
 	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;
 }
 
@@ -180,106 +180,104 @@ 
 
 $title = $post_type_object->labels->name;
 
-if ( 'post' == $post_type ) {
-	get_current_screen()->add_help_tab( array(
+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(
+		'<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 in the upper left to show All, Published, Draft, or Trashed posts. 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>' .
+		'<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 in the upper left to show All, Published, Draft, or Trashed posts. 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(
+	));
+	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>' .
+		'<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(
+	));
+	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>'
-	) );
+		'<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" target="_blank">Documentation on Managing Posts</a>') . '</p>' .
-	'<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Posts_Screen" target="_blank">Documentation on Managing Posts</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>'
 	);
 
-} elseif ( 'page' == $post_type ) {
-	get_current_screen()->add_help_tab( array(
+} 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(
+		'<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>'
-	) );
+		'<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" target="_blank">Documentation on Managing Pages</a>') . '</p>' .
-	'<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Pages_Screen" target="_blank">Documentation on Managing Pages</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>'
 	);
 
 }
 
-get_current_screen()->set_screen_reader_content( array(
+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,
-	'untrashed' => isset( $_REQUEST['untrashed'] ) ? absint( $_REQUEST['untrashed'] ) : 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['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.' ) :
-	                   _n( '%s post not updated, somebody is editing it.', '%s posts not updated, somebody is editing them.', $bulk_counts['locked'] ),
-	'deleted'   => _n( '%s post permanently deleted.', '%s posts permanently deleted.', $bulk_counts['deleted'] ),
-	'trashed'   => _n( '%s post moved to the Trash.', '%s posts moved to the Trash.', $bulk_counts['trashed'] ),
-	'untrashed' => _n( '%s post restored from the Trash.', '%s posts restored from the Trash.', $bulk_counts['untrashed'] ),
+	'updated'   => _n('%s post updated.', '%s posts updated.', $bulk_counts['updated']),
+	'locked'    => (1 == $bulk_counts['locked']) ? __('1 post not updated, somebody is editing it.') : _n('%s post not updated, somebody is editing it.', '%s posts not updated, somebody is editing them.', $bulk_counts['locked']),
+	'deleted'   => _n('%s post permanently deleted.', '%s posts permanently deleted.', $bulk_counts['deleted']),
+	'trashed'   => _n('%s post moved to the Trash.', '%s posts moved to the Trash.', $bulk_counts['trashed']),
+	'untrashed' => _n('%s post restored from the Trash.', '%s posts restored from the Trash.', $bulk_counts['untrashed']),
 );
 $bulk_messages['page'] = array(
-	'updated'   => _n( '%s page updated.', '%s pages updated.', $bulk_counts['updated'] ),
-	'locked'    => ( 1 == $bulk_counts['locked'] ) ? __( '1 page not updated, somebody is editing it.' ) :
-	                   _n( '%s page not updated, somebody is editing it.', '%s pages not updated, somebody is editing them.', $bulk_counts['locked'] ),
-	'deleted'   => _n( '%s page permanently deleted.', '%s pages permanently deleted.', $bulk_counts['deleted'] ),
-	'trashed'   => _n( '%s page moved to the Trash.', '%s pages moved to the Trash.', $bulk_counts['trashed'] ),
-	'untrashed' => _n( '%s page restored from the Trash.', '%s pages restored from the Trash.', $bulk_counts['untrashed'] ),
+	'updated'   => _n('%s page updated.', '%s pages updated.', $bulk_counts['updated']),
+	'locked'    => (1 == $bulk_counts['locked']) ? __('1 page not updated, somebody is editing it.') : _n('%s page not updated, somebody is editing it.', '%s pages not updated, somebody is editing them.', $bulk_counts['locked']),
+	'deleted'   => _n('%s page permanently deleted.', '%s pages permanently deleted.', $bulk_counts['deleted']),
+	'trashed'   => _n('%s page moved to the Trash.', '%s pages moved to the Trash.', $bulk_counts['trashed']),
+	'untrashed' => _n('%s page restored from the Trash.', '%s pages restored from the Trash.', $bulk_counts['untrashed']),
 );
 
 /**
@@ -293,54 +291,54 @@ 
  *                             keyed with 'updated', 'locked', 'deleted', 'trashed', and 'untrashed'.
  * @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_messages = apply_filters('bulk_post_updated_messages', $bulk_messages, $bulk_counts);
+$bulk_counts = array_filter($bulk_counts);
 
-require_once( ABSPATH . 'wp-admin/admin-header.php' );
+require_once(ABSPATH.'wp-admin/admin-header.php');
 ?>
 <div class="wrap">
 <h1><?php
-echo esc_html( $post_type_object->labels->name );
-if ( current_user_can( $post_type_object->cap->create_posts ) )
-	echo ' <a href="' . esc_url( admin_url( $post_new_file ) ) . '" class="page-title-action">' . esc_html( $post_type_object->labels->add_new ) . '</a>';
+echo esc_html($post_type_object->labels->name);
+if (current_user_can($post_type_object->cap->create_posts))
+	echo ' <a href="'.esc_url(admin_url($post_new_file)).'" class="page-title-action">'.esc_html($post_type_object->labels->add_new).'</a>';
 
-if ( isset( $_REQUEST['s'] ) && strlen( $_REQUEST['s'] ) ) {
+if (isset($_REQUEST['s']) && strlen($_REQUEST['s'])) {
 	/* translators: %s: search keywords */
-	printf( ' <span class="subtitle">' . __( 'Search results for &#8220;%s&#8221;' ) . '</span>', get_search_query() );
+	printf(' <span class="subtitle">'.__('Search results for &#8220;%s&#8221;').'</span>', get_search_query());
 }
 ?></h1>
 
 <?php
 // If we have a bulk message to issue:
 $messages = array();
-foreach ( $bulk_counts as $message => $count ) {
-	if ( isset( $bulk_messages[ $post_type ][ $message ] ) )
-		$messages[] = sprintf( $bulk_messages[ $post_type ][ $message ], number_format_i18n( $count ) );
-	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>';
+foreach ($bulk_counts as $message => $count) {
+	if (isset($bulk_messages[$post_type][$message]))
+		$messages[] = sprintf($bulk_messages[$post_type][$message], number_format_i18n($count));
+	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>';
 	}
 }
 
-if ( $messages )
-	echo '<div id="message" class="updated notice is-dismissible"><p>' . join( ' ', $messages ) . '</p></div>';
-unset( $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'] );
+$_SERVER['REQUEST_URI'] = remove_query_arg(array('locked', 'skipped', 'updated', 'deleted', 'trashed', 'untrashed'), $_SERVER['REQUEST_URI']);
 ?>
 
 <?php $wp_list_table->views(); ?>
 
 <form id="posts-filter" method="get">
 
-<?php $wp_list_table->search_box( $post_type_object->labels->search_items, 'post' ); ?>
+<?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['show_sticky'] ) ) { ?>
+<?php if ( ! empty($_REQUEST['show_sticky'])) { ?>
 <input type="hidden" name="show_sticky" value="1" />
 <?php } ?>
 
@@ -349,7 +347,7 @@ 
 </form>
 
 <?php
-if ( $wp_list_table->has_items() )
+if ($wp_list_table->has_items())
 	$wp_list_table->inline_edit();
 ?>
 
@@ -358,4 +356,4 @@ 
 </div>
 
 <?php
-include( ABSPATH . 'wp-admin/admin-footer.php' );
+include(ABSPATH.'wp-admin/admin-footer.php');

Braces +42 added lines, -27 removed lines

@@ -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( __( 'You are not allowed to edit posts in this post type.' ) );
@@ -31,8 +32,9 @@ 
 $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(
@@ -70,11 +72,13 @@ 
 	check_admin_referer('bulk-posts');
 
 	$sendback = remove_query_arg( array('trashed', 'untrashed', 'deleted', 'locked', 'ids'), wp_get_referer() );
-	if ( ! $sendback )
-		$sendback = admin_url( $parent_file );
+	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).
@@ -102,16 +106,18 @@ 
 			$trashed = $locked = 0;
 
 			foreach ( (array) $post_ids as $post_id ) {
-				if ( !current_user_can( 'delete_post', $post_id) )
-					wp_die( __('You are not allowed to move this item to the Trash.') );
+				if ( !current_user_can( 'delete_post', $post_id) ) {
+									wp_die( __('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++;
 			}
@@ -121,11 +127,13 @@ 
 		case 'untrash':
 			$untrashed = 0;
 			foreach ( (array) $post_ids as $post_id ) {
-				if ( !current_user_can( 'delete_post', $post_id) )
-					wp_die( __('You are not allowed to restore this item from the Trash.') );
+				if ( !current_user_can( 'delete_post', $post_id) ) {
+									wp_die( __('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++;
 			}
@@ -136,15 +144,18 @@ 
 			foreach ( (array) $post_ids as $post_id ) {
 				$post_del = get_post($post_id);
 
-				if ( !current_user_can( 'delete_post', $post_id ) )
-					wp_die( __('You are not allowed to delete this item.') );
+				if ( !current_user_can( 'delete_post', $post_id ) ) {
+									wp_die( __('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++;
 			}
@@ -301,8 +312,9 @@ 
 <div class="wrap">
 <h1><?php
 echo esc_html( $post_type_object->labels->name );
-if ( current_user_can( $post_type_object->cap->create_posts ) )
+if ( current_user_can( $post_type_object->cap->create_posts ) ) {
 	echo ' <a href="' . esc_url( admin_url( $post_new_file ) ) . '" class="page-title-action">' . esc_html( $post_type_object->labels->add_new ) . '</a>';
+}
 
 if ( isset( $_REQUEST['s'] ) && strlen( $_REQUEST['s'] ) ) {
 	/* translators: %s: search keywords */
@@ -314,10 +326,11 @@ 
 // If we have a bulk message to issue:
 $messages = array();
 foreach ( $bulk_counts as $message => $count ) {
-	if ( isset( $bulk_messages[ $post_type ][ $message ] ) )
-		$messages[] = sprintf( $bulk_messages[ $post_type ][ $message ], number_format_i18n( $count ) );
-	elseif ( isset( $bulk_messages['post'][ $message ] ) )
-		$messages[] = sprintf( $bulk_messages['post'][ $message ], number_format_i18n( $count ) );
+	if ( isset( $bulk_messages[ $post_type ][ $message ] ) ) {
+			$messages[] = sprintf( $bulk_messages[ $post_type ][ $message ], number_format_i18n( $count ) );
+	} 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'] );
@@ -325,8 +338,9 @@ 
 	}
 }
 
-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'] );
@@ -349,8 +363,9 @@ 
 </form>
 
 <?php
-if ( $wp_list_table->has_items() )
+if ( $wp_list_table->has_items() ) {
 	$wp_list_table->inline_edit();
+}
 ?>
 
 <div id="ajax-response"></div>

src/wp-admin/user-new.php

Indentation +13 added lines, -13 removed lines

@@ -201,9 +201,9 @@ 
 ) );
 
 get_current_screen()->set_help_sidebar(
-    '<p><strong>' . __('For more information:') . '</strong></p>' .
-    '<p>' . __('<a href="https://codex.wordpress.org/Users_Add_New_Screen" target="_blank">Documentation on Adding New Users</a>') . '</p>' .
-    '<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+	'<p><strong>' . __('For more information:') . '</strong></p>' .
+	'<p>' . __('<a href="https://codex.wordpress.org/Users_Add_New_Screen" target="_blank">Documentation on Adding New Users</a>') . '</p>' .
+	'<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
 );
 
 wp_enqueue_script('wp-ajax-response');
@@ -347,16 +347,16 @@ 
 </table>
 <?php
 /**
- * Fires at the end of the new user form.
- *
- * Passes a contextual string to make both types of new user forms
- * uniquely targetable. Contexts are 'add-existing-user' (Multisite),
- * and 'add-new-user' (single site and network admin).
- *
- * @since 3.7.0
- *
- * @param string $type A contextual string specifying which type of new user form the hook follows.
- */
+	 * Fires at the end of the new user form.
+	 *
+	 * Passes a contextual string to make both types of new user forms
+	 * uniquely targetable. Contexts are 'add-existing-user' (Multisite),
+	 * and 'add-new-user' (single site and network admin).
+	 *
+	 * @since 3.7.0
+	 *
+	 * @param string $type A contextual string specifying which type of new user form the hook follows.
+	 */
 do_action( 'user_new_form', 'add-existing-user' );
 ?>
 <?php submit_button( __( 'Add Existing User' ), 'primary', 'adduser', true, array( 'id' => 'addusersub' ) ); ?>

Spacing +165 added lines, -165 removed lines

@@ -7,53 +7,53 @@ 
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( is_multisite() ) {
-	if ( ! current_user_can( 'create_users' ) && ! current_user_can( 'promote_users' ) ) {
+if (is_multisite()) {
+	if ( ! current_user_can('create_users') && ! current_user_can('promote_users')) {
 		wp_die(
-			'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-			'<p>' . __( 'You do not have sufficient permissions to add users to this network.' ) . '</p>',
+			'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+			'<p>'.__('You do not have sufficient permissions to add users to this network.').'</p>',
 			403
 		);
 	}
-} elseif ( ! current_user_can( 'create_users' ) ) {
+} elseif ( ! current_user_can('create_users')) {
 	wp_die(
-		'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-		'<p>' . __( 'You are not allowed to create users.' ) . '</p>',
+		'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+		'<p>'.__('You are not allowed to create users.').'</p>',
 		403
 	);
 }
 
-if ( is_multisite() ) {
-	add_filter( 'wpmu_signup_user_notification_email', 'admin_created_user_email' );
+if (is_multisite()) {
+	add_filter('wpmu_signup_user_notification_email', 'admin_created_user_email');
 }
 
-if ( isset($_REQUEST['action']) && 'adduser' == $_REQUEST['action'] ) {
-	check_admin_referer( 'add-user', '_wpnonce_add-user' );
+if (isset($_REQUEST['action']) && 'adduser' == $_REQUEST['action']) {
+	check_admin_referer('add-user', '_wpnonce_add-user');
 
 	$user_details = null;
-	$user_email = wp_unslash( $_REQUEST['email'] );
-	if ( false !== strpos( $user_email, '@' ) ) {
-		$user_details = get_user_by( 'email', $user_email );
+	$user_email = wp_unslash($_REQUEST['email']);
+	if (false !== strpos($user_email, '@')) {
+		$user_details = get_user_by('email', $user_email);
 	} else {
-		if ( is_super_admin() ) {
-			$user_details = get_user_by( 'login', $user_email );
+		if (is_super_admin()) {
+			$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();
 	}
 
-	if ( ! current_user_can( 'promote_user', $user_details->ID ) ) {
+	if ( ! current_user_can('promote_user', $user_details->ID)) {
 		wp_die(
-			'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-			'<p>' . __( 'You do not have sufficient permissions to add users to this network.' ) . '</p>',
+			'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+			'<p>'.__('You do not have sufficient permissions to add users to this network.').'</p>',
 			403
 		);
 	}
@@ -63,18 +63,18 @@ 
 	$redirect = 'user-new.php';
 	$username = $user_details->user_login;
 	$user_id = $user_details->ID;
-	if ( ( $username != null && !is_super_admin( $user_id ) ) && ( array_key_exists($blog_id, get_blogs_of_user($user_id)) ) ) {
-		$redirect = add_query_arg( array('update' => 'addexisting'), 'user-new.php' );
+	if (($username != null && ! is_super_admin($user_id)) && (array_key_exists($blog_id, get_blogs_of_user($user_id)))) {
+		$redirect = add_query_arg(array('update' => 'addexisting'), 'user-new.php');
 	} else {
-		if ( isset( $_POST[ 'noconfirmation' ] ) && current_user_can( 'manage_network_users' ) ) {
-			add_existing_user_to_blog( array( 'user_id' => $user_id, 'role' => $_REQUEST[ 'role' ] ) );
-			$redirect = add_query_arg( array( 'update' => 'addnoconfirmation' , 'user_id' => $user_id ), 'user-new.php' );
+		if (isset($_POST['noconfirmation']) && current_user_can('manage_network_users')) {
+			add_existing_user_to_blog(array('user_id' => $user_id, 'role' => $_REQUEST['role']));
+			$redirect = add_query_arg(array('update' => 'addnoconfirmation', 'user_id' => $user_id), 'user-new.php');
 		} else {
-			$newuser_key = substr( md5( $user_id ), 0, 5 );
-			add_option( 'new_user_' . $newuser_key, array( 'user_id' => $user_id, 'email' => $user_details->user_email, 'role' => $_REQUEST[ 'role' ] ) );
+			$newuser_key = substr(md5($user_id), 0, 5);
+			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.
@@ -85,52 +85,52 @@ 
 			 * @param array  $role        The role of invited user.
 			 * @param string $newuser_key The key of the invitation.
 			 */
-			do_action( 'invite_user', $user_id, $role, $newuser_key );
+			do_action('invite_user', $user_id, $role, $newuser_key);
 
 			/* 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' );
-			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/" ) ) );
-			$redirect = add_query_arg( array('update' => 'add'), 'user-new.php' );
+			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/")));
+			$redirect = add_query_arg(array('update' => 'add'), 'user-new.php');
 		}
 	}
-	wp_redirect( $redirect );
+	wp_redirect($redirect);
 	die();
-} elseif ( isset($_REQUEST['action']) && 'createuser' == $_REQUEST['action'] ) {
-	check_admin_referer( 'create-user', '_wpnonce_create-user' );
+} elseif (isset($_REQUEST['action']) && 'createuser' == $_REQUEST['action']) {
+	check_admin_referer('create-user', '_wpnonce_create-user');
 
-	if ( ! current_user_can( 'create_users' ) ) {
+	if ( ! current_user_can('create_users')) {
 		wp_die(
-			'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-			'<p>' . __( 'You are not allowed to create users.' ) . '</p>',
+			'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+			'<p>'.__('You are not allowed to create users.').'</p>',
 			403
 		);
 	}
 
-	if ( ! is_multisite() ) {
+	if ( ! is_multisite()) {
 		$user_id = edit_user();
 
-		if ( is_wp_error( $user_id ) ) {
+		if (is_wp_error($user_id)) {
 			$add_user_errors = $user_id;
 		} else {
-			if ( current_user_can( 'list_users' ) )
-				$redirect = 'users.php?update=add&id=' . $user_id;
+			if (current_user_can('list_users'))
+				$redirect = 'users.php?update=add&id='.$user_id;
 			else
-				$redirect = add_query_arg( 'update', 'add', 'user-new.php' );
-			wp_redirect( $redirect );
+				$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' ];
+		$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'];
 		} else {
 			/**
 			 * Filter the user_login, also known as the username, before it is added to the site.
@@ -139,24 +139,24 @@ 
 			 *
 			 * @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' ) ) {
-				add_filter( 'wpmu_signup_user_notification', '__return_false' ); // Disable confirmation email
-				add_filter( 'wpmu_welcome_user_notification', '__return_false' ); // Disable welcome email
+			$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')) {
+				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' => $wpdb->blogid, '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' );
+			wpmu_signup_user($new_user_login, $new_user_email, array('add_to_blog' => $wpdb->blogid, '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');
 				} 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 );
+			wp_redirect($redirect);
 			die();
 		}
 	}
@@ -166,48 +166,48 @@ 
 $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>';
+$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>';
+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>' . __('You must assign a password to the new user, which they can change after logging in. The username, however, cannot be changed.') . '</p>' .
-	'<p>' . __('New users will receive an email letting them know they&#8217;ve been added as a user for your site. By default, this email will also contain their password. Uncheck the box if you don&#8217;t want the password to be included in the welcome email.') . '</p>';
+	$help .= '<p>'.__('You must assign a password to the new user, which they can change after logging in. The username, however, cannot be changed.').'</p>'.
+	'<p>'.__('New users will receive an email letting them know they&#8217;ve been added as a user for your site. By default, this email will also contain their password. Uncheck the box if you don&#8217;t want the password to be included in the 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>'.__('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(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'overview',
 	'title'   => __('Overview'),
 	'content' => $help,
-) );
+));
 
-get_current_screen()->add_help_tab( array(
+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>' .
+'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" target="_blank">Documentation on Adding New Users</a>') . '</p>' .
-    '<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+    '<p><strong>'.__('For more information:').'</strong></p>'.
+    '<p>'.__('<a href="https://codex.wordpress.org/Users_Add_New_Screen" target="_blank">Documentation on Adding New Users</a>').'</p>'.
+    '<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>'
 );
 
 wp_enqueue_script('wp-ajax-response');
-wp_enqueue_script( 'user-profile' );
+wp_enqueue_script('user-profile');
 
 /**
  * Filter whether to enable user auto-complete for non-super admins in Multisite.
@@ -216,26 +216,26 @@ 
  *
  * @param bool $enable Whether to enable auto-complete for non-super admins. Default false.
  */
-if ( is_multisite() && current_user_can( 'promote_users' ) && ! wp_is_large_network( 'users' )
-	&& ( is_super_admin() || apply_filters( 'autocomplete_users_for_site_admins', false ) )
+if (is_multisite() && current_user_can('promote_users') && ! wp_is_large_network('users')
+	&& (is_super_admin() || apply_filters('autocomplete_users_for_site_admins', false))
 ) {
-	wp_enqueue_script( 'user-suggest' );
+	wp_enqueue_script('user-suggest');
 }
 
-require_once( ABSPATH . 'wp-admin/admin-header.php' );
+require_once(ABSPATH.'wp-admin/admin-header.php');
 
-if ( isset($_GET['update']) ) {
+if (isset($_GET['update'])) {
 	$messages = array();
-	if ( is_multisite() ) {
+	if (is_multisite()) {
 		$edit_link = '';
-		if ( ( isset( $_GET['user_id'] ) ) ) {
-			$user_id_new = absint( $_GET['user_id'] );
-			if ( $user_id_new ) {
-				$edit_link = esc_url( add_query_arg( 'wp_http_referer', urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ), get_edit_user_link( $user_id_new ) ) );
+		if ((isset($_GET['user_id']))) {
+			$user_id_new = absint($_GET['user_id']);
+			if ($user_id_new) {
+				$edit_link = esc_url(add_query_arg('wp_http_referer', urlencode(wp_unslash($_SERVER['REQUEST_URI'])), get_edit_user_link($user_id_new)));
 			}
 		}
 
-		switch ( $_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.');
 				break;
@@ -243,11 +243,11 @@ 
 				$messages[] = __('Invitation email sent to user. A confirmation link must be clicked for them to be added to your site.');
 				break;
 			case "addnoconfirmation":
-				if ( empty( $edit_link ) ) {
-					$messages[] = __( 'User has been added to your site.' );
+				if (empty($edit_link)) {
+					$messages[] = __('User has been added to your site.');
 				} else {
 					/* translators: %s: edit page url */
-					$messages[] = sprintf( __( 'User has been added to your site. <a href="%s">Edit user</a>' ), $edit_link );
+					$messages[] = sprintf(__('User has been added to your site. <a href="%s">Edit user</a>'), $edit_link);
 				}
 				break;
 			case "addexisting":
@@ -261,40 +261,40 @@ 
 				break;
 		}
 	} else {
-		if ( 'add' == $_GET['update'] )
+		if ('add' == $_GET['update'])
 			$messages[] = __('User added.');
 	}
 }
 ?>
 <div class="wrap">
 <h1 id="add-new-user"><?php
-if ( current_user_can( 'create_users' ) ) {
-	echo _x( 'Add New User', 'user' );
-} elseif ( current_user_can( 'promote_users' ) ) {
-	echo _x( 'Add Existing User', 'user' );
+if (current_user_can('create_users')) {
+	echo _x('Add New User', 'user');
+} elseif (current_user_can('promote_users')) {
+	echo _x('Add Existing User', '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 )
+			foreach ($errors->get_error_messages() as $err)
 				echo "<li>$err</li>\n";
 		?>
 		</ul>
 	</div>
 <?php endif;
 
-if ( ! empty( $messages ) ) {
-	foreach ( $messages as $msg )
-		echo '<div id="message" class="updated notice is-dismissible"><p>' . $msg . '</p></div>';
+if ( ! empty($messages)) {
+	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 )
+			foreach ($add_user_errors->get_error_messages() as $message)
 				echo "<p>$message</p>";
 		?>
 	</div>
@@ -302,15 +302,15 @@ 
 <div id="ajax-response"></div>
 
 <?php
-if ( is_multisite() ) {
-	if ( $do_both )
-		echo '<h2 id="add-existing-user">' . __( 'Add Existing User' ) . '</h2>';
-	if ( !is_super_admin() ) {
-		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>';
+if (is_multisite()) {
+	if ($do_both)
+		echo '<h2 id="add-existing-user">'.__('Add Existing User').'</h2>';
+	if ( ! is_super_admin()) {
+		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');
 		$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>';
+		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');
 		$type  = 'text';
 	}
@@ -321,10 +321,10 @@ 
 	 *
 	 * @since 3.0.0
 	 */
-	do_action( 'user_new_form_tag' );
+	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">
@@ -334,14 +334,14 @@ 
 	<tr class="form-field">
 		<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>
-<?php if ( current_user_can( 'manage_network_users' ) ) { ?>
+<?php if (current_user_can('manage_network_users')) { ?>
 	<tr>
 		<th scope="row"><label for="adduser-noconfirmation"><?php _e('Skip Confirmation Email') ?></label></th>
-		<td><label for="adduser-noconfirmation"><input type="checkbox" name="noconfirmation" id="adduser-noconfirmation" value="1" /> <?php _e( 'Add the user without sending an email that requires their confirmation.' ); ?></label></td>
+		<td><label for="adduser-noconfirmation"><input type="checkbox" name="noconfirmation" id="adduser-noconfirmation" value="1" /> <?php _e('Add the user without sending an email that requires their confirmation.'); ?></label></td>
 	</tr>
 <?php } ?>
 </table>
@@ -357,48 +357,48 @@ 
  *
  * @param string $type A contextual string specifying which type of new user form the hook follows.
  */
-do_action( 'user_new_form', 'add-existing-user' );
+do_action('user_new_form', 'add-existing-user');
 ?>
-<?php submit_button( __( 'Add Existing User' ), 'primary', 'adduser', true, array( 'id' => 'addusersub' ) ); ?>
+<?php submit_button(__('Add Existing User'), 'primary', 'adduser', true, array('id' => 'addusersub')); ?>
 </form>
 <?php
 } // is_multisite()
 
-if ( current_user_can( 'create_users') ) {
-	if ( $do_both )
-		echo '<h2 id="create-new-user">' . __( 'Add New User' ) . '</h2>';
+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
 	/** This action is documented in wp-admin/user-new.php */
-	do_action( 'user_new_form_tag' );
+	do_action('user_new_form_tag');
 ?>>
 <input name="action" type="hidden" value="createuser" />
-<?php wp_nonce_field( 'create-user', '_wpnonce_create-user' ); ?>
+<?php wp_nonce_field('create-user', '_wpnonce_create-user'); ?>
 <?php
 // Load up the passed data, else set to a default.
-$creating = isset( $_POST['createuser'] );
+$creating = isset($_POST['createuser']);
 
-$new_user_login = $creating && isset( $_POST['user_login'] ) ? wp_unslash( $_POST['user_login'] ) : '';
-$new_user_firstname = $creating && isset( $_POST['first_name'] ) ? wp_unslash( $_POST['first_name'] ) : '';
-$new_user_lastname = $creating && isset( $_POST['last_name'] ) ? wp_unslash( $_POST['last_name'] ) : '';
-$new_user_email = $creating && isset( $_POST['email'] ) ? wp_unslash( $_POST['email'] ) : '';
-$new_user_uri = $creating && isset( $_POST['url'] ) ? wp_unslash( $_POST['url'] ) : '';
-$new_user_role = $creating && isset( $_POST['role'] ) ? wp_unslash( $_POST['role'] ) : '';
-$new_user_send_notification = $creating && ! isset( $_POST['send_user_notification'] ) ? false : true;
-$new_user_ignore_pass = $creating && isset( $_POST['noconfirmation'] ) ? wp_unslash( $_POST['noconfirmation'] ) : '';
+$new_user_login = $creating && isset($_POST['user_login']) ? wp_unslash($_POST['user_login']) : '';
+$new_user_firstname = $creating && isset($_POST['first_name']) ? wp_unslash($_POST['first_name']) : '';
+$new_user_lastname = $creating && isset($_POST['last_name']) ? wp_unslash($_POST['last_name']) : '';
+$new_user_email = $creating && isset($_POST['email']) ? wp_unslash($_POST['email']) : '';
+$new_user_uri = $creating && isset($_POST['url']) ? wp_unslash($_POST['url']) : '';
+$new_user_role = $creating && isset($_POST['role']) ? wp_unslash($_POST['role']) : '';
+$new_user_send_notification = $creating && ! isset($_POST['send_user_notification']) ? false : true;
+$new_user_ignore_pass = $creating && isset($_POST['noconfirmation']) ? wp_unslash($_POST['noconfirmation']) : '';
 
 ?>
 <table class="form-table">
 	<tr class="form-field form-required">
 		<th scope="row"><label for="user_login"><?php _e('Username'); ?> <span class="description"><?php _e('(required)'); ?></span></label></th>
-		<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>
+		<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>
-		<td><input name="email" type="email" id="email" value="<?php echo esc_attr( $new_user_email ); ?>" /></td>
+		<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>
@@ -409,82 +409,82 @@ 
 	</tr>
 	<tr class="form-field">
 		<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>
+		<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">
 		<th scope="row">
 			<label for="pass1">
-				<?php _e( 'Password' ); ?>
-				<span class="description hide-if-js"><?php _e( '(required)' ); ?></span>
+				<?php _e('Password'); ?>
+				<span class="description hide-if-js"><?php _e('(required)'); ?></span>
 			</label>
 		</th>
 		<td>
 			<input class="hidden" value=" " /><!-- #24364 workaround -->
-			<button type="button" class="button button-secondary wp-generate-pw hide-if-no-js"><?php _e( 'Show password' ); ?></button>
+			<button type="button" class="button button-secondary wp-generate-pw hide-if-no-js"><?php _e('Show password'); ?></button>
 			<div class="wp-pwd hide-if-js">
-				<?php $initial_password = wp_generate_password( 24 ); ?>
+				<?php $initial_password = wp_generate_password(24); ?>
 				<span class="password-input-wrapper">
-					<input type="password" name="pass1" id="pass1" class="regular-text" autocomplete="off" data-reveal="1" data-pw="<?php echo esc_attr( $initial_password ); ?>" aria-describedby="pass-strength-result" />
+					<input type="password" name="pass1" id="pass1" class="regular-text" autocomplete="off" data-reveal="1" data-pw="<?php echo esc_attr($initial_password); ?>" aria-describedby="pass-strength-result" />
 				</span>
-				<button type="button" class="button button-secondary wp-hide-pw hide-if-no-js" data-toggle="0" aria-label="<?php esc_attr_e( 'Hide password' ); ?>">
+				<button type="button" class="button button-secondary wp-hide-pw hide-if-no-js" data-toggle="0" aria-label="<?php esc_attr_e('Hide password'); ?>">
 					<span class="dashicons dashicons-hidden"></span>
-					<span class="text"><?php _e( 'Hide' ); ?></span>
+					<span class="text"><?php _e('Hide'); ?></span>
 				</button>
-				<button type="button" class="button button-secondary wp-cancel-pw hide-if-no-js" data-toggle="0" aria-label="<?php esc_attr_e( 'Cancel password change' ); ?>">
-					<span class="text"><?php _e( 'Cancel' ); ?></span>
+				<button type="button" class="button button-secondary wp-cancel-pw hide-if-no-js" data-toggle="0" aria-label="<?php esc_attr_e('Cancel password change'); ?>">
+					<span class="text"><?php _e('Cancel'); ?></span>
 				</button>
 				<div style="display:none" id="pass-strength-result" aria-live="polite"></div>
 			</div>
 		</td>
 	</tr>
 	<tr class="form-field form-required user-pass2-wrap hide-if-js">
-		<th scope="row"><label for="pass2"><?php _e( 'Repeat Password' ); ?> <span class="description"><?php _e( '(required)' ); ?></span></label></th>
+		<th scope="row"><label for="pass2"><?php _e('Repeat Password'); ?> <span class="description"><?php _e('(required)'); ?></span></label></th>
 		<td>
 		<input name="pass2" type="password" id="pass2" autocomplete="off" />
 		</td>
 	</tr>
 	<tr class="pw-weak">
-		<th><?php _e( 'Confirm Password' ); ?></th>
+		<th><?php _e('Confirm Password'); ?></th>
 		<td>
 			<label>
 				<input type="checkbox" name="pw_weak" class="pw-checkbox" />
-				<?php _e( 'Confirm use of weak password' ); ?>
+				<?php _e('Confirm use of weak password'); ?>
 			</label>
 		</td>
 	</tr>
 	<tr>
-		<th scope="row"><?php _e( 'Send User Notification' ) ?></th>
-		<td><label for="send_user_notification"><input type="checkbox" name="send_user_notification" id="send_user_notification" value="1" <?php checked( $new_user_send_notification ); ?> /> <?php _e( 'Send the new user an email about their account.' ); ?></label></td>
+		<th scope="row"><?php _e('Send User Notification') ?></th>
+		<td><label for="send_user_notification"><input type="checkbox" name="send_user_notification" id="send_user_notification" value="1" <?php checked($new_user_send_notification); ?> /> <?php _e('Send the new user an email about their account.'); ?></label></td>
 	</tr>
 <?php } // !is_multisite ?>
 	<tr class="form-field">
 		<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');
+			if ( ! $new_user_role)
+				$new_user_role = ! empty($current_role) ? $current_role : get_option('default_role');
 			wp_dropdown_roles($new_user_role);
 			?>
 			</select>
 		</td>
 	</tr>
-	<?php if ( is_multisite() && current_user_can( 'manage_network_users' ) ) { ?>
+	<?php if (is_multisite() && current_user_can('manage_network_users')) { ?>
 	<tr>
 		<th scope="row"><label for="noconfirmation"><?php _e('Skip Confirmation Email') ?></label></th>
-		<td><label for="noconfirmation"><input type="checkbox" name="noconfirmation" id="noconfirmation" value="1" <?php checked( $new_user_ignore_pass ); ?> /> <?php _e( 'Add the user without sending an email that requires their confirmation.' ); ?></label></td>
+		<td><label for="noconfirmation"><input type="checkbox" name="noconfirmation" id="noconfirmation" value="1" <?php checked($new_user_ignore_pass); ?> /> <?php _e('Add the user without sending an email that requires their confirmation.'); ?></label></td>
 	</tr>
 	<?php } ?>
 </table>
 
 <?php
 /** This action is documented in wp-admin/user-new.php */
-do_action( 'user_new_form', 'add-new-user' );
+do_action('user_new_form', 'add-new-user');
 ?>
 
-<?php submit_button( __( 'Add New User' ), 'primary', 'createuser', true, array( 'id' => 'createusersub' ) ); ?>
+<?php submit_button(__('Add New User'), 'primary', 'createuser', true, array('id' => 'createusersub')); ?>
 
 </form>
 <?php } // current_user_can('create_users') ?>
 </div>
 <?php
-include( ABSPATH . 'wp-admin/admin-footer.php' );
+include(ABSPATH.'wp-admin/admin-footer.php');

Braces +30 added lines, -21 removed lines

@@ -118,10 +118,11 @@ 
 		if ( is_wp_error( $user_id ) ) {
 			$add_user_errors = $user_id;
 		} else {
-			if ( current_user_can( 'list_users' ) )
-				$redirect = 'users.php?update=add&id=' . $user_id;
-			else
-				$redirect = add_query_arg( 'update', 'add', 'user-new.php' );
+			if ( current_user_can( 'list_users' ) ) {
+							$redirect = 'users.php?update=add&id=' . $user_id;
+			} else {
+							$redirect = add_query_arg( 'update', 'add', 'user-new.php' );
+			}
 			wp_redirect( $redirect );
 			die();
 		}
@@ -166,8 +167,9 @@ 
 $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>';
 
@@ -261,8 +263,9 @@ 
 				break;
 		}
 	} else {
-		if ( 'add' == $_GET['update'] )
-			$messages[] = __('User added.');
+		if ( 'add' == $_GET['update'] ) {
+					$messages[] = __('User added.');
+		}
 	}
 }
 ?>
@@ -279,23 +282,26 @@ 
 	<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;
 
 if ( ! empty( $messages ) ) {
-	foreach ( $messages as $msg )
-		echo '<div id="message" class="updated notice is-dismissible"><p>' . $msg . '</p></div>';
-} ?>
+	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 ) ) : ?>
 	<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; ?>
@@ -303,8 +309,9 @@ 
 
 <?php
 if ( is_multisite() ) {
-	if ( $do_both )
-		echo '<h2 id="add-existing-user">' . __( 'Add Existing User' ) . '</h2>';
+	if ( $do_both ) {
+			echo '<h2 id="add-existing-user">' . __( 'Add Existing User' ) . '</h2>';
+	}
 	if ( !is_super_admin() ) {
 		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');
@@ -365,9 +372,10 @@ 
 } // is_multisite()
 
 if ( current_user_can( 'create_users') ) {
-	if ( $do_both )
-		echo '<h2 id="create-new-user">' . __( 'Add New User' ) . '</h2>';
-?>
+	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
 	/** This action is documented in wp-admin/user-new.php */
@@ -461,8 +469,9 @@ 
 		<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');
+			if ( !$new_user_role ) {
+							$new_user_role = !empty($current_role) ? $current_role : get_option('default_role');
+			}
 			wp_dropdown_roles($new_user_role);
 			?>
 			</select>

src/wp-admin/users.php

Indentation +10 added lines, -10 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 /**
- * User administration panel
- *
- * @package WordPress
- * @subpackage Administration
- * @since 1.0.0
- */
+			 * User administration panel
+			 *
+			 * @package WordPress
+			 * @subpackage Administration
+			 * @since 1.0.0
+			 */
 
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
@@ -63,10 +63,10 @@ 
 unset( $help );
 
 get_current_screen()->set_help_sidebar(
-    '<p><strong>' . __('For more information:') . '</strong></p>' .
-    '<p>' . __('<a href="https://codex.wordpress.org/Users_Screen" target="_blank">Documentation on Managing Users</a>') . '</p>' .
-    '<p>' . __('<a href="https://codex.wordpress.org/Roles_and_Capabilities" target="_blank">Descriptions of Roles and Capabilities</a>') . '</p>' .
-    '<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+	'<p><strong>' . __('For more information:') . '</strong></p>' .
+	'<p>' . __('<a href="https://codex.wordpress.org/Users_Screen" target="_blank">Documentation on Managing Users</a>') . '</p>' .
+	'<p>' . __('<a href="https://codex.wordpress.org/Roles_and_Capabilities" target="_blank">Descriptions of Roles and Capabilities</a>') . '</p>' .
+	'<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
 );
 
 get_current_screen()->set_screen_reader_content( array(

Switch Indentation +273 added lines, -273 removed lines

@@ -90,101 +90,101 @@ 
 switch ( $wp_list_table->current_action() ) {
 
 /* Bulk Dropdown menu Role changes */
-case 'promote':
-	check_admin_referer('bulk-users');
+	case 'promote':
+		check_admin_referer('bulk-users');
 
-	if ( ! current_user_can( 'promote_users' ) )
-		wp_die( __( 'You can’t edit that user.' ) );
+		if ( ! current_user_can( 'promote_users' ) )
+			wp_die( __( 'You can’t edit that user.' ) );
 
-	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( __( 'You can’t give users that role.' ) );
-	}
-
-	$userids = $_REQUEST['users'];
-	$update = 'promote';
-	foreach ( $userids as $id ) {
-		$id = (int) $id;
-
-		if ( ! current_user_can('promote_user', $id) )
-			wp_die(__('You can’t edit that user.'));
-		// 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() && is_super_admin() ) ) {
-				$update = 'err_admin_role';
-				continue;
+		if ( empty($_REQUEST['users']) ) {
+			wp_redirect($redirect);
+			exit();
 		}
 
-		// 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
-			);
+		$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'];
 		}
 
-		$user = get_userdata( $id );
-		$user->set_role( $role );
-	}
+		if ( ! $role || empty( $editable_roles[ $role ] ) ) {
+			wp_die( __( 'You can&#8217;t give users that role.' ) );
+		}
 
-	wp_redirect(add_query_arg('update', $update, $redirect));
-	exit();
+		$userids = $_REQUEST['users'];
+		$update = 'promote';
+		foreach ( $userids as $id ) {
+			$id = (int) $id;
+
+			if ( ! current_user_can('promote_user', $id) )
+				wp_die(__('You can&#8217;t edit that user.'));
+			// 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() && is_super_admin() ) ) {
+					$update = 'err_admin_role';
+					continue;
+			}
 
-case 'dodelete':
-	if ( is_multisite() )
-		wp_die( __('User deletion is not allowed from this screen.') );
+			// 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
+				);
+			}
 
-	check_admin_referer('delete-users');
+			$user = get_userdata( $id );
+			$user->set_role( $role );
+		}
 
-	if ( empty($_REQUEST['users']) ) {
-		wp_redirect($redirect);
+		wp_redirect(add_query_arg('update', $update, $redirect));
 		exit();
-	}
 
-	$userids = array_map( 'intval', (array) $_REQUEST['users'] );
+	case 'dodelete':
+		if ( is_multisite() )
+			wp_die( __('User deletion is not allowed from this screen.') );
 
-	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(__('You can&#8217;t delete users.'));
+		check_admin_referer('delete-users');
 
-	$update = 'del';
-	$delete_count = 0;
+		if ( empty($_REQUEST['users']) ) {
+			wp_redirect($redirect);
+			exit();
+		}
 
-	foreach ( $userids as $id ) {
-		if ( ! current_user_can( 'delete_user', $id ) )
-			wp_die(__( 'You can&#8217;t delete that user.' ) );
+		$userids = array_map( 'intval', (array) $_REQUEST['users'] );
 
-		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;
+		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(__('You can&#8217;t delete users.'));
+
+		$update = 'del';
+		$delete_count = 0;
+
+		foreach ( $userids as $id ) {
+			if ( ! current_user_can( 'delete_user', $id ) )
+				wp_die(__( 'You can&#8217;t delete that user.' ) );
+
+			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;
 	}
 
@@ -192,95 +192,95 @@ 
 	wp_redirect($redirect);
 	exit();
 
-case 'delete':
-	if ( is_multisite() )
-		wp_die( __('User deletion is not allowed from this screen.') );
+	case 'delete':
+		if ( is_multisite() )
+			wp_die( __('User deletion is not allowed from this screen.') );
 
-	check_admin_referer('bulk-users');
+		check_admin_referer('bulk-users');
 
-	if ( empty($_REQUEST['users']) && empty($_REQUEST['user']) ) {
-		wp_redirect($redirect);
-		exit();
-	}
+		if ( empty($_REQUEST['users']) && empty($_REQUEST['user']) ) {
+			wp_redirect($redirect);
+			exit();
+		}
 
-	if ( ! current_user_can( 'delete_users' ) )
-		$errors = new WP_Error( 'edit_users', __( 'You can&#8217;t delete users.' ) );
+		if ( ! current_user_can( 'delete_users' ) )
+			$errors = new WP_Error( 'edit_users', __( 'You can&#8217;t delete users.' ) );
 
-	if ( empty($_REQUEST['users']) )
-		$userids = array( intval( $_REQUEST['user'] ) );
-	else
-		$userids = array_map( 'intval', (array) $_REQUEST['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;
-	}
+		$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' );
-	}
+		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; ?>
+		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">
 <h1><?php _e( 'Delete Users' ); ?></h1>
-<?php if ( isset( $_REQUEST['error'] ) ) : ?>
+	<?php if ( isset( $_REQUEST['error'] ) ) : ?>
 	<div class="error">
 		<p><strong><?php _e( 'ERROR:' ); ?></strong> <?php _e( 'Please select an option.' ); ?></p>
 	</div>
 <?php endif; ?>
-
-<?php if ( 1 == count( $userids ) ) : ?>
-	<p><?php _e( 'You have specified this user for deletion:' ); ?></p>
-<?php else : ?>
-	<p><?php _e( 'You have specified these users for deletion:' ); ?></p>
-<?php endif; ?>
+	
+	<?php if ( 1 == count( $userids ) ) : ?>
+		<p><?php _e( 'You have specified this user for deletion:' ); ?></p>
+	<?php else : ?>
+		<p><?php _e( 'You have specified these users for deletion:' ); ?></p>
+	<?php endif; ?>
 
 <ul>
 <?php
-	$go_delete = 0;
-	foreach ( $userids as $id ) {
-		$user = get_userdata( $id );
-		if ( $id == $current_user->ID ) {
-			/* translators: 1: user id, 2: user login */
-			echo "<li>" . sprintf(__('ID #%1$s: %2$s <strong>The current user will not be deleted.</strong>'), $id, $user->user_login) . "</li>\n";
-		} else {
-			/* translators: 1: user id, 2: user login */
-			echo "<li><input type=\"hidden\" name=\"users[]\" value=\"" . esc_attr($id) . "\" />" . sprintf(__('ID #%1$s: %2$s'), $id, $user->user_login) . "</li>\n";
-			$go_delete++;
+		$go_delete = 0;
+		foreach ( $userids as $id ) {
+			$user = get_userdata( $id );
+			if ( $id == $current_user->ID ) {
+				/* translators: 1: user id, 2: user login */
+				echo "<li>" . sprintf(__('ID #%1$s: %2$s <strong>The current user will not be deleted.</strong>'), $id, $user->user_login) . "</li>\n";
+			} else {
+				/* translators: 1: user id, 2: user login */
+				echo "<li><input type=\"hidden\" name=\"users[]\" value=\"" . esc_attr($id) . "\" />" . sprintf(__('ID #%1$s: %2$s'), $id, $user->user_login) . "</li>\n";
+				$go_delete++;
+			}
 		}
-	}
-	?>
-	</ul>
-<?php if ( $go_delete ) :
+		?>
+		</ul>
+	<?php if ( $go_delete ) :
 
-	if ( ! $users_have_content ) : ?>
-		<input type="hidden" name="delete_option" value="delete" />
+		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 if ( 1 == $go_delete ) : ?>
+				<fieldset><p><legend><?php _e( 'What should be done with content owned by this user?' ); ?></legend></p>
 		<?php else : ?>
-			<fieldset><p><legend><?php _e( 'What should be done with content owned by these users?' ); ?></legend></p>
+				<fieldset><p><legend><?php _e( 'What should be done with content owned by these users?' ); ?></legend></p>
 		<?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>
 			<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>
+				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;
-	/**
+		/**
 	 * Fires at the end of the delete users form prior to the confirm button.
 	 *
 	 * @since 4.0.0
@@ -289,178 +289,178 @@ 
 	 * @param WP_User $current_user WP_User object for the current user.
 	 * @param array   $userids      Array of IDs for users being deleted.
 	 */
-	do_action( 'delete_user_form', $current_user, $userids );
-	?>
-	<input type="hidden" name="action" value="dodelete" />
+		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; ?>
+	<?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.' ) );
+		if ( ! is_multisite() )
+			wp_die( __( 'You can&#8217;t remove users.' ) );
 
-	if ( empty($_REQUEST['users']) ) {
-		wp_redirect($redirect);
-		exit;
-	}
+		if ( empty($_REQUEST['users']) ) {
+			wp_redirect($redirect);
+			exit;
+		}
 
-	if ( ! current_user_can( 'remove_users' ) )
-		wp_die( __( 'You can&#8217;t remove users.' ) );
+		if ( ! current_user_can( 'remove_users' ) )
+			wp_die( __( 'You can&#8217;t remove users.' ) );
 
-	$userids = $_REQUEST['users'];
+		$userids = $_REQUEST['users'];
 
-	$update = 'remove';
- 	foreach ( $userids as $id ) {
-		$id = (int) $id;
-		if ( $id == $current_user->ID && !is_super_admin() ) {
-			$update = 'err_admin_remove';
-			continue;
-		}
-		if ( !current_user_can('remove_user', $id) ) {
-			$update = 'err_admin_remove';
-			continue;
+		$update = 'remove';
+ 		foreach ( $userids as $id ) {
+			$id = (int) $id;
+			if ( $id == $current_user->ID && !is_super_admin() ) {
+				$update = 'err_admin_remove';
+				continue;
+			}
+			if ( !current_user_can('remove_user', $id) ) {
+				$update = 'err_admin_remove';
+				continue;
+			}
+			remove_user_from_blog($id, $blog_id);
 		}
-		remove_user_from_blog($id, $blog_id);
-	}
 
-	$redirect = add_query_arg( array('update' => $update), $redirect);
-	wp_redirect($redirect);
-	exit;
+		$redirect = add_query_arg( array('update' => $update), $redirect);
+		wp_redirect($redirect);
+		exit;
 
-case 'remove':
+	case 'remove':
 
-	check_admin_referer('bulk-users');
+		check_admin_referer('bulk-users');
 
-	if ( ! is_multisite() )
-		wp_die( __( 'You can&#8217;t remove users.' ) );
+		if ( ! is_multisite() )
+			wp_die( __( 'You can&#8217;t remove users.' ) );
 
-	if ( empty($_REQUEST['users']) && empty($_REQUEST['user']) ) {
-		wp_redirect($redirect);
-		exit();
-	}
+		if ( empty($_REQUEST['users']) && empty($_REQUEST['user']) ) {
+			wp_redirect($redirect);
+			exit();
+		}
 
-	if ( !current_user_can('remove_users') )
-		$error = new WP_Error('edit_users', __('You can&#8217;t remove users.'));
+		if ( !current_user_can('remove_users') )
+			$error = new WP_Error('edit_users', __('You can&#8217;t remove users.'));
 
-	if ( empty($_REQUEST['users']) )
-		$userids = array(intval($_REQUEST['user']));
-	else
-		$userids = $_REQUEST['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; ?>
+		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">
 <h1><?php _e( 'Remove Users from Site' ); ?></h1>
 
-<?php if ( 1 == count( $userids ) ) : ?>
-	<p><?php _e( 'You have specified this user for removal:' ); ?></p>
-<?php else : ?>
-	<p><?php _e( 'You have specified these users for removal:' ); ?></p>
-<?php endif; ?>
+	<?php if ( 1 == count( $userids ) ) : ?>
+		<p><?php _e( 'You have specified this user for removal:' ); ?></p>
+	<?php else : ?>
+		<p><?php _e( 'You have specified these users for removal:' ); ?></p>
+	<?php endif; ?>
 
 <ul>
 <?php
-	$go_remove = false;
- 	foreach ( $userids as $id ) {
-		$id = (int) $id;
- 		$user = get_userdata( $id );
-		if ( $id == $current_user->ID && !is_super_admin() ) {
-			/* translators: 1: user id, 2: user login */
-			echo "<li>" . sprintf(__('ID #%1$s: %2$s <strong>The current user will not be removed.</strong>'), $id, $user->user_login) . "</li>\n";
-		} elseif ( !current_user_can('remove_user', $id) ) {
-			/* translators: 1: user id, 2: user login */
-			echo "<li>" . sprintf(__('ID #%1$s: %2$s <strong>You don&#8217;t have permission 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" />
+		$go_remove = false;
+ 		foreach ( $userids as $id ) {
+			$id = (int) $id;
+ 			$user = get_userdata( $id );
+			if ( $id == $current_user->ID && !is_super_admin() ) {
+				/* translators: 1: user id, 2: user login */
+				echo "<li>" . sprintf(__('ID #%1$s: %2$s <strong>The current user will not be removed.</strong>'), $id, $user->user_login) . "</li>\n";
+			} elseif ( !current_user_can('remove_user', $id) ) {
+				/* translators: 1: user id, 2: user login */
+				echo "<li>" . sprintf(__('ID #%1$s: %2$s <strong>You don&#8217;t have permission 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; ?>
+	<?php else : ?>
+		<p><?php _e('There are no valid users selected for removal.'); ?></p>
+	<?php endif; ?>
 </div>
 </form>
 <?php
 
-break;
+	break;
 
-default:
+	default:
 
-	if ( !empty($_GET['_wp_http_referer']) ) {
-		wp_redirect( remove_query_arg( array( '_wp_http_referer', '_wpnonce'), wp_unslash( $_SERVER['REQUEST_URI'] ) ) );
-		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;
-	}
+		if ( !empty($_GET['_wp_http_referer']) ) {
+			wp_redirect( remove_query_arg( array( '_wp_http_referer', '_wpnonce'), wp_unslash( $_SERVER['REQUEST_URI'] ) ) );
+			exit;
+		}
 
-	include( ABSPATH . 'wp-admin/admin-header.php' );
+		$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;
+		}
 
-	$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 );
+		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;
 			}
-			$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 ) ) : ?>

Spacing +175 added lines, -175 removed lines

@@ -8,12 +8,12 @@ 
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( ! current_user_can( 'list_users' ) ) {
+if ( ! current_user_can('list_users')) {
 	wp_die(
-		'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-		'<p>' . __( 'You are not allowed to browse users.' ) . '</p>',
+		'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+		'<p>'.__('You are not allowed to browse users.').'</p>',
 		403
 	);
 }
@@ -23,63 +23,63 @@ 
 $title = __('Users');
 $parent_file = 'users.php';
 
-add_screen_option( 'per_page' );
+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(
+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>'
-) ) ;
+	'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(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'screen-display',
 	'title'   => __('Screen Display'),
-	'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 in the upper left 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>' .
+	'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 in the upper left 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>' .
-	'<ul>' .
-	'<li>' . __('Edit takes you to the editable profile screen for that user. You can also reach that screen by clicking on the username.') . '</li>';
+$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>'.__('Edit 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() )
-	$help .= '<li>' . __( 'Remove 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>';
+if (is_multisite())
+	$help .= '<li>'.__('Remove 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
-	$help .= '<li>' . __( 'Delete 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 .= '<li>'.__('Delete 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(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'actions',
 	'title'   => __('Actions'),
 	'content' => $help,
-) );
-unset( $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" target="_blank">Documentation on Managing Users</a>') . '</p>' .
-    '<p>' . __('<a href="https://codex.wordpress.org/Roles_and_Capabilities" target="_blank">Descriptions of Roles and Capabilities</a>') . '</p>' .
-    '<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+    '<p><strong>'.__('For more information:').'</strong></p>'.
+    '<p>'.__('<a href="https://codex.wordpress.org/Users_Screen" target="_blank">Documentation on Managing Users</a>').'</p>'.
+    '<p>'.__('<a href="https://codex.wordpress.org/Roles_and_Capabilities" target="_blank">Descriptions of Roles and Capabilities</a>').'</p>'.
+    '<p>'.__('<a href="https://wordpress.org/support/" target="_blank">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' ),
-) );
-
-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) . '" />';
+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).'" />';
 } else {
 	$redirect = 'users.php';
 	$referer = '';
@@ -87,197 +87,197 @@ 
 
 $update = '';
 
-switch ( $wp_list_table->current_action() ) {
+switch ($wp_list_table->current_action()) {
 
 /* Bulk Dropdown menu Role changes */
 case 'promote':
 	check_admin_referer('bulk-users');
 
-	if ( ! current_user_can( 'promote_users' ) )
-		wp_die( __( 'You can&#8217;t edit that user.' ) );
+	if ( ! current_user_can('promote_users'))
+		wp_die(__('You can&#8217;t edit that user.'));
 
-	if ( empty($_REQUEST['users']) ) {
+	if (empty($_REQUEST['users'])) {
 		wp_redirect($redirect);
 		exit();
 	}
 
 	$editable_roles = get_editable_roles();
 	$role = false;
-	if ( ! empty( $_REQUEST['new_role2'] ) ) {
+	if ( ! empty($_REQUEST['new_role2'])) {
 		$role = $_REQUEST['new_role2'];
-	} elseif ( ! empty( $_REQUEST['new_role'] ) ) {
+	} elseif ( ! empty($_REQUEST['new_role'])) {
 		$role = $_REQUEST['new_role'];
 	}
 
-	if ( ! $role || empty( $editable_roles[ $role ] ) ) {
-		wp_die( __( 'You can&#8217;t give users that role.' ) );
+	if ( ! $role || empty($editable_roles[$role])) {
+		wp_die(__('You can&#8217;t give users that role.'));
 	}
 
 	$userids = $_REQUEST['users'];
 	$update = 'promote';
-	foreach ( $userids as $id ) {
+	foreach ($userids as $id) {
 		$id = (int) $id;
 
-		if ( ! current_user_can('promote_user', $id) )
+		if ( ! current_user_can('promote_user', $id))
 			wp_die(__('You can&#8217;t edit that user.'));
 		// 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() && is_super_admin() ) ) {
+		if ($id == $current_user->ID && ! $wp_roles->role_objects[$role]->has_cap('promote_users')
+			&& ! (is_multisite() && is_super_admin())) {
 				$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 ) ) {
+		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>',
+				'<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 );
+		$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.') );
+	if (is_multisite())
+		wp_die(__('User deletion is not allowed from this screen.'));
 
 	check_admin_referer('delete-users');
 
-	if ( empty($_REQUEST['users']) ) {
+	if (empty($_REQUEST['users'])) {
 		wp_redirect($redirect);
 		exit();
 	}
 
-	$userids = array_map( 'intval', (array) $_REQUEST['users'] );
+	$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 );
+	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' ) )
+	if ( ! current_user_can('delete_users'))
 		wp_die(__('You can&#8217;t delete users.'));
 
 	$update = 'del';
 	$delete_count = 0;
 
-	foreach ( $userids as $id ) {
-		if ( ! current_user_can( 'delete_user', $id ) )
-			wp_die(__( 'You can&#8217;t delete that user.' ) );
+	foreach ($userids as $id) {
+		if ( ! current_user_can('delete_user', $id))
+			wp_die(__('You can&#8217;t delete that user.'));
 
-		if ( $id == $current_user->ID ) {
+		if ($id == $current_user->ID) {
 			$update = 'err_admin_del';
 			continue;
 		}
-		switch ( $_REQUEST['delete_option'] ) {
+		switch ($_REQUEST['delete_option']) {
 		case 'delete':
-			wp_delete_user( $id );
+			wp_delete_user($id);
 			break;
 		case 'reassign':
-			wp_delete_user( $id, $_REQUEST['reassign_user'] );
+			wp_delete_user($id, $_REQUEST['reassign_user']);
 			break;
 		}
 		++$delete_count;
 	}
 
-	$redirect = add_query_arg( array('delete_count' => $delete_count, 'update' => $update), $redirect);
+	$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.') );
+	if (is_multisite())
+		wp_die(__('User deletion is not allowed from this screen.'));
 
 	check_admin_referer('bulk-users');
 
-	if ( empty($_REQUEST['users']) && empty($_REQUEST['user']) ) {
+	if (empty($_REQUEST['users']) && empty($_REQUEST['user'])) {
 		wp_redirect($redirect);
 		exit();
 	}
 
-	if ( ! current_user_can( 'delete_users' ) )
-		$errors = new WP_Error( 'edit_users', __( 'You can&#8217;t delete users.' ) );
+	if ( ! current_user_can('delete_users'))
+		$errors = new WP_Error('edit_users', __('You can&#8217;t delete users.'));
 
-	if ( empty($_REQUEST['users']) )
-		$userids = array( intval( $_REQUEST['user'] ) );
+	if (empty($_REQUEST['users']))
+		$userids = array(intval($_REQUEST['user']));
 	else
-		$userids = array_map( 'intval', (array) $_REQUEST['users'] );
+		$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" ) ) {
+	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" ) ) {
+	} 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' );
+	if ($users_have_content) {
+		add_action('admin_head', 'delete_users_add_js');
 	}
 
-	include( ABSPATH . 'wp-admin/admin-header.php' );
+	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">
-<h1><?php _e( 'Delete Users' ); ?></h1>
-<?php if ( isset( $_REQUEST['error'] ) ) : ?>
+<h1><?php _e('Delete Users'); ?></h1>
+<?php if (isset($_REQUEST['error'])) : ?>
 	<div class="error">
-		<p><strong><?php _e( 'ERROR:' ); ?></strong> <?php _e( 'Please select an option.' ); ?></p>
+		<p><strong><?php _e('ERROR:'); ?></strong> <?php _e('Please select an option.'); ?></p>
 	</div>
 <?php endif; ?>
 
-<?php if ( 1 == count( $userids ) ) : ?>
-	<p><?php _e( 'You have specified this user for deletion:' ); ?></p>
+<?php if (1 == count($userids)) : ?>
+	<p><?php _e('You have specified this user for deletion:'); ?></p>
 <?php else : ?>
-	<p><?php _e( 'You have specified these users for deletion:' ); ?></p>
+	<p><?php _e('You have specified these users for deletion:'); ?></p>
 <?php endif; ?>
 
 <ul>
 <?php
 	$go_delete = 0;
-	foreach ( $userids as $id ) {
-		$user = get_userdata( $id );
-		if ( $id == $current_user->ID ) {
+	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";
+			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";
+			echo "<li><input type=\"hidden\" name=\"users[]\" value=\"".esc_attr($id)."\" />".sprintf(__('ID #%1$s: %2$s'), $id, $user->user_login)."</li>\n";
 			$go_delete++;
 		}
 	}
 	?>
 	</ul>
-<?php if ( $go_delete ) :
+<?php if ($go_delete) :
 
-	if ( ! $users_have_content ) : ?>
+	if ( ! $users_have_content) : ?>
 		<input type="hidden" name="delete_option" value="delete" />
 	<?php else: ?>
-		<?php if ( 1 == $go_delete ) : ?>
-			<fieldset><p><legend><?php _e( 'What should be done with content owned by this user?' ); ?></legend></p>
+		<?php if (1 == $go_delete) : ?>
+			<fieldset><p><legend><?php _e('What should be done with content owned by this user?'); ?></legend></p>
 		<?php else : ?>
-			<fieldset><p><legend><?php _e( 'What should be done with content owned by these users?' ); ?></legend></p>
+			<fieldset><p><legend><?php _e('What should be done with content owned by these users?'); ?></legend></p>
 		<?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>
 			<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(
+			<?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 ) ),
+				'exclude' => array_diff($userids, array($current_user->ID)),
 				'show' => 'display_name_with_login',
-			) ); ?></li>
+			)); ?></li>
 		</ul></fieldset>
 	<?php endif;
 	/**
@@ -289,10 +289,10 @@ 
 	 * @param WP_User $current_user WP_User object for the current user.
 	 * @param array   $userids      Array of IDs for users being deleted.
 	 */
-	do_action( 'delete_user_form', $current_user, $userids );
+	do_action('delete_user_form', $current_user, $userids);
 	?>
 	<input type="hidden" name="action" value="dodelete" />
-	<?php submit_button( __('Confirm Deletion'), 'primary' ); ?>
+	<?php submit_button(__('Confirm Deletion'), 'primary'); ?>
 <?php else : ?>
 	<p><?php _e('There are no valid users selected for deletion.'); ?></p>
 <?php endif; ?>
@@ -305,34 +305,34 @@ 
 case 'doremove':
 	check_admin_referer('remove-users');
 
-	if ( ! is_multisite() )
-		wp_die( __( 'You can&#8217;t remove users.' ) );
+	if ( ! is_multisite())
+		wp_die(__('You can&#8217;t remove users.'));
 
-	if ( empty($_REQUEST['users']) ) {
+	if (empty($_REQUEST['users'])) {
 		wp_redirect($redirect);
 		exit;
 	}
 
-	if ( ! current_user_can( 'remove_users' ) )
-		wp_die( __( 'You can&#8217;t remove users.' ) );
+	if ( ! current_user_can('remove_users'))
+		wp_die(__('You can&#8217;t remove users.'));
 
 	$userids = $_REQUEST['users'];
 
 	$update = 'remove';
- 	foreach ( $userids as $id ) {
+ 	foreach ($userids as $id) {
 		$id = (int) $id;
-		if ( $id == $current_user->ID && !is_super_admin() ) {
+		if ($id == $current_user->ID && ! is_super_admin()) {
 			$update = 'err_admin_remove';
 			continue;
 		}
-		if ( !current_user_can('remove_user', $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);
+	$redirect = add_query_arg(array('update' => $update), $redirect);
 	wp_redirect($redirect);
 	exit;
 
@@ -340,60 +340,60 @@ 
 
 	check_admin_referer('bulk-users');
 
-	if ( ! is_multisite() )
-		wp_die( __( 'You can&#8217;t remove users.' ) );
+	if ( ! is_multisite())
+		wp_die(__('You can&#8217;t remove users.'));
 
-	if ( empty($_REQUEST['users']) && empty($_REQUEST['user']) ) {
+	if (empty($_REQUEST['users']) && empty($_REQUEST['user'])) {
 		wp_redirect($redirect);
 		exit();
 	}
 
-	if ( !current_user_can('remove_users') )
+	if ( ! current_user_can('remove_users'))
 		$error = new WP_Error('edit_users', __('You can&#8217;t remove users.'));
 
-	if ( empty($_REQUEST['users']) )
+	if (empty($_REQUEST['users']))
 		$userids = array(intval($_REQUEST['user']));
 	else
 		$userids = $_REQUEST['users'];
 
-	include( ABSPATH . 'wp-admin/admin-header.php' );
+	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">
-<h1><?php _e( 'Remove Users from Site' ); ?></h1>
+<h1><?php _e('Remove Users from Site'); ?></h1>
 
-<?php if ( 1 == count( $userids ) ) : ?>
-	<p><?php _e( 'You have specified this user for removal:' ); ?></p>
+<?php if (1 == count($userids)) : ?>
+	<p><?php _e('You have specified this user for removal:'); ?></p>
 <?php else : ?>
-	<p><?php _e( 'You have specified these users for removal:' ); ?></p>
+	<p><?php _e('You have specified these users for removal:'); ?></p>
 <?php endif; ?>
 
 <ul>
 <?php
 	$go_remove = false;
- 	foreach ( $userids as $id ) {
+ 	foreach ($userids as $id) {
 		$id = (int) $id;
- 		$user = get_userdata( $id );
-		if ( $id == $current_user->ID && !is_super_admin() ) {
+ 		$user = get_userdata($id);
+		if ($id == $current_user->ID && ! is_super_admin()) {
 			/* translators: 1: user id, 2: user login */
-			echo "<li>" . sprintf(__('ID #%1$s: %2$s <strong>The current user will not be removed.</strong>'), $id, $user->user_login) . "</li>\n";
-		} elseif ( !current_user_can('remove_user', $id) ) {
+			echo "<li>".sprintf(__('ID #%1$s: %2$s <strong>The current user will not be removed.</strong>'), $id, $user->user_login)."</li>\n";
+		} elseif ( ! current_user_can('remove_user', $id)) {
 			/* translators: 1: user id, 2: user login */
-			echo "<li>" . sprintf(__('ID #%1$s: %2$s <strong>You don&#8217;t have permission to remove this user.</strong>'), $id, $user->user_login) . "</li>\n";
+			echo "<li>".sprintf(__('ID #%1$s: %2$s <strong>You don&#8217;t have permission 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";
+			echo "<li><input type=\"hidden\" name=\"users[]\" value=\"{$id}\" />".sprintf(__('ID #%1$s: %2$s'), $id, $user->user_login)."</li>\n";
 			$go_remove = true;
 		}
  	}
  	?>
 </ul>
-<?php if ( $go_remove ) : ?>
+<?php if ($go_remove) : ?>
 		<input type="hidden" name="action" value="doremove" />
-		<?php submit_button( __('Confirm Removal'), 'primary' ); ?>
+		<?php submit_button(__('Confirm Removal'), 'primary'); ?>
 <?php else : ?>
 	<p><?php _e('There are no valid users selected for removal.'); ?></p>
 <?php endif; ?>
@@ -405,93 +405,93 @@ 
 
 default:
 
-	if ( !empty($_GET['_wp_http_referer']) ) {
-		wp_redirect( remove_query_arg( array( '_wp_http_referer', '_wpnonce'), wp_unslash( $_SERVER['REQUEST_URI'] ) ) );
+	if ( ! empty($_GET['_wp_http_referer'])) {
+		wp_redirect(remove_query_arg(array('_wp_http_referer', '_wpnonce'), wp_unslash($_SERVER['REQUEST_URI'])));
 		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 ) );
+	$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' );
+	include(ABSPATH.'wp-admin/admin-header.php');
 
 	$messages = array();
-	if ( isset($_GET['update']) ) :
-		switch($_GET['update']) {
+	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.' );
+			if (1 == $delete_count) {
+				$message = __('User deleted.');
 			} else {
-				$message = _n( '%s user deleted.', '%s users deleted.', $delete_count );
+				$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>';
+			$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 ) ) {
+			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>';
+				$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>';
+				$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>';
+			$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>';
+			$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>';
+			$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>';
+			$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>';
+			$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 ) ) : ?>
+<?php if (isset($errors) && is_wp_error($errors)) : ?>
 	<div class="error">
 		<ul>
 		<?php
-			foreach ( $errors->get_error_messages() as $err )
+			foreach ($errors->get_error_messages() as $err)
 				echo "<li>$err</li>\n";
 		?>
 		</ul>
 	</div>
 <?php endif;
 
-if ( ! empty($messages) ) {
-	foreach ( $messages as $msg )
+if ( ! empty($messages)) {
+	foreach ($messages as $msg)
 		echo $msg;
 } ?>
 
 <div class="wrap">
 <h1>
 <?php
-echo esc_html( $title );
-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>
+echo esc_html($title);
+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 }
 
-if ( strlen( $usersearch ) ) {
+if (strlen($usersearch)) {
 	/* translators: %s: search keywords */
-	printf( '<span class="subtitle">' . __( 'Search results for &#8220;%s&#8221;' ) . '</span>', esc_html( $usersearch ) );
+	printf('<span class="subtitle">'.__('Search results for &#8220;%s&#8221;').'</span>', esc_html($usersearch));
 }
 ?>
 </h1>
@@ -500,7 +500,7 @@ 
 
 <form method="get">
 
-<?php $wp_list_table->search_box( __( 'Search Users' ), 'user' ); ?>
+<?php $wp_list_table->search_box(__('Search Users'), 'user'); ?>
 
 <?php $wp_list_table->display(); ?>
 </form>
@@ -512,4 +512,4 @@ 
 
 } // end of the $doaction switch
 
-include( ABSPATH . 'wp-admin/admin-footer.php' );
+include(ABSPATH.'wp-admin/admin-footer.php');

Braces +83 added lines, -49 removed lines

@@ -48,10 +48,11 @@ 
 	'<ul>' .
 	'<li>' . __('Edit 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>' . __( 'Remove 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>' . __( 'Delete 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>';
 
@@ -93,8 +94,9 @@ 
 case 'promote':
 	check_admin_referer('bulk-users');
 
-	if ( ! current_user_can( 'promote_users' ) )
-		wp_die( __( 'You can&#8217;t edit that user.' ) );
+	if ( ! current_user_can( 'promote_users' ) ) {
+			wp_die( __( 'You can&#8217;t edit that user.' ) );
+	}
 
 	if ( empty($_REQUEST['users']) ) {
 		wp_redirect($redirect);
@@ -118,8 +120,9 @@ 
 	foreach ( $userids as $id ) {
 		$id = (int) $id;
 
-		if ( ! current_user_can('promote_user', $id) )
-			wp_die(__('You can&#8217;t edit that user.'));
+		if ( ! current_user_can('promote_user', $id) ) {
+					wp_die(__('You can&#8217;t edit that user.'));
+		}
 		// 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() && is_super_admin() ) ) {
@@ -144,8 +147,9 @@ 
 	exit();
 
 case 'dodelete':
-	if ( is_multisite() )
-		wp_die( __('User deletion is not allowed from this screen.') );
+	if ( is_multisite() ) {
+			wp_die( __('User deletion is not allowed from this screen.') );
+	}
 
 	check_admin_referer('delete-users');
 
@@ -163,15 +167,17 @@ 
 		exit;
 	}
 
-	if ( ! current_user_can( 'delete_users' ) )
-		wp_die(__('You can&#8217;t delete users.'));
+	if ( ! current_user_can( 'delete_users' ) ) {
+			wp_die(__('You can&#8217;t delete users.'));
+	}
 
 	$update = 'del';
 	$delete_count = 0;
 
 	foreach ( $userids as $id ) {
-		if ( ! current_user_can( 'delete_user', $id ) )
-			wp_die(__( 'You can&#8217;t delete that user.' ) );
+		if ( ! current_user_can( 'delete_user', $id ) ) {
+					wp_die(__( 'You can&#8217;t delete that user.' ) );
+		}
 
 		if ( $id == $current_user->ID ) {
 			$update = 'err_admin_del';
@@ -193,8 +199,9 @@ 
 	exit();
 
 case 'delete':
-	if ( is_multisite() )
-		wp_die( __('User deletion is not allowed from this screen.') );
+	if ( is_multisite() ) {
+			wp_die( __('User deletion is not allowed from this screen.') );
+	}
 
 	check_admin_referer('bulk-users');
 
@@ -203,13 +210,15 @@ 
 		exit();
 	}
 
-	if ( ! current_user_can( 'delete_users' ) )
-		$errors = new WP_Error( 'edit_users', __( 'You can&#8217;t delete users.' ) );
+	if ( ! current_user_can( 'delete_users' ) ) {
+			$errors = new WP_Error( 'edit_users', __( 'You can&#8217;t delete users.' ) );
+	}
 
-	if ( empty($_REQUEST['users']) )
-		$userids = array( intval( $_REQUEST['user'] ) );
-	else
-		$userids = array_map( 'intval', (array) $_REQUEST['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" ) ) {
@@ -238,8 +247,11 @@ 
 
 <?php if ( 1 == count( $userids ) ) : ?>
 	<p><?php _e( 'You have specified this user for deletion:' ); ?></p>
-<?php else : ?>
-	<p><?php _e( 'You have specified these users for deletion:' ); ?></p>
+<?php else {
+	: ?>
+	<p><?php _e( 'You have specified these users for deletion:' );
+}
+?></p>
 <?php endif; ?>
 
 <ul>
@@ -262,11 +274,17 @@ 
 
 	if ( ! $users_have_content ) : ?>
 		<input type="hidden" name="delete_option" value="delete" />
-	<?php else: ?>
+	<?php else {
+	: ?>
 		<?php if ( 1 == $go_delete ) : ?>
-			<fieldset><p><legend><?php _e( 'What should be done with content owned by this user?' ); ?></legend></p>
-		<?php else : ?>
-			<fieldset><p><legend><?php _e( 'What should be done with content owned by these users?' ); ?></legend></p>
+			<fieldset><p><legend><?php _e( 'What should be done with content owned by this user?' );
+}
+?></legend></p>
+		<?php else {
+	: ?>
+			<fieldset><p><legend><?php _e( 'What should be done with content owned by these users?' );
+}
+?></legend></p>
 		<?php endif; ?>
 		<ul style="list-style:none;">
 			<li><label><input type="radio" id="delete_option0" name="delete_option" value="delete" />
@@ -293,8 +311,11 @@ 
 	?>
 	<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 else {
+	: ?>
+	<p><?php _e('There are no valid users selected for deletion.');
+}
+?></p>
 <?php endif; ?>
 </div>
 </form>
@@ -305,16 +326,18 @@ 
 case 'doremove':
 	check_admin_referer('remove-users');
 
-	if ( ! is_multisite() )
-		wp_die( __( 'You can&#8217;t remove users.' ) );
+	if ( ! is_multisite() ) {
+			wp_die( __( 'You can&#8217;t remove users.' ) );
+	}
 
 	if ( empty($_REQUEST['users']) ) {
 		wp_redirect($redirect);
 		exit;
 	}
 
-	if ( ! current_user_can( 'remove_users' ) )
-		wp_die( __( 'You can&#8217;t remove users.' ) );
+	if ( ! current_user_can( 'remove_users' ) ) {
+			wp_die( __( 'You can&#8217;t remove users.' ) );
+	}
 
 	$userids = $_REQUEST['users'];
 
@@ -340,21 +363,24 @@ 
 
 	check_admin_referer('bulk-users');
 
-	if ( ! is_multisite() )
-		wp_die( __( 'You can&#8217;t remove users.' ) );
+	if ( ! is_multisite() ) {
+			wp_die( __( 'You can&#8217;t remove users.' ) );
+	}
 
 	if ( empty($_REQUEST['users']) && empty($_REQUEST['user']) ) {
 		wp_redirect($redirect);
 		exit();
 	}
 
-	if ( !current_user_can('remove_users') )
-		$error = new WP_Error('edit_users', __('You can&#8217;t remove users.'));
+	if ( !current_user_can('remove_users') ) {
+			$error = new WP_Error('edit_users', __('You can&#8217;t remove users.'));
+	}
 
-	if ( empty($_REQUEST['users']) )
-		$userids = array(intval($_REQUEST['user']));
-	else
-		$userids = $_REQUEST['users'];
+	if ( empty($_REQUEST['users']) ) {
+			$userids = array(intval($_REQUEST['user']));
+	} else {
+			$userids = $_REQUEST['users'];
+	}
 
 	include( ABSPATH . 'wp-admin/admin-header.php' );
 ?>
@@ -367,8 +393,11 @@ 
 
 <?php if ( 1 == count( $userids ) ) : ?>
 	<p><?php _e( 'You have specified this user for removal:' ); ?></p>
-<?php else : ?>
-	<p><?php _e( 'You have specified these users for removal:' ); ?></p>
+<?php else {
+	: ?>
+	<p><?php _e( 'You have specified these users for removal:' );
+}
+?></p>
 <?php endif; ?>
 
 <ul>
@@ -394,8 +423,11 @@ 
 <?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 else {
+	: ?>
+	<p><?php _e('There are no valid users selected for removal.');
+}
+?></p>
 <?php endif; ?>
 </div>
 </form>
@@ -467,17 +499,19 @@ 
 	<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;
 
 if ( ! empty($messages) ) {
-	foreach ( $messages as $msg )
-		echo $msg;
-} ?>
+	foreach ( $messages as $msg ) {
+			echo $msg;
+	}
+	} ?>
 
 <div class="wrap">
 <h1>

src/wp-admin/post-new.php

Spacing +26 added lines, -26 removed lines

@@ -7,7 +7,7 @@ 
  */
 
 /** Load WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
 /**
  * @global string  $post_type
@@ -16,28 +16,28 @@ 
  */
 global $post_type, $post_type_object, $post;
 
-if ( ! isset( $_GET['post_type'] ) ) {
+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') );
+	wp_die(__('Invalid post type'));
 }
-$post_type_object = get_post_type_object( $post_type );
+$post_type_object = get_post_type_object($post_type);
 
-if ( 'post' == $post_type ) {
+if ('post' == $post_type) {
 	$parent_file = 'edit.php';
 	$submenu_file = 'post-new.php';
-} elseif ( 'attachment' == $post_type ) {
-	if ( wp_redirect( admin_url( 'media-new.php' ) ) )
+} elseif ('attachment' == $post_type) {
+	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 ) {
+	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("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)])) {
 				// Fall back to edit.php for that post type, if it exists
 				$submenu_file = "edit.php?post_type=$post_type";
 			} else {
@@ -54,33 +54,33 @@ 
 
 $editing = true;
 
-if ( ! current_user_can( $post_type_object->cap->edit_posts ) || ! current_user_can( $post_type_object->cap->create_posts ) ) {
+if ( ! current_user_can($post_type_object->cap->edit_posts) || ! current_user_can($post_type_object->cap->create_posts)) {
 	wp_die(
-		'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-		'<p>' . __( 'You are not allowed to create posts as this user.' ) . '</p>',
+		'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+		'<p>'.__('You are not allowed to create posts as this user.').'</p>',
 		403
 	);
 }
 
 // Schedule auto-draft cleanup
-if ( ! wp_next_scheduled( 'wp_scheduled_auto_draft_delete' ) )
-	wp_schedule_event( time(), 'daily', 'wp_scheduled_auto_draft_delete' );
+if ( ! wp_next_scheduled('wp_scheduled_auto_draft_delete'))
+	wp_schedule_event(time(), 'daily', 'wp_scheduled_auto_draft_delete');
 
-wp_enqueue_script( 'autosave' );
+wp_enqueue_script('autosave');
 
-if ( is_multisite() ) {
-	add_action( 'admin_footer', '_admin_notice_post_locked' );
+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 )
-		add_action( 'admin_footer', '_admin_notice_post_locked' );
+	if (count($check_users) > 1)
+		add_action('admin_footer', '_admin_notice_post_locked');
 
-	unset( $check_users );
+	unset($check_users);
 }
 
 // Show post form.
-$post = get_default_post_to_edit( $post_type, true );
+$post = get_default_post_to_edit($post_type, true);
 $post_ID = $post->ID;
-include( ABSPATH . 'wp-admin/edit-form-advanced.php' );
-include( ABSPATH . 'wp-admin/admin-footer.php' );
+include(ABSPATH.'wp-admin/edit-form-advanced.php');
+include(ABSPATH.'wp-admin/admin-footer.php');

Braces +9 added lines, -6 removed lines

@@ -29,9 +29,10 @@ 
 	$parent_file = 'edit.php';
 	$submenu_file = 'post-new.php';
 } elseif ( 'attachment' == $post_type ) {
-	if ( wp_redirect( admin_url( 'media-new.php' ) ) )
-		exit;
-} else {
+	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;
@@ -63,8 +64,9 @@ 
 }
 
 // Schedule auto-draft cleanup
-if ( ! wp_next_scheduled( 'wp_scheduled_auto_draft_delete' ) )
+if ( ! wp_next_scheduled( 'wp_scheduled_auto_draft_delete' ) ) {
 	wp_schedule_event( time(), 'daily', 'wp_scheduled_auto_draft_delete' );
+}
 
 wp_enqueue_script( 'autosave' );
 
@@ -73,8 +75,9 @@ 
 } else {
 	$check_users = get_users( array( 'fields' => 'ID', 'number' => 2 ) );
 
-	if ( count( $check_users ) > 1 )
-		add_action( 'admin_footer', '_admin_notice_post_locked' );
+	if ( count( $check_users ) > 1 ) {
+			add_action( 'admin_footer', '_admin_notice_post_locked' );
+	}
 
 	unset( $check_users );
 }

src/wp-admin/edit-form-advanced.php

Indentation +25 added lines, -25 removed lines

@@ -491,12 +491,12 @@ 
 </div>
 <form name="post" action="post.php" method="post" id="post"<?php
 /**
- * Fires inside the post editor form tag.
- *
- * @since 3.0.0
- *
- * @param WP_Post $post Post object.
- */
+	 * Fires inside the post editor form tag.
+	 *
+	 * @since 3.0.0
+	 *
+	 * @param WP_Post $post Post object.
+	 */
 do_action( 'post_edit_form_tag', $post );
 
 $referer = wp_get_referer();
@@ -557,12 +557,12 @@ 
 </div>
 <?php
 /**
- * Fires before the permalink field in the edit form.
- *
- * @since 4.1.0
- *
- * @param WP_Post $post Post object.
- */
+	 * Fires before the permalink field in the edit form.
+	 *
+	 * @since 4.1.0
+	 *
+	 * @param WP_Post $post Post object.
+	 */
 do_action( 'edit_form_before_permalink', $post );
 ?>
 <div class="inside">
@@ -575,7 +575,7 @@ 
 	$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) . '" /><a href="#" class="button button-small" onclick="prompt(&#39;URL:&#39;, jQuery(\'#shortlink\').val()); return false;">' . __('Get Shortlink') . '</a>';
+		$sample_permalink_html .= '<input id="shortlink" type="hidden" value="' . esc_attr($shortlink) . '" /><a href="#" class="button button-small" onclick="prompt(&#39;URL:&#39;, jQuery(\'#shortlink\').val()); return false;">' . __('Get Shortlink') . '</a>';
 	}
 }
 
@@ -600,12 +600,12 @@ 
 <?php
 }
 /**
- * Fires after the title field.
- *
- * @since 3.5.0
- *
- * @param WP_Post $post Post object.
- */
+	 * Fires after the title field.
+	 *
+	 * @since 3.5.0
+	 *
+	 * @param WP_Post $post Post object.
+	 */
 do_action( 'edit_form_after_title', $post );
 
 if ( post_type_supports($post_type, 'editor') ) {
@@ -644,12 +644,12 @@ 
 </div>
 <?php }
 /**
- * Fires after the content editor.
- *
- * @since 3.5.0
- *
- * @param WP_Post $post Post object.
- */
+	 * Fires after the content editor.
+	 *
+	 * @since 3.5.0
+	 *
+	 * @param WP_Post $post Post object.
+	 */
 do_action( 'edit_form_after_editor', $post );
 ?>
 </div><!-- /post-body-content -->

Spacing +241 added lines, -241 removed lines

@@ -7,7 +7,7 @@ 
  */
 
 // don't load directly
-if ( !defined('ABSPATH') )
+if ( ! defined('ABSPATH'))
 	die('-1');
 
 /**
@@ -29,17 +29,17 @@ 
  * @param bool   $expand    Whether to enable the 'expand' functionality. Default true.
  * @param string $post_type Post type.
  */
-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 ) ) {
+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');
 	$_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() )
-	wp_enqueue_script( 'jquery-touch-punch' );
+if (wp_is_mobile())
+	wp_enqueue_script('jquery-touch-punch');
 
 /**
  * Post ID global
@@ -50,33 +50,33 @@ 
 $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' );
-	remove_post_type_support( $post_type, 'editor' );
+if ($post_ID == get_option('page_for_posts') && empty($post->post_content)) {
+	add_action('edit_form_after_title', '_wp_posts_page_notice');
+	remove_post_type_support($post_type, 'editor');
 }
 
-$thumbnail_support = current_theme_supports( 'post-thumbnails', $post_type ) && post_type_supports( $post_type, 'thumbnail' );
-if ( ! $thumbnail_support && 'attachment' === $post_type && $post->post_mime_type ) {
-	if ( wp_attachment_is( 'audio', $post ) ) {
-		$thumbnail_support = post_type_supports( 'attachment:audio', 'thumbnail' ) || current_theme_supports( 'post-thumbnails', 'attachment:audio' );
-	} elseif ( wp_attachment_is( 'video', $post ) ) {
-		$thumbnail_support = post_type_supports( 'attachment:video', 'thumbnail' ) || current_theme_supports( 'post-thumbnails', 'attachment:video' );
+$thumbnail_support = current_theme_supports('post-thumbnails', $post_type) && post_type_supports($post_type, 'thumbnail');
+if ( ! $thumbnail_support && 'attachment' === $post_type && $post->post_mime_type) {
+	if (wp_attachment_is('audio', $post)) {
+		$thumbnail_support = post_type_supports('attachment:audio', 'thumbnail') || current_theme_supports('post-thumbnails', 'attachment:audio');
+	} elseif (wp_attachment_is('video', $post)) {
+		$thumbnail_support = post_type_supports('attachment:video', 'thumbnail') || current_theme_supports('post-thumbnails', 'attachment:video');
 	}
 }
 
-if ( $thumbnail_support ) {
+if ($thumbnail_support) {
 	add_thickbox();
-	wp_enqueue_media( array( 'post' => $post_ID ) );
+	wp_enqueue_media(array('post' => $post_ID));
 }
 
 // Add the local autosave notice HTML
-add_action( 'admin_footer', '_local_storage_notice' );
+add_action('admin_footer', '_local_storage_notice');
 
 /*
  * @todo Document the $messages array(s).
  */
-$permalink = get_permalink( $post_ID );
-if ( ! $permalink ) {
+$permalink = get_permalink($post_ID);
+if ( ! $permalink) {
 	$permalink = '';
 }
 
@@ -85,82 +85,82 @@ 
 $preview_post_link_html = $scheduled_post_link_html = $view_post_link_html = '';
 $preview_page_link_html = $scheduled_page_link_html = $view_page_link_html = '';
 
-$preview_url = get_preview_post_link( $post );
+$preview_url = get_preview_post_link($post);
 
-$viewable = is_post_type_viewable( $post_type_object );
+$viewable = is_post_type_viewable($post_type_object);
 
-if ( $viewable ) {
+if ($viewable) {
 
 	// Preview post link.
-	$preview_post_link_html = sprintf( ' <a target="_blank" href="%1$s">%2$s</a>',
-		esc_url( $preview_url ),
-		__( 'Preview post' )
+	$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>',
-		esc_url( $permalink ),
-		__( 'Preview post' )
+	$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>',
-		esc_url( $permalink ),
-		__( 'View post' )
+	$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>',
-		esc_url( $preview_url ),
-		__( 'Preview page' )
+	$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>',
-		esc_url( $permalink ),
-		__( 'Preview page' )
+	$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>',
-		esc_url( $permalink ),
-		__( 'View page' )
+	$view_page_link_html = sprintf(' <a href="%1$s">%2$s</a>',
+		esc_url($permalink),
+		__('View page')
 	);
 
 }
 
 /* translators: Publish box date format, see http://php.net/date */
-$scheduled_date = date_i18n( __( 'M j, Y @ H:i' ), strtotime( $post->post_date ) );
+$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.' ),
+	 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,
-	10 => __( 'Post draft updated.' ) . $preview_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.' ),
+	 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,
-	10 => __( 'Page draft updated.' ) . $preview_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.
+$messages['attachment'] = array_fill(1, 10, __('Media file updated.')); // Hack, for now.
 
 /**
  * Filter the post updated messages.
@@ -169,109 +169,109 @@ 
  *
  * @param array $messages Post updated messages. For defaults @see $messages declarations above.
  */
-$messages = apply_filters( 'post_updated_messages', $messages );
+$messages = apply_filters('post_updated_messages', $messages);
 
 $message = false;
-if ( isset($_GET['message']) ) {
-	$_GET['message'] = absint( $_GET['message'] );
-	if ( isset($messages[$post_type][$_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']]) )
+	elseif ( ! isset($messages[$post_type]) && isset($messages['post'][$_GET['message']]))
 		$message = $messages['post'][$_GET['message']];
 }
 
 $notice = false;
 $form_extra = '';
-if ( 'auto-draft' == $post->post_status ) {
-	if ( 'edit' == $action )
+if ('auto-draft' == $post->post_status) {
+	if ('edit' == $action)
 		$post->post_title = '';
 	$autosave = false;
 	$form_extra .= "<input type='hidden' id='auto_draft' name='auto_draft' value='1' />";
 } else {
-	$autosave = wp_get_post_autosave( $post_ID );
+	$autosave = wp_get_post_autosave($post_ID);
 }
 
 $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) . "' />";
+$nonce_action = 'update-post_'.$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 ) ) {
-	foreach ( _wp_post_revision_fields( $post ) as $autosave_field => $_autosave_field ) {
-		if ( normalize_whitespace( $autosave->$autosave_field ) != normalize_whitespace( $post->$autosave_field ) ) {
-			$notice = sprintf( __( 'There is an autosave of this post that is more recent than the version below. <a href="%s">View the autosave</a>' ), get_edit_post_link( $autosave->ID ) );
+if ($autosave && mysql2date('U', $autosave->post_modified_gmt, false) > mysql2date('U', $post->post_modified_gmt, false)) {
+	foreach (_wp_post_revision_fields($post) as $autosave_field => $_autosave_field) {
+		if (normalize_whitespace($autosave->$autosave_field) != normalize_whitespace($post->$autosave_field)) {
+			$notice = sprintf(__('There is an autosave of this post that is more recent than the version below. <a href="%s">View the autosave</a>'), get_edit_post_link($autosave->ID));
 			break;
 		}
 	}
 	// If this autosave isn't different from the current post, begone.
-	if ( ! $notice )
-		wp_delete_post_revision( $autosave->ID );
+	if ( ! $notice)
+		wp_delete_post_revision($autosave->ID);
 	unset($autosave_field, $_autosave_field);
 }
 
 $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' );
+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 ) {
-	$revisions = wp_get_post_revisions( $post_ID );
+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 metabox 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 ) );
+	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');
 	}
 }
 
-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_action( 'edit_form_after_title', 'edit_form_image_editor' );
+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_action('edit_form_after_title', 'edit_form_image_editor');
 
-	if ( wp_attachment_is( 'audio', $post ) ) {
-		add_meta_box( 'attachment-id3', __( 'Metadata' ), 'attachment_id3_data_meta_box', null, 'normal', 'core' );
+	if (wp_attachment_is('audio', $post)) {
+		add_meta_box('attachment-id3', __('Metadata'), 'attachment_id3_data_meta_box', null, 'normal', 'core');
 	}
 } else {
-	add_meta_box( 'submitdiv', __( 'Publish' ), 'post_submit_meta_box', null, 'side', 'core', $publish_callback_args );
+	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' ) )
-	add_meta_box( 'formatdiv', _x( 'Format', 'post format' ), 'post_format_meta_box', null, 'side', 'core' );
+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 )
+foreach (get_object_taxonomies($post) as $tax_name) {
+	$taxonomy = get_taxonomy($tax_name);
+	if ( ! $taxonomy->show_ui || false === $taxonomy->meta_box_cb)
 		continue;
 
 	$label = $taxonomy->labels->name;
 
-	if ( ! is_taxonomy_hierarchical( $tax_name ) )
-		$tax_meta_box_id = 'tagsdiv-' . $tax_name;
+	if ( ! is_taxonomy_hierarchical($tax_name))
+		$tax_meta_box_id = 'tagsdiv-'.$tax_name;
 	else
-		$tax_meta_box_id = $tax_name . 'div';
+		$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 ) );
+	add_meta_box($tax_meta_box_id, $label, $taxonomy->meta_box_cb, null, 'side', 'core', array('taxonomy' => $tax_name));
 }
 
-if ( post_type_supports($post_type, 'page-attributes') )
+if (post_type_supports($post_type, 'page-attributes'))
 	add_meta_box('pageparentdiv', 'page' == $post_type ? __('Page Attributes') : __('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') )
+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') )
+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') )
+if (post_type_supports($post_type, 'custom-fields'))
 	add_meta_box('postcustom', __('Custom Fields'), 'post_custom_meta_box', null, 'normal', 'core');
 
 /**
@@ -282,33 +282,33 @@ 
  *
  * @param WP_Post $post Post object.
  */
-do_action( 'dbx_post_advanced', $post );
+do_action('dbx_post_advanced', $post);
 
 // Allow the Discussion meta box to show up if the post type supports comments,
 // or if comments or pings are open.
-if ( comments_open( $post ) || pings_open( $post ) || post_type_supports( $post_type, 'comments' ) ) {
-	add_meta_box( 'commentstatusdiv', __( 'Discussion' ), 'post_comment_status_meta_box', null, 'normal', 'core' );
+if (comments_open($post) || pings_open($post) || post_type_supports($post_type, 'comments')) {
+	add_meta_box('commentstatusdiv', __('Discussion'), 'post_comment_status_meta_box', null, 'normal', 'core');
 }
 
-$stati = get_post_stati( array( 'public' => true ) );
-if ( empty( $stati ) ) {
-	$stati = array( 'publish' );
+$stati = get_post_stati(array('public' => true));
+if (empty($stati)) {
+	$stati = array('publish');
 }
 $stati[] = 'private';
 
-if ( in_array( get_post_status( $post ), $stati ) ) {
+if (in_array(get_post_status($post), $stati)) {
 	// If the post type support comments, or the post has comments, allow the
 	// Comments meta box.
-	if ( comments_open( $post ) || pings_open( $post ) || $post->comment_count > 0 || post_type_supports( $post_type, 'comments' ) ) {
-		add_meta_box( 'commentsdiv', __( 'Comments' ), 'post_comment_meta_box', null, 'normal', 'core' );
+	if (comments_open($post) || pings_open($post) || $post->comment_count > 0 || post_type_supports($post_type, 'comments')) {
+		add_meta_box('commentsdiv', __('Comments'), 'post_comment_meta_box', null, 'normal', 'core');
 	}
 }
 
-if ( ! ( 'pending' == get_post_status( $post ) && ! current_user_can( $post_type_object->cap->publish_posts ) ) )
+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') ) {
-	if ( is_super_admin() || current_user_can( $post_type_object->cap->edit_others_posts ) )
+if (post_type_supports($post_type, 'author')) {
+	if (is_super_admin() || current_user_can($post_type_object->cap->edit_others_posts))
 		add_meta_box('authordiv', __('Author'), 'post_author_meta_box', null, 'normal', 'core');
 }
 
@@ -320,7 +320,7 @@ 
  * @param string  $post_type Post type.
  * @param WP_Post $post      Post object.
  */
-do_action( 'add_meta_boxes', $post_type, $post );
+do_action('add_meta_boxes', $post_type, $post);
 
 /**
  * Fires after all built-in meta boxes have been added, contextually for the given post type.
@@ -331,7 +331,7 @@ 
  *
  * @param WP_Post $post Post object.
  */
-do_action( 'add_meta_boxes_' . $post_type, $post );
+do_action('add_meta_boxes_'.$post_type, $post);
 
 /**
  * Fires after meta boxes have been added.
@@ -344,149 +344,149 @@ 
  * @param string  $context   string  Meta box context.
  * @param WP_Post $post      Post object.
  */
-do_action( 'do_meta_boxes', $post_type, 'normal', $post );
+do_action('do_meta_boxes', $post_type, 'normal', $post);
 /** This action is documented in wp-admin/edit-form-advanced.php */
-do_action( 'do_meta_boxes', $post_type, 'advanced', $post );
+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 );
+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>';
+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>';
 
-	get_current_screen()->add_help_tab( array(
+	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>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>';
-	$title_and_editor .= '<p>' . __( 'You can insert media files by clicking the icons above the post editor and following the directions. You can align or edit images using the inline formatting toolbar available in Visual mode.' ) . '</p>';
-	$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>';
+	$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>';
+	$title_and_editor .= '<p>'.__('You can insert media files by clicking the icons above the post editor and following the directions. You can align or edit images using the inline formatting toolbar available in Visual mode.').'</p>';
+	$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(
+	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" target="_blank">Documentation on Writing and Editing Posts</a>') . '</p>' .
-			'<p>' . __('<a href="https://wordpress.org/support/" target="_blank">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" target="_blank">Documentation on Writing and Editing Posts</a>').'</p>'.
+			'<p>'.__('<a href="https://wordpress.org/support/" target="_blank">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>';
+} 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>';
 
-	get_current_screen()->add_help_tab( array(
+	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" target="_blank">Documentation on Adding New Pages</a>') . '</p>' .
-			'<p>' . __('<a href="https://codex.wordpress.org/Pages_Screen#Editing_Individual_Pages" target="_blank">Documentation on Editing Pages</a>') . '</p>' .
-			'<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+			'<p><strong>'.__('For more information:').'</strong></p>'.
+			'<p>'.__('<a href="https://codex.wordpress.org/Pages_Add_New_Screen" target="_blank">Documentation on Adding New Pages</a>').'</p>'.
+			'<p>'.__('<a href="https://codex.wordpress.org/Pages_Screen#Editing_Individual_Pages" target="_blank">Documentation on Editing Pages</a>').'</p>'.
+			'<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>'
 	);
-} elseif ( 'attachment' == $post_type ) {
-	get_current_screen()->add_help_tab( array(
+} 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>'
-	) );
+			'<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" target="_blank">Documentation on Edit Media</a>') . '</p>' .
-	'<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Media_Add_New_Screen#Edit_Media" target="_blank">Documentation on Edit Media</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/" target="_blank">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 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>';
+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 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(
+	get_current_screen()->add_help_tab(array(
 		'id'		=> 'inserting-media',
-		'title'		=> __( '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 .= '<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.' ) .
+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 .= '<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>';
 
-	if ( current_theme_supports( 'post-formats' ) && post_type_supports( 'post', 'post-formats' ) ) {
-		$publish_box .= '<li>' . __( '<strong>Format</strong> &mdash; Post Formats designate how your theme will display a specific post. For example, you could have a <em>standard</em> blog post with a title and paragraphs, or a short <em>aside</em> that omits the title and contains a short text blurb. Please refer to the Codex for <a href="https://codex.wordpress.org/Post_Formats#Supported_Formats">descriptions of each post format</a>. Your theme could enable all or some of 10 possible formats.' ) . '</li>';
+	if (current_theme_supports('post-formats') && post_type_supports('post', 'post-formats')) {
+		$publish_box .= '<li>'.__('<strong>Format</strong> &mdash; Post Formats designate how your theme will display a specific post. For example, you could have a <em>standard</em> blog post with a title and paragraphs, or a short <em>aside</em> that omits the title and contains a short text blurb. Please refer to the Codex for <a href="https://codex.wordpress.org/Post_Formats#Supported_Formats">descriptions of each post format</a>. Your theme could enable all or some of 10 possible formats.').'</li>';
 	}
 
-	if ( current_theme_supports( 'post-thumbnails' ) && post_type_supports( 'post', 'thumbnail' ) ) {
+	if (current_theme_supports('post-thumbnails') && post_type_supports('post', 'thumbnail')) {
 		/* translators: %s: Featured Image */
-		$publish_box .= '<li>' . sprintf( __( '<strong>%s</strong> &mdash; This allows you to associate an image with your post without inserting it. This is usually useful only if your theme makes use of the image as a post thumbnail on the home page, a custom header, etc.' ), esc_html( $post_type_object->labels->featured_image ) ) . '</li>';
+		$publish_box .= '<li>'.sprintf(__('<strong>%s</strong> &mdash; This allows you to associate an image with your post without inserting it. This is usually useful only if your theme makes use of the image as a post thumbnail on the home page, a custom header, etc.'), esc_html($post_type_object->labels->featured_image)).'</li>';
 	}
 
 	$publish_box .= '</ul>';
 
-	get_current_screen()->add_help_tab( array(
+	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(
+	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>';
+	));
+} 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>';
 
-	get_current_screen()->add_help_tab( array(
+	get_current_screen()->add_help_tab(array(
 		'id' => 'page-attributes',
 		'title' => __('Page Attributes'),
 		'content' => $page_attributes,
-	) );
+	));
 }
 
-require_once( ABSPATH . 'wp-admin/admin-header.php' );
+require_once(ABSPATH.'wp-admin/admin-header.php');
 ?>
 
 <div class="wrap">
 <h1><?php
-echo esc_html( $title );
-if ( isset( $post_new_file ) && current_user_can( $post_type_object->cap->create_posts ) )
-	echo ' <a href="' . esc_url( admin_url( $post_new_file ) ) . '" class="page-title-action">' . esc_html( $post_type_object->labels->add_new ) . '</a>';
+echo esc_html($title);
+if (isset($post_new_file) && current_user_can($post_type_object->cap->create_posts))
+	echo ' <a href="'.esc_url(admin_url($post_new_file)).'" class="page-title-action">'.esc_html($post_type_object->labels->add_new).'</a>';
 ?></h1>
-<?php if ( $notice ) : ?>
+<?php if ($notice) : ?>
 <div id="notice" class="notice notice-warning"><p id="has-newer-autosave"><?php echo $notice ?></p></div>
 <?php endif; ?>
-<?php if ( $message ) : ?>
+<?php if ($message) : ?>
 <div id="message" class="updated notice notice-success is-dismissible"><p><?php echo $message; ?></p></div>
 <?php endif; ?>
 <div id="lost-connection-notice" class="error hidden">
-	<p><span class="spinner"></span> <?php _e( '<strong>Connection lost.</strong> Saving has been disabled until you&#8217;re reconnected.' ); ?>
-	<span class="hide-if-no-sessionstorage"><?php _e( 'We&#8217;re backing up this post in your browser, just in case.' ); ?></span>
+	<p><span class="spinner"></span> <?php _e('<strong>Connection lost.</strong> Saving has been disabled until you&#8217;re reconnected.'); ?>
+	<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
@@ -497,29 +497,29 @@ 
  *
  * @param WP_Post $post Post object.
  */
-do_action( 'post_edit_form_tag', $post );
+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 ) ?>" />
-<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="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 ) ); ?>" />
+<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="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 ) )
+if ('draft' != get_post_status($post))
 	wp_original_referer_field(true, 'previous');
 
 echo $form_extra;
 
-wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false );
-wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false );
+wp_nonce_field('meta-box-order', 'meta-box-order-nonce', false);
+wp_nonce_field('closedpostboxes', 'closedpostboxesnonce', false);
 ?>
 
 <?php
@@ -532,13 +532,13 @@ 
  *
  * @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
@@ -550,10 +550,10 @@ 
 	 * @param string  $text Placeholder text. Default 'Enter title here'.
 	 * @param WP_Post $post Post object.
 	 */
-	$title_placeholder = apply_filters( 'enter_title_here', __( 'Enter title here' ), $post );
+	$title_placeholder = apply_filters('enter_title_here', __('Enter title here'), $post);
 	?>
 	<label class="screen-reader-text" id="title-prompt-text" for="title"><?php echo $title_placeholder; ?></label>
-	<input type="text" name="post_title" size="30" value="<?php echo esc_attr( $post->post_title ); ?>" id="title" spellcheck="true" autocomplete="off" />
+	<input type="text" name="post_title" size="30" value="<?php echo esc_attr($post->post_title); ?>" id="title" spellcheck="true" autocomplete="off" />
 </div>
 <?php
 /**
@@ -563,28 +563,28 @@ 
  *
  * @param WP_Post $post Post object.
  */
-do_action( 'edit_form_before_permalink', $post );
+do_action('edit_form_before_permalink', $post);
 ?>
 <div class="inside">
 <?php
-if ( $viewable ) :
+if ($viewable) :
 $sample_permalink_html = $post_type_object->public ? get_sample_permalink_html($post->ID) : '';
 
 // As of 4.4, the Get Shortlink button is hidden by default.
-if ( has_filter( 'pre_get_shortlink' ) || has_filter( 'get_shortlink' ) ) {
+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) . '" /><a href="#" class="button button-small" onclick="prompt(&#39;URL:&#39;, jQuery(\'#shortlink\').val()); return false;">' . __('Get Shortlink') . '</a>';
+	if ( ! empty($shortlink) && $shortlink !== $permalink && $permalink !== home_url('?page_id='.$post->ID)) {
+    	$sample_permalink_html .= '<input id="shortlink" type="hidden" value="'.esc_attr($shortlink).'" /><a href="#" class="button button-small" onclick="prompt(&#39;URL:&#39;, jQuery(\'#shortlink\').val()); return false;">'.__('Get Shortlink').'</a>';
 	}
 }
 
-if ( $post_type_object->public && ! ( 'pending' == get_post_status( $post ) && !current_user_can( $post_type_object->cap->publish_posts ) ) ) {
+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 )
+		if ($has_sample_permalink)
 			echo $sample_permalink_html;
 	?>
 	</div>
@@ -594,7 +594,7 @@ 
 ?>
 </div>
 <?php
-wp_nonce_field( 'samplepermalink', 'samplepermalinknonce', false );
+wp_nonce_field('samplepermalink', 'samplepermalinknonce', false);
 ?>
 </div><!-- /titlediv -->
 <?php
@@ -606,13 +606,13 @@ 
  *
  * @param WP_Post $post Post object.
  */
-do_action( 'edit_form_after_title', $post );
+do_action('edit_form_after_title', $post);
 
-if ( post_type_supports($post_type, 'editor') ) {
+if (post_type_supports($post_type, 'editor')) {
 ?>
-<div id="postdivrich" class="postarea<?php if ( $_wp_editor_expand ) { echo ' wp-editor-expand'; } ?>">
+<div id="postdivrich" class="postarea<?php if ($_wp_editor_expand) { echo ' wp-editor-expand'; } ?>">
 
-<?php wp_editor( $post->post_content, 'content', array(
+<?php wp_editor($post->post_content, 'content', array(
 	'_content_editor_dfw' => $_content_editor_dfw,
 	'drag_drop_upload' => true,
 	'tabfocus_elements' => 'content-html,save-post',
@@ -622,18 +622,18 @@ 
 		'wp_autoresize_on' => $_wp_editor_expand,
 		'add_unload_trigger' => false,
 	),
-) ); ?>
+)); ?>
 <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 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 ) {
+	if ('auto-draft' != $post->post_status) {
 		echo '<span id="last-edit">';
-		if ( $last_user = get_userdata( get_post_meta( $post_ID, '_edit_last', true ) ) ) {
-			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 ) );
+		if ($last_user = get_userdata(get_post_meta($post_ID, '_edit_last', true))) {
+			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 {
-			printf( __( 'Last edited on %1$s at %2$s' ), mysql2date( __( 'F j, Y' ), $post->post_modified ), mysql2date( __( 'g:i a' ), $post->post_modified ) );
+			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>';
 	} ?>
@@ -650,14 +650,14 @@ 
  *
  * @param WP_Post $post Post object.
  */
-do_action( 'edit_form_after_editor', $post );
+do_action('edit_form_after_editor', $post);
 ?>
 </div><!-- /post-body-content -->
 
 <div id="postbox-container-1" class="postbox-container">
 <?php
 
-if ( 'page' == $post_type ) {
+if ('page' == $post_type) {
 	/**
 	 * Fires before meta boxes with 'side' context are output for the 'page' post type.
 	 *
@@ -667,7 +667,7 @@ 
 	 *
 	 * @param WP_Post $post Post object.
 	 */
-	do_action( 'submitpage_box', $post );
+	do_action('submitpage_box', $post);
 }
 else {
 	/**
@@ -679,7 +679,7 @@ 
 	 *
 	 * @param WP_Post $post Post object.
 	 */
-	do_action( 'submitpost_box', $post );
+	do_action('submitpost_box', $post);
 }
 
 
@@ -692,7 +692,7 @@ 
 
 do_meta_boxes(null, 'normal', $post);
 
-if ( 'page' == $post_type ) {
+if ('page' == $post_type) {
 	/**
 	 * Fires after 'normal' context meta boxes have been output for the 'page' post type.
 	 *
@@ -700,7 +700,7 @@ 
 	 *
 	 * @param WP_Post $post Post object.
 	 */
-	do_action( 'edit_page_form', $post );
+	do_action('edit_page_form', $post);
 }
 else {
 	/**
@@ -710,7 +710,7 @@ 
 	 *
 	 * @param WP_Post $post Post object.
 	 */
-	do_action( 'edit_form_advanced', $post );
+	do_action('edit_form_advanced', $post);
 }
 
 
@@ -726,7 +726,7 @@ 
  *
  * @param WP_Post $post Post object.
  */
-do_action( 'dbx_post_sidebar', $post );
+do_action('dbx_post_sidebar', $post);
 
 ?>
 </div><!-- /post-body -->
@@ -736,11 +736,11 @@ 
 </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 ) : ?>
+<?php if ( ! wp_is_mobile() && post_type_supports($post_type, 'title') && '' === $post->post_title) : ?>
 <script type="text/javascript">
 try{document.post.title.focus();}catch(e){}
 </script>

Braces +53 added lines, -36 removed lines

@@ -7,8 +7,9 @@ 
  */
 
 // don't load directly
-if ( !defined('ABSPATH') )
+if ( !defined('ABSPATH') ) {
 	die('-1');
+}
 
 /**
  * @global string  $post_type
@@ -38,8 +39,9 @@ 
 	$_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
@@ -174,17 +176,19 @@ 
 $message = false;
 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;
 $form_extra = '';
 if ( 'auto-draft' == $post->post_status ) {
-	if ( 'edit' == $action )
-		$post->post_title = '';
+	if ( 'edit' == $action ) {
+			$post->post_title = '';
+	}
 	$autosave = false;
 	$form_extra .= "<input type='hidden' id='auto_draft' name='auto_draft' value='1' />";
 } else {
@@ -204,8 +208,9 @@ 
 		}
 	}
 	// If this autosave isn't different from the current post, begone.
-	if ( ! $notice )
-		wp_delete_post_revision( $autosave->ID );
+	if ( ! $notice ) {
+			wp_delete_post_revision( $autosave->ID );
+	}
 	unset($autosave_field, $_autosave_field);
 }
 
@@ -240,39 +245,47 @@ 
 	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 )
-		continue;
+	if ( ! $taxonomy->show_ui || false === $taxonomy->meta_box_cb ) {
+			continue;
+	}
 
 	$label = $taxonomy->labels->name;
 
-	if ( ! is_taxonomy_hierarchical( $tax_name ) )
-		$tax_meta_box_id = 'tagsdiv-' . $tax_name;
-	else
-		$tax_meta_box_id = $tax_name . 'div';
+	if ( ! is_taxonomy_hierarchical( $tax_name ) ) {
+			$tax_meta_box_id = 'tagsdiv-' . $tax_name;
+	} 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 ) );
 }
 
-if ( post_type_supports($post_type, 'page-attributes') )
+if ( post_type_supports($post_type, 'page-attributes') ) {
 	add_meta_box('pageparentdiv', 'page' == $post_type ? __('Page Attributes') : __('Attributes'), 'page_attributes_meta_box', null, 'side', 'core');
+}
 
-if ( $thumbnail_support && current_user_can( 'upload_files' ) )
+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') )
+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') )
+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') )
+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.
@@ -304,13 +317,15 @@ 
 	}
 }
 
-if ( ! ( 'pending' == get_post_status( $post ) && ! current_user_can( $post_type_object->cap->publish_posts ) ) )
+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') ) {
-	if ( is_super_admin() || current_user_can( $post_type_object->cap->edit_others_posts ) )
-		add_meta_box('authordiv', __('Author'), 'post_author_meta_box', null, 'normal', 'core');
-}
+	if ( is_super_admin() || current_user_can( $post_type_object->cap->edit_others_posts ) ) {
+			add_meta_box('authordiv', __('Author'), 'post_author_meta_box', null, 'normal', 'core');
+	}
+	}
 
 /**
  * Fires after all built-in meta boxes have been added.
@@ -475,8 +490,9 @@ 
 <div class="wrap">
 <h1><?php
 echo esc_html( $title );
-if ( isset( $post_new_file ) && current_user_can( $post_type_object->cap->create_posts ) )
+if ( isset( $post_new_file ) && current_user_can( $post_type_object->cap->create_posts ) ) {
 	echo ' <a href="' . esc_url( admin_url( $post_new_file ) ) . '" class="page-title-action">' . esc_html( $post_type_object->labels->add_new ) . '</a>';
+}
 ?></h1>
 <?php if ( $notice ) : ?>
 <div id="notice" class="notice notice-warning"><p id="has-newer-autosave"><?php echo $notice ?></p></div>
@@ -513,8 +529,9 @@ 
 <input type="hidden" id="active_post_lock" value="<?php echo esc_attr( implode( ':', $active_post_lock ) ); ?>" />
 <?php
 }
-if ( 'draft' != get_post_status( $post ) )
+if ( 'draft' != get_post_status( $post ) ) {
 	wp_original_referer_field(true, 'previous');
+}
 
 echo $form_extra;
 
@@ -584,8 +601,9 @@ 
 ?>
 	<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
@@ -668,8 +686,7 @@ 
 	 * @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'.
 	 *
@@ -701,8 +718,7 @@ 
 	 * @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'.
 	 *
@@ -736,8 +752,9 @@ 
 </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 ) : ?>