ntwb / wordpress

src/wp-admin/widgets.php

Spacing +152 added lines, -152 removed lines

@@ -7,32 +7,32 @@ 
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
 /** WordPress Administration Widgets API */
-require_once(ABSPATH . 'wp-admin/includes/widgets.php');
+require_once(ABSPATH.'wp-admin/includes/widgets.php');
 
-if ( ! current_user_can( 'edit_theme_options' ) ) {
+if ( ! current_user_can('edit_theme_options')) {
 	wp_die(
-		'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-		'<p>' . __( 'Sorry, you are not allowed to edit theme options on this site.' ) . '</p>',
+		'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+		'<p>'.__('Sorry, you are not allowed to edit theme options on this site.').'</p>',
 		403
 	);
 }
 
-$widgets_access = get_user_setting( 'widgets_access' );
-if ( isset($_GET['widgets-access']) ) {
+$widgets_access = get_user_setting('widgets_access');
+if (isset($_GET['widgets-access'])) {
 	$widgets_access = 'on' == $_GET['widgets-access'] ? 'on' : 'off';
-	set_user_setting( 'widgets_access', $widgets_access );
+	set_user_setting('widgets_access', $widgets_access);
 }
 
-if ( 'on' == $widgets_access ) {
-	add_filter( 'admin_body_class', 'wp_widgets_access_body_class' );
+if ('on' == $widgets_access) {
+	add_filter('admin_body_class', 'wp_widgets_access_body_class');
 } else {
 	wp_enqueue_script('admin-widgets');
 
-	if ( wp_is_mobile() )
-		wp_enqueue_script( 'jquery-touch-punch' );
+	if (wp_is_mobile())
+		wp_enqueue_script('jquery-touch-punch');
 }
 
 /**
@@ -41,68 +41,68 @@ 
  *
  * @since 2.2.0
  */
-do_action( 'sidebar_admin_setup' );
+do_action('sidebar_admin_setup');
 
-$title = __( 'Widgets' );
+$title = __('Widgets');
 $parent_file = 'themes.php';
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 'id'		=> 'overview',
 'title'		=> __('Overview'),
 'content'	=>
-	'<p>' . __('Widgets are independent sections of content that can be placed into any widgetized area provided by your theme (commonly called sidebars). To populate your sidebars/widget areas with individual widgets, drag and drop the title bars into the desired area. By default, only the first widget area is expanded. To populate additional widget areas, click on their title bars to expand them.') . '</p>
-	<p>' . __('The Available Widgets section contains all the widgets you can choose from. Once you drag a widget into a sidebar, it will open to allow you to configure its settings. When you are happy with the widget settings, click the Save button and the widget will go live on your site. If you click Delete, it will remove the widget.') . '</p>'
-) );
-get_current_screen()->add_help_tab( array(
+	'<p>'.__('Widgets are independent sections of content that can be placed into any widgetized area provided by your theme (commonly called sidebars). To populate your sidebars/widget areas with individual widgets, drag and drop the title bars into the desired area. By default, only the first widget area is expanded. To populate additional widget areas, click on their title bars to expand them.').'</p>
+	<p>' . __('The Available Widgets section contains all the widgets you can choose from. Once you drag a widget into a sidebar, it will open to allow you to configure its settings. When you are happy with the widget settings, click the Save button and the widget will go live on your site. If you click Delete, it will remove the widget.').'</p>'
+));
+get_current_screen()->add_help_tab(array(
 'id'		=> 'removing-reusing',
 'title'		=> __('Removing and Reusing'),
 'content'	=>
-	'<p>' . __('If you want to remove the widget but save its setting for possible future use, just drag it into the Inactive Widgets area. You can add them back anytime from there. This is especially helpful when you switch to a theme with fewer or different widget areas.') . '</p>
-	<p>' . __('Widgets may be used multiple times. You can give each widget a title, to display on your site, but it&#8217;s not required.') . '</p>
-	<p>' . __('Enabling Accessibility Mode, via Screen Options, allows you to use Add and Edit buttons instead of using drag and drop.') . '</p>'
-) );
-get_current_screen()->add_help_tab( array(
+	'<p>'.__('If you want to remove the widget but save its setting for possible future use, just drag it into the Inactive Widgets area. You can add them back anytime from there. This is especially helpful when you switch to a theme with fewer or different widget areas.').'</p>
+	<p>' . __('Widgets may be used multiple times. You can give each widget a title, to display on your site, but it&#8217;s not required.').'</p>
+	<p>' . __('Enabling Accessibility Mode, via Screen Options, allows you to use Add and Edit buttons instead of using drag and drop.').'</p>'
+));
+get_current_screen()->add_help_tab(array(
 'id'		=> 'missing-widgets',
 'title'		=> __('Missing Widgets'),
 'content'	=>
-	'<p>' . __('Many themes show some sidebar widgets by default until you edit your sidebars, but they are not automatically displayed in your sidebar management tool. After you make your first widget change, you can re-add the default widgets by adding them from the Available Widgets area.') . '</p>' .
-		'<p>' . __('When changing themes, there is often some variation in the number and setup of widget areas/sidebars and sometimes these conflicts make the transition a bit less smooth. If you changed themes and seem to be missing widgets, scroll down on this screen to the Inactive Widgets area, where all of your widgets and their settings will have been saved.') . '</p>'
-) );
+	'<p>'.__('Many themes show some sidebar widgets by default until you edit your sidebars, but they are not automatically displayed in your sidebar management tool. After you make your first widget change, you can re-add the default widgets by adding them from the Available Widgets area.').'</p>'.
+		'<p>'.__('When changing themes, there is often some variation in the number and setup of widget areas/sidebars and sometimes these conflicts make the transition a bit less smooth. If you changed themes and seem to be missing widgets, scroll down on this screen to the Inactive Widgets area, where all of your widgets and their settings will have been saved.').'</p>'
+));
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Appearance_Widgets_Screen" target="_blank">Documentation on Widgets</a>') . '</p>' .
-	'<p>' . __('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>') . '</p>'
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Appearance_Widgets_Screen" target="_blank">Documentation on Widgets</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>'
 );
 
-if ( ! current_theme_supports( 'widgets' ) ) {
-	wp_die( __( 'The theme you are currently using isn&#8217;t widget-aware, meaning that it has no sidebars that you are able to change. For information on making your theme widget-aware, please <a href="https://codex.wordpress.org/Widgetizing_Themes">follow these instructions</a>.' ) );
+if ( ! current_theme_supports('widgets')) {
+	wp_die(__('The theme you are currently using isn&#8217;t widget-aware, meaning that it has no sidebars that you are able to change. For information on making your theme widget-aware, please <a href="https://codex.wordpress.org/Widgetizing_Themes">follow these instructions</a>.'));
 }
 
 // These are the widgets grouped by sidebar
 $sidebars_widgets = wp_get_sidebars_widgets();
 
-if ( empty( $sidebars_widgets ) )
+if (empty($sidebars_widgets))
 	$sidebars_widgets = wp_get_widget_defaults();
 
-foreach ( $sidebars_widgets as $sidebar_id => $widgets ) {
-	if ( 'wp_inactive_widgets' == $sidebar_id )
+foreach ($sidebars_widgets as $sidebar_id => $widgets) {
+	if ('wp_inactive_widgets' == $sidebar_id)
 		continue;
 
-	if ( ! is_registered_sidebar( $sidebar_id ) ) {
-		if ( ! empty( $widgets ) ) { // register the inactive_widgets area as sidebar
+	if ( ! is_registered_sidebar($sidebar_id)) {
+		if ( ! empty($widgets)) { // register the inactive_widgets area as sidebar
 			register_sidebar(array(
-				'name' => __( 'Inactive Sidebar (not used)' ),
+				'name' => __('Inactive Sidebar (not used)'),
 				'id' => $sidebar_id,
 				'class' => 'inactive-sidebar orphan-sidebar',
-				'description' => __( 'This sidebar is no longer available and does not show anywhere on your site. Remove each of the widgets below to fully remove this inactive sidebar.' ),
+				'description' => __('This sidebar is no longer available and does not show anywhere on your site. Remove each of the widgets below to fully remove this inactive sidebar.'),
 				'before_widget' => '',
 				'after_widget' => '',
 				'before_title' => '',
 				'after_title' => '',
 			));
 		} else {
-			unset( $sidebars_widgets[ $sidebar_id ] );
+			unset($sidebars_widgets[$sidebar_id]);
 		}
 	}
 }
@@ -112,7 +112,7 @@ 
 	'name' => __('Inactive Widgets'),
 	'id' => 'wp_inactive_widgets',
 	'class' => 'inactive-sidebar',
-	'description' => __( 'Drag widgets here to remove them from the sidebar but keep their settings.' ),
+	'description' => __('Drag widgets here to remove them from the sidebar but keep their settings.'),
 	'before_widget' => '',
 	'after_widget' => '',
 	'before_title' => '',
@@ -122,36 +122,36 @@ 
 retrieve_widgets();
 
 // We're saving a widget without js
-if ( isset($_POST['savewidget']) || isset($_POST['removewidget']) ) {
+if (isset($_POST['savewidget']) || isset($_POST['removewidget'])) {
 	$widget_id = $_POST['widget-id'];
 	check_admin_referer("save-delete-widget-$widget_id");
 
 	$number = isset($_POST['multi_number']) ? (int) $_POST['multi_number'] : '';
-	if ( $number ) {
-		foreach ( $_POST as $key => $val ) {
-			if ( is_array($val) && preg_match('/__i__|%i%/', key($val)) ) {
-				$_POST[$key] = array( $number => array_shift($val) );
+	if ($number) {
+		foreach ($_POST as $key => $val) {
+			if (is_array($val) && preg_match('/__i__|%i%/', key($val))) {
+				$_POST[$key] = array($number => array_shift($val));
 				break;
 			}
 		}
 	}
 
 	$sidebar_id = $_POST['sidebar'];
-	$position = isset($_POST[$sidebar_id . '_position']) ? (int) $_POST[$sidebar_id . '_position'] - 1 : 0;
+	$position = isset($_POST[$sidebar_id.'_position']) ? (int) $_POST[$sidebar_id.'_position'] - 1 : 0;
 
 	$id_base = $_POST['id_base'];
 	$sidebar = isset($sidebars_widgets[$sidebar_id]) ? $sidebars_widgets[$sidebar_id] : array();
 
 	// Delete.
-	if ( isset($_POST['removewidget']) && $_POST['removewidget'] ) {
+	if (isset($_POST['removewidget']) && $_POST['removewidget']) {
 
-		if ( !in_array($widget_id, $sidebar, true) ) {
-			wp_redirect( admin_url('widgets.php?error=0') );
+		if ( ! in_array($widget_id, $sidebar, true)) {
+			wp_redirect(admin_url('widgets.php?error=0'));
 			exit;
 		}
 
-		$sidebar = array_diff( $sidebar, array($widget_id) );
-		$_POST = array('sidebar' => $sidebar_id, 'widget-' . $id_base => array(), 'the-widget-id' => $widget_id, 'delete_widget' => '1');
+		$sidebar = array_diff($sidebar, array($widget_id));
+		$_POST = array('sidebar' => $sidebar_id, 'widget-'.$id_base => array(), 'the-widget-id' => $widget_id, 'delete_widget' => '1');
 
 		/**
 		 * Fires immediately after a widget has been marked for deletion.
@@ -162,17 +162,17 @@ 
 		 * @param string $sidebar_id ID of the sidebar the widget was deleted from.
 		 * @param string $id_base    ID base for the widget.
 		 */
-		do_action( 'delete_widget', $widget_id, $sidebar_id, $id_base );
+		do_action('delete_widget', $widget_id, $sidebar_id, $id_base);
 	}
 
 	$_POST['widget-id'] = $sidebar;
 
-	foreach ( (array) $wp_registered_widget_updates as $name => $control ) {
-		if ( $name != $id_base || !is_callable($control['callback']) )
+	foreach ((array) $wp_registered_widget_updates as $name => $control) {
+		if ($name != $id_base || ! is_callable($control['callback']))
 			continue;
 
 		ob_start();
-			call_user_func_array( $control['callback'], $control['params'] );
+			call_user_func_array($control['callback'], $control['params']);
 		ob_end_clean();
 
 		break;
@@ -181,58 +181,58 @@ 
 	$sidebars_widgets[$sidebar_id] = $sidebar;
 
 	// Remove old position.
-	if ( !isset($_POST['delete_widget']) ) {
-		foreach ( $sidebars_widgets as $key => $sb ) {
-			if ( is_array($sb) )
-				$sidebars_widgets[$key] = array_diff( $sb, array($widget_id) );
+	if ( ! isset($_POST['delete_widget'])) {
+		foreach ($sidebars_widgets as $key => $sb) {
+			if (is_array($sb))
+				$sidebars_widgets[$key] = array_diff($sb, array($widget_id));
 		}
-		array_splice( $sidebars_widgets[$sidebar_id], $position, 0, $widget_id );
+		array_splice($sidebars_widgets[$sidebar_id], $position, 0, $widget_id);
 	}
 
 	wp_set_sidebars_widgets($sidebars_widgets);
-	wp_redirect( admin_url('widgets.php?message=0') );
+	wp_redirect(admin_url('widgets.php?message=0'));
 	exit;
 }
 
 // Remove inactive widgets without js
-if ( isset( $_POST['removeinactivewidgets'] ) ) {
-	check_admin_referer( 'remove-inactive-widgets', '_wpnonce_remove_inactive_widgets' );
-
-	if ( $_POST['removeinactivewidgets'] ) {
-		foreach ( $sidebars_widgets['wp_inactive_widgets'] as $key => $widget_id ) {
-			$pieces = explode( '-', $widget_id );
-			$multi_number = array_pop( $pieces );
-			$id_base = implode( '-', $pieces );
-			$widget = get_option( 'widget_' . $id_base );
-			unset( $widget[$multi_number] );
-			update_option( 'widget_' . $id_base, $widget );
-			unset( $sidebars_widgets['wp_inactive_widgets'][$key] );
+if (isset($_POST['removeinactivewidgets'])) {
+	check_admin_referer('remove-inactive-widgets', '_wpnonce_remove_inactive_widgets');
+
+	if ($_POST['removeinactivewidgets']) {
+		foreach ($sidebars_widgets['wp_inactive_widgets'] as $key => $widget_id) {
+			$pieces = explode('-', $widget_id);
+			$multi_number = array_pop($pieces);
+			$id_base = implode('-', $pieces);
+			$widget = get_option('widget_'.$id_base);
+			unset($widget[$multi_number]);
+			update_option('widget_'.$id_base, $widget);
+			unset($sidebars_widgets['wp_inactive_widgets'][$key]);
 		}
 
-		wp_set_sidebars_widgets( $sidebars_widgets );
+		wp_set_sidebars_widgets($sidebars_widgets);
 	}
 
-	wp_redirect( admin_url( 'widgets.php?message=0' ) );
+	wp_redirect(admin_url('widgets.php?message=0'));
 	exit;
 }
 
 // Output the widget form without js
-if ( isset($_GET['editwidget']) && $_GET['editwidget'] ) {
+if (isset($_GET['editwidget']) && $_GET['editwidget']) {
 	$widget_id = $_GET['editwidget'];
 
-	if ( isset($_GET['addnew']) ) {
+	if (isset($_GET['addnew'])) {
 		// Default to the first sidebar
-		$keys = array_keys( $wp_registered_sidebars );
-		$sidebar = reset( $keys );
+		$keys = array_keys($wp_registered_sidebars);
+		$sidebar = reset($keys);
 
-		if ( isset($_GET['base']) && isset($_GET['num']) ) { // multi-widget
+		if (isset($_GET['base']) && isset($_GET['num'])) { // multi-widget
 			// Copy minimal info from an existing instance of this widget to a new instance
-			foreach ( $wp_registered_widget_controls as $control ) {
-				if ( $_GET['base'] === $control['id_base'] ) {
+			foreach ($wp_registered_widget_controls as $control) {
+				if ($_GET['base'] === $control['id_base']) {
 					$control_callback = $control['callback'];
 					$multi_number = (int) $_GET['num'];
 					$control['params'][0]['number'] = -1;
-					$widget_id = $control['id'] = $control['id_base'] . '-' . $multi_number;
+					$widget_id = $control['id'] = $control['id_base'].'-'.$multi_number;
 					$wp_registered_widget_controls[$control['id']] = $control;
 					break;
 				}
@@ -240,66 +240,66 @@ 
 		}
 	}
 
-	if ( isset($wp_registered_widget_controls[$widget_id]) && !isset($control) ) {
+	if (isset($wp_registered_widget_controls[$widget_id]) && ! isset($control)) {
 		$control = $wp_registered_widget_controls[$widget_id];
 		$control_callback = $control['callback'];
-	} elseif ( !isset($wp_registered_widget_controls[$widget_id]) && isset($wp_registered_widgets[$widget_id]) ) {
-		$name = esc_html( strip_tags($wp_registered_widgets[$widget_id]['name']) );
+	} elseif ( ! isset($wp_registered_widget_controls[$widget_id]) && isset($wp_registered_widgets[$widget_id])) {
+		$name = esc_html(strip_tags($wp_registered_widgets[$widget_id]['name']));
 	}
 
-	if ( !isset($name) )
-		$name = esc_html( strip_tags($control['name']) );
+	if ( ! isset($name))
+		$name = esc_html(strip_tags($control['name']));
 
-	if ( !isset($sidebar) )
+	if ( ! isset($sidebar))
 		$sidebar = isset($_GET['sidebar']) ? $_GET['sidebar'] : 'wp_inactive_widgets';
 
-	if ( !isset($multi_number) )
+	if ( ! isset($multi_number))
 		$multi_number = isset($control['params'][0]['number']) ? $control['params'][0]['number'] : '';
 
 	$id_base = isset($control['id_base']) ? $control['id_base'] : $control['id'];
 
 	// Show the widget form.
-	$width = ' style="width:' . max($control['width'], 350) . 'px"';
+	$width = ' style="width:'.max($control['width'], 350).'px"';
 	$key = isset($_GET['key']) ? (int) $_GET['key'] : 0;
 
-	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 ); ?></h1>
+	<h1><?php echo esc_html($title); ?></h1>
 	<div class="editwidget"<?php echo $width; ?>>
-	<h2><?php printf( __( 'Widget %s' ), $name ); ?></h2>
+	<h2><?php printf(__('Widget %s'), $name); ?></h2>
 
 	<form action="widgets.php" method="post">
 	<div class="widget-inside">
 <?php
-	if ( is_callable( $control_callback ) )
-		call_user_func_array( $control_callback, $control['params'] );
+	if (is_callable($control_callback))
+		call_user_func_array($control_callback, $control['params']);
 	else
-		echo '<p>' . __('There are no options for this widget.') . "</p>\n"; ?>
+		echo '<p>'.__('There are no options for this widget.')."</p>\n"; ?>
 	</div>
 
 	<p class="describe"><?php _e('Select both the sidebar for this widget and the position of the widget in that sidebar.'); ?></p>
 	<div class="widget-position">
 	<table class="widefat"><thead><tr><th><?php _e('Sidebar'); ?></th><th><?php _e('Position'); ?></th></tr></thead><tbody>
 <?php
-	foreach ( $wp_registered_sidebars as $sbname => $sbvalue ) {
-		echo "\t\t<tr><td><label><input type='radio' name='sidebar' value='" . esc_attr($sbname) . "'" . checked( $sbname, $sidebar, false ) . " /> $sbvalue[name]</label></td><td>";
-		if ( 'wp_inactive_widgets' == $sbname || 'orphaned_widgets' == substr( $sbname, 0, 16 ) ) {
+	foreach ($wp_registered_sidebars as $sbname => $sbvalue) {
+		echo "\t\t<tr><td><label><input type='radio' name='sidebar' value='".esc_attr($sbname)."'".checked($sbname, $sidebar, false)." /> $sbvalue[name]</label></td><td>";
+		if ('wp_inactive_widgets' == $sbname || 'orphaned_widgets' == substr($sbname, 0, 16)) {
 			echo '&nbsp;';
 		} else {
-			if ( !isset($sidebars_widgets[$sbname]) || !is_array($sidebars_widgets[$sbname]) ) {
+			if ( ! isset($sidebars_widgets[$sbname]) || ! is_array($sidebars_widgets[$sbname])) {
 				$j = 1;
 				$sidebars_widgets[$sbname] = array();
 			} else {
 				$j = count($sidebars_widgets[$sbname]);
-				if ( isset($_GET['addnew']) || !in_array($widget_id, $sidebars_widgets[$sbname], true) )
+				if (isset($_GET['addnew']) || ! in_array($widget_id, $sidebars_widgets[$sbname], true))
 					$j++;
 			}
 			$selected = '';
 			echo "\t\t<select name='{$sbname}_position'>\n";
-			echo "\t\t<option value=''>" . __('&mdash; Select &mdash;') . "</option>\n";
-			for ( $i = 1; $i <= $j; $i++ ) {
-				if ( in_array($widget_id, $sidebars_widgets[$sbname], true) )
-					$selected = selected( $i, $key + 1, false );
+			echo "\t\t<option value=''>".__('&mdash; Select &mdash;')."</option>\n";
+			for ($i = 1; $i <= $j; $i++) {
+				if (in_array($widget_id, $sidebars_widgets[$sbname], true))
+					$selected = selected($i, $key + 1, false);
 				echo "\t\t<option value='$i'$selected> $i </option>\n";
 			}
 			echo "\t\t</select>\n";
@@ -311,13 +311,13 @@ 
 
 	<div class="widget-control-actions">
 <?php
-	if ( isset($_GET['addnew']) ) { ?>
+	if (isset($_GET['addnew'])) { ?>
 	<a href="widgets.php" class="button alignleft"><?php _e('Cancel'); ?></a>
 <?php
 	} else {
-		submit_button( __( 'Delete' ), 'button alignleft', 'removewidget', false );
+		submit_button(__('Delete'), 'button alignleft', 'removewidget', false);
 	}
-	submit_button( __( 'Save Widget' ), 'button-primary alignright', 'savewidget', false ); ?>
+	submit_button(__('Save Widget'), 'button-primary alignright', 'savewidget', false); ?>
 	<input type="hidden" name="widget-id" class="widget-id" value="<?php echo esc_attr($widget_id); ?>" />
 	<input type="hidden" name="id_base" class="id_base" value="<?php echo esc_attr($id_base); ?>" />
 	<input type="hidden" name="multi_number" class="multi_number" value="<?php echo esc_attr($multi_number); ?>" />
@@ -328,7 +328,7 @@ 
 	</div>
 	</div>
 <?php
-	require_once( ABSPATH . 'wp-admin/admin-footer.php' );
+	require_once(ABSPATH.'wp-admin/admin-footer.php');
 	exit;
 }
 
@@ -341,32 +341,32 @@ 
 	__('Error in displaying the widget settings form.')
 );
 
-require_once( ABSPATH . 'wp-admin/admin-header.php' ); ?>
+require_once(ABSPATH.'wp-admin/admin-header.php'); ?>
 
 <div class="wrap">
 <h1>
 <?php
-	echo esc_html( $title );
-	if ( current_user_can( 'customize' ) ) {
+	echo esc_html($title);
+	if (current_user_can('customize')) {
 		printf(
 			' <a class="page-title-action hide-if-no-customize" href="%1$s">%2$s</a>',
-			esc_url( add_query_arg(
+			esc_url(add_query_arg(
 				array(
-					array( 'autofocus' => array( 'panel' => 'widgets' ) ),
-					'return' => urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) )
+					array('autofocus' => array('panel' => 'widgets')),
+					'return' => urlencode(wp_unslash($_SERVER['REQUEST_URI']))
 				),
-				admin_url( 'customize.php' )
-			) ),
-			__( 'Manage with Live Preview' )
+				admin_url('customize.php')
+			)),
+			__('Manage with Live Preview')
 		);
 	}
 ?>
 </h1>
 
-<?php if ( isset($_GET['message']) && isset($messages[$_GET['message']]) ) { ?>
+<?php if (isset($_GET['message']) && isset($messages[$_GET['message']])) { ?>
 <div id="message" class="updated notice is-dismissible"><p><?php echo $messages[$_GET['message']]; ?></p></div>
 <?php } ?>
-<?php if ( isset($_GET['error']) && isset($errors[$_GET['error']]) ) { ?>
+<?php if (isset($_GET['error']) && isset($errors[$_GET['error']])) { ?>
 <div id="message" class="error"><p><?php echo $errors[$_GET['error']]; ?></p></div>
 <?php } ?>
 
@@ -376,14 +376,14 @@ 
  *
  * @since 3.0.0
  */
-do_action( 'widgets_admin_page' ); ?>
+do_action('widgets_admin_page'); ?>
 
 <div class="widget-liquid-left">
 <div id="widgets-left">
 	<div id="available-widgets" class="widgets-holder-wrap">
 		<div class="sidebar-name">
 			<div class="sidebar-name-arrow"><br /></div>
-			<h2><?php _e( 'Available Widgets' ); ?> <span id="removing-widget"><?php _ex( 'Deactivate', 'removing-widget' ); ?> <span></span></span></h2>
+			<h2><?php _e('Available Widgets'); ?> <span id="removing-widget"><?php _ex('Deactivate', 'removing-widget'); ?> <span></span></span></h2>
 		</div>
 		<div class="widget-holder">
 			<div class="sidebar-description">
@@ -400,40 +400,40 @@ 
 <?php
 
 $theme_sidebars = array();
-foreach ( $wp_registered_sidebars as $sidebar => $registered_sidebar ) {
-	if ( false !== strpos( $registered_sidebar['class'], 'inactive-sidebar' ) || 'orphaned_widgets' == substr( $sidebar, 0, 16 ) ) {
+foreach ($wp_registered_sidebars as $sidebar => $registered_sidebar) {
+	if (false !== strpos($registered_sidebar['class'], 'inactive-sidebar') || 'orphaned_widgets' == substr($sidebar, 0, 16)) {
 		$wrap_class = 'widgets-holder-wrap';
-		if ( !empty( $registered_sidebar['class'] ) )
-			$wrap_class .= ' ' . $registered_sidebar['class'];
+		if ( ! empty($registered_sidebar['class']))
+			$wrap_class .= ' '.$registered_sidebar['class'];
 
 		$is_inactive_widgets = 'wp_inactive_widgets' == $registered_sidebar['id'];
 		?>
-		<div class="<?php echo esc_attr( $wrap_class ); ?>">
+		<div class="<?php echo esc_attr($wrap_class); ?>">
 			<div class="widget-holder inactive">
-				<?php wp_list_widget_controls( $registered_sidebar['id'], $registered_sidebar['name'] ); ?>
+				<?php wp_list_widget_controls($registered_sidebar['id'], $registered_sidebar['name']); ?>
 
-				<?php if ( $is_inactive_widgets ) { ?>
+				<?php if ($is_inactive_widgets) { ?>
 				<div class="remove-inactive-widgets">
 					<form action="" method="post">
 						<p>
 							<?php
-							$attributes = array( 'id' => 'inactive-widgets-control-remove' );
+							$attributes = array('id' => 'inactive-widgets-control-remove');
 
-							if ( empty($sidebars_widgets['wp_inactive_widgets']) ) {
+							if (empty($sidebars_widgets['wp_inactive_widgets'])) {
 								$attributes['disabled'] = '';
 							}
 
-							submit_button( __( 'Clear Inactive Widgets' ), 'delete', 'removeinactivewidgets', false, $attributes );
+							submit_button(__('Clear Inactive Widgets'), 'delete', 'removeinactivewidgets', false, $attributes);
 							?>
 							<span class="spinner"></span>
 						</p>
-						<?php wp_nonce_field( 'remove-inactive-widgets', '_wpnonce_remove_inactive_widgets' ); ?>
+						<?php wp_nonce_field('remove-inactive-widgets', '_wpnonce_remove_inactive_widgets'); ?>
 					</form>
 				</div>
 				<?php } ?>
 			</div>
-			<?php if ( $is_inactive_widgets ) { ?>
-			<p class="description"><?php _e( 'This will clear all items from the inactive widgets list. You will not be able to restore any customizations.' ); ?></p>
+			<?php if ($is_inactive_widgets) { ?>
+			<p class="description"><?php _e('This will clear all items from the inactive widgets list. You will not be able to restore any customizations.'); ?></p>
 			<?php } ?>
 		</div>
 		<?php
@@ -450,10 +450,10 @@ 
 
 $i = $split = 0;
 $single_sidebar_class = '';
-$sidebars_count = count( $theme_sidebars );
+$sidebars_count = count($theme_sidebars);
 
-if ( $sidebars_count > 1 ) {
-	$split = ceil( $sidebars_count / 2 );
+if ($sidebars_count > 1) {
+	$split = ceil($sidebars_count / 2);
 } else {
 	$single_sidebar_class = ' single-sidebar';
 }
@@ -464,23 +464,23 @@ 
 <div class="sidebars-column-1">
 <?php
 
-foreach ( $theme_sidebars as $sidebar => $registered_sidebar ) {
+foreach ($theme_sidebars as $sidebar => $registered_sidebar) {
 	$wrap_class = 'widgets-holder-wrap';
-	if ( !empty( $registered_sidebar['class'] ) )
-		$wrap_class .= ' sidebar-' . $registered_sidebar['class'];
+	if ( ! empty($registered_sidebar['class']))
+		$wrap_class .= ' sidebar-'.$registered_sidebar['class'];
 
-	if ( $i > 0 )
+	if ($i > 0)
 		$wrap_class .= ' closed';
 
-	if ( $split && $i == $split ) {
+	if ($split && $i == $split) {
 		?>
 		</div><div class="sidebars-column-2">
 		<?php
 	}
 
 	?>
-	<div class="<?php echo esc_attr( $wrap_class ); ?>">
-		<?php wp_list_widget_controls( $sidebar, $registered_sidebar['name'] ); // Show the control forms for each of the widgets in this sidebar ?>
+	<div class="<?php echo esc_attr($wrap_class); ?>">
+		<?php wp_list_widget_controls($sidebar, $registered_sidebar['name']); // Show the control forms for each of the widgets in this sidebar ?>
 	</div>
 	<?php
 
@@ -492,7 +492,7 @@ 
 </div>
 </div>
 <form method="post">
-<?php wp_nonce_field( 'save-sidebar-widgets', '_wpnonce_widgets', false ); ?>
+<?php wp_nonce_field('save-sidebar-widgets', '_wpnonce_widgets', false); ?>
 </form>
 <br class="clear" />
 </div>
@@ -500,8 +500,8 @@ 
 <div class="widgets-chooser">
 	<ul class="widgets-chooser-sidebars"></ul>
 	<div class="widgets-chooser-actions">
-		<button class="button-secondary"><?php _e( 'Cancel' ); ?></button>
-		<button class="button-primary"><?php _e( 'Add Widget' ); ?></button>
+		<button class="button-secondary"><?php _e('Cancel'); ?></button>
+		<button class="button-primary"><?php _e('Add Widget'); ?></button>
 	</div>
 </div>
 
@@ -512,5 +512,5 @@ 
  *
  * @since 2.2.0
  */
-do_action( 'sidebar_admin_page' );
-require_once( ABSPATH . 'wp-admin/admin-footer.php' );
+do_action('sidebar_admin_page');
+require_once(ABSPATH.'wp-admin/admin-footer.php');

src/wp-admin/upload.php

Spacing +143 added lines, -143 removed lines

@@ -7,90 +7,90 @@ 
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( !current_user_can('upload_files') )
-	wp_die( __( 'Sorry, you are not allowed to upload files.' ) );
+if ( ! current_user_can('upload_files'))
+	wp_die(__('Sorry, you are not allowed to upload files.'));
 
-$mode = get_user_option( 'media_library_mode', get_current_user_id() ) ? get_user_option( 'media_library_mode', get_current_user_id() ) : 'grid';
-$modes = array( 'grid', 'list' );
+$mode = get_user_option('media_library_mode', get_current_user_id()) ? get_user_option('media_library_mode', get_current_user_id()) : 'grid';
+$modes = array('grid', 'list');
 
-if ( isset( $_GET['mode'] ) && in_array( $_GET['mode'], $modes ) ) {
+if (isset($_GET['mode']) && in_array($_GET['mode'], $modes)) {
 	$mode = $_GET['mode'];
-	update_user_option( get_current_user_id(), 'media_library_mode', $mode );
+	update_user_option(get_current_user_id(), 'media_library_mode', $mode);
 }
 
-if ( 'grid' === $mode ) {
+if ('grid' === $mode) {
 	wp_enqueue_media();
-	wp_enqueue_script( 'media-grid' );
-	wp_enqueue_script( 'media' );
+	wp_enqueue_script('media-grid');
+	wp_enqueue_script('media');
 
-	remove_action( 'admin_head', 'wp_admin_canonical_url' );
+	remove_action('admin_head', 'wp_admin_canonical_url');
 
 	$q = $_GET;
 	// let JS handle this
-	unset( $q['s'] );
-	$vars = wp_edit_attachments_query_vars( $q );
-	$ignore = array( 'mode', 'post_type', 'post_status', 'posts_per_page' );
-	foreach ( $vars as $key => $value ) {
-		if ( ! $value || in_array( $key, $ignore ) ) {
-			unset( $vars[ $key ] );
+	unset($q['s']);
+	$vars = wp_edit_attachments_query_vars($q);
+	$ignore = array('mode', 'post_type', 'post_status', 'posts_per_page');
+	foreach ($vars as $key => $value) {
+		if ( ! $value || in_array($key, $ignore)) {
+			unset($vars[$key]);
 		}
 	}
 
-	wp_localize_script( 'media-grid', '_wpMediaGridSettings', array(
-		'adminUrl' => parse_url( self_admin_url(), PHP_URL_PATH ),
+	wp_localize_script('media-grid', '_wpMediaGridSettings', array(
+		'adminUrl' => parse_url(self_admin_url(), PHP_URL_PATH),
 		'queryVars' => (object) $vars
-	) );
+	));
 
-	get_current_screen()->add_help_tab( array(
+	get_current_screen()->add_help_tab(array(
 		'id'		=> 'overview',
-		'title'		=> __( 'Overview' ),
+		'title'		=> __('Overview'),
 		'content'	=>
-			'<p>' . __( 'All the files you&#8217;ve uploaded are listed in the Media Library, with the most recent uploads listed first.' ) . '</p>' .
-			'<p>' . __( 'You can view your media in a simple visual grid or a list with columns. Switch between these views using the icons to the left above the media.' ) . '</p>' .
-			'<p>' . __( 'To delete media items, click the Bulk Select button at the top of the screen. Select any items you wish to delete, then click the Delete Selected button. Clicking the Cancel Selection button takes you back to viewing your media.' ) . '</p>'
-	) );
+			'<p>'.__('All the files you&#8217;ve uploaded are listed in the Media Library, with the most recent uploads listed first.').'</p>'.
+			'<p>'.__('You can view your media in a simple visual grid or a list with columns. Switch between these views using the icons to the left above the media.').'</p>'.
+			'<p>'.__('To delete media items, click the Bulk Select button at the top of the screen. Select any items you wish to delete, then click the Delete Selected button. Clicking the Cancel Selection button takes you back to viewing your media.').'</p>'
+	));
 
-	get_current_screen()->add_help_tab( array(
+	get_current_screen()->add_help_tab(array(
 		'id'		=> 'attachment-details',
-		'title'		=> __( 'Attachment Details' ),
+		'title'		=> __('Attachment Details'),
 		'content'	=>
-			'<p>' . __( 'Clicking an item will display an Attachment Details dialog, which allows you to preview media and make quick edits. Any changes you make to the attachment details will be automatically saved.' ) . '</p>' .
-			'<p>' . __( 'Use the arrow buttons at the top of the dialog, or the left and right arrow keys on your keyboard, to navigate between media items quickly.' ) . '</p>' .
-			'<p>' . __( 'You can also delete individual items and access the extended edit screen from the details dialog.' ) . '</p>'
-	) );
+			'<p>'.__('Clicking an item will display an Attachment Details dialog, which allows you to preview media and make quick edits. Any changes you make to the attachment details will be automatically saved.').'</p>'.
+			'<p>'.__('Use the arrow buttons at the top of the dialog, or the left and right arrow keys on your keyboard, to navigate between media items quickly.').'</p>'.
+			'<p>'.__('You can also delete individual items and access the extended edit screen from the details dialog.').'</p>'
+	));
 
 	get_current_screen()->set_help_sidebar(
-		'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-		'<p>' . __( '<a href="https://codex.wordpress.org/Media_Library_Screen" target="_blank">Documentation on Media Library</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_Library_Screen" target="_blank">Documentation on Media Library</a>').'</p>'.
+		'<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>'
 	);
 
 	$title = __('Media Library');
 	$parent_file = 'upload.php';
 
-	require_once( ABSPATH . 'wp-admin/admin-header.php' );
+	require_once(ABSPATH.'wp-admin/admin-header.php');
 	?>
 	<div class="wrap" id="wp-media-grid" data-search="<?php _admin_search_query() ?>">
 		<h1>
 		<?php
-		echo esc_html( $title );
-		if ( current_user_can( 'upload_files' ) ) { ?>
-			<a href="<?php echo admin_url( 'media-new.php' ); ?>" class="page-title-action"><?php echo esc_html_x( 'Add New', 'file' ); ?></a><?php
+		echo esc_html($title);
+		if (current_user_can('upload_files')) { ?>
+			<a href="<?php echo admin_url('media-new.php'); ?>" class="page-title-action"><?php echo esc_html_x('Add New', 'file'); ?></a><?php
 		}
 		?>
 		</h1>
 		<div class="error hide-if-js">
 			<p><?php printf(
 				/* translators: %s: list view URL */
-				__( 'The grid view for the Media Library requires JavaScript. <a href="%s">Switch to the list view</a>.' ),
+				__('The grid view for the Media Library requires JavaScript. <a href="%s">Switch to the list view</a>.'),
 				'upload.php?mode=list'
 			); ?></p>
 		</div>
 	</div>
 	<?php
-	include( ABSPATH . 'wp-admin/admin-footer.php' );
+	include(ABSPATH.'wp-admin/admin-footer.php');
 	exit;
 }
 
@@ -100,75 +100,75 @@ 
 // Handle bulk actions
 $doaction = $wp_list_table->current_action();
 
-if ( $doaction ) {
+if ($doaction) {
 	check_admin_referer('bulk-media');
 
-	if ( 'delete_all' == $doaction ) {
-		$post_ids = $wpdb->get_col( "SELECT ID FROM $wpdb->posts WHERE post_type='attachment' AND post_status = 'trash'" );
+	if ('delete_all' == $doaction) {
+		$post_ids = $wpdb->get_col("SELECT ID FROM $wpdb->posts WHERE post_type='attachment' AND post_status = 'trash'");
 		$doaction = 'delete';
-	} elseif ( isset( $_REQUEST['media'] ) ) {
+	} elseif (isset($_REQUEST['media'])) {
 		$post_ids = $_REQUEST['media'];
-	} elseif ( isset( $_REQUEST['ids'] ) ) {
-		$post_ids = explode( ',', $_REQUEST['ids'] );
+	} elseif (isset($_REQUEST['ids'])) {
+		$post_ids = explode(',', $_REQUEST['ids']);
 	}
 
 	$location = 'upload.php';
-	if ( $referer = wp_get_referer() ) {
-		if ( false !== strpos( $referer, 'upload.php' ) )
-			$location = remove_query_arg( array( 'trashed', 'untrashed', 'deleted', 'message', 'ids', 'posted' ), $referer );
+	if ($referer = wp_get_referer()) {
+		if (false !== strpos($referer, 'upload.php'))
+			$location = remove_query_arg(array('trashed', 'untrashed', 'deleted', 'message', 'ids', 'posted'), $referer);
 	}
 
-	switch ( $doaction ) {
+	switch ($doaction) {
 		case 'detach':
-			wp_media_attach_action( $_REQUEST['parent_post_id'], 'detach' );
+			wp_media_attach_action($_REQUEST['parent_post_id'], 'detach');
 			break;
 
 		case 'attach':
-			wp_media_attach_action( $_REQUEST['found_post_id'] );
+			wp_media_attach_action($_REQUEST['found_post_id']);
 			break;
 
 		case 'trash':
-			if ( !isset( $post_ids ) )
+			if ( ! isset($post_ids))
 				break;
-			foreach ( (array) $post_ids as $post_id ) {
-				if ( !current_user_can( 'delete_post', $post_id ) )
-					wp_die( __( 'Sorry, you are not allowed to move this item to the Trash.' ) );
+			foreach ((array) $post_ids as $post_id) {
+				if ( ! current_user_can('delete_post', $post_id))
+					wp_die(__('Sorry, you are not allowed to move this item to the Trash.'));
 
-				if ( !wp_trash_post( $post_id ) )
-					wp_die( __( 'Error in moving to Trash.' ) );
+				if ( ! wp_trash_post($post_id))
+					wp_die(__('Error in moving to Trash.'));
 			}
-			$location = add_query_arg( array( 'trashed' => count( $post_ids ), 'ids' => join( ',', $post_ids ) ), $location );
+			$location = add_query_arg(array('trashed' => count($post_ids), 'ids' => join(',', $post_ids)), $location);
 			break;
 		case 'untrash':
-			if ( !isset( $post_ids ) )
+			if ( ! isset($post_ids))
 				break;
-			foreach ( (array) $post_ids as $post_id ) {
-				if ( !current_user_can( 'delete_post', $post_id ) )
-					wp_die( __( 'Sorry, you are not allowed to restore this item from the Trash.' ) );
+			foreach ((array) $post_ids as $post_id) {
+				if ( ! current_user_can('delete_post', $post_id))
+					wp_die(__('Sorry, you are not allowed to restore this item from the Trash.'));
 
-				if ( !wp_untrash_post( $post_id ) )
-					wp_die( __( 'Error in restoring from Trash.' ) );
+				if ( ! wp_untrash_post($post_id))
+					wp_die(__('Error in restoring from Trash.'));
 			}
-			$location = add_query_arg( 'untrashed', count( $post_ids ), $location );
+			$location = add_query_arg('untrashed', count($post_ids), $location);
 			break;
 		case 'delete':
-			if ( !isset( $post_ids ) )
+			if ( ! isset($post_ids))
 				break;
-			foreach ( (array) $post_ids as $post_id_del ) {
-				if ( !current_user_can( 'delete_post', $post_id_del ) )
-					wp_die( __( 'Sorry, you are not allowed to delete this item.' ) );
+			foreach ((array) $post_ids as $post_id_del) {
+				if ( ! current_user_can('delete_post', $post_id_del))
+					wp_die(__('Sorry, you are not allowed to delete this item.'));
 
-				if ( !wp_delete_attachment( $post_id_del ) )
-					wp_die( __( 'Error in deleting.' ) );
+				if ( ! wp_delete_attachment($post_id_del))
+					wp_die(__('Error in deleting.'));
 			}
-			$location = add_query_arg( 'deleted', count( $post_ids ), $location );
+			$location = add_query_arg('deleted', count($post_ids), $location);
 			break;
 	}
 
-	wp_redirect( $location );
+	wp_redirect($location);
 	exit;
-} elseif ( ! empty( $_GET['_wp_http_referer'] ) ) {
-	 wp_redirect( remove_query_arg( array( '_wp_http_referer', '_wpnonce' ), wp_unslash( $_SERVER['REQUEST_URI'] ) ) );
+} elseif ( ! empty($_GET['_wp_http_referer'])) {
+	 wp_redirect(remove_query_arg(array('_wp_http_referer', '_wpnonce'), wp_unslash($_SERVER['REQUEST_URI'])));
 	 exit;
 }
 
@@ -177,135 +177,135 @@ 
 $title = __('Media Library');
 $parent_file = 'upload.php';
 
-wp_enqueue_script( 'media' );
+wp_enqueue_script('media');
 
-add_screen_option( 'per_page' );
+add_screen_option('per_page');
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 'id'		=> 'overview',
 'title'		=> __('Overview'),
 'content'	=>
-	'<p>' . __( 'All the files you&#8217;ve uploaded are listed in the Media Library, with the most recent uploads listed first. You can use the Screen Options tab to customize the display of this screen.' ) . '</p>' .
-	'<p>' . __( 'You can narrow the list by file type/status or by date using the dropdown menus above the media table.' ) . '</p>' .
-	'<p>' . __( 'You can view your media in a simple visual grid or a list with columns. Switch between these views using the icons to the left above the media.' ) . '</p>'
-) );
-get_current_screen()->add_help_tab( array(
+	'<p>'.__('All the files you&#8217;ve uploaded are listed in the Media Library, with the most recent uploads listed first. You can use the Screen Options tab to customize the display of this screen.').'</p>'.
+	'<p>'.__('You can narrow the list by file type/status or by date using the dropdown menus above the media table.').'</p>'.
+	'<p>'.__('You can view your media in a simple visual grid or a list with columns. Switch between these views using the icons to the left above the media.').'</p>'
+));
+get_current_screen()->add_help_tab(array(
 'id'		=> 'actions-links',
 'title'		=> __('Available Actions'),
 'content'	=>
-	'<p>' . __( 'Hovering over a row reveals action links: Edit, Delete Permanently, and View. Clicking Edit or on the media file&#8217;s name displays a simple screen to edit that individual file&#8217;s metadata. Clicking Delete Permanently will delete the file from the media library (as well as from any posts to which it is currently attached). View will take you to the display page for that file.' ) . '</p>'
-) );
-get_current_screen()->add_help_tab( array(
+	'<p>'.__('Hovering over a row reveals action links: Edit, Delete Permanently, and View. Clicking Edit or on the media file&#8217;s name displays a simple screen to edit that individual file&#8217;s metadata. Clicking Delete Permanently will delete the file from the media library (as well as from any posts to which it is currently attached). View will take you to the display page for that file.').'</p>'
+));
+get_current_screen()->add_help_tab(array(
 'id'		=> 'attaching-files',
 'title'		=> __('Attaching Files'),
 'content'	=>
-	'<p>' . __( 'If a media file has not been attached to any content, you will see that in the Uploaded To column, and can click on Attach to launch a small popup that will allow you to search for existing content and attach the file.' ) . '</p>'
-) );
+	'<p>'.__('If a media file has not been attached to any content, you will see that in the Uploaded To column, and can click on Attach to launch a small popup that will allow you to search for existing content and attach the file.').'</p>'
+));
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
-	'<p>' . __( '<a href="https://codex.wordpress.org/Media_Library_Screen" target="_blank">Documentation on Media Library</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_Library_Screen" target="_blank">Documentation on Media Library</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 media items list' ),
-	'heading_pagination' => __( 'Media items list navigation' ),
-	'heading_list'       => __( 'Media items list' ),
-) );
+get_current_screen()->set_screen_reader_content(array(
+	'heading_views'      => __('Filter media items list'),
+	'heading_pagination' => __('Media items list navigation'),
+	'heading_list'       => __('Media items list'),
+));
 
-require_once( ABSPATH . 'wp-admin/admin-header.php' );
+require_once(ABSPATH.'wp-admin/admin-header.php');
 ?>
 
 <div class="wrap">
 <h1>
 <?php
-echo esc_html( $title );
-if ( current_user_can( 'upload_files' ) ) { ?>
-	<a href="<?php echo admin_url( 'media-new.php' ); ?>" class="page-title-action"><?php echo esc_html_x('Add New', 'file'); ?></a><?php
+echo esc_html($title);
+if (current_user_can('upload_files')) { ?>
+	<a href="<?php echo admin_url('media-new.php'); ?>" class="page-title-action"><?php echo esc_html_x('Add New', 'file'); ?></a><?php
 }
-if ( isset( $_REQUEST['s'] ) && strlen( $_REQUEST['s'] ) ) {
+if (isset($_REQUEST['s']) && strlen($_REQUEST['s'])) {
 	/* translators: %s: search keywords */
-	printf( '<span class="subtitle">' . __( 'Search results for &#8220;%s&#8221;' ) . '</span>', get_search_query() );
+	printf('<span class="subtitle">'.__('Search results for &#8220;%s&#8221;').'</span>', get_search_query());
 }
 ?>
 </h1>
 
 <?php
 $message = '';
-if ( ! empty( $_GET['posted'] ) ) {
-	$message = __( 'Media file updated.' );
+if ( ! empty($_GET['posted'])) {
+	$message = __('Media file updated.');
 	$_SERVER['REQUEST_URI'] = remove_query_arg(array('posted'), $_SERVER['REQUEST_URI']);
 }
 
-if ( ! empty( $_GET['attached'] ) && $attached = absint( $_GET['attached'] ) ) {
-	if ( 1 == $attached ) {
-		$message = __( 'Media file attached.' );
+if ( ! empty($_GET['attached']) && $attached = absint($_GET['attached'])) {
+	if (1 == $attached) {
+		$message = __('Media file attached.');
 	} else {
 		/* translators: %s: number of media files */
-		$message = _n( '%s media file attached.', '%s media files attached.', $attached );
+		$message = _n('%s media file attached.', '%s media files attached.', $attached);
 	}
-	$message = sprintf( $message, number_format_i18n( $attached ) );
-	$_SERVER['REQUEST_URI'] = remove_query_arg( array( 'detach', 'attached' ), $_SERVER['REQUEST_URI'] );
+	$message = sprintf($message, number_format_i18n($attached));
+	$_SERVER['REQUEST_URI'] = remove_query_arg(array('detach', 'attached'), $_SERVER['REQUEST_URI']);
 }
 
-if ( ! empty( $_GET['detach'] ) && $detached = absint( $_GET['detach'] ) ) {
-	if ( 1 == $detached ) {
-		$message = __( 'Media file detached.' );
+if ( ! empty($_GET['detach']) && $detached = absint($_GET['detach'])) {
+	if (1 == $detached) {
+		$message = __('Media file detached.');
 	} else {
 		/* translators: %s: number of media files */
-		$message = _n( '%s media file detached.', '%s media files detached.', $detached );
+		$message = _n('%s media file detached.', '%s media files detached.', $detached);
 	}
-	$message = sprintf( $message, number_format_i18n( $detached ) );
-	$_SERVER['REQUEST_URI'] = remove_query_arg( array( 'detach', 'attached' ), $_SERVER['REQUEST_URI'] );
+	$message = sprintf($message, number_format_i18n($detached));
+	$_SERVER['REQUEST_URI'] = remove_query_arg(array('detach', 'attached'), $_SERVER['REQUEST_URI']);
 }
 
-if ( ! empty( $_GET['deleted'] ) && $deleted = absint( $_GET['deleted'] ) ) {
-	if ( 1 == $deleted ) {
-		$message = __( 'Media file permanently deleted.' );
+if ( ! empty($_GET['deleted']) && $deleted = absint($_GET['deleted'])) {
+	if (1 == $deleted) {
+		$message = __('Media file permanently deleted.');
 	} else {
 		/* translators: %s: number of media files */
-		$message = _n( '%s media file permanently deleted.', '%s media files permanently deleted.', $deleted );
+		$message = _n('%s media file permanently deleted.', '%s media files permanently deleted.', $deleted);
 	}
-	$message = sprintf( $message, number_format_i18n( $deleted ) );
+	$message = sprintf($message, number_format_i18n($deleted));
 	$_SERVER['REQUEST_URI'] = remove_query_arg(array('deleted'), $_SERVER['REQUEST_URI']);
 }
 
-if ( ! empty( $_GET['trashed'] ) && $trashed = absint( $_GET['trashed'] ) ) {
-	if ( 1 == $trashed ) {
-		$message = __( 'Media file moved to the trash.' );
+if ( ! empty($_GET['trashed']) && $trashed = absint($_GET['trashed'])) {
+	if (1 == $trashed) {
+		$message = __('Media file moved to the trash.');
 	} else {
 		/* translators: %s: number of media files */
-		$message = _n( '%s media file moved to the trash.', '%s media files moved to the trash.', $trashed );
+		$message = _n('%s media file moved to the trash.', '%s media files moved to the trash.', $trashed);
 	}
-	$message = sprintf( $message, number_format_i18n( $trashed ) );
-	$message .= ' <a href="' . esc_url( wp_nonce_url( 'upload.php?doaction=undo&action=untrash&ids='.(isset($_GET['ids']) ? $_GET['ids'] : ''), "bulk-media" ) ) . '">' . __('Undo') . '</a>';
+	$message = sprintf($message, number_format_i18n($trashed));
+	$message .= ' <a href="'.esc_url(wp_nonce_url('upload.php?doaction=undo&action=untrash&ids='.(isset($_GET['ids']) ? $_GET['ids'] : ''), "bulk-media")).'">'.__('Undo').'</a>';
 	$_SERVER['REQUEST_URI'] = remove_query_arg(array('trashed'), $_SERVER['REQUEST_URI']);
 }
 
-if ( ! empty( $_GET['untrashed'] ) && $untrashed = absint( $_GET['untrashed'] ) ) {
-	if ( 1 == $untrashed ) {
-		$message = __( 'Media file restored from the trash.' );
+if ( ! empty($_GET['untrashed']) && $untrashed = absint($_GET['untrashed'])) {
+	if (1 == $untrashed) {
+		$message = __('Media file restored from the trash.');
 	} else {
 		/* translators: %s: number of media files */
-		$message = _n( '%s media file restored from the trash.', '%s media files restored from the trash.', $untrashed );
+		$message = _n('%s media file restored from the trash.', '%s media files restored from the trash.', $untrashed);
 	}
-	$message = sprintf( $message, number_format_i18n( $untrashed ) );
+	$message = sprintf($message, number_format_i18n($untrashed));
 	$_SERVER['REQUEST_URI'] = remove_query_arg(array('untrashed'), $_SERVER['REQUEST_URI']);
 }
 
-$messages[1] = __( 'Media file updated.' );
-$messages[2] = __( 'Media file permanently deleted.' );
-$messages[3] = __( 'Error saving media file.' );
-$messages[4] = __( 'Media file moved to the trash.' ) . ' <a href="' . esc_url( wp_nonce_url( 'upload.php?doaction=undo&action=untrash&ids='.(isset($_GET['ids']) ? $_GET['ids'] : ''), "bulk-media" ) ) . '">' . __( 'Undo' ) . '</a>';
-$messages[5] = __( 'Media file restored from the trash.' );
+$messages[1] = __('Media file updated.');
+$messages[2] = __('Media file permanently deleted.');
+$messages[3] = __('Error saving media file.');
+$messages[4] = __('Media file moved to the trash.').' <a href="'.esc_url(wp_nonce_url('upload.php?doaction=undo&action=untrash&ids='.(isset($_GET['ids']) ? $_GET['ids'] : ''), "bulk-media")).'">'.__('Undo').'</a>';
+$messages[5] = __('Media file restored from the trash.');
 
-if ( ! empty( $_GET['message'] ) && isset( $messages[ $_GET['message'] ] ) ) {
-	$message = $messages[ $_GET['message'] ];
+if ( ! empty($_GET['message']) && isset($messages[$_GET['message']])) {
+	$message = $messages[$_GET['message']];
 	$_SERVER['REQUEST_URI'] = remove_query_arg(array('message'), $_SERVER['REQUEST_URI']);
 }
 
-if ( !empty($message) ) { ?>
+if ( ! empty($message)) { ?>
 <div id="message" class="updated notice is-dismissible"><p><?php echo $message; ?></p></div>
 <?php } ?>
 
@@ -321,4 +321,4 @@ 
 </div>
 
 <?php
-include( ABSPATH . 'wp-admin/admin-footer.php' );
+include(ABSPATH.'wp-admin/admin-footer.php');

Braces +32 added lines, -21 removed lines

@@ -9,8 +9,9 @@ 
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( !current_user_can('upload_files') )
+if ( !current_user_can('upload_files') ) {
 	wp_die( __( 'Sorry, you are not allowed to upload files.' ) );
+}
 
 $mode = get_user_option( 'media_library_mode', get_current_user_id() ) ? get_user_option( 'media_library_mode', get_current_user_id() ) : 'grid';
 $modes = array( 'grid', 'list' );
@@ -114,8 +115,9 @@ 
 
 	$location = 'upload.php';
 	if ( $referer = wp_get_referer() ) {
-		if ( false !== strpos( $referer, 'upload.php' ) )
-			$location = remove_query_arg( array( 'trashed', 'untrashed', 'deleted', 'message', 'ids', 'posted' ), $referer );
+		if ( false !== strpos( $referer, 'upload.php' ) ) {
+					$location = remove_query_arg( array( 'trashed', 'untrashed', 'deleted', 'message', 'ids', 'posted' ), $referer );
+		}
 	}
 
 	switch ( $doaction ) {
@@ -128,38 +130,47 @@ 
 			break;
 
 		case 'trash':
-			if ( !isset( $post_ids ) )
-				break;
+			if ( !isset( $post_ids ) ) {
+							break;
+			}
 			foreach ( (array) $post_ids as $post_id ) {
-				if ( !current_user_can( 'delete_post', $post_id ) )
-					wp_die( __( 'Sorry, you are not allowed to move this item to the Trash.' ) );
+				if ( !current_user_can( 'delete_post', $post_id ) ) {
+									wp_die( __( 'Sorry, you are not allowed to move this item to the Trash.' ) );
+				}
 
-				if ( !wp_trash_post( $post_id ) )
-					wp_die( __( 'Error in moving to Trash.' ) );
+				if ( !wp_trash_post( $post_id ) ) {
+									wp_die( __( 'Error in moving to Trash.' ) );
+				}
 			}
 			$location = add_query_arg( array( 'trashed' => count( $post_ids ), 'ids' => join( ',', $post_ids ) ), $location );
 			break;
 		case 'untrash':
-			if ( !isset( $post_ids ) )
-				break;
+			if ( !isset( $post_ids ) ) {
+							break;
+			}
 			foreach ( (array) $post_ids as $post_id ) {
-				if ( !current_user_can( 'delete_post', $post_id ) )
-					wp_die( __( 'Sorry, you are not allowed to restore this item from the Trash.' ) );
+				if ( !current_user_can( 'delete_post', $post_id ) ) {
+									wp_die( __( 'Sorry, you are not allowed to restore this item from the Trash.' ) );
+				}
 
-				if ( !wp_untrash_post( $post_id ) )
-					wp_die( __( 'Error in restoring from Trash.' ) );
+				if ( !wp_untrash_post( $post_id ) ) {
+									wp_die( __( 'Error in restoring from Trash.' ) );
+				}
 			}
 			$location = add_query_arg( 'untrashed', count( $post_ids ), $location );
 			break;
 		case 'delete':
-			if ( !isset( $post_ids ) )
-				break;
+			if ( !isset( $post_ids ) ) {
+							break;
+			}
 			foreach ( (array) $post_ids as $post_id_del ) {
-				if ( !current_user_can( 'delete_post', $post_id_del ) )
-					wp_die( __( 'Sorry, you are not allowed to delete this item.' ) );
+				if ( !current_user_can( 'delete_post', $post_id_del ) ) {
+									wp_die( __( 'Sorry, you are not allowed to delete this item.' ) );
+				}
 
-				if ( !wp_delete_attachment( $post_id_del ) )
-					wp_die( __( 'Error in deleting.' ) );
+				if ( !wp_delete_attachment( $post_id_del ) ) {
+									wp_die( __( 'Error in deleting.' ) );
+				}
 			}
 			$location = add_query_arg( 'deleted', count( $post_ids ), $location );
 			break;

src/wp-admin/revision.php

Switch Indentation +42 added lines, -42 removed lines

@@ -30,56 +30,56 @@
 $redirect = 'edit.php';
 
 switch ( $action ) {
-case 'restore' :
-	if ( ! $revision = wp_get_post_revision( $revision_id ) )
-		break;
+	case 'restore' :
+		if ( ! $revision = wp_get_post_revision( $revision_id ) )
+			break;
 
-	if ( ! current_user_can( 'edit_post', $revision->post_parent ) )
-		break;
+		if ( ! current_user_can( 'edit_post', $revision->post_parent ) )
+			break;
 
-	if ( ! $post = get_post( $revision->post_parent ) )
-		break;
+		if ( ! $post = get_post( $revision->post_parent ) )
+			break;
 
-	// Restore if revisions are enabled or this is an autosave.
-	if ( ! wp_revisions_enabled( $post ) && ! wp_is_post_autosave( $revision ) ) {
-		$redirect = 'edit.php?post_type=' . $post->post_type;
-		break;
-	}
+		// Restore if revisions are enabled or this is an autosave.
+		if ( ! wp_revisions_enabled( $post ) && ! wp_is_post_autosave( $revision ) ) {
+			$redirect = 'edit.php?post_type=' . $post->post_type;
+			break;
+		}
 
-	// Don't allow revision restore when post is locked
-	if ( wp_check_post_lock( $post->ID ) )
-		break;
+		// Don't allow revision restore when post is locked
+		if ( wp_check_post_lock( $post->ID ) )
+			break;
 
-	check_admin_referer( "restore-post_{$revision->ID}" );
+		check_admin_referer( "restore-post_{$revision->ID}" );
 
-	wp_restore_post_revision( $revision->ID );
-	$redirect = add_query_arg( array( 'message' => 5, 'revision' => $revision->ID ), get_edit_post_link( $post->ID, 'url' ) );
-	break;
-case 'view' :
-case 'edit' :
-default :
-	if ( ! $revision = wp_get_post_revision( $revision_id ) )
+		wp_restore_post_revision( $revision->ID );
+		$redirect = add_query_arg( array( 'message' => 5, 'revision' => $revision->ID ), get_edit_post_link( $post->ID, 'url' ) );
 		break;
-	if ( ! $post = get_post( $revision->post_parent ) )
+	case 'view' :
+	case 'edit' :
+	default :
+		if ( ! $revision = wp_get_post_revision( $revision_id ) )
+			break;
+		if ( ! $post = get_post( $revision->post_parent ) )
+			break;
+
+		if ( ! current_user_can( 'read_post', $revision->ID ) || ! current_user_can( 'edit_post', $revision->post_parent ) )
+			break;
+
+		// Revisions disabled and we're not looking at an autosave
+		if ( ! wp_revisions_enabled( $post ) && ! wp_is_post_autosave( $revision ) ) {
+			$redirect = 'edit.php?post_type=' . $post->post_type;
+			break;
+		}
+
+		$post_edit_link = get_edit_post_link();
+		$post_title     = '<a href="' . $post_edit_link . '">' . _draft_or_post_title() . '</a>';
+		$h1             = sprintf( __( 'Compare Revisions of &#8220;%1$s&#8221;' ), $post_title );
+		$return_to_post = '<a href="' . $post_edit_link . '">' . __( '&larr; Return to editor' ) . '</a>';
+		$title          = __( 'Revisions' );
+
+		$redirect = false;
 		break;
-
-	if ( ! current_user_can( 'read_post', $revision->ID ) || ! current_user_can( 'edit_post', $revision->post_parent ) )
-		break;
-
-	// Revisions disabled and we're not looking at an autosave
-	if ( ! wp_revisions_enabled( $post ) && ! wp_is_post_autosave( $revision ) ) {
-		$redirect = 'edit.php?post_type=' . $post->post_type;
-		break;
-	}
-
-	$post_edit_link = get_edit_post_link();
-	$post_title     = '<a href="' . $post_edit_link . '">' . _draft_or_post_title() . '</a>';
-	$h1             = sprintf( __( 'Compare Revisions of &#8220;%1$s&#8221;' ), $post_title );
-	$return_to_post = '<a href="' . $post_edit_link . '">' . __( '&larr; Return to editor' ) . '</a>';
-	$title          = __( 'Revisions' );
-
-	$redirect = false;
-	break;
 }
 
 // Empty post_type means either malformed object found, or no valid parent was found.

Spacing +48 added lines, -48 removed lines

@@ -16,112 +16,112 @@ 
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-require ABSPATH . 'wp-admin/includes/revision.php';
+require ABSPATH.'wp-admin/includes/revision.php';
 
-wp_reset_vars( array( 'revision', 'action', 'from', 'to' ) );
+wp_reset_vars(array('revision', 'action', 'from', 'to'));
 
-$revision_id = absint( $revision );
+$revision_id = absint($revision);
 
-$from = is_numeric( $from ) ? absint( $from ) : null;
-if ( ! $revision_id )
-	$revision_id = absint( $to );
+$from = is_numeric($from) ? absint($from) : null;
+if ( ! $revision_id)
+	$revision_id = absint($to);
 $redirect = 'edit.php';
 
-switch ( $action ) {
+switch ($action) {
 case 'restore' :
-	if ( ! $revision = wp_get_post_revision( $revision_id ) )
+	if ( ! $revision = wp_get_post_revision($revision_id))
 		break;
 
-	if ( ! current_user_can( 'edit_post', $revision->post_parent ) )
+	if ( ! current_user_can('edit_post', $revision->post_parent))
 		break;
 
-	if ( ! $post = get_post( $revision->post_parent ) )
+	if ( ! $post = get_post($revision->post_parent))
 		break;
 
 	// Restore if revisions are enabled or this is an autosave.
-	if ( ! wp_revisions_enabled( $post ) && ! wp_is_post_autosave( $revision ) ) {
-		$redirect = 'edit.php?post_type=' . $post->post_type;
+	if ( ! wp_revisions_enabled($post) && ! wp_is_post_autosave($revision)) {
+		$redirect = 'edit.php?post_type='.$post->post_type;
 		break;
 	}
 
 	// Don't allow revision restore when post is locked
-	if ( wp_check_post_lock( $post->ID ) )
+	if (wp_check_post_lock($post->ID))
 		break;
 
-	check_admin_referer( "restore-post_{$revision->ID}" );
+	check_admin_referer("restore-post_{$revision->ID}");
 
-	wp_restore_post_revision( $revision->ID );
-	$redirect = add_query_arg( array( 'message' => 5, 'revision' => $revision->ID ), get_edit_post_link( $post->ID, 'url' ) );
+	wp_restore_post_revision($revision->ID);
+	$redirect = add_query_arg(array('message' => 5, 'revision' => $revision->ID), get_edit_post_link($post->ID, 'url'));
 	break;
 case 'view' :
 case 'edit' :
 default :
-	if ( ! $revision = wp_get_post_revision( $revision_id ) )
+	if ( ! $revision = wp_get_post_revision($revision_id))
 		break;
-	if ( ! $post = get_post( $revision->post_parent ) )
+	if ( ! $post = get_post($revision->post_parent))
 		break;
 
-	if ( ! current_user_can( 'read_post', $revision->ID ) || ! current_user_can( 'edit_post', $revision->post_parent ) )
+	if ( ! current_user_can('read_post', $revision->ID) || ! current_user_can('edit_post', $revision->post_parent))
 		break;
 
 	// Revisions disabled and we're not looking at an autosave
-	if ( ! wp_revisions_enabled( $post ) && ! wp_is_post_autosave( $revision ) ) {
-		$redirect = 'edit.php?post_type=' . $post->post_type;
+	if ( ! wp_revisions_enabled($post) && ! wp_is_post_autosave($revision)) {
+		$redirect = 'edit.php?post_type='.$post->post_type;
 		break;
 	}
 
 	$post_edit_link = get_edit_post_link();
-	$post_title     = '<a href="' . $post_edit_link . '">' . _draft_or_post_title() . '</a>';
-	$h1             = sprintf( __( 'Compare Revisions of &#8220;%1$s&#8221;' ), $post_title );
-	$return_to_post = '<a href="' . $post_edit_link . '">' . __( '&larr; Return to editor' ) . '</a>';
-	$title          = __( 'Revisions' );
+	$post_title     = '<a href="'.$post_edit_link.'">'._draft_or_post_title().'</a>';
+	$h1             = sprintf(__('Compare Revisions of &#8220;%1$s&#8221;'), $post_title);
+	$return_to_post = '<a href="'.$post_edit_link.'">'.__('&larr; Return to editor').'</a>';
+	$title          = __('Revisions');
 
 	$redirect = false;
 	break;
 }
 
 // Empty post_type means either malformed object found, or no valid parent was found.
-if ( ! $redirect && empty( $post->post_type ) )
+if ( ! $redirect && empty($post->post_type))
 	$redirect = 'edit.php';
 
-if ( ! empty( $redirect ) ) {
-	wp_redirect( $redirect );
+if ( ! empty($redirect)) {
+	wp_redirect($redirect);
 	exit;
 }
 
 // This is so that the correct "Edit" menu item is selected.
-if ( ! empty( $post->post_type ) && 'post' != $post->post_type )
-	$parent_file = $submenu_file = 'edit.php?post_type=' . $post->post_type;
+if ( ! empty($post->post_type) && 'post' != $post->post_type)
+	$parent_file = $submenu_file = 'edit.php?post_type='.$post->post_type;
 else
 	$parent_file = $submenu_file = 'edit.php';
 
-wp_enqueue_script( 'revisions' );
-wp_localize_script( 'revisions', '_wpRevisionsSettings', wp_prepare_revisions_for_js( $post, $revision_id, $from ) );
+wp_enqueue_script('revisions');
+wp_localize_script('revisions', '_wpRevisionsSettings', wp_prepare_revisions_for_js($post, $revision_id, $from));
 
 /* Revisions Help Tab */
 
-$revisions_overview  = '<p>' . __( 'This screen is used for managing your content revisions.' ) . '</p>';
-$revisions_overview .= '<p>' . __( 'Revisions are saved copies of your post or page, which are periodically created as you update your content. The red text on the left shows the content that was removed. The green text on the right shows the content that was added.' ) . '</p>';
-$revisions_overview .= '<p>' . __( 'From this screen you can review, compare, and restore revisions:' ) . '</p>';
-$revisions_overview .= '<ul><li>' . __( 'To navigate between revisions, <strong>drag the slider handle left or right</strong> or <strong>use the Previous or Next buttons</strong>.' ) . '</li>';
-$revisions_overview .= '<li>' . __( 'Compare two different revisions by <strong>selecting the &#8220;Compare any two revisions&#8221; box</strong> to the side.' ) . '</li>';
-$revisions_overview .= '<li>' . __( 'To restore a revision, <strong>click Restore This Revision</strong>.' ) . '</li></ul>';
+$revisions_overview  = '<p>'.__('This screen is used for managing your content revisions.').'</p>';
+$revisions_overview .= '<p>'.__('Revisions are saved copies of your post or page, which are periodically created as you update your content. The red text on the left shows the content that was removed. The green text on the right shows the content that was added.').'</p>';
+$revisions_overview .= '<p>'.__('From this screen you can review, compare, and restore revisions:').'</p>';
+$revisions_overview .= '<ul><li>'.__('To navigate between revisions, <strong>drag the slider handle left or right</strong> or <strong>use the Previous or Next buttons</strong>.').'</li>';
+$revisions_overview .= '<li>'.__('Compare two different revisions by <strong>selecting the &#8220;Compare any two revisions&#8221; box</strong> to the side.').'</li>';
+$revisions_overview .= '<li>'.__('To restore a revision, <strong>click Restore This Revision</strong>.').'</li></ul>';
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'revisions-overview',
-	'title'   => __( 'Overview' ),
+	'title'   => __('Overview'),
 	'content' => $revisions_overview
-) );
+));
 
-$revisions_sidebar  = '<p><strong>' . __( 'For more information:' ) . '</strong></p>';
-$revisions_sidebar .= '<p>' . __( '<a href="https://codex.wordpress.org/Revision_Management" target="_blank">Revisions Management</a>' ) . '</p>';
-$revisions_sidebar .= '<p>' . __( '<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>' ) . '</p>';
+$revisions_sidebar  = '<p><strong>'.__('For more information:').'</strong></p>';
+$revisions_sidebar .= '<p>'.__('<a href="https://codex.wordpress.org/Revision_Management" target="_blank">Revisions Management</a>').'</p>';
+$revisions_sidebar .= '<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>';
 
-get_current_screen()->set_help_sidebar( $revisions_sidebar );
+get_current_screen()->set_help_sidebar($revisions_sidebar);
 
-require_once( ABSPATH . 'wp-admin/admin-header.php' );
+require_once(ABSPATH.'wp-admin/admin-header.php');
 
 ?>
 
@@ -132,4 +132,4 @@ 
 <?php
 wp_print_revision_templates();
 
-require_once( ABSPATH . 'wp-admin/admin-footer.php' );
+require_once(ABSPATH.'wp-admin/admin-footer.php');

src/wp-admin/network.php

Spacing +47 added lines, -47 removed lines

@@ -10,104 +10,104 @@ 
  * @subpackage Administration
  */
 
-define( 'WP_INSTALLING_NETWORK', true );
+define('WP_INSTALLING_NETWORK', true);
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( ! is_super_admin() ) {
-	wp_die( __( 'Sorry, you are not allowed to manage options for this site.' ) );
+if ( ! is_super_admin()) {
+	wp_die(__('Sorry, you are not allowed to manage options for this site.'));
 }
 
-if ( is_multisite() ) {
-	if ( ! is_network_admin() ) {
-		wp_redirect( network_admin_url( 'setup.php' ) );
+if (is_multisite()) {
+	if ( ! is_network_admin()) {
+		wp_redirect(network_admin_url('setup.php'));
 		exit;
 	}
 
-	if ( ! defined( 'MULTISITE' ) ) {
-		wp_die( __( 'The Network creation panel is not for WordPress MU networks.' ) );
+	if ( ! defined('MULTISITE')) {
+		wp_die(__('The Network creation panel is not for WordPress MU networks.'));
 	}
 }
 
-require_once( dirname( __FILE__ ) . '/includes/network.php' );
+require_once(dirname(__FILE__).'/includes/network.php');
 
 // We need to create references to ms global tables to enable Network.
-foreach ( $wpdb->tables( 'ms_global' ) as $table => $prefixed_table ) {
+foreach ($wpdb->tables('ms_global') as $table => $prefixed_table) {
 	$wpdb->$table = $prefixed_table;
 }
 
-if ( ! network_domain_check() && ( ! defined( 'WP_ALLOW_MULTISITE' ) || ! WP_ALLOW_MULTISITE ) ) {
+if ( ! network_domain_check() && ( ! defined('WP_ALLOW_MULTISITE') || ! WP_ALLOW_MULTISITE)) {
 	wp_die(
 		printf(
 			/* translators: 1: WP_ALLOW_MULTISITE 2: wp-config.php */
-			__( 'You must define the %1$s constant as true in your %2$s file to allow creation of a Network.' ),
+			__('You must define the %1$s constant as true in your %2$s file to allow creation of a Network.'),
 			'<code>WP_ALLOW_MULTISITE</code>',
 			'<code>wp-config.php</code>'
 		)
 	);
 }
 
-if ( is_network_admin() ) {
-	$title = __( 'Network Setup' );
+if (is_network_admin()) {
+	$title = __('Network Setup');
 	$parent_file = 'settings.php';
 } else {
-	$title = __( 'Create a Network of WordPress Sites' );
+	$title = __('Create a Network of WordPress Sites');
 	$parent_file = 'tools.php';
 }
 
-$network_help = '<p>' . __('This screen allows you to configure a network as having subdomains (<code>site1.example.com</code>) or subdirectories (<code>example.com/site1</code>). Subdomains require wildcard subdomains to be enabled in Apache and DNS records, if your host allows it.') . '</p>' .
-	'<p>' . __('Choose subdomains or subdirectories; this can only be switched afterwards by reconfiguring your install. Fill out the network details, and click install. If this does not work, you may have to add a wildcard DNS record (for subdomains) or change to another setting in Permalinks (for subdirectories).') . '</p>' .
-	'<p>' . __('The next screen for Network Setup will give you individually-generated lines of code to add to your wp-config.php and .htaccess files. Make sure the settings of your FTP client make files starting with a dot visible, so that you can find .htaccess; you may have to create this file if it really is not there. Make backup copies of those two files.') . '</p>' .
-	'<p>' . __('Add the designated lines of code to wp-config.php (just before <code>/*...stop editing...*/</code>) and <code>.htaccess</code> (replacing the existing WordPress rules).') . '</p>' .
-	'<p>' . __('Once you add this code and refresh your browser, multisite should be enabled. This screen, now in the Network Admin navigation menu, will keep an archive of the added code. You can toggle between Network Admin and Site Admin by clicking on the Network Admin or an individual site name under the My Sites dropdown in the Toolbar.') . '</p>' .
-	'<p>' . __('The choice of subdirectory sites is disabled if this setup is more than a month old because of permalink problems with &#8220;/blog/&#8221; from the main site. This disabling will be addressed in a future version.') . '</p>' .
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Create_A_Network" target="_blank">Documentation on Creating a Network</a>') . '</p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Tools_Network_Screen" target="_blank">Documentation on the Network Screen</a>') . '</p>';
-
-get_current_screen()->add_help_tab( array(
+$network_help = '<p>'.__('This screen allows you to configure a network as having subdomains (<code>site1.example.com</code>) or subdirectories (<code>example.com/site1</code>). Subdomains require wildcard subdomains to be enabled in Apache and DNS records, if your host allows it.').'</p>'.
+	'<p>'.__('Choose subdomains or subdirectories; this can only be switched afterwards by reconfiguring your install. Fill out the network details, and click install. If this does not work, you may have to add a wildcard DNS record (for subdomains) or change to another setting in Permalinks (for subdirectories).').'</p>'.
+	'<p>'.__('The next screen for Network Setup will give you individually-generated lines of code to add to your wp-config.php and .htaccess files. Make sure the settings of your FTP client make files starting with a dot visible, so that you can find .htaccess; you may have to create this file if it really is not there. Make backup copies of those two files.').'</p>'.
+	'<p>'.__('Add the designated lines of code to wp-config.php (just before <code>/*...stop editing...*/</code>) and <code>.htaccess</code> (replacing the existing WordPress rules).').'</p>'.
+	'<p>'.__('Once you add this code and refresh your browser, multisite should be enabled. This screen, now in the Network Admin navigation menu, will keep an archive of the added code. You can toggle between Network Admin and Site Admin by clicking on the Network Admin or an individual site name under the My Sites dropdown in the Toolbar.').'</p>'.
+	'<p>'.__('The choice of subdirectory sites is disabled if this setup is more than a month old because of permalink problems with &#8220;/blog/&#8221; from the main site. This disabling will be addressed in a future version.').'</p>'.
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Create_A_Network" target="_blank">Documentation on Creating a Network</a>').'</p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Tools_Network_Screen" target="_blank">Documentation on the Network Screen</a>').'</p>';
+
+get_current_screen()->add_help_tab(array(
 	'id'      => 'network',
 	'title'   => __('Network'),
 	'content' => $network_help,
-) );
+));
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Create_A_Network" target="_blank">Documentation on Creating a Network</a>') . '</p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Tools_Network_Screen" target="_blank">Documentation on the Network Screen</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/Create_A_Network" target="_blank">Documentation on Creating a Network</a>').'</p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Tools_Network_Screen" target="_blank">Documentation on the Network Screen</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>'
 );
 
-include( ABSPATH . 'wp-admin/admin-header.php' );
+include(ABSPATH.'wp-admin/admin-header.php');
 ?>
 <div class="wrap">
-<h1><?php echo esc_html( $title ); ?></h1>
+<h1><?php echo esc_html($title); ?></h1>
 
 <?php
-if ( $_POST ) {
+if ($_POST) {
 
-	check_admin_referer( 'install-network-1' );
+	check_admin_referer('install-network-1');
 
-	require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+	require_once(ABSPATH.'wp-admin/includes/upgrade.php');
 	// Create network tables.
 	install_network();
-	$base              = parse_url( trailingslashit( get_option( 'home' ) ), PHP_URL_PATH );
-	$subdomain_install = allow_subdomain_install() ? !empty( $_POST['subdomain_install'] ) : false;
-	if ( ! network_domain_check() ) {
-		$result = populate_network( 1, get_clean_basedomain(), sanitize_email( $_POST['email'] ), wp_unslash( $_POST['sitename'] ), $base, $subdomain_install );
-		if ( is_wp_error( $result ) ) {
-			if ( 1 == count( $result->get_error_codes() ) && 'no_wildcard_dns' == $result->get_error_code() )
-				network_step2( $result );
+	$base              = parse_url(trailingslashit(get_option('home')), PHP_URL_PATH);
+	$subdomain_install = allow_subdomain_install() ? ! empty($_POST['subdomain_install']) : false;
+	if ( ! network_domain_check()) {
+		$result = populate_network(1, get_clean_basedomain(), sanitize_email($_POST['email']), wp_unslash($_POST['sitename']), $base, $subdomain_install);
+		if (is_wp_error($result)) {
+			if (1 == count($result->get_error_codes()) && 'no_wildcard_dns' == $result->get_error_code())
+				network_step2($result);
 			else
-				network_step1( $result );
+				network_step1($result);
 		} else {
 			network_step2();
 		}
 	} else {
 		network_step2();
 	}
-} elseif ( is_multisite() || network_domain_check() ) {
+} elseif (is_multisite() || network_domain_check()) {
 	network_step2();
 } else {
 	network_step1();
@@ -115,4 +115,4 @@ 
 ?>
 </div>
 
-<?php include( ABSPATH . 'wp-admin/admin-footer.php' ); ?>
+<?php include(ABSPATH.'wp-admin/admin-footer.php'); ?>

src/wp-admin/options-media.php

Spacing +22 added lines, -22 removed lines

@@ -7,46 +7,46 @@ 
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( ! current_user_can( 'manage_options' ) )
-	wp_die( __( 'Sorry, you are not allowed to manage options for this site.' ) );
+if ( ! current_user_can('manage_options'))
+	wp_die(__('Sorry, you are not allowed to manage options for this site.'));
 
 $title = __('Media Settings');
 $parent_file = 'options-general.php';
 
-$media_options_help = '<p>' . __('You can set maximum sizes for images inserted into your written content; you can also insert an image as Full Size.') . '</p>';
+$media_options_help = '<p>'.__('You can set maximum sizes for images inserted into your written content; you can also insert an image as Full Size.').'</p>';
 
-if ( ! is_multisite() && ( get_option('upload_url_path') || ( get_option('upload_path') != 'wp-content/uploads' && get_option('upload_path') ) ) ) {
-	$media_options_help .= '<p>' . __('Uploading Files allows you to choose the folder and path for storing your uploaded files.') . '</p>';
+if ( ! is_multisite() && (get_option('upload_url_path') || (get_option('upload_path') != 'wp-content/uploads' && get_option('upload_path')))) {
+	$media_options_help .= '<p>'.__('Uploading Files allows you to choose the folder and path for storing your uploaded files.').'</p>';
 }
 
-$media_options_help .= '<p>' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '</p>';
+$media_options_help .= '<p>'.__('You must click the Save Changes button at the bottom of the screen for new settings to take effect.').'</p>';
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'overview',
 	'title'   => __('Overview'),
 	'content' => $media_options_help,
-) );
+));
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Settings_Media_Screen" target="_blank">Documentation on Media Settings</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/Settings_Media_Screen" target="_blank">Documentation on Media Settings</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>'
 );
 
-include( ABSPATH . 'wp-admin/admin-header.php' );
+include(ABSPATH.'wp-admin/admin-header.php');
 
 ?>
 
 <div class="wrap">
-<h1><?php echo esc_html( $title ); ?></h1>
+<h1><?php echo esc_html($title); ?></h1>
 
 <form action="options.php" method="post">
 <?php settings_fields('media'); ?>
 
 <h2 class="title"><?php _e('Image sizes') ?></h2>
-<p><?php _e( 'The sizes listed below determine the maximum dimensions in pixels to use when adding an image to the Media Library.' ); ?></p>
+<p><?php _e('The sizes listed below determine the maximum dimensions in pixels to use when adding an image to the Media Library.'); ?></p>
 
 <table class="form-table">
 <tr>
@@ -88,33 +88,33 @@ 
 /**
  * @global array $wp_settings
  */
-if ( isset( $GLOBALS['wp_settings']['media']['embeds'] ) ) : ?>
+if (isset($GLOBALS['wp_settings']['media']['embeds'])) : ?>
 <h2 class="title"><?php _e('Embeds') ?></h2>
 <table class="form-table">
-<?php do_settings_fields( 'media', 'embeds' ); ?>
+<?php do_settings_fields('media', 'embeds'); ?>
 </table>
 <?php endif; ?>
 
-<?php if ( !is_multisite() ) : ?>
+<?php if ( ! is_multisite()) : ?>
 <h2 class="title"><?php _e('Uploading Files'); ?></h2>
 <table class="form-table">
 <?php
 // If upload_url_path is not the default (empty), and upload_path is not the default ('wp-content/uploads' or empty)
-if ( get_option('upload_url_path') || ( get_option('upload_path') != 'wp-content/uploads' && get_option('upload_path') ) ) :
+if (get_option('upload_url_path') || (get_option('upload_path') != 'wp-content/uploads' && get_option('upload_path'))) :
 ?>
 <tr>
 <th scope="row"><label for="upload_path"><?php _e('Store uploads in this folder'); ?></label></th>
 <td><input name="upload_path" type="text" id="upload_path" value="<?php echo esc_attr(get_option('upload_path')); ?>" class="regular-text code" />
 <p class="description"><?php
 	/* translators: %s: wp-content/uploads */
-	printf( __( 'Default is %s' ), '<code>wp-content/uploads</code>' );
+	printf(__('Default is %s'), '<code>wp-content/uploads</code>');
 ?></p>
 </td>
 </tr>
 
 <tr>
 <th scope="row"><label for="upload_url_path"><?php _e('Full URL path to files'); ?></label></th>
-<td><input name="upload_url_path" type="text" id="upload_url_path" value="<?php echo esc_attr( get_option('upload_url_path')); ?>" class="regular-text code" />
+<td><input name="upload_url_path" type="text" id="upload_url_path" value="<?php echo esc_attr(get_option('upload_url_path')); ?>" class="regular-text code" />
 <p class="description"><?php _e('Configuring this is optional. By default, it should be blank.'); ?></p>
 </td>
 </tr>
@@ -140,4 +140,4 @@ 
 
 </div>
 
-<?php include( ABSPATH . 'wp-admin/admin-footer.php' ); ?>
+<?php include(ABSPATH.'wp-admin/admin-footer.php'); ?>

src/wp-admin/users.php

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>' . __( 'Sorry, you are not allowed to browse users.' ) . '</p>',
+		'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+		'<p>'.__('Sorry, 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 above the users list to show All, Administrator, Editor, Author, Contributor, or Subscriber. The default view is to show all users. Unused User Roles are not listed.' ) . '</li>' .
-					'<li>' . __('You can view all posts made by a user by clicking on the number under the Posts column.') . '</li>' .
+	'content' => '<p>'.__('You can customize the display of this screen in a number of ways:').'</p>'.
+					'<ul>'.
+					'<li>'.__('You can hide/display columns based on your needs and decide how many users to list per screen using the Screen Options tab.').'</li>'.
+					'<li>'.__('You can filter the list of users by User Role using the text links above the users list to show All, Administrator, Editor, Author, Contributor, or Subscriber. The default view is to show all users. Unused User Roles are not listed.').'</li>'.
+					'<li>'.__('You can view all posts made by a user by clicking on the number under the Posts column.').'</li>'.
 					'</ul>'
-) );
+));
 
-$help = '<p>' . __('Hovering over a row in the users list will display action links that allow you to manage users. You can perform the following actions:') . '</p>' .
-	'<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');

src/wp-admin/user-edit.php

Spacing +174 added lines, -174 removed lines

@@ -7,57 +7,57 @@ 
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-wp_reset_vars( array( 'action', 'user_id', 'wp_http_referer' ) );
+wp_reset_vars(array('action', 'user_id', 'wp_http_referer'));
 
 $user_id = (int) $user_id;
 $current_user = wp_get_current_user();
-if ( ! defined( 'IS_PROFILE_PAGE' ) )
-	define( 'IS_PROFILE_PAGE', ( $user_id == $current_user->ID ) );
+if ( ! defined('IS_PROFILE_PAGE'))
+	define('IS_PROFILE_PAGE', ($user_id == $current_user->ID));
 
-if ( ! $user_id && IS_PROFILE_PAGE )
+if ( ! $user_id && IS_PROFILE_PAGE)
 	$user_id = $current_user->ID;
-elseif ( ! $user_id && ! IS_PROFILE_PAGE )
-	wp_die(__( 'Invalid user ID.' ) );
-elseif ( ! get_userdata( $user_id ) )
-	wp_die( __('Invalid user ID.') );
+elseif ( ! $user_id && ! IS_PROFILE_PAGE)
+	wp_die(__('Invalid user ID.'));
+elseif ( ! get_userdata($user_id))
+	wp_die(__('Invalid user ID.'));
 
 wp_enqueue_script('user-profile');
 
 $title = IS_PROFILE_PAGE ? __('Profile') : __('Edit User');
-if ( current_user_can('edit_users') && !IS_PROFILE_PAGE )
+if (current_user_can('edit_users') && ! IS_PROFILE_PAGE)
 	$submenu_file = 'users.php';
 else
 	$submenu_file = 'profile.php';
 
-if ( current_user_can('edit_users') && !is_user_admin() )
+if (current_user_can('edit_users') && ! is_user_admin())
 	$parent_file = 'users.php';
 else
 	$parent_file = 'profile.php';
 
-$profile_help = '<p>' . __('Your profile contains information about you (your &#8220;account&#8221;) as well as some personal options related to using WordPress.') . '</p>' .
-	'<p>' . __('You can change your password, turn on keyboard shortcuts, change the color scheme of your WordPress administration screens, and turn off the WYSIWYG (Visual) editor, among other things. You can hide the Toolbar (formerly called the Admin Bar) from the front end of your site, however it cannot be disabled on the admin screens.') . '</p>' .
-	'<p>' . __('Your username cannot be changed, but you can use other fields to enter your real name or a nickname, and change which name to display on your posts.') . '</p>' .
-	'<p>' . __( 'You can log out of other devices, such as your phone or a public computer, by clicking the Log Out Everywhere Else button.' ) . '</p>' .
-	'<p>' . __('Required fields are indicated; the rest are optional. Profile information will only be displayed if your theme is set up to do so.') . '</p>' .
-	'<p>' . __('Remember to click the Update Profile button when you are finished.') . '</p>';
+$profile_help = '<p>'.__('Your profile contains information about you (your &#8220;account&#8221;) as well as some personal options related to using WordPress.').'</p>'.
+	'<p>'.__('You can change your password, turn on keyboard shortcuts, change the color scheme of your WordPress administration screens, and turn off the WYSIWYG (Visual) editor, among other things. You can hide the Toolbar (formerly called the Admin Bar) from the front end of your site, however it cannot be disabled on the admin screens.').'</p>'.
+	'<p>'.__('Your username cannot be changed, but you can use other fields to enter your real name or a nickname, and change which name to display on your posts.').'</p>'.
+	'<p>'.__('You can log out of other devices, such as your phone or a public computer, by clicking the Log Out Everywhere Else button.').'</p>'.
+	'<p>'.__('Required fields are indicated; the rest are optional. Profile information will only be displayed if your theme is set up to do so.').'</p>'.
+	'<p>'.__('Remember to click the Update Profile button when you are finished.').'</p>';
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'overview',
 	'title'   => __('Overview'),
 	'content' => $profile_help,
-) );
+));
 
 get_current_screen()->set_help_sidebar(
-    '<p><strong>' . __('For more information:') . '</strong></p>' .
-    '<p>' . __('<a href="https://codex.wordpress.org/Users_Your_Profile_Screen" target="_blank">Documentation on User Profiles</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_Your_Profile_Screen" target="_blank">Documentation on User Profiles</a>').'</p>'.
+    '<p>'.__('<a href="https://wordpress.org/support/" target="_blank">Support Forums</a>').'</p>'
 );
 
-$wp_http_referer = remove_query_arg( array( 'update', 'delete_count', 'user_id' ), $wp_http_referer );
+$wp_http_referer = remove_query_arg(array('update', 'delete_count', 'user_id'), $wp_http_referer);
 
-$user_can_edit = current_user_can( 'edit_posts' ) || current_user_can( 'edit_pages' );
+$user_can_edit = current_user_can('edit_posts') || current_user_can('edit_pages');
 
 /**
  * Filters whether to allow administrators on Multisite to edit every user.
@@ -72,47 +72,47 @@ 
  *
  * @param bool $allow Whether to allow editing of any user. Default true.
  */
-if ( is_multisite()
-	&& ! current_user_can( 'manage_network_users' )
+if (is_multisite()
+	&& ! current_user_can('manage_network_users')
 	&& $user_id != $current_user->ID
-	&& ! apply_filters( 'enable_edit_any_user_configuration', true )
+	&& ! apply_filters('enable_edit_any_user_configuration', true)
 ) {
-	wp_die( __( 'Sorry, you are not allowed to edit this user.' ) );
+	wp_die(__('Sorry, you are not allowed to edit this user.'));
 }
 
 // Execute confirmed email change. See send_confirmation_on_profile_email().
-if ( is_multisite() && IS_PROFILE_PAGE && isset( $_GET[ 'newuseremail' ] ) && $current_user->ID ) {
-	$new_email = get_user_meta( $current_user->ID, '_new_email', true );
-	if ( $new_email && hash_equals( $new_email[ 'hash' ], $_GET[ 'newuseremail' ] ) ) {
+if (is_multisite() && IS_PROFILE_PAGE && isset($_GET['newuseremail']) && $current_user->ID) {
+	$new_email = get_user_meta($current_user->ID, '_new_email', true);
+	if ($new_email && hash_equals($new_email['hash'], $_GET['newuseremail'])) {
 		$user = new stdClass;
 		$user->ID = $current_user->ID;
-		$user->user_email = esc_html( trim( $new_email[ 'newemail' ] ) );
-		if ( $wpdb->get_var( $wpdb->prepare( "SELECT user_login FROM {$wpdb->signups} WHERE user_login = %s", $current_user->user_login ) ) ) {
-			$wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->signups} SET user_email = %s WHERE user_login = %s", $user->user_email, $current_user->user_login ) );
+		$user->user_email = esc_html(trim($new_email['newemail']));
+		if ($wpdb->get_var($wpdb->prepare("SELECT user_login FROM {$wpdb->signups} WHERE user_login = %s", $current_user->user_login))) {
+			$wpdb->query($wpdb->prepare("UPDATE {$wpdb->signups} SET user_email = %s WHERE user_login = %s", $user->user_email, $current_user->user_login));
 		}
-		wp_update_user( $user );
-		delete_user_meta( $current_user->ID, '_new_email' );
-		wp_redirect( add_query_arg( array( 'updated' => 'true' ), self_admin_url( 'profile.php' ) ) );
+		wp_update_user($user);
+		delete_user_meta($current_user->ID, '_new_email');
+		wp_redirect(add_query_arg(array('updated' => 'true'), self_admin_url('profile.php')));
 		die();
 	} else {
-		wp_redirect( add_query_arg( array( 'error' => 'new-email' ), self_admin_url( 'profile.php' ) ) );
+		wp_redirect(add_query_arg(array('error' => 'new-email'), self_admin_url('profile.php')));
 	}
-} elseif ( is_multisite() && IS_PROFILE_PAGE && !empty( $_GET['dismiss'] ) && $current_user->ID . '_new_email' === $_GET['dismiss'] ) {
-	check_admin_referer( 'dismiss-' . $current_user->ID . '_new_email' );
-	delete_user_meta( $current_user->ID, '_new_email' );
-	wp_redirect( add_query_arg( array('updated' => 'true'), self_admin_url( 'profile.php' ) ) );
+} elseif (is_multisite() && IS_PROFILE_PAGE && ! empty($_GET['dismiss']) && $current_user->ID.'_new_email' === $_GET['dismiss']) {
+	check_admin_referer('dismiss-'.$current_user->ID.'_new_email');
+	delete_user_meta($current_user->ID, '_new_email');
+	wp_redirect(add_query_arg(array('updated' => 'true'), self_admin_url('profile.php')));
 	die();
 }
 
 switch ($action) {
 case 'update':
 
-check_admin_referer('update-user_' . $user_id);
+check_admin_referer('update-user_'.$user_id);
 
-if ( !current_user_can('edit_user', $user_id) )
+if ( ! current_user_can('edit_user', $user_id))
 	wp_die(__('Sorry, you are not allowed to edit this user.'));
 
-if ( IS_PROFILE_PAGE ) {
+if (IS_PROFILE_PAGE) {
 	/**
 	 * Fires before the page loads on the 'Your Profile' editing screen.
 	 *
@@ -122,7 +122,7 @@ 
 	 *
 	 * @param int $user_id The user ID.
 	 */
-	do_action( 'personal_options_update', $user_id );
+	do_action('personal_options_update', $user_id);
 } else {
 	/**
 	 * Fires before the page loads on the 'Edit User' screen.
@@ -131,29 +131,29 @@ 
 	 *
 	 * @param int $user_id The user ID.
 	 */
-	do_action( 'edit_user_profile_update', $user_id );
+	do_action('edit_user_profile_update', $user_id);
 }
 
 // Update the email address in signups, if present.
-if ( is_multisite() ) {
-	$user = get_userdata( $user_id );
+if (is_multisite()) {
+	$user = get_userdata($user_id);
 
-	if ( $user->user_login && isset( $_POST[ 'email' ] ) && is_email( $_POST[ 'email' ] ) && $wpdb->get_var( $wpdb->prepare( "SELECT user_login FROM {$wpdb->signups} WHERE user_login = %s", $user->user_login ) ) ) {
-		$wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->signups} SET user_email = %s WHERE user_login = %s", $_POST[ 'email' ], $user_login ) );
+	if ($user->user_login && isset($_POST['email']) && is_email($_POST['email']) && $wpdb->get_var($wpdb->prepare("SELECT user_login FROM {$wpdb->signups} WHERE user_login = %s", $user->user_login))) {
+		$wpdb->query($wpdb->prepare("UPDATE {$wpdb->signups} SET user_email = %s WHERE user_login = %s", $_POST['email'], $user_login));
 	}
 }
 
 // Update the user.
-$errors = edit_user( $user_id );
+$errors = edit_user($user_id);
 
 // Grant or revoke super admin status if requested.
-if ( is_multisite() && is_network_admin() && !IS_PROFILE_PAGE && current_user_can( 'manage_network_options' ) && !isset($super_admins) && empty( $_POST['super_admin'] ) == is_super_admin( $user_id ) ) {
-	empty( $_POST['super_admin'] ) ? revoke_super_admin( $user_id ) : grant_super_admin( $user_id );
+if (is_multisite() && is_network_admin() && ! IS_PROFILE_PAGE && current_user_can('manage_network_options') && ! isset($super_admins) && empty($_POST['super_admin']) == is_super_admin($user_id)) {
+	empty($_POST['super_admin']) ? revoke_super_admin($user_id) : grant_super_admin($user_id);
 }
 
-if ( !is_wp_error( $errors ) ) {
-	$redirect = add_query_arg( 'updated', true, get_edit_user_link( $user_id ) );
-	if ( $wp_http_referer )
+if ( ! is_wp_error($errors)) {
+	$redirect = add_query_arg('updated', true, get_edit_user_link($user_id));
+	if ($wp_http_referer)
 		$redirect = add_query_arg('wp_http_referer', urlencode($wp_http_referer), $redirect);
 	wp_redirect($redirect);
 	exit;
@@ -162,62 +162,62 @@ 
 default:
 $profileuser = get_user_to_edit($user_id);
 
-if ( !current_user_can('edit_user', $user_id) )
+if ( ! current_user_can('edit_user', $user_id))
 	wp_die(__('Sorry, you are not allowed to edit this user.'));
 
-$sessions = WP_Session_Tokens::get_instance( $profileuser->ID );
+$sessions = WP_Session_Tokens::get_instance($profileuser->ID);
 
-include(ABSPATH . 'wp-admin/admin-header.php');
+include(ABSPATH.'wp-admin/admin-header.php');
 ?>
 
-<?php if ( !IS_PROFILE_PAGE && is_super_admin( $profileuser->ID ) && current_user_can( 'manage_network_options' ) ) { ?>
+<?php if ( ! IS_PROFILE_PAGE && is_super_admin($profileuser->ID) && current_user_can('manage_network_options')) { ?>
 	<div class="updated"><p><strong><?php _e('Important:'); ?></strong> <?php _e('This user has super admin privileges.'); ?></p></div>
 <?php } ?>
-<?php if ( isset($_GET['updated']) ) : ?>
+<?php if (isset($_GET['updated'])) : ?>
 <div id="message" class="updated notice is-dismissible">
-	<?php if ( IS_PROFILE_PAGE ) : ?>
+	<?php if (IS_PROFILE_PAGE) : ?>
 	<p><strong><?php _e('Profile updated.') ?></strong></p>
 	<?php else: ?>
 	<p><strong><?php _e('User updated.') ?></strong></p>
 	<?php endif; ?>
-	<?php if ( $wp_http_referer && false === strpos( $wp_http_referer, 'user-new.php' ) && ! IS_PROFILE_PAGE ) : ?>
-	<p><a href="<?php echo esc_url( $wp_http_referer ); ?>"><?php _e('&larr; Back to Users'); ?></a></p>
+	<?php if ($wp_http_referer && false === strpos($wp_http_referer, 'user-new.php') && ! IS_PROFILE_PAGE) : ?>
+	<p><a href="<?php echo esc_url($wp_http_referer); ?>"><?php _e('&larr; Back to Users'); ?></a></p>
 	<?php endif; ?>
 </div>
 <?php endif; ?>
-<?php if ( isset( $_GET['error'] ) ) : ?>
+<?php if (isset($_GET['error'])) : ?>
 <div class="notice notice-error">
-	<?php if ( 'new-email' == $_GET['error'] ) : ?>
-	<p><?php _e( 'Error while saving the new email address. Please try again.' ); ?></p>
+	<?php if ('new-email' == $_GET['error']) : ?>
+	<p><?php _e('Error while saving the new email address. Please try again.'); ?></p>
 	<?php endif; ?>
 </div>
 <?php endif; ?>
-<?php if ( isset( $errors ) && is_wp_error( $errors ) ) : ?>
-<div class="error"><p><?php echo implode( "</p>\n<p>", $errors->get_error_messages() ); ?></p></div>
+<?php if (isset($errors) && is_wp_error($errors)) : ?>
+<div class="error"><p><?php echo implode("</p>\n<p>", $errors->get_error_messages()); ?></p></div>
 <?php endif; ?>
 
 <div class="wrap" id="profile-page">
 <h1>
 <?php
-echo esc_html( $title );
-if ( ! IS_PROFILE_PAGE ) {
-	if ( current_user_can( 'create_users' ) ) { ?>
-		<a href="user-new.php" class="page-title-action"><?php echo esc_html_x( 'Add New', 'user' ); ?></a>
-	<?php } elseif ( is_multisite() && current_user_can( 'promote_users' ) ) { ?>
-		<a href="user-new.php" class="page-title-action"><?php echo esc_html_x( 'Add Existing', 'user' ); ?></a>
+echo esc_html($title);
+if ( ! IS_PROFILE_PAGE) {
+	if (current_user_can('create_users')) { ?>
+		<a href="user-new.php" class="page-title-action"><?php echo esc_html_x('Add New', 'user'); ?></a>
+	<?php } elseif (is_multisite() && current_user_can('promote_users')) { ?>
+		<a href="user-new.php" class="page-title-action"><?php echo esc_html_x('Add Existing', 'user'); ?></a>
 	<?php }
 } ?>
 </h1>
-<form id="your-profile" action="<?php echo esc_url( self_admin_url( IS_PROFILE_PAGE ? 'profile.php' : 'user-edit.php' ) ); ?>" method="post" novalidate="novalidate"<?php
+<form id="your-profile" action="<?php echo esc_url(self_admin_url(IS_PROFILE_PAGE ? 'profile.php' : 'user-edit.php')); ?>" method="post" novalidate="novalidate"<?php
 	/**
 	 * Fires inside the your-profile form tag on the user editing screen.
 	 *
 	 * @since 3.0.0
 	 */
-	do_action( 'user_edit_form_tag' );
+	do_action('user_edit_form_tag');
 ?>>
-<?php wp_nonce_field('update-user_' . $user_id) ?>
-<?php if ( $wp_http_referer ) : ?>
+<?php wp_nonce_field('update-user_'.$user_id) ?>
+<?php if ($wp_http_referer) : ?>
 	<input type="hidden" name="wp_http_referer" value="<?php echo esc_url($wp_http_referer); ?>" />
 <?php endif; ?>
 <p>
@@ -225,16 +225,16 @@ 
 <input type="hidden" name="checkuser_id" value="<?php echo get_current_user_id(); ?>" />
 </p>
 
-<h2><?php _e( 'Personal Options' ); ?></h2>
+<h2><?php _e('Personal Options'); ?></h2>
 
 <table class="form-table">
-<?php if ( ! ( IS_PROFILE_PAGE && ! $user_can_edit ) ) : ?>
+<?php if ( ! (IS_PROFILE_PAGE && ! $user_can_edit)) : ?>
 	<tr class="user-rich-editing-wrap">
-		<th scope="row"><?php _e( 'Visual Editor' ); ?></th>
-		<td><label for="rich_editing"><input name="rich_editing" type="checkbox" id="rich_editing" value="false" <?php if ( ! empty( $profileuser->rich_editing ) ) checked( 'false', $profileuser->rich_editing ); ?> /> <?php _e( 'Disable the visual editor when writing' ); ?></label></td>
+		<th scope="row"><?php _e('Visual Editor'); ?></th>
+		<td><label for="rich_editing"><input name="rich_editing" type="checkbox" id="rich_editing" value="false" <?php if ( ! empty($profileuser->rich_editing)) checked('false', $profileuser->rich_editing); ?> /> <?php _e('Disable the visual editor when writing'); ?></label></td>
 	</tr>
 <?php endif; ?>
-<?php if ( count($_wp_admin_css_colors) > 1 && has_action('admin_color_scheme_picker') ) : ?>
+<?php if (count($_wp_admin_css_colors) > 1 && has_action('admin_color_scheme_picker')) : ?>
 <tr class="user-admin-color-wrap">
 <th scope="row"><?php _e('Admin Color Scheme')?></th>
 <td><?php
@@ -249,23 +249,23 @@ 
 	 *
 	 * @param int $user_id The user ID.
 	 */
-	do_action( 'admin_color_scheme_picker', $user_id );
+	do_action('admin_color_scheme_picker', $user_id);
 ?></td>
 </tr>
 <?php
 endif; // $_wp_admin_css_colors
-if ( !( IS_PROFILE_PAGE && !$user_can_edit ) ) : ?>
+if ( ! (IS_PROFILE_PAGE && ! $user_can_edit)) : ?>
 <tr class="user-comment-shortcuts-wrap">
-<th scope="row"><?php _e( 'Keyboard Shortcuts' ); ?></th>
-<td><label for="comment_shortcuts"><input type="checkbox" name="comment_shortcuts" id="comment_shortcuts" value="true" <?php if ( ! empty( $profileuser->comment_shortcuts ) ) checked( 'true', $profileuser->comment_shortcuts ); ?> /> <?php _e('Enable keyboard shortcuts for comment moderation.'); ?></label> <?php _e('<a href="https://codex.wordpress.org/Keyboard_Shortcuts" target="_blank">More information</a>'); ?></td>
+<th scope="row"><?php _e('Keyboard Shortcuts'); ?></th>
+<td><label for="comment_shortcuts"><input type="checkbox" name="comment_shortcuts" id="comment_shortcuts" value="true" <?php if ( ! empty($profileuser->comment_shortcuts)) checked('true', $profileuser->comment_shortcuts); ?> /> <?php _e('Enable keyboard shortcuts for comment moderation.'); ?></label> <?php _e('<a href="https://codex.wordpress.org/Keyboard_Shortcuts" target="_blank">More information</a>'); ?></td>
 </tr>
 <?php endif; ?>
 <tr class="show-admin-bar user-admin-bar-front-wrap">
-<th scope="row"><?php _e( 'Toolbar' ); ?></th>
+<th scope="row"><?php _e('Toolbar'); ?></th>
 <td><fieldset><legend class="screen-reader-text"><span><?php _e('Toolbar') ?></span></legend>
 <label for="admin_bar_front">
-<input name="admin_bar_front" type="checkbox" id="admin_bar_front" value="1"<?php checked( _get_admin_bar_pref( 'front', $profileuser->ID ) ); ?> />
-<?php _e( 'Show Toolbar when viewing site' ); ?></label><br />
+<input name="admin_bar_front" type="checkbox" id="admin_bar_front" value="1"<?php checked(_get_admin_bar_pref('front', $profileuser->ID)); ?> />
+<?php _e('Show Toolbar when viewing site'); ?></label><br />
 </fieldset>
 </td>
 </tr>
@@ -277,12 +277,12 @@ 
  *
  * @param WP_User $profileuser The current WP_User object.
  */
-do_action( 'personal_options', $profileuser );
+do_action('personal_options', $profileuser);
 ?>
 
 </table>
 <?php
-	if ( IS_PROFILE_PAGE ) {
+	if (IS_PROFILE_PAGE) {
 		/**
 		 * Fires after the 'Personal Options' settings table on the 'Your Profile' editing screen.
 		 *
@@ -292,11 +292,11 @@ 
 		 *
 		 * @param WP_User $profileuser The current WP_User object.
 		 */
-		do_action( 'profile_personal_options', $profileuser );
+		do_action('profile_personal_options', $profileuser);
 	}
 ?>
 
-<h2><?php _e( 'Name' ); ?></h2>
+<h2><?php _e('Name'); ?></h2>
 
 <table class="form-table">
 	<tr class="user-user-login-wrap">
@@ -304,33 +304,33 @@ 
 		<td><input type="text" name="user_login" id="user_login" value="<?php echo esc_attr($profileuser->user_login); ?>" disabled="disabled" class="regular-text" /> <span class="description"><?php _e('Usernames cannot be changed.'); ?></span></td>
 	</tr>
 
-<?php if ( !IS_PROFILE_PAGE && !is_network_admin() ) : ?>
+<?php if ( ! IS_PROFILE_PAGE && ! is_network_admin()) : ?>
 <tr class="user-role-wrap"><th><label for="role"><?php _e('Role') ?></label></th>
 <td><select name="role" id="role">
 <?php
 // Compare user role against currently editable roles
-$user_roles = array_intersect( array_values( $profileuser->roles ), array_keys( get_editable_roles() ) );
-$user_role  = reset( $user_roles );
+$user_roles = array_intersect(array_values($profileuser->roles), array_keys(get_editable_roles()));
+$user_role  = reset($user_roles);
 
 // print the full list of roles with the primary one selected.
 wp_dropdown_roles($user_role);
 
 // print the 'no role' option. Make it selected if the user has no role yet.
-if ( $user_role )
-	echo '<option value="">' . __('&mdash; No role for this site &mdash;') . '</option>';
+if ($user_role)
+	echo '<option value="">'.__('&mdash; No role for this site &mdash;').'</option>';
 else
-	echo '<option value="" selected="selected">' . __('&mdash; No role for this site &mdash;') . '</option>';
+	echo '<option value="" selected="selected">'.__('&mdash; No role for this site &mdash;').'</option>';
 ?>
 </select></td></tr>
 <?php endif; //!IS_PROFILE_PAGE
 
-if ( is_multisite() && is_network_admin() && ! IS_PROFILE_PAGE && current_user_can( 'manage_network_options' ) && !isset($super_admins) ) { ?>
+if (is_multisite() && is_network_admin() && ! IS_PROFILE_PAGE && current_user_can('manage_network_options') && ! isset($super_admins)) { ?>
 <tr class="user-super-admin-wrap"><th><?php _e('Super Admin'); ?></th>
 <td>
-<?php if ( $profileuser->user_email != get_site_option( 'admin_email' ) || ! is_super_admin( $profileuser->ID ) ) : ?>
-<p><label><input type="checkbox" id="super_admin" name="super_admin"<?php checked( is_super_admin( $profileuser->ID ) ); ?> /> <?php _e( 'Grant this user super admin privileges for the Network.' ); ?></label></p>
+<?php if ($profileuser->user_email != get_site_option('admin_email') || ! is_super_admin($profileuser->ID)) : ?>
+<p><label><input type="checkbox" id="super_admin" name="super_admin"<?php checked(is_super_admin($profileuser->ID)); ?> /> <?php _e('Grant this user super admin privileges for the Network.'); ?></label></p>
 <?php else : ?>
-<p><?php _e( 'Super admin privileges cannot be removed because this user has the network admin email.' ); ?></p>
+<p><?php _e('Super admin privileges cannot be removed because this user has the network admin email.'); ?></p>
 <?php endif; ?>
 </td></tr>
 <?php } ?>
@@ -359,26 +359,26 @@ 
 			$public_display['display_nickname']  = $profileuser->nickname;
 			$public_display['display_username']  = $profileuser->user_login;
 
-			if ( !empty($profileuser->first_name) )
+			if ( ! empty($profileuser->first_name))
 				$public_display['display_firstname'] = $profileuser->first_name;
 
-			if ( !empty($profileuser->last_name) )
+			if ( ! empty($profileuser->last_name))
 				$public_display['display_lastname'] = $profileuser->last_name;
 
-			if ( !empty($profileuser->first_name) && !empty($profileuser->last_name) ) {
-				$public_display['display_firstlast'] = $profileuser->first_name . ' ' . $profileuser->last_name;
-				$public_display['display_lastfirst'] = $profileuser->last_name . ' ' . $profileuser->first_name;
+			if ( ! empty($profileuser->first_name) && ! empty($profileuser->last_name)) {
+				$public_display['display_firstlast'] = $profileuser->first_name.' '.$profileuser->last_name;
+				$public_display['display_lastfirst'] = $profileuser->last_name.' '.$profileuser->first_name;
 			}
 
-			if ( !in_array( $profileuser->display_name, $public_display ) ) // Only add this if it isn't duplicated elsewhere
-				$public_display = array( 'display_displayname' => $profileuser->display_name ) + $public_display;
+			if ( ! in_array($profileuser->display_name, $public_display)) // Only add this if it isn't duplicated elsewhere
+				$public_display = array('display_displayname' => $profileuser->display_name) + $public_display;
 
-			$public_display = array_map( 'trim', $public_display );
-			$public_display = array_unique( $public_display );
+			$public_display = array_map('trim', $public_display);
+			$public_display = array_unique($public_display);
 
-			foreach ( $public_display as $id => $item ) {
+			foreach ($public_display as $id => $item) {
 		?>
-			<option <?php selected( $profileuser->display_name, $item ); ?>><?php echo $item; ?></option>
+			<option <?php selected($profileuser->display_name, $item); ?>><?php echo $item; ?></option>
 		<?php
 			}
 		?>
@@ -387,26 +387,26 @@ 
 </tr>
 </table>
 
-<h2><?php _e( 'Contact Info' ); ?></h2>
+<h2><?php _e('Contact Info'); ?></h2>
 
 <table class="form-table">
 <tr class="user-email-wrap">
 	<th><label for="email"><?php _e('Email'); ?> <span class="description"><?php _e('(required)'); ?></span></label></th>
-	<td><input type="email" name="email" id="email" value="<?php echo esc_attr( $profileuser->user_email ) ?>" class="regular-text ltr" />
+	<td><input type="email" name="email" id="email" value="<?php echo esc_attr($profileuser->user_email) ?>" class="regular-text ltr" />
 	<?php
-	$new_email = get_user_meta( $current_user->ID, '_new_email', true );
-	if ( $new_email && $new_email['newemail'] != $current_user->user_email && $profileuser->ID == $current_user->ID ) : ?>
+	$new_email = get_user_meta($current_user->ID, '_new_email', true);
+	if ($new_email && $new_email['newemail'] != $current_user->user_email && $profileuser->ID == $current_user->ID) : ?>
 	<div class="updated inline">
 	<p><?php
 		printf(
 			/* translators: %s: new email */
-			__( 'There is a pending change of your email to %s.' ),
-			'<code>' . esc_html( $new_email['newemail'] ) . '</code>'
+			__('There is a pending change of your email to %s.'),
+			'<code>'.esc_html($new_email['newemail']).'</code>'
 		);
 		printf(
 			' <a href="%1$s">%2$s</a>',
-			esc_url( wp_nonce_url( self_admin_url( 'profile.php?dismiss=' . $current_user->ID . '_new_email' ), 'dismiss-' . $current_user->ID . '_new_email' ) ),
-			__( 'Cancel' )
+			esc_url(wp_nonce_url(self_admin_url('profile.php?dismiss='.$current_user->ID.'_new_email'), 'dismiss-'.$current_user->ID.'_new_email')),
+			__('Cancel')
 		);
 	?></p>
 	</div>
@@ -416,11 +416,11 @@ 
 
 <tr class="user-url-wrap">
 	<th><label for="url"><?php _e('Website') ?></label></th>
-	<td><input type="url" name="url" id="url" value="<?php echo esc_attr( $profileuser->user_url ) ?>" class="regular-text code" /></td>
+	<td><input type="url" name="url" id="url" value="<?php echo esc_attr($profileuser->user_url) ?>" class="regular-text code" /></td>
 </tr>
 
 <?php
-	foreach ( wp_get_user_contact_methods( $profileuser ) as $name => $desc ) {
+	foreach (wp_get_user_contact_methods($profileuser) as $name => $desc) {
 ?>
 <tr class="user-<?php echo $name; ?>-wrap">
 	<th><label for="<?php echo $name; ?>">
@@ -435,7 +435,7 @@ 
 		 *
 		 * @param string $desc The translatable label for the contactmethod.
 		 */
-		echo apply_filters( "user_{$name}_label", $desc );
+		echo apply_filters("user_{$name}_label", $desc);
 		?>
 	</label></th>
 	<td><input type="text" name="<?php echo $name; ?>" id="<?php echo $name; ?>" value="<?php echo esc_attr($profileuser->$name) ?>" class="regular-text" /></td>
@@ -445,7 +445,7 @@ 
 ?>
 </table>
 
-<h2><?php IS_PROFILE_PAGE ? _e( 'About Yourself' ) : _e( 'About the user' ); ?></h2>
+<h2><?php IS_PROFILE_PAGE ? _e('About Yourself') : _e('About the user'); ?></h2>
 
 <table class="form-table">
 <tr class="user-description-wrap">
@@ -454,16 +454,16 @@ 
 	<p class="description"><?php _e('Share a little biographical information to fill out your profile. This may be shown publicly.'); ?></p></td>
 </tr>
 
-<?php if ( get_option( 'show_avatars' ) ) : ?>
+<?php if (get_option('show_avatars')) : ?>
 <tr class="user-profile-picture">
-	<th><?php _e( 'Profile Picture' ); ?></th>
+	<th><?php _e('Profile Picture'); ?></th>
 	<td>
-		<?php echo get_avatar( $user_id ); ?>
+		<?php echo get_avatar($user_id); ?>
 		<p class="description"><?php
-			if ( IS_PROFILE_PAGE ) {
+			if (IS_PROFILE_PAGE) {
 				/* translators: %s: Gravatar URL */
-				$description = sprintf( __( 'You can change your profile picture on <a href="%s">Gravatar</a>.' ),
-					__( 'https://en.gravatar.com/' )
+				$description = sprintf(__('You can change your profile picture on <a href="%s">Gravatar</a>.'),
+					__('https://en.gravatar.com/')
 				);
 			} else {
 				$description = '';
@@ -476,7 +476,7 @@ 
 			 *
 			 * @param string $description The description that will be printed.
 			 */
-			echo apply_filters( 'user_profile_picture_description', $description );
+			echo apply_filters('user_profile_picture_description', $description);
 		?></p>
 	</td>
 </tr>
@@ -493,80 +493,80 @@ 
  * @param bool    $show        Whether to show the password fields. Default true.
  * @param WP_User $profileuser User object for the current user to edit.
  */
-if ( $show_password_fields = apply_filters( 'show_password_fields', true, $profileuser ) ) :
+if ($show_password_fields = apply_filters('show_password_fields', true, $profileuser)) :
 ?>
 </table>
 
-<h2><?php _e( 'Account Management' ); ?></h2>
+<h2><?php _e('Account Management'); ?></h2>
 <table class="form-table">
 <tr id="password" class="user-pass1-wrap">
-	<th><label for="pass1"><?php _e( 'New Password' ); ?></label></th>
+	<th><label for="pass1"><?php _e('New Password'); ?></label></th>
 	<td>
 		<input class="hidden" value=" " /><!-- #24364 workaround -->
-		<button type="button" class="button button-secondary wp-generate-pw hide-if-no-js"><?php _e( 'Generate Password' ); ?></button>
+		<button type="button" class="button button-secondary wp-generate-pw hide-if-no-js"><?php _e('Generate Password'); ?></button>
 		<div class="wp-pwd hide-if-js">
 			<span class="password-input-wrapper">
-				<input type="password" name="pass1" id="pass1" class="regular-text" value="" autocomplete="off" data-pw="<?php echo esc_attr( wp_generate_password( 24 ) ); ?>" aria-describedby="pass-strength-result" />
+				<input type="password" name="pass1" id="pass1" class="regular-text" value="" autocomplete="off" data-pw="<?php echo esc_attr(wp_generate_password(24)); ?>" aria-describedby="pass-strength-result" />
 			</span>
-			<button type="button" class="button button-secondary wp-hide-pw hide-if-no-js" data-toggle="0" aria-label="<?php esc_attr_e( 'Hide password' ); ?>">
+			<button type="button" class="button button-secondary wp-hide-pw hide-if-no-js" data-toggle="0" aria-label="<?php esc_attr_e('Hide password'); ?>">
 				<span class="dashicons dashicons-hidden"></span>
-				<span class="text"><?php _e( 'Hide' ); ?></span>
+				<span class="text"><?php _e('Hide'); ?></span>
 			</button>
-			<button type="button" class="button button-secondary wp-cancel-pw hide-if-no-js" data-toggle="0" aria-label="<?php esc_attr_e( 'Cancel password change' ); ?>">
-				<span class="text"><?php _e( 'Cancel' ); ?></span>
+			<button type="button" class="button button-secondary wp-cancel-pw hide-if-no-js" data-toggle="0" aria-label="<?php esc_attr_e('Cancel password change'); ?>">
+				<span class="text"><?php _e('Cancel'); ?></span>
 			</button>
 			<div style="display:none" id="pass-strength-result" aria-live="polite"></div>
 		</div>
 	</td>
 </tr>
 <tr class="user-pass2-wrap hide-if-js">
-	<th scope="row"><label for="pass2"><?php _e( 'Repeat New Password' ); ?></label></th>
+	<th scope="row"><label for="pass2"><?php _e('Repeat New Password'); ?></label></th>
 	<td>
 	<input name="pass2" type="password" id="pass2" class="regular-text" value="" autocomplete="off" />
-	<p class="description"><?php _e( 'Type your new password again.' ); ?></p>
+	<p class="description"><?php _e('Type your new password again.'); ?></p>
 	</td>
 </tr>
 <tr class="pw-weak">
-	<th><?php _e( 'Confirm Password' ); ?></th>
+	<th><?php _e('Confirm Password'); ?></th>
 	<td>
 		<label>
 			<input type="checkbox" name="pw_weak" class="pw-checkbox" />
-			<span id="pw-weak-text-label"><?php _e( 'Confirm use of potentially weak password' ); ?></span>
+			<span id="pw-weak-text-label"><?php _e('Confirm use of potentially weak password'); ?></span>
 		</label>
 	</td>
 </tr>
 <?php endif; ?>
 
 <?php
-if ( IS_PROFILE_PAGE && count( $sessions->get_all() ) === 1 ) : ?>
+if (IS_PROFILE_PAGE && count($sessions->get_all()) === 1) : ?>
 	<tr class="user-sessions-wrap hide-if-no-js">
-		<th><?php _e( 'Sessions' ); ?></th>
+		<th><?php _e('Sessions'); ?></th>
 		<td aria-live="assertive">
-			<div class="destroy-sessions"><button type="button" disabled class="button button-secondary"><?php _e( 'Log Out Everywhere Else' ); ?></button></div>
+			<div class="destroy-sessions"><button type="button" disabled class="button button-secondary"><?php _e('Log Out Everywhere Else'); ?></button></div>
 			<p class="description">
-				<?php _e( 'You are only logged in at this location.' ); ?>
+				<?php _e('You are only logged in at this location.'); ?>
 			</p>
 		</td>
 	</tr>
-<?php elseif ( IS_PROFILE_PAGE && count( $sessions->get_all() ) > 1 ) : ?>
+<?php elseif (IS_PROFILE_PAGE && count($sessions->get_all()) > 1) : ?>
 	<tr class="user-sessions-wrap hide-if-no-js">
-		<th><?php _e( 'Sessions' ); ?></th>
+		<th><?php _e('Sessions'); ?></th>
 		<td aria-live="assertive">
-			<div class="destroy-sessions"><button type="button" class="button button-secondary" id="destroy-sessions"><?php _e( 'Log Out Everywhere Else' ); ?></button></div>
+			<div class="destroy-sessions"><button type="button" class="button button-secondary" id="destroy-sessions"><?php _e('Log Out Everywhere Else'); ?></button></div>
 			<p class="description">
-				<?php _e( 'Did you lose your phone or leave your account logged in at a public computer? You can log out everywhere else, and stay logged in here.' ); ?>
+				<?php _e('Did you lose your phone or leave your account logged in at a public computer? You can log out everywhere else, and stay logged in here.'); ?>
 			</p>
 		</td>
 	</tr>
-<?php elseif ( ! IS_PROFILE_PAGE && $sessions->get_all() ) : ?>
+<?php elseif ( ! IS_PROFILE_PAGE && $sessions->get_all()) : ?>
 	<tr class="user-sessions-wrap hide-if-no-js">
-		<th><?php _e( 'Sessions' ); ?></th>
+		<th><?php _e('Sessions'); ?></th>
 		<td>
-			<p><button type="button" class="button button-secondary" id="destroy-sessions"><?php _e( 'Log Out Everywhere' ); ?></button></p>
+			<p><button type="button" class="button button-secondary" id="destroy-sessions"><?php _e('Log Out Everywhere'); ?></button></p>
 			<p class="description">
 				<?php
 				/* translators: 1: User's display name. */
-				printf( __( 'Log %s out of all locations.' ), $profileuser->display_name );
+				printf(__('Log %s out of all locations.'), $profileuser->display_name);
 				?>
 			</p>
 		</td>
@@ -576,7 +576,7 @@ 
 </table>
 
 <?php
-	if ( IS_PROFILE_PAGE ) {
+	if (IS_PROFILE_PAGE) {
 		/**
 		 * Fires after the 'About Yourself' settings table on the 'Your Profile' editing screen.
 		 *
@@ -586,7 +586,7 @@ 
 		 *
 		 * @param WP_User $profileuser The current WP_User object.
 		 */
-		do_action( 'show_user_profile', $profileuser );
+		do_action('show_user_profile', $profileuser);
 	} else {
 		/**
 		 * Fires after the 'About the User' settings table on the 'Edit User' screen.
@@ -595,7 +595,7 @@ 
 		 *
 		 * @param WP_User $profileuser The current WP_User object.
 		 */
-		do_action( 'edit_user_profile', $profileuser );
+		do_action('edit_user_profile', $profileuser);
 	}
 ?>
 
@@ -612,21 +612,21 @@ 
  * @param bool    $enable      Whether to display the capabilities. Default true.
  * @param WP_User $profileuser The current WP_User object.
  */
-if ( count( $profileuser->caps ) > count( $profileuser->roles )
-	&& apply_filters( 'additional_capabilities_display', true, $profileuser )
+if (count($profileuser->caps) > count($profileuser->roles)
+	&& apply_filters('additional_capabilities_display', true, $profileuser)
 ) : ?>
-<h2><?php _e( 'Additional Capabilities' ); ?></h2>
+<h2><?php _e('Additional Capabilities'); ?></h2>
 <table class="form-table">
 <tr class="user-capabilities-wrap">
-	<th scope="row"><?php _e( 'Capabilities' ); ?></th>
+	<th scope="row"><?php _e('Capabilities'); ?></th>
 	<td>
 <?php
 	$output = '';
-	foreach ( $profileuser->caps as $cap => $value ) {
-		if ( ! $wp_roles->is_role( $cap ) ) {
-			if ( '' != $output )
+	foreach ($profileuser->caps as $cap => $value) {
+		if ( ! $wp_roles->is_role($cap)) {
+			if ('' != $output)
 				$output .= ', ';
-			$output .= $value ? $cap : sprintf( __( 'Denied: %s' ), $cap );
+			$output .= $value ? $cap : sprintf(__('Denied: %s'), $cap);
 		}
 	}
 	echo $output;
@@ -639,7 +639,7 @@ 
 <input type="hidden" name="action" value="update" />
 <input type="hidden" name="user_id" id="user_id" value="<?php echo esc_attr($user_id); ?>" />
 
-<?php submit_button( IS_PROFILE_PAGE ? __('Update Profile') : __('Update User') ); ?>
+<?php submit_button(IS_PROFILE_PAGE ? __('Update Profile') : __('Update User')); ?>
 
 </form>
 </div>
@@ -653,4 +653,4 @@ 
 	}
 </script>
 <?php
-include( ABSPATH . 'wp-admin/admin-footer.php');
+include(ABSPATH.'wp-admin/admin-footer.php');

src/wp-admin/async-upload.php

Spacing +43 added lines, -43 removed lines

@@ -6,70 +6,70 @@ 
  * @subpackage Administration
  */
 
-if ( isset( $_REQUEST['action'] ) && 'upload-attachment' === $_REQUEST['action'] ) {
-	define( 'DOING_AJAX', true );
+if (isset($_REQUEST['action']) && 'upload-attachment' === $_REQUEST['action']) {
+	define('DOING_AJAX', true);
 }
 
-if ( ! defined( 'WP_ADMIN' ) ) {
-	define( 'WP_ADMIN', true );
+if ( ! defined('WP_ADMIN')) {
+	define('WP_ADMIN', true);
 }
 
-if ( defined('ABSPATH') )
-	require_once(ABSPATH . 'wp-load.php');
+if (defined('ABSPATH'))
+	require_once(ABSPATH.'wp-load.php');
 else
-	require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
+	require_once(dirname(dirname(__FILE__)).'/wp-load.php');
 
-if ( ! ( isset( $_REQUEST['action'] ) && 'upload-attachment' == $_REQUEST['action'] ) ) {
+if ( ! (isset($_REQUEST['action']) && 'upload-attachment' == $_REQUEST['action'])) {
 	// Flash often fails to send cookies with the POST or upload, so we need to pass it in GET or POST instead
-	if ( is_ssl() && empty($_COOKIE[SECURE_AUTH_COOKIE]) && !empty($_REQUEST['auth_cookie']) )
+	if (is_ssl() && empty($_COOKIE[SECURE_AUTH_COOKIE]) && ! empty($_REQUEST['auth_cookie']))
 		$_COOKIE[SECURE_AUTH_COOKIE] = $_REQUEST['auth_cookie'];
-	elseif ( empty($_COOKIE[AUTH_COOKIE]) && !empty($_REQUEST['auth_cookie']) )
+	elseif (empty($_COOKIE[AUTH_COOKIE]) && ! empty($_REQUEST['auth_cookie']))
 		$_COOKIE[AUTH_COOKIE] = $_REQUEST['auth_cookie'];
-	if ( empty($_COOKIE[LOGGED_IN_COOKIE]) && !empty($_REQUEST['logged_in_cookie']) )
+	if (empty($_COOKIE[LOGGED_IN_COOKIE]) && ! empty($_REQUEST['logged_in_cookie']))
 		$_COOKIE[LOGGED_IN_COOKIE] = $_REQUEST['logged_in_cookie'];
 	unset($current_user);
 }
 
-require_once( ABSPATH . 'wp-admin/admin.php' );
+require_once(ABSPATH.'wp-admin/admin.php');
 
-header( 'Content-Type: text/html; charset=' . get_option( 'blog_charset' ) );
+header('Content-Type: text/html; charset='.get_option('blog_charset'));
 
-if ( isset( $_REQUEST['action'] ) && 'upload-attachment' === $_REQUEST['action'] ) {
-	include( ABSPATH . 'wp-admin/includes/ajax-actions.php' );
+if (isset($_REQUEST['action']) && 'upload-attachment' === $_REQUEST['action']) {
+	include(ABSPATH.'wp-admin/includes/ajax-actions.php');
 
 	send_nosniff_header();
 	nocache_headers();
 
 	wp_ajax_upload_attachment();
-	die( '0' );
+	die('0');
 }
 
-if ( ! current_user_can( 'upload_files' ) ) {
-	wp_die( __( 'Sorry, you are not allowed to upload files.' ) );
+if ( ! current_user_can('upload_files')) {
+	wp_die(__('Sorry, you are not allowed to upload files.'));
 }
 
 // just fetch the detail form for that attachment
-if ( isset($_REQUEST['attachment_id']) && ($id = intval($_REQUEST['attachment_id'])) && $_REQUEST['fetch'] ) {
-	$post = get_post( $id );
-	if ( 'attachment' != $post->post_type )
-		wp_die( __( 'Unknown post type.' ) );
-	if ( ! current_user_can( 'edit_post', $id ) )
-		wp_die( __( 'Sorry, you are not allowed to edit this item.' ) );
-
-	switch ( $_REQUEST['fetch'] ) {
+if (isset($_REQUEST['attachment_id']) && ($id = intval($_REQUEST['attachment_id'])) && $_REQUEST['fetch']) {
+	$post = get_post($id);
+	if ('attachment' != $post->post_type)
+		wp_die(__('Unknown post type.'));
+	if ( ! current_user_can('edit_post', $id))
+		wp_die(__('Sorry, you are not allowed to edit this item.'));
+
+	switch ($_REQUEST['fetch']) {
 		case 3 :
-			if ( $thumb_url = wp_get_attachment_image_src( $id, 'thumbnail', true ) )
-				echo '<img class="pinkynail" src="' . esc_url( $thumb_url[0] ) . '" alt="" />';
-			echo '<a class="edit-attachment" href="' . esc_url( get_edit_post_link( $id ) ) . '" target="_blank">' . _x( 'Edit', 'media item' ) . '</a>';
+			if ($thumb_url = wp_get_attachment_image_src($id, 'thumbnail', true))
+				echo '<img class="pinkynail" src="'.esc_url($thumb_url[0]).'" alt="" />';
+			echo '<a class="edit-attachment" href="'.esc_url(get_edit_post_link($id)).'" target="_blank">'._x('Edit', 'media item').'</a>';
 
 			// Title shouldn't ever be empty, but use filename just in case.
-			$file = get_attached_file( $post->ID );
-			$title = $post->post_title ? $post->post_title : wp_basename( $file );
-			echo '<div class="filename new"><span class="title">' . esc_html( wp_html_excerpt( $title, 60, '&hellip;' ) ) . '</span></div>';
+			$file = get_attached_file($post->ID);
+			$title = $post->post_title ? $post->post_title : wp_basename($file);
+			echo '<div class="filename new"><span class="title">'.esc_html(wp_html_excerpt($title, 60, '&hellip;')).'</span></div>';
 			break;
 		case 2 :
 			add_filter('attachment_fields_to_edit', 'media_single_attachment_fields_to_edit', 10, 2);
-			echo get_media_item($id, array( 'send' => false, 'delete' => true ));
+			echo get_media_item($id, array('send' => false, 'delete' => true));
 			break;
 		default:
 			add_filter('attachment_fields_to_edit', 'media_post_single_attachment_fields_to_edit', 10, 2);
@@ -82,22 +82,22 @@ 
 check_admin_referer('media-form');
 
 $post_id = 0;
-if ( isset( $_REQUEST['post_id'] ) ) {
-	$post_id = absint( $_REQUEST['post_id'] );
-	if ( ! get_post( $post_id ) || ! current_user_can( 'edit_post', $post_id ) )
+if (isset($_REQUEST['post_id'])) {
+	$post_id = absint($_REQUEST['post_id']);
+	if ( ! get_post($post_id) || ! current_user_can('edit_post', $post_id))
 		$post_id = 0;
 }
 
-$id = media_handle_upload( 'async-upload', $post_id );
-if ( is_wp_error($id) ) {
+$id = media_handle_upload('async-upload', $post_id);
+if (is_wp_error($id)) {
 	echo '<div class="error-div error">
-	<a class="dismiss" href="#" onclick="jQuery(this).parents(\'div.media-item\').slideUp(200, function(){jQuery(this).remove();});">' . __('Dismiss') . '</a>
-	<strong>' . sprintf(__('&#8220;%s&#8221; has failed to upload.'), esc_html($_FILES['async-upload']['name']) ) . '</strong><br />' .
-	esc_html($id->get_error_message()) . '</div>';
+	<a class="dismiss" href="#" onclick="jQuery(this).parents(\'div.media-item\').slideUp(200, function(){jQuery(this).remove();});">' . __('Dismiss').'</a>
+	<strong>' . sprintf(__('&#8220;%s&#8221; has failed to upload.'), esc_html($_FILES['async-upload']['name'])).'</strong><br />'.
+	esc_html($id->get_error_message()).'</div>';
 	exit;
 }
 
-if ( $_REQUEST['short'] ) {
+if ($_REQUEST['short']) {
 	// Short form response - attachment ID only.
 	echo $id;
 } else {
@@ -114,5 +114,5 @@ 
 	 *
 	 * @param int $id Uploaded attachment ID.
 	 */
-	echo apply_filters( "async_upload_{$type}", $id );
+	echo apply_filters("async_upload_{$type}", $id);
 }

Braces +24 added lines, -17 removed lines

@@ -14,19 +14,22 @@ 
 	define( 'WP_ADMIN', true );
 }
 
-if ( defined('ABSPATH') )
+if ( defined('ABSPATH') ) {
 	require_once(ABSPATH . 'wp-load.php');
-else
+} else {
 	require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
+}
 
 if ( ! ( isset( $_REQUEST['action'] ) && 'upload-attachment' == $_REQUEST['action'] ) ) {
 	// Flash often fails to send cookies with the POST or upload, so we need to pass it in GET or POST instead
-	if ( is_ssl() && empty($_COOKIE[SECURE_AUTH_COOKIE]) && !empty($_REQUEST['auth_cookie']) )
-		$_COOKIE[SECURE_AUTH_COOKIE] = $_REQUEST['auth_cookie'];
-	elseif ( empty($_COOKIE[AUTH_COOKIE]) && !empty($_REQUEST['auth_cookie']) )
-		$_COOKIE[AUTH_COOKIE] = $_REQUEST['auth_cookie'];
-	if ( empty($_COOKIE[LOGGED_IN_COOKIE]) && !empty($_REQUEST['logged_in_cookie']) )
-		$_COOKIE[LOGGED_IN_COOKIE] = $_REQUEST['logged_in_cookie'];
+	if ( is_ssl() && empty($_COOKIE[SECURE_AUTH_COOKIE]) && !empty($_REQUEST['auth_cookie']) ) {
+			$_COOKIE[SECURE_AUTH_COOKIE] = $_REQUEST['auth_cookie'];
+	} elseif ( empty($_COOKIE[AUTH_COOKIE]) && !empty($_REQUEST['auth_cookie']) ) {
+			$_COOKIE[AUTH_COOKIE] = $_REQUEST['auth_cookie'];
+	}
+	if ( empty($_COOKIE[LOGGED_IN_COOKIE]) && !empty($_REQUEST['logged_in_cookie']) ) {
+			$_COOKIE[LOGGED_IN_COOKIE] = $_REQUEST['logged_in_cookie'];
+	}
 	unset($current_user);
 }
 
@@ -51,15 +54,18 @@ 
 // just fetch the detail form for that attachment
 if ( isset($_REQUEST['attachment_id']) && ($id = intval($_REQUEST['attachment_id'])) && $_REQUEST['fetch'] ) {
 	$post = get_post( $id );
-	if ( 'attachment' != $post->post_type )
-		wp_die( __( 'Unknown post type.' ) );
-	if ( ! current_user_can( 'edit_post', $id ) )
-		wp_die( __( 'Sorry, you are not allowed to edit this item.' ) );
+	if ( 'attachment' != $post->post_type ) {
+			wp_die( __( 'Unknown post type.' ) );
+	}
+	if ( ! current_user_can( 'edit_post', $id ) ) {
+			wp_die( __( 'Sorry, you are not allowed to edit this item.' ) );
+	}
 
 	switch ( $_REQUEST['fetch'] ) {
 		case 3 :
-			if ( $thumb_url = wp_get_attachment_image_src( $id, 'thumbnail', true ) )
-				echo '<img class="pinkynail" src="' . esc_url( $thumb_url[0] ) . '" alt="" />';
+			if ( $thumb_url = wp_get_attachment_image_src( $id, 'thumbnail', true ) ) {
+							echo '<img class="pinkynail" src="' . esc_url( $thumb_url[0] ) . '" alt="" />';
+			}
 			echo '<a class="edit-attachment" href="' . esc_url( get_edit_post_link( $id ) ) . '" target="_blank">' . _x( 'Edit', 'media item' ) . '</a>';
 
 			// Title shouldn't ever be empty, but use filename just in case.
@@ -84,9 +90,10 @@ 
 $post_id = 0;
 if ( isset( $_REQUEST['post_id'] ) ) {
 	$post_id = absint( $_REQUEST['post_id'] );
-	if ( ! get_post( $post_id ) || ! current_user_can( 'edit_post', $post_id ) )
-		$post_id = 0;
-}
+	if ( ! get_post( $post_id ) || ! current_user_can( 'edit_post', $post_id ) ) {
+			$post_id = 0;
+	}
+	}
 
 $id = media_handle_upload( 'async-upload', $post_id );
 if ( is_wp_error($id) ) {

src/wp-admin/update-core.php

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( __( 'Sorry, you are not allowed to update this site.' ) );
+if ( ! current_user_can('update_core') && ! current_user_can('update_themes') && ! current_user_can('update_plugins'))
+	wp_die(__('Sorry, you are not allowed 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,82 +222,82 @@ 
 
 	$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_url = self_admin_url('plugin-install.php?tab=plugin-information&plugin='.$plugin_data->update->slug.'&section=changelog&TB_iframe=true&width=640&height=662');
 		$details = sprintf(
 			'<a href="%1$s" class="thickbox open-plugin-details-modal" aria-label="%2$s">%3$s</a>',
-			esc_url( $details_url ),
+			esc_url($details_url),
 			/* translators: 1: plugin name, 2: version number */
-			esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $plugin_data->Name, $plugin_data->update->new_version ) ),
+			esc_attr(sprintf(__('View %1$s version %2$s details'), $plugin_data->Name, $plugin_data->update->new_version)),
 			/* translators: %s: plugin version */
-			sprintf( __( 'View version %s details.' ), $plugin_data->update->new_version )
+			sprintf(__('View version %s details.'), $plugin_data->update->new_version)
 		);
 
-		$checkbox_id = "checkbox_" . md5( $plugin_data->Name );
+		$checkbox_id = "checkbox_".md5($plugin_data->Name);
 		?>
 		<tr>
 			<td class="check-column">
-				<input type="checkbox" name="checked[]" id="<?php echo $checkbox_id; ?>" value="<?php echo esc_attr( $plugin_file ); ?>" />
+				<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>
@@ -306,11 +306,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>
@@ -322,7 +322,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>
@@ -336,50 +336,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']
 					);
 				?>
@@ -393,7 +393,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>
@@ -407,21 +407,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
 }
@@ -435,76 +435,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
 }
@@ -513,13 +513,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;
 }
 
@@ -527,21 +527,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';
 }
@@ -549,47 +549,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.');
@@ -598,129 +598,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( __( 'Sorry, you are not allowed to update this site.' ) );
+	if ( ! current_user_can('update_core'))
+		wp_die(__('Sorry, you are not allowed 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( __( 'Sorry, you are not allowed to update this site.' ) );
+	if ( ! current_user_can('update_plugins'))
+		wp_die(__('Sorry, you are not allowed 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( __( 'Sorry, you are not allowed to update this site.' ) );
+	if ( ! current_user_can('update_themes'))
+		wp_die(__('Sorry, you are not allowed 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( __( 'Sorry, you are not allowed to update this site.' ) );
+	if ( ! current_user_can('update_core') && ! current_user_can('update_plugins') && ! current_user_can('update_themes'))
+		wp_die(__('Sorry, you are not allowed 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 {
 	/**
@@ -732,5 +732,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( __( 'Sorry, you are not allowed 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>
@@ -440,17 +451,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.
@@ -474,14 +487,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' );
 
@@ -492,8 +507,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;
 	}
@@ -516,8 +532,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;
@@ -530,8 +547,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;
@@ -589,10 +607,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>';
 	}
 
@@ -602,14 +621,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.
@@ -622,32 +645,37 @@ 
 
 } elseif ( 'do-core-upgrade' == $action || 'do-core-reinstall' == $action ) {
 
-	if ( ! current_user_can( 'update_core' ) )
-		wp_die( __( 'Sorry, you are not allowed to update this site.' ) );
+	if ( ! current_user_can( 'update_core' ) ) {
+			wp_die( __( 'Sorry, you are not allowed 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( __( 'Sorry, you are not allowed to update this site.' ) );
+	if ( ! current_user_can( 'update_plugins' ) ) {
+			wp_die( __( 'Sorry, you are not allowed to update this site.' ) );
+	}
 
 	check_admin_referer('upgrade-core');
 
@@ -674,8 +702,9 @@ 
 
 } elseif ( 'do-theme-upgrade' == $action ) {
 
-	if ( ! current_user_can( 'update_themes' ) )
-		wp_die( __( 'Sorry, you are not allowed to update this site.' ) );
+	if ( ! current_user_can( 'update_themes' ) ) {
+			wp_die( __( 'Sorry, you are not allowed to update this site.' ) );
+	}
 
 	check_admin_referer('upgrade-core');
 
@@ -704,8 +733,9 @@ 
 
 } elseif ( 'do-translation-upgrade' == $action ) {
 
-	if ( ! current_user_can( 'update_core' ) && ! current_user_can( 'update_plugins' ) && ! current_user_can( 'update_themes' ) )
-		wp_die( __( 'Sorry, you are not allowed to update this site.' ) );
+	if ( ! current_user_can( 'update_core' ) && ! current_user_can( 'update_plugins' ) && ! current_user_can( 'update_themes' ) ) {
+			wp_die( __( 'Sorry, you are not allowed to update this site.' ) );
+	}
 
 	check_admin_referer( 'upgrade-translations' );