ntwb / wordpress

src/wp-admin/includes/admin.php

Spacing +28 added lines, -28 removed lines

@@ -7,80 +7,80 @@
  * @since 2.3.0
  */
 
-if ( ! defined('WP_ADMIN') ) {
+if ( ! defined('WP_ADMIN')) {
 	/*
 	 * This file is being included from a file other than wp-admin/admin.php, so
 	 * some setup was skipped. Make sure the admin message catalog is loaded since
 	 * load_default_textdomain() will not have done so in this context.
 	 */
-	load_textdomain( 'default', WP_LANG_DIR . '/admin-' . get_locale() . '.mo' );
+	load_textdomain('default', WP_LANG_DIR.'/admin-'.get_locale().'.mo');
 }
 
 /** WordPress Administration Hooks */
-require_once(ABSPATH . 'wp-admin/includes/admin-filters.php');
+require_once(ABSPATH.'wp-admin/includes/admin-filters.php');
 
 /** WordPress Bookmark Administration API */
-require_once(ABSPATH . 'wp-admin/includes/bookmark.php');
+require_once(ABSPATH.'wp-admin/includes/bookmark.php');
 
 /** WordPress Comment Administration API */
-require_once(ABSPATH . 'wp-admin/includes/comment.php');
+require_once(ABSPATH.'wp-admin/includes/comment.php');
 
 /** WordPress Administration File API */
-require_once(ABSPATH . 'wp-admin/includes/file.php');
+require_once(ABSPATH.'wp-admin/includes/file.php');
 
 /** WordPress Image Administration API */
-require_once(ABSPATH . 'wp-admin/includes/image.php');
+require_once(ABSPATH.'wp-admin/includes/image.php');
 
 /** WordPress Media Administration API */
-require_once(ABSPATH . 'wp-admin/includes/media.php');
+require_once(ABSPATH.'wp-admin/includes/media.php');
 
 /** WordPress Import Administration API */
-require_once(ABSPATH . 'wp-admin/includes/import.php');
+require_once(ABSPATH.'wp-admin/includes/import.php');
 
 /** WordPress Misc Administration API */
-require_once(ABSPATH . 'wp-admin/includes/misc.php');
+require_once(ABSPATH.'wp-admin/includes/misc.php');
 
 /** WordPress Options Administration API */
-require_once(ABSPATH . 'wp-admin/includes/options.php');
+require_once(ABSPATH.'wp-admin/includes/options.php');
 
 /** WordPress Plugin Administration API */
-require_once(ABSPATH . 'wp-admin/includes/plugin.php');
+require_once(ABSPATH.'wp-admin/includes/plugin.php');
 
 /** WordPress Post Administration API */
-require_once(ABSPATH . 'wp-admin/includes/post.php');
+require_once(ABSPATH.'wp-admin/includes/post.php');
 
 /** WordPress Administration Screen API */
-require_once(ABSPATH . 'wp-admin/includes/class-wp-screen.php');
-require_once(ABSPATH . 'wp-admin/includes/screen.php');
+require_once(ABSPATH.'wp-admin/includes/class-wp-screen.php');
+require_once(ABSPATH.'wp-admin/includes/screen.php');
 
 /** WordPress Taxonomy Administration API */
-require_once(ABSPATH . 'wp-admin/includes/taxonomy.php');
+require_once(ABSPATH.'wp-admin/includes/taxonomy.php');
 
 /** WordPress Template Administration API */
-require_once(ABSPATH . 'wp-admin/includes/template.php');
+require_once(ABSPATH.'wp-admin/includes/template.php');
 
 /** WordPress List Table Administration API and base class */
-require_once(ABSPATH . 'wp-admin/includes/class-wp-list-table.php');
-require_once(ABSPATH . 'wp-admin/includes/list-table.php');
+require_once(ABSPATH.'wp-admin/includes/class-wp-list-table.php');
+require_once(ABSPATH.'wp-admin/includes/list-table.php');
 
 /** WordPress Theme Administration API */
-require_once(ABSPATH . 'wp-admin/includes/theme.php');
+require_once(ABSPATH.'wp-admin/includes/theme.php');
 
 /** WordPress User Administration API */
-require_once(ABSPATH . 'wp-admin/includes/user.php');
+require_once(ABSPATH.'wp-admin/includes/user.php');
 
 /** WordPress Site Icon API */
-require_once(ABSPATH . 'wp-admin/includes/class-wp-site-icon.php');
+require_once(ABSPATH.'wp-admin/includes/class-wp-site-icon.php');
 
 /** WordPress Update Administration API */
-require_once(ABSPATH . 'wp-admin/includes/update.php');
+require_once(ABSPATH.'wp-admin/includes/update.php');
 
 /** WordPress Deprecated Administration API */
-require_once(ABSPATH . 'wp-admin/includes/deprecated.php');
+require_once(ABSPATH.'wp-admin/includes/deprecated.php');
 
 /** WordPress Multisite support API */
-if ( is_multisite() ) {
-	require_once(ABSPATH . 'wp-admin/includes/ms-admin-filters.php');
-	require_once(ABSPATH . 'wp-admin/includes/ms.php');
-	require_once(ABSPATH . 'wp-admin/includes/ms-deprecated.php');
+if (is_multisite()) {
+	require_once(ABSPATH.'wp-admin/includes/ms-admin-filters.php');
+	require_once(ABSPATH.'wp-admin/includes/ms.php');
+	require_once(ABSPATH.'wp-admin/includes/ms-deprecated.php');
 }

src/wp-admin/import.php

Spacing +45 added lines, -45 removed lines

@@ -9,55 +9,55 @@ 
 define('WP_LOAD_IMPORTERS', true);
 
 /** Load WordPress Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( !current_user_can('import') )
+if ( ! current_user_can('import'))
 	wp_die(__('You do not have sufficient permissions to import content in this site.'));
 
 $title = __('Import');
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'overview',
 	'title'   => __('Overview'),
-	'content' => '<p>' . __('This screen lists links to plugins to import data from blogging/content management platforms. Choose the platform you want to import from, and click Install Now when you are prompted in the popup window. If your platform is not listed, click the link to search the plugin directory for other importer plugins to see if there is one for your platform.') . '</p>' .
-		'<p>' . __('In previous versions of WordPress, all importers were built-in. They have been turned into plugins since most people only use them once or infrequently.') . '</p>',
-) );
+	'content' => '<p>'.__('This screen lists links to plugins to import data from blogging/content management platforms. Choose the platform you want to import from, and click Install Now when you are prompted in the popup window. If your platform is not listed, click the link to search the plugin directory for other importer plugins to see if there is one for your platform.').'</p>'.
+		'<p>'.__('In previous versions of WordPress, all importers were built-in. They have been turned into plugins since most people only use them once or infrequently.').'</p>',
+));
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Tools_Import_Screen" target="_blank">Documentation on Import</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/Tools_Import_Screen" target="_blank">Documentation on Import</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>'
 );
 
-if ( current_user_can( 'install_plugins' ) )
+if (current_user_can('install_plugins'))
 	$popular_importers = wp_get_popular_importers();
 else
 	$popular_importers = array();
 
 // Detect and redirect invalid importers like 'movabletype', which is registered as 'mt'
-if ( ! empty( $_GET['invalid'] ) && isset( $popular_importers[ $_GET['invalid'] ] ) ) {
-	$importer_id = $popular_importers[ $_GET['invalid'] ]['importer-id'];
-	if ( $importer_id != $_GET['invalid'] ) { // Prevent redirect loops.
-		wp_redirect( admin_url( 'admin.php?import=' . $importer_id ) );
+if ( ! empty($_GET['invalid']) && isset($popular_importers[$_GET['invalid']])) {
+	$importer_id = $popular_importers[$_GET['invalid']]['importer-id'];
+	if ($importer_id != $_GET['invalid']) { // Prevent redirect loops.
+		wp_redirect(admin_url('admin.php?import='.$importer_id));
 		exit;
 	}
-	unset( $importer_id );
+	unset($importer_id);
 }
 
 add_thickbox();
-wp_enqueue_script( 'plugin-install' );
+wp_enqueue_script('plugin-install');
 
-require_once( ABSPATH . 'wp-admin/admin-header.php' );
+require_once(ABSPATH.'wp-admin/admin-header.php');
 $parent_file = 'tools.php';
 ?>
 
 <div class="wrap">
-<h1><?php echo esc_html( $title ); ?></h1>
-<?php if ( ! empty( $_GET['invalid'] ) ) : ?>
+<h1><?php echo esc_html($title); ?></h1>
+<?php if ( ! empty($_GET['invalid'])) : ?>
 	<div class="error">
-		<p><strong><?php _e( 'ERROR:' ); ?></strong> <?php
+		<p><strong><?php _e('ERROR:'); ?></strong> <?php
 			/* translators: %s: importer slug */
-			printf( __( 'The %s importer is invalid or is not installed.' ), '<strong>' . esc_html( $_GET['invalid'] ) . '</strong>' );
+			printf(__('The %s importer is invalid or is not installed.'), '<strong>'.esc_html($_GET['invalid']).'</strong>');
 		?></p>
 	</div>
 <?php endif; ?>
@@ -68,48 +68,48 @@ 
 $importers = get_importers();
 
 // If a popular importer is not registered, create a dummy registration that links to the plugin installer.
-foreach ( $popular_importers as $pop_importer => $pop_data ) {
-	if ( isset( $importers[ $pop_importer ] ) )
+foreach ($popular_importers as $pop_importer => $pop_data) {
+	if (isset($importers[$pop_importer]))
 		continue;
-	if ( isset( $importers[ $pop_data['importer-id'] ] ) )
+	if (isset($importers[$pop_data['importer-id']]))
 		continue;
-	$importers[ $pop_data['importer-id'] ] = array( $pop_data['name'], $pop_data['description'], 'install' => $pop_data['plugin-slug'] );
+	$importers[$pop_data['importer-id']] = array($pop_data['name'], $pop_data['description'], 'install' => $pop_data['plugin-slug']);
 }
 
-if ( empty( $importers ) ) {
-	echo '<p>' . __('No importers are available.') . '</p>'; // TODO: make more helpful
+if (empty($importers)) {
+	echo '<p>'.__('No importers are available.').'</p>'; // TODO: make more helpful
 } else {
-	uasort( $importers, '_usort_by_first_member' );
+	uasort($importers, '_usort_by_first_member');
 ?>
 <table class="widefat importers striped">
 
 <?php
 	foreach ($importers as $importer_id => $data) {
 		$action = '';
-		if ( isset( $data['install'] ) ) {
+		if (isset($data['install'])) {
 			$plugin_slug = $data['install'];
-			if ( file_exists( WP_PLUGIN_DIR . '/' . $plugin_slug ) ) {
+			if (file_exists(WP_PLUGIN_DIR.'/'.$plugin_slug)) {
 				// Looks like Importer is installed, But not active
-				$plugins = get_plugins( '/' . $plugin_slug );
-				if ( !empty($plugins) ) {
+				$plugins = get_plugins('/'.$plugin_slug);
+				if ( ! empty($plugins)) {
 					$keys = array_keys($plugins);
-					$plugin_file = $plugin_slug . '/' . $keys[0];
-					$action = '<a href="' . esc_url(wp_nonce_url(admin_url('plugins.php?action=activate&plugin=' . $plugin_file . '&from=import'), 'activate-plugin_' . $plugin_file)) .
-											'"title="' . esc_attr__('Activate importer') . '"">' . $data[0] . '</a>';
+					$plugin_file = $plugin_slug.'/'.$keys[0];
+					$action = '<a href="'.esc_url(wp_nonce_url(admin_url('plugins.php?action=activate&plugin='.$plugin_file.'&from=import'), 'activate-plugin_'.$plugin_file)).
+											'"title="'.esc_attr__('Activate importer').'"">'.$data[0].'</a>';
 				}
 			}
-			if ( empty($action) ) {
-				if ( is_main_site() ) {
-					$action = '<a href="' . esc_url( network_admin_url( 'plugin-install.php?tab=plugin-information&plugin=' . $plugin_slug .
-										'&from=import&TB_iframe=true&width=600&height=550' ) ) . '" class="thickbox open-plugin-details-modal" title="' .
-										esc_attr__('Install importer') . '">' . $data[0] . '</a>';
+			if (empty($action)) {
+				if (is_main_site()) {
+					$action = '<a href="'.esc_url(network_admin_url('plugin-install.php?tab=plugin-information&plugin='.$plugin_slug.
+										'&from=import&TB_iframe=true&width=600&height=550')).'" class="thickbox open-plugin-details-modal" title="'.
+										esc_attr__('Install importer').'">'.$data[0].'</a>';
 				} else {
 					$action = $data[0];
-					$data[1] = sprintf( __( 'This importer is not installed. Please install importers from <a href="%s">the main site</a>.' ), get_admin_url( $current_site->blog_id, 'import.php' ) );
+					$data[1] = sprintf(__('This importer is not installed. Please install importers from <a href="%s">the main site</a>.'), get_admin_url($current_site->blog_id, 'import.php'));
 				}
 			}
 		} else {
-			$action = "<a href='" . esc_url( "admin.php?import=$importer_id" ) . "' title='" . esc_attr( wptexturize( strip_tags( $data[1] ) ) ) ."'>{$data[0]}</a>";
+			$action = "<a href='".esc_url("admin.php?import=$importer_id")."' title='".esc_attr(wptexturize(strip_tags($data[1])))."'>{$data[0]}</a>";
 		}
 
 		echo "
@@ -124,12 +124,12 @@ 
 <?php
 }
 
-if ( current_user_can('install_plugins') )
-	echo '<p>' . sprintf( __('If the importer you need is not listed, <a href="%s">search the plugin directory</a> to see if an importer is available.'), esc_url( network_admin_url( 'plugin-install.php?tab=search&type=tag&s=importer' ) ) ) . '</p>';
+if (current_user_can('install_plugins'))
+	echo '<p>'.sprintf(__('If the importer you need is not listed, <a href="%s">search the plugin directory</a> to see if an importer is available.'), esc_url(network_admin_url('plugin-install.php?tab=search&type=tag&s=importer'))).'</p>';
 ?>
 
 </div>
 
 <?php
 
-include( ABSPATH . 'wp-admin/admin-footer.php' );
+include(ABSPATH.'wp-admin/admin-footer.php');

src/wp-admin/menu-header.php

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * Displays Administration Menu.
- *
- * @package WordPress
- * @subpackage Administration
- */
+	 * Displays Administration Menu.
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 */
 
 /**
  * The current page.

Spacing +61 added lines, -61 removed lines

@@ -35,7 +35,7 @@ 
  *
  * @param string $parent_file The parent file.
  */
-$parent_file = apply_filters( 'parent_file', $parent_file );
+$parent_file = apply_filters('parent_file', $parent_file);
 
 /**
  * Filter the file of an admin menu sub-menu item.
@@ -45,7 +45,7 @@ 
  * @param string $submenu_file The submenu file.
  * @param string $parent_file  The submenu item's parent file.
  */
-$submenu_file = apply_filters( 'submenu_file', $submenu_file, $parent_file );
+$submenu_file = apply_filters('submenu_file', $submenu_file, $parent_file);
 
 get_admin_page_parent();
 
@@ -65,46 +65,46 @@ 
  * @param array $submenu
  * @param bool  $submenu_as_parent
  */
-function _wp_menu_output( $menu, $submenu, $submenu_as_parent = true ) {
+function _wp_menu_output($menu, $submenu, $submenu_as_parent = true) {
 	global $self, $parent_file, $submenu_file, $plugin_page, $typenow;
 
 	$first = true;
 	// 0 = menu_title, 1 = capability, 2 = menu_slug, 3 = page_title, 4 = classes, 5 = hookname, 6 = icon_url
-	foreach ( $menu as $key => $item ) {
+	foreach ($menu as $key => $item) {
 		$admin_is_parent = false;
 		$class = array();
 		$aria_attributes = '';
 		$aria_hidden = '';
 		$is_separator = false;
 
-		if ( $first ) {
+		if ($first) {
 			$class[] = 'wp-first-item';
 			$first = false;
 		}
 
 		$submenu_items = array();
-		if ( ! empty( $submenu[$item[2]] ) ) {
+		if ( ! empty($submenu[$item[2]])) {
 			$class[] = 'wp-has-submenu';
 			$submenu_items = $submenu[$item[2]];
 		}
 
-		if ( ( $parent_file && $item[2] == $parent_file ) || ( empty($typenow) && $self == $item[2] ) ) {
-			$class[] = ! empty( $submenu_items ) ? 'wp-has-current-submenu wp-menu-open' : 'current';
+		if (($parent_file && $item[2] == $parent_file) || (empty($typenow) && $self == $item[2])) {
+			$class[] = ! empty($submenu_items) ? 'wp-has-current-submenu wp-menu-open' : 'current';
 		} else {
 			$class[] = 'wp-not-current-submenu';
-			if ( ! empty( $submenu_items ) )
+			if ( ! empty($submenu_items))
 				$aria_attributes .= 'aria-haspopup="true"';
 		}
 
-		if ( ! empty( $item[4] ) )
-			$class[] = esc_attr( $item[4] );
+		if ( ! empty($item[4]))
+			$class[] = esc_attr($item[4]);
 
-		$class = $class ? ' class="' . join( ' ', $class ) . '"' : '';
-		$id = ! empty( $item[5] ) ? ' id="' . preg_replace( '|[^a-zA-Z0-9_:.]|', '-', $item[5] ) . '"' : '';
+		$class = $class ? ' class="'.join(' ', $class).'"' : '';
+		$id = ! empty($item[5]) ? ' id="'.preg_replace('|[^a-zA-Z0-9_:.]|', '-', $item[5]).'"' : '';
 		$img = $img_style = '';
 		$img_class = ' dashicons-before';
 
-		if ( false !== strpos( $class, 'wp-menu-separator' ) ) {
+		if (false !== strpos($class, 'wp-menu-separator')) {
 			$is_separator = true;
 		}
 
@@ -114,51 +114,51 @@ 
 		 * with CSS. Dashicons and base64-encoded data:image/svg_xml URIs are also handled
 		 * as special cases.
 		 */
-		if ( ! empty( $item[6] ) ) {
-			$img = '<img src="' . $item[6] . '" alt="" />';
+		if ( ! empty($item[6])) {
+			$img = '<img src="'.$item[6].'" alt="" />';
 
-			if ( 'none' === $item[6] || 'div' === $item[6] ) {
+			if ('none' === $item[6] || 'div' === $item[6]) {
 				$img = '<br />';
-			} elseif ( 0 === strpos( $item[6], 'data:image/svg+xml;base64,' ) ) {
+			} elseif (0 === strpos($item[6], 'data:image/svg+xml;base64,')) {
 				$img = '<br />';
-				$img_style = ' style="background-image:url(\'' . esc_attr( $item[6] ) . '\')"';
+				$img_style = ' style="background-image:url(\''.esc_attr($item[6]).'\')"';
 				$img_class = ' svg';
-			} elseif ( 0 === strpos( $item[6], 'dashicons-' ) ) {
+			} elseif (0 === strpos($item[6], 'dashicons-')) {
 				$img = '<br />';
-				$img_class = ' dashicons-before ' . sanitize_html_class( $item[6] );
+				$img_class = ' dashicons-before '.sanitize_html_class($item[6]);
 			}
 		}
 		$arrow = '<div class="wp-menu-arrow"><div></div></div>';
 
-		$title = wptexturize( $item[0] );
+		$title = wptexturize($item[0]);
 
 		// hide separators from screen readers
-		if ( $is_separator ) {
+		if ($is_separator) {
 			$aria_hidden = ' aria-hidden="true"';
 		}
 
 		echo "\n\t<li$class$id$aria_hidden>";
 
-		if ( $is_separator ) {
+		if ($is_separator) {
 			echo '<div class="separator"></div>';
-		} elseif ( $submenu_as_parent && ! empty( $submenu_items ) ) {
-			$submenu_items = array_values( $submenu_items );  // Re-index.
-			$menu_hook = get_plugin_page_hook( $submenu_items[0][2], $item[2] );
+		} elseif ($submenu_as_parent && ! empty($submenu_items)) {
+			$submenu_items = array_values($submenu_items); // Re-index.
+			$menu_hook = get_plugin_page_hook($submenu_items[0][2], $item[2]);
 			$menu_file = $submenu_items[0][2];
-			if ( false !== ( $pos = strpos( $menu_file, '?' ) ) )
-				$menu_file = substr( $menu_file, 0, $pos );
-			if ( ! empty( $menu_hook ) || ( ( 'index.php' != $submenu_items[0][2] ) && file_exists( WP_PLUGIN_DIR . "/$menu_file" ) && ! file_exists( ABSPATH . "/wp-admin/$menu_file" ) ) ) {
+			if (false !== ($pos = strpos($menu_file, '?')))
+				$menu_file = substr($menu_file, 0, $pos);
+			if ( ! empty($menu_hook) || (('index.php' != $submenu_items[0][2]) && file_exists(WP_PLUGIN_DIR."/$menu_file") && ! file_exists(ABSPATH."/wp-admin/$menu_file"))) {
 				$admin_is_parent = true;
 				echo "<a href='admin.php?page={$submenu_items[0][2]}'$class $aria_attributes>$arrow<div class='wp-menu-image$img_class'$img_style>$img</div><div class='wp-menu-name'>$title</div></a>";
 			} else {
 				echo "\n\t<a href='{$submenu_items[0][2]}'$class $aria_attributes>$arrow<div class='wp-menu-image$img_class'$img_style>$img</div><div class='wp-menu-name'>$title</div></a>";
 			}
-		} elseif ( ! empty( $item[2] ) && current_user_can( $item[1] ) ) {
-			$menu_hook = get_plugin_page_hook( $item[2], 'admin.php' );
+		} elseif ( ! empty($item[2]) && current_user_can($item[1])) {
+			$menu_hook = get_plugin_page_hook($item[2], 'admin.php');
 			$menu_file = $item[2];
-			if ( false !== ( $pos = strpos( $menu_file, '?' ) ) )
-				$menu_file = substr( $menu_file, 0, $pos );
-			if ( ! empty( $menu_hook ) || ( ( 'index.php' != $item[2] ) && file_exists( WP_PLUGIN_DIR . "/$menu_file" ) && ! file_exists( ABSPATH . "/wp-admin/$menu_file" ) ) ) {
+			if (false !== ($pos = strpos($menu_file, '?')))
+				$menu_file = substr($menu_file, 0, $pos);
+			if ( ! empty($menu_hook) || (('index.php' != $item[2]) && file_exists(WP_PLUGIN_DIR."/$menu_file") && ! file_exists(ABSPATH."/wp-admin/$menu_file"))) {
 				$admin_is_parent = true;
 				echo "\n\t<a href='admin.php?page={$item[2]}'$class $aria_attributes>$arrow<div class='wp-menu-image$img_class'$img_style>$img</div><div class='wp-menu-name'>{$item[0]}</div></a>";
 			} else {
@@ -166,64 +166,64 @@ 
 			}
 		}
 
-		if ( ! empty( $submenu_items ) ) {
+		if ( ! empty($submenu_items)) {
 			echo "\n\t<ul class='wp-submenu wp-submenu-wrap'>";
 			echo "<li class='wp-submenu-head' aria-hidden='true'>{$item[0]}</li>";
 
 			$first = true;
 
 			// 0 = menu_title, 1 = capability, 2 = menu_slug, 3 = page_title, 4 = classes
-			foreach ( $submenu_items as $sub_key => $sub_item ) {
-				if ( ! current_user_can( $sub_item[1] ) )
+			foreach ($submenu_items as $sub_key => $sub_item) {
+				if ( ! current_user_can($sub_item[1]))
 					continue;
 
 				$class = array();
-				if ( $first ) {
+				if ($first) {
 					$class[] = 'wp-first-item';
 					$first = false;
 				}
 
 				$menu_file = $item[2];
 
-				if ( false !== ( $pos = strpos( $menu_file, '?' ) ) )
-					$menu_file = substr( $menu_file, 0, $pos );
+				if (false !== ($pos = strpos($menu_file, '?')))
+					$menu_file = substr($menu_file, 0, $pos);
 
 				// Handle current for post_type=post|page|foo pages, which won't match $self.
-				$self_type = ! empty( $typenow ) ? $self . '?post_type=' . $typenow : 'nothing';
+				$self_type = ! empty($typenow) ? $self.'?post_type='.$typenow : 'nothing';
 
-				if ( isset( $submenu_file ) ) {
-					if ( $submenu_file == $sub_item[2] )
+				if (isset($submenu_file)) {
+					if ($submenu_file == $sub_item[2])
 						$class[] = 'current';
 				// If plugin_page is set the parent must either match the current page or not physically exist.
 				// This allows plugin pages with the same hook to exist under different parents.
 				} elseif (
-					( ! isset( $plugin_page ) && $self == $sub_item[2] ) ||
-					( isset( $plugin_page ) && $plugin_page == $sub_item[2] && ( $item[2] == $self_type || $item[2] == $self || file_exists($menu_file) === false ) )
+					( ! isset($plugin_page) && $self == $sub_item[2]) ||
+					(isset($plugin_page) && $plugin_page == $sub_item[2] && ($item[2] == $self_type || $item[2] == $self || file_exists($menu_file) === false))
 				) {
 					$class[] = 'current';
 				}
 
-				if ( ! empty( $sub_item[4] ) ) {
-					$class[] = esc_attr( $sub_item[4] );
+				if ( ! empty($sub_item[4])) {
+					$class[] = esc_attr($sub_item[4]);
 				}
 
-				$class = $class ? ' class="' . join( ' ', $class ) . '"' : '';
+				$class = $class ? ' class="'.join(' ', $class).'"' : '';
 
 				$menu_hook = get_plugin_page_hook($sub_item[2], $item[2]);
 				$sub_file = $sub_item[2];
-				if ( false !== ( $pos = strpos( $sub_file, '?' ) ) )
+				if (false !== ($pos = strpos($sub_file, '?')))
 					$sub_file = substr($sub_file, 0, $pos);
 
 				$title = wptexturize($sub_item[0]);
 
-				if ( ! empty( $menu_hook ) || ( ( 'index.php' != $sub_item[2] ) && file_exists( WP_PLUGIN_DIR . "/$sub_file" ) && ! file_exists( ABSPATH . "/wp-admin/$sub_file" ) ) ) {
+				if ( ! empty($menu_hook) || (('index.php' != $sub_item[2]) && file_exists(WP_PLUGIN_DIR."/$sub_file") && ! file_exists(ABSPATH."/wp-admin/$sub_file"))) {
 					// If admin.php is the current page or if the parent exists as a file in the plugins or admin dir
-					if ( ( ! $admin_is_parent && file_exists( WP_PLUGIN_DIR . "/$menu_file" ) && ! is_dir( WP_PLUGIN_DIR . "/{$item[2]}" ) ) || file_exists( $menu_file ) )
-						$sub_item_url = add_query_arg( array( 'page' => $sub_item[2] ), $item[2] );
+					if (( ! $admin_is_parent && file_exists(WP_PLUGIN_DIR."/$menu_file") && ! is_dir(WP_PLUGIN_DIR."/{$item[2]}")) || file_exists($menu_file))
+						$sub_item_url = add_query_arg(array('page' => $sub_item[2]), $item[2]);
 					else
-						$sub_item_url = add_query_arg( array( 'page' => $sub_item[2] ), 'admin.php' );
+						$sub_item_url = add_query_arg(array('page' => $sub_item[2]), 'admin.php');
 
-					$sub_item_url = esc_url( $sub_item_url );
+					$sub_item_url = esc_url($sub_item_url);
 					echo "<li$class><a href='$sub_item_url'$class>$title</a></li>";
 				} else {
 					echo "<li$class><a href='{$sub_item[2]}'$class>$title</a></li>";
@@ -235,28 +235,28 @@ 
 	}
 
 	echo '<li id="collapse-menu" class="hide-if-no-js"><div id="collapse-button"><div></div></div>';
-	echo '<span>' . esc_html__( 'Collapse menu' ) . '</span>';
+	echo '<span>'.esc_html__('Collapse menu').'</span>';
 	echo '</li>';
 }
 
 ?>
 
-<div id="adminmenumain" role="navigation" aria-label="<?php esc_attr_e( 'Main menu' ); ?>">
-<a href="#wpbody-content" class="screen-reader-shortcut"><?php _e( 'Skip to main content' ); ?></a>
-<a href="#wp-toolbar" class="screen-reader-shortcut"><?php _e( 'Skip to toolbar' ); ?></a>
+<div id="adminmenumain" role="navigation" aria-label="<?php esc_attr_e('Main menu'); ?>">
+<a href="#wpbody-content" class="screen-reader-shortcut"><?php _e('Skip to main content'); ?></a>
+<a href="#wp-toolbar" class="screen-reader-shortcut"><?php _e('Skip to toolbar'); ?></a>
 <div id="adminmenuback"></div>
 <div id="adminmenuwrap">
 <ul id="adminmenu">
 
 <?php
 
-_wp_menu_output( $menu, $submenu );
+_wp_menu_output($menu, $submenu);
 /**
  * Fires after the admin menu has been output.
  *
  * @since 2.5.0
  */
-do_action( 'adminmenu' );
+do_action('adminmenu');
 
 ?>
 </ul>

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

Spacing +48 added lines, -48 removed lines

@@ -7,28 +7,28 @@ 
  */
 
 // don't load directly
-if ( !defined('ABSPATH') )
+if ( ! defined('ABSPATH'))
 	die('-1');
 ?>
 <form name="post" action="comment.php" method="post" id="post">
-<?php wp_nonce_field('update-comment_' . $comment->comment_ID) ?>
+<?php wp_nonce_field('update-comment_'.$comment->comment_ID) ?>
 <div class="wrap">
-<h1><?php _e( 'Edit Comment' ); ?></h1>
+<h1><?php _e('Edit Comment'); ?></h1>
 
 <div id="poststuff">
 <input type="hidden" name="action" value="editedcomment" />
-<input type="hidden" name="comment_ID" value="<?php echo esc_attr( $comment->comment_ID ); ?>" />
-<input type="hidden" name="comment_post_ID" value="<?php echo esc_attr( $comment->comment_post_ID ); ?>" />
+<input type="hidden" name="comment_ID" value="<?php echo esc_attr($comment->comment_ID); ?>" />
+<input type="hidden" name="comment_post_ID" value="<?php echo esc_attr($comment->comment_post_ID); ?>" />
 
 <div id="post-body" class="metabox-holder columns-2">
 <div id="post-body-content" class="edit-form-section edit-comment-section">
 <?php
-if ( 'approved' === wp_get_comment_status( $comment ) && $comment->comment_post_ID > 0 ) :
-	$comment_link = get_comment_link( $comment );
+if ('approved' === wp_get_comment_status($comment) && $comment->comment_post_ID > 0) :
+	$comment_link = get_comment_link($comment);
 ?>
 <div class="inside">
 	<div id="comment-link-box">
-		<strong><?php _ex( 'Permalink:', 'comment' ); ?></strong>
+		<strong><?php _ex('Permalink:', 'comment'); ?></strong>
 		<span id="sample-permalink"><a href="<?php echo $comment_link; ?>"><?php echo $comment_link; ?></a></span>
 	</div>
 </div>
@@ -36,21 +36,21 @@ 
 <div id="namediv" class="stuffbox">
 <div class="inside">
 <fieldset>
-<legend class="edit-comment-author"><?php _e( 'Author' ) ?></legend>
+<legend class="edit-comment-author"><?php _e('Author') ?></legend>
 <table class="form-table editcomment">
 <tbody>
 <tr>
-	<td class="first"><label for="name"><?php _e( 'Name:' ); ?></label></td>
-	<td><input type="text" name="newcomment_author" size="30" value="<?php echo esc_attr( $comment->comment_author ); ?>" id="name" /></td>
+	<td class="first"><label for="name"><?php _e('Name:'); ?></label></td>
+	<td><input type="text" name="newcomment_author" size="30" value="<?php echo esc_attr($comment->comment_author); ?>" id="name" /></td>
 </tr>
 <tr>
-	<td class="first"><label for="email"><?php _e( 'Email:' ); ?></label></td>
+	<td class="first"><label for="email"><?php _e('Email:'); ?></label></td>
 	<td>
 		<input type="text" name="newcomment_author_email" size="30" value="<?php echo $comment->comment_author_email; ?>" id="email" />
 	</td>
 </tr>
 <tr>
-	<td class="first"><label for="newcomment_author_url"><?php _e( 'URL:' ); ?></label></td>
+	<td class="first"><label for="newcomment_author_url"><?php _e('URL:'); ?></label></td>
 	<td>
 		<input type="text" id="newcomment_author_url" name="newcomment_author_url" size="30" class="code" value="<?php echo esc_attr($comment->comment_author_url); ?>" />
 	</td>
@@ -64,16 +64,16 @@ 
 
 <div id="postdiv" class="postarea">
 <?php
-	echo '<label for="content" class="screen-reader-text">' . __( 'Comment' ) . '</label>';
-	$quicktags_settings = array( 'buttons' => 'strong,em,link,block,del,ins,img,ul,ol,li,code,close' );
-	wp_editor( $comment->comment_content, 'content', array( 'media_buttons' => false, 'tinymce' => false, 'quicktags' => $quicktags_settings ) );
-	wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false ); ?>
+	echo '<label for="content" class="screen-reader-text">'.__('Comment').'</label>';
+	$quicktags_settings = array('buttons' => 'strong,em,link,block,del,ins,img,ul,ol,li,code,close');
+	wp_editor($comment->comment_content, 'content', array('media_buttons' => false, 'tinymce' => false, 'quicktags' => $quicktags_settings));
+	wp_nonce_field('closedpostboxes', 'closedpostboxesnonce', false); ?>
 </div>
 </div><!-- /post-body-content -->
 
 <div id="postbox-container-1" class="postbox-container">
 <div id="submitdiv" class="stuffbox" >
-<h2><?php _e( 'Status' ) ?></h2>
+<h2><?php _e('Status') ?></h2>
 <div class="inside">
 <div class="submitbox" id="submitcomment">
 <div id="minor-publishing">
@@ -81,61 +81,61 @@ 
 <div id="misc-publishing-actions">
 
 <fieldset class="misc-pub-section misc-pub-comment-status" id="comment-status-radio">
-<legend class="screen-reader-text"><?php _e( 'Comment status' ); ?></legend>
-<label class="approved"><input type="radio"<?php checked( $comment->comment_approved, '1' ); ?> name="comment_status" value="1" /><?php _ex( 'Approved', 'comment status' ); ?></label><br />
-<label class="waiting"><input type="radio"<?php checked( $comment->comment_approved, '0' ); ?> name="comment_status" value="0" /><?php _ex( 'Pending', 'comment status' ); ?></label><br />
-<label class="spam"><input type="radio"<?php checked( $comment->comment_approved, 'spam' ); ?> name="comment_status" value="spam" /><?php _ex( 'Spam', 'comment status' ); ?></label>
+<legend class="screen-reader-text"><?php _e('Comment status'); ?></legend>
+<label class="approved"><input type="radio"<?php checked($comment->comment_approved, '1'); ?> name="comment_status" value="1" /><?php _ex('Approved', 'comment status'); ?></label><br />
+<label class="waiting"><input type="radio"<?php checked($comment->comment_approved, '0'); ?> name="comment_status" value="0" /><?php _ex('Pending', 'comment status'); ?></label><br />
+<label class="spam"><input type="radio"<?php checked($comment->comment_approved, 'spam'); ?> name="comment_status" value="spam" /><?php _ex('Spam', 'comment status'); ?></label>
 </fieldset>
 
 <div class="misc-pub-section curtime misc-pub-curtime">
 <?php
 /* translators: Publish box date format, see http://php.net/date */
-$datef = __( 'M j, Y @ H:i' );
+$datef = __('M j, Y @ H:i');
 ?>
 <span id="timestamp"><?php
 printf(
 	/* translators: %s: comment date */
-	__( 'Submitted on: %s' ),
-	'<b>' . date_i18n( $datef, strtotime( $comment->comment_date ) ) . '</b>'
+	__('Submitted on: %s'),
+	'<b>'.date_i18n($datef, strtotime($comment->comment_date)).'</b>'
 );
 ?></span>
-<a href="#edit_timestamp" class="edit-timestamp hide-if-no-js"><span aria-hidden="true"><?php _e( 'Edit' ); ?></span> <span class="screen-reader-text"><?php _e( 'Edit date and time' ); ?></span></a>
+<a href="#edit_timestamp" class="edit-timestamp hide-if-no-js"><span aria-hidden="true"><?php _e('Edit'); ?></span> <span class="screen-reader-text"><?php _e('Edit date and time'); ?></span></a>
 <fieldset id='timestampdiv' class='hide-if-js'>
-<legend class="screen-reader-text"><?php _e( 'Date and time' ); ?></legend>
-<?php touch_time( ( 'editcomment' === $action ), 0 ); ?>
+<legend class="screen-reader-text"><?php _e('Date and time'); ?></legend>
+<?php touch_time(('editcomment' === $action), 0); ?>
 </fieldset>
 </div>
 
 <?php
 $post_id = $comment->comment_post_ID;
-if ( current_user_can( 'edit_post', $post_id ) ) {
-	$post_link = "<a href='" . esc_url( get_edit_post_link( $post_id ) ) . "'>";
-	$post_link .= esc_html( get_the_title( $post_id ) ) . '</a>';
+if (current_user_can('edit_post', $post_id)) {
+	$post_link = "<a href='".esc_url(get_edit_post_link($post_id))."'>";
+	$post_link .= esc_html(get_the_title($post_id)).'</a>';
 } else {
-	$post_link = esc_html( get_the_title( $post_id ) );
+	$post_link = esc_html(get_the_title($post_id));
 }
 ?>
 
 <div class="misc-pub-section misc-pub-response-to">
 	<?php printf(
 		/* translators: %s: post link */
-		__( 'In response to: %s' ),
-		'<b>' . $post_link . '</b>'
+		__('In response to: %s'),
+		'<b>'.$post_link.'</b>'
 	); ?>
 </div>
 
 <?php
-if ( $comment->comment_parent ) :
-	$parent      = get_comment( $comment->comment_parent );
-	if ( $parent ) :
-		$parent_link = esc_url( get_comment_link( $parent ) );
-		$name        = get_comment_author( $parent );
+if ($comment->comment_parent) :
+	$parent = get_comment($comment->comment_parent);
+	if ($parent) :
+		$parent_link = esc_url(get_comment_link($parent));
+		$name        = get_comment_author($parent);
 	?>
 	<div class="misc-pub-section misc-pub-reply-to">
 		<?php printf(
 			/* translators: %s: comment link */
-			__( 'In reply to: %s' ),
-			'<b><a href="' . $parent_link . '">' . $name . '</a></b>'
+			__('In reply to: %s'),
+			'<b><a href="'.$parent_link.'">'.$name.'</a></b>'
 		); ?>
 	</div>
 <?php endif;
@@ -150,7 +150,7 @@ 
 	 * @param string $html    Output HTML to display miscellaneous action.
 	 * @param object $comment Current comment object.
 	 */
-	 echo apply_filters( 'edit_comment_misc_actions', '', $comment );
+	 echo apply_filters('edit_comment_misc_actions', '', $comment);
 ?>
 
 </div> <!-- misc actions -->
@@ -159,10 +159,10 @@ 
 
 <div id="major-publishing-actions">
 <div id="delete-action">
-<?php echo "<a class='submitdelete deletion' href='" . wp_nonce_url("comment.php?action=" . ( !EMPTY_TRASH_DAYS ? 'deletecomment' : 'trashcomment' ) . "&amp;c=$comment->comment_ID&amp;_wp_original_http_referer=" . urlencode(wp_get_referer()), 'delete-comment_' . $comment->comment_ID) . "'>" . ( !EMPTY_TRASH_DAYS ? __('Delete Permanently') : __('Move to Trash') ) . "</a>\n"; ?>
+<?php echo "<a class='submitdelete deletion' href='".wp_nonce_url("comment.php?action=".( ! EMPTY_TRASH_DAYS ? 'deletecomment' : 'trashcomment')."&amp;c=$comment->comment_ID&amp;_wp_original_http_referer=".urlencode(wp_get_referer()), 'delete-comment_'.$comment->comment_ID)."'>".( ! EMPTY_TRASH_DAYS ? __('Delete Permanently') : __('Move to Trash'))."</a>\n"; ?>
 </div>
 <div id="publishing-action">
-<?php submit_button( __( 'Update' ), 'primary', 'save', false ); ?>
+<?php submit_button(__('Update'), 'primary', 'save', false); ?>
 </div>
 <div class="clear"></div>
 </div>
@@ -174,7 +174,7 @@ 
 <div id="postbox-container-2" class="postbox-container">
 <?php
 /** This action is documented in wp-admin/edit-form-advanced.php */
-do_action( 'add_meta_boxes', 'comment', $comment );
+do_action('add_meta_boxes', 'comment', $comment);
 
 /**
  * Fires when comment-specific meta boxes are added.
@@ -183,7 +183,7 @@ 
  *
  * @param WP_Comment $comment Comment object.
  */
-do_action( 'add_meta_boxes_comment', $comment );
+do_action('add_meta_boxes_comment', $comment);
 
 do_meta_boxes(null, 'normal', $comment);
 
@@ -193,7 +193,7 @@ 
 
 <input type="hidden" name="c" value="<?php echo esc_attr($comment->comment_ID) ?>" />
 <input type="hidden" name="p" value="<?php echo esc_attr($comment->comment_post_ID) ?>" />
-<input name="referredby" type="hidden" id="referredby" value="<?php echo $referer ? esc_url( $referer ) : ''; ?>" />
+<input name="referredby" type="hidden" id="referredby" value="<?php echo $referer ? esc_url($referer) : ''; ?>" />
 <?php wp_original_referer_field(true, 'previous'); ?>
 <input type="hidden" name="noredir" value="1" />
 
@@ -202,7 +202,7 @@ 
 </div>
 </form>
 
-<?php if ( ! wp_is_mobile() ) : ?>
+<?php if ( ! wp_is_mobile()) : ?>
 <script type="text/javascript">
 try{document.post.name.focus();}catch(e){}
 </script>

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/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/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 ) : ?>

src/wp-admin/about.php

Indentation +9 added lines, -9 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 /**
- * About This Version administration panel.
- *
- * @package WordPress
- * @subpackage Administration
- */
+	 * About This Version administration panel.
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 */
 
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
@@ -160,7 +160,7 @@ 
 							'<a href="https://developer.wordpress.org/reference/functions/add_term_meta"><code>add_term_meta()</code></a>',
 							'<a href="https://developer.wordpress.org/reference/functions/get_term_meta"><code>get_term_meta()</code></a>',
 							'<a href="https://developer.wordpress.org/reference/functions/update_term_meta"><code>update_term_meta()</code></a>'
-				         );
+						 );
 					?></p>
 				</div>
 				<div class="col">
@@ -217,15 +217,15 @@ 
 
 /* translators: 1: WordPress version number, 2: plural number of bugs. */
 _n_noop( '<strong>Version %1$s</strong> addressed %2$s bug.',
-         '<strong>Version %1$s</strong> addressed %2$s bugs.' );
+		 '<strong>Version %1$s</strong> addressed %2$s bugs.' );
 
 /* translators: 1: WordPress version number, 2: plural number of bugs. Singular security issue. */
 _n_noop( '<strong>Version %1$s</strong> addressed a security issue and fixed %2$s bug.',
-         '<strong>Version %1$s</strong> addressed a security issue and fixed %2$s bugs.' );
+		 '<strong>Version %1$s</strong> addressed a security issue and fixed %2$s bugs.' );
 
 /* translators: 1: WordPress version number, 2: plural number of bugs. More than one security issue. */
 _n_noop( '<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bug.',
-         '<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bugs.' );
+		 '<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bugs.' );
 
 /* translators: %s: Codex URL */
 __( 'For more information, see <a href="%s">the release notes</a>.' );

Spacing +65 added lines, -65 removed lines

@@ -7,64 +7,64 @@ 
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-wp_enqueue_style( 'wp-mediaelement' );
-wp_enqueue_script( 'wp-mediaelement' );
-wp_localize_script( 'mediaelement', '_wpmejsSettings', array(
-	'pluginPath' => includes_url( 'js/mediaelement/', 'relative' ),
+wp_enqueue_style('wp-mediaelement');
+wp_enqueue_script('wp-mediaelement');
+wp_localize_script('mediaelement', '_wpmejsSettings', array(
+	'pluginPath' => includes_url('js/mediaelement/', 'relative'),
 	'pauseOtherPlayers' => ''
-) );
+));
 
-if ( current_user_can( 'install_plugins' ) ) {
+if (current_user_can('install_plugins')) {
 	add_thickbox();
-	wp_enqueue_script( 'plugin-install' );
+	wp_enqueue_script('plugin-install');
 }
 
 $video_url = 'https://videopress.com/embed/J44FHXvg?hd=true';
-$locale    = str_replace( '_', '-', get_locale() );
-list( $locale ) = explode( '-', $locale );
-if ( 'en' !== $locale ) {
-	$video_url = add_query_arg( 'defaultLangCode', $locale, $video_url );
+$locale    = str_replace('_', '-', get_locale());
+list($locale) = explode('-', $locale);
+if ('en' !== $locale) {
+	$video_url = add_query_arg('defaultLangCode', $locale, $video_url);
 }
 
 wp_oembed_add_host_js();
 
-$title = __( 'About' );
+$title = __('About');
 
-list( $display_version ) = explode( '-', $wp_version );
+list($display_version) = explode('-', $wp_version);
 
-include( ABSPATH . 'wp-admin/admin-header.php' );
+include(ABSPATH.'wp-admin/admin-header.php');
 ?>
 	<div class="wrap about-wrap">
-		<h1><?php printf( __( 'Welcome to WordPress&nbsp;%s' ), $display_version ); ?></h1>
+		<h1><?php printf(__('Welcome to WordPress&nbsp;%s'), $display_version); ?></h1>
 
-		<div class="about-text"><?php printf( __( 'Thank you for updating! WordPress %s makes your site more connected and responsive.' ), $display_version ); ?></div>
-		<div class="wp-badge"><?php printf( __( 'Version %s' ), $display_version ); ?></div>
+		<div class="about-text"><?php printf(__('Thank you for updating! WordPress %s makes your site more connected and responsive.'), $display_version); ?></div>
+		<div class="wp-badge"><?php printf(__('Version %s'), $display_version); ?></div>
 
 		<h2 class="nav-tab-wrapper wp-clearfix">
-			<a href="about.php" class="nav-tab nav-tab-active"><?php _e( 'What&#8217;s New' ); ?></a>
-			<a href="credits.php" class="nav-tab"><?php _e( 'Credits' ); ?></a>
-			<a href="freedoms.php" class="nav-tab"><?php _e( 'Freedoms' ); ?></a>
+			<a href="about.php" class="nav-tab nav-tab-active"><?php _e('What&#8217;s New'); ?></a>
+			<a href="credits.php" class="nav-tab"><?php _e('Credits'); ?></a>
+			<a href="freedoms.php" class="nav-tab"><?php _e('Freedoms'); ?></a>
 		</h2>
 
 		<div class="headline-feature feature-video">
-			<iframe width="1050" height="591" src="<?php echo esc_url( $video_url ); ?>" frameborder="0" allowfullscreen></iframe>
+			<iframe width="1050" height="591" src="<?php echo esc_url($video_url); ?>" frameborder="0" allowfullscreen></iframe>
 			<script src="https://videopress.com/videopress-iframe.js"></script>
 		</div>
 
 		<hr>
 
 		<div class="headline-feature feature-section one-col">
-			<h2><?php _e( 'Twenty Sixteen' ); ?></h2>
+			<h2><?php _e('Twenty Sixteen'); ?></h2>
 			<div class="media-container">
 				<img src="https://s.w.org/images/core/4.4/twenty-sixteen-white-fullsize-2x.png" alt="" srcset="https://s.w.org/images/core/4.4/twenty-sixteen-white-smartphone-1x.png 268w, https://s.w.org/images/core/4.4/twenty-sixteen-white-smartphone-2x.png 536w, https://s.w.org/images/core/4.4/twenty-sixteen-white-tablet-1x.png 558w, https://s.w.org/images/core/4.4/twenty-sixteen-white-desktop-1x.png 840w, https://s.w.org/images/core/4.4/twenty-sixteen-white-fullsize-1x.png 1086w, https://s.w.org/images/core/4.4/twenty-sixteen-white-tablet-2x.png 1116w, https://s.w.org/images/core/4.4/twenty-sixteen-white-desktop-2x.png 1680w, https://s.w.org/images/core/4.4/twenty-sixteen-white-fullsize-2x.png 2172w" sizes="(max-width: 500px) calc((100vw - 40px) * .8), (max-width: 782px) calc((100vw - 70px) * .8), (max-width: 960px) calc((100vw - 116px) * .8), (max-width: 1290px) calc((100vw - 240px) * .8), 840px" />
 			</div>
 			<div class="two-col">
 				<div class="col">
-					<h3><?php _e( 'Introducing Twenty Sixteen' ); ?></h3>
-					<p><?php _e( 'Our newest default theme, Twenty Sixteen, is a modern take on a classic blog design.' ); ?></p>
-					<p><?php _e( 'Twenty Sixteen was built to look great on any device. A fluid grid design, flexible header, fun color schemes, and more, will make your content shine.' ); ?></p>
+					<h3><?php _e('Introducing Twenty Sixteen'); ?></h3>
+					<p><?php _e('Our newest default theme, Twenty Sixteen, is a modern take on a classic blog design.'); ?></p>
+					<p><?php _e('Twenty Sixteen was built to look great on any device. A fluid grid design, flexible header, fun color schemes, and more, will make your content shine.'); ?></p>
 					<div class="horizontal-image">
 						<div class="content">
 							<img class="feature-image horizontal-screen" src="https://s.w.org/images/core/4.4/twenty-sixteen-dark-fullsize-2x.png" alt=""  srcset="https://s.w.org/images/core/4.4/twenty-sixteen-dark-smartphone-1x.png 268w, https://s.w.org/images/core/4.4/twenty-sixteen-dark-smartphone-2x.png 535w, https://s.w.org/images/core/4.4/twenty-sixteen-dark-desktop-1x.png 558w, https://s.w.org/images/core/4.4/twenty-sixteen-dark-fullsize-1x.png 783w, https://s.w.org/images/core/4.4/twenty-sixteen-dark-desktop-2x.png 1116w, https://s.w.org/images/core/4.4/twenty-sixteen-dark-fullsize-2x.png 1566w" sizes="(max-width: 500px) calc((100vw - 40px) * .8), (max-width: 782px) calc((100vw - 70px) * .8), (max-width: 960px) calc((100vw - 116px) * .5216), (max-width: 1290px) calc((100vw - 240px) * .5216), 548px" />
@@ -86,8 +86,8 @@ 
 				</div>
 			</div>
 			<div class="col">
-				<h3><?php _e( 'Responsive images' ); ?></h3>
-				<p><?php _e( 'WordPress now takes a smarter approach to displaying appropriate image sizes on any device, ensuring a perfect fit every time. You don&#8217;t need to do anything to your theme, it just works.' ); ?></p>
+				<h3><?php _e('Responsive images'); ?></h3>
+				<p><?php _e('WordPress now takes a smarter approach to displaying appropriate image sizes on any device, ensuring a perfect fit every time. You don&#8217;t need to do anything to your theme, it just works.'); ?></p>
 			</div>
 		</div>
 
@@ -96,12 +96,12 @@ 
 		<div class="feature-section two-col">
 			<div class="col">
 				<div class="embed-container">
-					<blockquote data-secret="OcUe7B6Edh" class="wp-embedded-content"><a href="https://wordpress.org/news/2015/12/clifford/">WordPress 4.4 &ldquo;Clifford&rdquo;</a></blockquote><iframe class="wp-embedded-content" sandbox="allow-scripts" security="restricted" style="display:none;" src="https://wordpress.org/news/2015/12/clifford/embed/#?secret=OcUe7B6Edh" data-secret="OcUe7B6Edh" width="600" height="338" title="<?php esc_attr_e( 'Embedded WordPress Post' ); ?>" frameborder="0" marginwidth="0" marginheight="0" scrolling="no"></iframe>
+					<blockquote data-secret="OcUe7B6Edh" class="wp-embedded-content"><a href="https://wordpress.org/news/2015/12/clifford/">WordPress 4.4 &ldquo;Clifford&rdquo;</a></blockquote><iframe class="wp-embedded-content" sandbox="allow-scripts" security="restricted" style="display:none;" src="https://wordpress.org/news/2015/12/clifford/embed/#?secret=OcUe7B6Edh" data-secret="OcUe7B6Edh" width="600" height="338" title="<?php esc_attr_e('Embedded WordPress Post'); ?>" frameborder="0" marginwidth="0" marginheight="0" scrolling="no"></iframe>
 				</div>
 			</div>
 			<div class="col">
-				<h3><?php _e( 'Embed your WordPress content' ); ?></h3>
-				<p><?php _e( 'Now you can embed your posts on other sites, even other WordPress sites. Simply drop a post URL into the editor and see an instant embed preview, complete with the title, excerpt, and featured image if you&#8217;ve set one. We&#8217;ll even include your site icon and links for comments and sharing.' ); ?></p>
+				<h3><?php _e('Embed your WordPress content'); ?></h3>
+				<p><?php _e('Now you can embed your posts on other sites, even other WordPress sites. Simply drop a post URL into the editor and see an instant embed preview, complete with the title, excerpt, and featured image if you&#8217;ve set one. We&#8217;ll even include your site icon and links for comments and sharing.'); ?></p>
 			</div>
 		</div>
 
@@ -114,23 +114,23 @@ 
 				</div>
 			</div>
 			<div class="col">
-				<h3><?php _e( 'Even more embed providers' ); ?></h3>
-				<p><?php _e( 'In addition to post embeds, WordPress 4.4 also adds support for five new oEmbed providers: Cloudup, Reddit&nbsp;Comments, ReverbNation, Speaker&nbsp;Deck, and VideoPress.' ); ?></p>
+				<h3><?php _e('Even more embed providers'); ?></h3>
+				<p><?php _e('In addition to post embeds, WordPress 4.4 also adds support for five new oEmbed providers: Cloudup, Reddit&nbsp;Comments, ReverbNation, Speaker&nbsp;Deck, and VideoPress.'); ?></p>
 			</div>
 		</div>
 
 		<hr />
 
 		<div class="changelog">
-			<h3><?php _e( 'Under the Hood' ); ?></h3>
+			<h3><?php _e('Under the Hood'); ?></h3>
 
 			<div class="feature-section under-the-hood one-col">
 				<div class="col">
-					<h4><?php _e( 'REST API infrastructure' ); ?></h4>
+					<h4><?php _e('REST API infrastructure'); ?></h4>
 					<div class="two-col-text">
-						<p><?php _e( 'Infrastructure for the REST API has been integrated into core, marking a new era in developing with WordPress. The REST API serves to provide developers with a path forward for building and extending RESTful APIs on top of WordPress.' ); ?></p>
+						<p><?php _e('Infrastructure for the REST API has been integrated into core, marking a new era in developing with WordPress. The REST API serves to provide developers with a path forward for building and extending RESTful APIs on top of WordPress.'); ?></p>
 						<p><?php
-							if ( current_user_can( 'install_plugins' ) ) {
+							if (current_user_can('install_plugins')) {
 								$url_args = array(
 									'tab'       => 'plugin-information',
 									'plugin'    => 'rest-api',
@@ -139,13 +139,13 @@ 
 									'height'    => 550
 								);
 
-								$plugin_link = '<a href="' . esc_url( add_query_arg( $url_args, network_admin_url( 'plugin-install.php' ) ) ) . '" class="thickbox open-plugin-details-modal">WordPress REST API</a>';
+								$plugin_link = '<a href="'.esc_url(add_query_arg($url_args, network_admin_url('plugin-install.php'))).'" class="thickbox open-plugin-details-modal">WordPress REST API</a>';
 							} else {
 								$plugin_link = '<a href="https://wordpress.org/plugins/rest-api">WordPress REST API</a>';
 							}
 
 							/* translators: WordPress REST API plugin link */
-							printf( __( 'Infrastructure is the first part of a multi-stage rollout for the REST API. Inclusion of core endpoints is targeted for an upcoming release. To get a sneak peek of the core endpoints, and for more information on extending the REST API, check out the official %s plugin.' ), $plugin_link );
+							printf(__('Infrastructure is the first part of a multi-stage rollout for the REST API. Inclusion of core endpoints is targeted for an upcoming release. To get a sneak peek of the core endpoints, and for more information on extending the REST API, check out the official %s plugin.'), $plugin_link);
 						?></p>
 					</div>
 				</div>
@@ -153,10 +153,10 @@ 
 
 			<div class="feature-section under-the-hood three-col">
 				<div class="col">
-					<h4><?php _e( 'Term meta' ); ?></h4>
+					<h4><?php _e('Term meta'); ?></h4>
 					<p><?php
 						/* translators: 1: add_term_meta() docs link, 2: get_term_meta() docs link, 3: update_term_meta() docs link */
-						printf( __( 'Terms now support metadata, just like posts. See %1$s, %2$s, and %3$s for more information.' ),
+						printf(__('Terms now support metadata, just like posts. See %1$s, %2$s, and %3$s for more information.'),
 							'<a href="https://developer.wordpress.org/reference/functions/add_term_meta"><code>add_term_meta()</code></a>',
 							'<a href="https://developer.wordpress.org/reference/functions/get_term_meta"><code>get_term_meta()</code></a>',
 							'<a href="https://developer.wordpress.org/reference/functions/update_term_meta"><code>update_term_meta()</code></a>'
@@ -164,17 +164,17 @@ 
 					?></p>
 				</div>
 				<div class="col">
-					<h4><?php _e( 'Comment query improvements' ); ?></h4>
+					<h4><?php _e('Comment query improvements'); ?></h4>
 					<p><?php
 						/* translators: WP_Comment_Query class name */
-						printf( __( 'Comment queries now have cache handling to improve performance. New arguments in %s make crafting robust comment queries simpler.' ), '<code>WP_Comment_Query</code>' );
+						printf(__('Comment queries now have cache handling to improve performance. New arguments in %s make crafting robust comment queries simpler.'), '<code>WP_Comment_Query</code>');
 					?></p>
 				</div>
 				<div class="col">
-					<h4><?php _e( 'Term, comment, and network objects' ); ?></h4>
+					<h4><?php _e('Term, comment, and network objects'); ?></h4>
 					<p><?php
 						/* translators: 1: WP_Term class name, WP_Comment class name, WP_Network class name */
-						printf( __( 'New %1$s, %2$s, and %3$s objects make interacting with terms, comments, and networks more predictable and intuitive in code.' ),
+						printf(__('New %1$s, %2$s, and %3$s objects make interacting with terms, comments, and networks more predictable and intuitive in code.'),
 							'<code>WP_Term</code>',
 							'<code>WP_Comment</code>',
 							'<code>WP_Network</code>'
@@ -184,48 +184,48 @@ 
 			</div>
 
 			<div class="return-to-dashboard">
-				<?php if ( current_user_can( 'update_core' ) && isset( $_GET['updated'] ) ) : ?>
-					<a href="<?php echo esc_url( self_admin_url( 'update-core.php' ) ); ?>">
-						<?php is_multisite() ? _e( 'Return to Updates' ) : _e( 'Return to Dashboard &rarr; Updates' ); ?>
+				<?php if (current_user_can('update_core') && isset($_GET['updated'])) : ?>
+					<a href="<?php echo esc_url(self_admin_url('update-core.php')); ?>">
+						<?php is_multisite() ? _e('Return to Updates') : _e('Return to Dashboard &rarr; Updates'); ?>
 					</a> |
 				<?php endif; ?>
-				<a href="<?php echo esc_url( self_admin_url() ); ?>"><?php is_blog_admin() ? _e( 'Go to Dashboard &rarr; Home' ) : _e( 'Go to Dashboard' ); ?></a>
+				<a href="<?php echo esc_url(self_admin_url()); ?>"><?php is_blog_admin() ? _e('Go to Dashboard &rarr; Home') : _e('Go to Dashboard'); ?></a>
 			</div>
 
 		</div>
 	</div>
 <?php
 
-include( ABSPATH . 'wp-admin/admin-footer.php' );
+include(ABSPATH.'wp-admin/admin-footer.php');
 
 // These are strings we may use to describe maintenance/security releases, where we aim for no new strings.
 return;
 
-__( 'Maintenance Release' );
-__( 'Maintenance Releases' );
+__('Maintenance Release');
+__('Maintenance Releases');
 
-__( 'Security Release' );
-__( 'Security Releases' );
+__('Security Release');
+__('Security Releases');
 
-__( 'Maintenance and Security Release' );
-__( 'Maintenance and Security Releases' );
+__('Maintenance and Security Release');
+__('Maintenance and Security Releases');
 
 /* translators: %s: WordPress version number */
-__( '<strong>Version %s</strong> addressed one security issue.' );
+__('<strong>Version %s</strong> addressed one security issue.');
 /* translators: %s: WordPress version number */
-__( '<strong>Version %s</strong> addressed some security issues.' );
+__('<strong>Version %s</strong> addressed some security issues.');
 
 /* translators: 1: WordPress version number, 2: plural number of bugs. */
-_n_noop( '<strong>Version %1$s</strong> addressed %2$s bug.',
-         '<strong>Version %1$s</strong> addressed %2$s bugs.' );
+_n_noop('<strong>Version %1$s</strong> addressed %2$s bug.',
+         '<strong>Version %1$s</strong> addressed %2$s bugs.');
 
 /* translators: 1: WordPress version number, 2: plural number of bugs. Singular security issue. */
-_n_noop( '<strong>Version %1$s</strong> addressed a security issue and fixed %2$s bug.',
-         '<strong>Version %1$s</strong> addressed a security issue and fixed %2$s bugs.' );
+_n_noop('<strong>Version %1$s</strong> addressed a security issue and fixed %2$s bug.',
+         '<strong>Version %1$s</strong> addressed a security issue and fixed %2$s bugs.');
 
 /* translators: 1: WordPress version number, 2: plural number of bugs. More than one security issue. */
-_n_noop( '<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bug.',
-         '<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bugs.' );
+_n_noop('<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bug.',
+         '<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bugs.');
 
 /* translators: %s: Codex URL */
-__( 'For more information, see <a href="%s">the release notes</a>.' );
+__('For more information, see <a href="%s">the release notes</a>.');

src/wp-admin/term.php

Indentation +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
 $title    = $tax->labels->edit_item;
 
 if ( ! in_array( $taxonomy, get_taxonomies( array( 'show_ui' => true ) ) ) ||
-     ! current_user_can( $tax->cap->manage_terms )
+	 ! current_user_can( $tax->cap->manage_terms )
 ) {
 	wp_die(
 		'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .

Spacing +25 added lines, -25 removed lines

@@ -8,34 +8,34 @@ 
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( empty( $_REQUEST['tag_ID'] ) ) {
-	$sendback = admin_url( 'edit-tags.php' );
-	if ( ! empty( $taxnow ) ) {
-		$sendback = add_query_arg( array( 'taxonomy' => $taxnow ), $sendback );
+if (empty($_REQUEST['tag_ID'])) {
+	$sendback = admin_url('edit-tags.php');
+	if ( ! empty($taxnow)) {
+		$sendback = add_query_arg(array('taxonomy' => $taxnow), $sendback);
 	}
-	wp_redirect( esc_url( $sendback ) );
+	wp_redirect(esc_url($sendback));
 	exit;
 }
 
-$tag_ID = absint( $_REQUEST['tag_ID'] );
-$tag    = get_term( $tag_ID, '', OBJECT, 'edit' );
+$tag_ID = absint($_REQUEST['tag_ID']);
+$tag    = get_term($tag_ID, '', OBJECT, 'edit');
 
-if ( ! $tag instanceof WP_Term ) {
-	wp_die( __( 'You attempted to edit an item that doesn’t exist. Perhaps it was deleted?' ) );
+if ( ! $tag instanceof WP_Term) {
+	wp_die(__('You attempted to edit an item that doesn’t exist. Perhaps it was deleted?'));
 }
 
-$tax      = get_taxonomy( $tag->taxonomy );
+$tax      = get_taxonomy($tag->taxonomy);
 $taxonomy = $tax->name;
 $title    = $tax->labels->edit_item;
 
-if ( ! in_array( $taxonomy, get_taxonomies( array( 'show_ui' => true ) ) ) ||
-     ! current_user_can( $tax->cap->manage_terms )
+if ( ! in_array($taxonomy, get_taxonomies(array('show_ui' => true))) ||
+     ! current_user_can($tax->cap->manage_terms)
 ) {
 	wp_die(
-		'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-		'<p>' . __( 'You are not allowed to manage this item.' ) . '</p>',
+		'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+		'<p>'.__('You are not allowed to manage this item.').'</p>',
 		403
 	);
 }
@@ -43,14 +43,14 @@ 
 $post_type = get_current_screen()->post_type;
 
 // Default to the first object_type associated with the taxonomy if no post type was passed.
-if ( empty( $post_type ) ) {
-	$post_type = reset( $tax->object_type );
+if (empty($post_type)) {
+	$post_type = reset($tax->object_type);
 }
 
-if ( 'post' != $post_type ) {
-	$parent_file  = ( 'attachment' == $post_type ) ? 'upload.php' : "edit.php?post_type=$post_type";
+if ('post' != $post_type) {
+	$parent_file  = ('attachment' == $post_type) ? 'upload.php' : "edit.php?post_type=$post_type";
 	$submenu_file = "edit-tags.php?taxonomy=$taxonomy&amp;post_type=$post_type";
-} elseif ( 'link_category' == $taxonomy ) {
+} elseif ('link_category' == $taxonomy) {
 	$parent_file  = 'link-manager.php';
 	$submenu_file = 'edit-tags.php?taxonomy=link_category';
 } else {
@@ -58,11 +58,11 @@ 
 	$submenu_file = "edit-tags.php?taxonomy=$taxonomy";
 }
 
-get_current_screen()->set_screen_reader_content( array(
+get_current_screen()->set_screen_reader_content(array(
 	'heading_pagination' => $tax->labels->items_list_navigation,
 	'heading_list'       => $tax->labels->items_list,
-) );
+));
 
-require_once( ABSPATH . 'wp-admin/admin-header.php' );
-include( ABSPATH . 'wp-admin/edit-tag-form.php' );
-include( ABSPATH . 'wp-admin/admin-footer.php' );
+require_once(ABSPATH.'wp-admin/admin-header.php');
+include(ABSPATH.'wp-admin/edit-tag-form.php');
+include(ABSPATH.'wp-admin/admin-footer.php');