ntwb / wordpress

src/wp-admin/includes/dashboard.php

Indentation +7 added lines, -7 removed lines

@@ -1355,13 +1355,13 @@
 	}
 
 	/**
-	* Filters the notice output for the 'Browse Happy' nag meta box.
-	*
-	* @since 3.2.0
-	*
-	* @param string $notice   The notice content.
-	* @param array  $response An array containing web browser information.
-	*/
+	 * Filters the notice output for the 'Browse Happy' nag meta box.
+	 *
+	 * @since 3.2.0
+	 *
+	 * @param string $notice   The notice content.
+	 * @param array  $response An array containing web browser information.
+	 */
 	echo apply_filters( 'browse-happy-notice', $notice, $response );
 }
 

Spacing +367 added lines, -367 removed lines

@@ -26,43 +26,43 @@ 
 
 	$response = wp_check_browser_version();
 
-	if ( $response && $response['upgrade'] ) {
-		add_filter( 'postbox_classes_dashboard_dashboard_browser_nag', 'dashboard_browser_nag_class' );
-		if ( $response['insecure'] )
-			wp_add_dashboard_widget( 'dashboard_browser_nag', __( 'You are using an insecure browser!' ), 'wp_dashboard_browser_nag' );
+	if ($response && $response['upgrade']) {
+		add_filter('postbox_classes_dashboard_dashboard_browser_nag', 'dashboard_browser_nag_class');
+		if ($response['insecure'])
+			wp_add_dashboard_widget('dashboard_browser_nag', __('You are using an insecure browser!'), 'wp_dashboard_browser_nag');
 		else
-			wp_add_dashboard_widget( 'dashboard_browser_nag', __( 'Your browser is out of date!' ), 'wp_dashboard_browser_nag' );
+			wp_add_dashboard_widget('dashboard_browser_nag', __('Your browser is out of date!'), 'wp_dashboard_browser_nag');
 	}
 
 	// Right Now
-	if ( is_blog_admin() && current_user_can('edit_posts') )
-		wp_add_dashboard_widget( 'dashboard_right_now', __( 'At a Glance' ), 'wp_dashboard_right_now' );
+	if (is_blog_admin() && current_user_can('edit_posts'))
+		wp_add_dashboard_widget('dashboard_right_now', __('At a Glance'), 'wp_dashboard_right_now');
 
-	if ( is_network_admin() )
-		wp_add_dashboard_widget( 'network_dashboard_right_now', __( 'Right Now' ), 'wp_network_dashboard_right_now' );
+	if (is_network_admin())
+		wp_add_dashboard_widget('network_dashboard_right_now', __('Right Now'), 'wp_network_dashboard_right_now');
 
 	// Activity Widget
-	if ( is_blog_admin() ) {
-		wp_add_dashboard_widget( 'dashboard_activity', __( 'Activity' ), 'wp_dashboard_site_activity' );
+	if (is_blog_admin()) {
+		wp_add_dashboard_widget('dashboard_activity', __('Activity'), 'wp_dashboard_site_activity');
 	}
 
 	// QuickPress Widget
-	if ( is_blog_admin() && current_user_can( get_post_type_object( 'post' )->cap->create_posts ) ) {
-		$quick_draft_title = sprintf( '<span class="hide-if-no-js">%1$s</span> <span class="hide-if-js">%2$s</span>', __( 'Quick Draft' ), __( 'Your Recent Drafts' ) );
-		wp_add_dashboard_widget( 'dashboard_quick_press', $quick_draft_title, 'wp_dashboard_quick_press' );
+	if (is_blog_admin() && current_user_can(get_post_type_object('post')->cap->create_posts)) {
+		$quick_draft_title = sprintf('<span class="hide-if-no-js">%1$s</span> <span class="hide-if-js">%2$s</span>', __('Quick Draft'), __('Your Recent Drafts'));
+		wp_add_dashboard_widget('dashboard_quick_press', $quick_draft_title, 'wp_dashboard_quick_press');
 	}
 
 	// WordPress Events and News
-	wp_add_dashboard_widget( 'dashboard_primary', __( 'WordPress Events and News' ), 'wp_dashboard_events_news' );
+	wp_add_dashboard_widget('dashboard_primary', __('WordPress Events and News'), 'wp_dashboard_events_news');
 
-	if ( is_network_admin() ) {
+	if (is_network_admin()) {
 
 		/**
 		 * Fires after core widgets for the Network Admin dashboard have been registered.
 		 *
 		 * @since 3.1.0
 		 */
-		do_action( 'wp_network_dashboard_setup' );
+		do_action('wp_network_dashboard_setup');
 
 		/**
 		 * Filters the list of widgets to load for the Network Admin dashboard.
@@ -71,15 +71,15 @@ 
 		 *
 		 * @param array $dashboard_widgets An array of dashboard widgets.
 		 */
-		$dashboard_widgets = apply_filters( 'wp_network_dashboard_widgets', array() );
-	} elseif ( is_user_admin() ) {
+		$dashboard_widgets = apply_filters('wp_network_dashboard_widgets', array());
+	} elseif (is_user_admin()) {
 
 		/**
 		 * Fires after core widgets for the User Admin dashboard have been registered.
 		 *
 		 * @since 3.1.0
 		 */
-		do_action( 'wp_user_dashboard_setup' );
+		do_action('wp_user_dashboard_setup');
 
 		/**
 		 * Filters the list of widgets to load for the User Admin dashboard.
@@ -88,7 +88,7 @@ 
 		 *
 		 * @param array $dashboard_widgets An array of dashboard widgets.
 		 */
-		$dashboard_widgets = apply_filters( 'wp_user_dashboard_widgets', array() );
+		$dashboard_widgets = apply_filters('wp_user_dashboard_widgets', array());
 	} else {
 
 		/**
@@ -96,7 +96,7 @@ 
 		 *
 		 * @since 2.5.0
 		 */
-		do_action( 'wp_dashboard_setup' );
+		do_action('wp_dashboard_setup');
 
 		/**
 		 * Filters the list of widgets to load for the admin dashboard.
@@ -105,28 +105,28 @@ 
 		 *
 		 * @param array $dashboard_widgets An array of dashboard widgets.
 		 */
-		$dashboard_widgets = apply_filters( 'wp_dashboard_widgets', array() );
+		$dashboard_widgets = apply_filters('wp_dashboard_widgets', array());
 	}
 
-	foreach ( $dashboard_widgets as $widget_id ) {
-		$name = empty( $wp_registered_widgets[$widget_id]['all_link'] ) ? $wp_registered_widgets[$widget_id]['name'] : $wp_registered_widgets[$widget_id]['name'] . " <a href='{$wp_registered_widgets[$widget_id]['all_link']}' class='edit-box open-box'>" . __('View all') . '</a>';
-		wp_add_dashboard_widget( $widget_id, $name, $wp_registered_widgets[$widget_id]['callback'], $wp_registered_widget_controls[$widget_id]['callback'] );
+	foreach ($dashboard_widgets as $widget_id) {
+		$name = empty($wp_registered_widgets[$widget_id]['all_link']) ? $wp_registered_widgets[$widget_id]['name'] : $wp_registered_widgets[$widget_id]['name']." <a href='{$wp_registered_widgets[$widget_id]['all_link']}' class='edit-box open-box'>".__('View all').'</a>';
+		wp_add_dashboard_widget($widget_id, $name, $wp_registered_widgets[$widget_id]['callback'], $wp_registered_widget_controls[$widget_id]['callback']);
 	}
 
-	if ( 'POST' == $_SERVER['REQUEST_METHOD'] && isset($_POST['widget_id']) ) {
-		check_admin_referer( 'edit-dashboard-widget_' . $_POST['widget_id'], 'dashboard-widget-nonce' );
+	if ('POST' == $_SERVER['REQUEST_METHOD'] && isset($_POST['widget_id'])) {
+		check_admin_referer('edit-dashboard-widget_'.$_POST['widget_id'], 'dashboard-widget-nonce');
 		ob_start(); // hack - but the same hack wp-admin/widgets.php uses
-		wp_dashboard_trigger_widget_control( $_POST['widget_id'] );
+		wp_dashboard_trigger_widget_control($_POST['widget_id']);
 		ob_end_clean();
-		wp_redirect( remove_query_arg( 'edit' ) );
+		wp_redirect(remove_query_arg('edit'));
 		exit;
 	}
 
 	/** This action is documented in wp-admin/edit-form-advanced.php */
-	do_action( 'do_meta_boxes', $screen->id, 'normal', '' );
+	do_action('do_meta_boxes', $screen->id, 'normal', '');
 
 	/** This action is documented in wp-admin/edit-form-advanced.php */
-	do_action( 'do_meta_boxes', $screen->id, 'side', '' );
+	do_action('do_meta_boxes', $screen->id, 'side', '');
 }
 
 /**
@@ -144,41 +144,41 @@ 
  * @param array    $callback_args    Optional. Data that should be set as the $args property of the widget array
  *                                   (which is the second parameter passed to your callback). Default null.
  */
-function wp_add_dashboard_widget( $widget_id, $widget_name, $callback, $control_callback = null, $callback_args = null ) {
+function wp_add_dashboard_widget($widget_id, $widget_name, $callback, $control_callback = null, $callback_args = null) {
 	$screen = get_current_screen();
 	global $wp_dashboard_control_callbacks;
 
-	$private_callback_args = array( '__widget_basename' => $widget_name );
+	$private_callback_args = array('__widget_basename' => $widget_name);
 
-	if ( is_null( $callback_args ) ) {
+	if (is_null($callback_args)) {
 		$callback_args = $private_callback_args;
-	} else if ( is_array( $callback_args ) ) {
-		$callback_args = array_merge( $callback_args, $private_callback_args );
+	} else if (is_array($callback_args)) {
+		$callback_args = array_merge($callback_args, $private_callback_args);
 	}
 
-	if ( $control_callback && current_user_can( 'edit_dashboard' ) && is_callable( $control_callback ) ) {
+	if ($control_callback && current_user_can('edit_dashboard') && is_callable($control_callback)) {
 		$wp_dashboard_control_callbacks[$widget_id] = $control_callback;
-		if ( isset( $_GET['edit'] ) && $widget_id == $_GET['edit'] ) {
-			list($url) = explode( '#', add_query_arg( 'edit', false ), 2 );
-			$widget_name .= ' <span class="postbox-title-action"><a href="' . esc_url( $url ) . '">' . __( 'Cancel' ) . '</a></span>';
+		if (isset($_GET['edit']) && $widget_id == $_GET['edit']) {
+			list($url) = explode('#', add_query_arg('edit', false), 2);
+			$widget_name .= ' <span class="postbox-title-action"><a href="'.esc_url($url).'">'.__('Cancel').'</a></span>';
 			$callback = '_wp_dashboard_control_callback';
 		} else {
-			list($url) = explode( '#', add_query_arg( 'edit', $widget_id ), 2 );
-			$widget_name .= ' <span class="postbox-title-action"><a href="' . esc_url( "$url#$widget_id" ) . '" class="edit-box open-box">' . __( 'Configure' ) . '</a></span>';
+			list($url) = explode('#', add_query_arg('edit', $widget_id), 2);
+			$widget_name .= ' <span class="postbox-title-action"><a href="'.esc_url("$url#$widget_id").'" class="edit-box open-box">'.__('Configure').'</a></span>';
 		}
 	}
 
-	$side_widgets = array( 'dashboard_quick_press', 'dashboard_primary' );
+	$side_widgets = array('dashboard_quick_press', 'dashboard_primary');
 
 	$location = 'normal';
-	if ( in_array($widget_id, $side_widgets) )
+	if (in_array($widget_id, $side_widgets))
 		$location = 'side';
 
 	$priority = 'core';
-	if ( 'dashboard_browser_nag' === $widget_id )
+	if ('dashboard_browser_nag' === $widget_id)
 		$priority = 'high';
 
-	add_meta_box( $widget_id, $widget_name, $callback, $screen, $location, $priority, $callback_args );
+	add_meta_box($widget_id, $widget_name, $callback, $screen, $location, $priority, $callback_args);
 }
 
 /**
@@ -190,12 +190,12 @@ 
  * @param mixed $dashboard
  * @param array $meta_box
  */
-function _wp_dashboard_control_callback( $dashboard, $meta_box ) {
+function _wp_dashboard_control_callback($dashboard, $meta_box) {
 	echo '<form method="post" class="dashboard-widget-control-form wp-clearfix">';
-	wp_dashboard_trigger_widget_control( $meta_box['id'] );
-	wp_nonce_field( 'edit-dashboard-widget_' . $meta_box['id'], 'dashboard-widget-nonce' );
-	echo '<input type="hidden" name="widget_id" value="' . esc_attr($meta_box['id']) . '" />';
-	submit_button( __('Submit') );
+	wp_dashboard_trigger_widget_control($meta_box['id']);
+	wp_nonce_field('edit-dashboard-widget_'.$meta_box['id'], 'dashboard-widget-nonce');
+	echo '<input type="hidden" name="widget_id" value="'.esc_attr($meta_box['id']).'" />';
+	submit_button(__('Submit'));
 	echo '</form>';
 }
 
@@ -206,31 +206,31 @@ 
  */
 function wp_dashboard() {
 	$screen = get_current_screen();
-	$columns = absint( $screen->get_columns() );
+	$columns = absint($screen->get_columns());
 	$columns_css = '';
-	if ( $columns ) {
+	if ($columns) {
 		$columns_css = " columns-$columns";
 	}
 
 ?>
 <div id="dashboard-widgets" class="metabox-holder<?php echo $columns_css; ?>">
 	<div id="postbox-container-1" class="postbox-container">
-	<?php do_meta_boxes( $screen->id, 'normal', '' ); ?>
+	<?php do_meta_boxes($screen->id, 'normal', ''); ?>
 	</div>
 	<div id="postbox-container-2" class="postbox-container">
-	<?php do_meta_boxes( $screen->id, 'side', '' ); ?>
+	<?php do_meta_boxes($screen->id, 'side', ''); ?>
 	</div>
 	<div id="postbox-container-3" class="postbox-container">
-	<?php do_meta_boxes( $screen->id, 'column3', '' ); ?>
+	<?php do_meta_boxes($screen->id, 'column3', ''); ?>
 	</div>
 	<div id="postbox-container-4" class="postbox-container">
-	<?php do_meta_boxes( $screen->id, 'column4', '' ); ?>
+	<?php do_meta_boxes($screen->id, 'column4', ''); ?>
 	</div>
 </div>
 
 <?php
-	wp_nonce_field( 'closedpostboxes', 'closedpostboxesnonce', false );
-	wp_nonce_field( 'meta-box-order', 'meta-box-order-nonce', false );
+	wp_nonce_field('closedpostboxes', 'closedpostboxesnonce', false);
+	wp_nonce_field('meta-box-order', 'meta-box-order-nonce', false);
 
 }
 
@@ -251,42 +251,42 @@ 
 	<ul>
 	<?php
 	// Posts and Pages
-	foreach ( array( 'post', 'page' ) as $post_type ) {
-		$num_posts = wp_count_posts( $post_type );
-		if ( $num_posts && $num_posts->publish ) {
-			if ( 'post' == $post_type ) {
-				$text = _n( '%s Post', '%s Posts', $num_posts->publish );
+	foreach (array('post', 'page') as $post_type) {
+		$num_posts = wp_count_posts($post_type);
+		if ($num_posts && $num_posts->publish) {
+			if ('post' == $post_type) {
+				$text = _n('%s Post', '%s Posts', $num_posts->publish);
 			} else {
-				$text = _n( '%s Page', '%s Pages', $num_posts->publish );
+				$text = _n('%s Page', '%s Pages', $num_posts->publish);
 			}
-			$text = sprintf( $text, number_format_i18n( $num_posts->publish ) );
-			$post_type_object = get_post_type_object( $post_type );
-			if ( $post_type_object && current_user_can( $post_type_object->cap->edit_posts ) ) {
-				printf( '<li class="%1$s-count"><a href="edit.php?post_type=%1$s">%2$s</a></li>', $post_type, $text );
+			$text = sprintf($text, number_format_i18n($num_posts->publish));
+			$post_type_object = get_post_type_object($post_type);
+			if ($post_type_object && current_user_can($post_type_object->cap->edit_posts)) {
+				printf('<li class="%1$s-count"><a href="edit.php?post_type=%1$s">%2$s</a></li>', $post_type, $text);
 			} else {
-				printf( '<li class="%1$s-count"><span>%2$s</span></li>', $post_type, $text );
+				printf('<li class="%1$s-count"><span>%2$s</span></li>', $post_type, $text);
 			}
 
 		}
 	}
 	// Comments
 	$num_comm = wp_count_comments();
-	if ( $num_comm && ( $num_comm->approved || $num_comm->moderated ) ) {
-		$text = sprintf( _n( '%s Comment', '%s Comments', $num_comm->approved ), number_format_i18n( $num_comm->approved ) );
+	if ($num_comm && ($num_comm->approved || $num_comm->moderated)) {
+		$text = sprintf(_n('%s Comment', '%s Comments', $num_comm->approved), number_format_i18n($num_comm->approved));
 		?>
 		<li class="comment-count"><a href="edit-comments.php"><?php echo $text; ?></a></li>
 		<?php
-		$moderated_comments_count_i18n = number_format_i18n( $num_comm->moderated );
+		$moderated_comments_count_i18n = number_format_i18n($num_comm->moderated);
 		/* translators: Number of comments in moderation */
-		$text = sprintf( _nx( '%s in moderation', '%s in moderation', $num_comm->moderated, 'comments' ), $moderated_comments_count_i18n );
+		$text = sprintf(_nx('%s in moderation', '%s in moderation', $num_comm->moderated, 'comments'), $moderated_comments_count_i18n);
 		/* translators: Number of comments in moderation */
-		$aria_label = sprintf( _nx( '%s comment in moderation', '%s comments in moderation', $num_comm->moderated, 'comments' ), $moderated_comments_count_i18n );
+		$aria_label = sprintf(_nx('%s comment in moderation', '%s comments in moderation', $num_comm->moderated, 'comments'), $moderated_comments_count_i18n);
 		?>
 		<li class="comment-mod-count<?php
-			if ( ! $num_comm->moderated ) {
+			if ( ! $num_comm->moderated) {
 				echo ' hidden';
 			}
-		?>"><a href="edit-comments.php?comment_status=moderated" aria-label="<?php esc_attr_e( $aria_label ); ?>"><?php echo $text; ?></a></li>
+		?>"><a href="edit-comments.php?comment_status=moderated" aria-label="<?php esc_attr_e($aria_label); ?>"><?php echo $text; ?></a></li>
 		<?php
 	}
 
@@ -301,10 +301,10 @@ 
 	 *
 	 * @param array $items Array of extra 'At a Glance' widget items.
 	 */
-	$elements = apply_filters( 'dashboard_glance_items', array() );
+	$elements = apply_filters('dashboard_glance_items', array());
 
-	if ( $elements ) {
-		echo '<li>' . implode( "</li>\n<li>", $elements ) . "</li>\n";
+	if ($elements) {
+		echo '<li>'.implode("</li>\n<li>", $elements)."</li>\n";
 	}
 
 	?>
@@ -313,7 +313,7 @@ 
 	update_right_now_message();
 
 	// Check if search engines are asked not to index this site.
-	if ( ! is_network_admin() && ! is_user_admin() && current_user_can( 'manage_options' ) && '0' == get_option( 'blog_public' ) ) {
+	if ( ! is_network_admin() && ! is_user_admin() && current_user_can('manage_options') && '0' == get_option('blog_public')) {
 
 		/**
 		 * Filters the link title attribute for the 'Search Engines Discouraged'
@@ -326,7 +326,7 @@ 
 		 *
 		 * @param string $title Default attribute text.
 		 */
-		$title = apply_filters( 'privacy_on_link_title', '' );
+		$title = apply_filters('privacy_on_link_title', '');
 
 		/**
 		 * Filters the link label for the 'Search Engines Discouraged' message
@@ -338,7 +338,7 @@ 
 		 *
 		 * @param string $content Default text.
 		 */
-		$content = apply_filters( 'privacy_on_link_text' , __( 'Search Engines Discouraged' ) );
+		$content = apply_filters('privacy_on_link_text', __('Search Engines Discouraged'));
 		$title_attr = '' === $title ? '' : " title='$title'";
 
 		echo "<p><a href='options-reading.php'$title_attr>$content</a></p>";
@@ -359,7 +359,7 @@ 
 	 *
 	 * @since 2.5.0
 	 */
-	do_action( 'rightnow_end' );
+	do_action('rightnow_end');
 
 	/**
 	 * Fires at the end of the 'At a Glance' dashboard widget.
@@ -368,11 +368,11 @@ 
 	 *
 	 * @since 2.0.0
 	 */
-	do_action( 'activity_box_end' );
+	do_action('activity_box_end');
 
 	$actions = ob_get_clean();
 
-	if ( !empty( $actions ) ) : ?>
+	if ( ! empty($actions)) : ?>
 	<div class="sub">
 		<?php echo $actions; ?>
 	</div>
@@ -384,28 +384,28 @@ 
  */
 function wp_network_dashboard_right_now() {
 	$actions = array();
-	if ( current_user_can('create_sites') )
-		$actions['create-site'] = '<a href="' . network_admin_url('site-new.php') . '">' . __( 'Create a New Site' ) . '</a>';
-	if ( current_user_can('create_users') )
-		$actions['create-user'] = '<a href="' . network_admin_url('user-new.php') . '">' . __( 'Create a New User' ) . '</a>';
+	if (current_user_can('create_sites'))
+		$actions['create-site'] = '<a href="'.network_admin_url('site-new.php').'">'.__('Create a New Site').'</a>';
+	if (current_user_can('create_users'))
+		$actions['create-user'] = '<a href="'.network_admin_url('user-new.php').'">'.__('Create a New User').'</a>';
 
 	$c_users = get_user_count();
 	$c_blogs = get_blog_count();
 
 	/* translators: 1: Number of users on the network */
-	$user_text = sprintf( _n( '%s user', '%s users', $c_users ), number_format_i18n( $c_users ) );
+	$user_text = sprintf(_n('%s user', '%s users', $c_users), number_format_i18n($c_users));
 	/* translators: 1: Number of sites on the network */
-	$blog_text = sprintf( _n( '%s site', '%s sites', $c_blogs ), number_format_i18n( $c_blogs ) );
+	$blog_text = sprintf(_n('%s site', '%s sites', $c_blogs), number_format_i18n($c_blogs));
 
 	/* translators: 1: Text indicating the number of sites on the network, 2: Text indicating the number of users on the network */
-	$sentence = sprintf( __( 'You have %1$s and %2$s.' ), $blog_text, $user_text );
+	$sentence = sprintf(__('You have %1$s and %2$s.'), $blog_text, $user_text);
 
-	if ( $actions ) {
+	if ($actions) {
 		echo '<ul class="subsubsub">';
-		foreach ( $actions as $class => $action ) {
-			 $actions[ $class ] = "\t<li class='$class'>$action";
+		foreach ($actions as $class => $action) {
+			 $actions[$class] = "\t<li class='$class'>$action";
 		}
-		echo implode( " |</li>\n", $actions ) . "</li>\n";
+		echo implode(" |</li>\n", $actions)."</li>\n";
 		echo '</ul>';
 	}
 ?>
@@ -423,22 +423,22 @@ 
 		 *
 		 * @param null $unused
 		 */
-		do_action( 'wpmuadminresult', '' );
+		do_action('wpmuadminresult', '');
 	?>
 
 	<form action="<?php echo network_admin_url('users.php'); ?>" method="get">
 		<p>
-			<label class="screen-reader-text" for="search-users"><?php _e( 'Search Users' ); ?></label>
+			<label class="screen-reader-text" for="search-users"><?php _e('Search Users'); ?></label>
 			<input type="search" name="s" value="" size="30" autocomplete="off" id="search-users"/>
-			<?php submit_button( __( 'Search Users' ), '', false, false, array( 'id' => 'submit_users' ) ); ?>
+			<?php submit_button(__('Search Users'), '', false, false, array('id' => 'submit_users')); ?>
 		</p>
 	</form>
 
 	<form action="<?php echo network_admin_url('sites.php'); ?>" method="get">
 		<p>
-			<label class="screen-reader-text" for="search-sites"><?php _e( 'Search Sites' ); ?></label>
+			<label class="screen-reader-text" for="search-sites"><?php _e('Search Sites'); ?></label>
 			<input type="search" name="s" value="" size="30" autocomplete="off" id="search-sites"/>
-			<?php submit_button( __( 'Search Sites' ), '', false, false, array( 'id' => 'submit_sites' ) ); ?>
+			<?php submit_button(__('Search Sites'), '', false, false, array('id' => 'submit_sites')); ?>
 		</p>
 	</form>
 <?php
@@ -447,14 +447,14 @@ 
 	 *
 	 * @since MU
 	 */
-	do_action( 'mu_rightnow_end' );
+	do_action('mu_rightnow_end');
 
 	/**
 	 * Fires at the end of the 'Right Now' widget in the Network Admin dashboard.
 	 *
 	 * @since MU
 	 */
-	do_action( 'mu_activity_box_end' );
+	do_action('mu_activity_box_end');
 }
 
 /**
@@ -466,37 +466,37 @@ 
  *
  * @param string $error_msg Optional. Error message. Default false.
  */
-function wp_dashboard_quick_press( $error_msg = false ) {
+function wp_dashboard_quick_press($error_msg = false) {
 	global $post_ID;
 
-	if ( ! current_user_can( 'edit_posts' ) ) {
+	if ( ! current_user_can('edit_posts')) {
 		return;
 	}
 
 	/* Check if a new auto-draft (= no new post_ID) is needed or if the old can be used */
-	$last_post_id = (int) get_user_option( 'dashboard_quick_press_last_post_id' ); // Get the last post_ID
-	if ( $last_post_id ) {
-		$post = get_post( $last_post_id );
-		if ( empty( $post ) || $post->post_status != 'auto-draft' ) { // auto-draft doesn't exists anymore
-			$post = get_default_post_to_edit( 'post', true );
-			update_user_option( get_current_user_id(), 'dashboard_quick_press_last_post_id', (int) $post->ID ); // Save post_ID
+	$last_post_id = (int) get_user_option('dashboard_quick_press_last_post_id'); // Get the last post_ID
+	if ($last_post_id) {
+		$post = get_post($last_post_id);
+		if (empty($post) || $post->post_status != 'auto-draft') { // auto-draft doesn't exists anymore
+			$post = get_default_post_to_edit('post', true);
+			update_user_option(get_current_user_id(), 'dashboard_quick_press_last_post_id', (int) $post->ID); // Save post_ID
 		} else {
 			$post->post_title = ''; // Remove the auto draft title
 		}
 	} else {
-		$post = get_default_post_to_edit( 'post' , true);
+		$post = get_default_post_to_edit('post', true);
 		$user_id = get_current_user_id();
 		// Don't create an option if this is a super admin who does not belong to this site.
-		if ( in_array( get_current_blog_id(), array_keys( get_blogs_of_user( $user_id ) ) ) )
-			update_user_option( $user_id, 'dashboard_quick_press_last_post_id', (int) $post->ID ); // Save post_ID
+		if (in_array(get_current_blog_id(), array_keys(get_blogs_of_user($user_id))))
+			update_user_option($user_id, 'dashboard_quick_press_last_post_id', (int) $post->ID); // Save post_ID
 	}
 
 	$post_ID = (int) $post->ID;
 ?>
 
-	<form name="post" action="<?php echo esc_url( admin_url( 'post.php' ) ); ?>" method="post" id="quick-press" class="initial-form hide-if-no-js">
+	<form name="post" action="<?php echo esc_url(admin_url('post.php')); ?>" method="post" id="quick-press" class="initial-form hide-if-no-js">
 
-		<?php if ( $error_msg ) : ?>
+		<?php if ($error_msg) : ?>
 		<div class="error"><?php echo $error_msg; ?></div>
 		<?php endif; ?>
 
@@ -505,14 +505,14 @@ 
 
 				<?php
 				/** This filter is documented in wp-admin/edit-form-advanced.php */
-				echo apply_filters( 'enter_title_here', __( 'Title' ), $post );
+				echo apply_filters('enter_title_here', __('Title'), $post);
 				?>
 			</label>
 			<input type="text" name="post_title" id="title" autocomplete="off" />
 		</div>
 
 		<div class="textarea-wrap" id="description-wrap">
-			<label class="screen-reader-text prompt" for="content" id="content-prompt-text"><?php _e( 'What&#8217;s on your mind?' ); ?></label>
+			<label class="screen-reader-text prompt" for="content" id="content-prompt-text"><?php _e('What&#8217;s on your mind?'); ?></label>
 			<textarea name="content" id="content" class="mceEditor" rows="3" cols="15" autocomplete="off"></textarea>
 		</div>
 
@@ -520,8 +520,8 @@ 
 			<input type="hidden" name="action" id="quickpost-action" value="post-quickdraft-save" />
 			<input type="hidden" name="post_ID" value="<?php echo $post_ID; ?>" />
 			<input type="hidden" name="post_type" value="post" />
-			<?php wp_nonce_field( 'add-post' ); ?>
-			<?php submit_button( __( 'Save Draft' ), 'primary', 'save', false, array( 'id' => 'save-post' ) ); ?>
+			<?php wp_nonce_field('add-post'); ?>
+			<?php submit_button(__('Save Draft'), 'primary', 'save', false, array('id' => 'save-post')); ?>
 			<br class="clear" />
 		</p>
 
@@ -537,8 +537,8 @@ 
  *
  * @param array $drafts
  */
-function wp_dashboard_recent_drafts( $drafts = false ) {
-	if ( ! $drafts ) {
+function wp_dashboard_recent_drafts($drafts = false) {
+	if ( ! $drafts) {
 		$query_args = array(
 			'post_type'      => 'post',
 			'post_status'    => 'draft',
@@ -555,30 +555,30 @@ 
 		 *
 		 * @param array $query_args The query arguments for the 'Recent Drafts' dashboard widget.
 		 */
-		$query_args = apply_filters( 'dashboard_recent_drafts_query_args', $query_args );
+		$query_args = apply_filters('dashboard_recent_drafts_query_args', $query_args);
 
-		$drafts = get_posts( $query_args );
-		if ( ! $drafts ) {
+		$drafts = get_posts($query_args);
+		if ( ! $drafts) {
 			return;
  		}
  	}
 
 	echo '<div class="drafts">';
-	if ( count( $drafts ) > 3 ) {
-		echo '<p class="view-all"><a href="' . esc_url( admin_url( 'edit.php?post_status=draft' ) ) . '">' . __( 'View all drafts' ) . "</a></p>\n";
+	if (count($drafts) > 3) {
+		echo '<p class="view-all"><a href="'.esc_url(admin_url('edit.php?post_status=draft')).'">'.__('View all drafts')."</a></p>\n";
  	}
-	echo '<h2 class="hide-if-no-js">' . __( 'Your Recent Drafts' ) . "</h2>\n<ul>";
+	echo '<h2 class="hide-if-no-js">'.__('Your Recent Drafts')."</h2>\n<ul>";
 
-	$drafts = array_slice( $drafts, 0, 3 );
-	foreach ( $drafts as $draft ) {
-		$url = get_edit_post_link( $draft->ID );
-		$title = _draft_or_post_title( $draft->ID );
+	$drafts = array_slice($drafts, 0, 3);
+	foreach ($drafts as $draft) {
+		$url = get_edit_post_link($draft->ID);
+		$title = _draft_or_post_title($draft->ID);
 		echo "<li>\n";
 		/* translators: %s: post title */
-		echo '<div class="draft-title"><a href="' . esc_url( $url ) . '" aria-label="' . esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;' ), $title ) ) . '">' . esc_html( $title ) . '</a>';
-		echo '<time datetime="' . get_the_time( 'c', $draft ) . '">' . get_the_time( __( 'F j, Y' ), $draft ) . '</time></div>';
-		if ( $the_content = wp_trim_words( $draft->post_content, 10 ) ) {
-			echo '<p>' . $the_content . '</p>';
+		echo '<div class="draft-title"><a href="'.esc_url($url).'" aria-label="'.esc_attr(sprintf(__('Edit &#8220;%s&#8221;'), $title)).'">'.esc_html($title).'</a>';
+		echo '<time datetime="'.get_the_time('c', $draft).'">'.get_the_time(__('F j, Y'), $draft).'</time></div>';
+		if ($the_content = wp_trim_words($draft->post_content, 10)) {
+			echo '<p>'.$the_content.'</p>';
  		}
 		echo "</li>\n";
  	}
@@ -596,20 +596,20 @@ 
  * @param WP_Comment $comment   The current comment.
  * @param bool       $show_date Optional. Whether to display the date.
  */
-function _wp_dashboard_recent_comments_row( &$comment, $show_date = true ) {
+function _wp_dashboard_recent_comments_row(&$comment, $show_date = true) {
 	$GLOBALS['comment'] = clone $comment;
 
-	if ( $comment->comment_post_ID > 0 ) {
+	if ($comment->comment_post_ID > 0) {
 
-		$comment_post_title = _draft_or_post_title( $comment->comment_post_ID );
-		$comment_post_url = get_the_permalink( $comment->comment_post_ID );
+		$comment_post_title = _draft_or_post_title($comment->comment_post_ID);
+		$comment_post_url = get_the_permalink($comment->comment_post_ID);
 		$comment_post_link = "<a href='$comment_post_url'>$comment_post_title</a>";
 	} else {
 		$comment_post_link = '';
 	}
 
 	$actions_string = '';
-	if ( current_user_can( 'edit_comment', $comment->comment_ID ) ) {
+	if (current_user_can('edit_comment', $comment->comment_ID)) {
 		// Pre-order it: Approve | Reply | Edit | Spam | Trash.
 		$actions = array(
 			'approve' => '', 'unapprove' => '',
@@ -620,28 +620,28 @@ 
 			'view' => '',
 		);
 
-		$del_nonce = esc_html( '_wpnonce=' . wp_create_nonce( "delete-comment_$comment->comment_ID" ) );
-		$approve_nonce = esc_html( '_wpnonce=' . wp_create_nonce( "approve-comment_$comment->comment_ID" ) );
+		$del_nonce = esc_html('_wpnonce='.wp_create_nonce("delete-comment_$comment->comment_ID"));
+		$approve_nonce = esc_html('_wpnonce='.wp_create_nonce("approve-comment_$comment->comment_ID"));
 
-		$approve_url = esc_url( "comment.php?action=approvecomment&p=$comment->comment_post_ID&c=$comment->comment_ID&$approve_nonce" );
-		$unapprove_url = esc_url( "comment.php?action=unapprovecomment&p=$comment->comment_post_ID&c=$comment->comment_ID&$approve_nonce" );
-		$spam_url = esc_url( "comment.php?action=spamcomment&p=$comment->comment_post_ID&c=$comment->comment_ID&$del_nonce" );
-		$trash_url = esc_url( "comment.php?action=trashcomment&p=$comment->comment_post_ID&c=$comment->comment_ID&$del_nonce" );
-		$delete_url = esc_url( "comment.php?action=deletecomment&p=$comment->comment_post_ID&c=$comment->comment_ID&$del_nonce" );
+		$approve_url = esc_url("comment.php?action=approvecomment&p=$comment->comment_post_ID&c=$comment->comment_ID&$approve_nonce");
+		$unapprove_url = esc_url("comment.php?action=unapprovecomment&p=$comment->comment_post_ID&c=$comment->comment_ID&$approve_nonce");
+		$spam_url = esc_url("comment.php?action=spamcomment&p=$comment->comment_post_ID&c=$comment->comment_ID&$del_nonce");
+		$trash_url = esc_url("comment.php?action=trashcomment&p=$comment->comment_post_ID&c=$comment->comment_ID&$del_nonce");
+		$delete_url = esc_url("comment.php?action=deletecomment&p=$comment->comment_post_ID&c=$comment->comment_ID&$del_nonce");
 
-		$actions['approve'] = "<a href='$approve_url' data-wp-lists='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3:new=approved' class='vim-a' aria-label='" . esc_attr__( 'Approve this comment' ) . "'>" . __( 'Approve' ) . '</a>';
-		$actions['unapprove'] = "<a href='$unapprove_url' data-wp-lists='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3:new=unapproved' class='vim-u' aria-label='" . esc_attr__( 'Unapprove this comment' ) . "'>" . __( 'Unapprove' ) . '</a>';
-		$actions['edit'] = "<a href='comment.php?action=editcomment&amp;c={$comment->comment_ID}' aria-label='" . esc_attr__( 'Edit this comment' ) . "'>". __( 'Edit' ) . '</a>';
-		$actions['reply'] = '<a onclick="window.commentReply && commentReply.open(\'' . $comment->comment_ID . '\',\''.$comment->comment_post_ID.'\');return false;" class="vim-r hide-if-no-js" aria-label="' . esc_attr__( 'Reply to this comment' ) . '" href="#">' . __( 'Reply' ) . '</a>';
-		$actions['spam'] = "<a href='$spam_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID::spam=1' class='vim-s vim-destructive' aria-label='" . esc_attr__( 'Mark this comment as spam' ) . "'>" . /* translators: mark as spam link */ _x( 'Spam', 'verb' ) . '</a>';
+		$actions['approve'] = "<a href='$approve_url' data-wp-lists='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3:new=approved' class='vim-a' aria-label='".esc_attr__('Approve this comment')."'>".__('Approve').'</a>';
+		$actions['unapprove'] = "<a href='$unapprove_url' data-wp-lists='dim:the-comment-list:comment-$comment->comment_ID:unapproved:e7e7d3:e7e7d3:new=unapproved' class='vim-u' aria-label='".esc_attr__('Unapprove this comment')."'>".__('Unapprove').'</a>';
+		$actions['edit'] = "<a href='comment.php?action=editcomment&amp;c={$comment->comment_ID}' aria-label='".esc_attr__('Edit this comment')."'>".__('Edit').'</a>';
+		$actions['reply'] = '<a onclick="window.commentReply && commentReply.open(\''.$comment->comment_ID.'\',\''.$comment->comment_post_ID.'\');return false;" class="vim-r hide-if-no-js" aria-label="'.esc_attr__('Reply to this comment').'" href="#">'.__('Reply').'</a>';
+		$actions['spam'] = "<a href='$spam_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID::spam=1' class='vim-s vim-destructive' aria-label='".esc_attr__('Mark this comment as spam')."'>"./* translators: mark as spam link */ _x('Spam', 'verb').'</a>';
 
-		if ( ! EMPTY_TRASH_DAYS ) {
-			$actions['delete'] = "<a href='$delete_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID::trash=1' class='delete vim-d vim-destructive' aria-label='" . esc_attr__( 'Delete this comment permanently' ) . "'>" . __( 'Delete Permanently' ) . '</a>';
+		if ( ! EMPTY_TRASH_DAYS) {
+			$actions['delete'] = "<a href='$delete_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID::trash=1' class='delete vim-d vim-destructive' aria-label='".esc_attr__('Delete this comment permanently')."'>".__('Delete Permanently').'</a>';
 		} else {
-			$actions['trash'] = "<a href='$trash_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID::trash=1' class='delete vim-d vim-destructive' aria-label='" . esc_attr__( 'Move this comment to the Trash' ) . "'>" . _x( 'Trash', 'verb' ) . '</a>';
+			$actions['trash'] = "<a href='$trash_url' data-wp-lists='delete:the-comment-list:comment-$comment->comment_ID::trash=1' class='delete vim-d vim-destructive' aria-label='".esc_attr__('Move this comment to the Trash')."'>"._x('Trash', 'verb').'</a>';
 		}
 
-		$actions['view'] = '<a class="comment-link" href="' . esc_url( get_comment_link( $comment ) ) . '" aria-label="' . esc_attr__( 'View this comment' ) . '">' . __( 'View' ) . '</a>';
+		$actions['view'] = '<a class="comment-link" href="'.esc_url(get_comment_link($comment)).'" aria-label="'.esc_attr__('View this comment').'">'.__('View').'</a>';
 
 		/**
 		 * Filters the action links displayed for each comment in the 'Recent Comments'
@@ -654,19 +654,19 @@ 
 		 *                            'Delete', and 'Trash'.
 		 * @param WP_Comment $comment The comment object.
 		 */
-		$actions = apply_filters( 'comment_row_actions', array_filter($actions), $comment );
+		$actions = apply_filters('comment_row_actions', array_filter($actions), $comment);
 
 		$i = 0;
-		foreach ( $actions as $action => $link ) {
+		foreach ($actions as $action => $link) {
 			++$i;
-			( ( ('approve' == $action || 'unapprove' == $action) && 2 === $i ) || 1 === $i ) ? $sep = '' : $sep = ' | ';
+			((('approve' == $action || 'unapprove' == $action) && 2 === $i) || 1 === $i) ? $sep = '' : $sep = ' | ';
 
 			// Reply and quickedit need a hide-if-no-js span
-			if ( 'reply' == $action || 'quickedit' == $action ) {
+			if ('reply' == $action || 'quickedit' == $action) {
 				$action .= ' hide-if-no-js';
 			}
 
-			if ( 'view' === $action && '1' !== $comment->comment_approved ) {
+			if ('view' === $action && '1' !== $comment->comment_approved) {
 				$action .= ' hidden';
 			}
 			$actions_string .= "<span class='$action'>$sep$link</span>";
@@ -674,30 +674,30 @@ 
 	}
 ?>
 
-		<li id="comment-<?php echo $comment->comment_ID; ?>" <?php comment_class( array( 'comment-item', wp_get_comment_status( $comment ) ), $comment ); ?>>
+		<li id="comment-<?php echo $comment->comment_ID; ?>" <?php comment_class(array('comment-item', wp_get_comment_status($comment)), $comment); ?>>
 
-			<?php echo get_avatar( $comment, 50, 'mystery' ); ?>
+			<?php echo get_avatar($comment, 50, 'mystery'); ?>
 
-			<?php if ( !$comment->comment_type || 'comment' == $comment->comment_type ) : ?>
+			<?php if ( ! $comment->comment_type || 'comment' == $comment->comment_type) : ?>
 
 			<div class="dashboard-comment-wrap has-row-actions">
 			<p class="comment-meta">
 			<?php
 				// Comments might not have a post they relate to, e.g. programmatically created ones.
-				if ( $comment_post_link ) {
+				if ($comment_post_link) {
 					printf(
 						/* translators: 1: comment author, 2: post link, 3: notification if the comment is pending */
-						__( 'From %1$s on %2$s %3$s' ),
-						'<cite class="comment-author">' . get_comment_author_link( $comment ) . '</cite>',
+						__('From %1$s on %2$s %3$s'),
+						'<cite class="comment-author">'.get_comment_author_link($comment).'</cite>',
 						$comment_post_link,
-						'<span class="approve">' . __( '[Pending]' ) . '</span>'
+						'<span class="approve">'.__('[Pending]').'</span>'
 					);
 				} else {
 					printf(
 						/* translators: 1: comment author, 2: notification if the comment is pending */
-						__( 'From %1$s %2$s' ),
-						'<cite class="comment-author">' . get_comment_author_link( $comment ) . '</cite>',
-						'<span class="approve">' . __( '[Pending]' ) . '</span>'
+						__('From %1$s %2$s'),
+						'<cite class="comment-author">'.get_comment_author_link($comment).'</cite>',
+						'<span class="approve">'.__('[Pending]').'</span>'
 					);
 				}
 			?>
@@ -705,45 +705,45 @@ 
 
 			<?php
 			else :
-				switch ( $comment->comment_type ) {
+				switch ($comment->comment_type) {
 					case 'pingback' :
-						$type = __( 'Pingback' );
+						$type = __('Pingback');
 						break;
 					case 'trackback' :
-						$type = __( 'Trackback' );
+						$type = __('Trackback');
 						break;
 					default :
-						$type = ucwords( $comment->comment_type );
+						$type = ucwords($comment->comment_type);
 				}
-				$type = esc_html( $type );
+				$type = esc_html($type);
 			?>
 			<div class="dashboard-comment-wrap has-row-actions">
 			<p class="comment-meta">
 			<?php
 				// Pingbacks, Trackbacks or custom comment types might not have a post they relate to, e.g. programmatically created ones.
-				if ( $comment_post_link ) {
+				if ($comment_post_link) {
 					printf(
 						/* translators: 1: type of comment, 2: post link, 3: notification if the comment is pending */
-						_x( '%1$s on %2$s %3$s', 'dashboard' ),
+						_x('%1$s on %2$s %3$s', 'dashboard'),
 						"<strong>$type</strong>",
 						$comment_post_link,
-						'<span class="approve">' . __( '[Pending]' ) . '</span>'
+						'<span class="approve">'.__('[Pending]').'</span>'
 					);
 				} else {
 					printf(
 						/* translators: 1: type of comment, 2: notification if the comment is pending */
-						_x( '%1$s %2$s', 'dashboard' ),
+						_x('%1$s %2$s', 'dashboard'),
 						"<strong>$type</strong>",
-						'<span class="approve">' . __( '[Pending]' ) . '</span>'
+						'<span class="approve">'.__('[Pending]').'</span>'
 					);
 				}
 			?>
 			</p>
-			<p class="comment-author"><?php comment_author_link( $comment ); ?></p>
+			<p class="comment-author"><?php comment_author_link($comment); ?></p>
 
 			<?php endif; // comment_type ?>
-			<blockquote><p><?php comment_excerpt( $comment ); ?></p></blockquote>
-			<?php if ( $actions_string ) : ?>
+			<blockquote><p><?php comment_excerpt($comment); ?></p></blockquote>
+			<?php if ($actions_string) : ?>
 			<p class="row-actions"><?php echo $actions_string; ?></p>
 			<?php endif; ?>
 			</div>
@@ -761,27 +761,27 @@ 
 
 	echo '<div id="activity-widget">';
 
-	$future_posts = wp_dashboard_recent_posts( array(
+	$future_posts = wp_dashboard_recent_posts(array(
 		'max'     => 5,
 		'status'  => 'future',
 		'order'   => 'ASC',
-		'title'   => __( 'Publishing Soon' ),
+		'title'   => __('Publishing Soon'),
 		'id'      => 'future-posts',
-	) );
-	$recent_posts = wp_dashboard_recent_posts( array(
+	));
+	$recent_posts = wp_dashboard_recent_posts(array(
 		'max'     => 5,
 		'status'  => 'publish',
 		'order'   => 'DESC',
-		'title'   => __( 'Recently Published' ),
+		'title'   => __('Recently Published'),
 		'id'      => 'published-posts',
-	) );
+	));
 
 	$recent_comments = wp_dashboard_recent_comments();
 
-	if ( !$future_posts && !$recent_posts && !$recent_comments ) {
+	if ( ! $future_posts && ! $recent_posts && ! $recent_comments) {
 		echo '<div class="no-activity">';
 		echo '<p class="smiley" aria-hidden="true"></p>';
-		echo '<p>' . __( 'No activity yet!' ) . '</p>';
+		echo '<p>'.__('No activity yet!').'</p>';
 		echo '</div>';
 	}
 
@@ -804,16 +804,16 @@ 
  * }
  * @return bool False if no posts were found. True otherwise.
  */
-function wp_dashboard_recent_posts( $args ) {
+function wp_dashboard_recent_posts($args) {
 	$query_args = array(
 		'post_type'      => 'post',
 		'post_status'    => $args['status'],
 		'orderby'        => 'date',
 		'order'          => $args['order'],
-		'posts_per_page' => intval( $args['max'] ),
+		'posts_per_page' => intval($args['max']),
 		'no_found_rows'  => true,
 		'cache_results'  => false,
-		'perm'           => ( 'future' === $args['status'] ) ? 'editable' : 'readable',
+		'perm'           => ('future' === $args['status']) ? 'editable' : 'readable',
 	);
 
 	/**
@@ -823,47 +823,47 @@ 
 	 *
 	 * @param array $query_args The arguments passed to WP_Query to produce the list of posts.
 	 */
-	$query_args = apply_filters( 'dashboard_recent_posts_query_args', $query_args );
-	$posts = new WP_Query( $query_args );
+	$query_args = apply_filters('dashboard_recent_posts_query_args', $query_args);
+	$posts = new WP_Query($query_args);
 
-	if ( $posts->have_posts() ) {
+	if ($posts->have_posts()) {
 
-		echo '<div id="' . $args['id'] . '" class="activity-block">';
+		echo '<div id="'.$args['id'].'" class="activity-block">';
 
-		echo '<h3>' . $args['title'] . '</h3>';
+		echo '<h3>'.$args['title'].'</h3>';
 
 		echo '<ul>';
 
-		$today    = date( 'Y-m-d', current_time( 'timestamp' ) );
-		$tomorrow = date( 'Y-m-d', strtotime( '+1 day', current_time( 'timestamp' ) ) );
+		$today    = date('Y-m-d', current_time('timestamp'));
+		$tomorrow = date('Y-m-d', strtotime('+1 day', current_time('timestamp')));
 
-		while ( $posts->have_posts() ) {
+		while ($posts->have_posts()) {
 			$posts->the_post();
 
-			$time = get_the_time( 'U' );
-			if ( date( 'Y-m-d', $time ) == $today ) {
-				$relative = __( 'Today' );
-			} elseif ( date( 'Y-m-d', $time ) == $tomorrow ) {
-				$relative = __( 'Tomorrow' );
-			} elseif ( date( 'Y', $time ) !== date( 'Y', current_time( 'timestamp' ) ) ) {
+			$time = get_the_time('U');
+			if (date('Y-m-d', $time) == $today) {
+				$relative = __('Today');
+			} elseif (date('Y-m-d', $time) == $tomorrow) {
+				$relative = __('Tomorrow');
+			} elseif (date('Y', $time) !== date('Y', current_time('timestamp'))) {
 				/* translators: date and time format for recent posts on the dashboard, from a different calendar year, see https://secure.php.net/date */
-				$relative = date_i18n( __( 'M jS Y' ), $time );
+				$relative = date_i18n(__('M jS Y'), $time);
 			} else {
 				/* translators: date and time format for recent posts on the dashboard, see https://secure.php.net/date */
-				$relative = date_i18n( __( 'M jS' ), $time );
+				$relative = date_i18n(__('M jS'), $time);
 			}
 
 			// Use the post edit link for those who can edit, the permalink otherwise.
-			$recent_post_link = current_user_can( 'edit_post', get_the_ID() ) ? get_edit_post_link() : get_permalink();
+			$recent_post_link = current_user_can('edit_post', get_the_ID()) ? get_edit_post_link() : get_permalink();
 
 			$draft_or_post_title = _draft_or_post_title();
 			printf(
 				'<li><span>%1$s</span> <a href="%2$s" aria-label="%3$s">%4$s</a></li>',
 				/* translators: 1: relative date, 2: time */
-				sprintf( _x( '%1$s, %2$s', 'dashboard' ), $relative, get_the_time() ),
+				sprintf(_x('%1$s, %2$s', 'dashboard'), $relative, get_the_time()),
 				$recent_post_link,
 				/* translators: %s: post title */
-				esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;' ), $draft_or_post_title ) ),
+				esc_attr(sprintf(__('Edit &#8220;%s&#8221;'), $draft_or_post_title)),
 				$draft_or_post_title
 			);
 		}
@@ -888,7 +888,7 @@ 
  * @param int $total_items Optional. Number of comments to query. Default 5.
  * @return bool False if no comments were found. True otherwise.
  */
-function wp_dashboard_recent_comments( $total_items = 5 ) {
+function wp_dashboard_recent_comments($total_items = 5) {
 	// Select all comment types and filter out spam later for better query performance.
 	$comments = array();
 
@@ -896,36 +896,36 @@ 
 		'number' => $total_items * 5,
 		'offset' => 0
 	);
-	if ( ! current_user_can( 'edit_posts' ) )
+	if ( ! current_user_can('edit_posts'))
 		$comments_query['status'] = 'approve';
 
-	while ( count( $comments ) < $total_items && $possible = get_comments( $comments_query ) ) {
-		if ( ! is_array( $possible ) ) {
+	while (count($comments) < $total_items && $possible = get_comments($comments_query)) {
+		if ( ! is_array($possible)) {
 			break;
 		}
-		foreach ( $possible as $comment ) {
-			if ( ! current_user_can( 'read_post', $comment->comment_post_ID ) )
+		foreach ($possible as $comment) {
+			if ( ! current_user_can('read_post', $comment->comment_post_ID))
 				continue;
 			$comments[] = $comment;
-			if ( count( $comments ) == $total_items )
+			if (count($comments) == $total_items)
 				break 2;
 		}
 		$comments_query['offset'] += $comments_query['number'];
 		$comments_query['number'] = $total_items * 10;
 	}
 
-	if ( $comments ) {
+	if ($comments) {
 		echo '<div id="latest-comments" class="activity-block">';
-		echo '<h3>' . __( 'Recent Comments' ) . '</h3>';
+		echo '<h3>'.__('Recent Comments').'</h3>';
 
 		echo '<ul id="the-comment-list" data-wp-lists="list:comment">';
-		foreach ( $comments as $comment )
-			_wp_dashboard_recent_comments_row( $comment );
+		foreach ($comments as $comment)
+			_wp_dashboard_recent_comments_row($comment);
 		echo '</ul>';
 
-		if ( current_user_can( 'edit_posts' ) ) {
-			echo '<h3 class="screen-reader-text">' . __( 'View more comments' ) . '</h3>';
-			_get_list_table( 'WP_Comments_List_Table' )->views();
+		if (current_user_can('edit_posts')) {
+			echo '<h3 class="screen-reader-text">'.__('View more comments').'</h3>';
+			_get_list_table('WP_Comments_List_Table')->views();
 		}
 
 		wp_comment_reply( -1, false, 'dashboard', false );
@@ -945,10 +945,10 @@ 
  *
  * @param string $widget_id
  */
-function wp_dashboard_rss_output( $widget_id ) {
-	$widgets = get_option( 'dashboard_widget_options' );
+function wp_dashboard_rss_output($widget_id) {
+	$widgets = get_option('dashboard_widget_options');
 	echo '<div class="rss-widget">';
-	wp_widget_rss_output( $widgets[ $widget_id ] );
+	wp_widget_rss_output($widgets[$widget_id]);
 	echo "</div>";
 }
 
@@ -967,37 +967,37 @@ 
  * @param array $check_urls RSS feeds
  * @return bool False on failure. True on success.
  */
-function wp_dashboard_cached_rss_widget( $widget_id, $callback, $check_urls = array() ) {
-	$loading = '<p class="widget-loading hide-if-no-js">' . __( 'Loading&#8230;' ) . '</p><div class="hide-if-js notice notice-error inline"><p>' . __( 'This widget requires JavaScript.' ) . '</p></div>';
+function wp_dashboard_cached_rss_widget($widget_id, $callback, $check_urls = array()) {
+	$loading = '<p class="widget-loading hide-if-no-js">'.__('Loading&#8230;').'</p><div class="hide-if-js notice notice-error inline"><p>'.__('This widget requires JavaScript.').'</p></div>';
 	$doing_ajax = wp_doing_ajax();
 
-	if ( empty($check_urls) ) {
-		$widgets = get_option( 'dashboard_widget_options' );
-		if ( empty($widgets[$widget_id]['url']) && ! $doing_ajax ) {
+	if (empty($check_urls)) {
+		$widgets = get_option('dashboard_widget_options');
+		if (empty($widgets[$widget_id]['url']) && ! $doing_ajax) {
 			echo $loading;
 			return false;
 		}
-		$check_urls = array( $widgets[$widget_id]['url'] );
+		$check_urls = array($widgets[$widget_id]['url']);
 	}
 
 	$locale = get_user_locale();
-	$cache_key = 'dash_v2_' . md5( $widget_id . '_' . $locale );
-	if ( false !== ( $output = get_transient( $cache_key ) ) ) {
+	$cache_key = 'dash_v2_'.md5($widget_id.'_'.$locale);
+	if (false !== ($output = get_transient($cache_key))) {
 		echo $output;
 		return true;
 	}
 
-	if ( ! $doing_ajax ) {
+	if ( ! $doing_ajax) {
 		echo $loading;
 		return false;
 	}
 
-	if ( $callback && is_callable( $callback ) ) {
-		$args = array_slice( func_get_args(), 3 );
-		array_unshift( $args, $widget_id, $check_urls );
+	if ($callback && is_callable($callback)) {
+		$args = array_slice(func_get_args(), 3);
+		array_unshift($args, $widget_id, $check_urls);
 		ob_start();
-		call_user_func_array( $callback, $args );
-		set_transient( $cache_key, ob_get_flush(), 12 * HOUR_IN_SECONDS ); // Default lifetime in cache of 12 hours (same as the feeds)
+		call_user_func_array($callback, $args);
+		set_transient($cache_key, ob_get_flush(), 12 * HOUR_IN_SECONDS); // Default lifetime in cache of 12 hours (same as the feeds)
 	}
 
 	return true;
@@ -1016,11 +1016,11 @@ 
  *
  * @param int $widget_control_id Registered Widget ID.
  */
-function wp_dashboard_trigger_widget_control( $widget_control_id = false ) {
+function wp_dashboard_trigger_widget_control($widget_control_id = false) {
 	global $wp_dashboard_control_callbacks;
 
-	if ( is_scalar($widget_control_id) && $widget_control_id && isset($wp_dashboard_control_callbacks[$widget_control_id]) && is_callable($wp_dashboard_control_callbacks[$widget_control_id]) ) {
-		call_user_func( $wp_dashboard_control_callbacks[$widget_control_id], '', array( 'id' => $widget_control_id, 'callback' => $wp_dashboard_control_callbacks[$widget_control_id] ) );
+	if (is_scalar($widget_control_id) && $widget_control_id && isset($wp_dashboard_control_callbacks[$widget_control_id]) && is_callable($wp_dashboard_control_callbacks[$widget_control_id])) {
+		call_user_func($wp_dashboard_control_callbacks[$widget_control_id], '', array('id' => $widget_control_id, 'callback' => $wp_dashboard_control_callbacks[$widget_control_id]));
 	}
 }
 
@@ -1035,25 +1035,25 @@ 
  * @param string $widget_id
  * @param array $form_inputs
  */
-function wp_dashboard_rss_control( $widget_id, $form_inputs = array() ) {
-	if ( !$widget_options = get_option( 'dashboard_widget_options' ) )
+function wp_dashboard_rss_control($widget_id, $form_inputs = array()) {
+	if ( ! $widget_options = get_option('dashboard_widget_options'))
 		$widget_options = array();
 
-	if ( !isset($widget_options[$widget_id]) )
+	if ( ! isset($widget_options[$widget_id]))
 		$widget_options[$widget_id] = array();
 
 	$number = 1; // Hack to use wp_widget_rss_form()
 	$widget_options[$widget_id]['number'] = $number;
 
-	if ( 'POST' == $_SERVER['REQUEST_METHOD'] && isset($_POST['widget-rss'][$number]) ) {
-		$_POST['widget-rss'][$number] = wp_unslash( $_POST['widget-rss'][$number] );
-		$widget_options[$widget_id] = wp_widget_rss_process( $_POST['widget-rss'][$number] );
+	if ('POST' == $_SERVER['REQUEST_METHOD'] && isset($_POST['widget-rss'][$number])) {
+		$_POST['widget-rss'][$number] = wp_unslash($_POST['widget-rss'][$number]);
+		$widget_options[$widget_id] = wp_widget_rss_process($_POST['widget-rss'][$number]);
 		$widget_options[$widget_id]['number'] = $number;
 
 		// Title is optional. If black, fill it if possible.
-		if ( !$widget_options[$widget_id]['title'] && isset($_POST['widget-rss'][$number]['title']) ) {
+		if ( ! $widget_options[$widget_id]['title'] && isset($_POST['widget-rss'][$number]['title'])) {
 			$rss = fetch_feed($widget_options[$widget_id]['url']);
-			if ( is_wp_error($rss) ) {
+			if (is_wp_error($rss)) {
 				$widget_options[$widget_id]['title'] = htmlentities(__('Unknown Feed'));
 			} else {
 				$widget_options[$widget_id]['title'] = htmlentities(strip_tags($rss->get_title()));
@@ -1061,13 +1061,13 @@ 
 				unset($rss);
 			}
 		}
-		update_option( 'dashboard_widget_options', $widget_options );
+		update_option('dashboard_widget_options', $widget_options);
 		$locale = get_user_locale();
-		$cache_key = 'dash_v2_' . md5( $widget_id . '_' . $locale );
-		delete_transient( $cache_key );
+		$cache_key = 'dash_v2_'.md5($widget_id.'_'.$locale);
+		delete_transient($cache_key);
 	}
 
-	wp_widget_rss_form( $widget_options[$widget_id], $form_inputs );
+	wp_widget_rss_form($widget_options[$widget_id], $form_inputs);
 }
 
 
@@ -1090,9 +1090,9 @@ 
 			printf(
 				'<a href="%1$s" target="_blank">%2$s <span class="screen-reader-text">%3$s</span><span aria-hidden="true" class="dashicons dashicons-external"></span></a>',
 				'https://make.wordpress.org/community/meetups-landing-page',
-				__( 'Meetups' ),
+				__('Meetups'),
 				/* translators: accessibility text */
-				__( '(opens in a new window)' )
+				__('(opens in a new window)')
 			);
 		?>
 
@@ -1102,9 +1102,9 @@ 
 			printf(
 				'<a href="%1$s" target="_blank">%2$s <span class="screen-reader-text">%3$s</span><span aria-hidden="true" class="dashicons dashicons-external"></span></a>',
 				'https://central.wordcamp.org/schedule/',
-				__( 'WordCamps' ),
+				__('WordCamps'),
 				/* translators: accessibility text */
-				__( '(opens in a new window)' )
+				__('(opens in a new window)')
 			);
 		?>
 
@@ -1114,10 +1114,10 @@ 
 			printf(
 				'<a href="%1$s" target="_blank">%2$s <span class="screen-reader-text">%3$s</span><span aria-hidden="true" class="dashicons dashicons-external"></span></a>',
 				/* translators: If a Rosetta site exists (e.g. https://es.wordpress.org/news/), then use that. Otherwise, leave untranslated. */
-				esc_url( _x( 'https://wordpress.org/news/', 'Events and News dashboard widget' ) ),
-				__( 'News' ),
+				esc_url(_x('https://wordpress.org/news/', 'Events and News dashboard widget')),
+				__('News'),
 				/* translators: accessibility text */
-				__( '(opens in a new window)' )
+				__('(opens in a new window)')
 			);
 		?>
 	</p>
@@ -1135,18 +1135,18 @@ 
 
 	<div class="community-events-errors notice notice-error inline hide-if-js">
 		<p class="hide-if-js">
-			<?php _e( 'This widget requires JavaScript.' ); ?>
+			<?php _e('This widget requires JavaScript.'); ?>
 		</p>
 
 		<p class="community-events-error-occurred" aria-hidden="true">
-			<?php _e( 'An error occurred. Please try again.' ); ?>
+			<?php _e('An error occurred. Please try again.'); ?>
 		</p>
 
 		<p class="community-events-could-not-locate" aria-hidden="true"></p>
 	</div>
 
 	<div class="community-events-loading hide-if-no-js">
-		<?php _e( 'Loading&hellip;' ); ?>
+		<?php _e('Loading&hellip;'); ?>
 	</div>
 
 	<?php
@@ -1160,14 +1160,14 @@ 
 			<p>
 				<span id="community-events-location-message"></span>
 
-				<button class="button-link community-events-toggle-location" aria-label="<?php esc_attr_e( 'Edit city' ); ?>" aria-expanded="false">
+				<button class="button-link community-events-toggle-location" aria-label="<?php esc_attr_e('Edit city'); ?>" aria-expanded="false">
 					<span class="dashicons dashicons-edit"></span>
 				</button>
 			</p>
 
-			<form class="community-events-form" aria-hidden="true" action="<?php echo esc_url( admin_url( 'admin-ajax.php' ) ); ?>" method="post">
+			<form class="community-events-form" aria-hidden="true" action="<?php echo esc_url(admin_url('admin-ajax.php')); ?>" method="post">
 				<label for="community-events-location">
-					<?php _e( 'City:' ); ?>
+					<?php _e('City:'); ?>
 				</label>
 				<?php
 				/* translators: Replace with a city related to your locale.
@@ -1179,12 +1179,12 @@ 
 				 * (native locale name) instead of the English name if possible.
 				 */
 				?>
-				<input id="community-events-location" class="regular-text" type="text" name="community-events-location" placeholder="<?php esc_attr_e( 'Cincinnati' ); ?>" />
+				<input id="community-events-location" class="regular-text" type="text" name="community-events-location" placeholder="<?php esc_attr_e('Cincinnati'); ?>" />
 
-				<?php submit_button( __( 'Submit' ), 'secondary', 'community-events-submit', false ); ?>
+				<?php submit_button(__('Submit'), 'secondary', 'community-events-submit', false); ?>
 
 				<button class="community-events-cancel button-link" type="button" aria-expanded="false">
-					<?php _e( 'Cancel' ); ?>
+					<?php _e('Cancel'); ?>
 				</button>
 
 				<span class="spinner"></span>
@@ -1208,7 +1208,7 @@ 
 	<script id="tmpl-community-events-attend-event-near" type="text/template">
 		<?php printf(
 			/* translators: %s is a placeholder for the name of a city. */
-			__( 'Attend an upcoming event near %s.' ),
+			__('Attend an upcoming event near %s.'),
 			'<strong>{{ data.location.description }}</strong>'
 		); ?>
 	</script>
@@ -1220,7 +1220,7 @@ 
 			 * that they match the expected location before including them.
 			 * Use endonyms (native locale names) whenever possible.
 			 */
-			__( 'We couldn&#8217;t locate %s. Please try another nearby city. For example: Kansas City; Springfield; Portland.' ),
+			__('We couldn&#8217;t locate %s. Please try another nearby city. For example: Kansas City; Springfield; Portland.'),
 			'<em>{{data.unknownCity}}</em>'
 		); ?>
 	</script>
@@ -1251,16 +1251,16 @@ 
 			<# if ( data.location.description ) { #>
 				<?php printf(
 					/* translators: 1: the city the user searched for, 2: meetup organization documentation URL */
-					__( 'There aren&#8217;t any events scheduled near %1$s at the moment. Would you like to <a href="%2$s">organize one</a>?' ),
+					__('There aren&#8217;t any events scheduled near %1$s at the moment. Would you like to <a href="%2$s">organize one</a>?'),
 					'{{ data.location.description }}',
-					__( 'https://make.wordpress.org/community/handbook/meetup-organizer/welcome/' )
+					__('https://make.wordpress.org/community/handbook/meetup-organizer/welcome/')
 				); ?>
 
 			<# } else { #>
 				<?php printf(
 					/* translators: meetup organization documentation URL. */
-					__( 'There aren&#8217;t any events scheduled near you at the moment. Would you like to <a href="%s">organize one</a>?' ),
-					__( 'https://make.wordpress.org/community/handbook/meetup-organizer/welcome/' )
+					__('There aren&#8217;t any events scheduled near you at the moment. Would you like to <a href="%s">organize one</a>?'),
+					__('https://make.wordpress.org/community/handbook/meetup-organizer/welcome/')
 				); ?>
 			<# } #>
 		</li>
@@ -1285,7 +1285,7 @@ 
 			 *
 			 * @param string $link The widget's primary link URL.
 			 */
-			'link' => apply_filters( 'dashboard_primary_link', __( 'https://wordpress.org/news/' ) ),
+			'link' => apply_filters('dashboard_primary_link', __('https://wordpress.org/news/')),
 
 			/**
 			 * Filters the primary feed URL for the 'WordPress News' dashboard widget.
@@ -1294,7 +1294,7 @@ 
 			 *
 			 * @param string $url The widget's primary feed URL.
 			 */
-			'url' => apply_filters( 'dashboard_primary_feed', __( 'http://wordpress.org/news/feed/' ) ),
+			'url' => apply_filters('dashboard_primary_feed', __('http://wordpress.org/news/feed/')),
 
 			/**
 			 * Filters the primary link title for the 'WordPress News' dashboard widget.
@@ -1303,7 +1303,7 @@ 
 			 *
 			 * @param string $title Title attribute for the widget's primary link.
 			 */
-			'title'        => apply_filters( 'dashboard_primary_title', __( 'WordPress Blog' ) ),
+			'title'        => apply_filters('dashboard_primary_title', __('WordPress Blog')),
 			'items'        => 1,
 			'show_summary' => 0,
 			'show_author'  => 0,
@@ -1318,7 +1318,7 @@ 
 			 *
 			 * @param string $link The widget's secondary link URL.
 			 */
-			'link' => apply_filters( 'dashboard_secondary_link', __( 'https://planet.wordpress.org/' ) ),
+			'link' => apply_filters('dashboard_secondary_link', __('https://planet.wordpress.org/')),
 
 			/**
 			 * Filters the secondary feed URL for the 'WordPress News' dashboard widget.
@@ -1327,7 +1327,7 @@ 
 			 *
 			 * @param string $url The widget's secondary feed URL.
 			 */
-			'url' => apply_filters( 'dashboard_secondary_feed', __( 'https://planet.wordpress.org/feed/' ) ),
+			'url' => apply_filters('dashboard_secondary_feed', __('https://planet.wordpress.org/feed/')),
 
 			/**
 			 * Filters the secondary link title for the 'WordPress News' dashboard widget.
@@ -1336,7 +1336,7 @@ 
 			 *
 			 * @param string $title Title attribute for the widget's secondary link.
 			 */
-			'title'        => apply_filters( 'dashboard_secondary_title', __( 'Other WordPress News' ) ),
+			'title'        => apply_filters('dashboard_secondary_title', __('Other WordPress News')),
 
 			/**
 			 * Filters the number of secondary link items for the 'WordPress News' dashboard widget.
@@ -1345,14 +1345,14 @@ 
 			 *
 			 * @param string $items How many items to show in the secondary feed.
 			 */
-			'items'        => apply_filters( 'dashboard_secondary_items', 3 ),
+			'items'        => apply_filters('dashboard_secondary_items', 3),
 			'show_summary' => 0,
 			'show_author'  => 0,
 			'show_date'    => 0,
 		)
 	);
 
-	wp_dashboard_cached_rss_widget( 'dashboard_primary', 'wp_dashboard_primary_output', $feeds );
+	wp_dashboard_cached_rss_widget('dashboard_primary', 'wp_dashboard_primary_output', $feeds);
 }
 
 /**
@@ -1364,11 +1364,11 @@ 
  * @param string $widget_id Widget ID.
  * @param array  $feeds     Array of RSS feeds.
  */
-function wp_dashboard_primary_output( $widget_id, $feeds ) {
-	foreach ( $feeds as $type => $args ) {
+function wp_dashboard_primary_output($widget_id, $feeds) {
+	foreach ($feeds as $type => $args) {
 		$args['type'] = $type;
 		echo '<div class="rss-widget">';
-			wp_widget_rss_output( $args['url'], $args );
+			wp_widget_rss_output($args['url'], $args);
 		echo "</div>";
 	}
 }
@@ -1383,48 +1383,48 @@ 
  * @return bool|null True if not multisite, user can't upload files, or the space check option is disabled.
  */
 function wp_dashboard_quota() {
-	if ( !is_multisite() || !current_user_can( 'upload_files' ) || get_site_option( 'upload_space_check_disabled' ) )
+	if ( ! is_multisite() || ! current_user_can('upload_files') || get_site_option('upload_space_check_disabled'))
 		return true;
 
 	$quota = get_space_allowed();
 	$used = get_space_used();
 
-	if ( $used > $quota )
+	if ($used > $quota)
 		$percentused = '100';
 	else
-		$percentused = ( $used / $quota ) * 100;
-	$used_class = ( $percentused >= 70 ) ? ' warning' : '';
-	$used = round( $used, 2 );
-	$percentused = number_format( $percentused );
+		$percentused = ($used / $quota) * 100;
+	$used_class = ($percentused >= 70) ? ' warning' : '';
+	$used = round($used, 2);
+	$percentused = number_format($percentused);
 
 	?>
-	<h3 class="mu-storage"><?php _e( 'Storage Space' ); ?></h3>
+	<h3 class="mu-storage"><?php _e('Storage Space'); ?></h3>
 	<div class="mu-storage">
 	<ul>
 		<li class="storage-count">
 			<?php $text = sprintf(
 				/* translators: number of megabytes */
-				__( '%s MB Space Allowed' ),
-				number_format_i18n( $quota )
+				__('%s MB Space Allowed'),
+				number_format_i18n($quota)
 			);
 			printf(
 				'<a href="%1$s">%2$s <span class="screen-reader-text">(%3$s)</span></a>',
-				esc_url( admin_url( 'upload.php' ) ),
+				esc_url(admin_url('upload.php')),
 				$text,
-				__( 'Manage Uploads' )
+				__('Manage Uploads')
 			); ?>
 		</li><li class="storage-count <?php echo $used_class; ?>">
 			<?php $text = sprintf(
 				/* translators: 1: number of megabytes, 2: percentage */
-				__( '%1$s MB (%2$s%%) Space Used' ),
-				number_format_i18n( $used, 2 ),
+				__('%1$s MB (%2$s%%) Space Used'),
+				number_format_i18n($used, 2),
 				$percentused
 			);
 			printf(
 				'<a href="%1$s" class="musublink">%2$s <span class="screen-reader-text">(%3$s)</span></a>',
-				esc_url( admin_url( 'upload.php' ) ),
+				esc_url(admin_url('upload.php')),
 				$text,
-				__( 'Manage Uploads' )
+				__('Manage Uploads')
 			); ?>
 		</li>
 	</ul>
@@ -1437,35 +1437,35 @@ 
 	$notice = '';
 	$response = wp_check_browser_version();
 
-	if ( $response ) {
-		if ( $response['insecure'] ) {
+	if ($response) {
+		if ($response['insecure']) {
 			/* translators: %s: browser name and link */
-			$msg = sprintf( __( "It looks like you're using an insecure version of %s. Using an outdated browser makes your computer unsafe. For the best WordPress experience, please update your browser." ),
-				sprintf( '<a href="%s">%s</a>', esc_url( $response['update_url'] ), esc_html( $response['name'] ) )
+			$msg = sprintf(__("It looks like you're using an insecure version of %s. Using an outdated browser makes your computer unsafe. For the best WordPress experience, please update your browser."),
+				sprintf('<a href="%s">%s</a>', esc_url($response['update_url']), esc_html($response['name']))
 			);
 		} else {
 			/* translators: %s: browser name and link */
-			$msg = sprintf( __( "It looks like you're using an old version of %s. For the best WordPress experience, please update your browser." ),
-				sprintf( '<a href="%s">%s</a>', esc_url( $response['update_url'] ), esc_html( $response['name'] ) )
+			$msg = sprintf(__("It looks like you're using an old version of %s. For the best WordPress experience, please update your browser."),
+				sprintf('<a href="%s">%s</a>', esc_url($response['update_url']), esc_html($response['name']))
 			);
 		}
 
 		$browser_nag_class = '';
-		if ( !empty( $response['img_src'] ) ) {
-			$img_src = ( is_ssl() && ! empty( $response['img_src_ssl'] ) )? $response['img_src_ssl'] : $response['img_src'];
+		if ( ! empty($response['img_src'])) {
+			$img_src = (is_ssl() && ! empty($response['img_src_ssl'])) ? $response['img_src_ssl'] : $response['img_src'];
 
-			$notice .= '<div class="alignright browser-icon"><a href="' . esc_attr($response['update_url']) . '"><img src="' . esc_attr( $img_src ) . '" alt="" /></a></div>';
+			$notice .= '<div class="alignright browser-icon"><a href="'.esc_attr($response['update_url']).'"><img src="'.esc_attr($img_src).'" alt="" /></a></div>';
 			$browser_nag_class = ' has-browser-icon';
 		}
 		$notice .= "<p class='browser-update-nag{$browser_nag_class}'>{$msg}</p>";
 
 		$browsehappy = 'http://browsehappy.com/';
 		$locale = get_user_locale();
-		if ( 'en_US' !== $locale )
-			$browsehappy = add_query_arg( 'locale', $locale, $browsehappy );
+		if ('en_US' !== $locale)
+			$browsehappy = add_query_arg('locale', $locale, $browsehappy);
 
-		$notice .= '<p>' . sprintf( __( '<a href="%1$s" class="update-browser-link">Update %2$s</a> or learn how to <a href="%3$s" class="browse-happy-link">browse happy</a>' ), esc_attr( $response['update_url'] ), esc_html( $response['name'] ), esc_url( $browsehappy ) ) . '</p>';
-		$notice .= '<p class="hide-if-no-js"><a href="" class="dismiss" aria-label="' . esc_attr__( 'Dismiss the browser warning panel' ) . '">' . __( 'Dismiss' ) . '</a></p>';
+		$notice .= '<p>'.sprintf(__('<a href="%1$s" class="update-browser-link">Update %2$s</a> or learn how to <a href="%3$s" class="browse-happy-link">browse happy</a>'), esc_attr($response['update_url']), esc_html($response['name']), esc_url($browsehappy)).'</p>';
+		$notice .= '<p class="hide-if-no-js"><a href="" class="dismiss" aria-label="'.esc_attr__('Dismiss the browser warning panel').'">'.__('Dismiss').'</a></p>';
 		$notice .= '<div class="clear"></div>';
 	}
 
@@ -1477,7 +1477,7 @@ 
 	* @param string $notice   The notice content.
 	* @param array  $response An array containing web browser information.
 	*/
-	echo apply_filters( 'browse-happy-notice', $notice, $response );
+	echo apply_filters('browse-happy-notice', $notice, $response);
 }
 
 /**
@@ -1486,10 +1486,10 @@ 
  * @param array $classes
  * @return array
  */
-function dashboard_browser_nag_class( $classes ) {
+function dashboard_browser_nag_class($classes) {
 	$response = wp_check_browser_version();
 
-	if ( $response && $response['insecure'] )
+	if ($response && $response['insecure'])
 		$classes[] = 'browser-insecure';
 
 	return $classes;
@@ -1503,20 +1503,20 @@ 
  * @return array|bool False on failure, array of browser data on success.
  */
 function wp_check_browser_version() {
-	if ( empty( $_SERVER['HTTP_USER_AGENT'] ) )
+	if (empty($_SERVER['HTTP_USER_AGENT']))
 		return false;
 
-	$key = md5( $_SERVER['HTTP_USER_AGENT'] );
+	$key = md5($_SERVER['HTTP_USER_AGENT']);
 
-	if ( false === ($response = get_site_transient('browser_' . $key) ) ) {
+	if (false === ($response = get_site_transient('browser_'.$key))) {
 		$options = array(
-			'body'			=> array( 'useragent' => $_SERVER['HTTP_USER_AGENT'] ),
-			'user-agent'	=> 'WordPress/' . get_bloginfo( 'version' ) . '; ' . home_url()
+			'body'			=> array('useragent' => $_SERVER['HTTP_USER_AGENT']),
+			'user-agent'	=> 'WordPress/'.get_bloginfo('version').'; '.home_url()
 		);
 
-		$response = wp_remote_post( 'http://api.wordpress.org/core/browse-happy/1.1/', $options );
+		$response = wp_remote_post('http://api.wordpress.org/core/browse-happy/1.1/', $options);
 
-		if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) )
+		if (is_wp_error($response) || 200 != wp_remote_retrieve_response_code($response))
 			return false;
 
 		/**
@@ -1531,12 +1531,12 @@ 
 		 *  'img_src' - string - An image representing the browser
 		 *  'img_src_ssl' - string - An image (over SSL) representing the browser
 		 */
-		$response = json_decode( wp_remote_retrieve_body( $response ), true );
+		$response = json_decode(wp_remote_retrieve_body($response), true);
 
-		if ( ! is_array( $response ) )
+		if ( ! is_array($response))
 			return false;
 
-		set_site_transient( 'browser_' . $key, $response, WEEK_IN_SECONDS );
+		set_site_transient('browser_'.$key, $response, WEEK_IN_SECONDS);
 	}
 
 	return $response;
@@ -1555,55 +1555,55 @@ 
 function wp_welcome_panel() {
 	?>
 	<div class="welcome-panel-content">
-	<h2><?php _e( 'Welcome to WordPress!' ); ?></h2>
-	<p class="about-description"><?php _e( 'We&#8217;ve assembled some links to get you started:' ); ?></p>
+	<h2><?php _e('Welcome to WordPress!'); ?></h2>
+	<p class="about-description"><?php _e('We&#8217;ve assembled some links to get you started:'); ?></p>
 	<div class="welcome-panel-column-container">
 	<div class="welcome-panel-column">
-		<?php if ( current_user_can( 'customize' ) ): ?>
-			<h3><?php _e( 'Get Started' ); ?></h3>
-			<a class="button button-primary button-hero load-customize hide-if-no-customize" href="<?php echo wp_customize_url(); ?>"><?php _e( 'Customize Your Site' ); ?></a>
+		<?php if (current_user_can('customize')): ?>
+			<h3><?php _e('Get Started'); ?></h3>
+			<a class="button button-primary button-hero load-customize hide-if-no-customize" href="<?php echo wp_customize_url(); ?>"><?php _e('Customize Your Site'); ?></a>
 		<?php endif; ?>
-		<a class="button button-primary button-hero hide-if-customize" href="<?php echo admin_url( 'themes.php' ); ?>"><?php _e( 'Customize Your Site' ); ?></a>
-		<?php if ( current_user_can( 'install_themes' ) || ( current_user_can( 'switch_themes' ) && count( wp_get_themes( array( 'allowed' => true ) ) ) > 1 ) ) : ?>
-			<p class="hide-if-no-customize"><?php printf( __( 'or, <a href="%s">change your theme completely</a>' ), admin_url( 'themes.php' ) ); ?></p>
+		<a class="button button-primary button-hero hide-if-customize" href="<?php echo admin_url('themes.php'); ?>"><?php _e('Customize Your Site'); ?></a>
+		<?php if (current_user_can('install_themes') || (current_user_can('switch_themes') && count(wp_get_themes(array('allowed' => true))) > 1)) : ?>
+			<p class="hide-if-no-customize"><?php printf(__('or, <a href="%s">change your theme completely</a>'), admin_url('themes.php')); ?></p>
 		<?php endif; ?>
 	</div>
 	<div class="welcome-panel-column">
-		<h3><?php _e( 'Next Steps' ); ?></h3>
+		<h3><?php _e('Next Steps'); ?></h3>
 		<ul>
-		<?php if ( 'page' == get_option( 'show_on_front' ) && ! get_option( 'page_for_posts' ) ) : ?>
-			<li><?php printf( '<a href="%s" class="welcome-icon welcome-edit-page">' . __( 'Edit your front page' ) . '</a>', get_edit_post_link( get_option( 'page_on_front' ) ) ); ?></li>
-			<li><?php printf( '<a href="%s" class="welcome-icon welcome-add-page">' . __( 'Add additional pages' ) . '</a>', admin_url( 'post-new.php?post_type=page' ) ); ?></li>
-		<?php elseif ( 'page' == get_option( 'show_on_front' ) ) : ?>
-			<li><?php printf( '<a href="%s" class="welcome-icon welcome-edit-page">' . __( 'Edit your front page' ) . '</a>', get_edit_post_link( get_option( 'page_on_front' ) ) ); ?></li>
-			<li><?php printf( '<a href="%s" class="welcome-icon welcome-add-page">' . __( 'Add additional pages' ) . '</a>', admin_url( 'post-new.php?post_type=page' ) ); ?></li>
-			<li><?php printf( '<a href="%s" class="welcome-icon welcome-write-blog">' . __( 'Add a blog post' ) . '</a>', admin_url( 'post-new.php' ) ); ?></li>
+		<?php if ('page' == get_option('show_on_front') && ! get_option('page_for_posts')) : ?>
+			<li><?php printf('<a href="%s" class="welcome-icon welcome-edit-page">'.__('Edit your front page').'</a>', get_edit_post_link(get_option('page_on_front'))); ?></li>
+			<li><?php printf('<a href="%s" class="welcome-icon welcome-add-page">'.__('Add additional pages').'</a>', admin_url('post-new.php?post_type=page')); ?></li>
+		<?php elseif ('page' == get_option('show_on_front')) : ?>
+			<li><?php printf('<a href="%s" class="welcome-icon welcome-edit-page">'.__('Edit your front page').'</a>', get_edit_post_link(get_option('page_on_front'))); ?></li>
+			<li><?php printf('<a href="%s" class="welcome-icon welcome-add-page">'.__('Add additional pages').'</a>', admin_url('post-new.php?post_type=page')); ?></li>
+			<li><?php printf('<a href="%s" class="welcome-icon welcome-write-blog">'.__('Add a blog post').'</a>', admin_url('post-new.php')); ?></li>
 		<?php else : ?>
-			<li><?php printf( '<a href="%s" class="welcome-icon welcome-write-blog">' . __( 'Write your first blog post' ) . '</a>', admin_url( 'post-new.php' ) ); ?></li>
-			<li><?php printf( '<a href="%s" class="welcome-icon welcome-add-page">' . __( 'Add an About page' ) . '</a>', admin_url( 'post-new.php?post_type=page' ) ); ?></li>
+			<li><?php printf('<a href="%s" class="welcome-icon welcome-write-blog">'.__('Write your first blog post').'</a>', admin_url('post-new.php')); ?></li>
+			<li><?php printf('<a href="%s" class="welcome-icon welcome-add-page">'.__('Add an About page').'</a>', admin_url('post-new.php?post_type=page')); ?></li>
 		<?php endif; ?>
-			<li><?php printf( '<a href="%s" class="welcome-icon welcome-view-site">' . __( 'View your site' ) . '</a>', home_url( '/' ) ); ?></li>
+			<li><?php printf('<a href="%s" class="welcome-icon welcome-view-site">'.__('View your site').'</a>', home_url('/')); ?></li>
 		</ul>
 	</div>
 	<div class="welcome-panel-column welcome-panel-last">
-		<h3><?php _e( 'More Actions' ); ?></h3>
+		<h3><?php _e('More Actions'); ?></h3>
 		<ul>
-		<?php if ( current_theme_supports( 'widgets' ) || current_theme_supports( 'menus' ) ) : ?>
+		<?php if (current_theme_supports('widgets') || current_theme_supports('menus')) : ?>
 			<li><div class="welcome-icon welcome-widgets-menus"><?php
-				if ( current_theme_supports( 'widgets' ) && current_theme_supports( 'menus' ) ) {
-					printf( __( 'Manage <a href="%1$s">widgets</a> or <a href="%2$s">menus</a>' ),
-						admin_url( 'widgets.php' ), admin_url( 'nav-menus.php' ) );
-				} elseif ( current_theme_supports( 'widgets' ) ) {
-					echo '<a href="' . admin_url( 'widgets.php' ) . '">' . __( 'Manage widgets' ) . '</a>';
+				if (current_theme_supports('widgets') && current_theme_supports('menus')) {
+					printf(__('Manage <a href="%1$s">widgets</a> or <a href="%2$s">menus</a>'),
+						admin_url('widgets.php'), admin_url('nav-menus.php'));
+				} elseif (current_theme_supports('widgets')) {
+					echo '<a href="'.admin_url('widgets.php').'">'.__('Manage widgets').'</a>';
 				} else {
-					echo '<a href="' . admin_url( 'nav-menus.php' ) . '">' . __( 'Manage menus' ) . '</a>';
+					echo '<a href="'.admin_url('nav-menus.php').'">'.__('Manage menus').'</a>';
 				}
 			?></div></li>
 		<?php endif; ?>
-		<?php if ( current_user_can( 'manage_options' ) ) : ?>
-			<li><?php printf( '<a href="%s" class="welcome-icon welcome-comments">' . __( 'Turn comments on or off' ) . '</a>', admin_url( 'options-discussion.php' ) ); ?></li>
+		<?php if (current_user_can('manage_options')) : ?>
+			<li><?php printf('<a href="%s" class="welcome-icon welcome-comments">'.__('Turn comments on or off').'</a>', admin_url('options-discussion.php')); ?></li>
 		<?php endif; ?>
-			<li><?php printf( '<a href="%s" class="welcome-icon welcome-learn-more">' . __( 'Learn more about getting started' ) . '</a>', __( 'https://codex.wordpress.org/First_Steps_With_WordPress' ) ); ?></li>
+			<li><?php printf('<a href="%s" class="welcome-icon welcome-learn-more">'.__('Learn more about getting started').'</a>', __('https://codex.wordpress.org/First_Steps_With_WordPress')); ?></li>
 		</ul>
 	</div>
 	</div>

Braces +76 added lines, -49 removed lines

@@ -28,18 +28,21 @@ 
 
 	if ( $response && $response['upgrade'] ) {
 		add_filter( 'postbox_classes_dashboard_dashboard_browser_nag', 'dashboard_browser_nag_class' );
-		if ( $response['insecure'] )
-			wp_add_dashboard_widget( 'dashboard_browser_nag', __( 'You are using an insecure browser!' ), 'wp_dashboard_browser_nag' );
-		else
-			wp_add_dashboard_widget( 'dashboard_browser_nag', __( 'Your browser is out of date!' ), 'wp_dashboard_browser_nag' );
+		if ( $response['insecure'] ) {
+					wp_add_dashboard_widget( 'dashboard_browser_nag', __( 'You are using an insecure browser!' ), 'wp_dashboard_browser_nag' );
+		} else {
+					wp_add_dashboard_widget( 'dashboard_browser_nag', __( 'Your browser is out of date!' ), 'wp_dashboard_browser_nag' );
+		}
 	}
 
 	// Right Now
-	if ( is_blog_admin() && current_user_can('edit_posts') )
-		wp_add_dashboard_widget( 'dashboard_right_now', __( 'At a Glance' ), 'wp_dashboard_right_now' );
+	if ( is_blog_admin() && current_user_can('edit_posts') ) {
+			wp_add_dashboard_widget( 'dashboard_right_now', __( 'At a Glance' ), 'wp_dashboard_right_now' );
+	}
 
-	if ( is_network_admin() )
-		wp_add_dashboard_widget( 'network_dashboard_right_now', __( 'Right Now' ), 'wp_network_dashboard_right_now' );
+	if ( is_network_admin() ) {
+			wp_add_dashboard_widget( 'network_dashboard_right_now', __( 'Right Now' ), 'wp_network_dashboard_right_now' );
+	}
 
 	// Activity Widget
 	if ( is_blog_admin() ) {
@@ -171,12 +174,14 @@ 
 	$side_widgets = array( 'dashboard_quick_press', 'dashboard_primary' );
 
 	$location = 'normal';
-	if ( in_array($widget_id, $side_widgets) )
-		$location = 'side';
+	if ( in_array($widget_id, $side_widgets) ) {
+			$location = 'side';
+	}
 
 	$priority = 'core';
-	if ( 'dashboard_browser_nag' === $widget_id )
-		$priority = 'high';
+	if ( 'dashboard_browser_nag' === $widget_id ) {
+			$priority = 'high';
+	}
 
 	add_meta_box( $widget_id, $widget_name, $callback, $screen, $location, $priority, $callback_args );
 }
@@ -384,10 +389,12 @@ 
  */
 function wp_network_dashboard_right_now() {
 	$actions = array();
-	if ( current_user_can('create_sites') )
-		$actions['create-site'] = '<a href="' . network_admin_url('site-new.php') . '">' . __( 'Create a New Site' ) . '</a>';
-	if ( current_user_can('create_users') )
-		$actions['create-user'] = '<a href="' . network_admin_url('user-new.php') . '">' . __( 'Create a New User' ) . '</a>';
+	if ( current_user_can('create_sites') ) {
+			$actions['create-site'] = '<a href="' . network_admin_url('site-new.php') . '">' . __( 'Create a New Site' ) . '</a>';
+	}
+	if ( current_user_can('create_users') ) {
+			$actions['create-user'] = '<a href="' . network_admin_url('user-new.php') . '">' . __( 'Create a New User' ) . '</a>';
+	}
 
 	$c_users = get_user_count();
 	$c_blogs = get_blog_count();
@@ -487,8 +494,10 @@ 
 		$post = get_default_post_to_edit( 'post' , true);
 		$user_id = get_current_user_id();
 		// Don't create an option if this is a super admin who does not belong to this site.
-		if ( in_array( get_current_blog_id(), array_keys( get_blogs_of_user( $user_id ) ) ) )
-			update_user_option( $user_id, 'dashboard_quick_press_last_post_id', (int) $post->ID ); // Save post_ID
+		if ( in_array( get_current_blog_id(), array_keys( get_blogs_of_user( $user_id ) ) ) ) {
+					update_user_option( $user_id, 'dashboard_quick_press_last_post_id', (int) $post->ID );
+		}
+		// Save post_ID
 	}
 
 	$post_ID = (int) $post->ID;
@@ -704,10 +713,12 @@ 
 			</p>
 
 			<?php
-			else :
+			else {
+				:
 				switch ( $comment->comment_type ) {
 					case 'pingback' :
 						$type = __( 'Pingback' );
+			}
 						break;
 					case 'trackback' :
 						$type = __( 'Trackback' );
@@ -896,19 +907,22 @@ 
 		'number' => $total_items * 5,
 		'offset' => 0
 	);
-	if ( ! current_user_can( 'edit_posts' ) )
-		$comments_query['status'] = 'approve';
+	if ( ! current_user_can( 'edit_posts' ) ) {
+			$comments_query['status'] = 'approve';
+	}
 
 	while ( count( $comments ) < $total_items && $possible = get_comments( $comments_query ) ) {
 		if ( ! is_array( $possible ) ) {
 			break;
 		}
 		foreach ( $possible as $comment ) {
-			if ( ! current_user_can( 'read_post', $comment->comment_post_ID ) )
-				continue;
+			if ( ! current_user_can( 'read_post', $comment->comment_post_ID ) ) {
+							continue;
+			}
 			$comments[] = $comment;
-			if ( count( $comments ) == $total_items )
-				break 2;
+			if ( count( $comments ) == $total_items ) {
+							break 2;
+			}
 		}
 		$comments_query['offset'] += $comments_query['number'];
 		$comments_query['number'] = $total_items * 10;
@@ -919,8 +933,9 @@ 
 		echo '<h3>' . __( 'Recent Comments' ) . '</h3>';
 
 		echo '<ul id="the-comment-list" data-wp-lists="list:comment">';
-		foreach ( $comments as $comment )
-			_wp_dashboard_recent_comments_row( $comment );
+		foreach ( $comments as $comment ) {
+					_wp_dashboard_recent_comments_row( $comment );
+		}
 		echo '</ul>';
 
 		if ( current_user_can( 'edit_posts' ) ) {
@@ -1036,11 +1051,13 @@ 
  * @param array $form_inputs
  */
 function wp_dashboard_rss_control( $widget_id, $form_inputs = array() ) {
-	if ( !$widget_options = get_option( 'dashboard_widget_options' ) )
-		$widget_options = array();
+	if ( !$widget_options = get_option( 'dashboard_widget_options' ) ) {
+			$widget_options = array();
+	}
 
-	if ( !isset($widget_options[$widget_id]) )
-		$widget_options[$widget_id] = array();
+	if ( !isset($widget_options[$widget_id]) ) {
+			$widget_options[$widget_id] = array();
+	}
 
 	$number = 1; // Hack to use wp_widget_rss_form()
 	$widget_options[$widget_id]['number'] = $number;
@@ -1383,16 +1400,18 @@ 
  * @return bool|null True if not multisite, user can't upload files, or the space check option is disabled.
  */
 function wp_dashboard_quota() {
-	if ( !is_multisite() || !current_user_can( 'upload_files' ) || get_site_option( 'upload_space_check_disabled' ) )
-		return true;
+	if ( !is_multisite() || !current_user_can( 'upload_files' ) || get_site_option( 'upload_space_check_disabled' ) ) {
+			return true;
+	}
 
 	$quota = get_space_allowed();
 	$used = get_space_used();
 
-	if ( $used > $quota )
-		$percentused = '100';
-	else
-		$percentused = ( $used / $quota ) * 100;
+	if ( $used > $quota ) {
+			$percentused = '100';
+	} else {
+			$percentused = ( $used / $quota ) * 100;
+	}
 	$used_class = ( $percentused >= 70 ) ? ' warning' : '';
 	$used = round( $used, 2 );
 	$percentused = number_format( $percentused );
@@ -1461,8 +1480,9 @@ 
 
 		$browsehappy = 'http://browsehappy.com/';
 		$locale = get_user_locale();
-		if ( 'en_US' !== $locale )
-			$browsehappy = add_query_arg( 'locale', $locale, $browsehappy );
+		if ( 'en_US' !== $locale ) {
+					$browsehappy = add_query_arg( 'locale', $locale, $browsehappy );
+		}
 
 		$notice .= '<p>' . sprintf( __( '<a href="%1$s" class="update-browser-link">Update %2$s</a> or learn how to <a href="%3$s" class="browse-happy-link">browse happy</a>' ), esc_attr( $response['update_url'] ), esc_html( $response['name'] ), esc_url( $browsehappy ) ) . '</p>';
 		$notice .= '<p class="hide-if-no-js"><a href="" class="dismiss" aria-label="' . esc_attr__( 'Dismiss the browser warning panel' ) . '">' . __( 'Dismiss' ) . '</a></p>';
@@ -1489,8 +1509,9 @@ 
 function dashboard_browser_nag_class( $classes ) {
 	$response = wp_check_browser_version();
 
-	if ( $response && $response['insecure'] )
-		$classes[] = 'browser-insecure';
+	if ( $response && $response['insecure'] ) {
+			$classes[] = 'browser-insecure';
+	}
 
 	return $classes;
 }
@@ -1503,8 +1524,9 @@ 
  * @return array|bool False on failure, array of browser data on success.
  */
 function wp_check_browser_version() {
-	if ( empty( $_SERVER['HTTP_USER_AGENT'] ) )
-		return false;
+	if ( empty( $_SERVER['HTTP_USER_AGENT'] ) ) {
+			return false;
+	}
 
 	$key = md5( $_SERVER['HTTP_USER_AGENT'] );
 
@@ -1516,8 +1538,9 @@ 
 
 		$response = wp_remote_post( 'http://api.wordpress.org/core/browse-happy/1.1/', $options );
 
-		if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) )
-			return false;
+		if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) ) {
+					return false;
+		}
 
 		/**
 		 * Response should be an array with:
@@ -1533,8 +1556,9 @@ 
 		 */
 		$response = json_decode( wp_remote_retrieve_body( $response ), true );
 
-		if ( ! is_array( $response ) )
-			return false;
+		if ( ! is_array( $response ) ) {
+					return false;
+		}
 
 		set_site_transient( 'browser_' . $key, $response, WEEK_IN_SECONDS );
 	}
@@ -1578,8 +1602,11 @@ 
 			<li><?php printf( '<a href="%s" class="welcome-icon welcome-edit-page">' . __( 'Edit your front page' ) . '</a>', get_edit_post_link( get_option( 'page_on_front' ) ) ); ?></li>
 			<li><?php printf( '<a href="%s" class="welcome-icon welcome-add-page">' . __( 'Add additional pages' ) . '</a>', admin_url( 'post-new.php?post_type=page' ) ); ?></li>
 			<li><?php printf( '<a href="%s" class="welcome-icon welcome-write-blog">' . __( 'Add a blog post' ) . '</a>', admin_url( 'post-new.php' ) ); ?></li>
-		<?php else : ?>
-			<li><?php printf( '<a href="%s" class="welcome-icon welcome-write-blog">' . __( 'Write your first blog post' ) . '</a>', admin_url( 'post-new.php' ) ); ?></li>
+		<?php else {
+	: ?>
+			<li><?php printf( '<a href="%s" class="welcome-icon welcome-write-blog">' . __( 'Write your first blog post' ) . '</a>', admin_url( 'post-new.php' ) );
+}
+?></li>
 			<li><?php printf( '<a href="%s" class="welcome-icon welcome-add-page">' . __( 'Add an About page' ) . '</a>', admin_url( 'post-new.php?post_type=page' ) ); ?></li>
 		<?php endif; ?>
 			<li><?php printf( '<a href="%s" class="welcome-icon welcome-view-site">' . __( 'View your site' ) . '</a>', home_url( '/' ) ); ?></li>

src/wp-admin/includes/class-wp-upgrader-skin.php

Braces +17 added lines, -12 removed lines

@@ -39,8 +39,9 @@ 
 	 * @param WP_Upgrader $upgrader
 	 */
 	public function set_upgrader(&$upgrader) {
-		if ( is_object($upgrader) )
-			$this->upgrader =& $upgrader;
+		if ( is_object($upgrader) ) {
+					$this->upgrader =& $upgrader;
+		}
 		$this->add_strings();
 	}
 
@@ -107,16 +108,18 @@ 
 	 * @param string|WP_Error $errors
 	 */
 	public function error($errors) {
-		if ( ! $this->done_header )
-			$this->header();
+		if ( ! $this->done_header ) {
+					$this->header();
+		}
 		if ( is_string($errors) ) {
 			$this->feedback($errors);
 		} elseif ( is_wp_error($errors) && $errors->get_error_code() ) {
 			foreach ( $errors->get_error_messages() as $message ) {
-				if ( $errors->get_error_data() && is_string( $errors->get_error_data() ) )
-					$this->feedback($message . ' ' . esc_html( strip_tags( $errors->get_error_data() ) ) );
-				else
-					$this->feedback($message);
+				if ( $errors->get_error_data() && is_string( $errors->get_error_data() ) ) {
+									$this->feedback($message . ' ' . esc_html( strip_tags( $errors->get_error_data() ) ) );
+				} else {
+									$this->feedback($message);
+				}
 			}
 		}
 	}
@@ -126,8 +129,9 @@ 
 	 * @param string $string
 	 */
 	public function feedback($string) {
-		if ( isset( $this->upgrader->strings[$string] ) )
-			$string = $this->upgrader->strings[$string];
+		if ( isset( $this->upgrader->strings[$string] ) ) {
+					$string = $this->upgrader->strings[$string];
+		}
 
 		if ( strpos($string, '%') !== false ) {
 			$args = func_get_args();
@@ -138,8 +142,9 @@ 
 				$string = vsprintf($string, $args);
 			}
 		}
-		if ( empty($string) )
-			return;
+		if ( empty($string) ) {
+					return;
+		}
 		show_message($string);
 	}
 

Spacing +28 added lines, -28 removed lines

@@ -34,7 +34,7 @@ 
 	 * @param array $args
 	 */
 	public function __construct($args = array()) {
-		$defaults = array( 'url' => '', 'nonce' => '', 'title' => '', 'context' => false );
+		$defaults = array('url' => '', 'nonce' => '', 'title' => '', 'context' => false);
 		$this->options = wp_parse_args($args, $defaults);
 	}
 
@@ -42,8 +42,8 @@ 
 	 * @param WP_Upgrader $upgrader
 	 */
 	public function set_upgrader(&$upgrader) {
-		if ( is_object($upgrader) )
-			$this->upgrader =& $upgrader;
+		if (is_object($upgrader))
+			$this->upgrader = & $upgrader;
 		$this->add_strings();
 	}
 
@@ -61,7 +61,7 @@ 
 	 *
 	 * @param string|bool|WP_Error $result The result of an upgrade.
 	 */
-	public function set_result( $result ) {
+	public function set_result($result) {
 		$this->result = $result;
 	}
 
@@ -81,37 +81,37 @@ 
 	 * @param bool   $allow_relaxed_file_ownership Optional. Whether to allow Group/World writable. Default false.
 	 * @return bool False on failure, true on success.
 	 */
-	public function request_filesystem_credentials( $error = false, $context = '', $allow_relaxed_file_ownership = false ) {
+	public function request_filesystem_credentials($error = false, $context = '', $allow_relaxed_file_ownership = false) {
 		$url = $this->options['url'];
-		if ( ! $context ) {
+		if ( ! $context) {
 			$context = $this->options['context'];
 		}
-		if ( !empty($this->options['nonce']) ) {
+		if ( ! empty($this->options['nonce'])) {
 			$url = wp_nonce_url($url, $this->options['nonce']);
 		}
 
 		$extra_fields = array();
 
-		return request_filesystem_credentials( $url, '', $error, $context, $extra_fields, $allow_relaxed_file_ownership );
+		return request_filesystem_credentials($url, '', $error, $context, $extra_fields, $allow_relaxed_file_ownership);
 	}
 
 	/**
 	 * @access public
 	 */
 	public function header() {
-		if ( $this->done_header ) {
+		if ($this->done_header) {
 			return;
 		}
 		$this->done_header = true;
 		echo '<div class="wrap">';
-		echo '<h1>' . $this->options['title'] . '</h1>';
+		echo '<h1>'.$this->options['title'].'</h1>';
 	}
 
 	/**
 	 * @access public
 	 */
 	public function footer() {
-		if ( $this->done_footer ) {
+		if ($this->done_footer) {
 			return;
 		}
 		$this->done_footer = true;
@@ -123,14 +123,14 @@ 
 	 * @param string|WP_Error $errors
 	 */
 	public function error($errors) {
-		if ( ! $this->done_header )
+		if ( ! $this->done_header)
 			$this->header();
-		if ( is_string($errors) ) {
+		if (is_string($errors)) {
 			$this->feedback($errors);
-		} elseif ( is_wp_error($errors) && $errors->get_error_code() ) {
-			foreach ( $errors->get_error_messages() as $message ) {
-				if ( $errors->get_error_data() && is_string( $errors->get_error_data() ) )
-					$this->feedback($message . ' ' . esc_html( strip_tags( $errors->get_error_data() ) ) );
+		} elseif (is_wp_error($errors) && $errors->get_error_code()) {
+			foreach ($errors->get_error_messages() as $message) {
+				if ($errors->get_error_data() && is_string($errors->get_error_data()))
+					$this->feedback($message.' '.esc_html(strip_tags($errors->get_error_data())));
 				else
 					$this->feedback($message);
 			}
@@ -142,19 +142,19 @@ 
 	 * @param string $string
 	 */
 	public function feedback($string) {
-		if ( isset( $this->upgrader->strings[$string] ) )
+		if (isset($this->upgrader->strings[$string]))
 			$string = $this->upgrader->strings[$string];
 
-		if ( strpos($string, '%') !== false ) {
+		if (strpos($string, '%') !== false) {
 			$args = func_get_args();
 			$args = array_splice($args, 1);
-			if ( $args ) {
-				$args = array_map( 'strip_tags', $args );
-				$args = array_map( 'esc_html', $args );
+			if ($args) {
+				$args = array_map('strip_tags', $args);
+				$args = array_map('esc_html', $args);
 				$string = vsprintf($string, $args);
 			}
 		}
-		if ( empty($string) )
+		if (empty($string))
 			return;
 		show_message($string);
 	}
@@ -177,22 +177,22 @@ 
 	 * @param string $type Type of update count to decrement. Likely values include 'plugin',
 	 *                     'theme', 'translation', etc.
 	 */
-	protected function decrement_update_count( $type ) {
-		if ( ! $this->result || is_wp_error( $this->result ) || 'up_to_date' === $this->result ) {
+	protected function decrement_update_count($type) {
+		if ( ! $this->result || is_wp_error($this->result) || 'up_to_date' === $this->result) {
 			return;
 		}
 
-		if ( defined( 'IFRAME_REQUEST' ) ) {
+		if (defined('IFRAME_REQUEST')) {
 			echo '<script type="text/javascript">
 					if ( window.postMessage && JSON ) {
-						window.parent.postMessage( JSON.stringify( { action: "decrementUpdateCount", upgradeType: "' . $type . '" } ), window.location.protocol + "//" + window.location.hostname );
+						window.parent.postMessage( JSON.stringify( { action: "decrementUpdateCount", upgradeType: "' . $type.'" } ), window.location.protocol + "//" + window.location.hostname );
 					}
 				</script>';
 		} else {
 			echo '<script type="text/javascript">
 					(function( wp ) {
 						if ( wp && wp.updates.decrementCount ) {
-							wp.updates.decrementCount( "' . $type . '" );
+							wp.updates.decrementCount( "' . $type.'" );
 						}
 					})( window.wp );
 				</script>';

src/wp-admin/includes/class-wp-ms-sites-list-table.php

Braces +12 added lines, -8 removed lines

@@ -94,10 +94,12 @@ 
 		 * the latest sites with no paging in order to avoid expensive count queries.
 		 */
 		if ( !$s && wp_is_large_network() ) {
-			if ( !isset($_REQUEST['orderby']) )
-				$_GET['orderby'] = $_REQUEST['orderby'] = '';
-			if ( !isset($_REQUEST['order']) )
-				$_GET['order'] = $_REQUEST['order'] = 'DESC';
+			if ( !isset($_REQUEST['orderby']) ) {
+							$_GET['orderby'] = $_REQUEST['orderby'] = '';
+			}
+			if ( !isset($_REQUEST['order']) ) {
+							$_GET['order'] = $_REQUEST['order'] = 'DESC';
+			}
 		}
 
 		$args = array(
@@ -199,8 +201,9 @@ 
 	 */
 	protected function get_bulk_actions() {
 		$actions = array();
-		if ( current_user_can( 'delete_sites' ) )
-			$actions['delete'] = __( 'Delete' );
+		if ( current_user_can( 'delete_sites' ) ) {
+					$actions['delete'] = __( 'Delete' );
+		}
 		$actions['spam'] = _x( 'Mark as Spam', 'site' );
 		$actions['notspam'] = _x( 'Not Spam', 'site' );
 
@@ -217,8 +220,9 @@ 
 
 		parent::pagination( $which );
 
-		if ( 'top' === $which )
-			$this->view_switcher( $mode );
+		if ( 'top' === $which ) {
+					$this->view_switcher( $mode );
+		}
 	}
 
 	/**

Spacing +137 added lines, -137 removed lines

@@ -36,18 +36,18 @@ 
 	 *
 	 * @param array $args An associative array of arguments.
 	 */
-	public function __construct( $args = array() ) {
+	public function __construct($args = array()) {
 		$this->status_list = array(
-			'archived' => array( 'site-archived', __( 'Archived' ) ),
-			'spam'     => array( 'site-spammed', _x( 'Spam', 'site' ) ),
-			'deleted'  => array( 'site-deleted', __( 'Deleted' ) ),
-			'mature'   => array( 'site-mature', __( 'Mature' ) )
+			'archived' => array('site-archived', __('Archived')),
+			'spam'     => array('site-spammed', _x('Spam', 'site')),
+			'deleted'  => array('site-deleted', __('Deleted')),
+			'mature'   => array('site-mature', __('Mature'))
 		);
 
-		parent::__construct( array(
+		parent::__construct(array(
 			'plural' => 'sites',
-			'screen' => isset( $args['screen'] ) ? $args['screen'] : null,
-		) );
+			'screen' => isset($args['screen']) ? $args['screen'] : null,
+		));
 	}
 
 	/**
@@ -55,7 +55,7 @@ 
 	 * @return bool
 	 */
 	public function ajax_user_can() {
-		return current_user_can( 'manage_sites' );
+		return current_user_can('manage_sites');
 	}
 
 	/**
@@ -70,20 +70,20 @@ 
 	public function prepare_items() {
 		global $s, $mode, $wpdb;
 
-		if ( ! empty( $_REQUEST['mode'] ) ) {
+		if ( ! empty($_REQUEST['mode'])) {
 			$mode = $_REQUEST['mode'] === 'excerpt' ? 'excerpt' : 'list';
-			set_user_setting( 'sites_list_mode', $mode );
+			set_user_setting('sites_list_mode', $mode);
 		} else {
-			$mode = get_user_setting( 'sites_list_mode', 'list' );
+			$mode = get_user_setting('sites_list_mode', 'list');
 		}
 
-		$per_page = $this->get_items_per_page( 'sites_network_per_page' );
+		$per_page = $this->get_items_per_page('sites_network_per_page');
 
 		$pagenum = $this->get_pagenum();
 
-		$s = isset( $_REQUEST['s'] ) ? wp_unslash( trim( $_REQUEST[ 's' ] ) ) : '';
+		$s = isset($_REQUEST['s']) ? wp_unslash(trim($_REQUEST['s'])) : '';
 		$wild = '';
-		if ( false !== strpos($s, '*') ) {
+		if (false !== strpos($s, '*')) {
 			$wild = '*';
 			$s = trim($s, '*');
 		}
@@ -92,66 +92,66 @@ 
 		 * If the network is large and a search is not being performed, show only
 		 * the latest sites with no paging in order to avoid expensive count queries.
 		 */
-		if ( !$s && wp_is_large_network() ) {
-			if ( !isset($_REQUEST['orderby']) )
+		if ( ! $s && wp_is_large_network()) {
+			if ( ! isset($_REQUEST['orderby']))
 				$_GET['orderby'] = $_REQUEST['orderby'] = '';
-			if ( !isset($_REQUEST['order']) )
+			if ( ! isset($_REQUEST['order']))
 				$_GET['order'] = $_REQUEST['order'] = 'DESC';
 		}
 
 		$args = array(
-			'number'     => intval( $per_page ),
-			'offset'     => intval( ( $pagenum - 1 ) * $per_page ),
+			'number'     => intval($per_page),
+			'offset'     => intval(($pagenum - 1) * $per_page),
 			'network_id' => get_current_network_id(),
 		);
 
-		if ( empty($s) ) {
+		if (empty($s)) {
 			// Nothing to do.
-		} elseif ( preg_match( '/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$/', $s ) ||
-					preg_match( '/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.?$/', $s ) ||
-					preg_match( '/^[0-9]{1,3}\.[0-9]{1,3}\.?$/', $s ) ||
-					preg_match( '/^[0-9]{1,3}\.$/', $s ) ) {
+		} elseif (preg_match('/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$/', $s) ||
+					preg_match('/^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.?$/', $s) ||
+					preg_match('/^[0-9]{1,3}\.[0-9]{1,3}\.?$/', $s) ||
+					preg_match('/^[0-9]{1,3}\.$/', $s)) {
 			// IPv4 address
-			$sql = $wpdb->prepare( "SELECT blog_id FROM {$wpdb->registration_log} WHERE {$wpdb->registration_log}.IP LIKE %s", $wpdb->esc_like( $s ) . ( ! empty( $wild ) ? '%' : '' ) );
-			$reg_blog_ids = $wpdb->get_col( $sql );
+			$sql = $wpdb->prepare("SELECT blog_id FROM {$wpdb->registration_log} WHERE {$wpdb->registration_log}.IP LIKE %s", $wpdb->esc_like($s).( ! empty($wild) ? '%' : ''));
+			$reg_blog_ids = $wpdb->get_col($sql);
 
-			if ( $reg_blog_ids ) {
+			if ($reg_blog_ids) {
 				$args['site__in'] = $reg_blog_ids;
 			}
-		} elseif ( is_numeric( $s ) && empty( $wild ) ) {
+		} elseif (is_numeric($s) && empty($wild)) {
 			$args['ID'] = $s;
 		} else {
 			$args['search'] = $s;
 
-			if ( ! is_subdomain_install() ) {
-				$args['search_columns'] = array( 'path' );
+			if ( ! is_subdomain_install()) {
+				$args['search_columns'] = array('path');
 			}
 		}
 
-		$order_by = isset( $_REQUEST['orderby'] ) ? $_REQUEST['orderby'] : '';
-		if ( 'registered' === $order_by ) {
+		$order_by = isset($_REQUEST['orderby']) ? $_REQUEST['orderby'] : '';
+		if ('registered' === $order_by) {
 			// registered is a valid field name.
-		} elseif ( 'lastupdated' === $order_by ) {
+		} elseif ('lastupdated' === $order_by) {
 			$order_by = 'last_updated';
-		} elseif ( 'blogname' === $order_by ) {
-			if ( is_subdomain_install() ) {
+		} elseif ('blogname' === $order_by) {
+			if (is_subdomain_install()) {
 				$order_by = 'domain';
 			} else {
 				$order_by = 'path';
 			}
-		} elseif ( 'blog_id' === $order_by ) {
+		} elseif ('blog_id' === $order_by) {
 			$order_by = 'id';
-		} elseif ( ! $order_by ) {
+		} elseif ( ! $order_by) {
 			$order_by = false;
 		}
 
 		$args['orderby'] = $order_by;
 
-		if ( $order_by ) {
-			$args['order'] = ( isset( $_REQUEST['order'] ) && 'DESC' === strtoupper( $_REQUEST['order'] ) ) ? "DESC" : "ASC";
+		if ($order_by) {
+			$args['order'] = (isset($_REQUEST['order']) && 'DESC' === strtoupper($_REQUEST['order'])) ? "DESC" : "ASC";
 		}
 
-		if ( wp_is_large_network() ) {
+		if (wp_is_large_network()) {
 			$args['no_found_rows'] = true;
 		} else {
 			$args['no_found_rows'] = false;
@@ -164,32 +164,32 @@ 
 		 *
 		 * @param array $args An array of get_sites() arguments.
 		 */
-		$args = apply_filters( 'ms_sites_list_table_query_args', $args );
+		$args = apply_filters('ms_sites_list_table_query_args', $args);
 
-		$_sites = get_sites( $args );
-		if ( is_array( $_sites ) ) {
-			update_site_cache( $_sites );
+		$_sites = get_sites($args);
+		if (is_array($_sites)) {
+			update_site_cache($_sites);
 
-			$this->items = array_slice( $_sites, 0, $per_page );
+			$this->items = array_slice($_sites, 0, $per_page);
 		}
 
-		$total_sites = get_sites( array_merge( $args, array(
+		$total_sites = get_sites(array_merge($args, array(
 			'count' => true,
 			'offset' => 0,
 			'number' => 0,
-		) ) );
+		)));
 
-		$this->set_pagination_args( array(
+		$this->set_pagination_args(array(
 			'total_items' => $total_sites,
 			'per_page' => $per_page,
-		) );
+		));
 	}
 
 	/**
 	 * @access public
 	 */
 	public function no_items() {
-		_e( 'No sites found.' );
+		_e('No sites found.');
 	}
 
 	/**
@@ -198,10 +198,10 @@ 
 	 */
 	protected function get_bulk_actions() {
 		$actions = array();
-		if ( current_user_can( 'delete_sites' ) )
-			$actions['delete'] = __( 'Delete' );
-		$actions['spam'] = _x( 'Mark as Spam', 'site' );
-		$actions['notspam'] = _x( 'Not Spam', 'site' );
+		if (current_user_can('delete_sites'))
+			$actions['delete'] = __('Delete');
+		$actions['spam'] = _x('Mark as Spam', 'site');
+		$actions['notspam'] = _x('Not Spam', 'site');
 
 		return $actions;
 	}
@@ -211,13 +211,13 @@ 
 	 *
 	 * @param string $which
 	 */
-	protected function pagination( $which ) {
+	protected function pagination($which) {
 		global $mode;
 
-		parent::pagination( $which );
+		parent::pagination($which);
 
-		if ( 'top' === $which )
-			$this->view_switcher( $mode );
+		if ('top' === $which)
+			$this->view_switcher($mode);
 	}
 
 	/**
@@ -226,14 +226,14 @@ 
 	public function get_columns() {
 		$sites_columns = array(
 			'cb'          => '<input type="checkbox" />',
-			'blogname'    => __( 'URL' ),
-			'lastupdated' => __( 'Last Updated' ),
-			'registered'  => _x( 'Registered', 'site' ),
-			'users'       => __( 'Users' ),
+			'blogname'    => __('URL'),
+			'lastupdated' => __('Last Updated'),
+			'registered'  => _x('Registered', 'site'),
+			'users'       => __('Users'),
 		);
 
-		if ( has_filter( 'wpmublogsaction' ) ) {
-			$sites_columns['plugins'] = __( 'Actions' );
+		if (has_filter('wpmublogsaction')) {
+			$sites_columns['plugins'] = __('Actions');
 		}
 
 		/**
@@ -244,7 +244,7 @@ 
 		 * @param array $sites_columns An array of displayed site columns. Default 'cb',
 		 *                             'blogname', 'lastupdated', 'registered', 'users'.
 		 */
-		return apply_filters( 'wpmu_blogs_columns', $sites_columns );
+		return apply_filters('wpmu_blogs_columns', $sites_columns);
 	}
 
 	/**
@@ -266,14 +266,14 @@ 
 	 *
 	 * @param array $blog Current site.
 	 */
-	public function column_cb( $blog ) {
-		if ( ! is_main_site( $blog['blog_id'] ) ) :
-			$blogname = untrailingslashit( $blog['domain'] . $blog['path'] );
+	public function column_cb($blog) {
+		if ( ! is_main_site($blog['blog_id'])) :
+			$blogname = untrailingslashit($blog['domain'].$blog['path']);
 		?>
 			<label class="screen-reader-text" for="blog_<?php echo $blog['blog_id']; ?>"><?php
-				printf( __( 'Select %s' ), $blogname );
+				printf(__('Select %s'), $blogname);
 			?></label>
-			<input type="checkbox" id="blog_<?php echo $blog['blog_id'] ?>" name="allblogs[]" value="<?php echo esc_attr( $blog['blog_id'] ) ?>" />
+			<input type="checkbox" id="blog_<?php echo $blog['blog_id'] ?>" name="allblogs[]" value="<?php echo esc_attr($blog['blog_id']) ?>" />
 		<?php endif;
 	}
 
@@ -285,7 +285,7 @@ 
 	 *
 	 * @param array $blog Current site.
 	 */
-	public function column_id( $blog ) {
+	public function column_id($blog) {
 		echo $blog['blog_id'];
 	}
 
@@ -299,44 +299,44 @@ 
 	 *
 	 * @param array $blog Current site.
 	 */
-	public function column_blogname( $blog ) {
+	public function column_blogname($blog) {
 		global $mode;
 
-		$blogname = untrailingslashit( $blog['domain'] . $blog['path'] );
+		$blogname = untrailingslashit($blog['domain'].$blog['path']);
 		$blog_states = array();
-		reset( $this->status_list );
+		reset($this->status_list);
 
-		foreach ( $this->status_list as $status => $col ) {
-			if ( $blog[ $status ] == 1 ) {
+		foreach ($this->status_list as $status => $col) {
+			if ($blog[$status] == 1) {
 				$blog_states[] = $col[1];
 			}
 		}
 		$blog_state = '';
-		if ( ! empty( $blog_states ) ) {
-			$state_count = count( $blog_states );
+		if ( ! empty($blog_states)) {
+			$state_count = count($blog_states);
 			$i = 0;
 			$blog_state .= ' &mdash; ';
-			foreach ( $blog_states as $state ) {
+			foreach ($blog_states as $state) {
 				++$i;
-				$sep = ( $i == $state_count ) ? '' : ', ';
+				$sep = ($i == $state_count) ? '' : ', ';
 				$blog_state .= "<span class='post-state'>$state$sep</span>";
 			}
 		}
 
 		?>
 		<strong>
-			<a href="<?php echo esc_url( network_admin_url( 'site-info.php?id=' . $blog['blog_id'] ) ); ?>" class="edit"><?php echo $blogname; ?></a>
+			<a href="<?php echo esc_url(network_admin_url('site-info.php?id='.$blog['blog_id'])); ?>" class="edit"><?php echo $blogname; ?></a>
 			<?php echo $blog_state; ?>
 		</strong>
 		<?php
-		if ( 'list' !== $mode ) {
-			switch_to_blog( $blog['blog_id'] );
+		if ('list' !== $mode) {
+			switch_to_blog($blog['blog_id']);
 			echo '<p>';
 			printf(
 				/* translators: 1: site name, 2: site tagline. */
-				__( '%1$s &#8211; %2$s' ),
-				get_option( 'blogname' ),
-				'<em>' . get_option( 'blogdescription ' ) . '</em>'
+				__('%1$s &#8211; %2$s'),
+				get_option('blogname'),
+				'<em>'.get_option('blogdescription ').'</em>'
 			);
 			echo '</p>';
 			restore_current_blog();
@@ -353,16 +353,16 @@ 
 	 *
 	 * @param array $blog Current site.
 	 */
-	public function column_lastupdated( $blog ) {
+	public function column_lastupdated($blog) {
 		global $mode;
 
-		if ( 'list' === $mode ) {
-			$date = __( 'Y/m/d' );
+		if ('list' === $mode) {
+			$date = __('Y/m/d');
 		} else {
-			$date = __( 'Y/m/d g:i:s a' );
+			$date = __('Y/m/d g:i:s a');
 		}
 
-		echo ( $blog['last_updated'] === '0000-00-00 00:00:00' ) ? __( 'Never' ) : mysql2date( $date, $blog['last_updated'] );
+		echo ($blog['last_updated'] === '0000-00-00 00:00:00') ? __('Never') : mysql2date($date, $blog['last_updated']);
 	}
 
 	/**
@@ -375,19 +375,19 @@ 
 	 *
 	 * @param array $blog Current site.
 	 */
-	public function column_registered( $blog ) {
+	public function column_registered($blog) {
 		global $mode;
 
-		if ( 'list' === $mode ) {
-			$date = __( 'Y/m/d' );
+		if ('list' === $mode) {
+			$date = __('Y/m/d');
 		} else {
-			$date = __( 'Y/m/d g:i:s a' );
+			$date = __('Y/m/d g:i:s a');
 		}
 
-		if ( $blog['registered'] === '0000-00-00 00:00:00' ) {
+		if ($blog['registered'] === '0000-00-00 00:00:00') {
 			echo '&#x2014;';
 		} else {
-			echo mysql2date( $date, $blog['registered'] );
+			echo mysql2date($date, $blog['registered']);
 		}
 	}
 
@@ -399,19 +399,19 @@ 
 	 *
 	 * @param array $blog Current site.
 	 */
-	public function column_users( $blog ) {
-		$user_count = wp_cache_get( $blog['blog_id'] . '_user_count', 'blog-details' );
-		if ( ! $user_count ) {
-			$blog_users = get_users( array( 'blog_id' => $blog['blog_id'], 'fields' => 'ID' ) );
-			$user_count = count( $blog_users );
-			unset( $blog_users );
-			wp_cache_set( $blog['blog_id'] . '_user_count', $user_count, 'blog-details', 12 * HOUR_IN_SECONDS );
+	public function column_users($blog) {
+		$user_count = wp_cache_get($blog['blog_id'].'_user_count', 'blog-details');
+		if ( ! $user_count) {
+			$blog_users = get_users(array('blog_id' => $blog['blog_id'], 'fields' => 'ID'));
+			$user_count = count($blog_users);
+			unset($blog_users);
+			wp_cache_set($blog['blog_id'].'_user_count', $user_count, 'blog-details', 12 * HOUR_IN_SECONDS);
 		}
 
 		printf(
 			'<a href="%s">%s</a>',
-			esc_url( network_admin_url( 'site-users.php?id=' . $blog['blog_id'] ) ),
-			number_format_i18n( $user_count )
+			esc_url(network_admin_url('site-users.php?id='.$blog['blog_id'])),
+			number_format_i18n($user_count)
 		);
 	}
 
@@ -423,8 +423,8 @@ 
 	 *
 	 * @param array $blog Current site.
 	 */
-	public function column_plugins( $blog ) {
-		if ( has_filter( 'wpmublogsaction' ) ) {
+	public function column_plugins($blog) {
+		if (has_filter('wpmublogsaction')) {
 			/**
 			 * Fires inside the auxiliary 'Actions' column of the Sites list table.
 			 *
@@ -434,7 +434,7 @@ 
 			 *
 			 * @param int $blog_id The site ID.
 			 */
-			do_action( 'wpmublogsaction', $blog['blog_id'] );
+			do_action('wpmublogsaction', $blog['blog_id']);
 		}
 	}
 
@@ -447,7 +447,7 @@ 
 	 * @param array  $blog        Current site.
 	 * @param string $column_name Current column name.
 	 */
-	public function column_default( $blog, $column_name ) {
+	public function column_default($blog, $column_name) {
 		/**
 		 * Fires for each registered custom column in the Sites list table.
 		 *
@@ -456,7 +456,7 @@ 
 		 * @param string $column_name The name of the column to display.
 		 * @param int    $blog_id     The site ID.
 		 */
-		do_action( 'manage_sites_custom_column', $column_name, $blog['blog_id'] );
+		do_action('manage_sites_custom_column', $column_name, $blog['blog_id']);
 	}
 
 	/**
@@ -464,20 +464,20 @@ 
 	 * @global string $mode
 	 */
 	public function display_rows() {
-		foreach ( $this->items as $blog ) {
+		foreach ($this->items as $blog) {
 			$blog = $blog->to_array();
 			$class = '';
-			reset( $this->status_list );
+			reset($this->status_list);
 
-			foreach ( $this->status_list as $status => $col ) {
-				if ( $blog[ $status ] == 1 ) {
+			foreach ($this->status_list as $status => $col) {
+				if ($blog[$status] == 1) {
 					$class = " class='{$col[0]}'";
 				}
 			}
 
 			echo "<tr{$class}>";
 
-			$this->single_row_columns( $blog );
+			$this->single_row_columns($blog);
 
 			echo '</tr>';
 		}
@@ -506,12 +506,12 @@ 
 	 * @param string $primary     Primary column name.
 	 * @return string Row actions output.
 	 */
-	protected function handle_row_actions( $blog, $column_name, $primary ) {
-		if ( $primary !== $column_name ) {
+	protected function handle_row_actions($blog, $column_name, $primary) {
+		if ($primary !== $column_name) {
 			return;
 		}
 
-		$blogname = untrailingslashit( $blog['domain'] . $blog['path'] );
+		$blogname = untrailingslashit($blog['domain'].$blog['path']);
 
 		// Preordered.
 		$actions = array(
@@ -523,33 +523,33 @@ 
 			'visit' => '',
 		);
 
-		$actions['edit']	= '<a href="' . esc_url( network_admin_url( 'site-info.php?id=' . $blog['blog_id'] ) ) . '">' . __( 'Edit' ) . '</a>';
-		$actions['backend']	= "<a href='" . esc_url( get_admin_url( $blog['blog_id'] ) ) . "' class='edit'>" . __( 'Dashboard' ) . '</a>';
-		if ( get_network()->site_id != $blog['blog_id'] ) {
-			if ( $blog['deleted'] == '1' ) {
-				$actions['activate']   = '<a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=activateblog&amp;id=' . $blog['blog_id'] ), 'activateblog_' . $blog['blog_id'] ) ) . '">' . __( 'Activate' ) . '</a>';
+		$actions['edit'] = '<a href="'.esc_url(network_admin_url('site-info.php?id='.$blog['blog_id'])).'">'.__('Edit').'</a>';
+		$actions['backend'] = "<a href='".esc_url(get_admin_url($blog['blog_id']))."' class='edit'>".__('Dashboard').'</a>';
+		if (get_network()->site_id != $blog['blog_id']) {
+			if ($blog['deleted'] == '1') {
+				$actions['activate']   = '<a href="'.esc_url(wp_nonce_url(network_admin_url('sites.php?action=confirm&amp;action2=activateblog&amp;id='.$blog['blog_id']), 'activateblog_'.$blog['blog_id'])).'">'.__('Activate').'</a>';
 			} else {
-				$actions['deactivate'] = '<a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=deactivateblog&amp;id=' . $blog['blog_id'] ), 'deactivateblog_' . $blog['blog_id'] ) ) . '">' . __( 'Deactivate' ) . '</a>';
+				$actions['deactivate'] = '<a href="'.esc_url(wp_nonce_url(network_admin_url('sites.php?action=confirm&amp;action2=deactivateblog&amp;id='.$blog['blog_id']), 'deactivateblog_'.$blog['blog_id'])).'">'.__('Deactivate').'</a>';
 			}
 
-			if ( $blog['archived'] == '1' ) {
-				$actions['unarchive'] = '<a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=unarchiveblog&amp;id=' . $blog['blog_id'] ), 'unarchiveblog_' . $blog['blog_id'] ) ) . '">' . __( 'Unarchive' ) . '</a>';
+			if ($blog['archived'] == '1') {
+				$actions['unarchive'] = '<a href="'.esc_url(wp_nonce_url(network_admin_url('sites.php?action=confirm&amp;action2=unarchiveblog&amp;id='.$blog['blog_id']), 'unarchiveblog_'.$blog['blog_id'])).'">'.__('Unarchive').'</a>';
 			} else {
-				$actions['archive']   = '<a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=archiveblog&amp;id=' . $blog['blog_id'] ), 'archiveblog_' . $blog['blog_id'] ) ) . '">' . _x( 'Archive', 'verb; site' ) . '</a>';
+				$actions['archive']   = '<a href="'.esc_url(wp_nonce_url(network_admin_url('sites.php?action=confirm&amp;action2=archiveblog&amp;id='.$blog['blog_id']), 'archiveblog_'.$blog['blog_id'])).'">'._x('Archive', 'verb; site').'</a>';
 			}
 
-			if ( $blog['spam'] == '1' ) {
-				$actions['unspam'] = '<a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=unspamblog&amp;id=' . $blog['blog_id'] ), 'unspamblog_' . $blog['blog_id'] ) ) . '">' . _x( 'Not Spam', 'site' ) . '</a>';
+			if ($blog['spam'] == '1') {
+				$actions['unspam'] = '<a href="'.esc_url(wp_nonce_url(network_admin_url('sites.php?action=confirm&amp;action2=unspamblog&amp;id='.$blog['blog_id']), 'unspamblog_'.$blog['blog_id'])).'">'._x('Not Spam', 'site').'</a>';
 			} else {
-				$actions['spam']   = '<a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=spamblog&amp;id=' . $blog['blog_id'] ), 'spamblog_' . $blog['blog_id'] ) ) . '">' . _x( 'Spam', 'site' ) . '</a>';
+				$actions['spam']   = '<a href="'.esc_url(wp_nonce_url(network_admin_url('sites.php?action=confirm&amp;action2=spamblog&amp;id='.$blog['blog_id']), 'spamblog_'.$blog['blog_id'])).'">'._x('Spam', 'site').'</a>';
 			}
 
-			if ( current_user_can( 'delete_site', $blog['blog_id'] ) ) {
-				$actions['delete'] = '<a href="' . esc_url( wp_nonce_url( network_admin_url( 'sites.php?action=confirm&amp;action2=deleteblog&amp;id=' . $blog['blog_id'] ), 'deleteblog_' . $blog['blog_id'] ) ) . '">' . __( 'Delete' ) . '</a>';
+			if (current_user_can('delete_site', $blog['blog_id'])) {
+				$actions['delete'] = '<a href="'.esc_url(wp_nonce_url(network_admin_url('sites.php?action=confirm&amp;action2=deleteblog&amp;id='.$blog['blog_id']), 'deleteblog_'.$blog['blog_id'])).'">'.__('Delete').'</a>';
 			}
 		}
 
-		$actions['visit']	= "<a href='" . esc_url( get_home_url( $blog['blog_id'], '/' ) ) . "' rel='bookmark'>" . __( 'Visit' ) . '</a>';
+		$actions['visit'] = "<a href='".esc_url(get_home_url($blog['blog_id'], '/'))."' rel='bookmark'>".__('Visit').'</a>';
 
 		/**
 		 * Filters the action links displayed for each site in the Sites list table.
@@ -566,7 +566,7 @@ 
 		 * @param string $blogname Site path, formatted depending on whether it is a sub-domain
 		 *                         or subdirectory multisite install.
 		 */
-		$actions = apply_filters( 'manage_sites_action_links', array_filter( $actions ), $blog['blog_id'], $blogname );
-		return $this->row_actions( $actions );
+		$actions = apply_filters('manage_sites_action_links', array_filter($actions), $blog['blog_id'], $blogname);
+		return $this->row_actions($actions);
 	}
 }

src/wp-admin/includes/class-theme-installer-skin.php

Spacing +24 added lines, -24 removed lines

@@ -22,7 +22,7 @@ 
 	 * @param array $args
 	 */
 	public function __construct($args = array()) {
-		$defaults = array( 'type' => 'web', 'url' => '', 'theme' => '', 'nonce' => '', 'title' => '' );
+		$defaults = array('type' => 'web', 'url' => '', 'theme' => '', 'nonce' => '', 'title' => '');
 		$args = wp_parse_args($args, $defaults);
 
 		$this->type = $args['type'];
@@ -35,49 +35,49 @@ 
 	 * @access public
 	 */
 	public function before() {
-		if ( !empty($this->api) )
-			$this->upgrader->strings['process_success'] = sprintf( $this->upgrader->strings['process_success_specific'], $this->api->name, $this->api->version);
+		if ( ! empty($this->api))
+			$this->upgrader->strings['process_success'] = sprintf($this->upgrader->strings['process_success_specific'], $this->api->name, $this->api->version);
 	}
 
 	/**
 	 * @access public
 	 */
 	public function after() {
-		if ( empty($this->upgrader->result['destination_name']) )
+		if (empty($this->upgrader->result['destination_name']))
 			return;
 
 		$theme_info = $this->upgrader->theme_info();
-		if ( empty( $theme_info ) )
+		if (empty($theme_info))
 			return;
 
 		$name       = $theme_info->display('Name');
 		$stylesheet = $this->upgrader->result['destination_name'];
 		$template   = $theme_info->get_template();
 
-		$activate_link = add_query_arg( array(
+		$activate_link = add_query_arg(array(
 			'action'     => 'activate',
-			'template'   => urlencode( $template ),
-			'stylesheet' => urlencode( $stylesheet ),
-		), admin_url('themes.php') );
-		$activate_link = wp_nonce_url( $activate_link, 'switch-theme_' . $stylesheet );
+			'template'   => urlencode($template),
+			'stylesheet' => urlencode($stylesheet),
+		), admin_url('themes.php'));
+		$activate_link = wp_nonce_url($activate_link, 'switch-theme_'.$stylesheet);
 
 		$install_actions = array();
 
-		if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) {
-			$install_actions['preview'] = '<a href="' . wp_customize_url( $stylesheet ) . '" class="hide-if-no-customize load-customize"><span aria-hidden="true">' . __( 'Live Preview' ) . '</span><span class="screen-reader-text">' . sprintf( __( 'Live Preview &#8220;%s&#8221;' ), $name ) . '</span></a>';
+		if (current_user_can('edit_theme_options') && current_user_can('customize')) {
+			$install_actions['preview'] = '<a href="'.wp_customize_url($stylesheet).'" class="hide-if-no-customize load-customize"><span aria-hidden="true">'.__('Live Preview').'</span><span class="screen-reader-text">'.sprintf(__('Live Preview &#8220;%s&#8221;'), $name).'</span></a>';
 		}
-		$install_actions['activate'] = '<a href="' . esc_url( $activate_link ) . '" class="activatelink"><span aria-hidden="true">' . __( 'Activate' ) . '</span><span class="screen-reader-text">' . sprintf( __( 'Activate &#8220;%s&#8221;' ), $name ) . '</span></a>';
+		$install_actions['activate'] = '<a href="'.esc_url($activate_link).'" class="activatelink"><span aria-hidden="true">'.__('Activate').'</span><span class="screen-reader-text">'.sprintf(__('Activate &#8220;%s&#8221;'), $name).'</span></a>';
 
-		if ( is_network_admin() && current_user_can( 'manage_network_themes' ) )
-			$install_actions['network_enable'] = '<a href="' . esc_url( wp_nonce_url( 'themes.php?action=enable&amp;theme=' . urlencode( $stylesheet ), 'enable-theme_' . $stylesheet ) ) . '" target="_parent">' . __( 'Network Enable' ) . '</a>';
+		if (is_network_admin() && current_user_can('manage_network_themes'))
+			$install_actions['network_enable'] = '<a href="'.esc_url(wp_nonce_url('themes.php?action=enable&amp;theme='.urlencode($stylesheet), 'enable-theme_'.$stylesheet)).'" target="_parent">'.__('Network Enable').'</a>';
 
-		if ( $this->type == 'web' )
-			$install_actions['themes_page'] = '<a href="' . self_admin_url( 'theme-install.php' ) . '" target="_parent">' . __( 'Return to Theme Installer' ) . '</a>';
-		elseif ( current_user_can( 'switch_themes' ) || current_user_can( 'edit_theme_options' ) )
-			$install_actions['themes_page'] = '<a href="' . self_admin_url( 'themes.php' ) . '" target="_parent">' . __( 'Return to Themes page' ) . '</a>';
+		if ($this->type == 'web')
+			$install_actions['themes_page'] = '<a href="'.self_admin_url('theme-install.php').'" target="_parent">'.__('Return to Theme Installer').'</a>';
+		elseif (current_user_can('switch_themes') || current_user_can('edit_theme_options'))
+			$install_actions['themes_page'] = '<a href="'.self_admin_url('themes.php').'" target="_parent">'.__('Return to Themes page').'</a>';
 
-		if ( ! $this->result || is_wp_error($this->result) || is_network_admin() || ! current_user_can( 'switch_themes' ) )
-			unset( $install_actions['activate'], $install_actions['preview'] );
+		if ( ! $this->result || is_wp_error($this->result) || is_network_admin() || ! current_user_can('switch_themes'))
+			unset($install_actions['activate'], $install_actions['preview']);
 
 		/**
 		 * Filters the list of action links available following a single theme installation.
@@ -89,8 +89,8 @@ 
 		 * @param string   $stylesheet      Theme directory name.
 		 * @param WP_Theme $theme_info      Theme object.
 		 */
-		$install_actions = apply_filters( 'install_theme_complete_actions', $install_actions, $this->api, $stylesheet, $theme_info );
-		if ( ! empty($install_actions) )
-			$this->feedback(implode(' | ', (array)$install_actions));
+		$install_actions = apply_filters('install_theme_complete_actions', $install_actions, $this->api, $stylesheet, $theme_info);
+		if ( ! empty($install_actions))
+			$this->feedback(implode(' | ', (array) $install_actions));
 	}
 }

Braces +23 added lines, -16 removed lines

@@ -35,20 +35,23 @@ 
 	 * @access public
 	 */
 	public function before() {
-		if ( !empty($this->api) )
-			$this->upgrader->strings['process_success'] = sprintf( $this->upgrader->strings['process_success_specific'], $this->api->name, $this->api->version);
+		if ( !empty($this->api) ) {
+					$this->upgrader->strings['process_success'] = sprintf( $this->upgrader->strings['process_success_specific'], $this->api->name, $this->api->version);
+		}
 	}
 
 	/**
 	 * @access public
 	 */
 	public function after() {
-		if ( empty($this->upgrader->result['destination_name']) )
-			return;
+		if ( empty($this->upgrader->result['destination_name']) ) {
+					return;
+		}
 
 		$theme_info = $this->upgrader->theme_info();
-		if ( empty( $theme_info ) )
-			return;
+		if ( empty( $theme_info ) ) {
+					return;
+		}
 
 		$name       = $theme_info->display('Name');
 		$stylesheet = $this->upgrader->result['destination_name'];
@@ -68,16 +71,19 @@ 
 		}
 		$install_actions['activate'] = '<a href="' . esc_url( $activate_link ) . '" class="activatelink"><span aria-hidden="true">' . __( 'Activate' ) . '</span><span class="screen-reader-text">' . sprintf( __( 'Activate &#8220;%s&#8221;' ), $name ) . '</span></a>';
 
-		if ( is_network_admin() && current_user_can( 'manage_network_themes' ) )
-			$install_actions['network_enable'] = '<a href="' . esc_url( wp_nonce_url( 'themes.php?action=enable&amp;theme=' . urlencode( $stylesheet ), 'enable-theme_' . $stylesheet ) ) . '" target="_parent">' . __( 'Network Enable' ) . '</a>';
+		if ( is_network_admin() && current_user_can( 'manage_network_themes' ) ) {
+					$install_actions['network_enable'] = '<a href="' . esc_url( wp_nonce_url( 'themes.php?action=enable&amp;theme=' . urlencode( $stylesheet ), 'enable-theme_' . $stylesheet ) ) . '" target="_parent">' . __( 'Network Enable' ) . '</a>';
+		}
 
-		if ( $this->type == 'web' )
-			$install_actions['themes_page'] = '<a href="' . self_admin_url( 'theme-install.php' ) . '" target="_parent">' . __( 'Return to Theme Installer' ) . '</a>';
-		elseif ( current_user_can( 'switch_themes' ) || current_user_can( 'edit_theme_options' ) )
-			$install_actions['themes_page'] = '<a href="' . self_admin_url( 'themes.php' ) . '" target="_parent">' . __( 'Return to Themes page' ) . '</a>';
+		if ( $this->type == 'web' ) {
+					$install_actions['themes_page'] = '<a href="' . self_admin_url( 'theme-install.php' ) . '" target="_parent">' . __( 'Return to Theme Installer' ) . '</a>';
+		} elseif ( current_user_can( 'switch_themes' ) || current_user_can( 'edit_theme_options' ) ) {
+					$install_actions['themes_page'] = '<a href="' . self_admin_url( 'themes.php' ) . '" target="_parent">' . __( 'Return to Themes page' ) . '</a>';
+		}
 
-		if ( ! $this->result || is_wp_error($this->result) || is_network_admin() || ! current_user_can( 'switch_themes' ) )
-			unset( $install_actions['activate'], $install_actions['preview'] );
+		if ( ! $this->result || is_wp_error($this->result) || is_network_admin() || ! current_user_can( 'switch_themes' ) ) {
+					unset( $install_actions['activate'], $install_actions['preview'] );
+		}
 
 		/**
 		 * Filters the list of action links available following a single theme installation.
@@ -90,7 +96,8 @@ 
 		 * @param WP_Theme $theme_info      Theme object.
 		 */
 		$install_actions = apply_filters( 'install_theme_complete_actions', $install_actions, $this->api, $stylesheet, $theme_info );
-		if ( ! empty($install_actions) )
-			$this->feedback(implode(' | ', (array)$install_actions));
+		if ( ! empty($install_actions) ) {
+					$this->feedback(implode(' | ', (array)$install_actions));
+		}
 	}
 }

src/wp-admin/includes/user.php

Indentation +8 added lines, -8 removed lines

@@ -185,14 +185,14 @@
 		$notify  = isset( $_POST['send_user_notification'] ) ? 'both' : 'admin';
 
 		/**
-		  * Fires after a new user has been created.
-		  *
-		  * @since 4.4.0
-		  *
-		  * @param int    $user_id ID of the newly created user.
-		  * @param string $notify  Type of notification that should happen. See wp_send_new_user_notifications()
-		  *                        for more information on possible values.
-		  */
+		 * Fires after a new user has been created.
+		 *
+		 * @since 4.4.0
+		 *
+		 * @param int    $user_id ID of the newly created user.
+		 * @param string $notify  Type of notification that should happen. See wp_send_new_user_notifications()
+		 *                        for more information on possible values.
+		 */
 		do_action( 'edit_user_created_user', $user_id, $notify );
 	}
 	return $user_id;

Braces +84 added lines, -56 removed lines

@@ -39,31 +39,37 @@ 
 		$update = false;
 	}
 
-	if ( !$update && isset( $_POST['user_login'] ) )
-		$user->user_login = sanitize_user($_POST['user_login'], true);
+	if ( !$update && isset( $_POST['user_login'] ) ) {
+			$user->user_login = sanitize_user($_POST['user_login'], true);
+	}
 
 	$pass1 = $pass2 = '';
-	if ( isset( $_POST['pass1'] ) )
-		$pass1 = $_POST['pass1'];
-	if ( isset( $_POST['pass2'] ) )
-		$pass2 = $_POST['pass2'];
+	if ( isset( $_POST['pass1'] ) ) {
+			$pass1 = $_POST['pass1'];
+	}
+	if ( isset( $_POST['pass2'] ) ) {
+			$pass2 = $_POST['pass2'];
+	}
 
 	if ( isset( $_POST['role'] ) && current_user_can( 'edit_users' ) ) {
 		$new_role = sanitize_text_field( $_POST['role'] );
 		$potential_role = isset($wp_roles->role_objects[$new_role]) ? $wp_roles->role_objects[$new_role] : false;
 		// Don't let anyone with 'edit_users' (admins) edit their own role to something without it.
 		// Multisite super admins can freely edit their blog roles -- they possess all caps.
-		if ( ( is_multisite() && current_user_can( 'manage_sites' ) ) || $user_id != get_current_user_id() || ($potential_role && $potential_role->has_cap( 'edit_users' ) ) )
-			$user->role = $new_role;
+		if ( ( is_multisite() && current_user_can( 'manage_sites' ) ) || $user_id != get_current_user_id() || ($potential_role && $potential_role->has_cap( 'edit_users' ) ) ) {
+					$user->role = $new_role;
+		}
 
 		// If the new role isn't editable by the logged-in user die with error
 		$editable_roles = get_editable_roles();
-		if ( ! empty( $new_role ) && empty( $editable_roles[$new_role] ) )
-			wp_die(__('You can’t give users that role.'));
+		if ( ! empty( $new_role ) && empty( $editable_roles[$new_role] ) ) {
+					wp_die(__('You can’t give users that role.'));
+		}
 	}
 
-	if ( isset( $_POST['email'] ))
-		$user->user_email = sanitize_text_field( wp_unslash( $_POST['email'] ) );
+	if ( isset( $_POST['email'] )) {
+			$user->user_email = sanitize_text_field( wp_unslash( $_POST['email'] ) );
+	}
 	if ( isset( $_POST['url'] ) ) {
 		if ( empty ( $_POST['url'] ) || $_POST['url'] == 'http://' ) {
 			$user->user_url = '';
@@ -73,21 +79,27 @@ 
 			$user->user_url = preg_match('/^(' . $protocols . '):/is', $user->user_url) ? $user->user_url : 'http://'.$user->user_url;
 		}
 	}
-	if ( isset( $_POST['first_name'] ) )
-		$user->first_name = sanitize_text_field( $_POST['first_name'] );
-	if ( isset( $_POST['last_name'] ) )
-		$user->last_name = sanitize_text_field( $_POST['last_name'] );
-	if ( isset( $_POST['nickname'] ) )
-		$user->nickname = sanitize_text_field( $_POST['nickname'] );
-	if ( isset( $_POST['display_name'] ) )
-		$user->display_name = sanitize_text_field( $_POST['display_name'] );
+	if ( isset( $_POST['first_name'] ) ) {
+			$user->first_name = sanitize_text_field( $_POST['first_name'] );
+	}
+	if ( isset( $_POST['last_name'] ) ) {
+			$user->last_name = sanitize_text_field( $_POST['last_name'] );
+	}
+	if ( isset( $_POST['nickname'] ) ) {
+			$user->nickname = sanitize_text_field( $_POST['nickname'] );
+	}
+	if ( isset( $_POST['display_name'] ) ) {
+			$user->display_name = sanitize_text_field( $_POST['display_name'] );
+	}
 
-	if ( isset( $_POST['description'] ) )
-		$user->description = trim( $_POST['description'] );
+	if ( isset( $_POST['description'] ) ) {
+			$user->description = trim( $_POST['description'] );
+	}
 
 	foreach ( wp_get_user_contact_methods( $user ) as $method => $name ) {
-		if ( isset( $_POST[$method] ))
-			$user->$method = sanitize_text_field( $_POST[$method] );
+		if ( isset( $_POST[$method] )) {
+					$user->$method = sanitize_text_field( $_POST[$method] );
+		}
 	}
 
 	if ( $update ) {
@@ -99,14 +111,16 @@ 
 	$user->comment_shortcuts = isset( $_POST['comment_shortcuts'] ) && 'true' == $_POST['comment_shortcuts'] ? 'true' : '';
 
 	$user->use_ssl = 0;
-	if ( !empty($_POST['use_ssl']) )
-		$user->use_ssl = 1;
+	if ( !empty($_POST['use_ssl']) ) {
+			$user->use_ssl = 1;
+	}
 
 	$errors = new WP_Error();
 
 	/* checking that username has been typed */
-	if ( $user->user_login == '' )
-		$errors->add( 'user_login', __( '<strong>ERROR</strong>: Please enter a username.' ) );
+	if ( $user->user_login == '' ) {
+			$errors->add( 'user_login', __( '<strong>ERROR</strong>: Please enter a username.' ) );
+	}
 
 	/* checking that nickname has been typed */
 	if ( $update && empty( $user->nickname ) ) {
@@ -139,14 +153,17 @@ 
 		$errors->add( 'pass', __( '<strong>ERROR</strong>: Please enter the same password in both password fields.' ), array( 'form-field' => 'pass1' ) );
 	}
 
-	if ( !empty( $pass1 ) )
-		$user->user_pass = $pass1;
+	if ( !empty( $pass1 ) ) {
+			$user->user_pass = $pass1;
+	}
 
-	if ( !$update && isset( $_POST['user_login'] ) && !validate_username( $_POST['user_login'] ) )
-		$errors->add( 'user_login', __( '<strong>ERROR</strong>: This username is invalid because it uses illegal characters. Please enter a valid username.' ));
+	if ( !$update && isset( $_POST['user_login'] ) && !validate_username( $_POST['user_login'] ) ) {
+			$errors->add( 'user_login', __( '<strong>ERROR</strong>: This username is invalid because it uses illegal characters. Please enter a valid username.' ));
+	}
 
-	if ( !$update && username_exists( $user->user_login ) )
-		$errors->add( 'user_login', __( '<strong>ERROR</strong>: This username is already registered. Please choose another one.' ));
+	if ( !$update && username_exists( $user->user_login ) ) {
+			$errors->add( 'user_login', __( '<strong>ERROR</strong>: This username is already registered. Please choose another one.' ));
+	}
 
 	/** This filter is documented in wp-includes/user.php */
 	$illegal_logins = (array) apply_filters( 'illegal_user_logins', array() );
@@ -175,8 +192,9 @@ 
 	 */
 	do_action_ref_array( 'user_profile_update_errors', array( &$errors, $update, &$user ) );
 
-	if ( $errors->get_error_codes() )
-		return $errors;
+	if ( $errors->get_error_codes() ) {
+			return $errors;
+	}
 
 	if ( $update ) {
 		$user_id = wp_update_user( $user );
@@ -240,8 +258,9 @@ 
 function get_user_to_edit( $user_id ) {
 	$user = get_userdata( $user_id );
 
-	if ( $user )
-		$user->filter = 'edit';
+	if ( $user ) {
+			$user->filter = 'edit';
+	}
 
 	return $user;
 }
@@ -297,8 +316,9 @@ 
 	$id = (int) $id;
 	$user = new WP_User( $id );
 
-	if ( !$user->exists() )
-		return false;
+	if ( !$user->exists() ) {
+			return false;
+	}
 
 	// Normalize $reassign to null or a user ID. 'novalue' was an older default.
 	if ( 'novalue' === $reassign ) {
@@ -340,29 +360,33 @@ 
 		$post_types_to_delete = implode( "', '", $post_types_to_delete );
 		$post_ids = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_author = %d AND post_type IN ('$post_types_to_delete')", $id ) );
 		if ( $post_ids ) {
-			foreach ( $post_ids as $post_id )
-				wp_delete_post( $post_id );
+			foreach ( $post_ids as $post_id ) {
+							wp_delete_post( $post_id );
+			}
 		}
 
 		// Clean links
 		$link_ids = $wpdb->get_col( $wpdb->prepare("SELECT link_id FROM $wpdb->links WHERE link_owner = %d", $id) );
 
 		if ( $link_ids ) {
-			foreach ( $link_ids as $link_id )
-				wp_delete_link($link_id);
+			foreach ( $link_ids as $link_id ) {
+							wp_delete_link($link_id);
+			}
 		}
 	} else {
 		$post_ids = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_author = %d", $id ) );
 		$wpdb->update( $wpdb->posts, array('post_author' => $reassign), array('post_author' => $id) );
 		if ( ! empty( $post_ids ) ) {
-			foreach ( $post_ids as $post_id )
-				clean_post_cache( $post_id );
+			foreach ( $post_ids as $post_id ) {
+							clean_post_cache( $post_id );
+			}
 		}
 		$link_ids = $wpdb->get_col( $wpdb->prepare("SELECT link_id FROM $wpdb->links WHERE link_owner = %d", $id) );
 		$wpdb->update( $wpdb->links, array('link_owner' => $reassign), array('link_owner' => $id) );
 		if ( ! empty( $link_ids ) ) {
-			foreach ( $link_ids as $link_id )
-				clean_bookmark_cache( $link_id );
+			foreach ( $link_ids as $link_id ) {
+							clean_bookmark_cache( $link_id );
+			}
 		}
 	}
 
@@ -371,8 +395,9 @@ 
 		remove_user_from_blog( $id, get_current_blog_id() );
 	} else {
 		$meta = $wpdb->get_col( $wpdb->prepare( "SELECT umeta_id FROM $wpdb->usermeta WHERE user_id = %d", $id ) );
-		foreach ( $meta as $mid )
-			delete_metadata_by_mid( 'user', $mid );
+		foreach ( $meta as $mid ) {
+					delete_metadata_by_mid( 'user', $mid );
+		}
 
 		$wpdb->delete( $wpdb->users, array( 'ID' => $id ) );
 	}
@@ -417,8 +442,9 @@ 
 function default_password_nag_handler($errors = false) {
 	global $user_ID;
 	// Short-circuit it.
-	if ( ! get_user_option('default_password_nag') )
-		return;
+	if ( ! get_user_option('default_password_nag') ) {
+			return;
+	}
 
 	// get_user_setting = JS saved UI setting. else no-js-fallback code.
 	if ( 'hide' == get_user_setting('default_password_nag') || isset($_GET['default_password_nag']) && '0' == $_GET['default_password_nag'] ) {
@@ -435,8 +461,9 @@ 
  */
 function default_password_nag_edit_user($user_ID, $old_data) {
 	// Short-circuit it.
-	if ( ! get_user_option('default_password_nag', $user_ID) )
-		return;
+	if ( ! get_user_option('default_password_nag', $user_ID) ) {
+			return;
+	}
 
 	$new_data = get_userdata($user_ID);
 
@@ -455,8 +482,9 @@ 
 function default_password_nag() {
 	global $pagenow;
 	// Short-circuit it.
-	if ( 'profile.php' == $pagenow || ! get_user_option('default_password_nag') )
-		return;
+	if ( 'profile.php' == $pagenow || ! get_user_option('default_password_nag') ) {
+			return;
+	}
 
 	echo '<div class="error default-password-nag">';
 	echo '<p>';

Spacing +133 added lines, -133 removed lines

@@ -27,82 +27,82 @@ 
  * @param int $user_id Optional. User ID.
  * @return int|WP_Error user id of the updated user
  */
-function edit_user( $user_id = 0 ) {
+function edit_user($user_id = 0) {
 	$wp_roles = wp_roles();
 	$user = new stdClass;
-	if ( $user_id ) {
+	if ($user_id) {
 		$update = true;
 		$user->ID = (int) $user_id;
-		$userdata = get_userdata( $user_id );
-		$user->user_login = wp_slash( $userdata->user_login );
+		$userdata = get_userdata($user_id);
+		$user->user_login = wp_slash($userdata->user_login);
 	} else {
 		$update = false;
 	}
 
-	if ( !$update && isset( $_POST['user_login'] ) )
+	if ( ! $update && isset($_POST['user_login']))
 		$user->user_login = sanitize_user($_POST['user_login'], true);
 
 	$pass1 = $pass2 = '';
-	if ( isset( $_POST['pass1'] ) )
+	if (isset($_POST['pass1']))
 		$pass1 = $_POST['pass1'];
-	if ( isset( $_POST['pass2'] ) )
+	if (isset($_POST['pass2']))
 		$pass2 = $_POST['pass2'];
 
-	if ( isset( $_POST['role'] ) && current_user_can( 'edit_users' ) ) {
-		$new_role = sanitize_text_field( $_POST['role'] );
+	if (isset($_POST['role']) && current_user_can('edit_users')) {
+		$new_role = sanitize_text_field($_POST['role']);
 		$potential_role = isset($wp_roles->role_objects[$new_role]) ? $wp_roles->role_objects[$new_role] : false;
 		// Don't let anyone with 'edit_users' (admins) edit their own role to something without it.
 		// Multisite super admins can freely edit their blog roles -- they possess all caps.
-		if ( ( is_multisite() && current_user_can( 'manage_sites' ) ) || $user_id != get_current_user_id() || ($potential_role && $potential_role->has_cap( 'edit_users' ) ) )
+		if ((is_multisite() && current_user_can('manage_sites')) || $user_id != get_current_user_id() || ($potential_role && $potential_role->has_cap('edit_users')))
 			$user->role = $new_role;
 
 		// If the new role isn't editable by the logged-in user die with error
 		$editable_roles = get_editable_roles();
-		if ( ! empty( $new_role ) && empty( $editable_roles[$new_role] ) )
+		if ( ! empty($new_role) && empty($editable_roles[$new_role]))
 			wp_die(__('You can’t give users that role.'));
 	}
 
-	if ( isset( $_POST['email'] ))
-		$user->user_email = sanitize_text_field( wp_unslash( $_POST['email'] ) );
-	if ( isset( $_POST['url'] ) ) {
-		if ( empty ( $_POST['url'] ) || $_POST['url'] == 'http://' ) {
+	if (isset($_POST['email']))
+		$user->user_email = sanitize_text_field(wp_unslash($_POST['email']));
+	if (isset($_POST['url'])) {
+		if (empty ($_POST['url']) || $_POST['url'] == 'http://') {
 			$user->user_url = '';
 		} else {
-			$user->user_url = esc_url_raw( $_POST['url'] );
-			$protocols = implode( '|', array_map( 'preg_quote', wp_allowed_protocols() ) );
-			$user->user_url = preg_match('/^(' . $protocols . '):/is', $user->user_url) ? $user->user_url : 'http://'.$user->user_url;
+			$user->user_url = esc_url_raw($_POST['url']);
+			$protocols = implode('|', array_map('preg_quote', wp_allowed_protocols()));
+			$user->user_url = preg_match('/^('.$protocols.'):/is', $user->user_url) ? $user->user_url : 'http://'.$user->user_url;
 		}
 	}
-	if ( isset( $_POST['first_name'] ) )
-		$user->first_name = sanitize_text_field( $_POST['first_name'] );
-	if ( isset( $_POST['last_name'] ) )
-		$user->last_name = sanitize_text_field( $_POST['last_name'] );
-	if ( isset( $_POST['nickname'] ) )
-		$user->nickname = sanitize_text_field( $_POST['nickname'] );
-	if ( isset( $_POST['display_name'] ) )
-		$user->display_name = sanitize_text_field( $_POST['display_name'] );
-
-	if ( isset( $_POST['description'] ) )
-		$user->description = trim( $_POST['description'] );
-
-	foreach ( wp_get_user_contact_methods( $user ) as $method => $name ) {
-		if ( isset( $_POST[$method] ))
-			$user->$method = sanitize_text_field( $_POST[$method] );
+	if (isset($_POST['first_name']))
+		$user->first_name = sanitize_text_field($_POST['first_name']);
+	if (isset($_POST['last_name']))
+		$user->last_name = sanitize_text_field($_POST['last_name']);
+	if (isset($_POST['nickname']))
+		$user->nickname = sanitize_text_field($_POST['nickname']);
+	if (isset($_POST['display_name']))
+		$user->display_name = sanitize_text_field($_POST['display_name']);
+
+	if (isset($_POST['description']))
+		$user->description = trim($_POST['description']);
+
+	foreach (wp_get_user_contact_methods($user) as $method => $name) {
+		if (isset($_POST[$method]))
+			$user->$method = sanitize_text_field($_POST[$method]);
 	}
 
-	if ( $update ) {
-		$user->rich_editing = isset( $_POST['rich_editing'] ) && 'false' == $_POST['rich_editing'] ? 'false' : 'true';
-		$user->admin_color = isset( $_POST['admin_color'] ) ? sanitize_text_field( $_POST['admin_color'] ) : 'fresh';
-		$user->show_admin_bar_front = isset( $_POST['admin_bar_front'] ) ? 'true' : 'false';
+	if ($update) {
+		$user->rich_editing = isset($_POST['rich_editing']) && 'false' == $_POST['rich_editing'] ? 'false' : 'true';
+		$user->admin_color = isset($_POST['admin_color']) ? sanitize_text_field($_POST['admin_color']) : 'fresh';
+		$user->show_admin_bar_front = isset($_POST['admin_bar_front']) ? 'true' : 'false';
 		$user->locale = '';
 
-		if ( isset( $_POST['locale'] ) ) {
-			$locale = sanitize_text_field( $_POST['locale'] );
-			if ( 'site-default' === $locale ) {
+		if (isset($_POST['locale'])) {
+			$locale = sanitize_text_field($_POST['locale']);
+			if ('site-default' === $locale) {
 				$locale = '';
-			} elseif ( '' === $locale ) {
+			} elseif ('' === $locale) {
 				$locale = 'en_US';
-			} elseif ( ! in_array( $locale, get_available_languages(), true ) ) {
+			} elseif ( ! in_array($locale, get_available_languages(), true)) {
 				$locale = '';
 			}
 
@@ -110,21 +110,21 @@ 
 		}
 	}
 
-	$user->comment_shortcuts = isset( $_POST['comment_shortcuts'] ) && 'true' == $_POST['comment_shortcuts'] ? 'true' : '';
+	$user->comment_shortcuts = isset($_POST['comment_shortcuts']) && 'true' == $_POST['comment_shortcuts'] ? 'true' : '';
 
 	$user->use_ssl = 0;
-	if ( !empty($_POST['use_ssl']) )
+	if ( ! empty($_POST['use_ssl']))
 		$user->use_ssl = 1;
 
 	$errors = new WP_Error();
 
 	/* checking that username has been typed */
-	if ( $user->user_login == '' )
-		$errors->add( 'user_login', __( '<strong>ERROR</strong>: Please enter a username.' ) );
+	if ($user->user_login == '')
+		$errors->add('user_login', __('<strong>ERROR</strong>: Please enter a username.'));
 
 	/* checking that nickname has been typed */
-	if ( $update && empty( $user->nickname ) ) {
-		$errors->add( 'nickname', __( '<strong>ERROR</strong>: Please enter a nickname.' ) );
+	if ($update && empty($user->nickname)) {
+		$errors->add('nickname', __('<strong>ERROR</strong>: Please enter a nickname.'));
 	}
 
 	/**
@@ -136,46 +136,46 @@ 
 	 * @param string &$pass1     The password, passed by reference.
 	 * @param string &$pass2     The confirmed password, passed by reference.
 	 */
-	do_action_ref_array( 'check_passwords', array( $user->user_login, &$pass1, &$pass2 ) );
+	do_action_ref_array('check_passwords', array($user->user_login, &$pass1, &$pass2));
 
 	// Check for blank password when adding a user.
-	if ( ! $update && empty( $pass1 ) ) {
-		$errors->add( 'pass', __( '<strong>ERROR</strong>: Please enter a password.' ), array( 'form-field' => 'pass1' ) );
+	if ( ! $update && empty($pass1)) {
+		$errors->add('pass', __('<strong>ERROR</strong>: Please enter a password.'), array('form-field' => 'pass1'));
 	}
 
 	// Check for "\" in password.
-	if ( false !== strpos( wp_unslash( $pass1 ), "\\" ) ) {
-		$errors->add( 'pass', __( '<strong>ERROR</strong>: Passwords may not contain the character "\\".' ), array( 'form-field' => 'pass1' ) );
+	if (false !== strpos(wp_unslash($pass1), "\\")) {
+		$errors->add('pass', __('<strong>ERROR</strong>: Passwords may not contain the character "\\".'), array('form-field' => 'pass1'));
 	}
 
 	// Checking the password has been typed twice the same.
-	if ( ( $update || ! empty( $pass1 ) ) && $pass1 != $pass2 ) {
-		$errors->add( 'pass', __( '<strong>ERROR</strong>: Please enter the same password in both password fields.' ), array( 'form-field' => 'pass1' ) );
+	if (($update || ! empty($pass1)) && $pass1 != $pass2) {
+		$errors->add('pass', __('<strong>ERROR</strong>: Please enter the same password in both password fields.'), array('form-field' => 'pass1'));
 	}
 
-	if ( !empty( $pass1 ) )
+	if ( ! empty($pass1))
 		$user->user_pass = $pass1;
 
-	if ( !$update && isset( $_POST['user_login'] ) && !validate_username( $_POST['user_login'] ) )
-		$errors->add( 'user_login', __( '<strong>ERROR</strong>: This username is invalid because it uses illegal characters. Please enter a valid username.' ));
+	if ( ! $update && isset($_POST['user_login']) && ! validate_username($_POST['user_login']))
+		$errors->add('user_login', __('<strong>ERROR</strong>: This username is invalid because it uses illegal characters. Please enter a valid username.'));
 
-	if ( !$update && username_exists( $user->user_login ) )
-		$errors->add( 'user_login', __( '<strong>ERROR</strong>: This username is already registered. Please choose another one.' ));
+	if ( ! $update && username_exists($user->user_login))
+		$errors->add('user_login', __('<strong>ERROR</strong>: This username is already registered. Please choose another one.'));
 
 	/** This filter is documented in wp-includes/user.php */
-	$illegal_logins = (array) apply_filters( 'illegal_user_logins', array() );
+	$illegal_logins = (array) apply_filters('illegal_user_logins', array());
 
-	if ( in_array( strtolower( $user->user_login ), array_map( 'strtolower', $illegal_logins ) ) ) {
-		$errors->add( 'invalid_username', __( '<strong>ERROR</strong>: Sorry, that username is not allowed.' ) );
+	if (in_array(strtolower($user->user_login), array_map('strtolower', $illegal_logins))) {
+		$errors->add('invalid_username', __('<strong>ERROR</strong>: Sorry, that username is not allowed.'));
 	}
 
 	/* checking email address */
-	if ( empty( $user->user_email ) ) {
-		$errors->add( 'empty_email', __( '<strong>ERROR</strong>: Please enter an email address.' ), array( 'form-field' => 'email' ) );
-	} elseif ( !is_email( $user->user_email ) ) {
-		$errors->add( 'invalid_email', __( '<strong>ERROR</strong>: The email address isn&#8217;t correct.' ), array( 'form-field' => 'email' ) );
-	} elseif ( ( $owner_id = email_exists($user->user_email) ) && ( !$update || ( $owner_id != $user->ID ) ) ) {
-		$errors->add( 'email_exists', __('<strong>ERROR</strong>: This email is already registered, please choose another one.'), array( 'form-field' => 'email' ) );
+	if (empty($user->user_email)) {
+		$errors->add('empty_email', __('<strong>ERROR</strong>: Please enter an email address.'), array('form-field' => 'email'));
+	} elseif ( ! is_email($user->user_email)) {
+		$errors->add('invalid_email', __('<strong>ERROR</strong>: The email address isn&#8217;t correct.'), array('form-field' => 'email'));
+	} elseif (($owner_id = email_exists($user->user_email)) && ( ! $update || ($owner_id != $user->ID))) {
+		$errors->add('email_exists', __('<strong>ERROR</strong>: This email is already registered, please choose another one.'), array('form-field' => 'email'));
 	}
 
 	/**
@@ -187,16 +187,16 @@ 
 	 * @param bool     $update  Whether this is a user update.
 	 * @param stdClass &$user   User object, passed by reference.
 	 */
-	do_action_ref_array( 'user_profile_update_errors', array( &$errors, $update, &$user ) );
+	do_action_ref_array('user_profile_update_errors', array(&$errors, $update, &$user));
 
-	if ( $errors->get_error_codes() )
+	if ($errors->get_error_codes())
 		return $errors;
 
-	if ( $update ) {
-		$user_id = wp_update_user( $user );
+	if ($update) {
+		$user_id = wp_update_user($user);
 	} else {
-		$user_id = wp_insert_user( $user );
-		$notify  = isset( $_POST['send_user_notification'] ) ? 'both' : 'admin';
+		$user_id = wp_insert_user($user);
+		$notify  = isset($_POST['send_user_notification']) ? 'both' : 'admin';
 
 		/**
 		  * Fires after a new user has been created.
@@ -207,7 +207,7 @@ 
 		  * @param string $notify  Type of notification that should happen. See wp_send_new_user_notifications()
 		  *                        for more information on possible values.
 		  */
-		do_action( 'edit_user_created_user', $user_id, $notify );
+		do_action('edit_user_created_user', $user_id, $notify);
 	}
 	return $user_id;
 }
@@ -238,7 +238,7 @@ 
 	 *
 	 * @param array $all_roles List of roles.
 	 */
-	$editable_roles = apply_filters( 'editable_roles', $all_roles );
+	$editable_roles = apply_filters('editable_roles', $all_roles);
 
 	return $editable_roles;
 }
@@ -251,10 +251,10 @@ 
  * @param int $user_id User ID.
  * @return WP_User|bool WP_User object on success, false on failure.
  */
-function get_user_to_edit( $user_id ) {
-	$user = get_userdata( $user_id );
+function get_user_to_edit($user_id) {
+	$user = get_userdata($user_id);
 
-	if ( $user )
+	if ($user)
 		$user->filter = 'edit';
 
 	return $user;
@@ -270,7 +270,7 @@ 
  * @param int $user_id User ID.
  * @return array
  */
-function get_users_drafts( $user_id ) {
+function get_users_drafts($user_id) {
 	global $wpdb;
 	$query = $wpdb->prepare("SELECT ID, post_title FROM $wpdb->posts WHERE post_type = 'post' AND post_status = 'draft' AND post_author = %d ORDER BY post_modified DESC", $user_id);
 
@@ -281,8 +281,8 @@ 
 	 *
 	 * @param string $query The user's drafts query string.
 	 */
-	$query = apply_filters( 'get_users_drafts', $query );
-	return $wpdb->get_results( $query );
+	$query = apply_filters('get_users_drafts', $query);
+	return $wpdb->get_results($query);
 }
 
 /**
@@ -301,23 +301,23 @@ 
  * @param int $reassign Optional. Reassign posts and links to new User ID.
  * @return bool True when finished.
  */
-function wp_delete_user( $id, $reassign = null ) {
+function wp_delete_user($id, $reassign = null) {
 	global $wpdb;
 
-	if ( ! is_numeric( $id ) ) {
+	if ( ! is_numeric($id)) {
 		return false;
 	}
 
 	$id = (int) $id;
-	$user = new WP_User( $id );
+	$user = new WP_User($id);
 
-	if ( !$user->exists() )
+	if ( ! $user->exists())
 		return false;
 
 	// Normalize $reassign to null or a user ID. 'novalue' was an older default.
-	if ( 'novalue' === $reassign ) {
+	if ('novalue' === $reassign) {
 		$reassign = null;
-	} elseif ( null !== $reassign ) {
+	} elseif (null !== $reassign) {
 		$reassign = (int) $reassign;
 	}
 
@@ -330,14 +330,14 @@ 
 	 * @param int|null $reassign ID of the user to reassign posts and links to.
 	 *                           Default null, for no reassignment.
 	 */
-	do_action( 'delete_user', $id, $reassign );
+	do_action('delete_user', $id, $reassign);
 
-	if ( null === $reassign ) {
+	if (null === $reassign) {
 		$post_types_to_delete = array();
-		foreach ( get_post_types( array(), 'objects' ) as $post_type ) {
-			if ( $post_type->delete_with_user ) {
+		foreach (get_post_types(array(), 'objects') as $post_type) {
+			if ($post_type->delete_with_user) {
 				$post_types_to_delete[] = $post_type->name;
-			} elseif ( null === $post_type->delete_with_user && post_type_supports( $post_type->name, 'author' ) ) {
+			} elseif (null === $post_type->delete_with_user && post_type_supports($post_type->name, 'author')) {
 				$post_types_to_delete[] = $post_type->name;
 			}
 		}
@@ -350,48 +350,48 @@ 
 		 * @param array $post_types_to_delete Post types to delete.
 		 * @param int   $id                   User ID.
 		 */
-		$post_types_to_delete = apply_filters( 'post_types_to_delete_with_user', $post_types_to_delete, $id );
-		$post_types_to_delete = implode( "', '", $post_types_to_delete );
-		$post_ids = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_author = %d AND post_type IN ('$post_types_to_delete')", $id ) );
-		if ( $post_ids ) {
-			foreach ( $post_ids as $post_id )
-				wp_delete_post( $post_id );
+		$post_types_to_delete = apply_filters('post_types_to_delete_with_user', $post_types_to_delete, $id);
+		$post_types_to_delete = implode("', '", $post_types_to_delete);
+		$post_ids = $wpdb->get_col($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_author = %d AND post_type IN ('$post_types_to_delete')", $id));
+		if ($post_ids) {
+			foreach ($post_ids as $post_id)
+				wp_delete_post($post_id);
 		}
 
 		// Clean links
-		$link_ids = $wpdb->get_col( $wpdb->prepare("SELECT link_id FROM $wpdb->links WHERE link_owner = %d", $id) );
+		$link_ids = $wpdb->get_col($wpdb->prepare("SELECT link_id FROM $wpdb->links WHERE link_owner = %d", $id));
 
-		if ( $link_ids ) {
-			foreach ( $link_ids as $link_id )
+		if ($link_ids) {
+			foreach ($link_ids as $link_id)
 				wp_delete_link($link_id);
 		}
 	} else {
-		$post_ids = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_author = %d", $id ) );
-		$wpdb->update( $wpdb->posts, array('post_author' => $reassign), array('post_author' => $id) );
-		if ( ! empty( $post_ids ) ) {
-			foreach ( $post_ids as $post_id )
-				clean_post_cache( $post_id );
+		$post_ids = $wpdb->get_col($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_author = %d", $id));
+		$wpdb->update($wpdb->posts, array('post_author' => $reassign), array('post_author' => $id));
+		if ( ! empty($post_ids)) {
+			foreach ($post_ids as $post_id)
+				clean_post_cache($post_id);
 		}
-		$link_ids = $wpdb->get_col( $wpdb->prepare("SELECT link_id FROM $wpdb->links WHERE link_owner = %d", $id) );
-		$wpdb->update( $wpdb->links, array('link_owner' => $reassign), array('link_owner' => $id) );
-		if ( ! empty( $link_ids ) ) {
-			foreach ( $link_ids as $link_id )
-				clean_bookmark_cache( $link_id );
+		$link_ids = $wpdb->get_col($wpdb->prepare("SELECT link_id FROM $wpdb->links WHERE link_owner = %d", $id));
+		$wpdb->update($wpdb->links, array('link_owner' => $reassign), array('link_owner' => $id));
+		if ( ! empty($link_ids)) {
+			foreach ($link_ids as $link_id)
+				clean_bookmark_cache($link_id);
 		}
 	}
 
 	// FINALLY, delete user
-	if ( is_multisite() ) {
-		remove_user_from_blog( $id, get_current_blog_id() );
+	if (is_multisite()) {
+		remove_user_from_blog($id, get_current_blog_id());
 	} else {
-		$meta = $wpdb->get_col( $wpdb->prepare( "SELECT umeta_id FROM $wpdb->usermeta WHERE user_id = %d", $id ) );
-		foreach ( $meta as $mid )
-			delete_metadata_by_mid( 'user', $mid );
+		$meta = $wpdb->get_col($wpdb->prepare("SELECT umeta_id FROM $wpdb->usermeta WHERE user_id = %d", $id));
+		foreach ($meta as $mid)
+			delete_metadata_by_mid('user', $mid);
 
-		$wpdb->delete( $wpdb->users, array( 'ID' => $id ) );
+		$wpdb->delete($wpdb->users, array('ID' => $id));
 	}
 
-	clean_user_cache( $user );
+	clean_user_cache($user);
 
 	/**
 	 * Fires immediately after a user is deleted from the database.
@@ -402,7 +402,7 @@ 
 	 * @param int|null $reassign ID of the user to reassign posts and links to.
 	 *                           Default null, for no reassignment.
 	 */
-	do_action( 'deleted_user', $id, $reassign );
+	do_action('deleted_user', $id, $reassign);
 
 	return true;
 }
@@ -431,11 +431,11 @@ 
 function default_password_nag_handler($errors = false) {
 	global $user_ID;
 	// Short-circuit it.
-	if ( ! get_user_option('default_password_nag') )
+	if ( ! get_user_option('default_password_nag'))
 		return;
 
 	// get_user_setting = JS saved UI setting. else no-js-fallback code.
-	if ( 'hide' == get_user_setting('default_password_nag') || isset($_GET['default_password_nag']) && '0' == $_GET['default_password_nag'] ) {
+	if ('hide' == get_user_setting('default_password_nag') || isset($_GET['default_password_nag']) && '0' == $_GET['default_password_nag']) {
 		delete_user_setting('default_password_nag');
 		update_user_option($user_ID, 'default_password_nag', false, true);
 	}
@@ -449,13 +449,13 @@ 
  */
 function default_password_nag_edit_user($user_ID, $old_data) {
 	// Short-circuit it.
-	if ( ! get_user_option('default_password_nag', $user_ID) )
+	if ( ! get_user_option('default_password_nag', $user_ID))
 		return;
 
 	$new_data = get_userdata($user_ID);
 
 	// Remove the nag if the password has been changed.
-	if ( $new_data->user_pass != $old_data->user_pass ) {
+	if ($new_data->user_pass != $old_data->user_pass) {
 		delete_user_setting('default_password_nag');
 		update_user_option($user_ID, 'default_password_nag', false, true);
 	}
@@ -469,16 +469,16 @@ 
 function default_password_nag() {
 	global $pagenow;
 	// Short-circuit it.
-	if ( 'profile.php' == $pagenow || ! get_user_option('default_password_nag') )
+	if ('profile.php' == $pagenow || ! get_user_option('default_password_nag'))
 		return;
 
 	echo '<div class="error default-password-nag">';
 	echo '<p>';
-	echo '<strong>' . __('Notice:') . '</strong> ';
+	echo '<strong>'.__('Notice:').'</strong> ';
 	_e('You&rsquo;re using the auto-generated password for your account. Would you like to change it?');
 	echo '</p><p>';
-	printf( '<a href="%s">' . __('Yes, take me to my profile page') . '</a> | ', get_edit_profile_url() . '#password' );
-	printf( '<a href="%s" id="default-password-nag-no">' . __('No thanks, do not remind me again') . '</a>', '?default_password_nag=0' );
+	printf('<a href="%s">'.__('Yes, take me to my profile page').'</a> | ', get_edit_profile_url().'#password');
+	printf('<a href="%s" id="default-password-nag-no">'.__('No thanks, do not remind me again').'</a>', '?default_password_nag=0');
 	echo '</p></div>';
 }
 
@@ -524,16 +524,16 @@ 
  * @param string $text
  * @return string
  */
-function admin_created_user_email( $text ) {
+function admin_created_user_email($text) {
 	$roles = get_editable_roles();
-	$role = $roles[ $_REQUEST['role'] ];
+	$role = $roles[$_REQUEST['role']];
 	/* translators: 1: Site name, 2: site URL, 3: role */
-	return sprintf( __( 'Hi,
+	return sprintf(__('Hi,
 You\'ve been invited to join \'%1$s\' at
 %2$s with the role of %3$s.
 If you do not want to join this site please ignore
 this email. This invitation will expire in a few days.
 
 Please click the following link to activate your user account:
-%%s' ), wp_specialchars_decode( get_bloginfo( 'name' ), ENT_QUOTES ), home_url(), wp_specialchars_decode( translate_user_role( $role['name'] ) ) );
+%%s' ), wp_specialchars_decode(get_bloginfo('name'), ENT_QUOTES), home_url(), wp_specialchars_decode(translate_user_role($role['name'])));
 }

src/wp-admin/about.php

Indentation +3 added lines, -3 removed lines

@@ -203,15 +203,15 @@
 
 /* translators: 1: WordPress version number, 2: plural number of bugs. */
 _n_noop( '<strong>Version %1$s</strong> addressed %2$s bug.',
-         '<strong>Version %1$s</strong> addressed %2$s bugs.' );
+		 '<strong>Version %1$s</strong> addressed %2$s bugs.' );
 
 /* translators: 1: WordPress version number, 2: plural number of bugs. Singular security issue. */
 _n_noop( '<strong>Version %1$s</strong> addressed a security issue and fixed %2$s bug.',
-         '<strong>Version %1$s</strong> addressed a security issue and fixed %2$s bugs.' );
+		 '<strong>Version %1$s</strong> addressed a security issue and fixed %2$s bugs.' );
 
 /* translators: 1: WordPress version number, 2: plural number of bugs. More than one security issue. */
 _n_noop( '<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bug.',
-         '<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bugs.' );
+		 '<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bugs.' );
 
 /* translators: %s: Codex URL */
 __( 'For more information, see <a href="%s">the release notes</a>.' );

Spacing +73 added lines, -73 removed lines

@@ -7,53 +7,53 @@ 
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( ! wp_is_mobile() ) {
-	wp_enqueue_style( 'wp-mediaelement' );
-	wp_enqueue_script( 'wp-mediaelement' );
-	wp_localize_script( 'mediaelement', '_wpmejsSettings', array(
-		'pluginPath'        => includes_url( 'js/mediaelement/', 'relative' ),
+if ( ! wp_is_mobile()) {
+	wp_enqueue_style('wp-mediaelement');
+	wp_enqueue_script('wp-mediaelement');
+	wp_localize_script('mediaelement', '_wpmejsSettings', array(
+		'pluginPath'        => includes_url('js/mediaelement/', 'relative'),
 		'pauseOtherPlayers' => '',
-	) );
+	));
 }
 
 $video_url = 'https://videopress.com/embed/AHz0Ca46?hd=true';
-$lang_code = str_replace( '_', '-', get_user_locale() );
-list( $lang_code ) = explode( '-', $lang_code );
-if ( 'en' !== $lang_code ) {
-	$video_url = add_query_arg( 'defaultLangCode', $lang_code, $video_url );
+$lang_code = str_replace('_', '-', get_user_locale());
+list($lang_code) = explode('-', $lang_code);
+if ('en' !== $lang_code) {
+	$video_url = add_query_arg('defaultLangCode', $lang_code, $video_url);
 }
 
-$title = __( 'About' );
+$title = __('About');
 
-list( $display_version ) = explode( '-', get_bloginfo( 'version' ) );
+list($display_version) = explode('-', get_bloginfo('version'));
 
-include( ABSPATH . 'wp-admin/admin-header.php' );
+include(ABSPATH.'wp-admin/admin-header.php');
 ?>
 	<div class="wrap about-wrap">
-		<h1><?php printf( __( 'Welcome to WordPress&nbsp;%s' ), $display_version ); ?></h1>
+		<h1><?php printf(__('Welcome to WordPress&nbsp;%s'), $display_version); ?></h1>
 
-		<p class="about-text"><?php printf( __( 'Thank you for updating to the latest version! WordPress %s adds more ways for you to express yourself and represent your brand.' ), $display_version ); ?></p>
-		<div class="wp-badge"><?php printf( __( 'Version %s' ), $display_version ); ?></div>
+		<p class="about-text"><?php printf(__('Thank you for updating to the latest version! WordPress %s adds more ways for you to express yourself and represent your brand.'), $display_version); ?></p>
+		<div class="wp-badge"><?php printf(__('Version %s'), $display_version); ?></div>
 
 		<h2 class="nav-tab-wrapper wp-clearfix">
-			<a href="about.php" class="nav-tab nav-tab-active"><?php _e( 'What&#8217;s New' ); ?></a>
-			<a href="credits.php" class="nav-tab"><?php _e( 'Credits' ); ?></a>
-			<a href="freedoms.php" class="nav-tab"><?php _e( 'Freedoms' ); ?></a>
+			<a href="about.php" class="nav-tab nav-tab-active"><?php _e('What&#8217;s New'); ?></a>
+			<a href="credits.php" class="nav-tab"><?php _e('Credits'); ?></a>
+			<a href="freedoms.php" class="nav-tab"><?php _e('Freedoms'); ?></a>
 		</h2>
 
 		<div class="feature-section one-col">
 			<div class="col">
-				<h2><?php _e( 'An Update with You in Mind' ); ?></h2>
-				<p class="lead-description"><?php _e( 'WordPress 4.8 adds some great new features. Gear up for a more intuitive WordPress!' ); ?></p>
-				<p><?php _e( 'Though some updates seem minor, they&#8217;ve been built by hundreds of contributors with <em>you</em> in mind. Get ready for new features you&#8217;ll welcome like an old friend: link improvements, <em>three</em> new media widgets covering images, audio, and video, an updated text widget that supports visual editing, and an upgraded news section in your dashboard which brings in nearby and upcoming WordPress events.' ); ?></p>
+				<h2><?php _e('An Update with You in Mind'); ?></h2>
+				<p class="lead-description"><?php _e('WordPress 4.8 adds some great new features. Gear up for a more intuitive WordPress!'); ?></p>
+				<p><?php _e('Though some updates seem minor, they&#8217;ve been built by hundreds of contributors with <em>you</em> in mind. Get ready for new features you&#8217;ll welcome like an old friend: link improvements, <em>three</em> new media widgets covering images, audio, and video, an updated text widget that supports visual editing, and an upgraded news section in your dashboard which brings in nearby and upcoming WordPress events.'); ?></p>
 			</div>
 		</div>
 
 		<hr />
 
-		<h2><?php _e( 'Exciting Widget Updates' ); ?></h2>
+		<h2><?php _e('Exciting Widget Updates'); ?></h2>
 
 		<div class="headline-feature one-col">
 			<div class="col">
@@ -101,20 +101,20 @@ 
 
 		<div class="feature-section two-col">
 			<div class="col">
-				<h3><?php _e( 'Image Widget' ); ?></h3>
-				<p><?php _e( 'Adding an image to a widget is now a simple task that is achievable for any WordPress user without needing to know code. Simply insert your image right within the widget settings. Try adding something like a headshot or a photo of your latest weekend adventure &mdash; and see it appear automatically.' ); ?></p>
+				<h3><?php _e('Image Widget'); ?></h3>
+				<p><?php _e('Adding an image to a widget is now a simple task that is achievable for any WordPress user without needing to know code. Simply insert your image right within the widget settings. Try adding something like a headshot or a photo of your latest weekend adventure &mdash; and see it appear automatically.'); ?></p>
 			</div>
 			<div class="col">
-				<h3><?php _e( 'Video Widget' ); ?></h3>
-				<p><?php _e( 'A welcome video is a great way to humanize the branding of your website. You can now add any video from the Media Library to a sidebar on your site with the new Video widget. Use this to showcase a welcome video to introduce visitors to your site or promote your latest and greatest content.' ); ?></p>
+				<h3><?php _e('Video Widget'); ?></h3>
+				<p><?php _e('A welcome video is a great way to humanize the branding of your website. You can now add any video from the Media Library to a sidebar on your site with the new Video widget. Use this to showcase a welcome video to introduce visitors to your site or promote your latest and greatest content.'); ?></p>
 			</div>
 			<div class="col">
-				<h3><?php _e( 'Audio Widget' ); ?></h3>
-				<p><?php _e( 'Are you a podcaster, musician, or avid blogger? Adding a widget with your audio file has never been easier. Upload your audio file to the Media Library, go to the widget settings, select your file, and you&#8217;re ready for listeners. This would be a easy way to add a more personal welcome message, too!' );?></p>
+				<h3><?php _e('Audio Widget'); ?></h3>
+				<p><?php _e('Are you a podcaster, musician, or avid blogger? Adding a widget with your audio file has never been easier. Upload your audio file to the Media Library, go to the widget settings, select your file, and you&#8217;re ready for listeners. This would be a easy way to add a more personal welcome message, too!'); ?></p>
 			</div>
 			<div class="col">
-				<h3><?php _e( 'Rich Text Widget' ); ?></h3>
-				<p><?php _e( 'This feature deserves a parade down the center of town! Rich-text editing capabilities are now native for Text widgets. Add a widget anywhere and format away. Create lists, add emphasis, and quickly and easily insert links. Have fun with your newfound formatting powers, and watch what you can accomplish in a short amount of time.' ); ?></p>
+				<h3><?php _e('Rich Text Widget'); ?></h3>
+				<p><?php _e('This feature deserves a parade down the center of town! Rich-text editing capabilities are now native for Text widgets. Add a widget anywhere and format away. Create lists, add emphasis, and quickly and easily insert links. Have fun with your newfound formatting powers, and watch what you can accomplish in a short amount of time.'); ?></p>
 			</div>
 		</div>
 
@@ -122,18 +122,18 @@ 
 
 		<div class="feature-section two-col">
 			<div class="col">
-				<h3><?php _e( 'Link Boundaries' ); ?></h3>
-				<p><?php _e( 'Have you ever tried updating a link, or the text around a link, and found you can&#8217;t seem to edit it correctly? When you edit the text after the link, your new text also ends up linked. Or you edit the text in the link, but your text ends up outside of it. This can be frustrating! With link boundaries, a great new feature, the process is streamlined and your links will work well. You’ll be happier. We promise.' ); ?></p>
+				<h3><?php _e('Link Boundaries'); ?></h3>
+				<p><?php _e('Have you ever tried updating a link, or the text around a link, and found you can&#8217;t seem to edit it correctly? When you edit the text after the link, your new text also ends up linked. Or you edit the text in the link, but your text ends up outside of it. This can be frustrating! With link boundaries, a great new feature, the process is streamlined and your links will work well. You’ll be happier. We promise.'); ?></p>
 			</div>
 			<div class="col">
 				<?php
-				echo wp_video_shortcode( array(
+				echo wp_video_shortcode(array(
 					'mp4'      => 'https://s.w.org/images/core/4.8/link-boundaries.mp4',
 					'poster'   => 'https://s.w.org/images/core/4.8/link-boundaries.png',
 					'width'    => 1140,
 					'height'   => 624,
 					// 'class'    => 'wp-video-shortcode feature-video',
-				) );
+				));
 				?>
 			</div>
 		</div>
@@ -142,13 +142,13 @@ 
 
 		<div class="feature-section two-col">
 			<div class="col">
-				<h3><?php _e( 'Nearby WordPress Events' ); ?></h3>
+				<h3><?php _e('Nearby WordPress Events'); ?></h3>
 
-				<p><?php _e( 'Did you know that WordPress has a thriving offline community with groups meeting regularly in more than 400 cities around the world? WordPress now draws your attention to the events that help you continue improving your WordPress skills, meet friends, and, of course, publish!' ); ?></p>
+				<p><?php _e('Did you know that WordPress has a thriving offline community with groups meeting regularly in more than 400 cities around the world? WordPress now draws your attention to the events that help you continue improving your WordPress skills, meet friends, and, of course, publish!'); ?></p>
 
-				<p><?php _e( 'This is quickly becoming one of our favorite features. While you are in the dashboard (because you&#8217;re running updates and writing posts, right?) all upcoming WordCamps and WordPress Meetups &mdash; local to you &mdash; will be displayed.' ); ?>
+				<p><?php _e('This is quickly becoming one of our favorite features. While you are in the dashboard (because you&#8217;re running updates and writing posts, right?) all upcoming WordCamps and WordPress Meetups &mdash; local to you &mdash; will be displayed.'); ?>
 
-				<p><?php _e( 'Being part of the community can help you improve your WordPress skills and network with people you wouldn&#8217;t otherwise meet. Now you can easily find your local events just by logging in to your dashboard and looking at the new Events and News dashboard widget.' ); ?>
+				<p><?php _e('Being part of the community can help you improve your WordPress skills and network with people you wouldn&#8217;t otherwise meet. Now you can easily find your local events just by logging in to your dashboard and looking at the new Events and News dashboard widget.'); ?>
 			</div>
 			<div class="col">
 				<img
@@ -177,35 +177,35 @@ 
 			<h2><?php
 				printf(
 					/* translators: %s: smiling face with smiling eyes emoji */
-					__( 'Even More Developer Happiness %s' ),
+					__('Even More Developer Happiness %s'),
 					'&#x1F60A'
 				);
 			?></h2>
 
 			<div class="under-the-hood three-col">
 				<div class="col">
-					<h3><a href="https://make.wordpress.org/core/2017/05/17/cleaner-headings-in-the-admin-screens/"><?php _e( 'More Accessible Admin Panel Headings' ); ?></a></h3>
-					<p><?php _e( 'New CSS rules mean extraneous content (like &ldquo;Add New&rdquo; links) no longer need to be included in admin-area headings. These panel headings improve the experience for people using assistive technologies.' ); ?></p>
+					<h3><a href="https://make.wordpress.org/core/2017/05/17/cleaner-headings-in-the-admin-screens/"><?php _e('More Accessible Admin Panel Headings'); ?></a></h3>
+					<p><?php _e('New CSS rules mean extraneous content (like &ldquo;Add New&rdquo; links) no longer need to be included in admin-area headings. These panel headings improve the experience for people using assistive technologies.'); ?></p>
 				</div>
 				<div class="col">
-					<h3><a href="https://make.wordpress.org/core/2017/05/22/removal-of-core-embedding-support-for-wmv-and-wma-file-formats/"><?php _e( 'Removal of Core Support for WMV and WMA Files' ); ?></a></h3>
-					<p><?php _e( 'As fewer and fewer browsers support Silverlight, file formats which require the presence of the Silverlight plugin are being removed from core support. Files will still display as a download link, but will no longer be embedded automatically.' ); ?></p>
+					<h3><a href="https://make.wordpress.org/core/2017/05/22/removal-of-core-embedding-support-for-wmv-and-wma-file-formats/"><?php _e('Removal of Core Support for WMV and WMA Files'); ?></a></h3>
+					<p><?php _e('As fewer and fewer browsers support Silverlight, file formats which require the presence of the Silverlight plugin are being removed from core support. Files will still display as a download link, but will no longer be embedded automatically.'); ?></p>
 				</div>
 				<div class="col">
-					<h3><a href="https://make.wordpress.org/core/2017/05/22/multisite-focused-changes-in-4-8/"><?php _e( 'Multisite Updates' ); ?></a></h3>
-					<p><?php _e( 'New capabilities have been introduced to 4.8 with an eye towards removing calls to <code>is_super_admin()</code>. Additionally, new hooks and tweaks to more granularly control site and user counts per network have been added.' ); ?></p>
+					<h3><a href="https://make.wordpress.org/core/2017/05/22/multisite-focused-changes-in-4-8/"><?php _e('Multisite Updates'); ?></a></h3>
+					<p><?php _e('New capabilities have been introduced to 4.8 with an eye towards removing calls to <code>is_super_admin()</code>. Additionally, new hooks and tweaks to more granularly control site and user counts per network have been added.'); ?></p>
 				</div>
 				<div class="col">
-					<h3><a href="https://make.wordpress.org/core/2017/05/23/addition-of-tinymce-to-the-text-widget/"><?php _e( 'Text-Editor JavaScript API' ); ?></a></h3>
-					<p><?php _e( 'With the addition of TinyMCE to the text widget in 4.8 comes a new JavaScript API for instantiating the editor after page load. This can be used to add an editor instance to any text area, and customize it with buttons and functions. Great for plugin authors!' ); ?></p>
+					<h3><a href="https://make.wordpress.org/core/2017/05/23/addition-of-tinymce-to-the-text-widget/"><?php _e('Text-Editor JavaScript API'); ?></a></h3>
+					<p><?php _e('With the addition of TinyMCE to the text widget in 4.8 comes a new JavaScript API for instantiating the editor after page load. This can be used to add an editor instance to any text area, and customize it with buttons and functions. Great for plugin authors!'); ?></p>
 				</div>
 				<div class="col">
-					<h3><a href="https://make.wordpress.org/core/2017/05/26/media-widgets-for-images-video-and-audio/"><?php _e( 'Media Widgets API' ); ?></a></h3>
-					<p><?php _e( 'The introduction of a new base media widget REST API schema to 4.8 opens up possibilities for even more media widgets (like galleries or playlists) in the future. The three new media widgets are powered by a shared base class that covers most of the interactions with the media modal. That class also makes it easier to create new media widgets and paves the way for more to come.' ); ?></p>
+					<h3><a href="https://make.wordpress.org/core/2017/05/26/media-widgets-for-images-video-and-audio/"><?php _e('Media Widgets API'); ?></a></h3>
+					<p><?php _e('The introduction of a new base media widget REST API schema to 4.8 opens up possibilities for even more media widgets (like galleries or playlists) in the future. The three new media widgets are powered by a shared base class that covers most of the interactions with the media modal. That class also makes it easier to create new media widgets and paves the way for more to come.'); ?></p>
 				</div>
 				<div class="col">
-					<h3><a href="https://make.wordpress.org/core/2017/05/16/customizer-sidebar-width-is-now-variable/"><?php _e( 'Customizer Width Variable' ); ?></a></h3>
-					<p><?php _e( 'Rejoice! New responsive breakpoints have been added to the customizer sidebar to make it wider on high-resolution screens. Customizer controls should use percentage-based widths instead of pixels.' ); ?></p>
+					<h3><a href="https://make.wordpress.org/core/2017/05/16/customizer-sidebar-width-is-now-variable/"><?php _e('Customizer Width Variable'); ?></a></h3>
+					<p><?php _e('Rejoice! New responsive breakpoints have been added to the customizer sidebar to make it wider on high-resolution screens. Customizer controls should use percentage-based widths instead of pixels.'); ?></p>
 				</div>
 			</div>
 		</div>
@@ -213,47 +213,47 @@ 
 		<hr />
 
 		<div class="return-to-dashboard">
-			<?php if ( current_user_can( 'update_core' ) && isset( $_GET['updated'] ) ) : ?>
-				<a href="<?php echo esc_url( self_admin_url( 'update-core.php' ) ); ?>">
-					<?php is_multisite() ? _e( 'Return to Updates' ) : _e( 'Return to Dashboard &rarr; Updates' ); ?>
+			<?php if (current_user_can('update_core') && isset($_GET['updated'])) : ?>
+				<a href="<?php echo esc_url(self_admin_url('update-core.php')); ?>">
+					<?php is_multisite() ? _e('Return to Updates') : _e('Return to Dashboard &rarr; Updates'); ?>
 				</a> |
 			<?php endif; ?>
-			<a href="<?php echo esc_url( self_admin_url() ); ?>"><?php is_blog_admin() ? _e( 'Go to Dashboard &rarr; Home' ) : _e( 'Go to Dashboard' ); ?></a>
+			<a href="<?php echo esc_url(self_admin_url()); ?>"><?php is_blog_admin() ? _e('Go to Dashboard &rarr; Home') : _e('Go to Dashboard'); ?></a>
 		</div>
 
 	</div>
 <?php
 
-include( ABSPATH . 'wp-admin/admin-footer.php' );
+include(ABSPATH.'wp-admin/admin-footer.php');
 
 // These are strings we may use to describe maintenance/security releases, where we aim for no new strings.
 return;
 
-__( 'Maintenance Release' );
-__( 'Maintenance Releases' );
+__('Maintenance Release');
+__('Maintenance Releases');
 
-__( 'Security Release' );
-__( 'Security Releases' );
+__('Security Release');
+__('Security Releases');
 
-__( 'Maintenance and Security Release' );
-__( 'Maintenance and Security Releases' );
+__('Maintenance and Security Release');
+__('Maintenance and Security Releases');
 
 /* translators: %s: WordPress version number */
-__( '<strong>Version %s</strong> addressed one security issue.' );
+__('<strong>Version %s</strong> addressed one security issue.');
 /* translators: %s: WordPress version number */
-__( '<strong>Version %s</strong> addressed some security issues.' );
+__('<strong>Version %s</strong> addressed some security issues.');
 
 /* translators: 1: WordPress version number, 2: plural number of bugs. */
-_n_noop( '<strong>Version %1$s</strong> addressed %2$s bug.',
-         '<strong>Version %1$s</strong> addressed %2$s bugs.' );
+_n_noop('<strong>Version %1$s</strong> addressed %2$s bug.',
+         '<strong>Version %1$s</strong> addressed %2$s bugs.');
 
 /* translators: 1: WordPress version number, 2: plural number of bugs. Singular security issue. */
-_n_noop( '<strong>Version %1$s</strong> addressed a security issue and fixed %2$s bug.',
-         '<strong>Version %1$s</strong> addressed a security issue and fixed %2$s bugs.' );
+_n_noop('<strong>Version %1$s</strong> addressed a security issue and fixed %2$s bug.',
+         '<strong>Version %1$s</strong> addressed a security issue and fixed %2$s bugs.');
 
 /* translators: 1: WordPress version number, 2: plural number of bugs. More than one security issue. */
-_n_noop( '<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bug.',
-         '<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bugs.' );
+_n_noop('<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bug.',
+         '<strong>Version %1$s</strong> addressed some security issues and fixed %2$s bugs.');
 
 /* translators: %s: Codex URL */
-__( 'For more information, see <a href="%s">the release notes</a>.' );
+__('For more information, see <a href="%s">the release notes</a>.');

src/wp-admin/edit-tags.php

Indentation +1 added lines, -1 removed lines

@@ -348,7 +348,7 @@
 if ( current_user_can($tax->cap->edit_terms) ) {
 	if ( 'category' == $taxonomy ) {
 		/**
- 		 * Fires before the Add Category form.
+		 * Fires before the Add Category form.
 		 *
 		 * @since 2.1.0
 		 * @deprecated 3.0.0 Use {$taxonomy}_pre_add_form instead.

Switch Indentation +88 added lines, -88 removed lines

@@ -67,118 +67,118 @@
 $referer = remove_query_arg( array( '_wp_http_referer', '_wpnonce', 'error', 'message', 'paged' ), $referer );
 switch ( $wp_list_table->current_action() ) {
 
-case 'add-tag':
-	check_admin_referer( 'add-tag', '_wpnonce_add-tag' );
-
-	if ( ! current_user_can( $tax->cap->edit_terms ) ) {
-		wp_die(
-			'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-			'<p>' . __( 'Sorry, you are not allowed to create terms in this taxonomy.' ) . '</p>',
-			403
-		);
-	}
-
-	$ret = wp_insert_term( $_POST['tag-name'], $taxonomy, $_POST );
-	if ( $ret && !is_wp_error( $ret ) )
-		$location = add_query_arg( 'message', 1, $referer );
-	else
-		$location = add_query_arg( array( 'error' => true, 'message' => 4 ), $referer );
-
-	break;
+	case 'add-tag':
+		check_admin_referer( 'add-tag', '_wpnonce_add-tag' );
+
+		if ( ! current_user_can( $tax->cap->edit_terms ) ) {
+			wp_die(
+				'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+				'<p>' . __( 'Sorry, you are not allowed to create terms in this taxonomy.' ) . '</p>',
+				403
+			);
+		}
+
+		$ret = wp_insert_term( $_POST['tag-name'], $taxonomy, $_POST );
+		if ( $ret && !is_wp_error( $ret ) )
+			$location = add_query_arg( 'message', 1, $referer );
+		else
+			$location = add_query_arg( array( 'error' => true, 'message' => 4 ), $referer );
 
-case 'delete':
-	if ( ! isset( $_REQUEST['tag_ID'] ) ) {
 		break;
-	}
 
-	$tag_ID = (int) $_REQUEST['tag_ID'];
-	check_admin_referer( 'delete-tag_' . $tag_ID );
+	case 'delete':
+		if ( ! isset( $_REQUEST['tag_ID'] ) ) {
+			break;
+		}
 
-	if ( ! current_user_can( 'delete_term', $tag_ID ) ) {
-		wp_die(
-			'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-			'<p>' . __( 'Sorry, you are not allowed to delete this item.' ) . '</p>',
-			403
-		);
-	}
+		$tag_ID = (int) $_REQUEST['tag_ID'];
+		check_admin_referer( 'delete-tag_' . $tag_ID );
 
-	wp_delete_term( $tag_ID, $taxonomy );
+		if ( ! current_user_can( 'delete_term', $tag_ID ) ) {
+			wp_die(
+				'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+				'<p>' . __( 'Sorry, you are not allowed to delete this item.' ) . '</p>',
+				403
+			);
+		}
 
-	$location = add_query_arg( 'message', 2, $referer );
+		wp_delete_term( $tag_ID, $taxonomy );
 
-	// When deleting a term, prevent the action from redirecting back to a term that no longer exists.
-	$location = remove_query_arg( array( 'tag_ID', 'action' ), $location );
+		$location = add_query_arg( 'message', 2, $referer );
 
-	break;
+		// When deleting a term, prevent the action from redirecting back to a term that no longer exists.
+		$location = remove_query_arg( array( 'tag_ID', 'action' ), $location );
 
-case 'bulk-delete':
-	check_admin_referer( 'bulk-tags' );
+		break;
 
-	if ( ! current_user_can( $tax->cap->delete_terms ) ) {
-		wp_die(
-			'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-			'<p>' . __( 'Sorry, you are not allowed to delete these items.' ) . '</p>',
-			403
-		);
-	}
+	case 'bulk-delete':
+		check_admin_referer( 'bulk-tags' );
 
-	$tags = (array) $_REQUEST['delete_tags'];
-	foreach ( $tags as $tag_ID ) {
-		wp_delete_term( $tag_ID, $taxonomy );
-	}
+		if ( ! current_user_can( $tax->cap->delete_terms ) ) {
+			wp_die(
+				'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+				'<p>' . __( 'Sorry, you are not allowed to delete these items.' ) . '</p>',
+				403
+			);
+		}
 
-	$location = add_query_arg( 'message', 6, $referer );
+		$tags = (array) $_REQUEST['delete_tags'];
+		foreach ( $tags as $tag_ID ) {
+			wp_delete_term( $tag_ID, $taxonomy );
+		}
 
-	break;
+		$location = add_query_arg( 'message', 6, $referer );
 
-case 'edit':
-	if ( ! isset( $_REQUEST['tag_ID'] ) ) {
 		break;
-	}
 
-	$term_id = (int) $_REQUEST['tag_ID'];
-	$term    = get_term( $term_id );
+	case 'edit':
+		if ( ! isset( $_REQUEST['tag_ID'] ) ) {
+			break;
+		}
 
-	if ( ! $term instanceof WP_Term ) {
-		wp_die( __( 'You attempted to edit an item that doesn&#8217;t exist. Perhaps it was deleted?' ) );
-	}
+		$term_id = (int) $_REQUEST['tag_ID'];
+		$term    = get_term( $term_id );
 
-	wp_redirect( esc_url_raw( get_edit_term_link( $term_id, $taxonomy, $post_type ) ) );
-	exit;
+		if ( ! $term instanceof WP_Term ) {
+			wp_die( __( 'You attempted to edit an item that doesn&#8217;t exist. Perhaps it was deleted?' ) );
+		}
 
-case 'editedtag':
-	$tag_ID = (int) $_POST['tag_ID'];
-	check_admin_referer( 'update-tag_' . $tag_ID );
+		wp_redirect( esc_url_raw( get_edit_term_link( $term_id, $taxonomy, $post_type ) ) );
+		exit;
 
-	if ( ! current_user_can( 'edit_term', $tag_ID ) ) {
-		wp_die(
-			'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-			'<p>' . __( 'Sorry, you are not allowed to edit this item.' ) . '</p>',
-			403
-		);
-	}
+	case 'editedtag':
+		$tag_ID = (int) $_POST['tag_ID'];
+		check_admin_referer( 'update-tag_' . $tag_ID );
 
-	$tag = get_term( $tag_ID, $taxonomy );
-	if ( ! $tag )
-		wp_die( __( 'You attempted to edit an item that doesn&#8217;t exist. Perhaps it was deleted?' ) );
+		if ( ! current_user_can( 'edit_term', $tag_ID ) ) {
+			wp_die(
+				'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
+				'<p>' . __( 'Sorry, you are not allowed to edit this item.' ) . '</p>',
+				403
+			);
+		}
 
-	$ret = wp_update_term( $tag_ID, $taxonomy, $_POST );
+		$tag = get_term( $tag_ID, $taxonomy );
+		if ( ! $tag )
+			wp_die( __( 'You attempted to edit an item that doesn&#8217;t exist. Perhaps it was deleted?' ) );
 
-	if ( $ret && ! is_wp_error( $ret ) ) {
-		$location = add_query_arg( 'message', 3, $referer );
-	} else {
-		$location = add_query_arg( array( 'error' => true, 'message' => 5 ), $referer );
-	}
-	break;
-default:
-	if ( ! $wp_list_table->current_action() || ! isset( $_REQUEST['delete_tags'] ) ) {
+		$ret = wp_update_term( $tag_ID, $taxonomy, $_POST );
+
+		if ( $ret && ! is_wp_error( $ret ) ) {
+			$location = add_query_arg( 'message', 3, $referer );
+		} else {
+			$location = add_query_arg( array( 'error' => true, 'message' => 5 ), $referer );
+		}
+		break;
+	default:
+		if ( ! $wp_list_table->current_action() || ! isset( $_REQUEST['delete_tags'] ) ) {
+			break;
+		}
+		check_admin_referer( 'bulk-tags' );
+		$tags = (array) $_REQUEST['delete_tags'];
+		/** This action is documented in wp-admin/edit-comments.php */
+		$location = apply_filters( 'handle_bulk_actions-' . get_current_screen()->id, $location, $wp_list_table->current_action(), $tags );
 		break;
-	}
-	check_admin_referer( 'bulk-tags' );
-	$tags = (array) $_REQUEST['delete_tags'];
-	/** This action is documented in wp-admin/edit-comments.php */
-	$location = apply_filters( 'handle_bulk_actions-' . get_current_screen()->id, $location, $wp_list_table->current_action(), $tags );
-	break;
 }
 
 if ( ! $location && ! empty( $_REQUEST['_wp_http_referer'] ) ) {

Spacing +165 added lines, -165 removed lines

@@ -7,24 +7,24 @@ 
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( ! $taxnow )
-	wp_die( __( 'Invalid taxonomy.' ) );
+if ( ! $taxnow)
+	wp_die(__('Invalid taxonomy.'));
 
-$tax = get_taxonomy( $taxnow );
+$tax = get_taxonomy($taxnow);
 
-if ( ! $tax )
-	wp_die( __( 'Invalid taxonomy.' ) );
+if ( ! $tax)
+	wp_die(__('Invalid taxonomy.'));
 
-if ( ! in_array( $tax->name, get_taxonomies( array( 'show_ui' => true ) ) ) ) {
-   wp_die( __( 'Sorry, you are not allowed to edit terms in this taxonomy.' ) );
+if ( ! in_array($tax->name, get_taxonomies(array('show_ui' => true)))) {
+   wp_die(__('Sorry, you are not allowed to edit terms in this taxonomy.'));
 }
 
-if ( ! current_user_can( $tax->cap->manage_terms ) ) {
+if ( ! current_user_can($tax->cap->manage_terms)) {
 	wp_die(
-		'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-		'<p>' . __( 'Sorry, you are not allowed to manage terms in this taxonomy.' ) . '</p>',
+		'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+		'<p>'.__('Sorry, you are not allowed to manage terms in this taxonomy.').'</p>',
 		403
 	);
 }
@@ -41,10 +41,10 @@ 
 
 $title = $tax->labels->name;
 
-if ( 'post' != $post_type ) {
-	$parent_file = ( 'attachment' == $post_type ) ? 'upload.php' : "edit.php?post_type=$post_type";
+if ('post' != $post_type) {
+	$parent_file = ('attachment' == $post_type) ? 'upload.php' : "edit.php?post_type=$post_type";
 	$submenu_file = "edit-tags.php?taxonomy=$taxonomy&amp;post_type=$post_type";
-} elseif ( 'link_category' == $tax->name ) {
+} elseif ('link_category' == $tax->name) {
 	$parent_file = 'link-manager.php';
 	$submenu_file = 'edit-tags.php?taxonomy=link_category';
 } else {
@@ -52,142 +52,142 @@ 
 	$submenu_file = "edit-tags.php?taxonomy=$taxonomy";
 }
 
-add_screen_option( 'per_page', array( 'default' => 20, 'option' => 'edit_' . $tax->name . '_per_page' ) );
+add_screen_option('per_page', array('default' => 20, 'option' => 'edit_'.$tax->name.'_per_page'));
 
-get_current_screen()->set_screen_reader_content( array(
+get_current_screen()->set_screen_reader_content(array(
 	'heading_pagination' => $tax->labels->items_list_navigation,
 	'heading_list'       => $tax->labels->items_list,
-) );
+));
 
 $location = false;
 $referer = wp_get_referer();
-if ( ! $referer ) { // For POST requests.
-	$referer = wp_unslash( $_SERVER['REQUEST_URI'] );
+if ( ! $referer) { // For POST requests.
+	$referer = wp_unslash($_SERVER['REQUEST_URI']);
 }
-$referer = remove_query_arg( array( '_wp_http_referer', '_wpnonce', 'error', 'message', 'paged' ), $referer );
-switch ( $wp_list_table->current_action() ) {
+$referer = remove_query_arg(array('_wp_http_referer', '_wpnonce', 'error', 'message', 'paged'), $referer);
+switch ($wp_list_table->current_action()) {
 
 case 'add-tag':
-	check_admin_referer( 'add-tag', '_wpnonce_add-tag' );
+	check_admin_referer('add-tag', '_wpnonce_add-tag');
 
-	if ( ! current_user_can( $tax->cap->edit_terms ) ) {
+	if ( ! current_user_can($tax->cap->edit_terms)) {
 		wp_die(
-			'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-			'<p>' . __( 'Sorry, you are not allowed to create terms in this taxonomy.' ) . '</p>',
+			'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+			'<p>'.__('Sorry, you are not allowed to create terms in this taxonomy.').'</p>',
 			403
 		);
 	}
 
-	$ret = wp_insert_term( $_POST['tag-name'], $taxonomy, $_POST );
-	if ( $ret && !is_wp_error( $ret ) )
-		$location = add_query_arg( 'message', 1, $referer );
+	$ret = wp_insert_term($_POST['tag-name'], $taxonomy, $_POST);
+	if ($ret && ! is_wp_error($ret))
+		$location = add_query_arg('message', 1, $referer);
 	else
-		$location = add_query_arg( array( 'error' => true, 'message' => 4 ), $referer );
+		$location = add_query_arg(array('error' => true, 'message' => 4), $referer);
 
 	break;
 
 case 'delete':
-	if ( ! isset( $_REQUEST['tag_ID'] ) ) {
+	if ( ! isset($_REQUEST['tag_ID'])) {
 		break;
 	}
 
 	$tag_ID = (int) $_REQUEST['tag_ID'];
-	check_admin_referer( 'delete-tag_' . $tag_ID );
+	check_admin_referer('delete-tag_'.$tag_ID);
 
-	if ( ! current_user_can( 'delete_term', $tag_ID ) ) {
+	if ( ! current_user_can('delete_term', $tag_ID)) {
 		wp_die(
-			'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-			'<p>' . __( 'Sorry, you are not allowed to delete this item.' ) . '</p>',
+			'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+			'<p>'.__('Sorry, you are not allowed to delete this item.').'</p>',
 			403
 		);
 	}
 
-	wp_delete_term( $tag_ID, $taxonomy );
+	wp_delete_term($tag_ID, $taxonomy);
 
-	$location = add_query_arg( 'message', 2, $referer );
+	$location = add_query_arg('message', 2, $referer);
 
 	// When deleting a term, prevent the action from redirecting back to a term that no longer exists.
-	$location = remove_query_arg( array( 'tag_ID', 'action' ), $location );
+	$location = remove_query_arg(array('tag_ID', 'action'), $location);
 
 	break;
 
 case 'bulk-delete':
-	check_admin_referer( 'bulk-tags' );
+	check_admin_referer('bulk-tags');
 
-	if ( ! current_user_can( $tax->cap->delete_terms ) ) {
+	if ( ! current_user_can($tax->cap->delete_terms)) {
 		wp_die(
-			'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-			'<p>' . __( 'Sorry, you are not allowed to delete these items.' ) . '</p>',
+			'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+			'<p>'.__('Sorry, you are not allowed to delete these items.').'</p>',
 			403
 		);
 	}
 
 	$tags = (array) $_REQUEST['delete_tags'];
-	foreach ( $tags as $tag_ID ) {
-		wp_delete_term( $tag_ID, $taxonomy );
+	foreach ($tags as $tag_ID) {
+		wp_delete_term($tag_ID, $taxonomy);
 	}
 
-	$location = add_query_arg( 'message', 6, $referer );
+	$location = add_query_arg('message', 6, $referer);
 
 	break;
 
 case 'edit':
-	if ( ! isset( $_REQUEST['tag_ID'] ) ) {
+	if ( ! isset($_REQUEST['tag_ID'])) {
 		break;
 	}
 
 	$term_id = (int) $_REQUEST['tag_ID'];
-	$term    = get_term( $term_id );
+	$term    = get_term($term_id);
 
-	if ( ! $term instanceof WP_Term ) {
-		wp_die( __( 'You attempted to edit an item that doesn&#8217;t exist. Perhaps it was deleted?' ) );
+	if ( ! $term instanceof WP_Term) {
+		wp_die(__('You attempted to edit an item that doesn&#8217;t exist. Perhaps it was deleted?'));
 	}
 
-	wp_redirect( esc_url_raw( get_edit_term_link( $term_id, $taxonomy, $post_type ) ) );
+	wp_redirect(esc_url_raw(get_edit_term_link($term_id, $taxonomy, $post_type)));
 	exit;
 
 case 'editedtag':
 	$tag_ID = (int) $_POST['tag_ID'];
-	check_admin_referer( 'update-tag_' . $tag_ID );
+	check_admin_referer('update-tag_'.$tag_ID);
 
-	if ( ! current_user_can( 'edit_term', $tag_ID ) ) {
+	if ( ! current_user_can('edit_term', $tag_ID)) {
 		wp_die(
-			'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-			'<p>' . __( 'Sorry, you are not allowed to edit this item.' ) . '</p>',
+			'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+			'<p>'.__('Sorry, you are not allowed to edit this item.').'</p>',
 			403
 		);
 	}
 
-	$tag = get_term( $tag_ID, $taxonomy );
-	if ( ! $tag )
-		wp_die( __( 'You attempted to edit an item that doesn&#8217;t exist. Perhaps it was deleted?' ) );
+	$tag = get_term($tag_ID, $taxonomy);
+	if ( ! $tag)
+		wp_die(__('You attempted to edit an item that doesn&#8217;t exist. Perhaps it was deleted?'));
 
-	$ret = wp_update_term( $tag_ID, $taxonomy, $_POST );
+	$ret = wp_update_term($tag_ID, $taxonomy, $_POST);
 
-	if ( $ret && ! is_wp_error( $ret ) ) {
-		$location = add_query_arg( 'message', 3, $referer );
+	if ($ret && ! is_wp_error($ret)) {
+		$location = add_query_arg('message', 3, $referer);
 	} else {
-		$location = add_query_arg( array( 'error' => true, 'message' => 5 ), $referer );
+		$location = add_query_arg(array('error' => true, 'message' => 5), $referer);
 	}
 	break;
 default:
-	if ( ! $wp_list_table->current_action() || ! isset( $_REQUEST['delete_tags'] ) ) {
+	if ( ! $wp_list_table->current_action() || ! isset($_REQUEST['delete_tags'])) {
 		break;
 	}
-	check_admin_referer( 'bulk-tags' );
+	check_admin_referer('bulk-tags');
 	$tags = (array) $_REQUEST['delete_tags'];
 	/** This action is documented in wp-admin/edit-comments.php */
-	$location = apply_filters( 'handle_bulk_actions-' . get_current_screen()->id, $location, $wp_list_table->current_action(), $tags );
+	$location = apply_filters('handle_bulk_actions-'.get_current_screen()->id, $location, $wp_list_table->current_action(), $tags);
 	break;
 }
 
-if ( ! $location && ! empty( $_REQUEST['_wp_http_referer'] ) ) {
-	$location = remove_query_arg( array( '_wp_http_referer', '_wpnonce' ), wp_unslash( $_SERVER['REQUEST_URI'] ) );
+if ( ! $location && ! empty($_REQUEST['_wp_http_referer'])) {
+	$location = remove_query_arg(array('_wp_http_referer', '_wpnonce'), wp_unslash($_SERVER['REQUEST_URI']));
 }
 
-if ( $location ) {
-	if ( $pagenum > 1 ) {
-		$location = add_query_arg( 'paged', $pagenum, $location ); // $pagenum takes care of $total_pages.
+if ($location) {
+	if ($pagenum > 1) {
+		$location = add_query_arg('paged', $pagenum, $location); // $pagenum takes care of $total_pages.
 	}
 
 	/**
@@ -198,114 +198,114 @@ 
 	 * @param string $location The destination URL.
 	 * @param object $tax      The taxonomy object.
 	 */
-	wp_redirect( apply_filters( 'redirect_term_location', $location, $tax ) );
+	wp_redirect(apply_filters('redirect_term_location', $location, $tax));
 	exit;
 }
 
 $wp_list_table->prepare_items();
-$total_pages = $wp_list_table->get_pagination_arg( '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 ) );
+if ($pagenum > $total_pages && $total_pages > 0) {
+	wp_redirect(add_query_arg('paged', $total_pages));
 	exit;
 }
 
 wp_enqueue_script('admin-tags');
-if ( current_user_can($tax->cap->edit_terms) )
+if (current_user_can($tax->cap->edit_terms))
 	wp_enqueue_script('inline-edit-tax');
 
-if ( 'category' == $taxonomy || 'link_category' == $taxonomy || 'post_tag' == $taxonomy  ) {
-	$help ='';
-	if ( 'category' == $taxonomy )
-		$help = '<p>' . sprintf(__( 'You can use categories to define sections of your site and group related posts. The default category is &#8220;Uncategorized&#8221; until you change it in your <a href="%s">writing settings</a>.' ) , 'options-writing.php' ) . '</p>';
-	elseif ( 'link_category' == $taxonomy )
-		$help = '<p>' . __( 'You can create groups of links by using Link Categories. Link Category names must be unique and Link Categories are separate from the categories you use for posts.' ) . '</p>';
+if ('category' == $taxonomy || 'link_category' == $taxonomy || 'post_tag' == $taxonomy) {
+	$help = '';
+	if ('category' == $taxonomy)
+		$help = '<p>'.sprintf(__('You can use categories to define sections of your site and group related posts. The default category is &#8220;Uncategorized&#8221; until you change it in your <a href="%s">writing settings</a>.'), 'options-writing.php').'</p>';
+	elseif ('link_category' == $taxonomy)
+		$help = '<p>'.__('You can create groups of links by using Link Categories. Link Category names must be unique and Link Categories are separate from the categories you use for posts.').'</p>';
 	else
-		$help = '<p>' . __( 'You can assign keywords to your posts using <strong>tags</strong>. Unlike categories, tags have no hierarchy, meaning there&#8217;s no relationship from one tag to another.' ) . '</p>';
+		$help = '<p>'.__('You can assign keywords to your posts using <strong>tags</strong>. Unlike categories, tags have no hierarchy, meaning there&#8217;s no relationship from one tag to another.').'</p>';
 
-	if ( 'link_category' == $taxonomy )
-		$help .= '<p>' . __( 'You can delete Link Categories in the Bulk Action pull-down, but that action does not delete the links within the category. Instead, it moves them to the default Link Category.' ) . '</p>';
+	if ('link_category' == $taxonomy)
+		$help .= '<p>'.__('You can delete Link Categories in the Bulk Action pull-down, but that action does not delete the links within the category. Instead, it moves them to the default Link Category.').'</p>';
 	else
-		$help .='<p>' . __( 'What&#8217;s the difference between categories and tags? Normally, tags are ad-hoc keywords that identify important information in your post (names, subjects, etc) that may or may not recur in other posts, while categories are pre-determined sections. If you think of your site like a book, the categories are like the Table of Contents and the tags are like the terms in the index.' ) . '</p>';
+		$help .= '<p>'.__('What&#8217;s the difference between categories and tags? Normally, tags are ad-hoc keywords that identify important information in your post (names, subjects, etc) that may or may not recur in other posts, while categories are pre-determined sections. If you think of your site like a book, the categories are like the Table of Contents and the tags are like the terms in the index.').'</p>';
 
-	get_current_screen()->add_help_tab( array(
+	get_current_screen()->add_help_tab(array(
 		'id'      => 'overview',
 		'title'   => __('Overview'),
 		'content' => $help,
-	) );
+	));
 
-	if ( 'category' == $taxonomy || 'post_tag' == $taxonomy ) {
-		if ( 'category' == $taxonomy )
-			$help = '<p>' . __( 'When adding a new category on this screen, you&#8217;ll fill in the following fields:' ) . '</p>';
+	if ('category' == $taxonomy || 'post_tag' == $taxonomy) {
+		if ('category' == $taxonomy)
+			$help = '<p>'.__('When adding a new category on this screen, you&#8217;ll fill in the following fields:').'</p>';
 		else
-			$help = '<p>' . __( 'When adding a new tag on this screen, you&#8217;ll fill in the following fields:' ) . '</p>';
+			$help = '<p>'.__('When adding a new tag on this screen, you&#8217;ll fill in the following fields:').'</p>';
 
-		$help .= '<ul>' .
-		'<li>' . __( '<strong>Name</strong> &mdash; The name is how it appears on your site.' ) . '</li>';
+		$help .= '<ul>'.
+		'<li>'.__('<strong>Name</strong> &mdash; The name is how it appears on your site.').'</li>';
 
-		if ( ! global_terms_enabled() )
-			$help .= '<li>' . __( '<strong>Slug</strong> &mdash; The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.' ) . '</li>';
+		if ( ! global_terms_enabled())
+			$help .= '<li>'.__('<strong>Slug</strong> &mdash; The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.').'</li>';
 
-		if ( 'category' == $taxonomy )
-			$help .= '<li>' . __( '<strong>Parent</strong> &mdash; Categories, unlike tags, can have a hierarchy. You might have a Jazz category, and under that have child categories for Bebop and Big Band. Totally optional. To create a subcategory, just choose another category from the Parent dropdown.' ) . '</li>';
+		if ('category' == $taxonomy)
+			$help .= '<li>'.__('<strong>Parent</strong> &mdash; Categories, unlike tags, can have a hierarchy. You might have a Jazz category, and under that have child categories for Bebop and Big Band. Totally optional. To create a subcategory, just choose another category from the Parent dropdown.').'</li>';
 
-		$help .= '<li>' . __( '<strong>Description</strong> &mdash; The description is not prominent by default; however, some themes may display it.' ) . '</li>' .
-		'</ul>' .
-		'<p>' . __( 'You can change the display of this screen using the Screen Options tab to set how many items are displayed per screen and to display/hide columns in the table.' ) . '</p>';
+		$help .= '<li>'.__('<strong>Description</strong> &mdash; The description is not prominent by default; however, some themes may display it.').'</li>'.
+		'</ul>'.
+		'<p>'.__('You can change the display of this screen using the Screen Options tab to set how many items are displayed per screen and to display/hide columns in the table.').'</p>';
 
-		get_current_screen()->add_help_tab( array(
+		get_current_screen()->add_help_tab(array(
 			'id'      => 'adding-terms',
-			'title'   => 'category' == $taxonomy ? __( 'Adding Categories' ) : __( 'Adding Tags' ),
+			'title'   => 'category' == $taxonomy ? __('Adding Categories') : __('Adding Tags'),
 			'content' => $help,
-		) );
+		));
 	}
 
-	$help = '<p><strong>' . __( 'For more information:' ) . '</strong></p>';
+	$help = '<p><strong>'.__('For more information:').'</strong></p>';
 
-	if ( 'category' == $taxonomy )
-		$help .= '<p>' . __( '<a href="https://codex.wordpress.org/Posts_Categories_Screen">Documentation on Categories</a>' ) . '</p>';
-	elseif ( 'link_category' == $taxonomy )
-		$help .= '<p>' . __( '<a href="https://codex.wordpress.org/Links_Link_Categories_Screen">Documentation on Link Categories</a>' ) . '</p>';
+	if ('category' == $taxonomy)
+		$help .= '<p>'.__('<a href="https://codex.wordpress.org/Posts_Categories_Screen">Documentation on Categories</a>').'</p>';
+	elseif ('link_category' == $taxonomy)
+		$help .= '<p>'.__('<a href="https://codex.wordpress.org/Links_Link_Categories_Screen">Documentation on Link Categories</a>').'</p>';
 	else
-		$help .= '<p>' . __( '<a href="https://codex.wordpress.org/Posts_Tags_Screen">Documentation on Tags</a>' ) . '</p>';
+		$help .= '<p>'.__('<a href="https://codex.wordpress.org/Posts_Tags_Screen">Documentation on Tags</a>').'</p>';
 
-	$help .= '<p>' . __('<a href="https://wordpress.org/support/">Support Forums</a>') . '</p>';
+	$help .= '<p>'.__('<a href="https://wordpress.org/support/">Support Forums</a>').'</p>';
 
-	get_current_screen()->set_help_sidebar( $help );
+	get_current_screen()->set_help_sidebar($help);
 
-	unset( $help );
+	unset($help);
 }
 
-require_once( ABSPATH . 'wp-admin/admin-header.php' );
+require_once(ABSPATH.'wp-admin/admin-header.php');
 
 /** Also used by the Edit Tag  form */
-require_once( ABSPATH . 'wp-admin/includes/edit-tag-messages.php' );
+require_once(ABSPATH.'wp-admin/includes/edit-tag-messages.php');
 
-$class = ( isset( $_REQUEST['error'] ) ) ? 'error' : 'updated';
+$class = (isset($_REQUEST['error'])) ? 'error' : 'updated';
 
-if ( is_plugin_active( 'wpcat2tag-importer/wpcat2tag-importer.php' ) ) {
-	$import_link = admin_url( 'admin.php?import=wpcat2tag' );
+if (is_plugin_active('wpcat2tag-importer/wpcat2tag-importer.php')) {
+	$import_link = admin_url('admin.php?import=wpcat2tag');
 } else {
-	$import_link = admin_url( 'import.php' );
+	$import_link = admin_url('import.php');
 }
 
 ?>
 
 <div class="wrap nosubsub">
-<h1 class="wp-heading-inline"><?php echo esc_html( $title ); ?></h1>
+<h1 class="wp-heading-inline"><?php echo esc_html($title); ?></h1>
 
 <?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>', esc_html( wp_unslash( $_REQUEST['s'] ) ) );
+	printf('<span class="subtitle">'.__('Search results for &#8220;%s&#8221;').'</span>', esc_html(wp_unslash($_REQUEST['s'])));
 }
 ?>
 
 <hr class="wp-header-end">
 
-<?php if ( $message ) : ?>
+<?php if ($message) : ?>
 <div id="message" class="<?php echo $class; ?> notice is-dismissible"><p><?php echo $message; ?></p></div>
-<?php $_SERVER['REQUEST_URI'] = remove_query_arg( array( 'message', 'error' ), $_SERVER['REQUEST_URI'] );
+<?php $_SERVER['REQUEST_URI'] = remove_query_arg(array('message', 'error'), $_SERVER['REQUEST_URI']);
 endif; ?>
 <div id="ajax-response"></div>
 
@@ -313,7 +313,7 @@ 
 <input type="hidden" name="taxonomy" value="<?php echo esc_attr($taxonomy); ?>" />
 <input type="hidden" name="post_type" value="<?php echo esc_attr($post_type); ?>" />
 
-<?php $wp_list_table->search_box( $tax->labels->search_items, 'tag' ); ?>
+<?php $wp_list_table->search_box($tax->labels->search_items, 'tag'); ?>
 
 </form>
 
@@ -324,8 +324,8 @@ 
 
 <?php
 
-if ( current_user_can($tax->cap->edit_terms) ) {
-	if ( 'category' == $taxonomy ) {
+if (current_user_can($tax->cap->edit_terms)) {
+	if ('category' == $taxonomy) {
 		/**
  		 * Fires before the Add Category form.
 		 *
@@ -334,8 +334,8 @@ 
 		 *
 		 * @param object $arg Optional arguments cast to an object.
 		 */
-		do_action( 'add_category_form_pre', (object) array( 'parent' => 0 ) );
-	} elseif ( 'link_category' == $taxonomy ) {
+		do_action('add_category_form_pre', (object) array('parent' => 0));
+	} elseif ('link_category' == $taxonomy) {
 		/**
 		 * Fires before the link category form.
 		 *
@@ -344,7 +344,7 @@ 
 		 *
 		 * @param object $arg Optional arguments cast to an object.
 		 */
-		do_action( 'add_link_category_form_pre', (object) array( 'parent' => 0 ) );
+		do_action('add_link_category_form_pre', (object) array('parent' => 0));
 	} else {
 		/**
 		 * Fires before the Add Tag form.
@@ -354,7 +354,7 @@ 
 		 *
 		 * @param string $taxonomy The taxonomy slug.
 		 */
-		do_action( 'add_tag_form_pre', $taxonomy );
+		do_action('add_tag_form_pre', $taxonomy);
 	}
 
 	/**
@@ -366,7 +366,7 @@ 
 	 *
 	 * @param string $taxonomy The taxonomy slug.
 	 */
-	do_action( "{$taxonomy}_pre_add_form", $taxonomy );
+	do_action("{$taxonomy}_pre_add_form", $taxonomy);
 ?>
 
 <div class="form-wrap">
@@ -379,7 +379,7 @@ 
  *
  * @since 3.7.0
  */
-do_action( "{$taxonomy}_term_new_form_tag" );
+do_action("{$taxonomy}_term_new_form_tag");
 ?>>
 <input type="hidden" name="action" value="add-tag" />
 <input type="hidden" name="screen" value="<?php echo esc_attr($current_screen->id); ?>" />
@@ -388,20 +388,20 @@ 
 <?php wp_nonce_field('add-tag', '_wpnonce_add-tag'); ?>
 
 <div class="form-field form-required term-name-wrap">
-	<label for="tag-name"><?php _ex( 'Name', 'term name' ); ?></label>
+	<label for="tag-name"><?php _ex('Name', 'term name'); ?></label>
 	<input name="tag-name" id="tag-name" type="text" value="" size="40" aria-required="true" />
 	<p><?php _e('The name is how it appears on your site.'); ?></p>
 </div>
-<?php if ( ! global_terms_enabled() ) : ?>
+<?php if ( ! global_terms_enabled()) : ?>
 <div class="form-field term-slug-wrap">
-	<label for="tag-slug"><?php _e( 'Slug' ); ?></label>
+	<label for="tag-slug"><?php _e('Slug'); ?></label>
 	<input name="slug" id="tag-slug" type="text" value="" size="40" />
 	<p><?php _e('The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.'); ?></p>
 </div>
 <?php endif; // global_terms_enabled() ?>
-<?php if ( is_taxonomy_hierarchical($taxonomy) ) : ?>
+<?php if (is_taxonomy_hierarchical($taxonomy)) : ?>
 <div class="form-field term-parent-wrap">
-	<label for="parent"><?php echo esc_html( $tax->labels->parent_item ); ?></label>
+	<label for="parent"><?php echo esc_html($tax->labels->parent_item); ?></label>
 	<?php
 	$dropdown_args = array(
 		'hide_empty'       => 0,
@@ -410,7 +410,7 @@ 
 		'name'             => 'parent',
 		'orderby'          => 'name',
 		'hierarchical'     => true,
-		'show_option_none' => __( 'None' ),
+		'show_option_none' => __('None'),
 	);
 
 	/**
@@ -434,25 +434,25 @@ 
 	 * @param string $taxonomy The taxonomy slug.
 	 * @param string $context  Filter context. Accepts 'new' or 'edit'.
 	 */
-	$dropdown_args = apply_filters( 'taxonomy_parent_dropdown_args', $dropdown_args, $taxonomy, 'new' );
+	$dropdown_args = apply_filters('taxonomy_parent_dropdown_args', $dropdown_args, $taxonomy, 'new');
 
-	wp_dropdown_categories( $dropdown_args );
+	wp_dropdown_categories($dropdown_args);
 	?>
-	<?php if ( 'category' == $taxonomy ) : ?>
-		<p><?php _e( 'Categories, unlike tags, can have a hierarchy. You might have a Jazz category, and under that have children categories for Bebop and Big Band. Totally optional.' ); ?></p>
+	<?php if ('category' == $taxonomy) : ?>
+		<p><?php _e('Categories, unlike tags, can have a hierarchy. You might have a Jazz category, and under that have children categories for Bebop and Big Band. Totally optional.'); ?></p>
 	<?php else : ?>
-		<p><?php _e( 'Assign a parent term to create a hierarchy. The term Jazz, for example, would be the parent of Bebop and Big Band.' ); ?></p>
+		<p><?php _e('Assign a parent term to create a hierarchy. The term Jazz, for example, would be the parent of Bebop and Big Band.'); ?></p>
 	<?php endif; ?>
 </div>
 <?php endif; // is_taxonomy_hierarchical() ?>
 <div class="form-field term-description-wrap">
-	<label for="tag-description"><?php _e( 'Description' ); ?></label>
+	<label for="tag-description"><?php _e('Description'); ?></label>
 	<textarea name="description" id="tag-description" rows="5" cols="40"></textarea>
 	<p><?php _e('The description is not prominent by default; however, some themes may show it.'); ?></p>
 </div>
 
 <?php
-if ( ! is_taxonomy_hierarchical( $taxonomy ) ) {
+if ( ! is_taxonomy_hierarchical($taxonomy)) {
 	/**
 	 * Fires after the Add Tag form fields for non-hierarchical taxonomies.
 	 *
@@ -460,7 +460,7 @@ 
 	 *
 	 * @param string $taxonomy The taxonomy slug.
 	 */
-	do_action( 'add_tag_form_fields', $taxonomy );
+	do_action('add_tag_form_fields', $taxonomy);
 }
 
 /**
@@ -472,11 +472,11 @@ 
  *
  * @param string $taxonomy The taxonomy slug.
  */
-do_action( "{$taxonomy}_add_form_fields", $taxonomy );
+do_action("{$taxonomy}_add_form_fields", $taxonomy);
 
-submit_button( $tax->labels->add_new_item );
+submit_button($tax->labels->add_new_item);
 
-if ( 'category' == $taxonomy ) {
+if ('category' == $taxonomy) {
 	/**
 	 * Fires at the end of the Edit Category form.
 	 *
@@ -485,8 +485,8 @@ 
 	 *
 	 * @param object $arg Optional arguments cast to an object.
 	 */
-	do_action( 'edit_category_form', (object) array( 'parent' => 0 ) );
-} elseif ( 'link_category' == $taxonomy ) {
+	do_action('edit_category_form', (object) array('parent' => 0));
+} elseif ('link_category' == $taxonomy) {
 	/**
 	 * Fires at the end of the Edit Link form.
 	 *
@@ -495,7 +495,7 @@ 
 	 *
 	 * @param object $arg Optional arguments cast to an object.
 	 */
-	do_action( 'edit_link_category_form', (object) array( 'parent' => 0 ) );
+	do_action('edit_link_category_form', (object) array('parent' => 0));
 } else {
 	/**
 	 * Fires at the end of the Add Tag form.
@@ -505,7 +505,7 @@ 
 	 *
 	 * @param string $taxonomy The taxonomy slug.
 	 */
-	do_action( 'add_tag_form', $taxonomy );
+	do_action('add_tag_form', $taxonomy);
 }
 
 /**
@@ -517,7 +517,7 @@ 
  *
  * @param string $taxonomy The taxonomy slug.
  */
-do_action( "{$taxonomy}_add_form", $taxonomy );
+do_action("{$taxonomy}_add_form", $taxonomy);
 ?>
 </form></div>
 <?php } ?>
@@ -528,33 +528,33 @@ 
 <div id="col-right">
 <div class="col-wrap">
 <form id="posts-filter" method="post">
-<input type="hidden" name="taxonomy" value="<?php echo esc_attr( $taxonomy ); ?>" />
-<input type="hidden" name="post_type" value="<?php echo esc_attr( $post_type ); ?>" />
+<input type="hidden" name="taxonomy" value="<?php echo esc_attr($taxonomy); ?>" />
+<input type="hidden" name="post_type" value="<?php echo esc_attr($post_type); ?>" />
 
 <?php $wp_list_table->display(); ?>
 
 </form>
 
-<?php if ( 'category' == $taxonomy ) : ?>
+<?php if ('category' == $taxonomy) : ?>
 <div class="form-wrap edit-term-notes">
 <p>
 	<?php
-	echo '<strong>' . __( 'Note:' ) . '</strong><br />';
+	echo '<strong>'.__('Note:').'</strong><br />';
 	printf(
 		/* translators: %s: default category */
-		__( 'Deleting a category does not delete the posts in that category. Instead, posts that were only assigned to the deleted category are set to the category %s.' ),
+		__('Deleting a category does not delete the posts in that category. Instead, posts that were only assigned to the deleted category are set to the category %s.'),
 		/** This filter is documented in wp-includes/category-template.php */
-		'<strong>' . apply_filters( 'the_category', get_cat_name( get_option( 'default_category') ) ) . '</strong>'
+		'<strong>'.apply_filters('the_category', get_cat_name(get_option('default_category'))).'</strong>'
 	);
 	?>
 </p>
-<?php if ( current_user_can( 'import' ) ) : ?>
-<p><?php printf( __( 'Categories can be selectively converted to tags using the <a href="%s">category to tag converter</a>.' ), esc_url( $import_link ) ) ?></p>
+<?php if (current_user_can('import')) : ?>
+<p><?php printf(__('Categories can be selectively converted to tags using the <a href="%s">category to tag converter</a>.'), esc_url($import_link)) ?></p>
 <?php endif; ?>
 </div>
-<?php elseif ( 'post_tag' == $taxonomy && current_user_can( 'import' ) ) : ?>
+<?php elseif ('post_tag' == $taxonomy && current_user_can('import')) : ?>
 <div class="form-wrap edit-term-notes">
-<p><?php printf( __( 'Tags can be selectively converted to categories using the <a href="%s">tag to category converter</a>.' ), esc_url( $import_link ) ) ;?></p>
+<p><?php printf(__('Tags can be selectively converted to categories using the <a href="%s">tag to category converter</a>.'), esc_url($import_link)); ?></p>
 </div>
 <?php endif;
 
@@ -567,7 +567,7 @@ 
  *
  * @param string $taxonomy The taxonomy name.
  */
-do_action( "after-{$taxonomy}-table", $taxonomy );
+do_action("after-{$taxonomy}-table", $taxonomy);
 ?>
 
 </div>
@@ -576,7 +576,7 @@ 
 </div><!-- /col-container -->
 </div><!-- /wrap -->
 
-<?php if ( ! wp_is_mobile() ) : ?>
+<?php if ( ! wp_is_mobile()) : ?>
 <script type="text/javascript">
 try{document.forms.addtag['tag-name'].focus();}catch(e){}
 </script>
@@ -585,4 +585,4 @@ 
 
 $wp_list_table->inline_edit();
 
-include( ABSPATH . 'wp-admin/admin-footer.php' );
+include(ABSPATH.'wp-admin/admin-footer.php');

Braces +50 added lines, -36 removed lines

@@ -9,13 +9,15 @@ 
 /** WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( ! $taxnow )
+if ( ! $taxnow ) {
 	wp_die( __( 'Invalid taxonomy.' ) );
+}
 
 $tax = get_taxonomy( $taxnow );
 
-if ( ! $tax )
+if ( ! $tax ) {
 	wp_die( __( 'Invalid taxonomy.' ) );
+}
 
 if ( ! in_array( $tax->name, get_taxonomies( array( 'show_ui' => true ) ) ) ) {
    wp_die( __( 'Sorry, you are not allowed to edit terms in this taxonomy.' ) );
@@ -79,10 +81,11 @@ 
 	}
 
 	$ret = wp_insert_term( $_POST['tag-name'], $taxonomy, $_POST );
-	if ( $ret && !is_wp_error( $ret ) )
-		$location = add_query_arg( 'message', 1, $referer );
-	else
-		$location = add_query_arg( array( 'error' => true, 'message' => 4 ), $referer );
+	if ( $ret && !is_wp_error( $ret ) ) {
+			$location = add_query_arg( 'message', 1, $referer );
+	} else {
+			$location = add_query_arg( array( 'error' => true, 'message' => 4 ), $referer );
+	}
 
 	break;
 
@@ -159,8 +162,9 @@ 
 	}
 
 	$tag = get_term( $tag_ID, $taxonomy );
-	if ( ! $tag )
-		wp_die( __( 'You attempted to edit an item that doesn’t exist. Perhaps it was deleted?' ) );
+	if ( ! $tag ) {
+			wp_die( __( 'You attempted to edit an item that doesn’t exist. Perhaps it was deleted?' ) );
+	}
 
 	$ret = wp_update_term( $tag_ID, $taxonomy, $_POST );
 
@@ -211,22 +215,25 @@ 
 }
 
 wp_enqueue_script('admin-tags');
-if ( current_user_can($tax->cap->edit_terms) )
+if ( current_user_can($tax->cap->edit_terms) ) {
 	wp_enqueue_script('inline-edit-tax');
+}
 
 if ( 'category' == $taxonomy || 'link_category' == $taxonomy || 'post_tag' == $taxonomy  ) {
 	$help ='';
-	if ( 'category' == $taxonomy )
-		$help = '<p>' . sprintf(__( 'You can use categories to define sections of your site and group related posts. The default category is &#8220;Uncategorized&#8221; until you change it in your <a href="%s">writing settings</a>.' ) , 'options-writing.php' ) . '</p>';
-	elseif ( 'link_category' == $taxonomy )
-		$help = '<p>' . __( 'You can create groups of links by using Link Categories. Link Category names must be unique and Link Categories are separate from the categories you use for posts.' ) . '</p>';
-	else
-		$help = '<p>' . __( 'You can assign keywords to your posts using <strong>tags</strong>. Unlike categories, tags have no hierarchy, meaning there&#8217;s no relationship from one tag to another.' ) . '</p>';
-
-	if ( 'link_category' == $taxonomy )
-		$help .= '<p>' . __( 'You can delete Link Categories in the Bulk Action pull-down, but that action does not delete the links within the category. Instead, it moves them to the default Link Category.' ) . '</p>';
-	else
-		$help .='<p>' . __( 'What&#8217;s the difference between categories and tags? Normally, tags are ad-hoc keywords that identify important information in your post (names, subjects, etc) that may or may not recur in other posts, while categories are pre-determined sections. If you think of your site like a book, the categories are like the Table of Contents and the tags are like the terms in the index.' ) . '</p>';
+	if ( 'category' == $taxonomy ) {
+			$help = '<p>' . sprintf(__( 'You can use categories to define sections of your site and group related posts. The default category is &#8220;Uncategorized&#8221; until you change it in your <a href="%s">writing settings</a>.' ) , 'options-writing.php' ) . '</p>';
+	} elseif ( 'link_category' == $taxonomy ) {
+			$help = '<p>' . __( 'You can create groups of links by using Link Categories. Link Category names must be unique and Link Categories are separate from the categories you use for posts.' ) . '</p>';
+	} else {
+			$help = '<p>' . __( 'You can assign keywords to your posts using <strong>tags</strong>. Unlike categories, tags have no hierarchy, meaning there&#8217;s no relationship from one tag to another.' ) . '</p>';
+	}
+
+	if ( 'link_category' == $taxonomy ) {
+			$help .= '<p>' . __( 'You can delete Link Categories in the Bulk Action pull-down, but that action does not delete the links within the category. Instead, it moves them to the default Link Category.' ) . '</p>';
+	} else {
+			$help .='<p>' . __( 'What&#8217;s the difference between categories and tags? Normally, tags are ad-hoc keywords that identify important information in your post (names, subjects, etc) that may or may not recur in other posts, while categories are pre-determined sections. If you think of your site like a book, the categories are like the Table of Contents and the tags are like the terms in the index.' ) . '</p>';
+	}
 
 	get_current_screen()->add_help_tab( array(
 		'id'      => 'overview',
@@ -235,19 +242,22 @@ 
 	) );
 
 	if ( 'category' == $taxonomy || 'post_tag' == $taxonomy ) {
-		if ( 'category' == $taxonomy )
-			$help = '<p>' . __( 'When adding a new category on this screen, you&#8217;ll fill in the following fields:' ) . '</p>';
-		else
-			$help = '<p>' . __( 'When adding a new tag on this screen, you&#8217;ll fill in the following fields:' ) . '</p>';
+		if ( 'category' == $taxonomy ) {
+					$help = '<p>' . __( 'When adding a new category on this screen, you&#8217;ll fill in the following fields:' ) . '</p>';
+		} else {
+					$help = '<p>' . __( 'When adding a new tag on this screen, you&#8217;ll fill in the following fields:' ) . '</p>';
+		}
 
 		$help .= '<ul>' .
 		'<li>' . __( '<strong>Name</strong> &mdash; The name is how it appears on your site.' ) . '</li>';
 
-		if ( ! global_terms_enabled() )
-			$help .= '<li>' . __( '<strong>Slug</strong> &mdash; The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.' ) . '</li>';
+		if ( ! global_terms_enabled() ) {
+					$help .= '<li>' . __( '<strong>Slug</strong> &mdash; The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.' ) . '</li>';
+		}
 
-		if ( 'category' == $taxonomy )
-			$help .= '<li>' . __( '<strong>Parent</strong> &mdash; Categories, unlike tags, can have a hierarchy. You might have a Jazz category, and under that have child categories for Bebop and Big Band. Totally optional. To create a subcategory, just choose another category from the Parent dropdown.' ) . '</li>';
+		if ( 'category' == $taxonomy ) {
+					$help .= '<li>' . __( '<strong>Parent</strong> &mdash; Categories, unlike tags, can have a hierarchy. You might have a Jazz category, and under that have child categories for Bebop and Big Band. Totally optional. To create a subcategory, just choose another category from the Parent dropdown.' ) . '</li>';
+		}
 
 		$help .= '<li>' . __( '<strong>Description</strong> &mdash; The description is not prominent by default; however, some themes may display it.' ) . '</li>' .
 		'</ul>' .
@@ -262,12 +272,13 @@ 
 
 	$help = '<p><strong>' . __( 'For more information:' ) . '</strong></p>';
 
-	if ( 'category' == $taxonomy )
-		$help .= '<p>' . __( '<a href="https://codex.wordpress.org/Posts_Categories_Screen">Documentation on Categories</a>' ) . '</p>';
-	elseif ( 'link_category' == $taxonomy )
-		$help .= '<p>' . __( '<a href="https://codex.wordpress.org/Links_Link_Categories_Screen">Documentation on Link Categories</a>' ) . '</p>';
-	else
-		$help .= '<p>' . __( '<a href="https://codex.wordpress.org/Posts_Tags_Screen">Documentation on Tags</a>' ) . '</p>';
+	if ( 'category' == $taxonomy ) {
+			$help .= '<p>' . __( '<a href="https://codex.wordpress.org/Posts_Categories_Screen">Documentation on Categories</a>' ) . '</p>';
+	} elseif ( 'link_category' == $taxonomy ) {
+			$help .= '<p>' . __( '<a href="https://codex.wordpress.org/Links_Link_Categories_Screen">Documentation on Link Categories</a>' ) . '</p>';
+	} else {
+			$help .= '<p>' . __( '<a href="https://codex.wordpress.org/Posts_Tags_Screen">Documentation on Tags</a>' ) . '</p>';
+	}
 
 	$help .= '<p>' . __('<a href="https://wordpress.org/support/">Support Forums</a>') . '</p>';
 
@@ -440,8 +451,11 @@ 
 	?>
 	<?php if ( 'category' == $taxonomy ) : ?>
 		<p><?php _e( 'Categories, unlike tags, can have a hierarchy. You might have a Jazz category, and under that have children categories for Bebop and Big Band. Totally optional.' ); ?></p>
-	<?php else : ?>
-		<p><?php _e( 'Assign a parent term to create a hierarchy. The term Jazz, for example, would be the parent of Bebop and Big Band.' ); ?></p>
+	<?php else {
+	: ?>
+		<p><?php _e( 'Assign a parent term to create a hierarchy. The term Jazz, for example, would be the parent of Bebop and Big Band.' );
+}
+?></p>
 	<?php endif; ?>
 </div>
 <?php endif; // is_taxonomy_hierarchical() ?>

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

Indentation +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 // Back compat hooks
 if ( 'category' == $taxonomy ) {
 	/**
- 	 * Fires before the Edit Category form.
+	 * Fires before the Edit Category form.
 	 *
 	 * @since 2.1.0
 	 * @deprecated 3.0.0 Use {$taxonomy}_pre_edit_form instead.

Spacing +52 added lines, -52 removed lines

@@ -7,12 +7,12 @@ 
  */
 
 // don't load directly
-if ( ! defined( 'ABSPATH' ) ) {
-	die( '-1' );
+if ( ! defined('ABSPATH')) {
+	die('-1');
 }
 
 // Back compat hooks
-if ( 'category' == $taxonomy ) {
+if ('category' == $taxonomy) {
 	/**
  	 * Fires before the Edit Category form.
 	 *
@@ -21,8 +21,8 @@ 
 	 *
 	 * @param object $tag Current category term object.
 	 */
-	do_action( 'edit_category_form_pre', $tag );
-} elseif ( 'link_category' == $taxonomy ) {
+	do_action('edit_category_form_pre', $tag);
+} elseif ('link_category' == $taxonomy) {
 	/**
 	 * Fires before the Edit Link Category form.
 	 *
@@ -31,7 +31,7 @@ 
 	 *
 	 * @param object $tag Current link category term object.
 	 */
-	do_action( 'edit_link_category_form_pre', $tag );
+	do_action('edit_link_category_form_pre', $tag);
 } else {
 	/**
 	 * Fires before the Edit Tag form.
@@ -41,18 +41,18 @@ 
 	 *
 	 * @param object $tag Current tag term object.
 	 */
-	do_action( 'edit_tag_form_pre', $tag );
+	do_action('edit_tag_form_pre', $tag);
 }
 
 /**
  * Use with caution, see https://codex.wordpress.org/Function_Reference/wp_reset_vars
  */
-wp_reset_vars( array( 'wp_http_referer' ) );
+wp_reset_vars(array('wp_http_referer'));
 
-$wp_http_referer = remove_query_arg( array( 'action', 'message', 'tag_ID' ), $wp_http_referer );
+$wp_http_referer = remove_query_arg(array('action', 'message', 'tag_ID'), $wp_http_referer);
 
 /** Also used by Edit Tags */
-require_once( ABSPATH . 'wp-admin/includes/edit-tag-messages.php' );
+require_once(ABSPATH.'wp-admin/includes/edit-tag-messages.php');
 
 /**
  * Fires before the Edit Term form for all taxonomies.
@@ -65,18 +65,18 @@ 
  * @param object $tag      Current taxonomy term object.
  * @param string $taxonomy Current $taxonomy slug.
  */
-do_action( "{$taxonomy}_pre_edit_form", $tag, $taxonomy ); ?>
+do_action("{$taxonomy}_pre_edit_form", $tag, $taxonomy); ?>
 
 <div class="wrap">
 <h1><?php echo $tax->labels->edit_item; ?></h1>
 
-<?php if ( $message ) : ?>
+<?php if ($message) : ?>
 <div id="message" class="updated">
 	<p><strong><?php echo $message; ?></strong></p>
-	<?php if ( $wp_http_referer ) { ?>
-	<p><a href="<?php echo esc_url( $wp_http_referer ); ?>"><?php
+	<?php if ($wp_http_referer) { ?>
+	<p><a href="<?php echo esc_url($wp_http_referer); ?>"><?php
 		/* translators: %s: taxonomy name */
-		printf( _x( '&larr; Back to %s', 'admin screen' ), $tax->labels->name );
+		printf(_x('&larr; Back to %s', 'admin screen'), $tax->labels->name);
 	?></a></p>
 	<?php } ?>
 </div>
@@ -92,14 +92,14 @@ 
  *
  * @since 3.7.0
  */
-do_action( "{$taxonomy}_term_edit_form_tag" );
+do_action("{$taxonomy}_term_edit_form_tag");
 ?>>
 <input type="hidden" name="action" value="editedtag"/>
-<input type="hidden" name="tag_ID" value="<?php echo esc_attr( $tag_ID ) ?>"/>
-<input type="hidden" name="taxonomy" value="<?php echo esc_attr( $taxonomy ) ?>"/>
+<input type="hidden" name="tag_ID" value="<?php echo esc_attr($tag_ID) ?>"/>
+<input type="hidden" name="taxonomy" value="<?php echo esc_attr($taxonomy) ?>"/>
 <?php
-wp_original_referer_field( true, 'previous' );
-wp_nonce_field( 'update-tag_' . $tag_ID );
+wp_original_referer_field(true, 'previous');
+wp_nonce_field('update-tag_'.$tag_ID);
 
 /**
  * Fires at the beginning of the Edit Term form.
@@ -113,17 +113,17 @@ 
  * @param object $tag      Current taxonomy term object.
  * @param string $taxonomy Current $taxonomy slug.
  */
-do_action( "{$taxonomy}_term_edit_form_top", $tag, $taxonomy );
+do_action("{$taxonomy}_term_edit_form_top", $tag, $taxonomy);
 ?>
 	<table class="form-table">
 		<tr class="form-field form-required term-name-wrap">
-			<th scope="row"><label for="name"><?php _ex( 'Name', 'term name' ); ?></label></th>
-			<td><input name="name" id="name" type="text" value="<?php if ( isset( $tag->name ) ) echo esc_attr($tag->name); ?>" size="40" aria-required="true" />
+			<th scope="row"><label for="name"><?php _ex('Name', 'term name'); ?></label></th>
+			<td><input name="name" id="name" type="text" value="<?php if (isset($tag->name)) echo esc_attr($tag->name); ?>" size="40" aria-required="true" />
 			<p class="description"><?php _e('The name is how it appears on your site.'); ?></p></td>
 		</tr>
-<?php if ( !global_terms_enabled() ) { ?>
+<?php if ( ! global_terms_enabled()) { ?>
 		<tr class="form-field term-slug-wrap">
-			<th scope="row"><label for="slug"><?php _e( 'Slug' ); ?></label></th>
+			<th scope="row"><label for="slug"><?php _e('Slug'); ?></label></th>
 			<?php
 			/**
 			 * Filters the editable slug.
@@ -138,15 +138,15 @@ 
 			 *                             upon the context in which it is evaluated.
 			 * @param object|WP_Post $tag  Term or WP_Post object.
 			 */
-			$slug = isset( $tag->slug ) ? apply_filters( 'editable_slug', $tag->slug, $tag ) : '';
+			$slug = isset($tag->slug) ? apply_filters('editable_slug', $tag->slug, $tag) : '';
 			?>
-			<td><input name="slug" id="slug" type="text" value="<?php echo esc_attr( $slug ); ?>" size="40" />
+			<td><input name="slug" id="slug" type="text" value="<?php echo esc_attr($slug); ?>" size="40" />
 			<p class="description"><?php _e('The &#8220;slug&#8221; is the URL-friendly version of the name. It is usually all lowercase and contains only letters, numbers, and hyphens.'); ?></p></td>
 		</tr>
 <?php } ?>
-<?php if ( is_taxonomy_hierarchical($taxonomy) ) : ?>
+<?php if (is_taxonomy_hierarchical($taxonomy)) : ?>
 		<tr class="form-field term-parent-wrap">
-			<th scope="row"><label for="parent"><?php echo esc_html( $tax->labels->parent_item ); ?></label></th>
+			<th scope="row"><label for="parent"><?php echo esc_html($tax->labels->parent_item); ?></label></th>
 			<td>
 				<?php
 				$dropdown_args = array(
@@ -158,28 +158,28 @@ 
 					'selected'         => $tag->parent,
 					'exclude_tree'     => $tag->term_id,
 					'hierarchical'     => true,
-					'show_option_none' => __( 'None' ),
+					'show_option_none' => __('None'),
 				);
 
 				/** This filter is documented in wp-admin/edit-tags.php */
-				$dropdown_args = apply_filters( 'taxonomy_parent_dropdown_args', $dropdown_args, $taxonomy, 'edit' );
-				wp_dropdown_categories( $dropdown_args ); ?>
-				<?php if ( 'category' == $taxonomy ) : ?>
-					<p class="description"><?php _e( 'Categories, unlike tags, can have a hierarchy. You might have a Jazz category, and under that have children categories for Bebop and Big Band. Totally optional.' ); ?></p>
+				$dropdown_args = apply_filters('taxonomy_parent_dropdown_args', $dropdown_args, $taxonomy, 'edit');
+				wp_dropdown_categories($dropdown_args); ?>
+				<?php if ('category' == $taxonomy) : ?>
+					<p class="description"><?php _e('Categories, unlike tags, can have a hierarchy. You might have a Jazz category, and under that have children categories for Bebop and Big Band. Totally optional.'); ?></p>
 				<?php else : ?>
-					<p class="description"><?php _e( 'Assign a parent term to create a hierarchy. The term Jazz, for example, would be the parent of Bebop and Big Band.' ); ?></p>
+					<p class="description"><?php _e('Assign a parent term to create a hierarchy. The term Jazz, for example, would be the parent of Bebop and Big Band.'); ?></p>
 				<?php endif; ?>
 			</td>
 		</tr>
 <?php endif; // is_taxonomy_hierarchical() ?>
 		<tr class="form-field term-description-wrap">
-			<th scope="row"><label for="description"><?php _e( 'Description' ); ?></label></th>
+			<th scope="row"><label for="description"><?php _e('Description'); ?></label></th>
 			<td><textarea name="description" id="description" rows="5" cols="50" class="large-text"><?php echo $tag->description; // textarea_escaped ?></textarea>
 			<p class="description"><?php _e('The description is not prominent by default; however, some themes may show it.'); ?></p></td>
 		</tr>
 		<?php
 		// Back compat hooks
-		if ( 'category' == $taxonomy ) {
+		if ('category' == $taxonomy) {
 			/**
 			 * Fires after the Edit Category form fields are displayed.
 			 *
@@ -188,8 +188,8 @@ 
 			 *
 			 * @param object $tag Current category term object.
 			 */
-			do_action( 'edit_category_form_fields', $tag );
-		} elseif ( 'link_category' == $taxonomy ) {
+			do_action('edit_category_form_fields', $tag);
+		} elseif ('link_category' == $taxonomy) {
 			/**
 			 * Fires after the Edit Link Category form fields are displayed.
 			 *
@@ -198,7 +198,7 @@ 
 			 *
 			 * @param object $tag Current link category term object.
 			 */
-			do_action( 'edit_link_category_form_fields', $tag );
+			do_action('edit_link_category_form_fields', $tag);
 		} else {
 			/**
 			 * Fires after the Edit Tag form fields are displayed.
@@ -208,7 +208,7 @@ 
 			 *
 			 * @param object $tag Current tag term object.
 			 */
-			do_action( 'edit_tag_form_fields', $tag );
+			do_action('edit_tag_form_fields', $tag);
 		}
 		/**
 		 * Fires after the Edit Term form fields are displayed.
@@ -221,17 +221,17 @@ 
 		 * @param object $tag      Current taxonomy term object.
 		 * @param string $taxonomy Current taxonomy slug.
 		 */
-		do_action( "{$taxonomy}_edit_form_fields", $tag, $taxonomy );
+		do_action("{$taxonomy}_edit_form_fields", $tag, $taxonomy);
 		?>
 	</table>
 <?php
 // Back compat hooks
-if ( 'category' == $taxonomy ) {
+if ('category' == $taxonomy) {
 	/** This action is documented in wp-admin/edit-tags.php */
-	do_action( 'edit_category_form', $tag );
-} elseif ( 'link_category' == $taxonomy ) {
+	do_action('edit_category_form', $tag);
+} elseif ('link_category' == $taxonomy) {
 	/** This action is documented in wp-admin/edit-tags.php */
-	do_action( 'edit_link_category_form', $tag );
+	do_action('edit_link_category_form', $tag);
 } else {
 	/**
 	 * Fires at the end of the Edit Term form.
@@ -241,7 +241,7 @@ 
 	 *
 	 * @param object $tag Current taxonomy term object.
 	 */
-	do_action( 'edit_tag_form', $tag );
+	do_action('edit_tag_form', $tag);
 }
 /**
  * Fires at the end of the Edit Term form for all taxonomies.
@@ -253,16 +253,16 @@ 
  * @param object $tag      Current taxonomy term object.
  * @param string $taxonomy Current taxonomy slug.
  */
-do_action( "{$taxonomy}_edit_form", $tag, $taxonomy );
+do_action("{$taxonomy}_edit_form", $tag, $taxonomy);
 ?>
 
 <div class="edit-tag-actions">
 
-	<?php submit_button( __( 'Update' ), 'primary', null, false ); ?>
+	<?php submit_button(__('Update'), 'primary', null, false); ?>
 
-	<?php if ( current_user_can( 'delete_term', $tag->term_id ) ) : ?>
+	<?php if (current_user_can('delete_term', $tag->term_id)) : ?>
 		<span id="delete-link">
-			<a class="delete" href="<?php echo admin_url( wp_nonce_url( "edit-tags.php?action=delete&taxonomy=$taxonomy&tag_ID=$tag->term_id", 'delete-tag_' . $tag->term_id ) ) ?>"><?php _e( 'Delete' ); ?></a>
+			<a class="delete" href="<?php echo admin_url(wp_nonce_url("edit-tags.php?action=delete&taxonomy=$taxonomy&tag_ID=$tag->term_id", 'delete-tag_'.$tag->term_id)) ?>"><?php _e('Delete'); ?></a>
 		</span>
 	<?php endif; ?>
 
@@ -271,7 +271,7 @@ 
 </form>
 </div>
 
-<?php if ( ! wp_is_mobile() ) : ?>
+<?php if ( ! wp_is_mobile()) : ?>
 <script type="text/javascript">
 try{document.forms.edittag.name.focus();}catch(e){}
 </script>

Braces +9 added lines, -3 removed lines

@@ -118,7 +118,10 @@ 
 	<table class="form-table">
 		<tr class="form-field form-required term-name-wrap">
 			<th scope="row"><label for="name"><?php _ex( 'Name', 'term name' ); ?></label></th>
-			<td><input name="name" id="name" type="text" value="<?php if ( isset( $tag->name ) ) echo esc_attr($tag->name); ?>" size="40" aria-required="true" />
+			<td><input name="name" id="name" type="text" value="<?php if ( isset( $tag->name ) ) {
+	echo esc_attr($tag->name);
+}
+?>" size="40" aria-required="true" />
 			<p class="description"><?php _e('The name is how it appears on your site.'); ?></p></td>
 		</tr>
 <?php if ( !global_terms_enabled() ) { ?>
@@ -166,8 +169,11 @@ 
 				wp_dropdown_categories( $dropdown_args ); ?>
 				<?php if ( 'category' == $taxonomy ) : ?>
 					<p class="description"><?php _e( 'Categories, unlike tags, can have a hierarchy. You might have a Jazz category, and under that have children categories for Bebop and Big Band. Totally optional.' ); ?></p>
-				<?php else : ?>
-					<p class="description"><?php _e( 'Assign a parent term to create a hierarchy. The term Jazz, for example, would be the parent of Bebop and Big Band.' ); ?></p>
+				<?php else {
+	: ?>
+					<p class="description"><?php _e( 'Assign a parent term to create a hierarchy. The term Jazz, for example, would be the parent of Bebop and Big Band.' );
+}
+?></p>
 				<?php endif; ?>
 			</td>
 		</tr>

src/wp-admin/network/user-new.php

Indentation +6 added lines, -6 removed lines

@@ -52,12 +52,12 @@
 	 		$add_user_errors = new WP_Error( 'add_user_fail', __( 'Cannot add user.' ) );
 		} else {
 			/**
-			  * Fires after a new user has been created via the network user-new.php page.
-			  *
-			  * @since 4.4.0
-			  *
-			  * @param int $user_id ID of the newly created user.
-			  */
+			 * Fires after a new user has been created via the network user-new.php page.
+			 *
+			 * @since 4.4.0
+			 *
+			 * @param int $user_id ID of the newly created user.
+			 */
 			do_action( 'network_user_new_created_user', $user_id );
 			wp_redirect( add_query_arg( array('update' => 'added', 'user_id' => $user_id ), 'user-new.php' ) );
 			exit;

Spacing +48 added lines, -48 removed lines

@@ -8,45 +8,45 @@ 
  */
 
 /** Load WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
-if ( ! current_user_can('create_users') )
+if ( ! current_user_can('create_users'))
 	wp_die(__('Sorry, you are not allowed to add users to this network.'));
 
-get_current_screen()->add_help_tab( array(
+get_current_screen()->add_help_tab(array(
 	'id'      => 'overview',
 	'title'   => __('Overview'),
 	'content' =>
-		'<p>' . __('Add User will set up a new user account on the network and send that person an email with username and password.') . '</p>' .
-		'<p>' . __('Users who are signed up to the network without a site are added as subscribers to the main or primary dashboard site, giving them profile pages to manage their accounts. These users will only see Dashboard and My Sites in the main navigation until a site is created for them.') . '</p>'
-) );
+		'<p>'.__('Add User will set up a new user account on the network and send that person an email with username and password.').'</p>'.
+		'<p>'.__('Users who are signed up to the network without a site are added as subscribers to the main or primary dashboard site, giving them profile pages to manage their accounts. These users will only see Dashboard and My Sites in the main navigation until a site is created for them.').'</p>'
+));
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Network_Admin_Users_Screen">Documentation on Network Users</a>') . '</p>' .
-	'<p>' . __('<a href="https://wordpress.org/support/forum/multisite/">Support Forums</a>') . '</p>'
+	'<p><strong>'.__('For more information:').'</strong></p>'.
+	'<p>'.__('<a href="https://codex.wordpress.org/Network_Admin_Users_Screen">Documentation on Network Users</a>').'</p>'.
+	'<p>'.__('<a href="https://wordpress.org/support/forum/multisite/">Support Forums</a>').'</p>'
 );
 
-if ( isset($_REQUEST['action']) && 'add-user' == $_REQUEST['action'] ) {
-	check_admin_referer( 'add-user', '_wpnonce_add-user' );
+if (isset($_REQUEST['action']) && 'add-user' == $_REQUEST['action']) {
+	check_admin_referer('add-user', '_wpnonce_add-user');
 
-	if ( ! current_user_can( 'manage_network_users' ) )
-		wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
+	if ( ! current_user_can('manage_network_users'))
+		wp_die(__('Sorry, you are not allowed to access this page.'), 403);
 
-	if ( ! is_array( $_POST['user'] ) )
-		wp_die( __( 'Cannot create an empty user.' ) );
+	if ( ! is_array($_POST['user']))
+		wp_die(__('Cannot create an empty user.'));
 
-	$user = wp_unslash( $_POST['user'] );
+	$user = wp_unslash($_POST['user']);
 
-	$user_details = wpmu_validate_user_signup( $user['username'], $user['email'] );
-	if ( is_wp_error( $user_details[ 'errors' ] ) && ! empty( $user_details[ 'errors' ]->errors ) ) {
-		$add_user_errors = $user_details[ 'errors' ];
+	$user_details = wpmu_validate_user_signup($user['username'], $user['email']);
+	if (is_wp_error($user_details['errors']) && ! empty($user_details['errors']->errors)) {
+		$add_user_errors = $user_details['errors'];
 	} else {
-		$password = wp_generate_password( 12, false);
-		$user_id = wpmu_create_user( esc_html( strtolower( $user['username'] ) ), $password, sanitize_email( $user['email'] ) );
+		$password = wp_generate_password(12, false);
+		$user_id = wpmu_create_user(esc_html(strtolower($user['username'])), $password, sanitize_email($user['email']));
 
-		if ( ! $user_id ) {
-	 		$add_user_errors = new WP_Error( 'add_user_fail', __( 'Cannot add user.' ) );
+		if ( ! $user_id) {
+	 		$add_user_errors = new WP_Error('add_user_fail', __('Cannot add user.'));
 		} else {
 			/**
 			  * Fires after a new user has been created via the network user-new.php page.
@@ -55,29 +55,29 @@ 
 			  *
 			  * @param int $user_id ID of the newly created user.
 			  */
-			do_action( 'network_user_new_created_user', $user_id );
-			wp_redirect( add_query_arg( array('update' => 'added', 'user_id' => $user_id ), 'user-new.php' ) );
+			do_action('network_user_new_created_user', $user_id);
+			wp_redirect(add_query_arg(array('update' => 'added', 'user_id' => $user_id), 'user-new.php'));
 			exit;
 		}
 	}
 }
 
-if ( isset($_GET['update']) ) {
+if (isset($_GET['update'])) {
 	$messages = array();
-	if ( 'added' == $_GET['update'] ) {
+	if ('added' == $_GET['update']) {
 		$edit_link = '';
-		if ( isset( $_GET['user_id'] ) ) {
-			$user_id_new = absint( $_GET['user_id'] );
-			if ( $user_id_new ) {
-				$edit_link = esc_url( add_query_arg( 'wp_http_referer', urlencode( wp_unslash( $_SERVER['REQUEST_URI'] ) ), get_edit_user_link( $user_id_new ) ) );
+		if (isset($_GET['user_id'])) {
+			$user_id_new = absint($_GET['user_id']);
+			if ($user_id_new) {
+				$edit_link = esc_url(add_query_arg('wp_http_referer', urlencode(wp_unslash($_SERVER['REQUEST_URI'])), get_edit_user_link($user_id_new)));
 			}
 		}
 
-		if ( empty( $edit_link ) ) {
-			$messages[] = __( 'User added.' );
+		if (empty($edit_link)) {
+			$messages[] = __('User added.');
 		} else {
 			/* translators: %s: edit page url */
-			$messages[] = sprintf( __( 'User added. <a href="%s">Edit user</a>' ), $edit_link );
+			$messages[] = sprintf(__('User added. <a href="%s">Edit user</a>'), $edit_link);
 		}
 	}
 }
@@ -85,20 +85,20 @@ 
 $title = __('Add New User');
 $parent_file = 'users.php';
 
-require( ABSPATH . 'wp-admin/admin-header.php' ); ?>
+require(ABSPATH.'wp-admin/admin-header.php'); ?>
 
 <div class="wrap">
-<h1 id="add-new-user"><?php _e( 'Add New User' ); ?></h1>
+<h1 id="add-new-user"><?php _e('Add New User'); ?></h1>
 <?php
-if ( ! empty( $messages ) ) {
-	foreach ( $messages as $msg )
-		echo '<div id="message" class="updated notice is-dismissible"><p>' . $msg . '</p></div>';
+if ( ! empty($messages)) {
+	foreach ($messages as $msg)
+		echo '<div id="message" class="updated notice is-dismissible"><p>'.$msg.'</p></div>';
 }
 
-if ( isset( $add_user_errors ) && is_wp_error( $add_user_errors ) ) { ?>
+if (isset($add_user_errors) && is_wp_error($add_user_errors)) { ?>
 	<div class="error">
 		<?php
-			foreach ( $add_user_errors->get_error_messages() as $message )
+			foreach ($add_user_errors->get_error_messages() as $message)
 				echo "<p>$message</p>";
 		?>
 	</div>
@@ -106,15 +106,15 @@ 
 	<form action="<?php echo network_admin_url('user-new.php?action=add-user'); ?>" id="adduser" method="post" novalidate="novalidate">
 	<table class="form-table">
 		<tr class="form-field form-required">
-			<th scope="row"><label for="username"><?php _e( 'Username' ) ?></label></th>
+			<th scope="row"><label for="username"><?php _e('Username') ?></label></th>
 			<td><input type="text" class="regular-text" name="user[username]" id="username" autocapitalize="none" autocorrect="off" maxlength="60" /></td>
 		</tr>
 		<tr class="form-field form-required">
-			<th scope="row"><label for="email"><?php _e( 'Email' ) ?></label></th>
+			<th scope="row"><label for="email"><?php _e('Email') ?></label></th>
 			<td><input type="email" class="regular-text" name="user[email]" id="email"/></td>
 		</tr>
 		<tr class="form-field">
-			<td colspan="2"><?php _e( 'A password reset link will be sent to the user via email.' ) ?></td>
+			<td colspan="2"><?php _e('A password reset link will be sent to the user via email.') ?></td>
 		</tr>
 	</table>
 	<?php
@@ -123,12 +123,12 @@ 
 	 *
 	 * @since 4.5.0
 	 */
-	do_action( 'network_user_new_form' );
+	do_action('network_user_new_form');
 
-	wp_nonce_field( 'add-user', '_wpnonce_add-user' );
-	submit_button( __('Add User'), 'primary', 'add-user' );
+	wp_nonce_field('add-user', '_wpnonce_add-user');
+	submit_button(__('Add User'), 'primary', 'add-user');
 	?>
 	</form>
 </div>
 <?php
-require( ABSPATH . 'wp-admin/admin-footer.php' );
+require(ABSPATH.'wp-admin/admin-footer.php');

Braces +15 added lines, -10 removed lines

@@ -10,8 +10,9 @@ 
 /** Load WordPress Administration Bootstrap */
 require_once( dirname( __FILE__ ) . '/admin.php' );
 
-if ( ! current_user_can('create_users') )
+if ( ! current_user_can('create_users') ) {
 	wp_die(__('Sorry, you are not allowed to add users to this network.'));
+}
 
 get_current_screen()->add_help_tab( array(
 	'id'      => 'overview',
@@ -30,11 +31,13 @@ 
 if ( isset($_REQUEST['action']) && 'add-user' == $_REQUEST['action'] ) {
 	check_admin_referer( 'add-user', '_wpnonce_add-user' );
 
-	if ( ! current_user_can( 'manage_network_users' ) )
-		wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
+	if ( ! current_user_can( 'manage_network_users' ) ) {
+			wp_die( __( 'Sorry, you are not allowed to access this page.' ), 403 );
+	}
 
-	if ( ! is_array( $_POST['user'] ) )
-		wp_die( __( 'Cannot create an empty user.' ) );
+	if ( ! is_array( $_POST['user'] ) ) {
+			wp_die( __( 'Cannot create an empty user.' ) );
+	}
 
 	$user = wp_unslash( $_POST['user'] );
 
@@ -91,15 +94,17 @@ 
 <h1 id="add-new-user"><?php _e( 'Add New User' ); ?></h1>
 <?php
 if ( ! empty( $messages ) ) {
-	foreach ( $messages as $msg )
-		echo '<div id="message" class="updated notice is-dismissible"><p>' . $msg . '</p></div>';
-}
+	foreach ( $messages as $msg ) {
+			echo '<div id="message" class="updated notice is-dismissible"><p>' . $msg . '</p></div>';
+	}
+	}
 
 if ( isset( $add_user_errors ) && is_wp_error( $add_user_errors ) ) { ?>
 	<div class="error">
 		<?php
-			foreach ( $add_user_errors->get_error_messages() as $message )
-				echo "<p>$message</p>";
+			foreach ( $add_user_errors->get_error_messages() as $message ) {
+							echo "<p>$message</p>";
+			}
 		?>
 	</div>
 <?php } ?>