ntwb / wordpress

src/wp-admin/options.php

Spacing +90 added lines, -90 removed lines

@@ -16,7 +16,7 @@ 
  */
 
 /** WordPress Administration Bootstrap */
-require_once( dirname( __FILE__ ) . '/admin.php' );
+require_once(dirname(__FILE__).'/admin.php');
 
 $title = __('Settings');
 $this_file = 'options.php';
@@ -27,7 +27,7 @@ 
 $capability = 'manage_options';
 
 // This is for back compat and will eventually be removed.
-if ( empty($option_page) ) {
+if (empty($option_page)) {
 	$option_page = 'options';
 } else {
 
@@ -41,69 +41,69 @@ 
 	 *
 	 * @param string $capability The capability used for the page, which is manage_options by default.
 	 */
-	$capability = apply_filters( "option_page_capability_{$option_page}", $capability );
+	$capability = apply_filters("option_page_capability_{$option_page}", $capability);
 }
 
-if ( ! current_user_can( $capability ) ) {
+if ( ! current_user_can($capability)) {
 	wp_die(
-		'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-		'<p>' . __( 'You are not allowed to manage these items.' ) . '</p>',
+		'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+		'<p>'.__('You are not allowed to manage these items.').'</p>',
 		403
 	);
 }
 
 // Handle admin email change requests
-if ( is_multisite() ) {
-	if ( ! empty($_GET[ 'adminhash' ] ) ) {
-		$new_admin_details = get_option( 'adminhash' );
+if (is_multisite()) {
+	if ( ! empty($_GET['adminhash'])) {
+		$new_admin_details = get_option('adminhash');
 		$redirect = 'options-general.php?updated=false';
-		if ( is_array( $new_admin_details ) && $new_admin_details[ 'hash' ] == $_GET[ 'adminhash' ] && !empty($new_admin_details[ 'newemail' ]) ) {
-			update_option( 'admin_email', $new_admin_details[ 'newemail' ] );
-			delete_option( 'adminhash' );
-			delete_option( 'new_admin_email' );
+		if (is_array($new_admin_details) && $new_admin_details['hash'] == $_GET['adminhash'] && ! empty($new_admin_details['newemail'])) {
+			update_option('admin_email', $new_admin_details['newemail']);
+			delete_option('adminhash');
+			delete_option('new_admin_email');
 			$redirect = 'options-general.php?updated=true';
 		}
-		wp_redirect( admin_url( $redirect ) );
+		wp_redirect(admin_url($redirect));
 		exit;
-	} elseif ( ! empty( $_GET['dismiss'] ) && 'new_admin_email' == $_GET['dismiss'] ) {
-		delete_option( 'adminhash' );
-		delete_option( 'new_admin_email' );
-		wp_redirect( admin_url( 'options-general.php?updated=true' ) );
+	} elseif ( ! empty($_GET['dismiss']) && 'new_admin_email' == $_GET['dismiss']) {
+		delete_option('adminhash');
+		delete_option('new_admin_email');
+		wp_redirect(admin_url('options-general.php?updated=true'));
 		exit;
 	}
 }
 
-if ( is_multisite() && ! is_super_admin() && 'update' != $action ) {
+if (is_multisite() && ! is_super_admin() && 'update' != $action) {
 	wp_die(
-		'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-		'<p>' . __( 'You are not allowed to delete these items.' ) . '</p>',
+		'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+		'<p>'.__('You are not allowed to delete these items.').'</p>',
 		403
 	);
 }
 
 $whitelist_options = array(
-	'general' => array( 'blogname', 'blogdescription', 'gmt_offset', 'date_format', 'time_format', 'start_of_week', 'timezone_string', 'WPLANG' ),
-	'discussion' => array( 'default_pingback_flag', 'default_ping_status', 'default_comment_status', 'comments_notify', 'moderation_notify', 'comment_moderation', 'require_name_email', 'comment_whitelist', 'comment_max_links', 'moderation_keys', 'blacklist_keys', 'show_avatars', 'avatar_rating', 'avatar_default', 'close_comments_for_old_posts', 'close_comments_days_old', 'thread_comments', 'thread_comments_depth', 'page_comments', 'comments_per_page', 'default_comments_page', 'comment_order', 'comment_registration' ),
-	'media' => array( 'thumbnail_size_w', 'thumbnail_size_h', 'thumbnail_crop', 'medium_size_w', 'medium_size_h', 'medium_large_size_w', 'medium_large_size_h', 'large_size_w', 'large_size_h', 'image_default_size', 'image_default_align', 'image_default_link_type' ),
-	'reading' => array( 'posts_per_page', 'posts_per_rss', 'rss_use_excerpt', 'show_on_front', 'page_on_front', 'page_for_posts', 'blog_public' ),
-	'writing' => array( 'default_category', 'default_email_category', 'default_link_category', 'default_post_format' )
+	'general' => array('blogname', 'blogdescription', 'gmt_offset', 'date_format', 'time_format', 'start_of_week', 'timezone_string', 'WPLANG'),
+	'discussion' => array('default_pingback_flag', 'default_ping_status', 'default_comment_status', 'comments_notify', 'moderation_notify', 'comment_moderation', 'require_name_email', 'comment_whitelist', 'comment_max_links', 'moderation_keys', 'blacklist_keys', 'show_avatars', 'avatar_rating', 'avatar_default', 'close_comments_for_old_posts', 'close_comments_days_old', 'thread_comments', 'thread_comments_depth', 'page_comments', 'comments_per_page', 'default_comments_page', 'comment_order', 'comment_registration'),
+	'media' => array('thumbnail_size_w', 'thumbnail_size_h', 'thumbnail_crop', 'medium_size_w', 'medium_size_h', 'medium_large_size_w', 'medium_large_size_h', 'large_size_w', 'large_size_h', 'image_default_size', 'image_default_align', 'image_default_link_type'),
+	'reading' => array('posts_per_page', 'posts_per_rss', 'rss_use_excerpt', 'show_on_front', 'page_on_front', 'page_for_posts', 'blog_public'),
+	'writing' => array('default_category', 'default_email_category', 'default_link_category', 'default_post_format')
 );
 $whitelist_options['misc'] = $whitelist_options['options'] = $whitelist_options['privacy'] = array();
 
 $mail_options = array('mailserver_url', 'mailserver_port', 'mailserver_login', 'mailserver_pass');
 
-if ( ! in_array( get_option( 'blog_charset' ), array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ) ) )
+if ( ! in_array(get_option('blog_charset'), array('utf8', 'utf-8', 'UTF8', 'UTF-8')))
 	$whitelist_options['reading'][] = 'blog_charset';
 
-if ( get_site_option( 'initial_db_version' ) < 32453 ) {
+if (get_site_option('initial_db_version') < 32453) {
 	$whitelist_options['writing'][] = 'use_smilies';
 	$whitelist_options['writing'][] = 'use_balanceTags';
 }
 
-if ( !is_multisite() ) {
-	if ( !defined( 'WP_SITEURL' ) )
+if ( ! is_multisite()) {
+	if ( ! defined('WP_SITEURL'))
 		$whitelist_options['general'][] = 'siteurl';
-	if ( !defined( 'WP_HOME' ) )
+	if ( ! defined('WP_HOME'))
 		$whitelist_options['general'][] = 'home';
 
 	$whitelist_options['general'][] = 'admin_email';
@@ -116,7 +116,7 @@ 
 	$whitelist_options['media'][] = 'uploads_use_yearmonth_folders';
 
 	// If upload_url_path and upload_path are both default values, they're locked.
-	if ( get_option( 'upload_url_path' ) || ( get_option('upload_path') != 'wp-content/uploads' && get_option('upload_path') ) ) {
+	if (get_option('upload_url_path') || (get_option('upload_path') != 'wp-content/uploads' && get_option('upload_path'))) {
 		$whitelist_options['media'][] = 'upload_path';
 		$whitelist_options['media'][] = 'upload_url_path';
 	}
@@ -130,7 +130,7 @@ 
 	 *
 	 * @param bool $enabled Whether post-by-email configuration is enabled. Default true.
 	 */
-	if ( apply_filters( 'enable_post_by_email_configuration', true ) )
+	if (apply_filters('enable_post_by_email_configuration', true))
 		$whitelist_options['writing'] = array_merge($whitelist_options['writing'], $mail_options);
 }
 
@@ -141,86 +141,86 @@ 
  *
  * @param array White list options.
  */
-$whitelist_options = apply_filters( 'whitelist_options', $whitelist_options );
+$whitelist_options = apply_filters('whitelist_options', $whitelist_options);
 
 /*
  * If $_GET['action'] == 'update' we are saving settings sent from a settings page
  */
-if ( 'update' == $action ) {
-	if ( 'options' == $option_page && !isset( $_POST['option_page'] ) ) { // This is for back compat and will eventually be removed.
+if ('update' == $action) {
+	if ('options' == $option_page && ! isset($_POST['option_page'])) { // This is for back compat and will eventually be removed.
 		$unregistered = true;
-		check_admin_referer( 'update-options' );
+		check_admin_referer('update-options');
 	} else {
 		$unregistered = false;
-		check_admin_referer( $option_page . '-options' );
+		check_admin_referer($option_page.'-options');
 	}
 
-	if ( !isset( $whitelist_options[ $option_page ] ) )
-		wp_die( __( '<strong>ERROR</strong>: options page not found.' ) );
+	if ( ! isset($whitelist_options[$option_page]))
+		wp_die(__('<strong>ERROR</strong>: options page not found.'));
 
-	if ( 'options' == $option_page ) {
-		if ( is_multisite() && ! is_super_admin() )
-			wp_die( __( 'You do not have sufficient permissions to modify unregistered settings for this site.' ) );
-		$options = explode( ',', wp_unslash( $_POST[ 'page_options' ] ) );
+	if ('options' == $option_page) {
+		if (is_multisite() && ! is_super_admin())
+			wp_die(__('You do not have sufficient permissions to modify unregistered settings for this site.'));
+		$options = explode(',', wp_unslash($_POST['page_options']));
 	} else {
-		$options = $whitelist_options[ $option_page ];
+		$options = $whitelist_options[$option_page];
 	}
 
-	if ( 'general' == $option_page ) {
+	if ('general' == $option_page) {
 		// Handle custom date/time formats.
-		if ( !empty($_POST['date_format']) && isset($_POST['date_format_custom']) && '\c\u\s\t\o\m' == wp_unslash( $_POST['date_format'] ) )
+		if ( ! empty($_POST['date_format']) && isset($_POST['date_format_custom']) && '\c\u\s\t\o\m' == wp_unslash($_POST['date_format']))
 			$_POST['date_format'] = $_POST['date_format_custom'];
-		if ( !empty($_POST['time_format']) && isset($_POST['time_format_custom']) && '\c\u\s\t\o\m' == wp_unslash( $_POST['time_format'] ) )
+		if ( ! empty($_POST['time_format']) && isset($_POST['time_format_custom']) && '\c\u\s\t\o\m' == wp_unslash($_POST['time_format']))
 			$_POST['time_format'] = $_POST['time_format_custom'];
 		// Map UTC+- timezones to gmt_offsets and set timezone_string to empty.
-		if ( !empty($_POST['timezone_string']) && preg_match('/^UTC[+-]/', $_POST['timezone_string']) ) {
+		if ( ! empty($_POST['timezone_string']) && preg_match('/^UTC[+-]/', $_POST['timezone_string'])) {
 			$_POST['gmt_offset'] = $_POST['timezone_string'];
 			$_POST['gmt_offset'] = preg_replace('/UTC\+?/', '', $_POST['gmt_offset']);
 			$_POST['timezone_string'] = '';
 		}
 
 		// Handle translation install.
-		if ( ! empty( $_POST['WPLANG'] ) && ( ! is_multisite() || is_super_admin() ) ) { // @todo: Skip if already installed
-			require_once( ABSPATH . 'wp-admin/includes/translation-install.php' );
+		if ( ! empty($_POST['WPLANG']) && ( ! is_multisite() || is_super_admin())) { // @todo: Skip if already installed
+			require_once(ABSPATH.'wp-admin/includes/translation-install.php');
 
-			if ( wp_can_install_language_pack() ) {
-				$language = wp_download_language_pack( $_POST['WPLANG'] );
-				if ( $language ) {
+			if (wp_can_install_language_pack()) {
+				$language = wp_download_language_pack($_POST['WPLANG']);
+				if ($language) {
 					$_POST['WPLANG'] = $language;
 				}
 			}
 		}
 	}
 
-	if ( $options ) {
-		foreach ( $options as $option ) {
-			if ( $unregistered ) {
-				_deprecated_argument( 'options.php', '2.7',
+	if ($options) {
+		foreach ($options as $option) {
+			if ($unregistered) {
+				_deprecated_argument('options.php', '2.7',
 					sprintf(
 						/* translators: %s: the option/setting */
-						__( 'The %s setting is unregistered. Unregistered settings are deprecated. See https://codex.wordpress.org/Settings_API' ),
-						'<code>' . $option . '</code>'
+						__('The %s setting is unregistered. Unregistered settings are deprecated. See https://codex.wordpress.org/Settings_API'),
+						'<code>'.$option.'</code>'
 					)
 				);
 			}
 
-			$option = trim( $option );
+			$option = trim($option);
 			$value = null;
-			if ( isset( $_POST[ $option ] ) ) {
-				$value = $_POST[ $option ];
-				if ( ! is_array( $value ) )
-					$value = trim( $value );
-				$value = wp_unslash( $value );
+			if (isset($_POST[$option])) {
+				$value = $_POST[$option];
+				if ( ! is_array($value))
+					$value = trim($value);
+				$value = wp_unslash($value);
 			}
-			update_option( $option, $value );
+			update_option($option, $value);
 		}
 
 		// Switch translation in case WPLANG was changed.
-		$language = get_option( 'WPLANG' );
-		if ( $language ) {
-			load_default_textdomain( $language );
+		$language = get_option('WPLANG');
+		if ($language) {
+			load_default_textdomain($language);
 		} else {
-			unload_textdomain( 'default' );
+			unload_textdomain('default');
 		}
 	}
 
@@ -228,38 +228,38 @@ 
 	 * Handle settings errors and return to options page
 	 */
 	// If no settings errors were registered add a general 'updated' message.
-	if ( !count( get_settings_errors() ) )
+	if ( ! count(get_settings_errors()))
 		add_settings_error('general', 'settings_updated', __('Settings saved.'), 'updated');
 	set_transient('settings_errors', get_settings_errors(), 30);
 
 	/**
 	 * Redirect back to the settings page that was submitted
 	 */
-	$goback = add_query_arg( 'settings-updated', 'true',  wp_get_referer() );
-	wp_redirect( $goback );
+	$goback = add_query_arg('settings-updated', 'true', wp_get_referer());
+	wp_redirect($goback);
 	exit;
 }
 
-include( ABSPATH . 'wp-admin/admin-header.php' ); ?>
+include(ABSPATH.'wp-admin/admin-header.php'); ?>
 
 <div class="wrap">
-  <h1><?php esc_html_e( 'All Settings' ); ?></h1>
+  <h1><?php esc_html_e('All Settings'); ?></h1>
   <form name="form" action="options.php" method="post" id="all-options">
   <?php wp_nonce_field('options-options') ?>
   <input type="hidden" name="action" value="update" />
   <input type="hidden" name="option_page" value="options" />
   <table class="form-table">
 <?php
-$options = $wpdb->get_results( "SELECT * FROM $wpdb->options ORDER BY option_name" );
+$options = $wpdb->get_results("SELECT * FROM $wpdb->options ORDER BY option_name");
 
-foreach ( (array) $options as $option ) :
+foreach ((array) $options as $option) :
 	$disabled = false;
-	if ( $option->option_name == '' )
+	if ($option->option_name == '')
 		continue;
-	if ( is_serialized( $option->option_value ) ) {
-		if ( is_serialized_string( $option->option_value ) ) {
+	if (is_serialized($option->option_value)) {
+		if (is_serialized_string($option->option_value)) {
 			// This is a serialized string, so we should display it.
-			$value = maybe_unserialize( $option->option_value );
+			$value = maybe_unserialize($option->option_value);
 			$options_to_update[] = $option->option_name;
 			$class = 'all-options';
 		} else {
@@ -272,28 +272,28 @@ 
 		$options_to_update[] = $option->option_name;
 		$class = 'all-options';
 	}
-	$name = esc_attr( $option->option_name );
+	$name = esc_attr($option->option_name);
 	?>
 <tr>
-	<th scope="row"><label for="<?php echo $name ?>"><?php echo esc_html( $option->option_name ); ?></label></th>
+	<th scope="row"><label for="<?php echo $name ?>"><?php echo esc_html($option->option_name); ?></label></th>
 <td>
-<?php if ( strpos( $value, "\n" ) !== false ) : ?>
+<?php if (strpos($value, "\n") !== false) : ?>
 	<textarea class="<?php echo $class ?>" name="<?php echo $name ?>" id="<?php echo $name ?>" cols="30" rows="5"><?php
-		echo esc_textarea( $value );
+		echo esc_textarea($value);
 	?></textarea>
 	<?php else: ?>
-		<input class="regular-text <?php echo $class ?>" type="text" name="<?php echo $name ?>" id="<?php echo $name ?>" value="<?php echo esc_attr( $value ) ?>"<?php disabled( $disabled, true ) ?> />
+		<input class="regular-text <?php echo $class ?>" type="text" name="<?php echo $name ?>" id="<?php echo $name ?>" value="<?php echo esc_attr($value) ?>"<?php disabled($disabled, true) ?> />
 	<?php endif ?></td>
 </tr>
 <?php endforeach; ?>
   </table>
 
-<input type="hidden" name="page_options" value="<?php echo esc_attr( implode( ',', $options_to_update ) ); ?>" />
+<input type="hidden" name="page_options" value="<?php echo esc_attr(implode(',', $options_to_update)); ?>" />
 
-<?php submit_button( __( 'Save Changes' ), 'primary', 'Update' ); ?>
+<?php submit_button(__('Save Changes'), 'primary', 'Update'); ?>
 
   </form>
 </div>
 
 <?php
-include( ABSPATH . 'wp-admin/admin-footer.php' );
+include(ABSPATH.'wp-admin/admin-footer.php');

Braces +38 added lines, -24 removed lines

@@ -92,8 +92,9 @@ 
 
 $mail_options = array('mailserver_url', 'mailserver_port', 'mailserver_login', 'mailserver_pass');
 
-if ( ! in_array( get_option( 'blog_charset' ), array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ) ) )
+if ( ! in_array( get_option( 'blog_charset' ), array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ) ) ) {
 	$whitelist_options['reading'][] = 'blog_charset';
+}
 
 if ( get_site_option( 'initial_db_version' ) < 32453 ) {
 	$whitelist_options['writing'][] = 'use_smilies';
@@ -101,10 +102,12 @@ 
 }
 
 if ( !is_multisite() ) {
-	if ( !defined( 'WP_SITEURL' ) )
-		$whitelist_options['general'][] = 'siteurl';
-	if ( !defined( 'WP_HOME' ) )
-		$whitelist_options['general'][] = 'home';
+	if ( !defined( 'WP_SITEURL' ) ) {
+			$whitelist_options['general'][] = 'siteurl';
+	}
+	if ( !defined( 'WP_HOME' ) ) {
+			$whitelist_options['general'][] = 'home';
+	}
 
 	$whitelist_options['general'][] = 'admin_email';
 	$whitelist_options['general'][] = 'users_can_register';
@@ -130,9 +133,10 @@ 
 	 *
 	 * @param bool $enabled Whether post-by-email configuration is enabled. Default true.
 	 */
-	if ( apply_filters( 'enable_post_by_email_configuration', true ) )
-		$whitelist_options['writing'] = array_merge($whitelist_options['writing'], $mail_options);
-}
+	if ( apply_filters( 'enable_post_by_email_configuration', true ) ) {
+			$whitelist_options['writing'] = array_merge($whitelist_options['writing'], $mail_options);
+	}
+	}
 
 /**
  * Filter the options white list.
@@ -155,12 +159,14 @@ 
 		check_admin_referer( $option_page . '-options' );
 	}
 
-	if ( !isset( $whitelist_options[ $option_page ] ) )
-		wp_die( __( '<strong>ERROR</strong>: options page not found.' ) );
+	if ( !isset( $whitelist_options[ $option_page ] ) ) {
+			wp_die( __( '<strong>ERROR</strong>: options page not found.' ) );
+	}
 
 	if ( 'options' == $option_page ) {
-		if ( is_multisite() && ! is_super_admin() )
-			wp_die( __( 'You do not have sufficient permissions to modify unregistered settings for this site.' ) );
+		if ( is_multisite() && ! is_super_admin() ) {
+					wp_die( __( 'You do not have sufficient permissions to modify unregistered settings for this site.' ) );
+		}
 		$options = explode( ',', wp_unslash( $_POST[ 'page_options' ] ) );
 	} else {
 		$options = $whitelist_options[ $option_page ];
@@ -168,10 +174,12 @@ 
 
 	if ( 'general' == $option_page ) {
 		// Handle custom date/time formats.
-		if ( !empty($_POST['date_format']) && isset($_POST['date_format_custom']) && '\c\u\s\t\o\m' == wp_unslash( $_POST['date_format'] ) )
-			$_POST['date_format'] = $_POST['date_format_custom'];
-		if ( !empty($_POST['time_format']) && isset($_POST['time_format_custom']) && '\c\u\s\t\o\m' == wp_unslash( $_POST['time_format'] ) )
-			$_POST['time_format'] = $_POST['time_format_custom'];
+		if ( !empty($_POST['date_format']) && isset($_POST['date_format_custom']) && '\c\u\s\t\o\m' == wp_unslash( $_POST['date_format'] ) ) {
+					$_POST['date_format'] = $_POST['date_format_custom'];
+		}
+		if ( !empty($_POST['time_format']) && isset($_POST['time_format_custom']) && '\c\u\s\t\o\m' == wp_unslash( $_POST['time_format'] ) ) {
+					$_POST['time_format'] = $_POST['time_format_custom'];
+		}
 		// Map UTC+- timezones to gmt_offsets and set timezone_string to empty.
 		if ( !empty($_POST['timezone_string']) && preg_match('/^UTC[+-]/', $_POST['timezone_string']) ) {
 			$_POST['gmt_offset'] = $_POST['timezone_string'];
@@ -208,8 +216,9 @@ 
 			$value = null;
 			if ( isset( $_POST[ $option ] ) ) {
 				$value = $_POST[ $option ];
-				if ( ! is_array( $value ) )
-					$value = trim( $value );
+				if ( ! is_array( $value ) ) {
+									$value = trim( $value );
+				}
 				$value = wp_unslash( $value );
 			}
 			update_option( $option, $value );
@@ -228,8 +237,9 @@ 
 	 * Handle settings errors and return to options page
 	 */
 	// If no settings errors were registered add a general 'updated' message.
-	if ( !count( get_settings_errors() ) )
-		add_settings_error('general', 'settings_updated', __('Settings saved.'), 'updated');
+	if ( !count( get_settings_errors() ) ) {
+			add_settings_error('general', 'settings_updated', __('Settings saved.'), 'updated');
+	}
 	set_transient('settings_errors', get_settings_errors(), 30);
 
 	/**
@@ -254,8 +264,9 @@ 
 
 foreach ( (array) $options as $option ) :
 	$disabled = false;
-	if ( $option->option_name == '' )
-		continue;
+	if ( $option->option_name == '' ) {
+			continue;
+	}
 	if ( is_serialized( $option->option_value ) ) {
 		if ( is_serialized_string( $option->option_value ) ) {
 			// This is a serialized string, so we should display it.
@@ -281,11 +292,14 @@ 
 	<textarea class="<?php echo $class ?>" name="<?php echo $name ?>" id="<?php echo $name ?>" cols="30" rows="5"><?php
 		echo esc_textarea( $value );
 	?></textarea>
-	<?php else: ?>
+	<?php else {
+	: ?>
 		<input class="regular-text <?php echo $class ?>" type="text" name="<?php echo $name ?>" id="<?php echo $name ?>" value="<?php echo esc_attr( $value ) ?>"<?php disabled( $disabled, true ) ?> />
 	<?php endif ?></td>
 </tr>
-<?php endforeach; ?>
+<?php endforeach;
+}
+?>
   </table>
 
 <input type="hidden" name="page_options" value="<?php echo esc_attr( implode( ',', $options_to_update ) ); ?>" />

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

Spacing +140 added lines, -140 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');
 	}
 
 	/**
@@ -69,20 +69,20 @@ 
 
 		$current_site = get_current_site();
 
-		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, '*');
 		}
@@ -91,92 +91,92 @@ 
 		 * 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';
 		}
 
 		$query = "SELECT * FROM {$wpdb->blogs} WHERE site_id = '{$wpdb->siteid}' ";
 
-		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 ) . $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).$wild);
+			$reg_blog_ids = $wpdb->get_col($sql);
 
-			if ( !$reg_blog_ids )
-				$reg_blog_ids = array( 0 );
+			if ( ! $reg_blog_ids)
+				$reg_blog_ids = array(0);
 
 			$query = "SELECT *
 				FROM {$wpdb->blogs}
 				WHERE site_id = '{$wpdb->siteid}'
-				AND {$wpdb->blogs}.blog_id IN (" . implode( ', ', $reg_blog_ids ) . ")";
+				AND {$wpdb->blogs}.blog_id IN (".implode(', ', $reg_blog_ids).")";
 		} else {
-			if ( is_numeric($s) && empty( $wild ) ) {
-				$query .= $wpdb->prepare( " AND ( {$wpdb->blogs}.blog_id = %s )", $s );
-			} elseif ( is_subdomain_install() ) {
-				$blog_s = str_replace( '.' . $current_site->domain, '', $s );
-				$blog_s = $wpdb->esc_like( $blog_s ) . $wild . $wpdb->esc_like( '.' . $current_site->domain );
-				$query .= $wpdb->prepare( " AND ( {$wpdb->blogs}.domain LIKE %s ) ", $blog_s );
+			if (is_numeric($s) && empty($wild)) {
+				$query .= $wpdb->prepare(" AND ( {$wpdb->blogs}.blog_id = %s )", $s);
+			} elseif (is_subdomain_install()) {
+				$blog_s = str_replace('.'.$current_site->domain, '', $s);
+				$blog_s = $wpdb->esc_like($blog_s).$wild.$wpdb->esc_like('.'.$current_site->domain);
+				$query .= $wpdb->prepare(" AND ( {$wpdb->blogs}.domain LIKE %s ) ", $blog_s);
 			} else {
-				if ( $s != trim('/', $current_site->path) ) {
-					$blog_s = $wpdb->esc_like( $current_site->path . $s ) . $wild . $wpdb->esc_like( '/' );
+				if ($s != trim('/', $current_site->path)) {
+					$blog_s = $wpdb->esc_like($current_site->path.$s).$wild.$wpdb->esc_like('/');
 				} else {
-					$blog_s = $wpdb->esc_like( $s );
+					$blog_s = $wpdb->esc_like($s);
 				}
-				$query .= $wpdb->prepare( " AND  ( {$wpdb->blogs}.path LIKE %s )", $blog_s );
+				$query .= $wpdb->prepare(" AND  ( {$wpdb->blogs}.path LIKE %s )", $blog_s);
 			}
 		}
 
-		$order_by = isset( $_REQUEST['orderby'] ) ? $_REQUEST['orderby'] : '';
-		if ( $order_by === 'registered' ) {
+		$order_by = isset($_REQUEST['orderby']) ? $_REQUEST['orderby'] : '';
+		if ($order_by === 'registered') {
 			$query .= ' ORDER BY registered ';
-		} elseif ( $order_by === 'lastupdated' ) {
+		} elseif ($order_by === 'lastupdated') {
 			$query .= ' ORDER BY last_updated ';
-		} elseif ( $order_by === 'blogname' ) {
-			if ( is_subdomain_install() ) {
+		} elseif ($order_by === 'blogname') {
+			if (is_subdomain_install()) {
 				$query .= ' ORDER BY domain ';
 			} else {
 				$query .= ' ORDER BY path ';
 			}
-		} elseif ( $order_by === 'blog_id' ) {
+		} elseif ($order_by === 'blog_id') {
 			$query .= ' ORDER BY blog_id ';
 		} else {
 			$order_by = null;
 		}
 
-		if ( isset( $order_by ) ) {
-			$order = ( isset( $_REQUEST['order'] ) && 'DESC' === strtoupper( $_REQUEST['order'] ) ) ? "DESC" : "ASC";
+		if (isset($order_by)) {
+			$order = (isset($_REQUEST['order']) && 'DESC' === strtoupper($_REQUEST['order'])) ? "DESC" : "ASC";
 			$query .= $order;
 		}
 
 		// Don't do an unbounded count on large networks
-		if ( ! wp_is_large_network() )
-			$total = $wpdb->get_var( str_replace( 'SELECT *', 'SELECT COUNT( blog_id )', $query ) );
+		if ( ! wp_is_large_network())
+			$total = $wpdb->get_var(str_replace('SELECT *', 'SELECT COUNT( blog_id )', $query));
 
-		$query .= " LIMIT " . intval( ( $pagenum - 1 ) * $per_page ) . ", " . intval( $per_page );
-		$this->items = $wpdb->get_results( $query, ARRAY_A );
+		$query .= " LIMIT ".intval(($pagenum - 1) * $per_page).", ".intval($per_page);
+		$this->items = $wpdb->get_results($query, ARRAY_A);
 
-		if ( wp_is_large_network() )
+		if (wp_is_large_network())
 			$total = count($this->items);
 
-		$this->set_pagination_args( array(
+		$this->set_pagination_args(array(
 			'total_items' => $total,
 			'per_page' => $per_page,
-		) );
+		));
 	}
 
 	/**
 	 * @access public
 	 */
 	public function no_items() {
-		_e( 'No sites found.' );
+		_e('No sites found.');
 	}
 
 	/**
@@ -185,10 +185,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;
 	}
@@ -198,13 +198,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);
 	}
 
 	/**
@@ -213,14 +213,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');
 		}
 
 		/**
@@ -231,7 +231,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);
 	}
 
 	/**
@@ -253,14 +253,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;
 	}
 
@@ -272,7 +272,7 @@ 
 	 *
 	 * @param array $blog Current site.
 	 */
-	public function column_id( $blog ) {
+	public function column_id($blog) {
 		echo $blog['blog_id'];
 	}
 
@@ -286,41 +286,41 @@ 
 	 *
 	 * @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 .= ' - ';
-			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>";
 			}
 		}
 
 		?>
-		<a href="<?php echo esc_url( network_admin_url( 'site-info.php?id=' . $blog['blog_id'] ) ); ?>" class="edit"><?php echo $blogname . $blog_state; ?></a>
+		<a href="<?php echo esc_url(network_admin_url('site-info.php?id='.$blog['blog_id'])); ?>" class="edit"><?php echo $blogname.$blog_state; ?></a>
 		<?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();
@@ -335,16 +335,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']);
 	}
 
 	/**
@@ -355,19 +355,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']);
 		}
 	}
 
@@ -379,19 +379,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)
 		);
 	}
 
@@ -403,8 +403,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.
 			 *
@@ -414,7 +414,7 @@ 
 			 *
 			 * @param int $blog_id The site ID.
 			 */
-			do_action( 'wpmublogsaction', $blog['blog_id'] );
+			do_action('wpmublogsaction', $blog['blog_id']);
 		}
 	}
 
@@ -427,7 +427,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.
 		 *
@@ -436,7 +436,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']);
 	}
 
 	/**
@@ -444,19 +444,19 @@ 
 	 * @global string $mode
 	 */
 	public function display_rows() {
-		foreach ( $this->items as $blog ) {
+		foreach ($this->items as $blog) {
 			$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>';
 		}
@@ -485,12 +485,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(
@@ -502,33 +502,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_current_site()->blog_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_current_site()->blog_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='permalink'>" . __( 'Visit' ) . '</a>';
+		$actions['visit'] = "<a href='".esc_url(get_home_url($blog['blog_id'], '/'))."' rel='permalink'>".__('Visit').'</a>';
 
 		/**
 		 * Filter the action links displayed for each site in the Sites list table.
@@ -545,7 +545,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);
 	}
 }

Braces +21 added lines, -14 removed lines

@@ -92,10 +92,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';
+			}
 		}
 
 		$query = "SELECT * FROM {$wpdb->blogs} WHERE site_id = '{$wpdb->siteid}' ";
@@ -110,8 +112,9 @@ 
 			$sql = $wpdb->prepare( "SELECT blog_id FROM {$wpdb->registration_log} WHERE {$wpdb->registration_log}.IP LIKE %s", $wpdb->esc_like( $s ) . $wild );
 			$reg_blog_ids = $wpdb->get_col( $sql );
 
-			if ( !$reg_blog_ids )
-				$reg_blog_ids = array( 0 );
+			if ( !$reg_blog_ids ) {
+							$reg_blog_ids = array( 0 );
+			}
 
 			$query = "SELECT *
 				FROM {$wpdb->blogs}
@@ -157,14 +160,16 @@ 
 		}
 
 		// Don't do an unbounded count on large networks
-		if ( ! wp_is_large_network() )
-			$total = $wpdb->get_var( str_replace( 'SELECT *', 'SELECT COUNT( blog_id )', $query ) );
+		if ( ! wp_is_large_network() ) {
+					$total = $wpdb->get_var( str_replace( 'SELECT *', 'SELECT COUNT( blog_id )', $query ) );
+		}
 
 		$query .= " LIMIT " . intval( ( $pagenum - 1 ) * $per_page ) . ", " . intval( $per_page );
 		$this->items = $wpdb->get_results( $query, ARRAY_A );
 
-		if ( wp_is_large_network() )
-			$total = count($this->items);
+		if ( wp_is_large_network() ) {
+					$total = count($this->items);
+		}
 
 		$this->set_pagination_args( array(
 			'total_items' => $total,
@@ -185,8 +190,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' );
 
@@ -203,8 +209,9 @@ 
 
 		parent::pagination( $which );
 
-		if ( 'top' === $which )
-			$this->view_switcher( $mode );
+		if ( 'top' === $which ) {
+					$this->view_switcher( $mode );
+		}
 	}
 
 	/**

src/wp-admin/includes/options.php

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * WordPress Options Administration API.
- *
- * @package WordPress
- * @subpackage Administration
- * @since 4.4.0
- */
+	 * WordPress Options Administration API.
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 * @since 4.4.0
+	 */
 
 /**
  * Output JavaScript to toggle display of additional settings if avatars are disabled.

Spacing +3 added lines, -3 removed lines

@@ -36,7 +36,7 @@ 
 <script type="text/javascript">
 	jQuery(document).ready(function($){
 		var $siteName = $( '#wp-admin-bar-site-name' ).children( 'a' ).first(),
-			homeURL = ( <?php echo wp_json_encode( get_home_url() ); ?> || '' ).replace( /^(https?:\/\/)?(www\.)?/, '' );
+			homeURL = ( <?php echo wp_json_encode(get_home_url()); ?> || '' ).replace( /^(https?:\/\/)?(www\.)?/, '' );
 
 		$( '#blogname' ).on( 'input', function() {
 			var title = $.trim( $( this ).val() ) || homeURL;
@@ -136,6 +136,6 @@ 
  * @since 3.5.0
  */
 function options_reading_blog_charset() {
-	echo '<input name="blog_charset" type="text" id="blog_charset" value="' . esc_attr( get_option( 'blog_charset' ) ) . '" class="regular-text" />';
-	echo '<p class="description">' . __( 'The <a href="https://codex.wordpress.org/Glossary#Character_set">character encoding</a> of your site (UTF-8 is recommended)' ) . '</p>';
+	echo '<input name="blog_charset" type="text" id="blog_charset" value="'.esc_attr(get_option('blog_charset')).'" class="regular-text" />';
+	echo '<p class="description">'.__('The <a href="https://codex.wordpress.org/Glossary#Character_set">character encoding</a> of your site (UTF-8 is recommended)').'</p>';
 }

src/wp-admin/includes/edit-tag-messages.php

Spacing +24 added lines, -24 removed lines

@@ -11,32 +11,32 @@ 
 // 0 = unused. Messages start at index 1.
 $messages['_item'] = array(
 	0 => '',
-	1 => __( 'Item added.' ),
-	2 => __( 'Item deleted.' ),
-	3 => __( 'Item updated.' ),
-	4 => __( 'Item not added.' ),
-	5 => __( 'Item not updated.' ),
-	6 => __( 'Items deleted.' ),
+	1 => __('Item added.'),
+	2 => __('Item deleted.'),
+	3 => __('Item updated.'),
+	4 => __('Item not added.'),
+	5 => __('Item not updated.'),
+	6 => __('Items deleted.'),
 );
 
 $messages['category'] = array(
 	0 => '',
-	1 => __( 'Category added.' ),
-	2 => __( 'Category deleted.' ),
-	3 => __( 'Category updated.' ),
-	4 => __( 'Category not added.' ),
-	5 => __( 'Category not updated.' ),
-	6 => __( 'Categories deleted.' ),
+	1 => __('Category added.'),
+	2 => __('Category deleted.'),
+	3 => __('Category updated.'),
+	4 => __('Category not added.'),
+	5 => __('Category not updated.'),
+	6 => __('Categories deleted.'),
 );
 
 $messages['post_tag'] = array(
 	0 => '',
-	1 => __( 'Tag added.' ),
-	2 => __( 'Tag deleted.' ),
-	3 => __( 'Tag updated.' ),
-	4 => __( 'Tag not added.' ),
-	5 => __( 'Tag not updated.' ),
-	6 => __( 'Tags deleted.' ),
+	1 => __('Tag added.'),
+	2 => __('Tag deleted.'),
+	3 => __('Tag updated.'),
+	4 => __('Tag not added.'),
+	5 => __('Tag not updated.'),
+	6 => __('Tags deleted.'),
 );
 
 /**
@@ -46,13 +46,13 @@ 
  *
  * @param array $messages The messages to be displayed.
  */
-$messages = apply_filters( 'term_updated_messages', $messages );
+$messages = apply_filters('term_updated_messages', $messages);
 
 $message = false;
-if ( isset( $_REQUEST['message'] ) && ( $msg = (int) $_REQUEST['message'] ) ) {
-	if ( isset( $messages[ $taxonomy ][ $msg ] ) ) {
-		$message = $messages[ $taxonomy ][ $msg ];
-	} elseif ( ! isset( $messages[ $taxonomy ] ) && isset( $messages['_item'][ $msg ] ) ) {
-		$message = $messages['_item'][ $msg ];
+if (isset($_REQUEST['message']) && ($msg = (int) $_REQUEST['message'])) {
+	if (isset($messages[$taxonomy][$msg])) {
+		$message = $messages[$taxonomy][$msg];
+	} elseif ( ! isset($messages[$taxonomy]) && isset($messages['_item'][$msg])) {
+		$message = $messages['_item'][$msg];
 	}
 }
\ No newline at end of file

src/wp-admin/includes/class-wp-terms-list-table.php

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * List Table API: WP_Terms_List_Table class
- *
- * @package WordPress
- * @subpackage Administration
- * @since 3.1.0
- */
+	 * List Table API: WP_Terms_List_Table class
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 * @since 3.1.0
+	 */
 
 /**
  * Core class used to implement displaying terms in a list table.

Spacing +144 added lines, -144 removed lines

@@ -36,29 +36,29 @@ 
 	 *
 	 * @param array $args An associative array of arguments.
 	 */
-	public function __construct( $args = array() ) {
+	public function __construct($args = array()) {
 		global $post_type, $taxonomy, $action, $tax;
 
-		parent::__construct( array(
+		parent::__construct(array(
 			'plural' => 'tags',
 			'singular' => 'tag',
-			'screen' => isset( $args['screen'] ) ? $args['screen'] : null,
-		) );
+			'screen' => isset($args['screen']) ? $args['screen'] : null,
+		));
 
 		$action    = $this->screen->action;
 		$post_type = $this->screen->post_type;
 		$taxonomy  = $this->screen->taxonomy;
 
-		if ( empty( $taxonomy ) )
+		if (empty($taxonomy))
 			$taxonomy = 'post_tag';
 
-		if ( ! taxonomy_exists( $taxonomy ) )
-			wp_die( __( 'Invalid taxonomy' ) );
+		if ( ! taxonomy_exists($taxonomy))
+			wp_die(__('Invalid taxonomy'));
 
-		$tax = get_taxonomy( $taxonomy );
+		$tax = get_taxonomy($taxonomy);
 
 		// @todo Still needed? Maybe just the show_ui part.
-		if ( empty( $post_type ) || !in_array( $post_type, get_post_types( array( 'show_ui' => true ) ) ) )
+		if (empty($post_type) || ! in_array($post_type, get_post_types(array('show_ui' => true))))
 			$post_type = 'post';
 
 	}
@@ -68,16 +68,16 @@ 
 	 * @return bool
 	 */
 	public function ajax_user_can() {
-		return current_user_can( get_taxonomy( $this->screen->taxonomy )->cap->manage_terms );
+		return current_user_can(get_taxonomy($this->screen->taxonomy)->cap->manage_terms);
 	}
 
 	/**
 	 * @access public
 	 */
 	public function prepare_items() {
-		$tags_per_page = $this->get_items_per_page( 'edit_' . $this->screen->taxonomy . '_per_page' );
+		$tags_per_page = $this->get_items_per_page('edit_'.$this->screen->taxonomy.'_per_page');
 
-		if ( 'post_tag' === $this->screen->taxonomy ) {
+		if ('post_tag' === $this->screen->taxonomy) {
 			/**
 			 * Filter the number of terms displayed per page for the Tags list table.
 			 *
@@ -85,7 +85,7 @@ 
 			 *
 			 * @param int $tags_per_page Number of tags to be displayed. Default 20.
 			 */
-			$tags_per_page = apply_filters( 'edit_tags_per_page', $tags_per_page );
+			$tags_per_page = apply_filters('edit_tags_per_page', $tags_per_page);
 
 			/**
 			 * Filter the number of terms displayed per page for the Tags list table.
@@ -95,8 +95,8 @@ 
 			 *
 			 * @param int $tags_per_page Number of tags to be displayed. Default 20.
 			 */
-			$tags_per_page = apply_filters( 'tagsperpage', $tags_per_page );
-		} elseif ( 'category' === $this->screen->taxonomy ) {
+			$tags_per_page = apply_filters('tagsperpage', $tags_per_page);
+		} elseif ('category' === $this->screen->taxonomy) {
 			/**
 			 * Filter the number of terms displayed per page for the Categories list table.
 			 *
@@ -104,10 +104,10 @@ 
 			 *
 			 * @param int $tags_per_page Number of categories to be displayed. Default 20.
 			 */
-			$tags_per_page = apply_filters( 'edit_categories_per_page', $tags_per_page );
+			$tags_per_page = apply_filters('edit_categories_per_page', $tags_per_page);
 		}
 
-		$search = !empty( $_REQUEST['s'] ) ? trim( wp_unslash( $_REQUEST['s'] ) ) : '';
+		$search = ! empty($_REQUEST['s']) ? trim(wp_unslash($_REQUEST['s'])) : '';
 
 		$args = array(
 			'search' => $search,
@@ -115,18 +115,18 @@ 
 			'number' => $tags_per_page,
 		);
 
-		if ( !empty( $_REQUEST['orderby'] ) )
-			$args['orderby'] = trim( wp_unslash( $_REQUEST['orderby'] ) );
+		if ( ! empty($_REQUEST['orderby']))
+			$args['orderby'] = trim(wp_unslash($_REQUEST['orderby']));
 
-		if ( !empty( $_REQUEST['order'] ) )
-			$args['order'] = trim( wp_unslash( $_REQUEST['order'] ) );
+		if ( ! empty($_REQUEST['order']))
+			$args['order'] = trim(wp_unslash($_REQUEST['order']));
 
 		$this->callback_args = $args;
 
-		$this->set_pagination_args( array(
-			'total_items' => wp_count_terms( $this->screen->taxonomy, compact( 'search' ) ),
+		$this->set_pagination_args(array(
+			'total_items' => wp_count_terms($this->screen->taxonomy, compact('search')),
 			'per_page' => $tags_per_page,
-		) );
+		));
 	}
 
 	/**
@@ -142,7 +142,7 @@ 
 	 * @access public
 	 */
 	public function no_items() {
-		echo get_taxonomy( $this->screen->taxonomy )->labels->not_found;
+		echo get_taxonomy($this->screen->taxonomy)->labels->not_found;
 	}
 
 	/**
@@ -151,7 +151,7 @@ 
 	 */
 	protected function get_bulk_actions() {
 		$actions = array();
-		$actions['delete'] = __( 'Delete' );
+		$actions['delete'] = __('Delete');
 
 		return $actions;
 	}
@@ -161,7 +161,7 @@ 
 	 * @return string
 	 */
 	public function current_action() {
-		if ( isset( $_REQUEST['action'] ) && isset( $_REQUEST['delete_tags'] ) && ( 'delete' === $_REQUEST['action'] || 'delete' === $_REQUEST['action2'] ) )
+		if (isset($_REQUEST['action']) && isset($_REQUEST['delete_tags']) && ('delete' === $_REQUEST['action'] || 'delete' === $_REQUEST['action2']))
 			return 'bulk-delete';
 
 		return parent::current_action();
@@ -174,15 +174,15 @@ 
 	public function get_columns() {
 		$columns = array(
 			'cb'          => '<input type="checkbox" />',
-			'name'        => _x( 'Name', 'term name' ),
-			'description' => __( 'Description' ),
-			'slug'        => __( 'Slug' ),
+			'name'        => _x('Name', 'term name'),
+			'description' => __('Description'),
+			'slug'        => __('Slug'),
 		);
 
-		if ( 'link_category' === $this->screen->taxonomy ) {
-			$columns['links'] = __( 'Links' );
+		if ('link_category' === $this->screen->taxonomy) {
+			$columns['links'] = __('Links');
 		} else {
-			$columns['posts'] = _x( 'Count', 'Number/count of items' );
+			$columns['posts'] = _x('Count', 'Number/count of items');
 		}
 
 		return $columns;
@@ -208,47 +208,47 @@ 
 	public function display_rows_or_placeholder() {
 		$taxonomy = $this->screen->taxonomy;
 
-		$args = wp_parse_args( $this->callback_args, array(
+		$args = wp_parse_args($this->callback_args, array(
 			'page' => 1,
 			'number' => 20,
 			'search' => '',
 			'hide_empty' => 0
-		) );
+		));
 
 		$page = $args['page'];
 
 		// Set variable because $args['number'] can be subsequently overridden.
 		$number = $args['number'];
 
-		$args['offset'] = $offset = ( $page - 1 ) * $number;
+		$args['offset'] = $offset = ($page - 1) * $number;
 
 		// Convert it to table rows.
 		$count = 0;
 
-		if ( is_taxonomy_hierarchical( $taxonomy ) && ! isset( $args['orderby'] ) ) {
+		if (is_taxonomy_hierarchical($taxonomy) && ! isset($args['orderby'])) {
 			// We'll need the full set of terms then.
 			$args['number'] = $args['offset'] = 0;
 		}
-		$terms = get_terms( $taxonomy, $args );
+		$terms = get_terms($taxonomy, $args);
 
-		if ( empty( $terms ) || ! is_array( $terms ) ) {
-			echo '<tr class="no-items"><td class="colspanchange" colspan="' . $this->get_column_count() . '">';
+		if (empty($terms) || ! is_array($terms)) {
+			echo '<tr class="no-items"><td class="colspanchange" colspan="'.$this->get_column_count().'">';
 			$this->no_items();
 			echo '</td></tr>';
 			return;
 		}
 
-		if ( is_taxonomy_hierarchical( $taxonomy ) && ! isset( $args['orderby'] ) ) {
-			if ( ! empty( $args['search'] ) ) {// Ignore children on searches.
+		if (is_taxonomy_hierarchical($taxonomy) && ! isset($args['orderby'])) {
+			if ( ! empty($args['search'])) {// Ignore children on searches.
 				$children = array();
 			} else {
-				$children = _get_term_hierarchy( $taxonomy );
+				$children = _get_term_hierarchy($taxonomy);
 			}
 			// Some funky recursion to get the job done( Paging & parents mainly ) is contained within, Skip it for non-hierarchical taxonomies for performance sake
-			$this->_rows( $taxonomy, $terms, $children, $offset, $number, $count );
+			$this->_rows($taxonomy, $terms, $children, $offset, $number, $count);
 		} else {
-			foreach ( $terms as $term ) {
-				$this->single_row( $term );
+			foreach ($terms as $term) {
+				$this->single_row($term);
 			}
 		}
 	}
@@ -263,51 +263,51 @@ 
 	 * @param int   $parent
 	 * @param int   $level
 	 */
-	private function _rows( $taxonomy, $terms, &$children, $start, $per_page, &$count, $parent = 0, $level = 0 ) {
+	private function _rows($taxonomy, $terms, &$children, $start, $per_page, &$count, $parent = 0, $level = 0) {
 
 		$end = $start + $per_page;
 
-		foreach ( $terms as $key => $term ) {
+		foreach ($terms as $key => $term) {
 
-			if ( $count >= $end )
+			if ($count >= $end)
 				break;
 
-			if ( $term->parent != $parent && empty( $_REQUEST['s'] ) )
+			if ($term->parent != $parent && empty($_REQUEST['s']))
 				continue;
 
 			// If the page starts in a subtree, print the parents.
-			if ( $count == $start && $term->parent > 0 && empty( $_REQUEST['s'] ) ) {
+			if ($count == $start && $term->parent > 0 && empty($_REQUEST['s'])) {
 				$my_parents = $parent_ids = array();
 				$p = $term->parent;
-				while ( $p ) {
-					$my_parent = get_term( $p, $taxonomy );
+				while ($p) {
+					$my_parent = get_term($p, $taxonomy);
 					$my_parents[] = $my_parent;
 					$p = $my_parent->parent;
-					if ( in_array( $p, $parent_ids ) ) // Prevent parent loops.
+					if (in_array($p, $parent_ids)) // Prevent parent loops.
 						break;
 					$parent_ids[] = $p;
 				}
-				unset( $parent_ids );
+				unset($parent_ids);
 
-				$num_parents = count( $my_parents );
-				while ( $my_parent = array_pop( $my_parents ) ) {
+				$num_parents = count($my_parents);
+				while ($my_parent = array_pop($my_parents)) {
 					echo "\t";
-					$this->single_row( $my_parent, $level - $num_parents );
+					$this->single_row($my_parent, $level - $num_parents);
 					$num_parents--;
 				}
 			}
 
-			if ( $count >= $start ) {
+			if ($count >= $start) {
 				echo "\t";
-				$this->single_row( $term, $level );
+				$this->single_row($term, $level);
 			}
 
 			++$count;
 
-			unset( $terms[$key] );
+			unset($terms[$key]);
 
-			if ( isset( $children[$term->term_id] ) && empty( $_REQUEST['s'] ) )
-				$this->_rows( $taxonomy, $terms, $children, $start, $per_page, $count, $term->term_id, $level + 1 );
+			if (isset($children[$term->term_id]) && empty($_REQUEST['s']))
+				$this->_rows($taxonomy, $terms, $children, $start, $per_page, $count, $term->term_id, $level + 1);
 		}
 	}
 
@@ -316,14 +316,14 @@ 
 	 * @param object $tag
 	 * @param int $level
 	 */
-	public function single_row( $tag, $level = 0 ) {
+	public function single_row($tag, $level = 0) {
 		global $taxonomy;
- 		$tag = sanitize_term( $tag, $taxonomy );
+ 		$tag = sanitize_term($tag, $taxonomy);
 
 		$this->level = $level;
 
-		echo '<tr id="tag-' . $tag->term_id . '">';
-		$this->single_row_columns( $tag );
+		echo '<tr id="tag-'.$tag->term_id.'">';
+		$this->single_row_columns($tag);
 		echo '</tr>';
 	}
 
@@ -331,12 +331,12 @@ 
 	 * @param object $tag
 	 * @return string
 	 */
-	public function column_cb( $tag ) {
-		$default_term = get_option( 'default_' . $this->screen->taxonomy );
+	public function column_cb($tag) {
+		$default_term = get_option('default_'.$this->screen->taxonomy);
 
-		if ( current_user_can( get_taxonomy( $this->screen->taxonomy )->cap->delete_terms ) && $tag->term_id != $default_term )
-			return '<label class="screen-reader-text" for="cb-select-' . $tag->term_id . '">' . sprintf( __( 'Select %s' ), $tag->name ) . '</label>'
-				. '<input type="checkbox" name="delete_tags[]" value="' . $tag->term_id . '" id="cb-select-' . $tag->term_id . '" />';
+		if (current_user_can(get_taxonomy($this->screen->taxonomy)->cap->delete_terms) && $tag->term_id != $default_term)
+			return '<label class="screen-reader-text" for="cb-select-'.$tag->term_id.'">'.sprintf(__('Select %s'), $tag->name).'</label>'
+				. '<input type="checkbox" name="delete_tags[]" value="'.$tag->term_id.'" id="cb-select-'.$tag->term_id.'" />';
 
 		return '&nbsp;';
 	}
@@ -345,10 +345,10 @@ 
 	 * @param object $tag
 	 * @return string
 	 */
-	public function column_name( $tag ) {
+	public function column_name($tag) {
 		$taxonomy = $this->screen->taxonomy;
 
-		$pad = str_repeat( '&#8212; ', max( 0, $this->level ) );
+		$pad = str_repeat('&#8212; ', max(0, $this->level));
 
 		/**
 		 * Filter display of the term name in the terms list table.
@@ -363,32 +363,32 @@ 
 		 * @param string $pad_tag_name The term name, padded if not top-level.
 		 * @param object $tag          Term object.
 		 */
-		$name = apply_filters( 'term_name', $pad . ' ' . $tag->name, $tag );
+		$name = apply_filters('term_name', $pad.' '.$tag->name, $tag);
 
-		$qe_data = get_term( $tag->term_id, $taxonomy, OBJECT, 'edit' );
+		$qe_data = get_term($tag->term_id, $taxonomy, OBJECT, 'edit');
 
-		$uri = ( defined( 'DOING_AJAX' ) && DOING_AJAX ) ? wp_get_referer() : $_SERVER['REQUEST_URI'];
+		$uri = (defined('DOING_AJAX') && DOING_AJAX) ? wp_get_referer() : $_SERVER['REQUEST_URI'];
 
 		$edit_link = add_query_arg(
 			'wp_http_referer',
-			urlencode( wp_unslash( $uri ) ),
-			get_edit_term_link( $tag->term_id, $taxonomy, $this->screen->post_type )
+			urlencode(wp_unslash($uri)),
+			get_edit_term_link($tag->term_id, $taxonomy, $this->screen->post_type)
 		);
 
 		$out = sprintf(
 			'<strong><a class="row-title" href="%s" aria-label="%s">%s</a></strong><br />',
-			esc_url( $edit_link ),
+			esc_url($edit_link),
 			/* translators: %s: taxonomy term name */
-			esc_attr( sprintf( __( '&#8220;%s&#8221; (Edit)' ), $tag->name ) ),
+			esc_attr(sprintf(__('&#8220;%s&#8221; (Edit)'), $tag->name)),
 			$name
 		);
 
-		$out .= '<div class="hidden" id="inline_' . $qe_data->term_id . '">';
-		$out .= '<div class="name">' . $qe_data->name . '</div>';
+		$out .= '<div class="hidden" id="inline_'.$qe_data->term_id.'">';
+		$out .= '<div class="name">'.$qe_data->name.'</div>';
 
 		/** This filter is documented in wp-admin/edit-tag-form.php */
-		$out .= '<div class="slug">' . apply_filters( 'editable_slug', $qe_data->slug, $qe_data ) . '</div>';
-		$out .= '<div class="parent">' . $qe_data->parent . '</div></div>';
+		$out .= '<div class="slug">'.apply_filters('editable_slug', $qe_data->slug, $qe_data).'</div>';
+		$out .= '<div class="parent">'.$qe_data->parent.'</div></div>';
 
 		return $out;
 	}
@@ -416,55 +416,55 @@ 
 	 * @param string $primary     Primary column name.
 	 * @return string Row actions output for terms.
 	 */
-	protected function handle_row_actions( $tag, $column_name, $primary ) {
-		if ( $primary !== $column_name ) {
+	protected function handle_row_actions($tag, $column_name, $primary) {
+		if ($primary !== $column_name) {
 			return '';
 		}
 
 		$taxonomy = $this->screen->taxonomy;
-		$tax = get_taxonomy( $taxonomy );
-		$default_term = get_option( 'default_' . $taxonomy );
+		$tax = get_taxonomy($taxonomy);
+		$default_term = get_option('default_'.$taxonomy);
 
-		$uri = ( defined( 'DOING_AJAX' ) && DOING_AJAX ) ? wp_get_referer() : $_SERVER['REQUEST_URI'];
+		$uri = (defined('DOING_AJAX') && DOING_AJAX) ? wp_get_referer() : $_SERVER['REQUEST_URI'];
 
 		$edit_link = add_query_arg(
 			'wp_http_referer',
-			urlencode( wp_unslash( $uri ) ),
-			get_edit_term_link( $tag->term_id, $taxonomy, $this->screen->post_type )
+			urlencode(wp_unslash($uri)),
+			get_edit_term_link($tag->term_id, $taxonomy, $this->screen->post_type)
 		);
 
 		$actions = array();
-		if ( current_user_can( $tax->cap->edit_terms ) ) {
+		if (current_user_can($tax->cap->edit_terms)) {
 			$actions['edit'] = sprintf(
 				'<a href="%s" aria-label="%s">%s</a>',
-				esc_url( $edit_link ),
+				esc_url($edit_link),
 				/* translators: %s: taxonomy term name */
-				esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;' ), $tag->name ) ),
-				__( 'Edit' )
+				esc_attr(sprintf(__('Edit &#8220;%s&#8221;'), $tag->name)),
+				__('Edit')
 			);
 			$actions['inline hide-if-no-js'] = sprintf(
 				'<a href="#" class="editinline aria-button-if-js" aria-label="%s">%s</a>',
 				/* translators: %s: taxonomy term name */
-				esc_attr( sprintf( __( 'Quick edit &#8220;%s&#8221; inline' ), $tag->name ) ),
-				__( 'Quick&nbsp;Edit' )
+				esc_attr(sprintf(__('Quick edit &#8220;%s&#8221; inline'), $tag->name)),
+				__('Quick&nbsp;Edit')
 			);
 		}
-		if ( current_user_can( $tax->cap->delete_terms ) && $tag->term_id != $default_term ) {
+		if (current_user_can($tax->cap->delete_terms) && $tag->term_id != $default_term) {
 			$actions['delete'] = sprintf(
 				'<a href="%s" class="delete-tag aria-button-if-js" aria-label="%s">%s</a>',
-				wp_nonce_url( "edit-tags.php?action=delete&amp;taxonomy=$taxonomy&amp;tag_ID=$tag->term_id", 'delete-tag_' . $tag->term_id ),
+				wp_nonce_url("edit-tags.php?action=delete&amp;taxonomy=$taxonomy&amp;tag_ID=$tag->term_id", 'delete-tag_'.$tag->term_id),
 				/* translators: %s: taxonomy term name */
-				esc_attr( sprintf( __( 'Delete &#8220;%s&#8221;' ), $tag->name ) ),
-				__( 'Delete' )
+				esc_attr(sprintf(__('Delete &#8220;%s&#8221;'), $tag->name)),
+				__('Delete')
 			);
 		}
-		if ( $tax->public ) {
+		if ($tax->public) {
 			$actions['view'] = sprintf(
 				'<a href="%s" aria-label="%s">%s</a>',
-				get_term_link( $tag ),
+				get_term_link($tag),
 				/* translators: %s: taxonomy term name */
-				esc_attr( sprintf( __( 'View &#8220;%s&#8221; archive' ), $tag->name ) ),
-				__( 'View' )
+				esc_attr(sprintf(__('View &#8220;%s&#8221; archive'), $tag->name)),
+				__('View')
 			);
 		}
 
@@ -478,7 +478,7 @@ 
 		 *                        'Edit', 'Quick Edit', 'Delete', and 'View'.
 		 * @param object $tag     Term object.
 		 */
-		$actions = apply_filters( 'tag_row_actions', $actions, $tag );
+		$actions = apply_filters('tag_row_actions', $actions, $tag);
 
 		/**
 		 * Filter the action links displayed for each term in the terms list table.
@@ -491,16 +491,16 @@ 
 		 *                        'Edit', 'Quick Edit', 'Delete', and 'View'.
 		 * @param object $tag     Term object.
 		 */
-		$actions = apply_filters( "{$taxonomy}_row_actions", $actions, $tag );
+		$actions = apply_filters("{$taxonomy}_row_actions", $actions, $tag);
 
-		return $this->row_actions( $actions );
+		return $this->row_actions($actions);
 	}
 
 	/**
 	 * @param object $tag
 	 * @return string
 	 */
-	public function column_description( $tag ) {
+	public function column_description($tag) {
 		return $tag->description;
 	}
 
@@ -508,46 +508,46 @@ 
 	 * @param object $tag
 	 * @return string
 	 */
-	public function column_slug( $tag ) {
+	public function column_slug($tag) {
 		/** This filter is documented in wp-admin/edit-tag-form.php */
-		return apply_filters( 'editable_slug', $tag->slug, $tag );
+		return apply_filters('editable_slug', $tag->slug, $tag);
 	}
 
 	/**
 	 * @param object $tag
 	 * @return string
 	 */
-	public function column_posts( $tag ) {
-		$count = number_format_i18n( $tag->count );
+	public function column_posts($tag) {
+		$count = number_format_i18n($tag->count);
 
-		$tax = get_taxonomy( $this->screen->taxonomy );
+		$tax = get_taxonomy($this->screen->taxonomy);
 
-		$ptype_object = get_post_type_object( $this->screen->post_type );
-		if ( ! $ptype_object->show_ui )
+		$ptype_object = get_post_type_object($this->screen->post_type);
+		if ( ! $ptype_object->show_ui)
 			return $count;
 
-		if ( $tax->query_var ) {
-			$args = array( $tax->query_var => $tag->slug );
+		if ($tax->query_var) {
+			$args = array($tax->query_var => $tag->slug);
 		} else {
-			$args = array( 'taxonomy' => $tax->name, 'term' => $tag->slug );
+			$args = array('taxonomy' => $tax->name, 'term' => $tag->slug);
 		}
 
-		if ( 'post' != $this->screen->post_type )
+		if ('post' != $this->screen->post_type)
 			$args['post_type'] = $this->screen->post_type;
 
-		if ( 'attachment' === $this->screen->post_type )
-			return "<a href='" . esc_url ( add_query_arg( $args, 'upload.php' ) ) . "'>$count</a>";
+		if ('attachment' === $this->screen->post_type)
+			return "<a href='".esc_url(add_query_arg($args, 'upload.php'))."'>$count</a>";
 
-		return "<a href='" . esc_url ( add_query_arg( $args, 'edit.php' ) ) . "'>$count</a>";
+		return "<a href='".esc_url(add_query_arg($args, 'edit.php'))."'>$count</a>";
 	}
 
 	/**
 	 * @param object $tag
 	 * @return string
 	 */
-	public function column_links( $tag ) {
-		$count = number_format_i18n( $tag->count );
-		if ( $count )
+	public function column_links($tag) {
+		$count = number_format_i18n($tag->count);
+		if ($count)
 			$count = "<a href='link-manager.php?cat_id=$tag->term_id'>$count</a>";
 		return $count;
 	}
@@ -557,7 +557,7 @@ 
 	 * @param string $column_name
 	 * @return string
 	 */
-	public function column_default( $tag, $column_name ) {
+	public function column_default($tag, $column_name) {
 		/**
 		 * Filter the displayed columns in the terms list table.
 		 *
@@ -570,7 +570,7 @@ 
 		 * @param string $column_name Name of the column.
 		 * @param int    $term_id     Term ID.
 		 */
-		return apply_filters( "manage_{$this->screen->taxonomy}_custom_column", '', $column_name, $tag->term_id );
+		return apply_filters("manage_{$this->screen->taxonomy}_custom_column", '', $column_name, $tag->term_id);
 	}
 
 	/**
@@ -579,9 +579,9 @@ 
 	 * @since 3.1.0
 	 */
 	public function inline_edit() {
-		$tax = get_taxonomy( $this->screen->taxonomy );
+		$tax = get_taxonomy($this->screen->taxonomy);
 
-		if ( ! current_user_can( $tax->cap->edit_terms ) )
+		if ( ! current_user_can($tax->cap->edit_terms))
 			return;
 ?>
 
@@ -589,43 +589,43 @@ 
 		<tr id="inline-edit" class="inline-edit-row" style="display: none"><td colspan="<?php echo $this->get_column_count(); ?>" class="colspanchange">
 
 			<fieldset>
-				<legend class="inline-edit-legend"><?php _e( 'Quick Edit' ); ?></legend>
+				<legend class="inline-edit-legend"><?php _e('Quick Edit'); ?></legend>
 				<div class="inline-edit-col">
 				<label>
-					<span class="title"><?php _ex( 'Name', 'term name' ); ?></span>
+					<span class="title"><?php _ex('Name', 'term name'); ?></span>
 					<span class="input-text-wrap"><input type="text" name="name" class="ptitle" value="" /></span>
 				</label>
-	<?php if ( !global_terms_enabled() ) { ?>
+	<?php if ( ! global_terms_enabled()) { ?>
 				<label>
-					<span class="title"><?php _e( 'Slug' ); ?></span>
+					<span class="title"><?php _e('Slug'); ?></span>
 					<span class="input-text-wrap"><input type="text" name="slug" class="ptitle" value="" /></span>
 				</label>
 	<?php } ?>
 			</div></fieldset>
 	<?php
 
-		$core_columns = array( 'cb' => true, 'description' => true, 'name' => true, 'slug' => true, 'posts' => true );
+		$core_columns = array('cb' => true, 'description' => true, 'name' => true, 'slug' => true, 'posts' => true);
 
-		list( $columns ) = $this->get_column_info();
+		list($columns) = $this->get_column_info();
 
-		foreach ( $columns as $column_name => $column_display_name ) {
-			if ( isset( $core_columns[$column_name] ) )
+		foreach ($columns as $column_name => $column_display_name) {
+			if (isset($core_columns[$column_name]))
 				continue;
 
 			/** This action is documented in wp-admin/includes/class-wp-posts-list-table.php */
-			do_action( 'quick_edit_custom_box', $column_name, 'edit-tags', $this->screen->taxonomy );
+			do_action('quick_edit_custom_box', $column_name, 'edit-tags', $this->screen->taxonomy);
 		}
 
 	?>
 
 		<p class="inline-edit-save submit">
-			<button type="button" class="cancel button-secondary alignleft"><?php _e( 'Cancel' ); ?></button>
+			<button type="button" class="cancel button-secondary alignleft"><?php _e('Cancel'); ?></button>
 			<button type="button" class="save button-primary alignright"><?php echo $tax->labels->update_item; ?></button>
 			<span class="spinner"></span>
 			<span class="error" style="display:none;"></span>
-			<?php wp_nonce_field( 'taxinlineeditnonce', '_inline_edit', false ); ?>
-			<input type="hidden" name="taxonomy" value="<?php echo esc_attr( $this->screen->taxonomy ); ?>" />
-			<input type="hidden" name="post_type" value="<?php echo esc_attr( $this->screen->post_type ); ?>" />
+			<?php wp_nonce_field('taxinlineeditnonce', '_inline_edit', false); ?>
+			<input type="hidden" name="taxonomy" value="<?php echo esc_attr($this->screen->taxonomy); ?>" />
+			<input type="hidden" name="post_type" value="<?php echo esc_attr($this->screen->post_type); ?>" />
 			<br class="clear" />
 		</p>
 		</td></tr>

Braces +52 added lines, -34 removed lines

@@ -49,17 +49,20 @@ 
 		$post_type = $this->screen->post_type;
 		$taxonomy  = $this->screen->taxonomy;
 
-		if ( empty( $taxonomy ) )
-			$taxonomy = 'post_tag';
+		if ( empty( $taxonomy ) ) {
+					$taxonomy = 'post_tag';
+		}
 
-		if ( ! taxonomy_exists( $taxonomy ) )
-			wp_die( __( 'Invalid taxonomy' ) );
+		if ( ! taxonomy_exists( $taxonomy ) ) {
+					wp_die( __( 'Invalid taxonomy' ) );
+		}
 
 		$tax = get_taxonomy( $taxonomy );
 
 		// @todo Still needed? Maybe just the show_ui part.
-		if ( empty( $post_type ) || !in_array( $post_type, get_post_types( array( 'show_ui' => true ) ) ) )
-			$post_type = 'post';
+		if ( empty( $post_type ) || !in_array( $post_type, get_post_types( array( 'show_ui' => true ) ) ) ) {
+					$post_type = 'post';
+		}
 
 	}
 
@@ -115,11 +118,13 @@ 
 			'number' => $tags_per_page,
 		);
 
-		if ( !empty( $_REQUEST['orderby'] ) )
-			$args['orderby'] = trim( wp_unslash( $_REQUEST['orderby'] ) );
+		if ( !empty( $_REQUEST['orderby'] ) ) {
+					$args['orderby'] = trim( wp_unslash( $_REQUEST['orderby'] ) );
+		}
 
-		if ( !empty( $_REQUEST['order'] ) )
-			$args['order'] = trim( wp_unslash( $_REQUEST['order'] ) );
+		if ( !empty( $_REQUEST['order'] ) ) {
+					$args['order'] = trim( wp_unslash( $_REQUEST['order'] ) );
+		}
 
 		$this->callback_args = $args;
 
@@ -161,8 +166,9 @@ 
 	 * @return string
 	 */
 	public function current_action() {
-		if ( isset( $_REQUEST['action'] ) && isset( $_REQUEST['delete_tags'] ) && ( 'delete' === $_REQUEST['action'] || 'delete' === $_REQUEST['action2'] ) )
-			return 'bulk-delete';
+		if ( isset( $_REQUEST['action'] ) && isset( $_REQUEST['delete_tags'] ) && ( 'delete' === $_REQUEST['action'] || 'delete' === $_REQUEST['action2'] ) ) {
+					return 'bulk-delete';
+		}
 
 		return parent::current_action();
 	}
@@ -269,11 +275,13 @@ 
 
 		foreach ( $terms as $key => $term ) {
 
-			if ( $count >= $end )
-				break;
+			if ( $count >= $end ) {
+							break;
+			}
 
-			if ( $term->parent != $parent && empty( $_REQUEST['s'] ) )
-				continue;
+			if ( $term->parent != $parent && empty( $_REQUEST['s'] ) ) {
+							continue;
+			}
 
 			// If the page starts in a subtree, print the parents.
 			if ( $count == $start && $term->parent > 0 && empty( $_REQUEST['s'] ) ) {
@@ -283,8 +291,10 @@ 
 					$my_parent = get_term( $p, $taxonomy );
 					$my_parents[] = $my_parent;
 					$p = $my_parent->parent;
-					if ( in_array( $p, $parent_ids ) ) // Prevent parent loops.
+					if ( in_array( $p, $parent_ids ) ) {
+						// Prevent parent loops.
 						break;
+					}
 					$parent_ids[] = $p;
 				}
 				unset( $parent_ids );
@@ -306,8 +316,9 @@ 
 
 			unset( $terms[$key] );
 
-			if ( isset( $children[$term->term_id] ) && empty( $_REQUEST['s'] ) )
-				$this->_rows( $taxonomy, $terms, $children, $start, $per_page, $count, $term->term_id, $level + 1 );
+			if ( isset( $children[$term->term_id] ) && empty( $_REQUEST['s'] ) ) {
+							$this->_rows( $taxonomy, $terms, $children, $start, $per_page, $count, $term->term_id, $level + 1 );
+			}
 		}
 	}
 
@@ -334,9 +345,10 @@ 
 	public function column_cb( $tag ) {
 		$default_term = get_option( 'default_' . $this->screen->taxonomy );
 
-		if ( current_user_can( get_taxonomy( $this->screen->taxonomy )->cap->delete_terms ) && $tag->term_id != $default_term )
-			return '<label class="screen-reader-text" for="cb-select-' . $tag->term_id . '">' . sprintf( __( 'Select %s' ), $tag->name ) . '</label>'
+		if ( current_user_can( get_taxonomy( $this->screen->taxonomy )->cap->delete_terms ) && $tag->term_id != $default_term ) {
+					return '<label class="screen-reader-text" for="cb-select-' . $tag->term_id . '">' . sprintf( __( 'Select %s' ), $tag->name ) . '</label>'
 				. '<input type="checkbox" name="delete_tags[]" value="' . $tag->term_id . '" id="cb-select-' . $tag->term_id . '" />';
+		}
 
 		return '&nbsp;';
 	}
@@ -523,8 +535,9 @@ 
 		$tax = get_taxonomy( $this->screen->taxonomy );
 
 		$ptype_object = get_post_type_object( $this->screen->post_type );
-		if ( ! $ptype_object->show_ui )
-			return $count;
+		if ( ! $ptype_object->show_ui ) {
+					return $count;
+		}
 
 		if ( $tax->query_var ) {
 			$args = array( $tax->query_var => $tag->slug );
@@ -532,11 +545,13 @@ 
 			$args = array( 'taxonomy' => $tax->name, 'term' => $tag->slug );
 		}
 
-		if ( 'post' != $this->screen->post_type )
-			$args['post_type'] = $this->screen->post_type;
+		if ( 'post' != $this->screen->post_type ) {
+					$args['post_type'] = $this->screen->post_type;
+		}
 
-		if ( 'attachment' === $this->screen->post_type )
-			return "<a href='" . esc_url ( add_query_arg( $args, 'upload.php' ) ) . "'>$count</a>";
+		if ( 'attachment' === $this->screen->post_type ) {
+					return "<a href='" . esc_url ( add_query_arg( $args, 'upload.php' ) ) . "'>$count</a>";
+		}
 
 		return "<a href='" . esc_url ( add_query_arg( $args, 'edit.php' ) ) . "'>$count</a>";
 	}
@@ -547,8 +562,9 @@ 
 	 */
 	public function column_links( $tag ) {
 		$count = number_format_i18n( $tag->count );
-		if ( $count )
-			$count = "<a href='link-manager.php?cat_id=$tag->term_id'>$count</a>";
+		if ( $count ) {
+					$count = "<a href='link-manager.php?cat_id=$tag->term_id'>$count</a>";
+		}
 		return $count;
 	}
 
@@ -581,9 +597,10 @@ 
 	public function inline_edit() {
 		$tax = get_taxonomy( $this->screen->taxonomy );
 
-		if ( ! current_user_can( $tax->cap->edit_terms ) )
-			return;
-?>
+		if ( ! current_user_can( $tax->cap->edit_terms ) ) {
+					return;
+		}
+		?>
 
 	<form method="get"><table style="display: none"><tbody id="inlineedit">
 		<tr id="inline-edit" class="inline-edit-row" style="display: none"><td colspan="<?php echo $this->get_column_count(); ?>" class="colspanchange">
@@ -609,8 +626,9 @@ 
 		list( $columns ) = $this->get_column_info();
 
 		foreach ( $columns as $column_name => $column_display_name ) {
-			if ( isset( $core_columns[$column_name] ) )
-				continue;
+			if ( isset( $core_columns[$column_name] ) ) {
+							continue;
+			}
 
 			/** This action is documented in wp-admin/includes/class-wp-posts-list-table.php */
 			do_action( 'quick_edit_custom_box', $column_name, 'edit-tags', $this->screen->taxonomy );

src/wp-admin/includes/ajax-actions.php

Spacing +1046 added lines, -1046 removed lines

@@ -23,13 +23,13 @@ 
 	$response = array();
 
 	// screen_id is the same as $current_screen->id and the JS global 'pagenow'.
-	if ( ! empty($_POST['screen_id']) )
+	if ( ! empty($_POST['screen_id']))
 		$screen_id = sanitize_key($_POST['screen_id']);
 	else
 		$screen_id = 'front';
 
-	if ( ! empty($_POST['data']) ) {
-		$data = wp_unslash( (array) $_POST['data'] );
+	if ( ! empty($_POST['data'])) {
+		$data = wp_unslash((array) $_POST['data']);
 
 		/**
 		 * Filter Heartbeat AJAX response in no-privilege environments.
@@ -40,7 +40,7 @@ 
 		 * @param array        $data      An array of data passed via $_POST.
 		 * @param string       $screen_id The screen id.
 		 */
-		$response = apply_filters( 'heartbeat_nopriv_received', $response, $data, $screen_id );
+		$response = apply_filters('heartbeat_nopriv_received', $response, $data, $screen_id);
 	}
 
 	/**
@@ -51,7 +51,7 @@ 
 	 * @param array|object $response  The Heartbeat response object or array.
 	 * @param string       $screen_id The screen id.
 	 */
-	$response = apply_filters( 'heartbeat_nopriv_send', $response, $screen_id );
+	$response = apply_filters('heartbeat_nopriv_send', $response, $screen_id);
 
 	/**
 	 * Fires when Heartbeat ticks in no-privilege environments.
@@ -63,7 +63,7 @@ 
 	 * @param array|object $response  The no-priv Heartbeat response.
 	 * @param string       $screen_id The screen id.
 	 */
-	do_action( 'heartbeat_nopriv_tick', $response, $screen_id );
+	do_action('heartbeat_nopriv_tick', $response, $screen_id);
 
 	// Send the current time according to the server.
 	$response['server_time'] = time();
@@ -86,18 +86,18 @@ 
 	global $wp_list_table;
 
 	$list_class = $_GET['list_args']['class'];
-	check_ajax_referer( "fetch-list-$list_class", '_ajax_fetch_list_nonce' );
+	check_ajax_referer("fetch-list-$list_class", '_ajax_fetch_list_nonce');
 
-	$wp_list_table = _get_list_table( $list_class, array( 'screen' => $_GET['list_args']['screen']['id'] ) );
-	if ( ! $wp_list_table )
-		wp_die( 0 );
+	$wp_list_table = _get_list_table($list_class, array('screen' => $_GET['list_args']['screen']['id']));
+	if ( ! $wp_list_table)
+		wp_die(0);
 
-	if ( ! $wp_list_table->ajax_user_can() )
+	if ( ! $wp_list_table->ajax_user_can())
 		wp_die( -1 );
 
 	$wp_list_table->ajax_response();
 
-	wp_die( 0 );
+	wp_die(0);
 }
 
 /**
@@ -106,30 +106,30 @@ 
  * @since 3.1.0
  */
 function wp_ajax_ajax_tag_search() {
-	if ( ! isset( $_GET['tax'] ) ) {
-		wp_die( 0 );
+	if ( ! isset($_GET['tax'])) {
+		wp_die(0);
 	}
 
-	$taxonomy = sanitize_key( $_GET['tax'] );
-	$tax = get_taxonomy( $taxonomy );
-	if ( ! $tax ) {
-		wp_die( 0 );
+	$taxonomy = sanitize_key($_GET['tax']);
+	$tax = get_taxonomy($taxonomy);
+	if ( ! $tax) {
+		wp_die(0);
 	}
 
-	if ( ! current_user_can( $tax->cap->assign_terms ) ) {
+	if ( ! current_user_can($tax->cap->assign_terms)) {
 		wp_die( -1 );
 	}
 
-	$s = wp_unslash( $_GET['q'] );
+	$s = wp_unslash($_GET['q']);
 
-	$comma = _x( ',', 'tag delimiter' );
-	if ( ',' !== $comma )
-		$s = str_replace( $comma, ',', $s );
-	if ( false !== strpos( $s, ',' ) ) {
-		$s = explode( ',', $s );
-		$s = $s[count( $s ) - 1];
+	$comma = _x(',', 'tag delimiter');
+	if (',' !== $comma)
+		$s = str_replace($comma, ',', $s);
+	if (false !== strpos($s, ',')) {
+		$s = explode(',', $s);
+		$s = $s[count($s) - 1];
 	}
-	$s = trim( $s );
+	$s = trim($s);
 
 	/**
 	 * Filter the minimum number of characters required to fire a tag search via AJAX.
@@ -140,19 +140,19 @@ 
 	 * @param object $tax        The taxonomy object.
 	 * @param string $s          The search term.
 	 */
-	$term_search_min_chars = (int) apply_filters( 'term_search_min_chars', 2, $tax, $s );
+	$term_search_min_chars = (int) apply_filters('term_search_min_chars', 2, $tax, $s);
 
 	/*
 	 * Require $term_search_min_chars chars for matching (default: 2)
 	 * ensure it's a non-negative, non-zero integer.
 	 */
-	if ( ( $term_search_min_chars == 0 ) || ( strlen( $s ) < $term_search_min_chars ) ){
+	if (($term_search_min_chars == 0) || (strlen($s) < $term_search_min_chars)) {
 		wp_die();
 	}
 
-	$results = get_terms( $taxonomy, array( 'name__like' => $s, 'fields' => 'names', 'hide_empty' => false ) );
+	$results = get_terms($taxonomy, array('name__like' => $s, 'fields' => 'names', 'hide_empty' => false));
 
-	echo join( $results, "\n" );
+	echo join($results, "\n");
 	wp_die();
 }
 
@@ -162,48 +162,48 @@ 
  * @since 3.1.0
  */
 function wp_ajax_wp_compression_test() {
-	if ( !current_user_can( 'manage_options' ) )
+	if ( ! current_user_can('manage_options'))
 		wp_die( -1 );
 
-	if ( ini_get('zlib.output_compression') || 'ob_gzhandler' == ini_get('output_handler') ) {
+	if (ini_get('zlib.output_compression') || 'ob_gzhandler' == ini_get('output_handler')) {
 		update_site_option('can_compress_scripts', 0);
-		wp_die( 0 );
+		wp_die(0);
 	}
 
-	if ( isset($_GET['test']) ) {
-		header( 'Expires: Wed, 11 Jan 1984 05:00:00 GMT' );
-		header( 'Last-Modified: ' . gmdate( 'D, d M Y H:i:s' ) . ' GMT' );
-		header( 'Cache-Control: no-cache, must-revalidate, max-age=0' );
-		header( 'Pragma: no-cache' );
+	if (isset($_GET['test'])) {
+		header('Expires: Wed, 11 Jan 1984 05:00:00 GMT');
+		header('Last-Modified: '.gmdate('D, d M Y H:i:s').' GMT');
+		header('Cache-Control: no-cache, must-revalidate, max-age=0');
+		header('Pragma: no-cache');
 		header('Content-Type: application/javascript; charset=UTF-8');
-		$force_gzip = ( defined('ENFORCE_GZIP') && ENFORCE_GZIP );
+		$force_gzip = (defined('ENFORCE_GZIP') && ENFORCE_GZIP);
 		$test_str = '"wpCompressionTest Lorem ipsum dolor sit amet consectetuer mollis sapien urna ut a. Eu nonummy condimentum fringilla tempor pretium platea vel nibh netus Maecenas. Hac molestie amet justo quis pellentesque est ultrices interdum nibh Morbi. Cras mattis pretium Phasellus ante ipsum ipsum ut sociis Suspendisse Lorem. Ante et non molestie. Porta urna Vestibulum egestas id congue nibh eu risus gravida sit. Ac augue auctor Ut et non a elit massa id sodales. Elit eu Nulla at nibh adipiscing mattis lacus mauris at tempus. Netus nibh quis suscipit nec feugiat eget sed lorem et urna. Pellentesque lacus at ut massa consectetuer ligula ut auctor semper Pellentesque. Ut metus massa nibh quam Curabitur molestie nec mauris congue. Volutpat molestie elit justo facilisis neque ac risus Ut nascetur tristique. Vitae sit lorem tellus et quis Phasellus lacus tincidunt nunc Fusce. Pharetra wisi Suspendisse mus sagittis libero lacinia Integer consequat ac Phasellus. Et urna ac cursus tortor aliquam Aliquam amet tellus volutpat Vestibulum. Justo interdum condimentum In augue congue tellus sollicitudin Quisque quis nibh."';
 
-		 if ( 1 == $_GET['test'] ) {
+		 if (1 == $_GET['test']) {
 		 	echo $test_str;
 		 	wp_die();
-		 } elseif ( 2 == $_GET['test'] ) {
-			if ( !isset($_SERVER['HTTP_ACCEPT_ENCODING']) )
+		 } elseif (2 == $_GET['test']) {
+			if ( ! isset($_SERVER['HTTP_ACCEPT_ENCODING']))
 				wp_die( -1 );
-			if ( false !== stripos( $_SERVER['HTTP_ACCEPT_ENCODING'], 'deflate') && function_exists('gzdeflate') && ! $force_gzip ) {
+			if (false !== stripos($_SERVER['HTTP_ACCEPT_ENCODING'], 'deflate') && function_exists('gzdeflate') && ! $force_gzip) {
 				header('Content-Encoding: deflate');
-				$out = gzdeflate( $test_str, 1 );
-			} elseif ( false !== stripos( $_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') && function_exists('gzencode') ) {
+				$out = gzdeflate($test_str, 1);
+			} elseif (false !== stripos($_SERVER['HTTP_ACCEPT_ENCODING'], 'gzip') && function_exists('gzencode')) {
 				header('Content-Encoding: gzip');
-				$out = gzencode( $test_str, 1 );
+				$out = gzencode($test_str, 1);
 			} else {
 				wp_die( -1 );
 			}
 			echo $out;
 			wp_die();
-		} elseif ( 'no' == $_GET['test'] ) {
+		} elseif ('no' == $_GET['test']) {
 			update_site_option('can_compress_scripts', 0);
-		} elseif ( 'yes' == $_GET['test'] ) {
+		} elseif ('yes' == $_GET['test']) {
 			update_site_option('can_compress_scripts', 1);
 		}
 	}
 
-	wp_die( 0 );
+	wp_die(0);
 }
 
 /**
@@ -213,13 +213,13 @@ 
  */
 function wp_ajax_imgedit_preview() {
 	$post_id = intval($_GET['postid']);
-	if ( empty($post_id) || !current_user_can('edit_post', $post_id) )
+	if (empty($post_id) || ! current_user_can('edit_post', $post_id))
 		wp_die( -1 );
 
-	check_ajax_referer( "image_editor-$post_id" );
+	check_ajax_referer("image_editor-$post_id");
 
-	include_once( ABSPATH . 'wp-admin/includes/image-edit.php' );
-	if ( ! stream_preview_image($post_id) )
+	include_once(ABSPATH.'wp-admin/includes/image-edit.php');
+	if ( ! stream_preview_image($post_id))
 		wp_die( -1 );
 
 	wp_die();
@@ -233,8 +233,8 @@ 
  * @global WP_Embed $wp_embed
  */
 function wp_ajax_oembed_cache() {
-	$GLOBALS['wp_embed']->cache_oembed( $_GET['post'] );
-	wp_die( 0 );
+	$GLOBALS['wp_embed']->cache_oembed($_GET['post']);
+	wp_die(0);
 }
 
 /**
@@ -243,18 +243,18 @@ 
  * @since 3.4.0
  */
 function wp_ajax_autocomplete_user() {
-	if ( ! is_multisite() || ! current_user_can( 'promote_users' ) || wp_is_large_network( 'users' ) )
+	if ( ! is_multisite() || ! current_user_can('promote_users') || wp_is_large_network('users'))
 		wp_die( -1 );
 
 	/** This filter is documented in wp-admin/user-new.php */
-	if ( ! is_super_admin() && ! apply_filters( 'autocomplete_users_for_site_admins', false ) )
+	if ( ! is_super_admin() && ! apply_filters('autocomplete_users_for_site_admins', false))
 		wp_die( -1 );
 
 	$return = array();
 
 	// Check the type of request
 	// Current allowed values are `add` and `search`
-	if ( isset( $_REQUEST['autocomplete_type'] ) && 'search' === $_REQUEST['autocomplete_type'] ) {
+	if (isset($_REQUEST['autocomplete_type']) && 'search' === $_REQUEST['autocomplete_type']) {
 		$type = $_REQUEST['autocomplete_type'];
 	} else {
 		$type = 'add';
@@ -262,39 +262,39 @@ 
 
 	// Check the desired field for value
 	// Current allowed values are `user_email` and `user_login`
-	if ( isset( $_REQUEST['autocomplete_field'] ) && 'user_email' === $_REQUEST['autocomplete_field'] ) {
+	if (isset($_REQUEST['autocomplete_field']) && 'user_email' === $_REQUEST['autocomplete_field']) {
 		$field = $_REQUEST['autocomplete_field'];
 	} else {
 		$field = 'user_login';
 	}
 
 	// Exclude current users of this blog
-	if ( isset( $_REQUEST['site_id'] ) ) {
-		$id = absint( $_REQUEST['site_id'] );
+	if (isset($_REQUEST['site_id'])) {
+		$id = absint($_REQUEST['site_id']);
 	} else {
 		$id = get_current_blog_id();
 	}
 
-	$include_blog_users = ( $type == 'search' ? get_users( array( 'blog_id' => $id, 'fields' => 'ID' ) ) : array() );
-	$exclude_blog_users = ( $type == 'add' ? get_users( array( 'blog_id' => $id, 'fields' => 'ID' ) ) : array() );
+	$include_blog_users = ($type == 'search' ? get_users(array('blog_id' => $id, 'fields' => 'ID')) : array());
+	$exclude_blog_users = ($type == 'add' ? get_users(array('blog_id' => $id, 'fields' => 'ID')) : array());
 
-	$users = get_users( array(
+	$users = get_users(array(
 		'blog_id' => false,
-		'search'  => '*' . $_REQUEST['term'] . '*',
+		'search'  => '*'.$_REQUEST['term'].'*',
 		'include' => $include_blog_users,
 		'exclude' => $exclude_blog_users,
-		'search_columns' => array( 'user_login', 'user_nicename', 'user_email' ),
-	) );
+		'search_columns' => array('user_login', 'user_nicename', 'user_email'),
+	));
 
-	foreach ( $users as $user ) {
+	foreach ($users as $user) {
 		$return[] = array(
 			/* translators: 1: user_login, 2: user_email */
-			'label' => sprintf( _x( '%1$s (%2$s)', 'user autocomplete result' ), $user->user_login, $user->user_email ),
+			'label' => sprintf(_x('%1$s (%2$s)', 'user autocomplete result'), $user->user_login, $user->user_email),
 			'value' => $user->$field,
 		);
 	}
 
-	wp_die( wp_json_encode( $return ) );
+	wp_die(wp_json_encode($return));
 }
 
 /**
@@ -303,14 +303,14 @@ 
  * @since 3.4.0
  */
 function wp_ajax_dashboard_widgets() {
-	require_once ABSPATH . 'wp-admin/includes/dashboard.php';
+	require_once ABSPATH.'wp-admin/includes/dashboard.php';
 
 	$pagenow = $_GET['pagenow'];
-	if ( $pagenow === 'dashboard-user' || $pagenow === 'dashboard-network' || $pagenow === 'dashboard' ) {
-		set_current_screen( $pagenow );
+	if ($pagenow === 'dashboard-user' || $pagenow === 'dashboard-network' || $pagenow === 'dashboard') {
+		set_current_screen($pagenow);
 	}
 
-	switch ( $_GET['widget'] ) {
+	switch ($_GET['widget']) {
 		case 'dashboard_primary' :
 			wp_dashboard_primary();
 			break;
@@ -324,7 +324,7 @@ 
  * @since 3.4.0
  */
 function wp_ajax_logged_in() {
-	wp_die( 1 );
+	wp_die(1);
 }
 
 //
@@ -342,20 +342,20 @@ 
  * @param int $comment_id
  * @param int $delta
  */
-function _wp_ajax_delete_comment_response( $comment_id, $delta = -1 ) {
-	$total    = isset( $_POST['_total'] )    ? (int) $_POST['_total']    : 0;
-	$per_page = isset( $_POST['_per_page'] ) ? (int) $_POST['_per_page'] : 0;
-	$page     = isset( $_POST['_page'] )     ? (int) $_POST['_page']     : 0;
-	$url      = isset( $_POST['_url'] )      ? esc_url_raw( $_POST['_url'] ) : '';
+function _wp_ajax_delete_comment_response($comment_id, $delta = -1) {
+	$total    = isset($_POST['_total']) ? (int) $_POST['_total'] : 0;
+	$per_page = isset($_POST['_per_page']) ? (int) $_POST['_per_page'] : 0;
+	$page     = isset($_POST['_page']) ? (int) $_POST['_page'] : 0;
+	$url      = isset($_POST['_url']) ? esc_url_raw($_POST['_url']) : '';
 
 	// JS didn't send us everything we need to know. Just die with success message
-	if ( ! $total || ! $per_page || ! $page || ! $url ) {
+	if ( ! $total || ! $per_page || ! $page || ! $url) {
 		$time = time();
-		$comment = get_comment( $comment_id );
+		$comment = get_comment($comment_id);
 
 		$counts = wp_count_comments();
 
-		$x = new WP_Ajax_Response( array(
+		$x = new WP_Ajax_Response(array(
 			'what' => 'comment',
 			// Here for completeness - not used.
 			'id' => $comment_id,
@@ -365,62 +365,62 @@ 
 				'time' => $time,
 				'in_moderation' => $counts->moderated,
 				'i18n_comments_text' => sprintf(
-					_n( '%s Comment', '%s Comments', $counts->approved ),
-					number_format_i18n( $counts->approved )
+					_n('%s Comment', '%s Comments', $counts->approved),
+					number_format_i18n($counts->approved)
 				),
 				'i18n_moderation_text' => sprintf(
-					_nx( '%s in moderation', '%s in moderation', $counts->moderated, 'comments' ),
-					number_format_i18n( $counts->moderated )
+					_nx('%s in moderation', '%s in moderation', $counts->moderated, 'comments'),
+					number_format_i18n($counts->moderated)
 				)
 			)
-		) );
+		));
 		$x->send();
 	}
 
 	$total += $delta;
-	if ( $total < 0 )
+	if ($total < 0)
 		$total = 0;
 
 	// Only do the expensive stuff on a page-break, and about 1 other time per page
-	if ( 0 == $total % $per_page || 1 == mt_rand( 1, $per_page ) ) {
+	if (0 == $total % $per_page || 1 == mt_rand(1, $per_page)) {
 		$post_id = 0;
 		// What type of comment count are we looking for?
 		$status = 'all';
-		$parsed = parse_url( $url );
-		if ( isset( $parsed['query'] ) ) {
-			parse_str( $parsed['query'], $query_vars );
-			if ( !empty( $query_vars['comment_status'] ) )
+		$parsed = parse_url($url);
+		if (isset($parsed['query'])) {
+			parse_str($parsed['query'], $query_vars);
+			if ( ! empty($query_vars['comment_status']))
 				$status = $query_vars['comment_status'];
-			if ( !empty( $query_vars['p'] ) )
+			if ( ! empty($query_vars['p']))
 				$post_id = (int) $query_vars['p'];
 		}
 
 		$comment_count = wp_count_comments($post_id);
 
 		// We're looking for a known type of comment count.
-		if ( isset( $comment_count->$status ) )
+		if (isset($comment_count->$status))
 			$total = $comment_count->$status;
 			// Else use the decremented value from above.
 	}
 
 	// The time since the last comment count.
 	$time = time();
-	$comment = get_comment( $comment_id );
+	$comment = get_comment($comment_id);
 
-	$x = new WP_Ajax_Response( array(
+	$x = new WP_Ajax_Response(array(
 		'what' => 'comment',
 		// Here for completeness - not used.
 		'id' => $comment_id,
 		'supplemental' => array(
 			'status' => $comment ? $comment->comment_approved : '',
 			'postId' => $comment ? $comment->comment_post_ID : '',
-			'total_items_i18n' => sprintf( _n( '%s item', '%s items', $total ), number_format_i18n( $total ) ),
-			'total_pages' => ceil( $total / $per_page ),
-			'total_pages_i18n' => number_format_i18n( ceil( $total / $per_page ) ),
+			'total_items_i18n' => sprintf(_n('%s item', '%s items', $total), number_format_i18n($total)),
+			'total_pages' => ceil($total / $per_page),
+			'total_pages_i18n' => number_format_i18n(ceil($total / $per_page)),
 			'total' => $total,
 			'time' => $time
 		)
-	) );
+	));
 	$x->send();
 }
 
@@ -437,87 +437,87 @@ 
 function _wp_ajax_add_hierarchical_term() {
 	$action = $_POST['action'];
 	$taxonomy = get_taxonomy(substr($action, 4));
-	check_ajax_referer( $action, '_ajax_nonce-add-' . $taxonomy->name );
-	if ( !current_user_can( $taxonomy->cap->edit_terms ) )
+	check_ajax_referer($action, '_ajax_nonce-add-'.$taxonomy->name);
+	if ( ! current_user_can($taxonomy->cap->edit_terms))
 		wp_die( -1 );
 	$names = explode(',', $_POST['new'.$taxonomy->name]);
 	$parent = isset($_POST['new'.$taxonomy->name.'_parent']) ? (int) $_POST['new'.$taxonomy->name.'_parent'] : 0;
-	if ( 0 > $parent )
+	if (0 > $parent)
 		$parent = 0;
-	if ( $taxonomy->name == 'category' )
+	if ($taxonomy->name == 'category')
 		$post_category = isset($_POST['post_category']) ? (array) $_POST['post_category'] : array();
 	else
-		$post_category = ( isset($_POST['tax_input']) && isset($_POST['tax_input'][$taxonomy->name]) ) ? (array) $_POST['tax_input'][$taxonomy->name] : array();
-	$checked_categories = array_map( 'absint', (array) $post_category );
+		$post_category = (isset($_POST['tax_input']) && isset($_POST['tax_input'][$taxonomy->name])) ? (array) $_POST['tax_input'][$taxonomy->name] : array();
+	$checked_categories = array_map('absint', (array) $post_category);
 	$popular_ids = wp_popular_terms_checklist($taxonomy->name, 0, 10, false);
 
-	foreach ( $names as $cat_name ) {
+	foreach ($names as $cat_name) {
 		$cat_name = trim($cat_name);
 		$category_nicename = sanitize_title($cat_name);
-		if ( '' === $category_nicename )
+		if ('' === $category_nicename)
 			continue;
-		if ( !$cat_id = term_exists( $cat_name, $taxonomy->name, $parent ) )
-			$cat_id = wp_insert_term( $cat_name, $taxonomy->name, array( 'parent' => $parent ) );
-		if ( is_wp_error( $cat_id ) ) {
+		if ( ! $cat_id = term_exists($cat_name, $taxonomy->name, $parent))
+			$cat_id = wp_insert_term($cat_name, $taxonomy->name, array('parent' => $parent));
+		if (is_wp_error($cat_id)) {
 			continue;
-		} elseif ( is_array( $cat_id ) ) {
+		} elseif (is_array($cat_id)) {
 			$cat_id = $cat_id['term_id'];
 		}
 		$checked_categories[] = $cat_id;
-		if ( $parent ) // Do these all at once in a second
+		if ($parent) // Do these all at once in a second
 			continue;
 
 		ob_start();
 
-		wp_terms_checklist( 0, array( 'taxonomy' => $taxonomy->name, 'descendants_and_self' => $cat_id, 'selected_cats' => $checked_categories, 'popular_cats' => $popular_ids ));
+		wp_terms_checklist(0, array('taxonomy' => $taxonomy->name, 'descendants_and_self' => $cat_id, 'selected_cats' => $checked_categories, 'popular_cats' => $popular_ids));
 
 		$data = ob_get_clean();
 
 		$add = array(
 			'what' => $taxonomy->name,
 			'id' => $cat_id,
-			'data' => str_replace( array("\n", "\t"), '', $data),
+			'data' => str_replace(array("\n", "\t"), '', $data),
 			'position' => -1
 		);
 	}
 
-	if ( $parent ) { // Foncy - replace the parent and all its children
-		$parent = get_term( $parent, $taxonomy->name );
+	if ($parent) { // Foncy - replace the parent and all its children
+		$parent = get_term($parent, $taxonomy->name);
 		$term_id = $parent->term_id;
 
-		while ( $parent->parent ) { // get the top parent
-			$parent = get_term( $parent->parent, $taxonomy->name );
-			if ( is_wp_error( $parent ) )
+		while ($parent->parent) { // get the top parent
+			$parent = get_term($parent->parent, $taxonomy->name);
+			if (is_wp_error($parent))
 				break;
 			$term_id = $parent->term_id;
 		}
 
 		ob_start();
 
-		wp_terms_checklist( 0, array('taxonomy' => $taxonomy->name, 'descendants_and_self' => $term_id, 'selected_cats' => $checked_categories, 'popular_cats' => $popular_ids));
+		wp_terms_checklist(0, array('taxonomy' => $taxonomy->name, 'descendants_and_self' => $term_id, 'selected_cats' => $checked_categories, 'popular_cats' => $popular_ids));
 
 		$data = ob_get_clean();
 
 		$add = array(
 			'what' => $taxonomy->name,
 			'id' => $term_id,
-			'data' => str_replace( array("\n", "\t"), '', $data),
+			'data' => str_replace(array("\n", "\t"), '', $data),
 			'position' => -1
 		);
 	}
 
 	ob_start();
 
-	wp_dropdown_categories( array(
+	wp_dropdown_categories(array(
 		'taxonomy' => $taxonomy->name, 'hide_empty' => 0, 'name' => 'new'.$taxonomy->name.'_parent', 'orderby' => 'name',
 		'hierarchical' => 1, 'show_option_none' => '&mdash; '.$taxonomy->labels->parent_item.' &mdash;'
-	) );
+	));
 
 	$sup = ob_get_clean();
 
-	$add['supplemental'] = array( 'newcat_parent' => $sup );
+	$add['supplemental'] = array('newcat_parent' => $sup);
 
-	$x = new WP_Ajax_Response( $add );
+	$x = new WP_Ajax_Response($add);
 	$x->send();
 }
 
@@ -527,46 +527,46 @@ 
  * @since 3.1.0
  */
 function wp_ajax_delete_comment() {
-	$id = isset( $_POST['id'] ) ? (int) $_POST['id'] : 0;
+	$id = isset($_POST['id']) ? (int) $_POST['id'] : 0;
 
-	if ( !$comment = get_comment( $id ) )
-		wp_die( time() );
-	if ( ! current_user_can( 'edit_comment', $comment->comment_ID ) )
+	if ( ! $comment = get_comment($id))
+		wp_die(time());
+	if ( ! current_user_can('edit_comment', $comment->comment_ID))
 		wp_die( -1 );
 
-	check_ajax_referer( "delete-comment_$id" );
-	$status = wp_get_comment_status( $comment );
+	check_ajax_referer("delete-comment_$id");
+	$status = wp_get_comment_status($comment);
 
 	$delta = -1;
-	if ( isset($_POST['trash']) && 1 == $_POST['trash'] ) {
-		if ( 'trash' == $status )
-			wp_die( time() );
-		$r = wp_trash_comment( $comment );
-	} elseif ( isset($_POST['untrash']) && 1 == $_POST['untrash'] ) {
-		if ( 'trash' != $status )
-			wp_die( time() );
-		$r = wp_untrash_comment( $comment );
-		if ( ! isset( $_POST['comment_status'] ) || $_POST['comment_status'] != 'trash' ) // undo trash, not in trash
+	if (isset($_POST['trash']) && 1 == $_POST['trash']) {
+		if ('trash' == $status)
+			wp_die(time());
+		$r = wp_trash_comment($comment);
+	} elseif (isset($_POST['untrash']) && 1 == $_POST['untrash']) {
+		if ('trash' != $status)
+			wp_die(time());
+		$r = wp_untrash_comment($comment);
+		if ( ! isset($_POST['comment_status']) || $_POST['comment_status'] != 'trash') // undo trash, not in trash
 			$delta = 1;
-	} elseif ( isset($_POST['spam']) && 1 == $_POST['spam'] ) {
-		if ( 'spam' == $status )
-			wp_die( time() );
-		$r = wp_spam_comment( $comment );
-	} elseif ( isset($_POST['unspam']) && 1 == $_POST['unspam'] ) {
-		if ( 'spam' != $status )
-			wp_die( time() );
-		$r = wp_unspam_comment( $comment );
-		if ( ! isset( $_POST['comment_status'] ) || $_POST['comment_status'] != 'spam' ) // undo spam, not in spam
+	} elseif (isset($_POST['spam']) && 1 == $_POST['spam']) {
+		if ('spam' == $status)
+			wp_die(time());
+		$r = wp_spam_comment($comment);
+	} elseif (isset($_POST['unspam']) && 1 == $_POST['unspam']) {
+		if ('spam' != $status)
+			wp_die(time());
+		$r = wp_unspam_comment($comment);
+		if ( ! isset($_POST['comment_status']) || $_POST['comment_status'] != 'spam') // undo spam, not in spam
 			$delta = 1;
-	} elseif ( isset($_POST['delete']) && 1 == $_POST['delete'] ) {
-		$r = wp_delete_comment( $comment );
+	} elseif (isset($_POST['delete']) && 1 == $_POST['delete']) {
+		$r = wp_delete_comment($comment);
 	} else {
 		wp_die( -1 );
 	}
 
-	if ( $r ) // Decide if we need to send back '1' or a more complicated response including page links and comment counts
-		_wp_ajax_delete_comment_response( $comment->comment_ID, $delta );
-	wp_die( 0 );
+	if ($r) // Decide if we need to send back '1' or a more complicated response including page links and comment counts
+		_wp_ajax_delete_comment_response($comment->comment_ID, $delta);
+	wp_die(0);
 }
 
 /**
@@ -576,22 +576,22 @@ 
  */
 function wp_ajax_delete_tag() {
 	$tag_id = (int) $_POST['tag_ID'];
-	check_ajax_referer( "delete-tag_$tag_id" );
+	check_ajax_referer("delete-tag_$tag_id");
 
-	$taxonomy = !empty($_POST['taxonomy']) ? $_POST['taxonomy'] : 'post_tag';
+	$taxonomy = ! empty($_POST['taxonomy']) ? $_POST['taxonomy'] : 'post_tag';
 	$tax = get_taxonomy($taxonomy);
 
-	if ( !current_user_can( $tax->cap->delete_terms ) )
+	if ( ! current_user_can($tax->cap->delete_terms))
 		wp_die( -1 );
 
-	$tag = get_term( $tag_id, $taxonomy );
-	if ( !$tag || is_wp_error( $tag ) )
-		wp_die( 1 );
+	$tag = get_term($tag_id, $taxonomy);
+	if ( ! $tag || is_wp_error($tag))
+		wp_die(1);
 
-	if ( wp_delete_term($tag_id, $taxonomy))
-		wp_die( 1 );
+	if (wp_delete_term($tag_id, $taxonomy))
+		wp_die(1);
 	else
-		wp_die( 0 );
+		wp_die(0);
 }
 
 /**
@@ -600,20 +600,20 @@ 
  * @since 3.1.0
  */
 function wp_ajax_delete_link() {
-	$id = isset( $_POST['id'] ) ? (int) $_POST['id'] : 0;
+	$id = isset($_POST['id']) ? (int) $_POST['id'] : 0;
 
-	check_ajax_referer( "delete-bookmark_$id" );
-	if ( !current_user_can( 'manage_links' ) )
+	check_ajax_referer("delete-bookmark_$id");
+	if ( ! current_user_can('manage_links'))
 		wp_die( -1 );
 
-	$link = get_bookmark( $id );
-	if ( !$link || is_wp_error( $link ) )
-		wp_die( 1 );
+	$link = get_bookmark($id);
+	if ( ! $link || is_wp_error($link))
+		wp_die(1);
 
-	if ( wp_delete_link( $id ) )
-		wp_die( 1 );
+	if (wp_delete_link($id))
+		wp_die(1);
 	else
-		wp_die( 0 );
+		wp_die(0);
 }
 
 /**
@@ -622,17 +622,17 @@ 
  * @since 3.1.0
  */
 function wp_ajax_delete_meta() {
-	$id = isset( $_POST['id'] ) ? (int) $_POST['id'] : 0;
+	$id = isset($_POST['id']) ? (int) $_POST['id'] : 0;
 
-	check_ajax_referer( "delete-meta_$id" );
-	if ( !$meta = get_metadata_by_mid( 'post', $id ) )
-		wp_die( 1 );
+	check_ajax_referer("delete-meta_$id");
+	if ( ! $meta = get_metadata_by_mid('post', $id))
+		wp_die(1);
 
-	if ( is_protected_meta( $meta->meta_key, 'post' ) || ! current_user_can( 'delete_post_meta',  $meta->post_id, $meta->meta_key ) )
+	if (is_protected_meta($meta->meta_key, 'post') || ! current_user_can('delete_post_meta', $meta->post_id, $meta->meta_key))
 		wp_die( -1 );
-	if ( delete_meta( $meta->meta_id ) )
-		wp_die( 1 );
-	wp_die( 0 );
+	if (delete_meta($meta->meta_id))
+		wp_die(1);
+	wp_die(0);
 }
 
 /**
@@ -642,22 +642,22 @@ 
  *
  * @param string $action Action to perform.
  */
-function wp_ajax_delete_post( $action ) {
-	if ( empty( $action ) )
+function wp_ajax_delete_post($action) {
+	if (empty($action))
 		$action = 'delete-post';
-	$id = isset( $_POST['id'] ) ? (int) $_POST['id'] : 0;
+	$id = isset($_POST['id']) ? (int) $_POST['id'] : 0;
 
-	check_ajax_referer( "{$action}_$id" );
-	if ( !current_user_can( 'delete_post', $id ) )
+	check_ajax_referer("{$action}_$id");
+	if ( ! current_user_can('delete_post', $id))
 		wp_die( -1 );
 
-	if ( !get_post( $id ) )
-		wp_die( 1 );
+	if ( ! get_post($id))
+		wp_die(1);
 
-	if ( wp_delete_post( $id ) )
-		wp_die( 1 );
+	if (wp_delete_post($id))
+		wp_die(1);
 	else
-		wp_die( 0 );
+		wp_die(0);
 }
 
 /**
@@ -667,27 +667,27 @@ 
  *
  * @param string $action Action to perform.
  */
-function wp_ajax_trash_post( $action ) {
-	if ( empty( $action ) )
+function wp_ajax_trash_post($action) {
+	if (empty($action))
 		$action = 'trash-post';
-	$id = isset( $_POST['id'] ) ? (int) $_POST['id'] : 0;
+	$id = isset($_POST['id']) ? (int) $_POST['id'] : 0;
 
-	check_ajax_referer( "{$action}_$id" );
-	if ( !current_user_can( 'delete_post', $id ) )
+	check_ajax_referer("{$action}_$id");
+	if ( ! current_user_can('delete_post', $id))
 		wp_die( -1 );
 
-	if ( !get_post( $id ) )
-		wp_die( 1 );
+	if ( ! get_post($id))
+		wp_die(1);
 
-	if ( 'trash-post' == $action )
-		$done = wp_trash_post( $id );
+	if ('trash-post' == $action)
+		$done = wp_trash_post($id);
 	else
-		$done = wp_untrash_post( $id );
+		$done = wp_untrash_post($id);
 
-	if ( $done )
-		wp_die( 1 );
+	if ($done)
+		wp_die(1);
 
-	wp_die( 0 );
+	wp_die(0);
 }
 
 /**
@@ -697,10 +697,10 @@ 
  *
  * @param string $action Action to perform.
  */
-function wp_ajax_untrash_post( $action ) {
-	if ( empty( $action ) )
+function wp_ajax_untrash_post($action) {
+	if (empty($action))
 		$action = 'untrash-post';
-	wp_ajax_trash_post( $action );
+	wp_ajax_trash_post($action);
 }
 
 /**
@@ -708,22 +708,22 @@ 
  *
  * @param string $action
  */
-function wp_ajax_delete_page( $action ) {
-	if ( empty( $action ) )
+function wp_ajax_delete_page($action) {
+	if (empty($action))
 		$action = 'delete-page';
-	$id = isset( $_POST['id'] ) ? (int) $_POST['id'] : 0;
+	$id = isset($_POST['id']) ? (int) $_POST['id'] : 0;
 
-	check_ajax_referer( "{$action}_$id" );
-	if ( !current_user_can( 'delete_page', $id ) )
+	check_ajax_referer("{$action}_$id");
+	if ( ! current_user_can('delete_page', $id))
 		wp_die( -1 );
 
-	if ( ! get_post( $id ) )
-		wp_die( 1 );
+	if ( ! get_post($id))
+		wp_die(1);
 
-	if ( wp_delete_post( $id ) )
-		wp_die( 1 );
+	if (wp_delete_post($id))
+		wp_die(1);
 	else
-		wp_die( 0 );
+		wp_die(0);
 }
 
 /**
@@ -732,41 +732,41 @@ 
  * @since 3.1.0
  */
 function wp_ajax_dim_comment() {
-	$id = isset( $_POST['id'] ) ? (int) $_POST['id'] : 0;
+	$id = isset($_POST['id']) ? (int) $_POST['id'] : 0;
 
-	if ( !$comment = get_comment( $id ) ) {
-		$x = new WP_Ajax_Response( array(
+	if ( ! $comment = get_comment($id)) {
+		$x = new WP_Ajax_Response(array(
 			'what' => 'comment',
 			'id' => new WP_Error('invalid_comment', sprintf(__('Comment %d does not exist'), $id))
-		) );
+		));
 		$x->send();
 	}
 
-	if ( ! current_user_can( 'edit_comment', $comment->comment_ID ) && ! current_user_can( 'moderate_comments' ) )
+	if ( ! current_user_can('edit_comment', $comment->comment_ID) && ! current_user_can('moderate_comments'))
 		wp_die( -1 );
 
-	$current = wp_get_comment_status( $comment );
-	if ( isset( $_POST['new'] ) && $_POST['new'] == $current )
-		wp_die( time() );
+	$current = wp_get_comment_status($comment);
+	if (isset($_POST['new']) && $_POST['new'] == $current)
+		wp_die(time());
 
-	check_ajax_referer( "approve-comment_$id" );
-	if ( in_array( $current, array( 'unapproved', 'spam' ) ) ) {
-		$result = wp_set_comment_status( $comment, 'approve', true );
+	check_ajax_referer("approve-comment_$id");
+	if (in_array($current, array('unapproved', 'spam'))) {
+		$result = wp_set_comment_status($comment, 'approve', true);
 	} else {
-		$result = wp_set_comment_status( $comment, 'hold', true );
+		$result = wp_set_comment_status($comment, 'hold', true);
 	}
 
-	if ( is_wp_error($result) ) {
-		$x = new WP_Ajax_Response( array(
+	if (is_wp_error($result)) {
+		$x = new WP_Ajax_Response(array(
 			'what' => 'comment',
 			'id' => $result
-		) );
+		));
 		$x->send();
 	}
 
 	// Decide if we need to send back '1' or a more complicated response including page links and comment counts
-	_wp_ajax_delete_comment_response( $comment->comment_ID );
-	wp_die( 0 );
+	_wp_ajax_delete_comment_response($comment->comment_ID);
+	wp_die(0);
 }
 
 /**
@@ -776,33 +776,33 @@ 
  *
  * @param string $action Action to perform.
  */
-function wp_ajax_add_link_category( $action ) {
-	if ( empty( $action ) )
+function wp_ajax_add_link_category($action) {
+	if (empty($action))
 		$action = 'add-link-category';
-	check_ajax_referer( $action );
-	if ( !current_user_can( 'manage_categories' ) )
+	check_ajax_referer($action);
+	if ( ! current_user_can('manage_categories'))
 		wp_die( -1 );
-	$names = explode(',', wp_unslash( $_POST['newcat'] ) );
+	$names = explode(',', wp_unslash($_POST['newcat']));
 	$x = new WP_Ajax_Response();
-	foreach ( $names as $cat_name ) {
+	foreach ($names as $cat_name) {
 		$cat_name = trim($cat_name);
 		$slug = sanitize_title($cat_name);
-		if ( '' === $slug )
+		if ('' === $slug)
 			continue;
-		if ( !$cat_id = term_exists( $cat_name, 'link_category' ) )
-			$cat_id = wp_insert_term( $cat_name, 'link_category' );
-		if ( is_wp_error( $cat_id ) ) {
+		if ( ! $cat_id = term_exists($cat_name, 'link_category'))
+			$cat_id = wp_insert_term($cat_name, 'link_category');
+		if (is_wp_error($cat_id)) {
 			continue;
-		} elseif ( is_array( $cat_id ) ) {
+		} elseif (is_array($cat_id)) {
 			$cat_id = $cat_id['term_id'];
 		}
-		$cat_name = esc_html( $cat_name );
-		$x->add( array(
+		$cat_name = esc_html($cat_name);
+		$x->add(array(
 			'what' => 'link-category',
 			'id' => $cat_id,
-			'data' => "<li id='link-category-$cat_id'><label for='in-link-category-$cat_id' class='selectit'><input value='" . esc_attr($cat_id) . "' type='checkbox' checked='checked' name='link_category[]' id='in-link-category-$cat_id'/> $cat_name</label></li>",
+			'data' => "<li id='link-category-$cat_id'><label for='in-link-category-$cat_id' class='selectit'><input value='".esc_attr($cat_id)."' type='checkbox' checked='checked' name='link_category[]' id='in-link-category-$cat_id'/> $cat_name</label></li>",
 			'position' => -1
-		) );
+		));
 	}
 	$x->send();
 }
@@ -817,52 +817,52 @@ 
 function wp_ajax_add_tag() {
 	global $wp_list_table;
 
-	check_ajax_referer( 'add-tag', '_wpnonce_add-tag' );
-	$taxonomy = !empty($_POST['taxonomy']) ? $_POST['taxonomy'] : 'post_tag';
+	check_ajax_referer('add-tag', '_wpnonce_add-tag');
+	$taxonomy = ! empty($_POST['taxonomy']) ? $_POST['taxonomy'] : 'post_tag';
 	$tax = get_taxonomy($taxonomy);
 
-	if ( !current_user_can( $tax->cap->edit_terms ) )
+	if ( ! current_user_can($tax->cap->edit_terms))
 		wp_die( -1 );
 
 	$x = new WP_Ajax_Response();
 
-	$tag = wp_insert_term($_POST['tag-name'], $taxonomy, $_POST );
+	$tag = wp_insert_term($_POST['tag-name'], $taxonomy, $_POST);
 
-	if ( !$tag || is_wp_error($tag) || (!$tag = get_term( $tag['term_id'], $taxonomy )) ) {
+	if ( ! $tag || is_wp_error($tag) || ( ! $tag = get_term($tag['term_id'], $taxonomy))) {
 		$message = __('An error has occurred. Please reload the page and try again.');
-		if ( is_wp_error($tag) && $tag->get_error_message() )
+		if (is_wp_error($tag) && $tag->get_error_message())
 			$message = $tag->get_error_message();
 
-		$x->add( array(
+		$x->add(array(
 			'what' => 'taxonomy',
-			'data' => new WP_Error('error', $message )
-		) );
+			'data' => new WP_Error('error', $message)
+		));
 		$x->send();
 	}
 
-	$wp_list_table = _get_list_table( 'WP_Terms_List_Table', array( 'screen' => $_POST['screen'] ) );
+	$wp_list_table = _get_list_table('WP_Terms_List_Table', array('screen' => $_POST['screen']));
 
 	$level = 0;
-	if ( is_taxonomy_hierarchical($taxonomy) ) {
-		$level = count( get_ancestors( $tag->term_id, $taxonomy, 'taxonomy' ) );
+	if (is_taxonomy_hierarchical($taxonomy)) {
+		$level = count(get_ancestors($tag->term_id, $taxonomy, 'taxonomy'));
 		ob_start();
-		$wp_list_table->single_row( $tag, $level );
+		$wp_list_table->single_row($tag, $level);
 		$noparents = ob_get_clean();
 	}
 
 	ob_start();
-	$wp_list_table->single_row( $tag );
+	$wp_list_table->single_row($tag);
 	$parents = ob_get_clean();
 
-	$x->add( array(
+	$x->add(array(
 		'what' => 'taxonomy',
 		'supplemental' => compact('parents', 'noparents')
-	) );
-	$x->add( array(
+	));
+	$x->add(array(
 		'what' => 'term',
 		'position' => $level,
 		'supplemental' => (array) $tag
-	) );
+	));
 	$x->send();
 }
 
@@ -872,38 +872,38 @@ 
  * @since 3.1.0
  */
 function wp_ajax_get_tagcloud() {
-	if ( ! isset( $_POST['tax'] ) ) {
-		wp_die( 0 );
+	if ( ! isset($_POST['tax'])) {
+		wp_die(0);
 	}
 
-	$taxonomy = sanitize_key( $_POST['tax'] );
-	$tax = get_taxonomy( $taxonomy );
-	if ( ! $tax ) {
-		wp_die( 0 );
+	$taxonomy = sanitize_key($_POST['tax']);
+	$tax = get_taxonomy($taxonomy);
+	if ( ! $tax) {
+		wp_die(0);
 	}
 
-	if ( ! current_user_can( $tax->cap->assign_terms ) ) {
+	if ( ! current_user_can($tax->cap->assign_terms)) {
 		wp_die( -1 );
 	}
 
-	$tags = get_terms( $taxonomy, array( 'number' => 45, 'orderby' => 'count', 'order' => 'DESC' ) );
+	$tags = get_terms($taxonomy, array('number' => 45, 'orderby' => 'count', 'order' => 'DESC'));
 
-	if ( empty( $tags ) )
-		wp_die( $tax->labels->not_found );
+	if (empty($tags))
+		wp_die($tax->labels->not_found);
 
-	if ( is_wp_error( $tags ) )
-		wp_die( $tags->get_error_message() );
+	if (is_wp_error($tags))
+		wp_die($tags->get_error_message());
 
-	foreach ( $tags as $key => $tag ) {
-		$tags[ $key ]->link = '#';
-		$tags[ $key ]->id = $tag->term_id;
+	foreach ($tags as $key => $tag) {
+		$tags[$key]->link = '#';
+		$tags[$key]->id = $tag->term_id;
 	}
 
 	// We need raw tag names here, so don't filter the output
-	$return = wp_generate_tag_cloud( $tags, array('filter' => 0) );
+	$return = wp_generate_tag_cloud($tags, array('filter' => 0));
 
-	if ( empty($return) )
-		wp_die( 0 );
+	if (empty($return))
+		wp_die(0);
 
 	echo $return;
 
@@ -920,46 +920,46 @@ 
  *
  * @param string $action Action to perform.
  */
-function wp_ajax_get_comments( $action ) {
+function wp_ajax_get_comments($action) {
 	global $wp_list_table, $post_id;
-	if ( empty( $action ) )
+	if (empty($action))
 		$action = 'get-comments';
 
-	check_ajax_referer( $action );
+	check_ajax_referer($action);
 
-	if ( empty( $post_id ) && ! empty( $_REQUEST['p'] ) ) {
-		$id = absint( $_REQUEST['p'] );
-		if ( ! empty( $id ) )
+	if (empty($post_id) && ! empty($_REQUEST['p'])) {
+		$id = absint($_REQUEST['p']);
+		if ( ! empty($id))
 			$post_id = $id;
 	}
 
-	if ( empty( $post_id ) )
+	if (empty($post_id))
 		wp_die( -1 );
 
-	$wp_list_table = _get_list_table( 'WP_Post_Comments_List_Table', array( 'screen' => 'edit-comments' ) );
+	$wp_list_table = _get_list_table('WP_Post_Comments_List_Table', array('screen' => 'edit-comments'));
 
-	if ( ! current_user_can( 'edit_post', $post_id ) )
+	if ( ! current_user_can('edit_post', $post_id))
 		wp_die( -1 );
 
 	$wp_list_table->prepare_items();
 
-	if ( !$wp_list_table->has_items() )
-		wp_die( 1 );
+	if ( ! $wp_list_table->has_items())
+		wp_die(1);
 
 	$x = new WP_Ajax_Response();
 	ob_start();
-	foreach ( $wp_list_table->items as $comment ) {
-		if ( ! current_user_can( 'edit_comment', $comment->comment_ID ) )
+	foreach ($wp_list_table->items as $comment) {
+		if ( ! current_user_can('edit_comment', $comment->comment_ID))
 			continue;
-		get_comment( $comment );
-		$wp_list_table->single_row( $comment );
+		get_comment($comment);
+		$wp_list_table->single_row($comment);
 	}
 	$comment_list_item = ob_get_clean();
 
-	$x->add( array(
+	$x->add(array(
 		'what' => 'comments',
 		'data' => $comment_list_item
-	) );
+	));
 	$x->send();
 }
 
@@ -972,91 +972,91 @@ 
  *
  * @param string $action Action to perform.
  */
-function wp_ajax_replyto_comment( $action ) {
+function wp_ajax_replyto_comment($action) {
 	global $wp_list_table;
-	if ( empty( $action ) )
+	if (empty($action))
 		$action = 'replyto-comment';
 
-	check_ajax_referer( $action, '_ajax_nonce-replyto-comment' );
+	check_ajax_referer($action, '_ajax_nonce-replyto-comment');
 
 	$comment_post_ID = (int) $_POST['comment_post_ID'];
-	$post = get_post( $comment_post_ID );
-	if ( ! $post )
+	$post = get_post($comment_post_ID);
+	if ( ! $post)
 		wp_die( -1 );
 
-	if ( !current_user_can( 'edit_post', $comment_post_ID ) )
+	if ( ! current_user_can('edit_post', $comment_post_ID))
 		wp_die( -1 );
 
-	if ( empty( $post->post_status ) )
-		wp_die( 1 );
-	elseif ( in_array($post->post_status, array('draft', 'pending', 'trash') ) )
-		wp_die( __('ERROR: you are replying to a comment on a draft post.') );
+	if (empty($post->post_status))
+		wp_die(1);
+	elseif (in_array($post->post_status, array('draft', 'pending', 'trash')))
+		wp_die(__('ERROR: you are replying to a comment on a draft post.'));
 
 	$user = wp_get_current_user();
-	if ( $user->exists() ) {
+	if ($user->exists()) {
 		$user_ID = $user->ID;
-		$comment_author       = wp_slash( $user->display_name );
-		$comment_author_email = wp_slash( $user->user_email );
-		$comment_author_url   = wp_slash( $user->user_url );
-		$comment_content      = trim( $_POST['content'] );
-		$comment_type         = isset( $_POST['comment_type'] ) ? trim( $_POST['comment_type'] ) : '';
-		if ( current_user_can( 'unfiltered_html' ) ) {
-			if ( ! isset( $_POST['_wp_unfiltered_html_comment'] ) )
+		$comment_author       = wp_slash($user->display_name);
+		$comment_author_email = wp_slash($user->user_email);
+		$comment_author_url   = wp_slash($user->user_url);
+		$comment_content      = trim($_POST['content']);
+		$comment_type         = isset($_POST['comment_type']) ? trim($_POST['comment_type']) : '';
+		if (current_user_can('unfiltered_html')) {
+			if ( ! isset($_POST['_wp_unfiltered_html_comment']))
 				$_POST['_wp_unfiltered_html_comment'] = '';
 
-			if ( wp_create_nonce( 'unfiltered-html-comment' ) != $_POST['_wp_unfiltered_html_comment'] ) {
+			if (wp_create_nonce('unfiltered-html-comment') != $_POST['_wp_unfiltered_html_comment']) {
 				kses_remove_filters(); // start with a clean slate
 				kses_init_filters(); // set up the filters
 			}
 		}
 	} else {
-		wp_die( __( 'Sorry, you must be logged in to reply to a comment.' ) );
+		wp_die(__('Sorry, you must be logged in to reply to a comment.'));
 	}
 
-	if ( '' == $comment_content )
-		wp_die( __( 'ERROR: please type a comment.' ) );
+	if ('' == $comment_content)
+		wp_die(__('ERROR: please type a comment.'));
 
 	$comment_parent = 0;
-	if ( isset( $_POST['comment_ID'] ) )
-		$comment_parent = absint( $_POST['comment_ID'] );
+	if (isset($_POST['comment_ID']))
+		$comment_parent = absint($_POST['comment_ID']);
 	$comment_auto_approved = false;
 	$commentdata = compact('comment_post_ID', 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_content', 'comment_type', 'comment_parent', 'user_ID');
 
 	// Automatically approve parent comment.
-	if ( !empty($_POST['approve_parent']) ) {
-		$parent = get_comment( $comment_parent );
+	if ( ! empty($_POST['approve_parent'])) {
+		$parent = get_comment($comment_parent);
 
-		if ( $parent && $parent->comment_approved === '0' && $parent->comment_post_ID == $comment_post_ID ) {
-			if ( ! current_user_can( 'edit_comment', $parent->comment_ID ) ) {
+		if ($parent && $parent->comment_approved === '0' && $parent->comment_post_ID == $comment_post_ID) {
+			if ( ! current_user_can('edit_comment', $parent->comment_ID)) {
 				wp_die( -1 );
 			}
 
-			if ( wp_set_comment_status( $parent, 'approve' ) )
+			if (wp_set_comment_status($parent, 'approve'))
 				$comment_auto_approved = true;
 		}
 	}
 
-	$comment_id = wp_new_comment( $commentdata );
+	$comment_id = wp_new_comment($commentdata);
 	$comment = get_comment($comment_id);
-	if ( ! $comment ) wp_die( 1 );
+	if ( ! $comment) wp_die(1);
 
-	$position = ( isset($_POST['position']) && (int) $_POST['position'] ) ? (int) $_POST['position'] : '-1';
+	$position = (isset($_POST['position']) && (int) $_POST['position']) ? (int) $_POST['position'] : '-1';
 
 	ob_start();
-	if ( isset( $_REQUEST['mode'] ) && 'dashboard' == $_REQUEST['mode'] ) {
-		require_once( ABSPATH . 'wp-admin/includes/dashboard.php' );
-		_wp_dashboard_recent_comments_row( $comment );
+	if (isset($_REQUEST['mode']) && 'dashboard' == $_REQUEST['mode']) {
+		require_once(ABSPATH.'wp-admin/includes/dashboard.php');
+		_wp_dashboard_recent_comments_row($comment);
 	} else {
-		if ( isset( $_REQUEST['mode'] ) && 'single' == $_REQUEST['mode'] ) {
-			$wp_list_table = _get_list_table('WP_Post_Comments_List_Table', array( 'screen' => 'edit-comments' ) );
+		if (isset($_REQUEST['mode']) && 'single' == $_REQUEST['mode']) {
+			$wp_list_table = _get_list_table('WP_Post_Comments_List_Table', array('screen' => 'edit-comments'));
 		} else {
-			$wp_list_table = _get_list_table('WP_Comments_List_Table', array( 'screen' => 'edit-comments' ) );
+			$wp_list_table = _get_list_table('WP_Comments_List_Table', array('screen' => 'edit-comments'));
 		}
-		$wp_list_table->single_row( $comment );
+		$wp_list_table->single_row($comment);
 	}
 	$comment_list_item = ob_get_clean();
 
-	$response =  array(
+	$response = array(
 		'what' => 'comment',
 		'id' => $comment->comment_ID,
 		'data' => $comment_list_item,
@@ -1067,22 +1067,22 @@ 
 	$response['supplemental'] = array(
 		'in_moderation' => $counts->moderated,
 		'i18n_comments_text' => sprintf(
-			_n( '%s Comment', '%s Comments', $counts->approved ),
-			number_format_i18n( $counts->approved )
+			_n('%s Comment', '%s Comments', $counts->approved),
+			number_format_i18n($counts->approved)
 		),
 		'i18n_moderation_text' => sprintf(
-			_nx( '%s in moderation', '%s in moderation', $counts->moderated, 'comments' ),
-			number_format_i18n( $counts->moderated )
+			_nx('%s in moderation', '%s in moderation', $counts->moderated, 'comments'),
+			number_format_i18n($counts->moderated)
 		)
 	);
 
-	if ( $comment_auto_approved ) {
+	if ($comment_auto_approved) {
 		$response['supplemental']['parent_approved'] = $parent->comment_ID;
 		$response['supplemental']['parent_post_id'] = $parent->comment_post_ID;
 	}
 
 	$x = new WP_Ajax_Response();
-	$x->add( $response );
+	$x->add($response);
 	$x->send();
 }
 
@@ -1096,34 +1096,34 @@ 
 function wp_ajax_edit_comment() {
 	global $wp_list_table;
 
-	check_ajax_referer( 'replyto-comment', '_ajax_nonce-replyto-comment' );
+	check_ajax_referer('replyto-comment', '_ajax_nonce-replyto-comment');
 
 	$comment_id = (int) $_POST['comment_ID'];
-	if ( ! current_user_can( 'edit_comment', $comment_id ) )
+	if ( ! current_user_can('edit_comment', $comment_id))
 		wp_die( -1 );
 
-	if ( '' == $_POST['content'] )
-		wp_die( __( 'ERROR: please type a comment.' ) );
+	if ('' == $_POST['content'])
+		wp_die(__('ERROR: please type a comment.'));
 
-	if ( isset( $_POST['status'] ) )
+	if (isset($_POST['status']))
 		$_POST['comment_status'] = $_POST['status'];
 	edit_comment();
 
-	$position = ( isset($_POST['position']) && (int) $_POST['position']) ? (int) $_POST['position'] : '-1';
-	$checkbox = ( isset($_POST['checkbox']) && true == $_POST['checkbox'] ) ? 1 : 0;
-	$wp_list_table = _get_list_table( $checkbox ? 'WP_Comments_List_Table' : 'WP_Post_Comments_List_Table', array( 'screen' => 'edit-comments' ) );
+	$position = (isset($_POST['position']) && (int) $_POST['position']) ? (int) $_POST['position'] : '-1';
+	$checkbox = (isset($_POST['checkbox']) && true == $_POST['checkbox']) ? 1 : 0;
+	$wp_list_table = _get_list_table($checkbox ? 'WP_Comments_List_Table' : 'WP_Post_Comments_List_Table', array('screen' => 'edit-comments'));
 
-	$comment = get_comment( $comment_id );
-	if ( empty( $comment->comment_ID ) )
+	$comment = get_comment($comment_id);
+	if (empty($comment->comment_ID))
 		wp_die( -1 );
 
 	ob_start();
-	$wp_list_table->single_row( $comment );
+	$wp_list_table->single_row($comment);
 	$comment_list_item = ob_get_clean();
 
 	$x = new WP_Ajax_Response();
 
-	$x->add( array(
+	$x->add(array(
 		'what' => 'edit_comment',
 		'id' => $comment->comment_ID,
 		'data' => $comment_list_item,
@@ -1139,39 +1139,39 @@ 
  * @since 3.1.0
  */
 function wp_ajax_add_menu_item() {
-	check_ajax_referer( 'add-menu_item', 'menu-settings-column-nonce' );
+	check_ajax_referer('add-menu_item', 'menu-settings-column-nonce');
 
-	if ( ! current_user_can( 'edit_theme_options' ) )
+	if ( ! current_user_can('edit_theme_options'))
 		wp_die( -1 );
 
-	require_once ABSPATH . 'wp-admin/includes/nav-menu.php';
+	require_once ABSPATH.'wp-admin/includes/nav-menu.php';
 
 	// For performance reasons, we omit some object properties from the checklist.
 	// The following is a hacky way to restore them when adding non-custom items.
 
 	$menu_items_data = array();
-	foreach ( (array) $_POST['menu-item'] as $menu_item_data ) {
+	foreach ((array) $_POST['menu-item'] as $menu_item_data) {
 		if (
-			! empty( $menu_item_data['menu-item-type'] ) &&
+			! empty($menu_item_data['menu-item-type']) &&
 			'custom' != $menu_item_data['menu-item-type'] &&
-			! empty( $menu_item_data['menu-item-object-id'] )
+			! empty($menu_item_data['menu-item-object-id'])
 		) {
-			switch( $menu_item_data['menu-item-type'] ) {
+			switch ($menu_item_data['menu-item-type']) {
 				case 'post_type' :
-					$_object = get_post( $menu_item_data['menu-item-object-id'] );
+					$_object = get_post($menu_item_data['menu-item-object-id']);
 				break;
 
 				case 'post_type_archive' :
-					$_object = get_post_type_object( $menu_item_data['menu-item-object'] );
+					$_object = get_post_type_object($menu_item_data['menu-item-object']);
 				break;
 
 				case 'taxonomy' :
-					$_object = get_term( $menu_item_data['menu-item-object-id'], $menu_item_data['menu-item-object'] );
+					$_object = get_term($menu_item_data['menu-item-object-id'], $menu_item_data['menu-item-object']);
 				break;
 			}
 
-			$_menu_items = array_map( 'wp_setup_nav_menu_item', array( $_object ) );
-			$_menu_item = reset( $_menu_items );
+			$_menu_items = array_map('wp_setup_nav_menu_item', array($_object));
+			$_menu_item = reset($_menu_items);
 
 			// Restore the missing menu item properties
 			$menu_item_data['menu-item-description'] = $_menu_item->description;
@@ -1180,28 +1180,28 @@ 
 		$menu_items_data[] = $menu_item_data;
 	}
 
-	$item_ids = wp_save_nav_menu_items( 0, $menu_items_data );
-	if ( is_wp_error( $item_ids ) )
-		wp_die( 0 );
+	$item_ids = wp_save_nav_menu_items(0, $menu_items_data);
+	if (is_wp_error($item_ids))
+		wp_die(0);
 
 	$menu_items = array();
 
-	foreach ( (array) $item_ids as $menu_item_id ) {
-		$menu_obj = get_post( $menu_item_id );
-		if ( ! empty( $menu_obj->ID ) ) {
-			$menu_obj = wp_setup_nav_menu_item( $menu_obj );
+	foreach ((array) $item_ids as $menu_item_id) {
+		$menu_obj = get_post($menu_item_id);
+		if ( ! empty($menu_obj->ID)) {
+			$menu_obj = wp_setup_nav_menu_item($menu_obj);
 			$menu_obj->label = $menu_obj->title; // don't show "(pending)" in ajax-added items
 			$menu_items[] = $menu_obj;
 		}
 	}
 
 	/** This filter is documented in wp-admin/includes/nav-menu.php */
-	$walker_class_name = apply_filters( 'wp_edit_nav_menu_walker', 'Walker_Nav_Menu_Edit', $_POST['menu'] );
+	$walker_class_name = apply_filters('wp_edit_nav_menu_walker', 'Walker_Nav_Menu_Edit', $_POST['menu']);
 
-	if ( ! class_exists( $walker_class_name ) )
-		wp_die( 0 );
+	if ( ! class_exists($walker_class_name))
+		wp_die(0);
 
-	if ( ! empty( $menu_items ) ) {
+	if ( ! empty($menu_items)) {
 		$args = array(
 			'after' => '',
 			'before' => '',
@@ -1209,7 +1209,7 @@ 
 			'link_before' => '',
 			'walker' => new $walker_class_name,
 		);
-		echo walk_nav_menu_tree( $menu_items, 0, (object) $args );
+		echo walk_nav_menu_tree($menu_items, 0, (object) $args);
 	}
 	wp_die();
 }
@@ -1220,86 +1220,86 @@ 
  * @since 3.1.0
  */
 function wp_ajax_add_meta() {
-	check_ajax_referer( 'add-meta', '_ajax_nonce-add-meta' );
+	check_ajax_referer('add-meta', '_ajax_nonce-add-meta');
 	$c = 0;
 	$pid = (int) $_POST['post_id'];
-	$post = get_post( $pid );
+	$post = get_post($pid);
 
-	if ( isset($_POST['metakeyselect']) || isset($_POST['metakeyinput']) ) {
-		if ( !current_user_can( 'edit_post', $pid ) )
+	if (isset($_POST['metakeyselect']) || isset($_POST['metakeyinput'])) {
+		if ( ! current_user_can('edit_post', $pid))
 			wp_die( -1 );
-		if ( isset($_POST['metakeyselect']) && '#NONE#' == $_POST['metakeyselect'] && empty($_POST['metakeyinput']) )
-			wp_die( 1 );
+		if (isset($_POST['metakeyselect']) && '#NONE#' == $_POST['metakeyselect'] && empty($_POST['metakeyinput']))
+			wp_die(1);
 
 		// If the post is an autodraft, save the post as a draft and then attempt to save the meta.
-		if ( $post->post_status == 'auto-draft' ) {
+		if ($post->post_status == 'auto-draft') {
 			$post_data = array();
 			$post_data['action'] = 'draft'; // Warning fix
 			$post_data['post_ID'] = $pid;
 			$post_data['post_type'] = $post->post_type;
 			$post_data['post_status'] = 'draft';
 			$now = current_time('timestamp', 1);
-			$post_data['post_title'] = sprintf( __( 'Draft created on %1$s at %2$s' ), date( __( 'F j, Y' ), $now ), date( __( 'g:i a' ), $now ) );
+			$post_data['post_title'] = sprintf(__('Draft created on %1$s at %2$s'), date(__('F j, Y'), $now), date(__('g:i a'), $now));
 
-			$pid = edit_post( $post_data );
-			if ( $pid ) {
-				if ( is_wp_error( $pid ) ) {
-					$x = new WP_Ajax_Response( array(
+			$pid = edit_post($post_data);
+			if ($pid) {
+				if (is_wp_error($pid)) {
+					$x = new WP_Ajax_Response(array(
 						'what' => 'meta',
 						'data' => $pid
-					) );
+					));
 					$x->send();
 				}
 
-				if ( !$mid = add_meta( $pid ) )
-					wp_die( __( 'Please provide a custom field value.' ) );
+				if ( ! $mid = add_meta($pid))
+					wp_die(__('Please provide a custom field value.'));
 			} else {
-				wp_die( 0 );
+				wp_die(0);
 			}
-		} elseif ( ! $mid = add_meta( $pid ) ) {
-			wp_die( __( 'Please provide a custom field value.' ) );
+		} elseif ( ! $mid = add_meta($pid)) {
+			wp_die(__('Please provide a custom field value.'));
 		}
 
-		$meta = get_metadata_by_mid( 'post', $mid );
+		$meta = get_metadata_by_mid('post', $mid);
 		$pid = (int) $meta->post_id;
-		$meta = get_object_vars( $meta );
-		$x = new WP_Ajax_Response( array(
+		$meta = get_object_vars($meta);
+		$x = new WP_Ajax_Response(array(
 			'what' => 'meta',
 			'id' => $mid,
-			'data' => _list_meta_row( $meta, $c ),
+			'data' => _list_meta_row($meta, $c),
 			'position' => 1,
 			'supplemental' => array('postid' => $pid)
-		) );
+		));
 	} else { // Update?
-		$mid = (int) key( $_POST['meta'] );
-		$key = wp_unslash( $_POST['meta'][$mid]['key'] );
-		$value = wp_unslash( $_POST['meta'][$mid]['value'] );
-		if ( '' == trim($key) )
-			wp_die( __( 'Please provide a custom field name.' ) );
-		if ( '' == trim($value) )
-			wp_die( __( 'Please provide a custom field value.' ) );
-		if ( ! $meta = get_metadata_by_mid( 'post', $mid ) )
-			wp_die( 0 ); // if meta doesn't exist
-		if ( is_protected_meta( $meta->meta_key, 'post' ) || is_protected_meta( $key, 'post' ) ||
-			! current_user_can( 'edit_post_meta', $meta->post_id, $meta->meta_key ) ||
-			! current_user_can( 'edit_post_meta', $meta->post_id, $key ) )
+		$mid = (int) key($_POST['meta']);
+		$key = wp_unslash($_POST['meta'][$mid]['key']);
+		$value = wp_unslash($_POST['meta'][$mid]['value']);
+		if ('' == trim($key))
+			wp_die(__('Please provide a custom field name.'));
+		if ('' == trim($value))
+			wp_die(__('Please provide a custom field value.'));
+		if ( ! $meta = get_metadata_by_mid('post', $mid))
+			wp_die(0); // if meta doesn't exist
+		if (is_protected_meta($meta->meta_key, 'post') || is_protected_meta($key, 'post') ||
+			! current_user_can('edit_post_meta', $meta->post_id, $meta->meta_key) ||
+			! current_user_can('edit_post_meta', $meta->post_id, $key))
 			wp_die( -1 );
-		if ( $meta->meta_value != $value || $meta->meta_key != $key ) {
-			if ( !$u = update_metadata_by_mid( 'post', $mid, $value, $key ) )
-				wp_die( 0 ); // We know meta exists; we also know it's unchanged (or DB error, in which case there are bigger problems).
+		if ($meta->meta_value != $value || $meta->meta_key != $key) {
+			if ( ! $u = update_metadata_by_mid('post', $mid, $value, $key))
+				wp_die(0); // We know meta exists; we also know it's unchanged (or DB error, in which case there are bigger problems).
 		}
 
-		$x = new WP_Ajax_Response( array(
+		$x = new WP_Ajax_Response(array(
 			'what' => 'meta',
 			'id' => $mid, 'old_id' => $mid,
-			'data' => _list_meta_row( array(
+			'data' => _list_meta_row(array(
 				'meta_key' => $key,
 				'meta_value' => $value,
 				'meta_id' => $mid
-			), $c ),
+			), $c),
 			'position' => 0,
 			'supplemental' => array('postid' => $meta->post_id)
-		) );
+		));
 	}
 	$x->send();
 }
@@ -1313,42 +1313,42 @@ 
  *
  * @param string $action Action to perform.
  */
-function wp_ajax_add_user( $action ) {
+function wp_ajax_add_user($action) {
 	global $wp_list_table;
-	if ( empty( $action ) )
+	if (empty($action))
 		$action = 'add-user';
 
-	check_ajax_referer( $action );
-	if ( ! current_user_can('create_users') )
+	check_ajax_referer($action);
+	if ( ! current_user_can('create_users'))
 		wp_die( -1 );
-	if ( ! $user_id = edit_user() ) {
-		wp_die( 0 );
-	} elseif ( is_wp_error( $user_id ) ) {
-		$x = new WP_Ajax_Response( array(
+	if ( ! $user_id = edit_user()) {
+		wp_die(0);
+	} elseif (is_wp_error($user_id)) {
+		$x = new WP_Ajax_Response(array(
 			'what' => 'user',
 			'id' => $user_id
-		) );
+		));
 		$x->send();
 	}
-	$user_object = get_userdata( $user_id );
+	$user_object = get_userdata($user_id);
 
 	$wp_list_table = _get_list_table('WP_Users_List_Table');
 
-	$role = current( $user_object->roles );
+	$role = current($user_object->roles);
 
-	$x = new WP_Ajax_Response( array(
+	$x = new WP_Ajax_Response(array(
 		'what' => 'user',
 		'id' => $user_id,
-		'data' => $wp_list_table->single_row( $user_object, '', $role ),
+		'data' => $wp_list_table->single_row($user_object, '', $role),
 		'supplemental' => array(
 			'show-link' => sprintf(
 				/* translators: %s: the new user */
-				__( 'User %s added' ),
-				'<a href="#user-' . $user_id . '">' . $user_object->user_login . '</a>'
+				__('User %s added'),
+				'<a href="#user-'.$user_id.'">'.$user_object->user_login.'</a>'
 			),
 			'role' => $role,
 		)
-	) );
+	));
 	$x->send();
 }
 
@@ -1358,30 +1358,30 @@ 
  * @since 3.1.0
  */
 function wp_ajax_closed_postboxes() {
-	check_ajax_referer( 'closedpostboxes', 'closedpostboxesnonce' );
-	$closed = isset( $_POST['closed'] ) ? explode( ',', $_POST['closed']) : array();
+	check_ajax_referer('closedpostboxes', 'closedpostboxesnonce');
+	$closed = isset($_POST['closed']) ? explode(',', $_POST['closed']) : array();
 	$closed = array_filter($closed);
 
-	$hidden = isset( $_POST['hidden'] ) ? explode( ',', $_POST['hidden']) : array();
+	$hidden = isset($_POST['hidden']) ? explode(',', $_POST['hidden']) : array();
 	$hidden = array_filter($hidden);
 
-	$page = isset( $_POST['page'] ) ? $_POST['page'] : '';
+	$page = isset($_POST['page']) ? $_POST['page'] : '';
 
-	if ( $page != sanitize_key( $page ) )
-		wp_die( 0 );
+	if ($page != sanitize_key($page))
+		wp_die(0);
 
-	if ( ! $user = wp_get_current_user() )
+	if ( ! $user = wp_get_current_user())
 		wp_die( -1 );
 
-	if ( is_array($closed) )
+	if (is_array($closed))
 		update_user_option($user->ID, "closedpostboxes_$page", $closed, true);
 
-	if ( is_array($hidden) ) {
-		$hidden = array_diff( $hidden, array('submitdiv', 'linksubmitdiv', 'manage-menu', 'create-menu') ); // postboxes that are always shown
+	if (is_array($hidden)) {
+		$hidden = array_diff($hidden, array('submitdiv', 'linksubmitdiv', 'manage-menu', 'create-menu')); // postboxes that are always shown
 		update_user_option($user->ID, "metaboxhidden_$page", $hidden, true);
 	}
 
-	wp_die( 1 );
+	wp_die(1);
 }
 
 /**
@@ -1390,19 +1390,19 @@ 
  * @since 3.1.0
  */
 function wp_ajax_hidden_columns() {
-	check_ajax_referer( 'screen-options-nonce', 'screenoptionnonce' );
-	$page = isset( $_POST['page'] ) ? $_POST['page'] : '';
+	check_ajax_referer('screen-options-nonce', 'screenoptionnonce');
+	$page = isset($_POST['page']) ? $_POST['page'] : '';
 
-	if ( $page != sanitize_key( $page ) )
-		wp_die( 0 );
+	if ($page != sanitize_key($page))
+		wp_die(0);
 
-	if ( ! $user = wp_get_current_user() )
+	if ( ! $user = wp_get_current_user())
 		wp_die( -1 );
 
-	$hidden = ! empty( $_POST['hidden'] ) ? explode( ',', $_POST['hidden'] ) : array();
-	update_user_option( $user->ID, "manage{$page}columnshidden", $hidden, true );
+	$hidden = ! empty($_POST['hidden']) ? explode(',', $_POST['hidden']) : array();
+	update_user_option($user->ID, "manage{$page}columnshidden", $hidden, true);
 
-	wp_die( 1 );
+	wp_die(1);
 }
 
 /**
@@ -1411,14 +1411,14 @@ 
  * @since 3.1.0
  */
 function wp_ajax_update_welcome_panel() {
-	check_ajax_referer( 'welcome-panel-nonce', 'welcomepanelnonce' );
+	check_ajax_referer('welcome-panel-nonce', 'welcomepanelnonce');
 
-	if ( ! current_user_can( 'edit_theme_options' ) )
+	if ( ! current_user_can('edit_theme_options'))
 		wp_die( -1 );
 
-	update_user_meta( get_current_user_id(), 'show_welcome_panel', empty( $_POST['visible'] ) ? 0 : 1 );
+	update_user_meta(get_current_user_id(), 'show_welcome_panel', empty($_POST['visible']) ? 0 : 1);
 
-	wp_die( 1 );
+	wp_die(1);
 }
 
 /**
@@ -1427,31 +1427,31 @@ 
  * @since 3.1.0
  */
 function wp_ajax_menu_get_metabox() {
-	if ( ! current_user_can( 'edit_theme_options' ) )
+	if ( ! current_user_can('edit_theme_options'))
 		wp_die( -1 );
 
-	require_once ABSPATH . 'wp-admin/includes/nav-menu.php';
+	require_once ABSPATH.'wp-admin/includes/nav-menu.php';
 
-	if ( isset( $_POST['item-type'] ) && 'post_type' == $_POST['item-type'] ) {
+	if (isset($_POST['item-type']) && 'post_type' == $_POST['item-type']) {
 		$type = 'posttype';
 		$callback = 'wp_nav_menu_item_post_type_meta_box';
-		$items = (array) get_post_types( array( 'show_in_nav_menus' => true ), 'object' );
-	} elseif ( isset( $_POST['item-type'] ) && 'taxonomy' == $_POST['item-type'] ) {
+		$items = (array) get_post_types(array('show_in_nav_menus' => true), 'object');
+	} elseif (isset($_POST['item-type']) && 'taxonomy' == $_POST['item-type']) {
 		$type = 'taxonomy';
 		$callback = 'wp_nav_menu_item_taxonomy_meta_box';
-		$items = (array) get_taxonomies( array( 'show_ui' => true ), 'object' );
+		$items = (array) get_taxonomies(array('show_ui' => true), 'object');
 	}
 
-	if ( ! empty( $_POST['item-object'] ) && isset( $items[$_POST['item-object']] ) ) {
-		$menus_meta_box_object = $items[ $_POST['item-object'] ];
+	if ( ! empty($_POST['item-object']) && isset($items[$_POST['item-object']])) {
+		$menus_meta_box_object = $items[$_POST['item-object']];
 
 		/** This filter is documented in wp-admin/includes/nav-menu.php */
-		$item = apply_filters( 'nav_menu_meta_box_object', $menus_meta_box_object );
+		$item = apply_filters('nav_menu_meta_box_object', $menus_meta_box_object);
 		ob_start();
 		call_user_func_array($callback, array(
 			null,
 			array(
-				'id' => 'add-' . $item->name,
+				'id' => 'add-'.$item->name,
 				'title' => $item->labels->name,
 				'callback' => $callback,
 				'args' => $item,
@@ -1461,7 +1461,7 @@ 
 		$markup = ob_get_clean();
 
 		echo wp_json_encode(array(
-			'replace-id' => $type . '-' . $item->name,
+			'replace-id' => $type.'-'.$item->name,
 			'markup' => $markup,
 		));
 	}
@@ -1475,27 +1475,27 @@ 
  * @since 3.1.0
  */
 function wp_ajax_wp_link_ajax() {
-	check_ajax_referer( 'internal-linking', '_ajax_linking_nonce' );
+	check_ajax_referer('internal-linking', '_ajax_linking_nonce');
 
 	$args = array();
 
-	if ( isset( $_POST['search'] ) ) {
-		$args['s'] = wp_unslash( $_POST['search'] );
+	if (isset($_POST['search'])) {
+		$args['s'] = wp_unslash($_POST['search']);
 	}
 
-	if ( isset( $_POST['term'] ) ) {
-		$args['s'] = wp_unslash( $_POST['term'] );
+	if (isset($_POST['term'])) {
+		$args['s'] = wp_unslash($_POST['term']);
 	}
 
-	$args['pagenum'] = ! empty( $_POST['page'] ) ? absint( $_POST['page'] ) : 1;
+	$args['pagenum'] = ! empty($_POST['page']) ? absint($_POST['page']) : 1;
 
-	require(ABSPATH . WPINC . '/class-wp-editor.php');
-	$results = _WP_Editors::wp_link_query( $args );
+	require(ABSPATH.WPINC.'/class-wp-editor.php');
+	$results = _WP_Editors::wp_link_query($args);
 
-	if ( ! isset( $results ) )
-		wp_die( 0 );
+	if ( ! isset($results))
+		wp_die(0);
 
-	echo wp_json_encode( $results );
+	echo wp_json_encode($results);
 	echo "\n";
 
 	wp_die();
@@ -1507,13 +1507,13 @@ 
  * @since 3.1.0
  */
 function wp_ajax_menu_locations_save() {
-	if ( ! current_user_can( 'edit_theme_options' ) )
+	if ( ! current_user_can('edit_theme_options'))
 		wp_die( -1 );
-	check_ajax_referer( 'add-menu_item', 'menu-settings-column-nonce' );
-	if ( ! isset( $_POST['menu-locations'] ) )
-		wp_die( 0 );
-	set_theme_mod( 'nav_menu_locations', array_map( 'absint', $_POST['menu-locations'] ) );
-	wp_die( 1 );
+	check_ajax_referer('add-menu_item', 'menu-settings-column-nonce');
+	if ( ! isset($_POST['menu-locations']))
+		wp_die(0);
+	set_theme_mod('nav_menu_locations', array_map('absint', $_POST['menu-locations']));
+	wp_die(1);
 }
 
 /**
@@ -1522,28 +1522,28 @@ 
  * @since 3.1.0
  */
 function wp_ajax_meta_box_order() {
-	check_ajax_referer( 'meta-box-order' );
-	$order = isset( $_POST['order'] ) ? (array) $_POST['order'] : false;
-	$page_columns = isset( $_POST['page_columns'] ) ? $_POST['page_columns'] : 'auto';
+	check_ajax_referer('meta-box-order');
+	$order = isset($_POST['order']) ? (array) $_POST['order'] : false;
+	$page_columns = isset($_POST['page_columns']) ? $_POST['page_columns'] : 'auto';
 
-	if ( $page_columns != 'auto' )
+	if ($page_columns != 'auto')
 		$page_columns = (int) $page_columns;
 
-	$page = isset( $_POST['page'] ) ? $_POST['page'] : '';
+	$page = isset($_POST['page']) ? $_POST['page'] : '';
 
-	if ( $page != sanitize_key( $page ) )
-		wp_die( 0 );
+	if ($page != sanitize_key($page))
+		wp_die(0);
 
-	if ( ! $user = wp_get_current_user() )
+	if ( ! $user = wp_get_current_user())
 		wp_die( -1 );
 
-	if ( $order )
+	if ($order)
 		update_user_option($user->ID, "meta-box-order_$page", $order, true);
 
-	if ( $page_columns )
+	if ($page_columns)
 		update_user_option($user->ID, "screen_layout_$page", $page_columns, true);
 
-	wp_die( 1 );
+	wp_die(1);
 }
 
 /**
@@ -1552,12 +1552,12 @@ 
  * @since 3.1.0
  */
 function wp_ajax_menu_quick_search() {
-	if ( ! current_user_can( 'edit_theme_options' ) )
+	if ( ! current_user_can('edit_theme_options'))
 		wp_die( -1 );
 
-	require_once ABSPATH . 'wp-admin/includes/nav-menu.php';
+	require_once ABSPATH.'wp-admin/includes/nav-menu.php';
 
-	_wp_ajax_menu_quick_search( $_POST );
+	_wp_ajax_menu_quick_search($_POST);
 
 	wp_die();
 }
@@ -1568,9 +1568,9 @@ 
  * @since 3.1.0
  */
 function wp_ajax_get_permalink() {
-	check_ajax_referer( 'getpermalink', 'getpermalinknonce' );
-	$post_id = isset($_POST['post_id'])? intval($_POST['post_id']) : 0;
-	wp_die( get_preview_post_link( $post_id ) );
+	check_ajax_referer('getpermalink', 'getpermalinknonce');
+	$post_id = isset($_POST['post_id']) ? intval($_POST['post_id']) : 0;
+	wp_die(get_preview_post_link($post_id));
 }
 
 /**
@@ -1579,11 +1579,11 @@ 
  * @since 3.1.0
  */
 function wp_ajax_sample_permalink() {
-	check_ajax_referer( 'samplepermalink', 'samplepermalinknonce' );
-	$post_id = isset($_POST['post_id'])? intval($_POST['post_id']) : 0;
-	$title = isset($_POST['new_title'])? $_POST['new_title'] : '';
-	$slug = isset($_POST['new_slug'])? $_POST['new_slug'] : null;
-	wp_die( get_sample_permalink_html( $post_id, $title, $slug ) );
+	check_ajax_referer('samplepermalink', 'samplepermalinknonce');
+	$post_id = isset($_POST['post_id']) ? intval($_POST['post_id']) : 0;
+	$title = isset($_POST['new_title']) ? $_POST['new_title'] : '';
+	$slug = isset($_POST['new_slug']) ? $_POST['new_slug'] : null;
+	wp_die(get_sample_permalink_html($post_id, $title, $slug));
 }
 
 /**
@@ -1596,29 +1596,29 @@ 
 function wp_ajax_inline_save() {
 	global $wp_list_table, $mode;
 
-	check_ajax_referer( 'inlineeditnonce', '_inline_edit' );
+	check_ajax_referer('inlineeditnonce', '_inline_edit');
 
-	if ( ! isset($_POST['post_ID']) || ! ( $post_ID = (int) $_POST['post_ID'] ) )
+	if ( ! isset($_POST['post_ID']) || ! ($post_ID = (int) $_POST['post_ID']))
 		wp_die();
 
-	if ( 'page' == $_POST['post_type'] ) {
-		if ( ! current_user_can( 'edit_page', $post_ID ) )
-			wp_die( __( 'You are not allowed to edit this page.' ) );
+	if ('page' == $_POST['post_type']) {
+		if ( ! current_user_can('edit_page', $post_ID))
+			wp_die(__('You are not allowed to edit this page.'));
 	} else {
-		if ( ! current_user_can( 'edit_post', $post_ID ) )
-			wp_die( __( 'You are not allowed to edit this post.' ) );
+		if ( ! current_user_can('edit_post', $post_ID))
+			wp_die(__('You are not allowed to edit this post.'));
 	}
 
-	if ( $last = wp_check_post_lock( $post_ID ) ) {
-		$last_user = get_userdata( $last );
-		$last_user_name = $last_user ? $last_user->display_name : __( 'Someone' );
-		printf( $_POST['post_type'] == 'page' ? __( 'Saving is disabled: %s is currently editing this page.' ) : __( 'Saving is disabled: %s is currently editing this post.' ),	esc_html( $last_user_name ) );
+	if ($last = wp_check_post_lock($post_ID)) {
+		$last_user = get_userdata($last);
+		$last_user_name = $last_user ? $last_user->display_name : __('Someone');
+		printf($_POST['post_type'] == 'page' ? __('Saving is disabled: %s is currently editing this page.') : __('Saving is disabled: %s is currently editing this post.'), esc_html($last_user_name));
 		wp_die();
 	}
 
 	$data = &$_POST;
 
-	$post = get_post( $post_ID, ARRAY_A );
+	$post = get_post($post_ID, ARRAY_A);
 
 	// Since it's coming from the database.
 	$post = wp_slash($post);
@@ -1629,57 +1629,57 @@ 
 	// Rename.
 	$data['user_ID'] = get_current_user_id();
 
-	if ( isset($data['post_parent']) )
+	if (isset($data['post_parent']))
 		$data['parent_id'] = $data['post_parent'];
 
 	// Status.
-	if ( isset( $data['keep_private'] ) && 'private' == $data['keep_private'] ) {
+	if (isset($data['keep_private']) && 'private' == $data['keep_private']) {
 		$data['visibility']  = 'private';
 		$data['post_status'] = 'private';
 	} else {
 		$data['post_status'] = $data['_status'];
 	}
 
-	if ( empty($data['comment_status']) )
+	if (empty($data['comment_status']))
 		$data['comment_status'] = 'closed';
-	if ( empty($data['ping_status']) )
+	if (empty($data['ping_status']))
 		$data['ping_status'] = 'closed';
 
 	// Exclude terms from taxonomies that are not supposed to appear in Quick Edit.
-	if ( ! empty( $data['tax_input'] ) ) {
-		foreach ( $data['tax_input'] as $taxonomy => $terms ) {
-			$tax_object = get_taxonomy( $taxonomy );
+	if ( ! empty($data['tax_input'])) {
+		foreach ($data['tax_input'] as $taxonomy => $terms) {
+			$tax_object = get_taxonomy($taxonomy);
 			/** This filter is documented in wp-admin/includes/class-wp-posts-list-table.php */
-			if ( ! apply_filters( 'quick_edit_show_taxonomy', $tax_object->show_in_quick_edit, $taxonomy, $post['post_type'] ) ) {
-				unset( $data['tax_input'][ $taxonomy ] );
+			if ( ! apply_filters('quick_edit_show_taxonomy', $tax_object->show_in_quick_edit, $taxonomy, $post['post_type'])) {
+				unset($data['tax_input'][$taxonomy]);
 			}
 		}
 	}
 
 	// Hack: wp_unique_post_slug() doesn't work for drafts, so we will fake that our post is published.
-	if ( ! empty( $data['post_name'] ) && in_array( $post['post_status'], array( 'draft', 'pending' ) ) ) {
+	if ( ! empty($data['post_name']) && in_array($post['post_status'], array('draft', 'pending'))) {
 		$post['post_status'] = 'publish';
-		$data['post_name'] = wp_unique_post_slug( $data['post_name'], $post['ID'], $post['post_status'], $post['post_type'], $post['post_parent'] );
+		$data['post_name'] = wp_unique_post_slug($data['post_name'], $post['ID'], $post['post_status'], $post['post_type'], $post['post_parent']);
 	}
 
 	// Update the post.
 	edit_post();
 
-	$wp_list_table = _get_list_table( 'WP_Posts_List_Table', array( 'screen' => $_POST['screen'] ) );
+	$wp_list_table = _get_list_table('WP_Posts_List_Table', array('screen' => $_POST['screen']));
 
 	$mode = $_POST['post_view'] === 'excerpt' ? 'excerpt' : 'list';
 
 	$level = 0;
-	$request_post = array( get_post( $_POST['post_ID'] ) );
+	$request_post = array(get_post($_POST['post_ID']));
 	$parent = $request_post[0]->post_parent;
 
-	while ( $parent > 0 ) {
-		$parent_post = get_post( $parent );
+	while ($parent > 0) {
+		$parent_post = get_post($parent);
 		$parent = $parent_post->post_parent;
 		$level++;
 	}
 
-	$wp_list_table->display_rows( array( get_post( $_POST['post_ID'] ) ), $level );
+	$wp_list_table->display_rows(array(get_post($_POST['post_ID'])), $level);
 
 	wp_die();
 }
@@ -1694,45 +1694,45 @@ 
 function wp_ajax_inline_save_tax() {
 	global $wp_list_table;
 
-	check_ajax_referer( 'taxinlineeditnonce', '_inline_edit' );
+	check_ajax_referer('taxinlineeditnonce', '_inline_edit');
 
-	$taxonomy = sanitize_key( $_POST['taxonomy'] );
-	$tax = get_taxonomy( $taxonomy );
-	if ( ! $tax )
-		wp_die( 0 );
+	$taxonomy = sanitize_key($_POST['taxonomy']);
+	$tax = get_taxonomy($taxonomy);
+	if ( ! $tax)
+		wp_die(0);
 
-	if ( ! current_user_can( $tax->cap->edit_terms ) )
+	if ( ! current_user_can($tax->cap->edit_terms))
 		wp_die( -1 );
 
-	$wp_list_table = _get_list_table( 'WP_Terms_List_Table', array( 'screen' => 'edit-' . $taxonomy ) );
+	$wp_list_table = _get_list_table('WP_Terms_List_Table', array('screen' => 'edit-'.$taxonomy));
 
-	if ( ! isset($_POST['tax_ID']) || ! ( $id = (int) $_POST['tax_ID'] ) )
+	if ( ! isset($_POST['tax_ID']) || ! ($id = (int) $_POST['tax_ID']))
 		wp_die( -1 );
 
-	$tag = get_term( $id, $taxonomy );
+	$tag = get_term($id, $taxonomy);
 	$_POST['description'] = $tag->description;
 
 	$updated = wp_update_term($id, $taxonomy, $_POST);
-	if ( $updated && !is_wp_error($updated) ) {
-		$tag = get_term( $updated['term_id'], $taxonomy );
-		if ( !$tag || is_wp_error( $tag ) ) {
-			if ( is_wp_error($tag) && $tag->get_error_message() )
-				wp_die( $tag->get_error_message() );
-			wp_die( __( 'Item not updated.' ) );
+	if ($updated && ! is_wp_error($updated)) {
+		$tag = get_term($updated['term_id'], $taxonomy);
+		if ( ! $tag || is_wp_error($tag)) {
+			if (is_wp_error($tag) && $tag->get_error_message())
+				wp_die($tag->get_error_message());
+			wp_die(__('Item not updated.'));
 		}
 	} else {
-		if ( is_wp_error($updated) && $updated->get_error_message() )
-			wp_die( $updated->get_error_message() );
-		wp_die( __( 'Item not updated.' ) );
+		if (is_wp_error($updated) && $updated->get_error_message())
+			wp_die($updated->get_error_message());
+		wp_die(__('Item not updated.'));
 	}
 	$level = 0;
 	$parent = $tag->parent;
-	while ( $parent > 0 ) {
-		$parent_tag = get_term( $parent, $taxonomy );
+	while ($parent > 0) {
+		$parent_tag = get_term($parent, $taxonomy);
 		$parent = $parent_tag->parent;
 		$level++;
 	}
-	$wp_list_table->single_row( $tag, $level );
+	$wp_list_table->single_row($tag, $level);
 	wp_die();
 }
 
@@ -1744,33 +1744,33 @@ 
  * @since 3.1.0
  */
 function wp_ajax_find_posts() {
-	check_ajax_referer( 'find-posts' );
+	check_ajax_referer('find-posts');
 
-	$post_types = get_post_types( array( 'public' => true ), 'objects' );
-	unset( $post_types['attachment'] );
+	$post_types = get_post_types(array('public' => true), 'objects');
+	unset($post_types['attachment']);
 
-	$s = wp_unslash( $_POST['ps'] );
+	$s = wp_unslash($_POST['ps']);
 	$args = array(
-		'post_type' => array_keys( $post_types ),
+		'post_type' => array_keys($post_types),
 		'post_status' => 'any',
 		'posts_per_page' => 50,
 	);
-	if ( '' !== $s )
+	if ('' !== $s)
 		$args['s'] = $s;
 
-	$posts = get_posts( $args );
+	$posts = get_posts($args);
 
-	if ( ! $posts ) {
-		wp_send_json_error( __( 'No items found.' ) );
+	if ( ! $posts) {
+		wp_send_json_error(__('No items found.'));
 	}
 
 	$html = '<table class="widefat"><thead><tr><th class="found-radio"><br /></th><th>'.__('Title').'</th><th class="no-break">'.__('Type').'</th><th class="no-break">'.__('Date').'</th><th class="no-break">'.__('Status').'</th></tr></thead><tbody>';
 	$alt = '';
-	foreach ( $posts as $post ) {
-		$title = trim( $post->post_title ) ? $post->post_title : __( '(no title)' );
-		$alt = ( 'alternate' == $alt ) ? '' : 'alternate';
+	foreach ($posts as $post) {
+		$title = trim($post->post_title) ? $post->post_title : __('(no title)');
+		$alt = ('alternate' == $alt) ? '' : 'alternate';
 
-		switch ( $post->post_status ) {
+		switch ($post->post_status) {
 			case 'publish' :
 			case 'private' :
 				$stat = __('Published');
@@ -1786,20 +1786,20 @@ 
 				break;
 		}
 
-		if ( '0000-00-00 00:00:00' == $post->post_date ) {
+		if ('0000-00-00 00:00:00' == $post->post_date) {
 			$time = '';
 		} else {
 			/* translators: date format in table columns, see http://php.net/date */
 			$time = mysql2date(__('Y/m/d'), $post->post_date);
 		}
 
-		$html .= '<tr class="' . trim( 'found-posts ' . $alt ) . '"><td class="found-radio"><input type="radio" id="found-'.$post->ID.'" name="found_post_id" value="' . esc_attr($post->ID) . '"></td>';
-		$html .= '<td><label for="found-'.$post->ID.'">' . esc_html( $title ) . '</label></td><td class="no-break">' . esc_html( $post_types[$post->post_type]->labels->singular_name ) . '</td><td class="no-break">'.esc_html( $time ) . '</td><td class="no-break">' . esc_html( $stat ). ' </td></tr>' . "\n\n";
+		$html .= '<tr class="'.trim('found-posts '.$alt).'"><td class="found-radio"><input type="radio" id="found-'.$post->ID.'" name="found_post_id" value="'.esc_attr($post->ID).'"></td>';
+		$html .= '<td><label for="found-'.$post->ID.'">'.esc_html($title).'</label></td><td class="no-break">'.esc_html($post_types[$post->post_type]->labels->singular_name).'</td><td class="no-break">'.esc_html($time).'</td><td class="no-break">'.esc_html($stat).' </td></tr>'."\n\n";
 	}
 
 	$html .= '</tbody></table>';
 
-	wp_send_json_success( $html );
+	wp_send_json_success($html);
 }
 
 /**
@@ -1808,22 +1808,22 @@ 
  * @since 3.1.0
  */
 function wp_ajax_widgets_order() {
-	check_ajax_referer( 'save-sidebar-widgets', 'savewidgets' );
+	check_ajax_referer('save-sidebar-widgets', 'savewidgets');
 
-	if ( !current_user_can('edit_theme_options') )
+	if ( ! current_user_can('edit_theme_options'))
 		wp_die( -1 );
 
-	unset( $_POST['savewidgets'], $_POST['action'] );
+	unset($_POST['savewidgets'], $_POST['action']);
 
 	// Save widgets order for all sidebars.
-	if ( is_array($_POST['sidebars']) ) {
+	if (is_array($_POST['sidebars'])) {
 		$sidebars = array();
-		foreach ( $_POST['sidebars'] as $key => $val ) {
+		foreach ($_POST['sidebars'] as $key => $val) {
 			$sb = array();
-			if ( !empty($val) ) {
+			if ( ! empty($val)) {
 				$val = explode(',', $val);
-				foreach ( $val as $k => $v ) {
-					if ( strpos($v, 'widget-') === false )
+				foreach ($val as $k => $v) {
+					if (strpos($v, 'widget-') === false)
 						continue;
 
 					$sb[$k] = substr($v, strpos($v, '_') + 1);
@@ -1832,7 +1832,7 @@ 
 			$sidebars[$key] = $sb;
 		}
 		wp_set_sidebars_widgets($sidebars);
-		wp_die( 1 );
+		wp_die(1);
 	}
 
 	wp_die( -1 );
@@ -1850,87 +1850,87 @@ 
 function wp_ajax_save_widget() {
 	global $wp_registered_widgets, $wp_registered_widget_controls, $wp_registered_widget_updates;
 
-	check_ajax_referer( 'save-sidebar-widgets', 'savewidgets' );
+	check_ajax_referer('save-sidebar-widgets', 'savewidgets');
 
-	if ( !current_user_can('edit_theme_options') || !isset($_POST['id_base']) )
+	if ( ! current_user_can('edit_theme_options') || ! isset($_POST['id_base']))
 		wp_die( -1 );
 
-	unset( $_POST['savewidgets'], $_POST['action'] );
+	unset($_POST['savewidgets'], $_POST['action']);
 
 	/**
 	 * Fires early when editing the widgets displayed in sidebars.
 	 *
 	 * @since 2.8.0
 	 */
-	do_action( 'load-widgets.php' );
+	do_action('load-widgets.php');
 
 	/**
 	 * Fires early when editing the widgets displayed in sidebars.
 	 *
 	 * @since 2.8.0
 	 */
-	do_action( 'widgets.php' );
+	do_action('widgets.php');
 
 	/** This action is documented in wp-admin/widgets.php */
-	do_action( 'sidebar_admin_setup' );
+	do_action('sidebar_admin_setup');
 
 	$id_base = $_POST['id_base'];
 	$widget_id = $_POST['widget-id'];
 	$sidebar_id = $_POST['sidebar'];
-	$multi_number = !empty($_POST['multi_number']) ? (int) $_POST['multi_number'] : 0;
-	$settings = isset($_POST['widget-' . $id_base]) && is_array($_POST['widget-' . $id_base]) ? $_POST['widget-' . $id_base] : false;
-	$error = '<p>' . __('An error has occurred. Please reload the page and try again.') . '</p>';
+	$multi_number = ! empty($_POST['multi_number']) ? (int) $_POST['multi_number'] : 0;
+	$settings = isset($_POST['widget-'.$id_base]) && is_array($_POST['widget-'.$id_base]) ? $_POST['widget-'.$id_base] : false;
+	$error = '<p>'.__('An error has occurred. Please reload the page and try again.').'</p>';
 
 	$sidebars = wp_get_sidebars_widgets();
 	$sidebar = isset($sidebars[$sidebar_id]) ? $sidebars[$sidebar_id] : array();
 
 	// Delete.
-	if ( isset($_POST['delete_widget']) && $_POST['delete_widget'] ) {
+	if (isset($_POST['delete_widget']) && $_POST['delete_widget']) {
 
-		if ( !isset($wp_registered_widgets[$widget_id]) )
-			wp_die( $error );
+		if ( ! isset($wp_registered_widgets[$widget_id]))
+			wp_die($error);
 
-		$sidebar = array_diff( $sidebar, array($widget_id) );
-		$_POST = array('sidebar' => $sidebar_id, 'widget-' . $id_base => array(), 'the-widget-id' => $widget_id, 'delete_widget' => '1');
+		$sidebar = array_diff($sidebar, array($widget_id));
+		$_POST = array('sidebar' => $sidebar_id, 'widget-'.$id_base => array(), 'the-widget-id' => $widget_id, 'delete_widget' => '1');
 
 		/** This action is documented in wp-admin/widgets.php */
-		do_action( 'delete_widget', $widget_id, $sidebar_id, $id_base );
+		do_action('delete_widget', $widget_id, $sidebar_id, $id_base);
 
-	} elseif ( $settings && preg_match( '/__i__|%i%/', key($settings) ) ) {
-		if ( !$multi_number )
-			wp_die( $error );
+	} elseif ($settings && preg_match('/__i__|%i%/', key($settings))) {
+		if ( ! $multi_number)
+			wp_die($error);
 
-		$_POST[ 'widget-' . $id_base ] = array( $multi_number => reset( $settings ) );
-		$widget_id = $id_base . '-' . $multi_number;
+		$_POST['widget-'.$id_base] = array($multi_number => reset($settings));
+		$widget_id = $id_base.'-'.$multi_number;
 		$sidebar[] = $widget_id;
 	}
 	$_POST['widget-id'] = $sidebar;
 
-	foreach ( (array) $wp_registered_widget_updates as $name => $control ) {
+	foreach ((array) $wp_registered_widget_updates as $name => $control) {
 
-		if ( $name == $id_base ) {
-			if ( !is_callable( $control['callback'] ) )
+		if ($name == $id_base) {
+			if ( ! is_callable($control['callback']))
 				continue;
 
 			ob_start();
-				call_user_func_array( $control['callback'], $control['params'] );
+				call_user_func_array($control['callback'], $control['params']);
 			ob_end_clean();
 			break;
 		}
 	}
 
-	if ( isset($_POST['delete_widget']) && $_POST['delete_widget'] ) {
+	if (isset($_POST['delete_widget']) && $_POST['delete_widget']) {
 		$sidebars[$sidebar_id] = $sidebar;
 		wp_set_sidebars_widgets($sidebars);
 		echo "deleted:$widget_id";
 		wp_die();
 	}
 
-	if ( !empty($_POST['add_new']) )
+	if ( ! empty($_POST['add_new']))
 		wp_die();
 
-	if ( $form = $wp_registered_widget_controls[$widget_id] )
-		call_user_func_array( $form['callback'], $form['params'] );
+	if ($form = $wp_registered_widget_controls[$widget_id])
+		call_user_func_array($form['callback'], $form['params']);
 
 	wp_die();
 }
@@ -1953,31 +1953,31 @@ 
  * @since 4.4.0
  */
 function wp_ajax_delete_inactive_widgets() {
-	check_ajax_referer( 'remove-inactive-widgets', 'removeinactivewidgets' );
+	check_ajax_referer('remove-inactive-widgets', 'removeinactivewidgets');
 
-	if ( ! current_user_can( 'edit_theme_options' ) ) {
+	if ( ! current_user_can('edit_theme_options')) {
 		wp_die( -1 );
 	}
 
-	unset( $_POST['removeinactivewidgets'], $_POST['action'] );
+	unset($_POST['removeinactivewidgets'], $_POST['action']);
 
-	do_action( 'load-widgets.php' );
-	do_action( 'widgets.php' );
-	do_action( 'sidebar_admin_setup' );
+	do_action('load-widgets.php');
+	do_action('widgets.php');
+	do_action('sidebar_admin_setup');
 
 	$sidebars_widgets = wp_get_sidebars_widgets();
 
-	foreach ( $sidebars_widgets['wp_inactive_widgets'] as $key => $widget_id ) {
-		$pieces = explode( '-', $widget_id );
-		$multi_number = array_pop( $pieces );
-		$id_base = implode( '-', $pieces );
-		$widget = get_option( 'widget_' . $id_base );
-		unset( $widget[$multi_number] );
-		update_option( 'widget_' . $id_base, $widget );
-		unset( $sidebars_widgets['wp_inactive_widgets'][$key] );
+	foreach ($sidebars_widgets['wp_inactive_widgets'] as $key => $widget_id) {
+		$pieces = explode('-', $widget_id);
+		$multi_number = array_pop($pieces);
+		$id_base = implode('-', $pieces);
+		$widget = get_option('widget_'.$id_base);
+		unset($widget[$multi_number]);
+		update_option('widget_'.$id_base, $widget);
+		unset($sidebars_widgets['wp_inactive_widgets'][$key]);
 	}
 
-	wp_set_sidebars_widgets( $sidebars_widgets );
+	wp_set_sidebars_widgets($sidebars_widgets);
 
 	wp_die();
 }
@@ -1988,35 +1988,35 @@ 
  * @since 3.3.0
  */
 function wp_ajax_upload_attachment() {
-	check_ajax_referer( 'media-form' );
+	check_ajax_referer('media-form');
 	/*
 	 * This function does not use wp_send_json_success() / wp_send_json_error()
 	 * as the html4 Plupload handler requires a text/html content-type for older IE.
 	 * See https://core.trac.wordpress.org/ticket/31037
 	 */
 
-	if ( ! current_user_can( 'upload_files' ) ) {
-		echo wp_json_encode( array(
+	if ( ! current_user_can('upload_files')) {
+		echo wp_json_encode(array(
 			'success' => false,
 			'data'    => array(
-				'message'  => __( 'You do not have permission to upload files.' ),
+				'message'  => __('You do not have permission to upload files.'),
 				'filename' => $_FILES['async-upload']['name'],
 			)
-		) );
+		));
 
 		wp_die();
 	}
 
-	if ( isset( $_REQUEST['post_id'] ) ) {
+	if (isset($_REQUEST['post_id'])) {
 		$post_id = $_REQUEST['post_id'];
-		if ( ! current_user_can( 'edit_post', $post_id ) ) {
-			echo wp_json_encode( array(
+		if ( ! current_user_can('edit_post', $post_id)) {
+			echo wp_json_encode(array(
 				'success' => false,
 				'data'    => array(
-					'message'  => __( "You don't have permission to attach files to this post." ),
+					'message'  => __("You don't have permission to attach files to this post."),
 					'filename' => $_FILES['async-upload']['name'],
 				)
-			) );
+			));
 
 			wp_die();
 		}
@@ -2024,53 +2024,53 @@ 
 		$post_id = null;
 	}
 
-	$post_data = isset( $_REQUEST['post_data'] ) ? $_REQUEST['post_data'] : array();
+	$post_data = isset($_REQUEST['post_data']) ? $_REQUEST['post_data'] : array();
 
 	// If the context is custom header or background, make sure the uploaded file is an image.
-	if ( isset( $post_data['context'] ) && in_array( $post_data['context'], array( 'custom-header', 'custom-background' ) ) ) {
-		$wp_filetype = wp_check_filetype_and_ext( $_FILES['async-upload']['tmp_name'], $_FILES['async-upload']['name'] );
-		if ( ! wp_match_mime_types( 'image', $wp_filetype['type'] ) ) {
-			echo wp_json_encode( array(
+	if (isset($post_data['context']) && in_array($post_data['context'], array('custom-header', 'custom-background'))) {
+		$wp_filetype = wp_check_filetype_and_ext($_FILES['async-upload']['tmp_name'], $_FILES['async-upload']['name']);
+		if ( ! wp_match_mime_types('image', $wp_filetype['type'])) {
+			echo wp_json_encode(array(
 				'success' => false,
 				'data'    => array(
-					'message'  => __( 'The uploaded file is not a valid image. Please try again.' ),
+					'message'  => __('The uploaded file is not a valid image. Please try again.'),
 					'filename' => $_FILES['async-upload']['name'],
 				)
-			) );
+			));
 
 			wp_die();
 		}
 	}
 
-	$attachment_id = media_handle_upload( 'async-upload', $post_id, $post_data );
+	$attachment_id = media_handle_upload('async-upload', $post_id, $post_data);
 
-	if ( is_wp_error( $attachment_id ) ) {
-		echo wp_json_encode( array(
+	if (is_wp_error($attachment_id)) {
+		echo wp_json_encode(array(
 			'success' => false,
 			'data'    => array(
 				'message'  => $attachment_id->get_error_message(),
 				'filename' => $_FILES['async-upload']['name'],
 			)
-		) );
+		));
 
 		wp_die();
 	}
 
-	if ( isset( $post_data['context'] ) && isset( $post_data['theme'] ) ) {
-		if ( 'custom-background' === $post_data['context'] )
-			update_post_meta( $attachment_id, '_wp_attachment_is_custom_background', $post_data['theme'] );
+	if (isset($post_data['context']) && isset($post_data['theme'])) {
+		if ('custom-background' === $post_data['context'])
+			update_post_meta($attachment_id, '_wp_attachment_is_custom_background', $post_data['theme']);
 
-		if ( 'custom-header' === $post_data['context'] )
-			update_post_meta( $attachment_id, '_wp_attachment_is_custom_header', $post_data['theme'] );
+		if ('custom-header' === $post_data['context'])
+			update_post_meta($attachment_id, '_wp_attachment_is_custom_header', $post_data['theme']);
 	}
 
-	if ( ! $attachment = wp_prepare_attachment_for_js( $attachment_id ) )
+	if ( ! $attachment = wp_prepare_attachment_for_js($attachment_id))
 		wp_die();
 
-	echo wp_json_encode( array(
+	echo wp_json_encode(array(
 		'success' => true,
 		'data'    => $attachment,
-	) );
+	));
 
 	wp_die();
 }
@@ -2082,18 +2082,18 @@ 
  */
 function wp_ajax_image_editor() {
 	$attachment_id = intval($_POST['postid']);
-	if ( empty($attachment_id) || !current_user_can('edit_post', $attachment_id) )
+	if (empty($attachment_id) || ! current_user_can('edit_post', $attachment_id))
 		wp_die( -1 );
 
-	check_ajax_referer( "image_editor-$attachment_id" );
-	include_once( ABSPATH . 'wp-admin/includes/image-edit.php' );
+	check_ajax_referer("image_editor-$attachment_id");
+	include_once(ABSPATH.'wp-admin/includes/image-edit.php');
 
 	$msg = false;
-	switch ( $_POST['do'] ) {
+	switch ($_POST['do']) {
 		case 'save' :
 			$msg = wp_save_image($attachment_id);
 			$msg = wp_json_encode($msg);
-			wp_die( $msg );
+			wp_die($msg);
 			break;
 		case 'scale' :
 			$msg = wp_save_image($attachment_id);
@@ -2113,34 +2113,34 @@ 
  * @since 3.1.0
  */
 function wp_ajax_set_post_thumbnail() {
-	$json = ! empty( $_REQUEST['json'] ); // New-style request
+	$json = ! empty($_REQUEST['json']); // New-style request
 
-	$post_ID = intval( $_POST['post_id'] );
-	if ( ! current_user_can( 'edit_post', $post_ID ) )
+	$post_ID = intval($_POST['post_id']);
+	if ( ! current_user_can('edit_post', $post_ID))
 		wp_die( -1 );
 
-	$thumbnail_id = intval( $_POST['thumbnail_id'] );
+	$thumbnail_id = intval($_POST['thumbnail_id']);
 
-	if ( $json )
-		check_ajax_referer( "update-post_$post_ID" );
+	if ($json)
+		check_ajax_referer("update-post_$post_ID");
 	else
-		check_ajax_referer( "set_post_thumbnail-$post_ID" );
+		check_ajax_referer("set_post_thumbnail-$post_ID");
 
-	if ( $thumbnail_id == '-1' ) {
-		if ( delete_post_thumbnail( $post_ID ) ) {
-			$return = _wp_post_thumbnail_html( null, $post_ID );
-			$json ? wp_send_json_success( $return ) : wp_die( $return );
+	if ($thumbnail_id == '-1') {
+		if (delete_post_thumbnail($post_ID)) {
+			$return = _wp_post_thumbnail_html(null, $post_ID);
+			$json ? wp_send_json_success($return) : wp_die($return);
 		} else {
-			wp_die( 0 );
+			wp_die(0);
 		}
 	}
 
-	if ( set_post_thumbnail( $post_ID, $thumbnail_id ) ) {
-		$return = _wp_post_thumbnail_html( $thumbnail_id, $post_ID );
-		$json ? wp_send_json_success( $return ) : wp_die( $return );
+	if (set_post_thumbnail($post_ID, $thumbnail_id)) {
+		$return = _wp_post_thumbnail_html($thumbnail_id, $post_ID);
+		$json ? wp_send_json_success($return) : wp_die($return);
 	}
 
-	wp_die( 0 );
+	wp_die(0);
 }
 
 /**
@@ -2151,41 +2151,41 @@ 
  * @see set_post_thumbnail()
  */
 function wp_ajax_set_attachment_thumbnail() {
-	if ( empty( $_POST['urls'] ) || ! is_array( $_POST['urls'] ) ) {
+	if (empty($_POST['urls']) || ! is_array($_POST['urls'])) {
 		wp_send_json_error();
 	}
 
 	$thumbnail_id = (int) $_POST['thumbnail_id'];
-	if ( empty( $thumbnail_id ) ) {
+	if (empty($thumbnail_id)) {
 		wp_send_json_error();
 	}
 
 	$post_ids = array();
 	// For each URL, try to find its corresponding post ID.
-	foreach ( $_POST['urls'] as $url ) {
-		$post_id = attachment_url_to_postid( $url );
-		if ( ! empty( $post_id ) ) {
+	foreach ($_POST['urls'] as $url) {
+		$post_id = attachment_url_to_postid($url);
+		if ( ! empty($post_id)) {
 			$post_ids[] = $post_id;
 		}
 	}
 
-	if ( empty( $post_ids ) ) {
+	if (empty($post_ids)) {
 		wp_send_json_error();
 	}
 
 	$success = 0;
 	// For each found attachment, set its thumbnail.
-	foreach ( $post_ids as $post_id ) {
-		if ( ! current_user_can( 'edit_post', $post_id ) ) {
+	foreach ($post_ids as $post_id) {
+		if ( ! current_user_can('edit_post', $post_id)) {
 			continue;
 		}
 
-		if ( set_post_thumbnail( $post_id, $thumbnail_id ) ) {
+		if (set_post_thumbnail($post_id, $thumbnail_id)) {
 			$success++;
 		}
 	}
 
-	if ( 0 === $success ) {
+	if (0 === $success) {
 		wp_send_json_error();
 	} else {
 		wp_send_json_success();
@@ -2200,7 +2200,7 @@ 
  * @since 3.1.0
  */
 function wp_ajax_date_format() {
-	wp_die( date_i18n( sanitize_option( 'date_format', wp_unslash( $_POST['date'] ) ) ) );
+	wp_die(date_i18n(sanitize_option('date_format', wp_unslash($_POST['date']))));
 }
 
 /**
@@ -2209,7 +2209,7 @@ 
  * @since 3.1.0
  */
 function wp_ajax_time_format() {
-	wp_die( date_i18n( sanitize_option( 'time_format', wp_unslash( $_POST['date'] ) ) ) );
+	wp_die(date_i18n(sanitize_option('time_format', wp_unslash($_POST['date']))));
 }
 
 /**
@@ -2219,37 +2219,37 @@ 
  * @deprecated 4.3.0
  */
 function wp_ajax_wp_fullscreen_save_post() {
-	$post_id = isset( $_POST['post_ID'] ) ? (int) $_POST['post_ID'] : 0;
+	$post_id = isset($_POST['post_ID']) ? (int) $_POST['post_ID'] : 0;
 
 	$post = null;
 
-	if ( $post_id )
-		$post = get_post( $post_id );
+	if ($post_id)
+		$post = get_post($post_id);
 
-	check_ajax_referer('update-post_' . $post_id, '_wpnonce');
+	check_ajax_referer('update-post_'.$post_id, '_wpnonce');
 
 	$post_id = edit_post();
 
-	if ( is_wp_error( $post_id ) ) {
+	if (is_wp_error($post_id)) {
 		wp_send_json_error();
 	}
 
-	if ( $post ) {
-		$last_date = mysql2date( __( 'F j, Y' ), $post->post_modified );
-		$last_time = mysql2date( __( 'g:i a' ), $post->post_modified );
+	if ($post) {
+		$last_date = mysql2date(__('F j, Y'), $post->post_modified);
+		$last_time = mysql2date(__('g:i a'), $post->post_modified);
 	} else {
-		$last_date = date_i18n( __( 'F j, Y' ) );
-		$last_time = date_i18n( __( 'g:i a' ) );
+		$last_date = date_i18n(__('F j, Y'));
+		$last_time = date_i18n(__('g:i a'));
 	}
 
-	if ( $last_id = get_post_meta( $post_id, '_edit_last', true ) ) {
-		$last_user = get_userdata( $last_id );
-		$last_edited = sprintf( __('Last edited by %1$s on %2$s at %3$s'), esc_html( $last_user->display_name ), $last_date, $last_time );
+	if ($last_id = get_post_meta($post_id, '_edit_last', true)) {
+		$last_user = get_userdata($last_id);
+		$last_edited = sprintf(__('Last edited by %1$s on %2$s at %3$s'), esc_html($last_user->display_name), $last_date, $last_time);
 	} else {
-		$last_edited = sprintf( __('Last edited on %1$s at %2$s'), $last_date, $last_time );
+		$last_edited = sprintf(__('Last edited on %1$s at %2$s'), $last_date, $last_time);
 	}
 
-	wp_send_json_success( array( 'last_edited' => $last_edited ) );
+	wp_send_json_success(array('last_edited' => $last_edited));
 }
 
 /**
@@ -2258,20 +2258,20 @@ 
  * @since 3.1.0
  */
 function wp_ajax_wp_remove_post_lock() {
-	if ( empty( $_POST['post_ID'] ) || empty( $_POST['active_post_lock'] ) )
-		wp_die( 0 );
+	if (empty($_POST['post_ID']) || empty($_POST['active_post_lock']))
+		wp_die(0);
 	$post_id = (int) $_POST['post_ID'];
-	if ( ! $post = get_post( $post_id ) )
-		wp_die( 0 );
+	if ( ! $post = get_post($post_id))
+		wp_die(0);
 
-	check_ajax_referer( 'update-post_' . $post_id );
+	check_ajax_referer('update-post_'.$post_id);
 
-	if ( ! current_user_can( 'edit_post', $post_id ) )
+	if ( ! current_user_can('edit_post', $post_id))
 		wp_die( -1 );
 
-	$active_lock = array_map( 'absint', explode( ':', $_POST['active_post_lock'] ) );
-	if ( $active_lock[1] != get_current_user_id() )
-		wp_die( 0 );
+	$active_lock = array_map('absint', explode(':', $_POST['active_post_lock']));
+	if ($active_lock[1] != get_current_user_id())
+		wp_die(0);
 
 	/**
 	 * Filter the post lock window duration.
@@ -2281,9 +2281,9 @@ 
 	 * @param int $interval The interval in seconds the post lock duration
 	 *                      should last, plus 5 seconds. Default 150.
 	 */
-	$new_lock = ( time() - apply_filters( 'wp_check_post_lock_window', 150 ) + 5 ) . ':' . $active_lock[1];
-	update_post_meta( $post_id, '_edit_lock', $new_lock, implode( ':', $active_lock ) );
-	wp_die( 1 );
+	$new_lock = (time() - apply_filters('wp_check_post_lock_window', 150) + 5).':'.$active_lock[1];
+	update_post_meta($post_id, '_edit_lock', $new_lock, implode(':', $active_lock));
+	wp_die(1);
 }
 
 /**
@@ -2293,21 +2293,21 @@ 
  */
 function wp_ajax_dismiss_wp_pointer() {
 	$pointer = $_POST['pointer'];
-	if ( $pointer != sanitize_key( $pointer ) )
-		wp_die( 0 );
+	if ($pointer != sanitize_key($pointer))
+		wp_die(0);
 
 //	check_ajax_referer( 'dismiss-pointer_' . $pointer );
 
-	$dismissed = array_filter( explode( ',', (string) get_user_meta( get_current_user_id(), 'dismissed_wp_pointers', true ) ) );
+	$dismissed = array_filter(explode(',', (string) get_user_meta(get_current_user_id(), 'dismissed_wp_pointers', true)));
 
-	if ( in_array( $pointer, $dismissed ) )
-		wp_die( 0 );
+	if (in_array($pointer, $dismissed))
+		wp_die(0);
 
 	$dismissed[] = $pointer;
-	$dismissed = implode( ',', $dismissed );
+	$dismissed = implode(',', $dismissed);
 
-	update_user_meta( get_current_user_id(), 'dismissed_wp_pointers', $dismissed );
-	wp_die( 1 );
+	update_user_meta(get_current_user_id(), 'dismissed_wp_pointers', $dismissed);
+	wp_die(1);
 }
 
 /**
@@ -2316,25 +2316,25 @@ 
  * @since 3.5.0
  */
 function wp_ajax_get_attachment() {
-	if ( ! isset( $_REQUEST['id'] ) )
+	if ( ! isset($_REQUEST['id']))
 		wp_send_json_error();
 
-	if ( ! $id = absint( $_REQUEST['id'] ) )
+	if ( ! $id = absint($_REQUEST['id']))
 		wp_send_json_error();
 
-	if ( ! $post = get_post( $id ) )
+	if ( ! $post = get_post($id))
 		wp_send_json_error();
 
-	if ( 'attachment' != $post->post_type )
+	if ('attachment' != $post->post_type)
 		wp_send_json_error();
 
-	if ( ! current_user_can( 'upload_files' ) )
+	if ( ! current_user_can('upload_files'))
 		wp_send_json_error();
 
-	if ( ! $attachment = wp_prepare_attachment_for_js( $id ) )
+	if ( ! $attachment = wp_prepare_attachment_for_js($id))
 		wp_send_json_error();
 
-	wp_send_json_success( $attachment );
+	wp_send_json_success($attachment);
 }
 
 /**
@@ -2343,31 +2343,31 @@ 
  * @since 3.5.0
  */
 function wp_ajax_query_attachments() {
-	if ( ! current_user_can( 'upload_files' ) )
+	if ( ! current_user_can('upload_files'))
 		wp_send_json_error();
 
-	$query = isset( $_REQUEST['query'] ) ? (array) $_REQUEST['query'] : array();
+	$query = isset($_REQUEST['query']) ? (array) $_REQUEST['query'] : array();
 	$keys = array(
 		's', 'order', 'orderby', 'posts_per_page', 'paged', 'post_mime_type',
 		'post_parent', 'post__in', 'post__not_in', 'year', 'monthnum'
 	);
-	foreach ( get_taxonomies_for_attachments( 'objects' ) as $t ) {
-		if ( $t->query_var && isset( $query[ $t->query_var ] ) ) {
+	foreach (get_taxonomies_for_attachments('objects') as $t) {
+		if ($t->query_var && isset($query[$t->query_var])) {
 			$keys[] = $t->query_var;
 		}
 	}
 
-	$query = array_intersect_key( $query, array_flip( $keys ) );
+	$query = array_intersect_key($query, array_flip($keys));
 	$query['post_type'] = 'attachment';
-	if ( MEDIA_TRASH
-		&& ! empty( $_REQUEST['query']['post_status'] )
-		&& 'trash' === $_REQUEST['query']['post_status'] ) {
+	if (MEDIA_TRASH
+		&& ! empty($_REQUEST['query']['post_status'])
+		&& 'trash' === $_REQUEST['query']['post_status']) {
 		$query['post_status'] = 'trash';
 	} else {
 		$query['post_status'] = 'inherit';
 	}
 
-	if ( current_user_can( get_post_type_object( 'attachment' )->cap->read_private_posts ) )
+	if (current_user_can(get_post_type_object('attachment')->cap->read_private_posts))
 		$query['post_status'] .= ',private';
 
 	/**
@@ -2380,13 +2380,13 @@ 
 	 *
 	 * @param array $query An array of query variables.
 	 */
-	$query = apply_filters( 'ajax_query_attachments_args', $query );
-	$query = new WP_Query( $query );
+	$query = apply_filters('ajax_query_attachments_args', $query);
+	$query = new WP_Query($query);
 
-	$posts = array_map( 'wp_prepare_attachment_for_js', $query->posts );
-	$posts = array_filter( $posts );
+	$posts = array_map('wp_prepare_attachment_for_js', $query->posts);
+	$posts = array_filter($posts);
 
-	wp_send_json_success( $posts );
+	wp_send_json_success($posts);
 }
 
 /**
@@ -2395,69 +2395,69 @@ 
  * @since 3.5.0
  */
 function wp_ajax_save_attachment() {
-	if ( ! isset( $_REQUEST['id'] ) || ! isset( $_REQUEST['changes'] ) )
+	if ( ! isset($_REQUEST['id']) || ! isset($_REQUEST['changes']))
 		wp_send_json_error();
 
-	if ( ! $id = absint( $_REQUEST['id'] ) )
+	if ( ! $id = absint($_REQUEST['id']))
 		wp_send_json_error();
 
-	check_ajax_referer( 'update-post_' . $id, 'nonce' );
+	check_ajax_referer('update-post_'.$id, 'nonce');
 
-	if ( ! current_user_can( 'edit_post', $id ) )
+	if ( ! current_user_can('edit_post', $id))
 		wp_send_json_error();
 
 	$changes = $_REQUEST['changes'];
-	$post    = get_post( $id, ARRAY_A );
+	$post    = get_post($id, ARRAY_A);
 
-	if ( 'attachment' != $post['post_type'] )
+	if ('attachment' != $post['post_type'])
 		wp_send_json_error();
 
-	if ( isset( $changes['parent'] ) )
+	if (isset($changes['parent']))
 		$post['post_parent'] = $changes['parent'];
 
-	if ( isset( $changes['title'] ) )
+	if (isset($changes['title']))
 		$post['post_title'] = $changes['title'];
 
-	if ( isset( $changes['caption'] ) )
+	if (isset($changes['caption']))
 		$post['post_excerpt'] = $changes['caption'];
 
-	if ( isset( $changes['description'] ) )
+	if (isset($changes['description']))
 		$post['post_content'] = $changes['description'];
 
-	if ( MEDIA_TRASH && isset( $changes['status'] ) )
+	if (MEDIA_TRASH && isset($changes['status']))
 		$post['post_status'] = $changes['status'];
 
-	if ( isset( $changes['alt'] ) ) {
-		$alt = wp_unslash( $changes['alt'] );
-		if ( $alt != get_post_meta( $id, '_wp_attachment_image_alt', true ) ) {
-			$alt = wp_strip_all_tags( $alt, true );
-			update_post_meta( $id, '_wp_attachment_image_alt', wp_slash( $alt ) );
+	if (isset($changes['alt'])) {
+		$alt = wp_unslash($changes['alt']);
+		if ($alt != get_post_meta($id, '_wp_attachment_image_alt', true)) {
+			$alt = wp_strip_all_tags($alt, true);
+			update_post_meta($id, '_wp_attachment_image_alt', wp_slash($alt));
 		}
 	}
 
-	if ( wp_attachment_is( 'audio', $post['ID'] ) ) {
+	if (wp_attachment_is('audio', $post['ID'])) {
 		$changed = false;
-		$id3data = wp_get_attachment_metadata( $post['ID'] );
-		if ( ! is_array( $id3data ) ) {
+		$id3data = wp_get_attachment_metadata($post['ID']);
+		if ( ! is_array($id3data)) {
 			$changed = true;
 			$id3data = array();
 		}
-		foreach ( wp_get_attachment_id3_keys( (object) $post, 'edit' ) as $key => $label ) {
-			if ( isset( $changes[ $key ] ) ) {
+		foreach (wp_get_attachment_id3_keys((object) $post, 'edit') as $key => $label) {
+			if (isset($changes[$key])) {
 				$changed = true;
-				$id3data[ $key ] = sanitize_text_field( wp_unslash( $changes[ $key ] ) );
+				$id3data[$key] = sanitize_text_field(wp_unslash($changes[$key]));
 			}
 		}
 
-		if ( $changed ) {
-			wp_update_attachment_metadata( $id, $id3data );
+		if ($changed) {
+			wp_update_attachment_metadata($id, $id3data);
 		}
 	}
 
-	if ( MEDIA_TRASH && isset( $changes['status'] ) && 'trash' === $changes['status'] ) {
-		wp_delete_post( $id );
+	if (MEDIA_TRASH && isset($changes['status']) && 'trash' === $changes['status']) {
+		wp_delete_post($id);
 	} else {
-		wp_update_post( $post );
+		wp_update_post($post);
 	}
 
 	wp_send_json_success();
@@ -2469,45 +2469,45 @@ 
  * @since 3.5.0
  */
 function wp_ajax_save_attachment_compat() {
-	if ( ! isset( $_REQUEST['id'] ) )
+	if ( ! isset($_REQUEST['id']))
 		wp_send_json_error();
 
-	if ( ! $id = absint( $_REQUEST['id'] ) )
+	if ( ! $id = absint($_REQUEST['id']))
 		wp_send_json_error();
 
-	if ( empty( $_REQUEST['attachments'] ) || empty( $_REQUEST['attachments'][ $id ] ) )
+	if (empty($_REQUEST['attachments']) || empty($_REQUEST['attachments'][$id]))
 		wp_send_json_error();
-	$attachment_data = $_REQUEST['attachments'][ $id ];
+	$attachment_data = $_REQUEST['attachments'][$id];
 
-	check_ajax_referer( 'update-post_' . $id, 'nonce' );
+	check_ajax_referer('update-post_'.$id, 'nonce');
 
-	if ( ! current_user_can( 'edit_post', $id ) )
+	if ( ! current_user_can('edit_post', $id))
 		wp_send_json_error();
 
-	$post = get_post( $id, ARRAY_A );
+	$post = get_post($id, ARRAY_A);
 
-	if ( 'attachment' != $post['post_type'] )
+	if ('attachment' != $post['post_type'])
 		wp_send_json_error();
 
 	/** This filter is documented in wp-admin/includes/media.php */
-	$post = apply_filters( 'attachment_fields_to_save', $post, $attachment_data );
+	$post = apply_filters('attachment_fields_to_save', $post, $attachment_data);
 
-	if ( isset( $post['errors'] ) ) {
+	if (isset($post['errors'])) {
 		$errors = $post['errors']; // @todo return me and display me!
-		unset( $post['errors'] );
+		unset($post['errors']);
 	}
 
-	wp_update_post( $post );
+	wp_update_post($post);
 
-	foreach ( get_attachment_taxonomies( $post ) as $taxonomy ) {
-		if ( isset( $attachment_data[ $taxonomy ] ) )
-			wp_set_object_terms( $id, array_map( 'trim', preg_split( '/,+/', $attachment_data[ $taxonomy ] ) ), $taxonomy, false );
+	foreach (get_attachment_taxonomies($post) as $taxonomy) {
+		if (isset($attachment_data[$taxonomy]))
+			wp_set_object_terms($id, array_map('trim', preg_split('/,+/', $attachment_data[$taxonomy])), $taxonomy, false);
 	}
 
-	if ( ! $attachment = wp_prepare_attachment_for_js( $id ) )
+	if ( ! $attachment = wp_prepare_attachment_for_js($id))
 		wp_send_json_error();
 
-	wp_send_json_success( $attachment );
+	wp_send_json_success($attachment);
 }
 
 /**
@@ -2516,31 +2516,31 @@ 
  * @since 3.5.0
  */
 function wp_ajax_save_attachment_order() {
-	if ( ! isset( $_REQUEST['post_id'] ) )
+	if ( ! isset($_REQUEST['post_id']))
 		wp_send_json_error();
 
-	if ( ! $post_id = absint( $_REQUEST['post_id'] ) )
+	if ( ! $post_id = absint($_REQUEST['post_id']))
 		wp_send_json_error();
 
-	if ( empty( $_REQUEST['attachments'] ) )
+	if (empty($_REQUEST['attachments']))
 		wp_send_json_error();
 
-	check_ajax_referer( 'update-post_' . $post_id, 'nonce' );
+	check_ajax_referer('update-post_'.$post_id, 'nonce');
 
 	$attachments = $_REQUEST['attachments'];
 
-	if ( ! current_user_can( 'edit_post', $post_id ) )
+	if ( ! current_user_can('edit_post', $post_id))
 		wp_send_json_error();
 
-	foreach ( $attachments as $attachment_id => $menu_order ) {
-		if ( ! current_user_can( 'edit_post', $attachment_id ) )
+	foreach ($attachments as $attachment_id => $menu_order) {
+		if ( ! current_user_can('edit_post', $attachment_id))
 			continue;
-		if ( ! $attachment = get_post( $attachment_id ) )
+		if ( ! $attachment = get_post($attachment_id))
 			continue;
-		if ( 'attachment' != $attachment->post_type )
+		if ('attachment' != $attachment->post_type)
 			continue;
 
-		wp_update_post( array( 'ID' => $attachment_id, 'menu_order' => $menu_order ) );
+		wp_update_post(array('ID' => $attachment_id, 'menu_order' => $menu_order));
 	}
 
 	wp_send_json_success();
@@ -2556,59 +2556,59 @@ 
  * @since 3.5.0
  */
 function wp_ajax_send_attachment_to_editor() {
-	check_ajax_referer( 'media-send-to-editor', 'nonce' );
+	check_ajax_referer('media-send-to-editor', 'nonce');
 
-	$attachment = wp_unslash( $_POST['attachment'] );
+	$attachment = wp_unslash($_POST['attachment']);
 
-	$id = intval( $attachment['id'] );
+	$id = intval($attachment['id']);
 
-	if ( ! $post = get_post( $id ) )
+	if ( ! $post = get_post($id))
 		wp_send_json_error();
 
-	if ( 'attachment' != $post->post_type )
+	if ('attachment' != $post->post_type)
 		wp_send_json_error();
 
-	if ( current_user_can( 'edit_post', $id ) ) {
+	if (current_user_can('edit_post', $id)) {
 		// If this attachment is unattached, attach it. Primarily a back compat thing.
-		if ( 0 == $post->post_parent && $insert_into_post_id = intval( $_POST['post_id'] ) ) {
-			wp_update_post( array( 'ID' => $id, 'post_parent' => $insert_into_post_id ) );
+		if (0 == $post->post_parent && $insert_into_post_id = intval($_POST['post_id'])) {
+			wp_update_post(array('ID' => $id, 'post_parent' => $insert_into_post_id));
 		}
 	}
 
 	$rel = '';
-	$url = empty( $attachment['url'] ) ? '' : $attachment['url'];
-	if ( strpos( $url, 'attachment_id') || get_attachment_link( $id ) == $url ) {
-		$rel = 'attachment wp-att-' . $id;
+	$url = empty($attachment['url']) ? '' : $attachment['url'];
+	if (strpos($url, 'attachment_id') || get_attachment_link($id) == $url) {
+		$rel = 'attachment wp-att-'.$id;
 	}
 
-	remove_filter( 'media_send_to_editor', 'image_media_send_to_editor' );
+	remove_filter('media_send_to_editor', 'image_media_send_to_editor');
 
-	if ( 'image' === substr( $post->post_mime_type, 0, 5 ) ) {
-		$align = isset( $attachment['align'] ) ? $attachment['align'] : 'none';
-		$size = isset( $attachment['image-size'] ) ? $attachment['image-size'] : 'medium';
-		$alt = isset( $attachment['image_alt'] ) ? $attachment['image_alt'] : '';
+	if ('image' === substr($post->post_mime_type, 0, 5)) {
+		$align = isset($attachment['align']) ? $attachment['align'] : 'none';
+		$size = isset($attachment['image-size']) ? $attachment['image-size'] : 'medium';
+		$alt = isset($attachment['image_alt']) ? $attachment['image_alt'] : '';
 
 		// No whitespace-only captions.
-		$caption = isset( $attachment['post_excerpt'] ) ? $attachment['post_excerpt'] : '';
-		if ( '' === trim( $caption ) ) {
+		$caption = isset($attachment['post_excerpt']) ? $attachment['post_excerpt'] : '';
+		if ('' === trim($caption)) {
 			$caption = '';
 		}
 
 		$title = ''; // We no longer insert title tags into <img> tags, as they are redundant.
-		$html = get_image_send_to_editor( $id, $caption, $title, $align, $url, $rel, $size, $alt );
-	} elseif ( wp_attachment_is( 'video', $post ) || wp_attachment_is( 'audio', $post )  ) {
-		$html = stripslashes_deep( $_POST['html'] );
+		$html = get_image_send_to_editor($id, $caption, $title, $align, $url, $rel, $size, $alt);
+	} elseif (wp_attachment_is('video', $post) || wp_attachment_is('audio', $post)) {
+		$html = stripslashes_deep($_POST['html']);
 	} else {
-		$html = isset( $attachment['post_title'] ) ? $attachment['post_title'] : '';
-		if ( ! empty( $url ) ) {
-			$html = '<a href="' . esc_url( $url ) . '"' . 'rel="' . esc_attr( $rel ) . '">' . $html . '</a>';
+		$html = isset($attachment['post_title']) ? $attachment['post_title'] : '';
+		if ( ! empty($url)) {
+			$html = '<a href="'.esc_url($url).'"'.'rel="'.esc_attr($rel).'">'.$html.'</a>';
 		}
 	}
 
 	/** This filter is documented in wp-admin/includes/media.php */
-	$html = apply_filters( 'media_send_to_editor', $html, $id, $attachment );
+	$html = apply_filters('media_send_to_editor', $html, $id, $attachment);
 
-	wp_send_json_success( $html );
+	wp_send_json_success($html);
 }
 
 /**
@@ -2629,47 +2629,47 @@ 
 function wp_ajax_send_link_to_editor() {
 	global $post, $wp_embed;
 
-	check_ajax_referer( 'media-send-to-editor', 'nonce' );
+	check_ajax_referer('media-send-to-editor', 'nonce');
 
-	if ( ! $src = wp_unslash( $_POST['src'] ) )
+	if ( ! $src = wp_unslash($_POST['src']))
 		wp_send_json_error();
 
-	if ( ! strpos( $src, '://' ) )
-		$src = 'http://' . $src;
+	if ( ! strpos($src, '://'))
+		$src = 'http://'.$src;
 
-	if ( ! $src = esc_url_raw( $src ) )
+	if ( ! $src = esc_url_raw($src))
 		wp_send_json_error();
 
-	if ( ! $link_text = trim( wp_unslash( $_POST['link_text'] ) ) )
-		$link_text = wp_basename( $src );
+	if ( ! $link_text = trim(wp_unslash($_POST['link_text'])))
+		$link_text = wp_basename($src);
 
-	$post = get_post( isset( $_POST['post_id'] ) ? $_POST['post_id'] : 0 );
+	$post = get_post(isset($_POST['post_id']) ? $_POST['post_id'] : 0);
 
 	// Ping WordPress for an embed.
-	$check_embed = $wp_embed->run_shortcode( '[embed]'. $src .'[/embed]' );
+	$check_embed = $wp_embed->run_shortcode('[embed]'.$src.'[/embed]');
 
 	// Fallback that WordPress creates when no oEmbed was found.
-	$fallback = $wp_embed->maybe_make_link( $src );
+	$fallback = $wp_embed->maybe_make_link($src);
 
-	if ( $check_embed !== $fallback ) {
+	if ($check_embed !== $fallback) {
 		// TinyMCE view for [embed] will parse this
-		$html = '[embed]' . $src . '[/embed]';
-	} elseif ( $link_text ) {
-		$html = '<a href="' . esc_url( $src ) . '">' . $link_text . '</a>';
+		$html = '[embed]'.$src.'[/embed]';
+	} elseif ($link_text) {
+		$html = '<a href="'.esc_url($src).'">'.$link_text.'</a>';
 	} else {
 		$html = '';
 	}
 
 	// Figure out what filter to run:
 	$type = 'file';
-	if ( ( $ext = preg_replace( '/^.+?\.([^.]+)$/', '$1', $src ) ) && ( $ext_type = wp_ext2type( $ext ) )
-		&& ( 'audio' == $ext_type || 'video' == $ext_type ) )
+	if (($ext = preg_replace('/^.+?\.([^.]+)$/', '$1', $src)) && ($ext_type = wp_ext2type($ext))
+		&& ('audio' == $ext_type || 'video' == $ext_type))
 			$type = $ext_type;
 
 	/** This filter is documented in wp-admin/includes/media.php */
-	$html = apply_filters( $type . '_send_to_editor_url', $html, $src, $link_text );
+	$html = apply_filters($type.'_send_to_editor_url', $html, $src, $link_text);
 
-	wp_send_json_success( $html );
+	wp_send_json_success($html);
 }
 
 /**
@@ -2680,35 +2680,35 @@ 
  * @since 3.6.0
  */
 function wp_ajax_heartbeat() {
-	if ( empty( $_POST['_nonce'] ) ) {
+	if (empty($_POST['_nonce'])) {
 		wp_send_json_error();
 	}
 
 	$response = $data = array();
-	$nonce_state = wp_verify_nonce( $_POST['_nonce'], 'heartbeat-nonce' );
+	$nonce_state = wp_verify_nonce($_POST['_nonce'], 'heartbeat-nonce');
 
 	// screen_id is the same as $current_screen->id and the JS global 'pagenow'.
-	if ( ! empty( $_POST['screen_id'] ) ) {
+	if ( ! empty($_POST['screen_id'])) {
 		$screen_id = sanitize_key($_POST['screen_id']);
 	} else {
 		$screen_id = 'front';
 	}
 
-	if ( ! empty( $_POST['data'] ) ) {
-		$data = wp_unslash( (array) $_POST['data'] );
+	if ( ! empty($_POST['data'])) {
+		$data = wp_unslash((array) $_POST['data']);
 	}
 
-	if ( 1 !== $nonce_state ) {
-		$response = apply_filters( 'wp_refresh_nonces', $response, $data, $screen_id );
+	if (1 !== $nonce_state) {
+		$response = apply_filters('wp_refresh_nonces', $response, $data, $screen_id);
 
-		if ( false === $nonce_state ) {
+		if (false === $nonce_state) {
 			// User is logged in but nonces have expired.
 			$response['nonces_expired'] = true;
-			wp_send_json( $response );
+			wp_send_json($response);
 		}
 	}
 
-	if ( ! empty( $data ) ) {
+	if ( ! empty($data)) {
 		/**
 		 * Filter the Heartbeat response received.
 		 *
@@ -2718,7 +2718,7 @@ 
 		 * @param array  $data      The $_POST data sent.
 		 * @param string $screen_id The screen id.
 		 */
-		$response = apply_filters( 'heartbeat_received', $response, $data, $screen_id );
+		$response = apply_filters('heartbeat_received', $response, $data, $screen_id);
 	}
 
 	/**
@@ -2729,7 +2729,7 @@ 
 	 * @param array  $response  The Heartbeat response.
 	 * @param string $screen_id The screen id.
 	 */
-	$response = apply_filters( 'heartbeat_send', $response, $screen_id );
+	$response = apply_filters('heartbeat_send', $response, $screen_id);
 
 	/**
 	 * Fires when Heartbeat ticks in logged-in environments.
@@ -2741,12 +2741,12 @@ 
 	 * @param array  $response  The Heartbeat response.
 	 * @param string $screen_id The screen id.
 	 */
-	do_action( 'heartbeat_tick', $response, $screen_id );
+	do_action('heartbeat_tick', $response, $screen_id);
 
 	// Send the current time according to the server
 	$response['server_time'] = time();
 
-	wp_send_json( $response );
+	wp_send_json($response);
 }
 
 /**
@@ -2755,30 +2755,30 @@ 
  * @since 3.6.0
  */
 function wp_ajax_get_revision_diffs() {
-	require ABSPATH . 'wp-admin/includes/revision.php';
+	require ABSPATH.'wp-admin/includes/revision.php';
 
-	if ( ! $post = get_post( (int) $_REQUEST['post_id'] ) )
+	if ( ! $post = get_post((int) $_REQUEST['post_id']))
 		wp_send_json_error();
 
-	if ( ! current_user_can( 'read_post', $post->ID ) )
+	if ( ! current_user_can('read_post', $post->ID))
 		wp_send_json_error();
 
 	// Really just pre-loading the cache here.
-	if ( ! $revisions = wp_get_post_revisions( $post->ID, array( 'check_enabled' => false ) ) )
+	if ( ! $revisions = wp_get_post_revisions($post->ID, array('check_enabled' => false)))
 		wp_send_json_error();
 
 	$return = array();
-	@set_time_limit( 0 );
+	@set_time_limit(0);
 
-	foreach ( $_REQUEST['compare'] as $compare_key ) {
-		list( $compare_from, $compare_to ) = explode( ':', $compare_key ); // from:to
+	foreach ($_REQUEST['compare'] as $compare_key) {
+		list($compare_from, $compare_to) = explode(':', $compare_key); // from:to
 
 		$return[] = array(
 			'id' => $compare_key,
-			'fields' => wp_get_revision_ui_diff( $post, $compare_from, $compare_to ),
+			'fields' => wp_get_revision_ui_diff($post, $compare_from, $compare_to),
 		);
 	}
-	wp_send_json_success( $return );
+	wp_send_json_success($return);
 }
 
 /**
@@ -2792,21 +2792,21 @@ 
 function wp_ajax_save_user_color_scheme() {
 	global $_wp_admin_css_colors;
 
-	check_ajax_referer( 'save-color-scheme', 'nonce' );
+	check_ajax_referer('save-color-scheme', 'nonce');
 
-	$color_scheme = sanitize_key( $_POST['color_scheme'] );
+	$color_scheme = sanitize_key($_POST['color_scheme']);
 
-	if ( ! isset( $_wp_admin_css_colors[ $color_scheme ] ) ) {
+	if ( ! isset($_wp_admin_css_colors[$color_scheme])) {
 		wp_send_json_error();
 	}
 
-	$previous_color_scheme = get_user_meta( get_current_user_id(), 'admin_color', true );
-	update_user_meta( get_current_user_id(), 'admin_color', $color_scheme );
+	$previous_color_scheme = get_user_meta(get_current_user_id(), 'admin_color', true);
+	update_user_meta(get_current_user_id(), 'admin_color', $color_scheme);
 
-	wp_send_json_success( array(
-		'previousScheme' => 'admin-color-' . $previous_color_scheme,
-		'currentScheme'  => 'admin-color-' . $color_scheme
-	) );
+	wp_send_json_success(array(
+		'previousScheme' => 'admin-color-'.$previous_color_scheme,
+		'currentScheme'  => 'admin-color-'.$color_scheme
+	));
 }
 
 /**
@@ -2820,50 +2820,50 @@ 
 function wp_ajax_query_themes() {
 	global $themes_allowedtags, $theme_field_defaults;
 
-	if ( ! current_user_can( 'install_themes' ) ) {
+	if ( ! current_user_can('install_themes')) {
 		wp_send_json_error();
 	}
 
-	$args = wp_parse_args( wp_unslash( $_REQUEST['request'] ), array(
+	$args = wp_parse_args(wp_unslash($_REQUEST['request']), array(
 		'per_page' => 20,
 		'fields'   => $theme_field_defaults
-	) );
+	));
 
-	if ( isset( $args['browse'] ) && 'favorites' === $args['browse'] && ! isset( $args['user'] ) ) {
-		$user = get_user_option( 'wporg_favorites' );
-		if ( $user ) {
+	if (isset($args['browse']) && 'favorites' === $args['browse'] && ! isset($args['user'])) {
+		$user = get_user_option('wporg_favorites');
+		if ($user) {
 			$args['user'] = $user;
 		}
 	}
 
-	$old_filter = isset( $args['browse'] ) ? $args['browse'] : 'search';
+	$old_filter = isset($args['browse']) ? $args['browse'] : 'search';
 
 	/** This filter is documented in wp-admin/includes/class-wp-theme-install-list-table.php */
-	$args = apply_filters( 'install_themes_table_api_args_' . $old_filter, $args );
+	$args = apply_filters('install_themes_table_api_args_'.$old_filter, $args);
 
-	$api = themes_api( 'query_themes', $args );
+	$api = themes_api('query_themes', $args);
 
-	if ( is_wp_error( $api ) ) {
+	if (is_wp_error($api)) {
 		wp_send_json_error();
 	}
 
-	$update_php = network_admin_url( 'update.php?action=install-theme' );
-	foreach ( $api->themes as &$theme ) {
-		$theme->install_url = add_query_arg( array(
+	$update_php = network_admin_url('update.php?action=install-theme');
+	foreach ($api->themes as &$theme) {
+		$theme->install_url = add_query_arg(array(
 			'theme'    => $theme->slug,
-			'_wpnonce' => wp_create_nonce( 'install-theme_' . $theme->slug )
-		), $update_php );
+			'_wpnonce' => wp_create_nonce('install-theme_'.$theme->slug)
+		), $update_php);
 
-		$theme->name        = wp_kses( $theme->name, $themes_allowedtags );
-		$theme->author      = wp_kses( $theme->author, $themes_allowedtags );
-		$theme->version     = wp_kses( $theme->version, $themes_allowedtags );
-		$theme->description = wp_kses( $theme->description, $themes_allowedtags );
-		$theme->stars       = wp_star_rating( array( 'rating' => $theme->rating, 'type' => 'percent', 'number' => $theme->num_ratings, 'echo' => false ) );
-		$theme->num_ratings = number_format_i18n( $theme->num_ratings );
-		$theme->preview_url = set_url_scheme( $theme->preview_url );
+		$theme->name        = wp_kses($theme->name, $themes_allowedtags);
+		$theme->author      = wp_kses($theme->author, $themes_allowedtags);
+		$theme->version     = wp_kses($theme->version, $themes_allowedtags);
+		$theme->description = wp_kses($theme->description, $themes_allowedtags);
+		$theme->stars       = wp_star_rating(array('rating' => $theme->rating, 'type' => 'percent', 'number' => $theme->num_ratings, 'echo' => false));
+		$theme->num_ratings = number_format_i18n($theme->num_ratings);
+		$theme->preview_url = set_url_scheme($theme->preview_url);
 	}
 
-	wp_send_json_success( $api );
+	wp_send_json_success($api);
 }
 
 /**
@@ -2878,87 +2878,87 @@ 
 function wp_ajax_parse_embed() {
 	global $post, $wp_embed;
 
-	if ( ! $post = get_post( (int) $_POST['post_ID'] ) ) {
+	if ( ! $post = get_post((int) $_POST['post_ID'])) {
 		wp_send_json_error();
 	}
 
-	if ( empty( $_POST['shortcode'] ) || ! current_user_can( 'edit_post', $post->ID ) ) {
+	if (empty($_POST['shortcode']) || ! current_user_can('edit_post', $post->ID)) {
 		wp_send_json_error();
 	}
 
-	$shortcode = wp_unslash( $_POST['shortcode'] );
+	$shortcode = wp_unslash($_POST['shortcode']);
 
-	preg_match( '/' . get_shortcode_regex() . '/s', $shortcode, $matches );
-	$atts = shortcode_parse_atts( $matches[3] );
-	if ( ! empty( $matches[5] ) ) {
+	preg_match('/'.get_shortcode_regex().'/s', $shortcode, $matches);
+	$atts = shortcode_parse_atts($matches[3]);
+	if ( ! empty($matches[5])) {
 		$url = $matches[5];
-	} elseif ( ! empty( $atts['src'] ) ) {
+	} elseif ( ! empty($atts['src'])) {
 		$url = $atts['src'];
 	} else {
 		$url = '';
 	}
 
 	$parsed = false;
-	setup_postdata( $post );
+	setup_postdata($post);
 
 	$wp_embed->return_false_on_fail = true;
 
-	if ( is_ssl() && 0 === strpos( $url, 'http://' ) ) {
+	if (is_ssl() && 0 === strpos($url, 'http://')) {
 		// Admin is ssl and the user pasted non-ssl URL.
 		// Check if the provider supports ssl embeds and use that for the preview.
-		$ssl_shortcode = preg_replace( '%^(\\[embed[^\\]]*\\])http://%i', '$1https://', $shortcode );
-		$parsed = $wp_embed->run_shortcode( $ssl_shortcode );
+		$ssl_shortcode = preg_replace('%^(\\[embed[^\\]]*\\])http://%i', '$1https://', $shortcode);
+		$parsed = $wp_embed->run_shortcode($ssl_shortcode);
 
-		if ( ! $parsed ) {
+		if ( ! $parsed) {
 			$no_ssl_support = true;
 		}
 	}
 
-	if ( $url && ! $parsed ) {
-		$parsed = $wp_embed->run_shortcode( $shortcode );
+	if ($url && ! $parsed) {
+		$parsed = $wp_embed->run_shortcode($shortcode);
 	}
 
-	if ( ! $parsed ) {
-		wp_send_json_error( array(
+	if ( ! $parsed) {
+		wp_send_json_error(array(
 			'type' => 'not-embeddable',
-			'message' => sprintf( __( '%s failed to embed.' ), '<code>' . esc_html( $url ) . '</code>' ),
-		) );
+			'message' => sprintf(__('%s failed to embed.'), '<code>'.esc_html($url).'</code>'),
+		));
 	}
 
-	if ( has_shortcode( $parsed, 'audio' ) || has_shortcode( $parsed, 'video' ) ) {
+	if (has_shortcode($parsed, 'audio') || has_shortcode($parsed, 'video')) {
 		$styles = '';
 		$mce_styles = wpview_media_sandbox_styles();
-		foreach ( $mce_styles as $style ) {
-			$styles .= sprintf( '<link rel="stylesheet" href="%s"/>', $style );
+		foreach ($mce_styles as $style) {
+			$styles .= sprintf('<link rel="stylesheet" href="%s"/>', $style);
 		}
 
-		$html = do_shortcode( $parsed );
+		$html = do_shortcode($parsed);
 
 		global $wp_scripts;
-		if ( ! empty( $wp_scripts ) ) {
+		if ( ! empty($wp_scripts)) {
 			$wp_scripts->done = array();
 		}
 		ob_start();
-		wp_print_scripts( 'wp-mediaelement' );
+		wp_print_scripts('wp-mediaelement');
 		$scripts = ob_get_clean();
 
-		$parsed = $styles . $html . $scripts;
+		$parsed = $styles.$html.$scripts;
 	}
 
 
-	if ( ! empty( $no_ssl_support ) || ( is_ssl() && ( preg_match( '%<(iframe|script|embed) [^>]*src="http://%', $parsed ) ||
-		preg_match( '%<link [^>]*href="http://%', $parsed ) ) ) ) {
+	if ( ! empty($no_ssl_support) || (is_ssl() && (preg_match('%<(iframe|script|embed) [^>]*src="http://%', $parsed) ||
+		preg_match('%<link [^>]*href="http://%', $parsed)))) {
 		// Admin is ssl and the embed is not. Iframes, scripts, and other "active content" will be blocked.
-		wp_send_json_error( array(
+		wp_send_json_error(array(
 			'type' => 'not-ssl',
-			'message' => __( 'This preview is unavailable in the editor.' ),
-		) );
+			'message' => __('This preview is unavailable in the editor.'),
+		));
 	}
 
-	wp_send_json_success( array(
+	wp_send_json_success(array(
 		'body' => $parsed,
 		'attr' => $wp_embed->last_attr
-	) );
+	));
 }
 
 /**
@@ -2970,42 +2970,42 @@ 
 function wp_ajax_parse_media_shortcode() {
 	global $post, $wp_scripts;
 
-	if ( empty( $_POST['shortcode'] ) ) {
+	if (empty($_POST['shortcode'])) {
 		wp_send_json_error();
 	}
 
-	$shortcode = wp_unslash( $_POST['shortcode'] );
+	$shortcode = wp_unslash($_POST['shortcode']);
 
-	if ( ! empty( $_POST['post_ID'] ) ) {
-		$post = get_post( (int) $_POST['post_ID'] );
+	if ( ! empty($_POST['post_ID'])) {
+		$post = get_post((int) $_POST['post_ID']);
 	}
 
 	// the embed shortcode requires a post
-	if ( ! $post || ! current_user_can( 'edit_post', $post->ID ) ) {
-		if ( 'embed' === $shortcode ) {
+	if ( ! $post || ! current_user_can('edit_post', $post->ID)) {
+		if ('embed' === $shortcode) {
 			wp_send_json_error();
 		}
 	} else {
-		setup_postdata( $post );
+		setup_postdata($post);
 	}
 
-	$parsed = do_shortcode( $shortcode  );
+	$parsed = do_shortcode($shortcode);
 
-	if ( empty( $parsed ) ) {
-		wp_send_json_error( array(
+	if (empty($parsed)) {
+		wp_send_json_error(array(
 			'type' => 'no-items',
-			'message' => __( 'No items found.' ),
-		) );
+			'message' => __('No items found.'),
+		));
 	}
 
 	$head = '';
 	$styles = wpview_media_sandbox_styles();
 
-	foreach ( $styles as $style ) {
-		$head .= '<link type="text/css" rel="stylesheet" href="' . $style . '">';
+	foreach ($styles as $style) {
+		$head .= '<link type="text/css" rel="stylesheet" href="'.$style.'">';
 	}
 
-	if ( ! empty( $wp_scripts ) ) {
+	if ( ! empty($wp_scripts)) {
 		$wp_scripts->done = array();
 	}
 
@@ -3013,18 +3013,18 @@ 
 
 	echo $parsed;
 
-	if ( 'playlist' === $_REQUEST['type'] ) {
+	if ('playlist' === $_REQUEST['type']) {
 		wp_underscore_playlist_templates();
 
-		wp_print_scripts( 'wp-playlist' );
+		wp_print_scripts('wp-playlist');
 	} else {
-		wp_print_scripts( array( 'froogaloop', 'wp-mediaelement' ) );
+		wp_print_scripts(array('froogaloop', 'wp-mediaelement'));
 	}
 
-	wp_send_json_success( array(
+	wp_send_json_success(array(
 		'head' => $head,
 		'body' => ob_get_clean()
-	) );
+	));
 }
 
 /**
@@ -3033,33 +3033,33 @@ 
  * @since 4.1.0
  */
 function wp_ajax_destroy_sessions() {
-	$user = get_userdata( (int) $_POST['user_id'] );
-	if ( $user ) {
-		if ( ! current_user_can( 'edit_user', $user->ID ) ) {
+	$user = get_userdata((int) $_POST['user_id']);
+	if ($user) {
+		if ( ! current_user_can('edit_user', $user->ID)) {
 			$user = false;
-		} elseif ( ! wp_verify_nonce( $_POST['nonce'], 'update-user_' . $user->ID ) ) {
+		} elseif ( ! wp_verify_nonce($_POST['nonce'], 'update-user_'.$user->ID)) {
 			$user = false;
 		}
 	}
 
-	if ( ! $user ) {
-		wp_send_json_error( array(
-			'message' => __( 'Could not log out user sessions. Please try again.' ),
-		) );
+	if ( ! $user) {
+		wp_send_json_error(array(
+			'message' => __('Could not log out user sessions. Please try again.'),
+		));
 	}
 
-	$sessions = WP_Session_Tokens::get_instance( $user->ID );
+	$sessions = WP_Session_Tokens::get_instance($user->ID);
 
-	if ( $user->ID === get_current_user_id() ) {
-		$sessions->destroy_others( wp_get_session_token() );
-		$message = __( 'You are now logged out everywhere else.' );
+	if ($user->ID === get_current_user_id()) {
+		$sessions->destroy_others(wp_get_session_token());
+		$message = __('You are now logged out everywhere else.');
 	} else {
 		$sessions->destroy_all();
 		/* translators: 1: User's display name. */
-		$message = sprintf( __( '%s has been logged out.' ), $user->display_name );
+		$message = sprintf(__('%s has been logged out.'), $user->display_name);
 	}
 
-	wp_send_json_success( array( 'message' => $message ) );
+	wp_send_json_success(array('message' => $message));
 }
 
 
@@ -3073,42 +3073,42 @@ 
 function wp_ajax_update_plugin() {
 	global $wp_filesystem;
 
-	$plugin = urldecode( $_POST['plugin'] );
+	$plugin = urldecode($_POST['plugin']);
 
 	$status = array(
 		'update'     => 'plugin',
 		'plugin'     => $plugin,
-		'slug'       => sanitize_key( $_POST['slug'] ),
+		'slug'       => sanitize_key($_POST['slug']),
 		'oldVersion' => '',
 		'newVersion' => '',
 	);
 
-	$plugin_data = get_plugin_data( WP_PLUGIN_DIR . '/' . $plugin );
-	if ( $plugin_data['Version'] ) {
-		$status['oldVersion'] = sprintf( __( 'Version %s' ), $plugin_data['Version'] );
+	$plugin_data = get_plugin_data(WP_PLUGIN_DIR.'/'.$plugin);
+	if ($plugin_data['Version']) {
+		$status['oldVersion'] = sprintf(__('Version %s'), $plugin_data['Version']);
 	}
 
-	if ( ! current_user_can( 'update_plugins' ) ) {
-		$status['error'] = __( 'You do not have sufficient permissions to update plugins for this site.' );
- 		wp_send_json_error( $status );
+	if ( ! current_user_can('update_plugins')) {
+		$status['error'] = __('You do not have sufficient permissions to update plugins for this site.');
+ 		wp_send_json_error($status);
 	}
 
-	check_ajax_referer( 'updates' );
+	check_ajax_referer('updates');
 
-	include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
+	include_once(ABSPATH.'wp-admin/includes/class-wp-upgrader.php');
 
 	wp_update_plugins();
 
 	$skin = new Automatic_Upgrader_Skin();
-	$upgrader = new Plugin_Upgrader( $skin );
-	$result = $upgrader->bulk_upgrade( array( $plugin ) );
+	$upgrader = new Plugin_Upgrader($skin);
+	$result = $upgrader->bulk_upgrade(array($plugin));
 
-	if ( is_array( $result ) && empty( $result[$plugin] ) && is_wp_error( $skin->result ) ) {
+	if (is_array($result) && empty($result[$plugin]) && is_wp_error($skin->result)) {
 		$result = $skin->result;
 	}
 
-	if ( is_array( $result ) && !empty( $result[ $plugin ] ) ) {
-		$plugin_update_data = current( $result );
+	if (is_array($result) && ! empty($result[$plugin])) {
+		$plugin_update_data = current($result);
 
 		/*
 		 * If the `update_plugins` site transient is empty (e.g. when you update
@@ -3118,38 +3118,38 @@ 
 		 * Preferably something can be done to ensure `update_plugins` isn't empty.
 		 * For now, surface some sort of error here.
 		 */
-		if ( $plugin_update_data === true ) {
-			$status['error'] = __( 'Plugin update failed.' );
- 			wp_send_json_error( $status );
+		if ($plugin_update_data === true) {
+			$status['error'] = __('Plugin update failed.');
+ 			wp_send_json_error($status);
 		}
 
-		$plugin_data = get_plugins( '/' . $result[ $plugin ]['destination_name'] );
-		$plugin_data = reset( $plugin_data );
+		$plugin_data = get_plugins('/'.$result[$plugin]['destination_name']);
+		$plugin_data = reset($plugin_data);
 
-		if ( $plugin_data['Version'] ) {
-			$status['newVersion'] = sprintf( __( 'Version %s' ), $plugin_data['Version'] );
+		if ($plugin_data['Version']) {
+			$status['newVersion'] = sprintf(__('Version %s'), $plugin_data['Version']);
 		}
 
-		wp_send_json_success( $status );
-	} else if ( is_wp_error( $result ) ) {
+		wp_send_json_success($status);
+	} else if (is_wp_error($result)) {
 		$status['error'] = $result->get_error_message();
- 		wp_send_json_error( $status );
+ 		wp_send_json_error($status);
 
- 	} else if ( is_bool( $result ) && ! $result ) {
+ 	} else if (is_bool($result) && ! $result) {
 		$status['errorCode'] = 'unable_to_connect_to_filesystem';
-		$status['error'] = __( 'Unable to connect to the filesystem. Please confirm your credentials.' );
+		$status['error'] = __('Unable to connect to the filesystem. Please confirm your credentials.');
 
 		// Pass through the error from WP_Filesystem if one was raised
-		if ( is_wp_error( $wp_filesystem->errors ) && $wp_filesystem->errors->get_error_code() ) {
+		if (is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code()) {
 			$status['error'] = $wp_filesystem->errors->get_error_message();
 		}
 
-		wp_send_json_error( $status );
+		wp_send_json_error($status);
 
 	} else {
 		// An unhandled error occured
-		$status['error'] = __( 'Plugin update failed.' );
-		wp_send_json_error( $status );
+		$status['error'] = __('Plugin update failed.');
+		wp_send_json_error($status);
 	}
 }
 
@@ -3161,8 +3161,8 @@ 
  * @global WP_Press_This $wp_press_this
  */
 function wp_ajax_press_this_save_post() {
-	if ( empty( $GLOBALS['wp_press_this'] ) ) {
-		include( ABSPATH . 'wp-admin/includes/class-wp-press-this.php' );
+	if (empty($GLOBALS['wp_press_this'])) {
+		include(ABSPATH.'wp-admin/includes/class-wp-press-this.php');
 	}
 
 	$GLOBALS['wp_press_this']->save_post();
@@ -3176,8 +3176,8 @@ 
  * @global WP_Press_This $wp_press_this
  */
 function wp_ajax_press_this_add_category() {
-	if ( empty( $GLOBALS['wp_press_this'] ) ) {
-		include( ABSPATH . 'wp-admin/includes/class-wp-press-this.php' );
+	if (empty($GLOBALS['wp_press_this'])) {
+		include(ABSPATH.'wp-admin/includes/class-wp-press-this.php');
 	}
 
 	$GLOBALS['wp_press_this']->add_category();
@@ -3191,49 +3191,49 @@ 
  * @global WP_Site_Icon $wp_site_icon
  */
 function wp_ajax_crop_image() {
-	$attachment_id = absint( $_POST['id'] );
+	$attachment_id = absint($_POST['id']);
 
-	check_ajax_referer( 'image_editor-' . $attachment_id, 'nonce' );
-	if ( ! current_user_can( 'customize' ) ) {
+	check_ajax_referer('image_editor-'.$attachment_id, 'nonce');
+	if ( ! current_user_can('customize')) {
 		wp_send_json_error();
 	}
 
-	$context = str_replace( '_', '-', $_POST['context'] );
-	$data    = array_map( 'absint', $_POST['cropDetails'] );
-	$cropped = wp_crop_image( $attachment_id, $data['x1'], $data['y1'], $data['width'], $data['height'], $data['dst_width'], $data['dst_height'] );
+	$context = str_replace('_', '-', $_POST['context']);
+	$data    = array_map('absint', $_POST['cropDetails']);
+	$cropped = wp_crop_image($attachment_id, $data['x1'], $data['y1'], $data['width'], $data['height'], $data['dst_width'], $data['dst_height']);
 
-	if ( ! $cropped || is_wp_error( $cropped ) ) {
-		wp_send_json_error( array( 'message' => __( 'Image could not be processed.' ) ) );
+	if ( ! $cropped || is_wp_error($cropped)) {
+		wp_send_json_error(array('message' => __('Image could not be processed.')));
 	}
 
-	switch ( $context ) {
+	switch ($context) {
 		case 'site-icon':
-			require_once ABSPATH . '/wp-admin/includes/class-wp-site-icon.php';
+			require_once ABSPATH.'/wp-admin/includes/class-wp-site-icon.php';
 			global $wp_site_icon;
 
 			// Skip creating a new attachment if the attachment is a Site Icon.
-			if ( get_post_meta( $attachment_id, '_wp_attachment_context', true ) == $context ) {
+			if (get_post_meta($attachment_id, '_wp_attachment_context', true) == $context) {
 
 				// Delete the temporary cropped file, we don't need it.
-				wp_delete_file( $cropped );
+				wp_delete_file($cropped);
 
 				// Additional sizes in wp_prepare_attachment_for_js().
-				add_filter( 'image_size_names_choose', array( $wp_site_icon, 'additional_sizes' ) );
+				add_filter('image_size_names_choose', array($wp_site_icon, 'additional_sizes'));
 				break;
 			}
 
 			/** This filter is documented in wp-admin/custom-header.php */
-			$cropped = apply_filters( 'wp_create_file_in_uploads', $cropped, $attachment_id ); // For replication.
-			$object  = $wp_site_icon->create_attachment_object( $cropped, $attachment_id );
-			unset( $object['ID'] );
+			$cropped = apply_filters('wp_create_file_in_uploads', $cropped, $attachment_id); // For replication.
+			$object  = $wp_site_icon->create_attachment_object($cropped, $attachment_id);
+			unset($object['ID']);
 
 			// Update the attachment.
-			add_filter( 'intermediate_image_sizes_advanced', array( $wp_site_icon, 'additional_sizes' ) );
-			$attachment_id = $wp_site_icon->insert_attachment( $object, $cropped );
-			remove_filter( 'intermediate_image_sizes_advanced', array( $wp_site_icon, 'additional_sizes' ) );
+			add_filter('intermediate_image_sizes_advanced', array($wp_site_icon, 'additional_sizes'));
+			$attachment_id = $wp_site_icon->insert_attachment($object, $cropped);
+			remove_filter('intermediate_image_sizes_advanced', array($wp_site_icon, 'additional_sizes'));
 
 			// Additional sizes in wp_prepare_attachment_for_js().
-			add_filter( 'image_size_names_choose', array( $wp_site_icon, 'additional_sizes' ) );
+			add_filter('image_size_names_choose', array($wp_site_icon, 'additional_sizes'));
 			break;
 
 		default:
@@ -3249,27 +3249,27 @@ 
 			 * @param int    $attachment_id The attachment ID of the original image.
 			 * @param string $cropped       Path to the cropped image file.
 			 */
-			do_action( 'wp_ajax_crop_image_pre_save', $context, $attachment_id, $cropped );
+			do_action('wp_ajax_crop_image_pre_save', $context, $attachment_id, $cropped);
 
 			/** This filter is documented in wp-admin/custom-header.php */
-			$cropped = apply_filters( 'wp_create_file_in_uploads', $cropped, $attachment_id ); // For replication.
+			$cropped = apply_filters('wp_create_file_in_uploads', $cropped, $attachment_id); // For replication.
 
-			$parent_url = wp_get_attachment_url( $attachment_id );
-			$url        = str_replace( basename( $parent_url ), basename( $cropped ), $parent_url );
+			$parent_url = wp_get_attachment_url($attachment_id);
+			$url        = str_replace(basename($parent_url), basename($cropped), $parent_url);
 
-			$size       = @getimagesize( $cropped );
-			$image_type = ( $size ) ? $size['mime'] : 'image/jpeg';
+			$size       = @getimagesize($cropped);
+			$image_type = ($size) ? $size['mime'] : 'image/jpeg';
 
 			$object = array(
-				'post_title'     => basename( $cropped ),
+				'post_title'     => basename($cropped),
 				'post_content'   => $url,
 				'post_mime_type' => $image_type,
 				'guid'           => $url,
 				'context'        => $context,
 			);
 
-			$attachment_id = wp_insert_attachment( $object, $cropped );
-			$metadata = wp_generate_attachment_metadata( $attachment_id, $cropped );
+			$attachment_id = wp_insert_attachment($object, $cropped);
+			$metadata = wp_generate_attachment_metadata($attachment_id, $cropped);
 
 			/**
 			 * Filter the cropped image attachment metadata.
@@ -3280,8 +3280,8 @@ 
 			 *
 			 * @param array $metadata Attachment metadata.
 			 */
-			$metadata = apply_filters( 'wp_ajax_cropped_attachment_metadata', $metadata );
-			wp_update_attachment_metadata( $attachment_id, $metadata );
+			$metadata = apply_filters('wp_ajax_cropped_attachment_metadata', $metadata);
+			wp_update_attachment_metadata($attachment_id, $metadata);
 
 			/**
 			 * Filter the attachment ID for a cropped image.
@@ -3291,10 +3291,10 @@ 
 			 * @param int    $attachment_id The attachment ID of the cropped image.
 			 * @param string $context       The Customizer control requesting the cropped image.
 			 */
-			$attachment_id = apply_filters( 'wp_ajax_cropped_attachment_id', $attachment_id, $context );
+			$attachment_id = apply_filters('wp_ajax_cropped_attachment_id', $attachment_id, $context);
 	}
 
-	wp_send_json_success( wp_prepare_attachment_for_js( $attachment_id ) );
+	wp_send_json_success(wp_prepare_attachment_for_js($attachment_id));
 }
 
 /**
@@ -3303,7 +3303,7 @@ 
  * @since 4.4.0
  */
 function wp_ajax_generate_password() {
-	wp_send_json_success( wp_generate_password( 24 ) );
+	wp_send_json_success(wp_generate_password(24));
 }
 
 /**
@@ -3312,15 +3312,15 @@ 
  * @since 4.4.0
  */
 function wp_ajax_save_wporg_username() {
-	if ( ! current_user_can( 'install_themes' ) && ! current_user_can( 'install_plugins' ) ) {
+	if ( ! current_user_can('install_themes') && ! current_user_can('install_plugins')) {
 		wp_send_json_error();
 	}
 
-	$username = isset( $_REQUEST['username'] ) ? wp_unslash( $_REQUEST['username'] ) : false;
+	$username = isset($_REQUEST['username']) ? wp_unslash($_REQUEST['username']) : false;
 
-	if ( ! $username ) {
+	if ( ! $username) {
 		wp_send_json_error();
 	}
 
-	wp_send_json_success( update_user_meta( get_current_user_id(), 'wporg_favorites', $username ) );
+	wp_send_json_success(update_user_meta(get_current_user_id(), 'wporg_favorites', $username));
 }

Braces +582 added lines, -389 removed lines

@@ -23,10 +23,11 @@ 
 	$response = array();
 
 	// screen_id is the same as $current_screen->id and the JS global 'pagenow'.
-	if ( ! empty($_POST['screen_id']) )
-		$screen_id = sanitize_key($_POST['screen_id']);
-	else
-		$screen_id = 'front';
+	if ( ! empty($_POST['screen_id']) ) {
+			$screen_id = sanitize_key($_POST['screen_id']);
+	} else {
+			$screen_id = 'front';
+	}
 
 	if ( ! empty($_POST['data']) ) {
 		$data = wp_unslash( (array) $_POST['data'] );
@@ -89,11 +90,13 @@ 
 	check_ajax_referer( "fetch-list-$list_class", '_ajax_fetch_list_nonce' );
 
 	$wp_list_table = _get_list_table( $list_class, array( 'screen' => $_GET['list_args']['screen']['id'] ) );
-	if ( ! $wp_list_table )
-		wp_die( 0 );
+	if ( ! $wp_list_table ) {
+			wp_die( 0 );
+	}
 
-	if ( ! $wp_list_table->ajax_user_can() )
-		wp_die( -1 );
+	if ( ! $wp_list_table->ajax_user_can() ) {
+			wp_die( -1 );
+	}
 
 	$wp_list_table->ajax_response();
 
@@ -123,8 +126,9 @@ 
 	$s = wp_unslash( $_GET['q'] );
 
 	$comma = _x( ',', 'tag delimiter' );
-	if ( ',' !== $comma )
-		$s = str_replace( $comma, ',', $s );
+	if ( ',' !== $comma ) {
+			$s = str_replace( $comma, ',', $s );
+	}
 	if ( false !== strpos( $s, ',' ) ) {
 		$s = explode( ',', $s );
 		$s = $s[count( $s ) - 1];
@@ -162,8 +166,9 @@ 
  * @since 3.1.0
  */
 function wp_ajax_wp_compression_test() {
-	if ( !current_user_can( 'manage_options' ) )
-		wp_die( -1 );
+	if ( !current_user_can( 'manage_options' ) ) {
+			wp_die( -1 );
+	}
 
 	if ( ini_get('zlib.output_compression') || 'ob_gzhandler' == ini_get('output_handler') ) {
 		update_site_option('can_compress_scripts', 0);
@@ -183,8 +188,9 @@ 
 		 	echo $test_str;
 		 	wp_die();
 		 } elseif ( 2 == $_GET['test'] ) {
-			if ( !isset($_SERVER['HTTP_ACCEPT_ENCODING']) )
-				wp_die( -1 );
+			if ( !isset($_SERVER['HTTP_ACCEPT_ENCODING']) ) {
+							wp_die( -1 );
+			}
 			if ( false !== stripos( $_SERVER['HTTP_ACCEPT_ENCODING'], 'deflate') && function_exists('gzdeflate') && ! $force_gzip ) {
 				header('Content-Encoding: deflate');
 				$out = gzdeflate( $test_str, 1 );
@@ -213,14 +219,16 @@ 
  */
 function wp_ajax_imgedit_preview() {
 	$post_id = intval($_GET['postid']);
-	if ( empty($post_id) || !current_user_can('edit_post', $post_id) )
-		wp_die( -1 );
+	if ( empty($post_id) || !current_user_can('edit_post', $post_id) ) {
+			wp_die( -1 );
+	}
 
 	check_ajax_referer( "image_editor-$post_id" );
 
 	include_once( ABSPATH . 'wp-admin/includes/image-edit.php' );
-	if ( ! stream_preview_image($post_id) )
-		wp_die( -1 );
+	if ( ! stream_preview_image($post_id) ) {
+			wp_die( -1 );
+	}
 
 	wp_die();
 }
@@ -243,12 +251,14 @@ 
  * @since 3.4.0
  */
 function wp_ajax_autocomplete_user() {
-	if ( ! is_multisite() || ! current_user_can( 'promote_users' ) || wp_is_large_network( 'users' ) )
-		wp_die( -1 );
+	if ( ! is_multisite() || ! current_user_can( 'promote_users' ) || wp_is_large_network( 'users' ) ) {
+			wp_die( -1 );
+	}
 
 	/** This filter is documented in wp-admin/user-new.php */
-	if ( ! is_super_admin() && ! apply_filters( 'autocomplete_users_for_site_admins', false ) )
-		wp_die( -1 );
+	if ( ! is_super_admin() && ! apply_filters( 'autocomplete_users_for_site_admins', false ) ) {
+			wp_die( -1 );
+	}
 
 	$return = array();
 
@@ -378,8 +388,9 @@ 
 	}
 
 	$total += $delta;
-	if ( $total < 0 )
-		$total = 0;
+	if ( $total < 0 ) {
+			$total = 0;
+	}
 
 	// Only do the expensive stuff on a page-break, and about 1 other time per page
 	if ( 0 == $total % $per_page || 1 == mt_rand( 1, $per_page ) ) {
@@ -389,17 +400,20 @@ 
 		$parsed = parse_url( $url );
 		if ( isset( $parsed['query'] ) ) {
 			parse_str( $parsed['query'], $query_vars );
-			if ( !empty( $query_vars['comment_status'] ) )
-				$status = $query_vars['comment_status'];
-			if ( !empty( $query_vars['p'] ) )
-				$post_id = (int) $query_vars['p'];
+			if ( !empty( $query_vars['comment_status'] ) ) {
+							$status = $query_vars['comment_status'];
+			}
+			if ( !empty( $query_vars['p'] ) ) {
+							$post_id = (int) $query_vars['p'];
+			}
 		}
 
 		$comment_count = wp_count_comments($post_id);
 
 		// We're looking for a known type of comment count.
-		if ( isset( $comment_count->$status ) )
-			$total = $comment_count->$status;
+		if ( isset( $comment_count->$status ) ) {
+					$total = $comment_count->$status;
+		}
 			// Else use the decremented value from above.
 	}
 
@@ -438,34 +452,41 @@ 
 	$action = $_POST['action'];
 	$taxonomy = get_taxonomy(substr($action, 4));
 	check_ajax_referer( $action, '_ajax_nonce-add-' . $taxonomy->name );
-	if ( !current_user_can( $taxonomy->cap->edit_terms ) )
-		wp_die( -1 );
+	if ( !current_user_can( $taxonomy->cap->edit_terms ) ) {
+			wp_die( -1 );
+	}
 	$names = explode(',', $_POST['new'.$taxonomy->name]);
 	$parent = isset($_POST['new'.$taxonomy->name.'_parent']) ? (int) $_POST['new'.$taxonomy->name.'_parent'] : 0;
-	if ( 0 > $parent )
-		$parent = 0;
-	if ( $taxonomy->name == 'category' )
-		$post_category = isset($_POST['post_category']) ? (array) $_POST['post_category'] : array();
-	else
-		$post_category = ( isset($_POST['tax_input']) && isset($_POST['tax_input'][$taxonomy->name]) ) ? (array) $_POST['tax_input'][$taxonomy->name] : array();
+	if ( 0 > $parent ) {
+			$parent = 0;
+	}
+	if ( $taxonomy->name == 'category' ) {
+			$post_category = isset($_POST['post_category']) ? (array) $_POST['post_category'] : array();
+	} else {
+			$post_category = ( isset($_POST['tax_input']) && isset($_POST['tax_input'][$taxonomy->name]) ) ? (array) $_POST['tax_input'][$taxonomy->name] : array();
+	}
 	$checked_categories = array_map( 'absint', (array) $post_category );
 	$popular_ids = wp_popular_terms_checklist($taxonomy->name, 0, 10, false);
 
 	foreach ( $names as $cat_name ) {
 		$cat_name = trim($cat_name);
 		$category_nicename = sanitize_title($cat_name);
-		if ( '' === $category_nicename )
-			continue;
-		if ( !$cat_id = term_exists( $cat_name, $taxonomy->name, $parent ) )
-			$cat_id = wp_insert_term( $cat_name, $taxonomy->name, array( 'parent' => $parent ) );
+		if ( '' === $category_nicename ) {
+					continue;
+		}
+		if ( !$cat_id = term_exists( $cat_name, $taxonomy->name, $parent ) ) {
+					$cat_id = wp_insert_term( $cat_name, $taxonomy->name, array( 'parent' => $parent ) );
+		}
 		if ( is_wp_error( $cat_id ) ) {
 			continue;
 		} elseif ( is_array( $cat_id ) ) {
 			$cat_id = $cat_id['term_id'];
 		}
 		$checked_categories[] = $cat_id;
-		if ( $parent ) // Do these all at once in a second
+		if ( $parent ) {
+			// Do these all at once in a second
 			continue;
+		}
 
 		ob_start();
 
@@ -487,8 +508,9 @@ 
 
 		while ( $parent->parent ) { // get the top parent
 			$parent = get_term( $parent->parent, $taxonomy->name );
-			if ( is_wp_error( $parent ) )
-				break;
+			if ( is_wp_error( $parent ) ) {
+							break;
+			}
 			$term_id = $parent->term_id;
 		}
 
@@ -529,43 +551,55 @@ 
 function wp_ajax_delete_comment() {
 	$id = isset( $_POST['id'] ) ? (int) $_POST['id'] : 0;
 
-	if ( !$comment = get_comment( $id ) )
-		wp_die( time() );
-	if ( ! current_user_can( 'edit_comment', $comment->comment_ID ) )
-		wp_die( -1 );
+	if ( !$comment = get_comment( $id ) ) {
+			wp_die( time() );
+	}
+	if ( ! current_user_can( 'edit_comment', $comment->comment_ID ) ) {
+			wp_die( -1 );
+	}
 
 	check_ajax_referer( "delete-comment_$id" );
 	$status = wp_get_comment_status( $comment );
 
 	$delta = -1;
 	if ( isset($_POST['trash']) && 1 == $_POST['trash'] ) {
-		if ( 'trash' == $status )
-			wp_die( time() );
+		if ( 'trash' == $status ) {
+					wp_die( time() );
+		}
 		$r = wp_trash_comment( $comment );
 	} elseif ( isset($_POST['untrash']) && 1 == $_POST['untrash'] ) {
-		if ( 'trash' != $status )
-			wp_die( time() );
+		if ( 'trash' != $status ) {
+					wp_die( time() );
+		}
 		$r = wp_untrash_comment( $comment );
-		if ( ! isset( $_POST['comment_status'] ) || $_POST['comment_status'] != 'trash' ) // undo trash, not in trash
+		if ( ! isset( $_POST['comment_status'] ) || $_POST['comment_status'] != 'trash' ) {
+			// undo trash, not in trash
 			$delta = 1;
+		}
 	} elseif ( isset($_POST['spam']) && 1 == $_POST['spam'] ) {
-		if ( 'spam' == $status )
-			wp_die( time() );
+		if ( 'spam' == $status ) {
+					wp_die( time() );
+		}
 		$r = wp_spam_comment( $comment );
 	} elseif ( isset($_POST['unspam']) && 1 == $_POST['unspam'] ) {
-		if ( 'spam' != $status )
-			wp_die( time() );
+		if ( 'spam' != $status ) {
+					wp_die( time() );
+		}
 		$r = wp_unspam_comment( $comment );
-		if ( ! isset( $_POST['comment_status'] ) || $_POST['comment_status'] != 'spam' ) // undo spam, not in spam
+		if ( ! isset( $_POST['comment_status'] ) || $_POST['comment_status'] != 'spam' ) {
+			// undo spam, not in spam
 			$delta = 1;
+		}
 	} elseif ( isset($_POST['delete']) && 1 == $_POST['delete'] ) {
 		$r = wp_delete_comment( $comment );
 	} else {
 		wp_die( -1 );
 	}
 
-	if ( $r ) // Decide if we need to send back '1' or a more complicated response including page links and comment counts
+	if ( $r ) {
+		// Decide if we need to send back '1' or a more complicated response including page links and comment counts
 		_wp_ajax_delete_comment_response( $comment->comment_ID, $delta );
+	}
 	wp_die( 0 );
 }
 
@@ -581,18 +615,21 @@ 
 	$taxonomy = !empty($_POST['taxonomy']) ? $_POST['taxonomy'] : 'post_tag';
 	$tax = get_taxonomy($taxonomy);
 
-	if ( !current_user_can( $tax->cap->delete_terms ) )
-		wp_die( -1 );
+	if ( !current_user_can( $tax->cap->delete_terms ) ) {
+			wp_die( -1 );
+	}
 
 	$tag = get_term( $tag_id, $taxonomy );
-	if ( !$tag || is_wp_error( $tag ) )
-		wp_die( 1 );
+	if ( !$tag || is_wp_error( $tag ) ) {
+			wp_die( 1 );
+	}
 
-	if ( wp_delete_term($tag_id, $taxonomy))
-		wp_die( 1 );
-	else
-		wp_die( 0 );
-}
+	if ( wp_delete_term($tag_id, $taxonomy)) {
+			wp_die( 1 );
+	} else {
+			wp_die( 0 );
+	}
+	}
 
 /**
  * Ajax handler for deleting a link.
@@ -603,18 +640,21 @@ 
 	$id = isset( $_POST['id'] ) ? (int) $_POST['id'] : 0;
 
 	check_ajax_referer( "delete-bookmark_$id" );
-	if ( !current_user_can( 'manage_links' ) )
-		wp_die( -1 );
+	if ( !current_user_can( 'manage_links' ) ) {
+			wp_die( -1 );
+	}
 
 	$link = get_bookmark( $id );
-	if ( !$link || is_wp_error( $link ) )
-		wp_die( 1 );
+	if ( !$link || is_wp_error( $link ) ) {
+			wp_die( 1 );
+	}
 
-	if ( wp_delete_link( $id ) )
-		wp_die( 1 );
-	else
-		wp_die( 0 );
-}
+	if ( wp_delete_link( $id ) ) {
+			wp_die( 1 );
+	} else {
+			wp_die( 0 );
+	}
+	}
 
 /**
  * Ajax handler for deleting meta.
@@ -625,13 +665,16 @@ 
 	$id = isset( $_POST['id'] ) ? (int) $_POST['id'] : 0;
 
 	check_ajax_referer( "delete-meta_$id" );
-	if ( !$meta = get_metadata_by_mid( 'post', $id ) )
-		wp_die( 1 );
+	if ( !$meta = get_metadata_by_mid( 'post', $id ) ) {
+			wp_die( 1 );
+	}
 
-	if ( is_protected_meta( $meta->meta_key, 'post' ) || ! current_user_can( 'delete_post_meta',  $meta->post_id, $meta->meta_key ) )
-		wp_die( -1 );
-	if ( delete_meta( $meta->meta_id ) )
-		wp_die( 1 );
+	if ( is_protected_meta( $meta->meta_key, 'post' ) || ! current_user_can( 'delete_post_meta',  $meta->post_id, $meta->meta_key ) ) {
+			wp_die( -1 );
+	}
+	if ( delete_meta( $meta->meta_id ) ) {
+			wp_die( 1 );
+	}
 	wp_die( 0 );
 }
 
@@ -643,22 +686,26 @@ 
  * @param string $action Action to perform.
  */
 function wp_ajax_delete_post( $action ) {
-	if ( empty( $action ) )
-		$action = 'delete-post';
+	if ( empty( $action ) ) {
+			$action = 'delete-post';
+	}
 	$id = isset( $_POST['id'] ) ? (int) $_POST['id'] : 0;
 
 	check_ajax_referer( "{$action}_$id" );
-	if ( !current_user_can( 'delete_post', $id ) )
-		wp_die( -1 );
+	if ( !current_user_can( 'delete_post', $id ) ) {
+			wp_die( -1 );
+	}
 
-	if ( !get_post( $id ) )
-		wp_die( 1 );
+	if ( !get_post( $id ) ) {
+			wp_die( 1 );
+	}
 
-	if ( wp_delete_post( $id ) )
-		wp_die( 1 );
-	else
-		wp_die( 0 );
-}
+	if ( wp_delete_post( $id ) ) {
+			wp_die( 1 );
+	} else {
+			wp_die( 0 );
+	}
+	}
 
 /**
  * Ajax handler for sending a post to the trash.
@@ -668,24 +715,29 @@ 
  * @param string $action Action to perform.
  */
 function wp_ajax_trash_post( $action ) {
-	if ( empty( $action ) )
-		$action = 'trash-post';
+	if ( empty( $action ) ) {
+			$action = 'trash-post';
+	}
 	$id = isset( $_POST['id'] ) ? (int) $_POST['id'] : 0;
 
 	check_ajax_referer( "{$action}_$id" );
-	if ( !current_user_can( 'delete_post', $id ) )
-		wp_die( -1 );
+	if ( !current_user_can( 'delete_post', $id ) ) {
+			wp_die( -1 );
+	}
 
-	if ( !get_post( $id ) )
-		wp_die( 1 );
+	if ( !get_post( $id ) ) {
+			wp_die( 1 );
+	}
 
-	if ( 'trash-post' == $action )
-		$done = wp_trash_post( $id );
-	else
-		$done = wp_untrash_post( $id );
+	if ( 'trash-post' == $action ) {
+			$done = wp_trash_post( $id );
+	} else {
+			$done = wp_untrash_post( $id );
+	}
 
-	if ( $done )
-		wp_die( 1 );
+	if ( $done ) {
+			wp_die( 1 );
+	}
 
 	wp_die( 0 );
 }
@@ -698,8 +750,9 @@ 
  * @param string $action Action to perform.
  */
 function wp_ajax_untrash_post( $action ) {
-	if ( empty( $action ) )
-		$action = 'untrash-post';
+	if ( empty( $action ) ) {
+			$action = 'untrash-post';
+	}
 	wp_ajax_trash_post( $action );
 }
 
@@ -709,22 +762,26 @@ 
  * @param string $action
  */
 function wp_ajax_delete_page( $action ) {
-	if ( empty( $action ) )
-		$action = 'delete-page';
+	if ( empty( $action ) ) {
+			$action = 'delete-page';
+	}
 	$id = isset( $_POST['id'] ) ? (int) $_POST['id'] : 0;
 
 	check_ajax_referer( "{$action}_$id" );
-	if ( !current_user_can( 'delete_page', $id ) )
-		wp_die( -1 );
+	if ( !current_user_can( 'delete_page', $id ) ) {
+			wp_die( -1 );
+	}
 
-	if ( ! get_post( $id ) )
-		wp_die( 1 );
+	if ( ! get_post( $id ) ) {
+			wp_die( 1 );
+	}
 
-	if ( wp_delete_post( $id ) )
-		wp_die( 1 );
-	else
-		wp_die( 0 );
-}
+	if ( wp_delete_post( $id ) ) {
+			wp_die( 1 );
+	} else {
+			wp_die( 0 );
+	}
+	}
 
 /**
  * Ajax handler to dim a comment.
@@ -742,12 +799,14 @@ 
 		$x->send();
 	}
 
-	if ( ! current_user_can( 'edit_comment', $comment->comment_ID ) && ! current_user_can( 'moderate_comments' ) )
-		wp_die( -1 );
+	if ( ! current_user_can( 'edit_comment', $comment->comment_ID ) && ! current_user_can( 'moderate_comments' ) ) {
+			wp_die( -1 );
+	}
 
 	$current = wp_get_comment_status( $comment );
-	if ( isset( $_POST['new'] ) && $_POST['new'] == $current )
-		wp_die( time() );
+	if ( isset( $_POST['new'] ) && $_POST['new'] == $current ) {
+			wp_die( time() );
+	}
 
 	check_ajax_referer( "approve-comment_$id" );
 	if ( in_array( $current, array( 'unapproved', 'spam' ) ) ) {
@@ -777,20 +836,24 @@ 
  * @param string $action Action to perform.
  */
 function wp_ajax_add_link_category( $action ) {
-	if ( empty( $action ) )
-		$action = 'add-link-category';
+	if ( empty( $action ) ) {
+			$action = 'add-link-category';
+	}
 	check_ajax_referer( $action );
-	if ( !current_user_can( 'manage_categories' ) )
-		wp_die( -1 );
+	if ( !current_user_can( 'manage_categories' ) ) {
+			wp_die( -1 );
+	}
 	$names = explode(',', wp_unslash( $_POST['newcat'] ) );
 	$x = new WP_Ajax_Response();
 	foreach ( $names as $cat_name ) {
 		$cat_name = trim($cat_name);
 		$slug = sanitize_title($cat_name);
-		if ( '' === $slug )
-			continue;
-		if ( !$cat_id = term_exists( $cat_name, 'link_category' ) )
-			$cat_id = wp_insert_term( $cat_name, 'link_category' );
+		if ( '' === $slug ) {
+					continue;
+		}
+		if ( !$cat_id = term_exists( $cat_name, 'link_category' ) ) {
+					$cat_id = wp_insert_term( $cat_name, 'link_category' );
+		}
 		if ( is_wp_error( $cat_id ) ) {
 			continue;
 		} elseif ( is_array( $cat_id ) ) {
@@ -821,8 +884,9 @@ 
 	$taxonomy = !empty($_POST['taxonomy']) ? $_POST['taxonomy'] : 'post_tag';
 	$tax = get_taxonomy($taxonomy);
 
-	if ( !current_user_can( $tax->cap->edit_terms ) )
-		wp_die( -1 );
+	if ( !current_user_can( $tax->cap->edit_terms ) ) {
+			wp_die( -1 );
+	}
 
 	$x = new WP_Ajax_Response();
 
@@ -830,8 +894,9 @@ 
 
 	if ( !$tag || is_wp_error($tag) || (!$tag = get_term( $tag['term_id'], $taxonomy )) ) {
 		$message = __('An error has occurred. Please reload the page and try again.');
-		if ( is_wp_error($tag) && $tag->get_error_message() )
-			$message = $tag->get_error_message();
+		if ( is_wp_error($tag) && $tag->get_error_message() ) {
+					$message = $tag->get_error_message();
+		}
 
 		$x->add( array(
 			'what' => 'taxonomy',
@@ -888,11 +953,13 @@ 
 
 	$tags = get_terms( $taxonomy, array( 'number' => 45, 'orderby' => 'count', 'order' => 'DESC' ) );
 
-	if ( empty( $tags ) )
-		wp_die( $tax->labels->not_found );
+	if ( empty( $tags ) ) {
+			wp_die( $tax->labels->not_found );
+	}
 
-	if ( is_wp_error( $tags ) )
-		wp_die( $tags->get_error_message() );
+	if ( is_wp_error( $tags ) ) {
+			wp_die( $tags->get_error_message() );
+	}
 
 	foreach ( $tags as $key => $tag ) {
 		$tags[ $key ]->link = '#';
@@ -902,8 +969,9 @@ 
 	// We need raw tag names here, so don't filter the output
 	$return = wp_generate_tag_cloud( $tags, array('filter' => 0) );
 
-	if ( empty($return) )
-		wp_die( 0 );
+	if ( empty($return) ) {
+			wp_die( 0 );
+	}
 
 	echo $return;
 
@@ -922,35 +990,41 @@ 
  */
 function wp_ajax_get_comments( $action ) {
 	global $wp_list_table, $post_id;
-	if ( empty( $action ) )
-		$action = 'get-comments';
+	if ( empty( $action ) ) {
+			$action = 'get-comments';
+	}
 
 	check_ajax_referer( $action );
 
 	if ( empty( $post_id ) && ! empty( $_REQUEST['p'] ) ) {
 		$id = absint( $_REQUEST['p'] );
-		if ( ! empty( $id ) )
-			$post_id = $id;
+		if ( ! empty( $id ) ) {
+					$post_id = $id;
+		}
 	}
 
-	if ( empty( $post_id ) )
-		wp_die( -1 );
+	if ( empty( $post_id ) ) {
+			wp_die( -1 );
+	}
 
 	$wp_list_table = _get_list_table( 'WP_Post_Comments_List_Table', array( 'screen' => 'edit-comments' ) );
 
-	if ( ! current_user_can( 'edit_post', $post_id ) )
-		wp_die( -1 );
+	if ( ! current_user_can( 'edit_post', $post_id ) ) {
+			wp_die( -1 );
+	}
 
 	$wp_list_table->prepare_items();
 
-	if ( !$wp_list_table->has_items() )
-		wp_die( 1 );
+	if ( !$wp_list_table->has_items() ) {
+			wp_die( 1 );
+	}
 
 	$x = new WP_Ajax_Response();
 	ob_start();
 	foreach ( $wp_list_table->items as $comment ) {
-		if ( ! current_user_can( 'edit_comment', $comment->comment_ID ) )
-			continue;
+		if ( ! current_user_can( 'edit_comment', $comment->comment_ID ) ) {
+					continue;
+		}
 		get_comment( $comment );
 		$wp_list_table->single_row( $comment );
 	}
@@ -974,23 +1048,27 @@ 
  */
 function wp_ajax_replyto_comment( $action ) {
 	global $wp_list_table;
-	if ( empty( $action ) )
-		$action = 'replyto-comment';
+	if ( empty( $action ) ) {
+			$action = 'replyto-comment';
+	}
 
 	check_ajax_referer( $action, '_ajax_nonce-replyto-comment' );
 
 	$comment_post_ID = (int) $_POST['comment_post_ID'];
 	$post = get_post( $comment_post_ID );
-	if ( ! $post )
-		wp_die( -1 );
+	if ( ! $post ) {
+			wp_die( -1 );
+	}
 
-	if ( !current_user_can( 'edit_post', $comment_post_ID ) )
-		wp_die( -1 );
+	if ( !current_user_can( 'edit_post', $comment_post_ID ) ) {
+			wp_die( -1 );
+	}
 
-	if ( empty( $post->post_status ) )
-		wp_die( 1 );
-	elseif ( in_array($post->post_status, array('draft', 'pending', 'trash') ) )
-		wp_die( __('ERROR: you are replying to a comment on a draft post.') );
+	if ( empty( $post->post_status ) ) {
+			wp_die( 1 );
+	} elseif ( in_array($post->post_status, array('draft', 'pending', 'trash') ) ) {
+			wp_die( __('ERROR: you are replying to a comment on a draft post.') );
+	}
 
 	$user = wp_get_current_user();
 	if ( $user->exists() ) {
@@ -1001,8 +1079,9 @@ 
 		$comment_content      = trim( $_POST['content'] );
 		$comment_type         = isset( $_POST['comment_type'] ) ? trim( $_POST['comment_type'] ) : '';
 		if ( current_user_can( 'unfiltered_html' ) ) {
-			if ( ! isset( $_POST['_wp_unfiltered_html_comment'] ) )
-				$_POST['_wp_unfiltered_html_comment'] = '';
+			if ( ! isset( $_POST['_wp_unfiltered_html_comment'] ) ) {
+							$_POST['_wp_unfiltered_html_comment'] = '';
+			}
 
 			if ( wp_create_nonce( 'unfiltered-html-comment' ) != $_POST['_wp_unfiltered_html_comment'] ) {
 				kses_remove_filters(); // start with a clean slate
@@ -1013,12 +1092,14 @@ 
 		wp_die( __( 'Sorry, you must be logged in to reply to a comment.' ) );
 	}
 
-	if ( '' == $comment_content )
-		wp_die( __( 'ERROR: please type a comment.' ) );
+	if ( '' == $comment_content ) {
+			wp_die( __( 'ERROR: please type a comment.' ) );
+	}
 
 	$comment_parent = 0;
-	if ( isset( $_POST['comment_ID'] ) )
-		$comment_parent = absint( $_POST['comment_ID'] );
+	if ( isset( $_POST['comment_ID'] ) ) {
+			$comment_parent = absint( $_POST['comment_ID'] );
+	}
 	$comment_auto_approved = false;
 	$commentdata = compact('comment_post_ID', 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_content', 'comment_type', 'comment_parent', 'user_ID');
 
@@ -1031,14 +1112,17 @@ 
 				wp_die( -1 );
 			}
 
-			if ( wp_set_comment_status( $parent, 'approve' ) )
-				$comment_auto_approved = true;
+			if ( wp_set_comment_status( $parent, 'approve' ) ) {
+							$comment_auto_approved = true;
+			}
 		}
 	}
 
 	$comment_id = wp_new_comment( $commentdata );
 	$comment = get_comment($comment_id);
-	if ( ! $comment ) wp_die( 1 );
+	if ( ! $comment ) {
+		wp_die( 1 );
+	}
 
 	$position = ( isset($_POST['position']) && (int) $_POST['position'] ) ? (int) $_POST['position'] : '-1';
 
@@ -1099,14 +1183,17 @@ 
 	check_ajax_referer( 'replyto-comment', '_ajax_nonce-replyto-comment' );
 
 	$comment_id = (int) $_POST['comment_ID'];
-	if ( ! current_user_can( 'edit_comment', $comment_id ) )
-		wp_die( -1 );
+	if ( ! current_user_can( 'edit_comment', $comment_id ) ) {
+			wp_die( -1 );
+	}
 
-	if ( '' == $_POST['content'] )
-		wp_die( __( 'ERROR: please type a comment.' ) );
+	if ( '' == $_POST['content'] ) {
+			wp_die( __( 'ERROR: please type a comment.' ) );
+	}
 
-	if ( isset( $_POST['status'] ) )
-		$_POST['comment_status'] = $_POST['status'];
+	if ( isset( $_POST['status'] ) ) {
+			$_POST['comment_status'] = $_POST['status'];
+	}
 	edit_comment();
 
 	$position = ( isset($_POST['position']) && (int) $_POST['position']) ? (int) $_POST['position'] : '-1';
@@ -1114,8 +1201,9 @@ 
 	$wp_list_table = _get_list_table( $checkbox ? 'WP_Comments_List_Table' : 'WP_Post_Comments_List_Table', array( 'screen' => 'edit-comments' ) );
 
 	$comment = get_comment( $comment_id );
-	if ( empty( $comment->comment_ID ) )
-		wp_die( -1 );
+	if ( empty( $comment->comment_ID ) ) {
+			wp_die( -1 );
+	}
 
 	ob_start();
 	$wp_list_table->single_row( $comment );
@@ -1141,8 +1229,9 @@ 
 function wp_ajax_add_menu_item() {
 	check_ajax_referer( 'add-menu_item', 'menu-settings-column-nonce' );
 
-	if ( ! current_user_can( 'edit_theme_options' ) )
-		wp_die( -1 );
+	if ( ! current_user_can( 'edit_theme_options' ) ) {
+			wp_die( -1 );
+	}
 
 	require_once ABSPATH . 'wp-admin/includes/nav-menu.php';
 
@@ -1181,8 +1270,9 @@ 
 	}
 
 	$item_ids = wp_save_nav_menu_items( 0, $menu_items_data );
-	if ( is_wp_error( $item_ids ) )
-		wp_die( 0 );
+	if ( is_wp_error( $item_ids ) ) {
+			wp_die( 0 );
+	}
 
 	$menu_items = array();
 
@@ -1198,8 +1288,9 @@ 
 	/** This filter is documented in wp-admin/includes/nav-menu.php */
 	$walker_class_name = apply_filters( 'wp_edit_nav_menu_walker', 'Walker_Nav_Menu_Edit', $_POST['menu'] );
 
-	if ( ! class_exists( $walker_class_name ) )
-		wp_die( 0 );
+	if ( ! class_exists( $walker_class_name ) ) {
+			wp_die( 0 );
+	}
 
 	if ( ! empty( $menu_items ) ) {
 		$args = array(
@@ -1226,10 +1317,12 @@ 
 	$post = get_post( $pid );
 
 	if ( isset($_POST['metakeyselect']) || isset($_POST['metakeyinput']) ) {
-		if ( !current_user_can( 'edit_post', $pid ) )
-			wp_die( -1 );
-		if ( isset($_POST['metakeyselect']) && '#NONE#' == $_POST['metakeyselect'] && empty($_POST['metakeyinput']) )
-			wp_die( 1 );
+		if ( !current_user_can( 'edit_post', $pid ) ) {
+					wp_die( -1 );
+		}
+		if ( isset($_POST['metakeyselect']) && '#NONE#' == $_POST['metakeyselect'] && empty($_POST['metakeyinput']) ) {
+					wp_die( 1 );
+		}
 
 		// If the post is an autodraft, save the post as a draft and then attempt to save the meta.
 		if ( $post->post_status == 'auto-draft' ) {
@@ -1251,8 +1344,9 @@ 
 					$x->send();
 				}
 
-				if ( !$mid = add_meta( $pid ) )
-					wp_die( __( 'Please provide a custom field value.' ) );
+				if ( !$mid = add_meta( $pid ) ) {
+									wp_die( __( 'Please provide a custom field value.' ) );
+				}
 			} else {
 				wp_die( 0 );
 			}
@@ -1274,19 +1368,26 @@ 
 		$mid = (int) key( $_POST['meta'] );
 		$key = wp_unslash( $_POST['meta'][$mid]['key'] );
 		$value = wp_unslash( $_POST['meta'][$mid]['value'] );
-		if ( '' == trim($key) )
-			wp_die( __( 'Please provide a custom field name.' ) );
-		if ( '' == trim($value) )
-			wp_die( __( 'Please provide a custom field value.' ) );
-		if ( ! $meta = get_metadata_by_mid( 'post', $mid ) )
-			wp_die( 0 ); // if meta doesn't exist
+		if ( '' == trim($key) ) {
+					wp_die( __( 'Please provide a custom field name.' ) );
+		}
+		if ( '' == trim($value) ) {
+					wp_die( __( 'Please provide a custom field value.' ) );
+		}
+		if ( ! $meta = get_metadata_by_mid( 'post', $mid ) ) {
+					wp_die( 0 );
+		}
+		// if meta doesn't exist
 		if ( is_protected_meta( $meta->meta_key, 'post' ) || is_protected_meta( $key, 'post' ) ||
 			! current_user_can( 'edit_post_meta', $meta->post_id, $meta->meta_key ) ||
-			! current_user_can( 'edit_post_meta', $meta->post_id, $key ) )
-			wp_die( -1 );
+			! current_user_can( 'edit_post_meta', $meta->post_id, $key ) ) {
+					wp_die( -1 );
+		}
 		if ( $meta->meta_value != $value || $meta->meta_key != $key ) {
-			if ( !$u = update_metadata_by_mid( 'post', $mid, $value, $key ) )
-				wp_die( 0 ); // We know meta exists; we also know it's unchanged (or DB error, in which case there are bigger problems).
+			if ( !$u = update_metadata_by_mid( 'post', $mid, $value, $key ) ) {
+							wp_die( 0 );
+			}
+			// We know meta exists; we also know it's unchanged (or DB error, in which case there are bigger problems).
 		}
 
 		$x = new WP_Ajax_Response( array(
@@ -1315,12 +1416,14 @@ 
  */
 function wp_ajax_add_user( $action ) {
 	global $wp_list_table;
-	if ( empty( $action ) )
-		$action = 'add-user';
+	if ( empty( $action ) ) {
+			$action = 'add-user';
+	}
 
 	check_ajax_referer( $action );
-	if ( ! current_user_can('create_users') )
-		wp_die( -1 );
+	if ( ! current_user_can('create_users') ) {
+			wp_die( -1 );
+	}
 	if ( ! $user_id = edit_user() ) {
 		wp_die( 0 );
 	} elseif ( is_wp_error( $user_id ) ) {
@@ -1367,14 +1470,17 @@ 
 
 	$page = isset( $_POST['page'] ) ? $_POST['page'] : '';
 
-	if ( $page != sanitize_key( $page ) )
-		wp_die( 0 );
+	if ( $page != sanitize_key( $page ) ) {
+			wp_die( 0 );
+	}
 
-	if ( ! $user = wp_get_current_user() )
-		wp_die( -1 );
+	if ( ! $user = wp_get_current_user() ) {
+			wp_die( -1 );
+	}
 
-	if ( is_array($closed) )
-		update_user_option($user->ID, "closedpostboxes_$page", $closed, true);
+	if ( is_array($closed) ) {
+			update_user_option($user->ID, "closedpostboxes_$page", $closed, true);
+	}
 
 	if ( is_array($hidden) ) {
 		$hidden = array_diff( $hidden, array('submitdiv', 'linksubmitdiv', 'manage-menu', 'create-menu') ); // postboxes that are always shown
@@ -1393,11 +1499,13 @@ 
 	check_ajax_referer( 'screen-options-nonce', 'screenoptionnonce' );
 	$page = isset( $_POST['page'] ) ? $_POST['page'] : '';
 
-	if ( $page != sanitize_key( $page ) )
-		wp_die( 0 );
+	if ( $page != sanitize_key( $page ) ) {
+			wp_die( 0 );
+	}
 
-	if ( ! $user = wp_get_current_user() )
-		wp_die( -1 );
+	if ( ! $user = wp_get_current_user() ) {
+			wp_die( -1 );
+	}
 
 	$hidden = ! empty( $_POST['hidden'] ) ? explode( ',', $_POST['hidden'] ) : array();
 	update_user_option( $user->ID, "manage{$page}columnshidden", $hidden, true );
@@ -1413,8 +1521,9 @@ 
 function wp_ajax_update_welcome_panel() {
 	check_ajax_referer( 'welcome-panel-nonce', 'welcomepanelnonce' );
 
-	if ( ! current_user_can( 'edit_theme_options' ) )
-		wp_die( -1 );
+	if ( ! current_user_can( 'edit_theme_options' ) ) {
+			wp_die( -1 );
+	}
 
 	update_user_meta( get_current_user_id(), 'show_welcome_panel', empty( $_POST['visible'] ) ? 0 : 1 );
 
@@ -1427,8 +1536,9 @@ 
  * @since 3.1.0
  */
 function wp_ajax_menu_get_metabox() {
-	if ( ! current_user_can( 'edit_theme_options' ) )
-		wp_die( -1 );
+	if ( ! current_user_can( 'edit_theme_options' ) ) {
+			wp_die( -1 );
+	}
 
 	require_once ABSPATH . 'wp-admin/includes/nav-menu.php';
 
@@ -1492,8 +1602,9 @@ 
 	require(ABSPATH . WPINC . '/class-wp-editor.php');
 	$results = _WP_Editors::wp_link_query( $args );
 
-	if ( ! isset( $results ) )
-		wp_die( 0 );
+	if ( ! isset( $results ) ) {
+			wp_die( 0 );
+	}
 
 	echo wp_json_encode( $results );
 	echo "\n";
@@ -1507,11 +1618,13 @@ 
  * @since 3.1.0
  */
 function wp_ajax_menu_locations_save() {
-	if ( ! current_user_can( 'edit_theme_options' ) )
-		wp_die( -1 );
+	if ( ! current_user_can( 'edit_theme_options' ) ) {
+			wp_die( -1 );
+	}
 	check_ajax_referer( 'add-menu_item', 'menu-settings-column-nonce' );
-	if ( ! isset( $_POST['menu-locations'] ) )
-		wp_die( 0 );
+	if ( ! isset( $_POST['menu-locations'] ) ) {
+			wp_die( 0 );
+	}
 	set_theme_mod( 'nav_menu_locations', array_map( 'absint', $_POST['menu-locations'] ) );
 	wp_die( 1 );
 }
@@ -1526,22 +1639,27 @@ 
 	$order = isset( $_POST['order'] ) ? (array) $_POST['order'] : false;
 	$page_columns = isset( $_POST['page_columns'] ) ? $_POST['page_columns'] : 'auto';
 
-	if ( $page_columns != 'auto' )
-		$page_columns = (int) $page_columns;
+	if ( $page_columns != 'auto' ) {
+			$page_columns = (int) $page_columns;
+	}
 
 	$page = isset( $_POST['page'] ) ? $_POST['page'] : '';
 
-	if ( $page != sanitize_key( $page ) )
-		wp_die( 0 );
+	if ( $page != sanitize_key( $page ) ) {
+			wp_die( 0 );
+	}
 
-	if ( ! $user = wp_get_current_user() )
-		wp_die( -1 );
+	if ( ! $user = wp_get_current_user() ) {
+			wp_die( -1 );
+	}
 
-	if ( $order )
-		update_user_option($user->ID, "meta-box-order_$page", $order, true);
+	if ( $order ) {
+			update_user_option($user->ID, "meta-box-order_$page", $order, true);
+	}
 
-	if ( $page_columns )
-		update_user_option($user->ID, "screen_layout_$page", $page_columns, true);
+	if ( $page_columns ) {
+			update_user_option($user->ID, "screen_layout_$page", $page_columns, true);
+	}
 
 	wp_die( 1 );
 }
@@ -1552,8 +1670,9 @@ 
  * @since 3.1.0
  */
 function wp_ajax_menu_quick_search() {
-	if ( ! current_user_can( 'edit_theme_options' ) )
-		wp_die( -1 );
+	if ( ! current_user_can( 'edit_theme_options' ) ) {
+			wp_die( -1 );
+	}
 
 	require_once ABSPATH . 'wp-admin/includes/nav-menu.php';
 
@@ -1598,15 +1717,18 @@ 
 
 	check_ajax_referer( 'inlineeditnonce', '_inline_edit' );
 
-	if ( ! isset($_POST['post_ID']) || ! ( $post_ID = (int) $_POST['post_ID'] ) )
-		wp_die();
+	if ( ! isset($_POST['post_ID']) || ! ( $post_ID = (int) $_POST['post_ID'] ) ) {
+			wp_die();
+	}
 
 	if ( 'page' == $_POST['post_type'] ) {
-		if ( ! current_user_can( 'edit_page', $post_ID ) )
-			wp_die( __( 'You are not allowed to edit this page.' ) );
+		if ( ! current_user_can( 'edit_page', $post_ID ) ) {
+					wp_die( __( 'You are not allowed to edit this page.' ) );
+		}
 	} else {
-		if ( ! current_user_can( 'edit_post', $post_ID ) )
-			wp_die( __( 'You are not allowed to edit this post.' ) );
+		if ( ! current_user_can( 'edit_post', $post_ID ) ) {
+					wp_die( __( 'You are not allowed to edit this post.' ) );
+		}
 	}
 
 	if ( $last = wp_check_post_lock( $post_ID ) ) {
@@ -1629,8 +1751,9 @@ 
 	// Rename.
 	$data['user_ID'] = get_current_user_id();
 
-	if ( isset($data['post_parent']) )
-		$data['parent_id'] = $data['post_parent'];
+	if ( isset($data['post_parent']) ) {
+			$data['parent_id'] = $data['post_parent'];
+	}
 
 	// Status.
 	if ( isset( $data['keep_private'] ) && 'private' == $data['keep_private'] ) {
@@ -1640,10 +1763,12 @@ 
 		$data['post_status'] = $data['_status'];
 	}
 
-	if ( empty($data['comment_status']) )
-		$data['comment_status'] = 'closed';
-	if ( empty($data['ping_status']) )
-		$data['ping_status'] = 'closed';
+	if ( empty($data['comment_status']) ) {
+			$data['comment_status'] = 'closed';
+	}
+	if ( empty($data['ping_status']) ) {
+			$data['ping_status'] = 'closed';
+	}
 
 	// Exclude terms from taxonomies that are not supposed to appear in Quick Edit.
 	if ( ! empty( $data['tax_input'] ) ) {
@@ -1698,16 +1823,19 @@ 
 
 	$taxonomy = sanitize_key( $_POST['taxonomy'] );
 	$tax = get_taxonomy( $taxonomy );
-	if ( ! $tax )
-		wp_die( 0 );
+	if ( ! $tax ) {
+			wp_die( 0 );
+	}
 
-	if ( ! current_user_can( $tax->cap->edit_terms ) )
-		wp_die( -1 );
+	if ( ! current_user_can( $tax->cap->edit_terms ) ) {
+			wp_die( -1 );
+	}
 
 	$wp_list_table = _get_list_table( 'WP_Terms_List_Table', array( 'screen' => 'edit-' . $taxonomy ) );
 
-	if ( ! isset($_POST['tax_ID']) || ! ( $id = (int) $_POST['tax_ID'] ) )
-		wp_die( -1 );
+	if ( ! isset($_POST['tax_ID']) || ! ( $id = (int) $_POST['tax_ID'] ) ) {
+			wp_die( -1 );
+	}
 
 	$tag = get_term( $id, $taxonomy );
 	$_POST['description'] = $tag->description;
@@ -1716,13 +1844,15 @@ 
 	if ( $updated && !is_wp_error($updated) ) {
 		$tag = get_term( $updated['term_id'], $taxonomy );
 		if ( !$tag || is_wp_error( $tag ) ) {
-			if ( is_wp_error($tag) && $tag->get_error_message() )
-				wp_die( $tag->get_error_message() );
+			if ( is_wp_error($tag) && $tag->get_error_message() ) {
+							wp_die( $tag->get_error_message() );
+			}
 			wp_die( __( 'Item not updated.' ) );
 		}
 	} else {
-		if ( is_wp_error($updated) && $updated->get_error_message() )
-			wp_die( $updated->get_error_message() );
+		if ( is_wp_error($updated) && $updated->get_error_message() ) {
+					wp_die( $updated->get_error_message() );
+		}
 		wp_die( __( 'Item not updated.' ) );
 	}
 	$level = 0;
@@ -1755,8 +1885,9 @@ 
 		'post_status' => 'any',
 		'posts_per_page' => 50,
 	);
-	if ( '' !== $s )
-		$args['s'] = $s;
+	if ( '' !== $s ) {
+			$args['s'] = $s;
+	}
 
 	$posts = get_posts( $args );
 
@@ -1810,8 +1941,9 @@ 
 function wp_ajax_widgets_order() {
 	check_ajax_referer( 'save-sidebar-widgets', 'savewidgets' );
 
-	if ( !current_user_can('edit_theme_options') )
-		wp_die( -1 );
+	if ( !current_user_can('edit_theme_options') ) {
+			wp_die( -1 );
+	}
 
 	unset( $_POST['savewidgets'], $_POST['action'] );
 
@@ -1823,8 +1955,9 @@ 
 			if ( !empty($val) ) {
 				$val = explode(',', $val);
 				foreach ( $val as $k => $v ) {
-					if ( strpos($v, 'widget-') === false )
-						continue;
+					if ( strpos($v, 'widget-') === false ) {
+											continue;
+					}
 
 					$sb[$k] = substr($v, strpos($v, '_') + 1);
 				}
@@ -1852,8 +1985,9 @@ 
 
 	check_ajax_referer( 'save-sidebar-widgets', 'savewidgets' );
 
-	if ( !current_user_can('edit_theme_options') || !isset($_POST['id_base']) )
-		wp_die( -1 );
+	if ( !current_user_can('edit_theme_options') || !isset($_POST['id_base']) ) {
+			wp_die( -1 );
+	}
 
 	unset( $_POST['savewidgets'], $_POST['action'] );
 
@@ -1887,8 +2021,9 @@ 
 	// Delete.
 	if ( isset($_POST['delete_widget']) && $_POST['delete_widget'] ) {
 
-		if ( !isset($wp_registered_widgets[$widget_id]) )
-			wp_die( $error );
+		if ( !isset($wp_registered_widgets[$widget_id]) ) {
+					wp_die( $error );
+		}
 
 		$sidebar = array_diff( $sidebar, array($widget_id) );
 		$_POST = array('sidebar' => $sidebar_id, 'widget-' . $id_base => array(), 'the-widget-id' => $widget_id, 'delete_widget' => '1');
@@ -1897,8 +2032,9 @@ 
 		do_action( 'delete_widget', $widget_id, $sidebar_id, $id_base );
 
 	} elseif ( $settings && preg_match( '/__i__|%i%/', key($settings) ) ) {
-		if ( !$multi_number )
-			wp_die( $error );
+		if ( !$multi_number ) {
+					wp_die( $error );
+		}
 
 		$_POST[ 'widget-' . $id_base ] = array( $multi_number => reset( $settings ) );
 		$widget_id = $id_base . '-' . $multi_number;
@@ -1909,8 +2045,9 @@ 
 	foreach ( (array) $wp_registered_widget_updates as $name => $control ) {
 
 		if ( $name == $id_base ) {
-			if ( !is_callable( $control['callback'] ) )
-				continue;
+			if ( !is_callable( $control['callback'] ) ) {
+							continue;
+			}
 
 			ob_start();
 				call_user_func_array( $control['callback'], $control['params'] );
@@ -1926,11 +2063,13 @@ 
 		wp_die();
 	}
 
-	if ( !empty($_POST['add_new']) )
-		wp_die();
+	if ( !empty($_POST['add_new']) ) {
+			wp_die();
+	}
 
-	if ( $form = $wp_registered_widget_controls[$widget_id] )
-		call_user_func_array( $form['callback'], $form['params'] );
+	if ( $form = $wp_registered_widget_controls[$widget_id] ) {
+			call_user_func_array( $form['callback'], $form['params'] );
+	}
 
 	wp_die();
 }
@@ -2057,15 +2196,18 @@ 
 	}
 
 	if ( isset( $post_data['context'] ) && isset( $post_data['theme'] ) ) {
-		if ( 'custom-background' === $post_data['context'] )
-			update_post_meta( $attachment_id, '_wp_attachment_is_custom_background', $post_data['theme'] );
+		if ( 'custom-background' === $post_data['context'] ) {
+					update_post_meta( $attachment_id, '_wp_attachment_is_custom_background', $post_data['theme'] );
+		}
 
-		if ( 'custom-header' === $post_data['context'] )
-			update_post_meta( $attachment_id, '_wp_attachment_is_custom_header', $post_data['theme'] );
+		if ( 'custom-header' === $post_data['context'] ) {
+					update_post_meta( $attachment_id, '_wp_attachment_is_custom_header', $post_data['theme'] );
+		}
 	}
 
-	if ( ! $attachment = wp_prepare_attachment_for_js( $attachment_id ) )
-		wp_die();
+	if ( ! $attachment = wp_prepare_attachment_for_js( $attachment_id ) ) {
+			wp_die();
+	}
 
 	echo wp_json_encode( array(
 		'success' => true,
@@ -2082,8 +2224,9 @@ 
  */
 function wp_ajax_image_editor() {
 	$attachment_id = intval($_POST['postid']);
-	if ( empty($attachment_id) || !current_user_can('edit_post', $attachment_id) )
-		wp_die( -1 );
+	if ( empty($attachment_id) || !current_user_can('edit_post', $attachment_id) ) {
+			wp_die( -1 );
+	}
 
 	check_ajax_referer( "image_editor-$attachment_id" );
 	include_once( ABSPATH . 'wp-admin/includes/image-edit.php' );
@@ -2116,15 +2259,17 @@ 
 	$json = ! empty( $_REQUEST['json'] ); // New-style request
 
 	$post_ID = intval( $_POST['post_id'] );
-	if ( ! current_user_can( 'edit_post', $post_ID ) )
-		wp_die( -1 );
+	if ( ! current_user_can( 'edit_post', $post_ID ) ) {
+			wp_die( -1 );
+	}
 
 	$thumbnail_id = intval( $_POST['thumbnail_id'] );
 
-	if ( $json )
-		check_ajax_referer( "update-post_$post_ID" );
-	else
-		check_ajax_referer( "set_post_thumbnail-$post_ID" );
+	if ( $json ) {
+			check_ajax_referer( "update-post_$post_ID" );
+	} else {
+			check_ajax_referer( "set_post_thumbnail-$post_ID" );
+	}
 
 	if ( $thumbnail_id == '-1' ) {
 		if ( delete_post_thumbnail( $post_ID ) ) {
@@ -2223,8 +2368,9 @@ 
 
 	$post = null;
 
-	if ( $post_id )
-		$post = get_post( $post_id );
+	if ( $post_id ) {
+			$post = get_post( $post_id );
+	}
 
 	check_ajax_referer('update-post_' . $post_id, '_wpnonce');
 
@@ -2258,20 +2404,24 @@ 
  * @since 3.1.0
  */
 function wp_ajax_wp_remove_post_lock() {
-	if ( empty( $_POST['post_ID'] ) || empty( $_POST['active_post_lock'] ) )
-		wp_die( 0 );
+	if ( empty( $_POST['post_ID'] ) || empty( $_POST['active_post_lock'] ) ) {
+			wp_die( 0 );
+	}
 	$post_id = (int) $_POST['post_ID'];
-	if ( ! $post = get_post( $post_id ) )
-		wp_die( 0 );
+	if ( ! $post = get_post( $post_id ) ) {
+			wp_die( 0 );
+	}
 
 	check_ajax_referer( 'update-post_' . $post_id );
 
-	if ( ! current_user_can( 'edit_post', $post_id ) )
-		wp_die( -1 );
+	if ( ! current_user_can( 'edit_post', $post_id ) ) {
+			wp_die( -1 );
+	}
 
 	$active_lock = array_map( 'absint', explode( ':', $_POST['active_post_lock'] ) );
-	if ( $active_lock[1] != get_current_user_id() )
-		wp_die( 0 );
+	if ( $active_lock[1] != get_current_user_id() ) {
+			wp_die( 0 );
+	}
 
 	/**
 	 * Filter the post lock window duration.
@@ -2293,15 +2443,17 @@ 
  */
 function wp_ajax_dismiss_wp_pointer() {
 	$pointer = $_POST['pointer'];
-	if ( $pointer != sanitize_key( $pointer ) )
-		wp_die( 0 );
+	if ( $pointer != sanitize_key( $pointer ) ) {
+			wp_die( 0 );
+	}
 
 //	check_ajax_referer( 'dismiss-pointer_' . $pointer );
 
 	$dismissed = array_filter( explode( ',', (string) get_user_meta( get_current_user_id(), 'dismissed_wp_pointers', true ) ) );
 
-	if ( in_array( $pointer, $dismissed ) )
-		wp_die( 0 );
+	if ( in_array( $pointer, $dismissed ) ) {
+			wp_die( 0 );
+	}
 
 	$dismissed[] = $pointer;
 	$dismissed = implode( ',', $dismissed );
@@ -2316,23 +2468,29 @@ 
  * @since 3.5.0
  */
 function wp_ajax_get_attachment() {
-	if ( ! isset( $_REQUEST['id'] ) )
-		wp_send_json_error();
+	if ( ! isset( $_REQUEST['id'] ) ) {
+			wp_send_json_error();
+	}
 
-	if ( ! $id = absint( $_REQUEST['id'] ) )
-		wp_send_json_error();
+	if ( ! $id = absint( $_REQUEST['id'] ) ) {
+			wp_send_json_error();
+	}
 
-	if ( ! $post = get_post( $id ) )
-		wp_send_json_error();
+	if ( ! $post = get_post( $id ) ) {
+			wp_send_json_error();
+	}
 
-	if ( 'attachment' != $post->post_type )
-		wp_send_json_error();
+	if ( 'attachment' != $post->post_type ) {
+			wp_send_json_error();
+	}
 
-	if ( ! current_user_can( 'upload_files' ) )
-		wp_send_json_error();
+	if ( ! current_user_can( 'upload_files' ) ) {
+			wp_send_json_error();
+	}
 
-	if ( ! $attachment = wp_prepare_attachment_for_js( $id ) )
-		wp_send_json_error();
+	if ( ! $attachment = wp_prepare_attachment_for_js( $id ) ) {
+			wp_send_json_error();
+	}
 
 	wp_send_json_success( $attachment );
 }
@@ -2343,8 +2501,9 @@ 
  * @since 3.5.0
  */
 function wp_ajax_query_attachments() {
-	if ( ! current_user_can( 'upload_files' ) )
-		wp_send_json_error();
+	if ( ! current_user_can( 'upload_files' ) ) {
+			wp_send_json_error();
+	}
 
 	$query = isset( $_REQUEST['query'] ) ? (array) $_REQUEST['query'] : array();
 	$keys = array(
@@ -2367,8 +2526,9 @@ 
 		$query['post_status'] = 'inherit';
 	}
 
-	if ( current_user_can( get_post_type_object( 'attachment' )->cap->read_private_posts ) )
-		$query['post_status'] .= ',private';
+	if ( current_user_can( get_post_type_object( 'attachment' )->cap->read_private_posts ) ) {
+			$query['post_status'] .= ',private';
+	}
 
 	/**
 	 * Filter the arguments passed to WP_Query during an AJAX
@@ -2395,37 +2555,46 @@ 
  * @since 3.5.0
  */
 function wp_ajax_save_attachment() {
-	if ( ! isset( $_REQUEST['id'] ) || ! isset( $_REQUEST['changes'] ) )
-		wp_send_json_error();
+	if ( ! isset( $_REQUEST['id'] ) || ! isset( $_REQUEST['changes'] ) ) {
+			wp_send_json_error();
+	}
 
-	if ( ! $id = absint( $_REQUEST['id'] ) )
-		wp_send_json_error();
+	if ( ! $id = absint( $_REQUEST['id'] ) ) {
+			wp_send_json_error();
+	}
 
 	check_ajax_referer( 'update-post_' . $id, 'nonce' );
 
-	if ( ! current_user_can( 'edit_post', $id ) )
-		wp_send_json_error();
+	if ( ! current_user_can( 'edit_post', $id ) ) {
+			wp_send_json_error();
+	}
 
 	$changes = $_REQUEST['changes'];
 	$post    = get_post( $id, ARRAY_A );
 
-	if ( 'attachment' != $post['post_type'] )
-		wp_send_json_error();
+	if ( 'attachment' != $post['post_type'] ) {
+			wp_send_json_error();
+	}
 
-	if ( isset( $changes['parent'] ) )
-		$post['post_parent'] = $changes['parent'];
+	if ( isset( $changes['parent'] ) ) {
+			$post['post_parent'] = $changes['parent'];
+	}
 
-	if ( isset( $changes['title'] ) )
-		$post['post_title'] = $changes['title'];
+	if ( isset( $changes['title'] ) ) {
+			$post['post_title'] = $changes['title'];
+	}
 
-	if ( isset( $changes['caption'] ) )
-		$post['post_excerpt'] = $changes['caption'];
+	if ( isset( $changes['caption'] ) ) {
+			$post['post_excerpt'] = $changes['caption'];
+	}
 
-	if ( isset( $changes['description'] ) )
-		$post['post_content'] = $changes['description'];
+	if ( isset( $changes['description'] ) ) {
+			$post['post_content'] = $changes['description'];
+	}
 
-	if ( MEDIA_TRASH && isset( $changes['status'] ) )
-		$post['post_status'] = $changes['status'];
+	if ( MEDIA_TRASH && isset( $changes['status'] ) ) {
+			$post['post_status'] = $changes['status'];
+	}
 
 	if ( isset( $changes['alt'] ) ) {
 		$alt = wp_unslash( $changes['alt'] );
@@ -2469,25 +2638,30 @@ 
  * @since 3.5.0
  */
 function wp_ajax_save_attachment_compat() {
-	if ( ! isset( $_REQUEST['id'] ) )
-		wp_send_json_error();
+	if ( ! isset( $_REQUEST['id'] ) ) {
+			wp_send_json_error();
+	}
 
-	if ( ! $id = absint( $_REQUEST['id'] ) )
-		wp_send_json_error();
+	if ( ! $id = absint( $_REQUEST['id'] ) ) {
+			wp_send_json_error();
+	}
 
-	if ( empty( $_REQUEST['attachments'] ) || empty( $_REQUEST['attachments'][ $id ] ) )
-		wp_send_json_error();
+	if ( empty( $_REQUEST['attachments'] ) || empty( $_REQUEST['attachments'][ $id ] ) ) {
+			wp_send_json_error();
+	}
 	$attachment_data = $_REQUEST['attachments'][ $id ];
 
 	check_ajax_referer( 'update-post_' . $id, 'nonce' );
 
-	if ( ! current_user_can( 'edit_post', $id ) )
-		wp_send_json_error();
+	if ( ! current_user_can( 'edit_post', $id ) ) {
+			wp_send_json_error();
+	}
 
 	$post = get_post( $id, ARRAY_A );
 
-	if ( 'attachment' != $post['post_type'] )
-		wp_send_json_error();
+	if ( 'attachment' != $post['post_type'] ) {
+			wp_send_json_error();
+	}
 
 	/** This filter is documented in wp-admin/includes/media.php */
 	$post = apply_filters( 'attachment_fields_to_save', $post, $attachment_data );
@@ -2500,12 +2674,14 @@ 
 	wp_update_post( $post );
 
 	foreach ( get_attachment_taxonomies( $post ) as $taxonomy ) {
-		if ( isset( $attachment_data[ $taxonomy ] ) )
-			wp_set_object_terms( $id, array_map( 'trim', preg_split( '/,+/', $attachment_data[ $taxonomy ] ) ), $taxonomy, false );
+		if ( isset( $attachment_data[ $taxonomy ] ) ) {
+					wp_set_object_terms( $id, array_map( 'trim', preg_split( '/,+/', $attachment_data[ $taxonomy ] ) ), $taxonomy, false );
+		}
 	}
 
-	if ( ! $attachment = wp_prepare_attachment_for_js( $id ) )
-		wp_send_json_error();
+	if ( ! $attachment = wp_prepare_attachment_for_js( $id ) ) {
+			wp_send_json_error();
+	}
 
 	wp_send_json_success( $attachment );
 }
@@ -2516,29 +2692,36 @@ 
  * @since 3.5.0
  */
 function wp_ajax_save_attachment_order() {
-	if ( ! isset( $_REQUEST['post_id'] ) )
-		wp_send_json_error();
+	if ( ! isset( $_REQUEST['post_id'] ) ) {
+			wp_send_json_error();
+	}
 
-	if ( ! $post_id = absint( $_REQUEST['post_id'] ) )
-		wp_send_json_error();
+	if ( ! $post_id = absint( $_REQUEST['post_id'] ) ) {
+			wp_send_json_error();
+	}
 
-	if ( empty( $_REQUEST['attachments'] ) )
-		wp_send_json_error();
+	if ( empty( $_REQUEST['attachments'] ) ) {
+			wp_send_json_error();
+	}
 
 	check_ajax_referer( 'update-post_' . $post_id, 'nonce' );
 
 	$attachments = $_REQUEST['attachments'];
 
-	if ( ! current_user_can( 'edit_post', $post_id ) )
-		wp_send_json_error();
+	if ( ! current_user_can( 'edit_post', $post_id ) ) {
+			wp_send_json_error();
+	}
 
 	foreach ( $attachments as $attachment_id => $menu_order ) {
-		if ( ! current_user_can( 'edit_post', $attachment_id ) )
-			continue;
-		if ( ! $attachment = get_post( $attachment_id ) )
-			continue;
-		if ( 'attachment' != $attachment->post_type )
-			continue;
+		if ( ! current_user_can( 'edit_post', $attachment_id ) ) {
+					continue;
+		}
+		if ( ! $attachment = get_post( $attachment_id ) ) {
+					continue;
+		}
+		if ( 'attachment' != $attachment->post_type ) {
+					continue;
+		}
 
 		wp_update_post( array( 'ID' => $attachment_id, 'menu_order' => $menu_order ) );
 	}
@@ -2562,11 +2745,13 @@ 
 
 	$id = intval( $attachment['id'] );
 
-	if ( ! $post = get_post( $id ) )
-		wp_send_json_error();
+	if ( ! $post = get_post( $id ) ) {
+			wp_send_json_error();
+	}
 
-	if ( 'attachment' != $post->post_type )
-		wp_send_json_error();
+	if ( 'attachment' != $post->post_type ) {
+			wp_send_json_error();
+	}
 
 	if ( current_user_can( 'edit_post', $id ) ) {
 		// If this attachment is unattached, attach it. Primarily a back compat thing.
@@ -2631,17 +2816,21 @@ 
 
 	check_ajax_referer( 'media-send-to-editor', 'nonce' );
 
-	if ( ! $src = wp_unslash( $_POST['src'] ) )
-		wp_send_json_error();
+	if ( ! $src = wp_unslash( $_POST['src'] ) ) {
+			wp_send_json_error();
+	}
 
-	if ( ! strpos( $src, '://' ) )
-		$src = 'http://' . $src;
+	if ( ! strpos( $src, '://' ) ) {
+			$src = 'http://' . $src;
+	}
 
-	if ( ! $src = esc_url_raw( $src ) )
-		wp_send_json_error();
+	if ( ! $src = esc_url_raw( $src ) ) {
+			wp_send_json_error();
+	}
 
-	if ( ! $link_text = trim( wp_unslash( $_POST['link_text'] ) ) )
-		$link_text = wp_basename( $src );
+	if ( ! $link_text = trim( wp_unslash( $_POST['link_text'] ) ) ) {
+			$link_text = wp_basename( $src );
+	}
 
 	$post = get_post( isset( $_POST['post_id'] ) ? $_POST['post_id'] : 0 );
 
@@ -2663,8 +2852,9 @@ 
 	// Figure out what filter to run:
 	$type = 'file';
 	if ( ( $ext = preg_replace( '/^.+?\.([^.]+)$/', '$1', $src ) ) && ( $ext_type = wp_ext2type( $ext ) )
-		&& ( 'audio' == $ext_type || 'video' == $ext_type ) )
-			$type = $ext_type;
+		&& ( 'audio' == $ext_type || 'video' == $ext_type ) ) {
+				$type = $ext_type;
+	}
 
 	/** This filter is documented in wp-admin/includes/media.php */
 	$html = apply_filters( $type . '_send_to_editor_url', $html, $src, $link_text );
@@ -2757,15 +2947,18 @@ 
 function wp_ajax_get_revision_diffs() {
 	require ABSPATH . 'wp-admin/includes/revision.php';
 
-	if ( ! $post = get_post( (int) $_REQUEST['post_id'] ) )
-		wp_send_json_error();
+	if ( ! $post = get_post( (int) $_REQUEST['post_id'] ) ) {
+			wp_send_json_error();
+	}
 
-	if ( ! current_user_can( 'read_post', $post->ID ) )
-		wp_send_json_error();
+	if ( ! current_user_can( 'read_post', $post->ID ) ) {
+			wp_send_json_error();
+	}
 
 	// Really just pre-loading the cache here.
-	if ( ! $revisions = wp_get_post_revisions( $post->ID, array( 'check_enabled' => false ) ) )
-		wp_send_json_error();
+	if ( ! $revisions = wp_get_post_revisions( $post->ID, array( 'check_enabled' => false ) ) ) {
+			wp_send_json_error();
+	}
 
 	$return = array();
 	@set_time_limit( 0 );

src/wp-admin/includes/credits.php

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * WordPress Credits Administration API.
- *
- * @package WordPress
- * @subpackage Administration
- * @since 4.4.0
- */
+	 * WordPress Credits Administration API.
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 * @since 4.4.0
+	 */
 
 /**
  * Retrieve the contributor credits.

Spacing +13 added lines, -13 removed lines

@@ -20,23 +20,23 @@ 
 	global $wp_version;
 	$locale = get_locale();
 
-	$results = get_site_transient( 'wordpress_credits_' . $locale );
+	$results = get_site_transient('wordpress_credits_'.$locale);
 
-	if ( ! is_array( $results )
-		|| false !== strpos( $wp_version, '-' )
-		|| ( isset( $results['data']['version'] ) && strpos( $wp_version, $results['data']['version'] ) !== 0 )
+	if ( ! is_array($results)
+		|| false !== strpos($wp_version, '-')
+		|| (isset($results['data']['version']) && strpos($wp_version, $results['data']['version']) !== 0)
 	) {
-		$response = wp_remote_get( "http://api.wordpress.org/core/credits/1.1/?version=$wp_version&locale=$locale" );
+		$response = wp_remote_get("http://api.wordpress.org/core/credits/1.1/?version=$wp_version&locale=$locale");
 
-		if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) )
+		if (is_wp_error($response) || 200 != wp_remote_retrieve_response_code($response))
 			return false;
 
-		$results = json_decode( wp_remote_retrieve_body( $response ), true );
+		$results = json_decode(wp_remote_retrieve_body($response), true);
 
-		if ( ! is_array( $results ) )
+		if ( ! is_array($results))
 			return false;
 
-		set_site_transient( 'wordpress_credits_' . $locale, $results, DAY_IN_SECONDS );
+		set_site_transient('wordpress_credits_'.$locale, $results, DAY_IN_SECONDS);
 	}
 
 	return $results;
@@ -52,8 +52,8 @@ 
  * @param string $username      The contributor's username.
  * @param string $profiles      URL to the contributor's WordPress.org profile page.
  */
-function _wp_credits_add_profile_link( &$display_name, $username, $profiles ) {
-	$display_name = '<a href="' . esc_url( sprintf( $profiles, $username ) ) . '">' . esc_html( $display_name ) . '</a>';
+function _wp_credits_add_profile_link(&$display_name, $username, $profiles) {
+	$display_name = '<a href="'.esc_url(sprintf($profiles, $username)).'">'.esc_html($display_name).'</a>';
 }
 
 /**
@@ -64,6 +64,6 @@ 
  *
  * @param string $data External library data, passed by reference.
  */
-function _wp_credits_build_object_link( &$data ) {
-	$data = '<a href="' . esc_url( $data[1] ) . '">' . esc_html( $data[0] ) . '</a>';
+function _wp_credits_build_object_link(&$data) {
+	$data = '<a href="'.esc_url($data[1]).'">'.esc_html($data[0]).'</a>';
 }

Braces +6 added lines, -4 removed lines

@@ -28,13 +28,15 @@
 	) {
 		$response = wp_remote_get( "http://api.wordpress.org/core/credits/1.1/?version=$wp_version&locale=$locale" );
 
-		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;
+		}
 
 		$results = json_decode( wp_remote_retrieve_body( $response ), true );
 
-		if ( ! is_array( $results ) )
-			return false;
+		if ( ! is_array( $results ) ) {
+					return false;
+		}
 
 		set_site_transient( 'wordpress_credits_' . $locale, $results, DAY_IN_SECONDS );
 	}

src/wp-admin/includes/user.php

Indentation +13 added lines, -13 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 /**
- * WordPress user administration API.
- *
- * @package WordPress
- * @subpackage Administration
- */
+	 * WordPress user administration API.
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 */
 
 /**
  * Creates a new user from the "Users" form using $_POST information.
@@ -179,14 +179,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 {@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 {@see wp_send_new_user_notifications()}
+		 *                        for more information on possible values.
+		 */
 		do_action( 'edit_user_created_user', $user_id, $notify );
 	}
 	return $user_id;

Spacing +126 added lines, -126 removed lines

@@ -27,90 +27,90 @@ 
  * @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->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.'));
 	}
 
 	/* checking the password has been typed twice */
@@ -123,39 +123,39 @@ 
 	 * @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 "\" 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 ( $pass1 != $pass2 )
-		$errors->add( 'pass', __( '<strong>ERROR</strong>: Please enter the same password in both password fields.' ), array( 'form-field' => 'pass1' ) );
+	if ($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'));
 	}
 
 	/**
@@ -167,16 +167,16 @@ 
 	 * @param bool     $update  Whether this is a user update.
 	 * @param WP_User  &$user   WP_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.
@@ -187,7 +187,7 @@ 
 		  * @param string $notify  Type of notification that should happen. See {@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;
 }
@@ -218,7 +218,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;
 }
@@ -231,10 +231,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;
@@ -250,7 +250,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);
 
@@ -261,8 +261,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);
 }
 
 /**
@@ -281,23 +281,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;
 	}
 
@@ -310,14 +310,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;
 			}
 		}
@@ -330,48 +330,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.
@@ -382,7 +382,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;
 }
@@ -411,11 +411,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);
 	}
@@ -429,13 +429,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);
 	}
@@ -449,16 +449,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>';
 }
 
@@ -502,16 +502,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' ), get_bloginfo( 'name' ), home_url(), wp_specialchars_decode( translate_user_role( $role['name'] ) ) );
+%%s' ), get_bloginfo('name'), home_url(), wp_specialchars_decode(translate_user_role($role['name'])));
 }

Braces +90 added lines, -60 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 ) ) {
@@ -126,21 +140,26 @@ 
 	do_action_ref_array( 'check_passwords', array( $user->user_login, &$pass1, &$pass2 ) );
 
 	/* 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 ( $pass1 != $pass2 )
-		$errors->add( 'pass', __( '<strong>ERROR</strong>: Please enter the same password in both password fields.' ), array( 'form-field' => 'pass1' ) );
+	if ( $pass1 != $pass2 ) {
+			$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() );
@@ -169,8 +188,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 );
@@ -234,8 +254,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;
 }
@@ -291,8 +312,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 ) {
@@ -334,29 +356,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 );
+			}
 		}
 	}
 
@@ -365,8 +391,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 ) );
 	}
@@ -411,8 +438,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'] ) {
@@ -429,8 +457,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);
 
@@ -449,8 +478,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>';

src/wp-admin/includes/class-walker-nav-menu-edit.php

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * Navigation Menu API: Walker_Nav_Menu_Edit class
- *
- * @package WordPress
- * @subpackage Administration
- * @since 4.4.0
- */
+	 * Navigation Menu API: Walker_Nav_Menu_Edit class
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 * @since 4.4.0
+	 */
 
 /**
  * Create HTML list of nav menu input items.

Spacing +60 added lines, -60 removed lines

@@ -26,7 +26,7 @@ 
 	 * @param int    $depth  Depth of menu item. Used for padding.
 	 * @param array  $args   Not used.
 	 */
-	public function start_lvl( &$output, $depth = 0, $args = array() ) {}
+	public function start_lvl(&$output, $depth = 0, $args = array()) {}
 
 	/**
 	 * Ends the list of after the elements are added.
@@ -39,7 +39,7 @@ 
 	 * @param int    $depth  Depth of menu item. Used for padding.
 	 * @param array  $args   Not used.
 	 */
-	public function end_lvl( &$output, $depth = 0, $args = array() ) {}
+	public function end_lvl(&$output, $depth = 0, $args = array()) {}
 
 	/**
 	 * Start the element output.
@@ -55,12 +55,12 @@ 
 	 * @param array  $args   Not used.
 	 * @param int    $id     Not used.
 	 */
-	public function start_el( &$output, $item, $depth = 0, $args = array(), $id = 0 ) {
+	public function start_el(&$output, $item, $depth = 0, $args = array(), $id = 0) {
 		global $_wp_nav_menu_max_depth;
 		$_wp_nav_menu_max_depth = $depth > $_wp_nav_menu_max_depth ? $depth : $_wp_nav_menu_max_depth;
 
 		ob_start();
-		$item_id = esc_attr( $item->ID );
+		$item_id = esc_attr($item->ID);
 		$removed_args = array(
 			'action',
 			'customlink-tab',
@@ -71,51 +71,51 @@ 
 		);
 
 		$original_title = '';
-		if ( 'taxonomy' == $item->type ) {
-			$original_title = get_term_field( 'name', $item->object_id, $item->object, 'raw' );
-			if ( is_wp_error( $original_title ) )
+		if ('taxonomy' == $item->type) {
+			$original_title = get_term_field('name', $item->object_id, $item->object, 'raw');
+			if (is_wp_error($original_title))
 				$original_title = false;
-		} elseif ( 'post_type' == $item->type ) {
-			$original_object = get_post( $item->object_id );
-			$original_title = get_the_title( $original_object->ID );
-		} elseif ( 'post_type_archive' == $item->type ) {
-			$original_object = get_post_type_object( $item->object );
-			if ( $original_object ) {
+		} elseif ('post_type' == $item->type) {
+			$original_object = get_post($item->object_id);
+			$original_title = get_the_title($original_object->ID);
+		} elseif ('post_type_archive' == $item->type) {
+			$original_object = get_post_type_object($item->object);
+			if ($original_object) {
 				$original_title = $original_object->labels->archives;
 			}
 		}
 
 		$classes = array(
-			'menu-item menu-item-depth-' . $depth,
-			'menu-item-' . esc_attr( $item->object ),
-			'menu-item-edit-' . ( ( isset( $_GET['edit-menu-item'] ) && $item_id == $_GET['edit-menu-item'] ) ? 'active' : 'inactive'),
+			'menu-item menu-item-depth-'.$depth,
+			'menu-item-'.esc_attr($item->object),
+			'menu-item-edit-'.((isset($_GET['edit-menu-item']) && $item_id == $_GET['edit-menu-item']) ? 'active' : 'inactive'),
 		);
 
 		$title = $item->title;
 
-		if ( ! empty( $item->_invalid ) ) {
+		if ( ! empty($item->_invalid)) {
 			$classes[] = 'menu-item-invalid';
 			/* translators: %s: title of menu item which is invalid */
-			$title = sprintf( __( '%s (Invalid)' ), $item->title );
-		} elseif ( isset( $item->post_status ) && 'draft' == $item->post_status ) {
+			$title = sprintf(__('%s (Invalid)'), $item->title);
+		} elseif (isset($item->post_status) && 'draft' == $item->post_status) {
 			$classes[] = 'pending';
 			/* translators: %s: title of menu item in draft status */
-			$title = sprintf( __('%s (Pending)'), $item->title );
+			$title = sprintf(__('%s (Pending)'), $item->title);
 		}
 
-		$title = ( ! isset( $item->label ) || '' == $item->label ) ? $title : $item->label;
+		$title = ( ! isset($item->label) || '' == $item->label) ? $title : $item->label;
 
 		$submenu_text = '';
-		if ( 0 == $depth )
+		if (0 == $depth)
 			$submenu_text = 'style="display: none;"';
 
 		?>
-		<li id="menu-item-<?php echo $item_id; ?>" class="<?php echo implode(' ', $classes ); ?>">
+		<li id="menu-item-<?php echo $item_id; ?>" class="<?php echo implode(' ', $classes); ?>">
 			<div class="menu-item-bar">
 				<div class="menu-item-handle">
-					<span class="item-title"><span class="menu-item-title"><?php echo esc_html( $title ); ?></span> <span class="is-submenu" <?php echo $submenu_text; ?>><?php _e( 'sub item' ); ?></span></span>
+					<span class="item-title"><span class="menu-item-title"><?php echo esc_html($title); ?></span> <span class="is-submenu" <?php echo $submenu_text; ?>><?php _e('sub item'); ?></span></span>
 					<span class="item-controls">
-						<span class="item-type"><?php echo esc_html( $item->type_label ); ?></span>
+						<span class="item-type"><?php echo esc_html($item->type_label); ?></span>
 						<span class="item-order hide-if-js">
 							<a href="<?php
 								echo wp_nonce_url(
@@ -124,11 +124,11 @@ 
 											'action' => 'move-up-menu-item',
 											'menu-item' => $item_id,
 										),
-										remove_query_arg($removed_args, admin_url( 'nav-menus.php' ) )
+										remove_query_arg($removed_args, admin_url('nav-menus.php'))
 									),
 									'move-menu_item'
 								);
-							?>" class="item-move-up" aria-label="<?php esc_attr_e( 'Move up' ) ?>">&#8593;</a>
+							?>" class="item-move-up" aria-label="<?php esc_attr_e('Move up') ?>">&#8593;</a>
 							|
 							<a href="<?php
 								echo wp_nonce_url(
@@ -137,81 +137,81 @@ 
 											'action' => 'move-down-menu-item',
 											'menu-item' => $item_id,
 										),
-										remove_query_arg($removed_args, admin_url( 'nav-menus.php' ) )
+										remove_query_arg($removed_args, admin_url('nav-menus.php'))
 									),
 									'move-menu_item'
 								);
-							?>" class="item-move-down" aria-label="<?php esc_attr_e( 'Move down' ) ?>">&#8595;</a>
+							?>" class="item-move-down" aria-label="<?php esc_attr_e('Move down') ?>">&#8595;</a>
 						</span>
 						<a class="item-edit" id="edit-<?php echo $item_id; ?>" href="<?php
-							echo ( isset( $_GET['edit-menu-item'] ) && $item_id == $_GET['edit-menu-item'] ) ? admin_url( 'nav-menus.php' ) : add_query_arg( 'edit-menu-item', $item_id, remove_query_arg( $removed_args, admin_url( 'nav-menus.php#menu-item-settings-' . $item_id ) ) );
-						?>" aria-label="<?php esc_attr_e( 'Edit menu item' ); ?>"><?php _e( 'Edit' ); ?></a>
+							echo (isset($_GET['edit-menu-item']) && $item_id == $_GET['edit-menu-item']) ? admin_url('nav-menus.php') : add_query_arg('edit-menu-item', $item_id, remove_query_arg($removed_args, admin_url('nav-menus.php#menu-item-settings-'.$item_id)));
+						?>" aria-label="<?php esc_attr_e('Edit menu item'); ?>"><?php _e('Edit'); ?></a>
 					</span>
 				</div>
 			</div>
 
 			<div class="menu-item-settings wp-clearfix" id="menu-item-settings-<?php echo $item_id; ?>">
-				<?php if ( 'custom' == $item->type ) : ?>
+				<?php if ('custom' == $item->type) : ?>
 					<p class="field-url description description-wide">
 						<label for="edit-menu-item-url-<?php echo $item_id; ?>">
-							<?php _e( 'URL' ); ?><br />
-							<input type="text" id="edit-menu-item-url-<?php echo $item_id; ?>" class="widefat code edit-menu-item-url" name="menu-item-url[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->url ); ?>" />
+							<?php _e('URL'); ?><br />
+							<input type="text" id="edit-menu-item-url-<?php echo $item_id; ?>" class="widefat code edit-menu-item-url" name="menu-item-url[<?php echo $item_id; ?>]" value="<?php echo esc_attr($item->url); ?>" />
 						</label>
 					</p>
 				<?php endif; ?>
 				<p class="description description-wide">
 					<label for="edit-menu-item-title-<?php echo $item_id; ?>">
-						<?php _e( 'Navigation Label' ); ?><br />
-						<input type="text" id="edit-menu-item-title-<?php echo $item_id; ?>" class="widefat edit-menu-item-title" name="menu-item-title[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->title ); ?>" />
+						<?php _e('Navigation Label'); ?><br />
+						<input type="text" id="edit-menu-item-title-<?php echo $item_id; ?>" class="widefat edit-menu-item-title" name="menu-item-title[<?php echo $item_id; ?>]" value="<?php echo esc_attr($item->title); ?>" />
 					</label>
 				</p>
 				<p class="field-title-attribute description description-wide">
 					<label for="edit-menu-item-attr-title-<?php echo $item_id; ?>">
-						<?php _e( 'Title Attribute' ); ?><br />
-						<input type="text" id="edit-menu-item-attr-title-<?php echo $item_id; ?>" class="widefat edit-menu-item-attr-title" name="menu-item-attr-title[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->post_excerpt ); ?>" />
+						<?php _e('Title Attribute'); ?><br />
+						<input type="text" id="edit-menu-item-attr-title-<?php echo $item_id; ?>" class="widefat edit-menu-item-attr-title" name="menu-item-attr-title[<?php echo $item_id; ?>]" value="<?php echo esc_attr($item->post_excerpt); ?>" />
 					</label>
 				</p>
 				<p class="field-link-target description">
 					<label for="edit-menu-item-target-<?php echo $item_id; ?>">
-						<input type="checkbox" id="edit-menu-item-target-<?php echo $item_id; ?>" value="_blank" name="menu-item-target[<?php echo $item_id; ?>]"<?php checked( $item->target, '_blank' ); ?> />
-						<?php _e( 'Open link in a new tab' ); ?>
+						<input type="checkbox" id="edit-menu-item-target-<?php echo $item_id; ?>" value="_blank" name="menu-item-target[<?php echo $item_id; ?>]"<?php checked($item->target, '_blank'); ?> />
+						<?php _e('Open link in a new tab'); ?>
 					</label>
 				</p>
 				<p class="field-css-classes description description-thin">
 					<label for="edit-menu-item-classes-<?php echo $item_id; ?>">
-						<?php _e( 'CSS Classes (optional)' ); ?><br />
-						<input type="text" id="edit-menu-item-classes-<?php echo $item_id; ?>" class="widefat code edit-menu-item-classes" name="menu-item-classes[<?php echo $item_id; ?>]" value="<?php echo esc_attr( implode(' ', $item->classes ) ); ?>" />
+						<?php _e('CSS Classes (optional)'); ?><br />
+						<input type="text" id="edit-menu-item-classes-<?php echo $item_id; ?>" class="widefat code edit-menu-item-classes" name="menu-item-classes[<?php echo $item_id; ?>]" value="<?php echo esc_attr(implode(' ', $item->classes)); ?>" />
 					</label>
 				</p>
 				<p class="field-xfn description description-thin">
 					<label for="edit-menu-item-xfn-<?php echo $item_id; ?>">
-						<?php _e( 'Link Relationship (XFN)' ); ?><br />
-						<input type="text" id="edit-menu-item-xfn-<?php echo $item_id; ?>" class="widefat code edit-menu-item-xfn" name="menu-item-xfn[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->xfn ); ?>" />
+						<?php _e('Link Relationship (XFN)'); ?><br />
+						<input type="text" id="edit-menu-item-xfn-<?php echo $item_id; ?>" class="widefat code edit-menu-item-xfn" name="menu-item-xfn[<?php echo $item_id; ?>]" value="<?php echo esc_attr($item->xfn); ?>" />
 					</label>
 				</p>
 				<p class="field-description description description-wide">
 					<label for="edit-menu-item-description-<?php echo $item_id; ?>">
-						<?php _e( 'Description' ); ?><br />
-						<textarea id="edit-menu-item-description-<?php echo $item_id; ?>" class="widefat edit-menu-item-description" rows="3" cols="20" name="menu-item-description[<?php echo $item_id; ?>]"><?php echo esc_html( $item->description ); // textarea_escaped ?></textarea>
+						<?php _e('Description'); ?><br />
+						<textarea id="edit-menu-item-description-<?php echo $item_id; ?>" class="widefat edit-menu-item-description" rows="3" cols="20" name="menu-item-description[<?php echo $item_id; ?>]"><?php echo esc_html($item->description); // textarea_escaped ?></textarea>
 						<span class="description"><?php _e('The description will be displayed in the menu if the current theme supports it.'); ?></span>
 					</label>
 				</p>
 
 				<p class="field-move hide-if-no-js description description-wide">
 					<label>
-						<span><?php _e( 'Move' ); ?></span>
-						<a href="#" class="menus-move menus-move-up" data-dir="up"><?php _e( 'Up one' ); ?></a>
-						<a href="#" class="menus-move menus-move-down" data-dir="down"><?php _e( 'Down one' ); ?></a>
+						<span><?php _e('Move'); ?></span>
+						<a href="#" class="menus-move menus-move-up" data-dir="up"><?php _e('Up one'); ?></a>
+						<a href="#" class="menus-move menus-move-down" data-dir="down"><?php _e('Down one'); ?></a>
 						<a href="#" class="menus-move menus-move-left" data-dir="left"></a>
 						<a href="#" class="menus-move menus-move-right" data-dir="right"></a>
-						<a href="#" class="menus-move menus-move-top" data-dir="top"><?php _e( 'To the top' ); ?></a>
+						<a href="#" class="menus-move menus-move-top" data-dir="top"><?php _e('To the top'); ?></a>
 					</label>
 				</p>
 
 				<div class="menu-item-actions description-wide submitbox">
-					<?php if ( 'custom' != $item->type && $original_title !== false ) : ?>
+					<?php if ('custom' != $item->type && $original_title !== false) : ?>
 						<p class="link-to-original">
-							<?php printf( __('Original: %s'), '<a href="' . esc_attr( $item->url ) . '">' . esc_html( $original_title ) . '</a>' ); ?>
+							<?php printf(__('Original: %s'), '<a href="'.esc_attr($item->url).'">'.esc_html($original_title).'</a>'); ?>
 						</p>
 					<?php endif; ?>
 					<a class="item-delete submitdelete deletion" id="delete-<?php echo $item_id; ?>" href="<?php
@@ -221,19 +221,19 @@ 
 								'action' => 'delete-menu-item',
 								'menu-item' => $item_id,
 							),
-							admin_url( 'nav-menus.php' )
+							admin_url('nav-menus.php')
 						),
-						'delete-menu_item_' . $item_id
-					); ?>"><?php _e( 'Remove' ); ?></a> <span class="meta-sep hide-if-no-js"> | </span> <a class="item-cancel submitcancel hide-if-no-js" id="cancel-<?php echo $item_id; ?>" href="<?php echo esc_url( add_query_arg( array( 'edit-menu-item' => $item_id, 'cancel' => time() ), admin_url( 'nav-menus.php' ) ) );
+						'delete-menu_item_'.$item_id
+					); ?>"><?php _e('Remove'); ?></a> <span class="meta-sep hide-if-no-js"> | </span> <a class="item-cancel submitcancel hide-if-no-js" id="cancel-<?php echo $item_id; ?>" href="<?php echo esc_url(add_query_arg(array('edit-menu-item' => $item_id, 'cancel' => time()), admin_url('nav-menus.php')));
 						?>#menu-item-settings-<?php echo $item_id; ?>"><?php _e('Cancel'); ?></a>
 				</div>
 
 				<input class="menu-item-data-db-id" type="hidden" name="menu-item-db-id[<?php echo $item_id; ?>]" value="<?php echo $item_id; ?>" />
-				<input class="menu-item-data-object-id" type="hidden" name="menu-item-object-id[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->object_id ); ?>" />
-				<input class="menu-item-data-object" type="hidden" name="menu-item-object[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->object ); ?>" />
-				<input class="menu-item-data-parent-id" type="hidden" name="menu-item-parent-id[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->menu_item_parent ); ?>" />
-				<input class="menu-item-data-position" type="hidden" name="menu-item-position[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->menu_order ); ?>" />
-				<input class="menu-item-data-type" type="hidden" name="menu-item-type[<?php echo $item_id; ?>]" value="<?php echo esc_attr( $item->type ); ?>" />
+				<input class="menu-item-data-object-id" type="hidden" name="menu-item-object-id[<?php echo $item_id; ?>]" value="<?php echo esc_attr($item->object_id); ?>" />
+				<input class="menu-item-data-object" type="hidden" name="menu-item-object[<?php echo $item_id; ?>]" value="<?php echo esc_attr($item->object); ?>" />
+				<input class="menu-item-data-parent-id" type="hidden" name="menu-item-parent-id[<?php echo $item_id; ?>]" value="<?php echo esc_attr($item->menu_item_parent); ?>" />
+				<input class="menu-item-data-position" type="hidden" name="menu-item-position[<?php echo $item_id; ?>]" value="<?php echo esc_attr($item->menu_order); ?>" />
+				<input class="menu-item-data-type" type="hidden" name="menu-item-type[<?php echo $item_id; ?>]" value="<?php echo esc_attr($item->type); ?>" />
 			</div><!-- .menu-item-settings-->
 			<ul class="menu-item-transport"></ul>
 		<?php

Braces +6 added lines, -4 removed lines

@@ -73,8 +73,9 @@ 
 		$original_title = '';
 		if ( 'taxonomy' == $item->type ) {
 			$original_title = get_term_field( 'name', $item->object_id, $item->object, 'raw' );
-			if ( is_wp_error( $original_title ) )
-				$original_title = false;
+			if ( is_wp_error( $original_title ) ) {
+							$original_title = false;
+			}
 		} elseif ( 'post_type' == $item->type ) {
 			$original_object = get_post( $item->object_id );
 			$original_title = get_the_title( $original_object->ID );
@@ -106,8 +107,9 @@ 
 		$title = ( ! isset( $item->label ) || '' == $item->label ) ? $title : $item->label;
 
 		$submenu_text = '';
-		if ( 0 == $depth )
-			$submenu_text = 'style="display: none;"';
+		if ( 0 == $depth ) {
+					$submenu_text = 'style="display: none;"';
+		}
 
 		?>
 		<li id="menu-item-<?php echo $item_id; ?>" class="<?php echo implode(' ', $classes ); ?>">