ntwb / wordpress

src/wp-admin/includes/ms-admin-filters.php

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * Multisite Administration hooks
- *
- * @package WordPress
- *
- * @since 4.3.0
- */
+	 * Multisite Administration hooks
+	 *
+	 * @package WordPress
+	 *
+	 * @since 4.3.0
+	 */
 
 // Media Hooks.
 add_filter( 'wp_handle_upload_prefilter', 'check_upload_size' );

Spacing +14 added lines, -14 removed lines

@@ -8,35 +8,35 @@
  */
 
 // Media Hooks.
-add_filter( 'wp_handle_upload_prefilter', 'check_upload_size' );
+add_filter('wp_handle_upload_prefilter', 'check_upload_size');
 
 // User Hooks
-add_action( 'admin_notices', 'new_user_email_admin_notice' );
+add_action('admin_notices', 'new_user_email_admin_notice');
 
-add_action( 'admin_page_access_denied', '_access_denied_splash', 99 );
+add_action('admin_page_access_denied', '_access_denied_splash', 99);
 
-add_action( 'add_option_new_admin_email', 'update_option_new_admin_email', 10, 2 );
+add_action('add_option_new_admin_email', 'update_option_new_admin_email', 10, 2);
 
-add_action( 'personal_options_update', 'send_confirmation_on_profile_email' );
+add_action('personal_options_update', 'send_confirmation_on_profile_email');
 
-add_action( 'update_option_new_admin_email', 'update_option_new_admin_email', 10, 2 );
+add_action('update_option_new_admin_email', 'update_option_new_admin_email', 10, 2);
 
 // Site Hooks.
-add_action( 'wpmueditblogaction', 'upload_space_setting' );
+add_action('wpmueditblogaction', 'upload_space_setting');
 
 // Taxonomy Hooks
-add_filter( 'get_term', 'sync_category_tag_slugs', 10, 2 );
+add_filter('get_term', 'sync_category_tag_slugs', 10, 2);
 
 // Post Hooks.
-add_filter( 'wp_insert_post_data', 'avoid_blog_page_permalink_collision', 10, 2 );
+add_filter('wp_insert_post_data', 'avoid_blog_page_permalink_collision', 10, 2);
 
 // Tools Hooks.
-add_filter( 'import_allow_create_users', 'check_import_new_users' );
+add_filter('import_allow_create_users', 'check_import_new_users');
 
 // Notices Hooks
-add_action( 'admin_notices',         'site_admin_notice' );
-add_action( 'network_admin_notices', 'site_admin_notice' );
+add_action('admin_notices', 'site_admin_notice');
+add_action('network_admin_notices', 'site_admin_notice');
 
 // Update Hooks
-add_action( 'network_admin_notices', 'update_nag',      3  );
-add_action( 'network_admin_notices', 'maintenance_nag', 10 );
+add_action('network_admin_notices', 'update_nag', 3);
+add_action('network_admin_notices', 'maintenance_nag', 10);

src/wp-admin/includes/theme-install.php

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * WordPress Theme Install Administration API
- *
- * @package WordPress
- * @subpackage Administration
- */
+	 * WordPress Theme Install Administration API
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 */
 
 $themes_allowedtags = array('a' => array('href' => array(), 'title' => array(), 'target' => array()),
 	'abbr' => array('title' => array()), 'acronym' => array('title' => array()),

Spacing +40 added lines, -40 removed lines

@@ -14,7 +14,7 @@ 
 	'img' => array('src' => array(), 'class' => array(), 'alt' => array())
 );
 
-$theme_field_defaults = array( 'description' => true, 'sections' => false, 'tested' => true, 'requires' => true,
+$theme_field_defaults = array('description' => true, 'sections' => false, 'tested' => true, 'requires' => true,
 	'rating' => true, 'downloaded' => true, 'downloadlink' => true, 'last_updated' => true, 'homepage' => true,
 	'tags' => true, 'num_ratings' => true
 );
@@ -29,19 +29,19 @@ 
  * @return array
  */
 function install_themes_feature_list() {
-	_deprecated_function( __FUNCTION__, '3.1', 'get_theme_feature_list()' );
+	_deprecated_function(__FUNCTION__, '3.1', 'get_theme_feature_list()');
 
-	if ( !$cache = get_transient( 'wporg_theme_feature_list' ) )
-		set_transient( 'wporg_theme_feature_list', array(), 3 * HOUR_IN_SECONDS );
+	if ( ! $cache = get_transient('wporg_theme_feature_list'))
+		set_transient('wporg_theme_feature_list', array(), 3 * HOUR_IN_SECONDS);
 
-	if ( $cache )
+	if ($cache)
 		return $cache;
 
-	$feature_list = themes_api( 'feature_list', array() );
-	if ( is_wp_error( $feature_list ) )
+	$feature_list = themes_api('feature_list', array());
+	if (is_wp_error($feature_list))
 		return array();
 
-	set_transient( 'wporg_theme_feature_list', $feature_list, 3 * HOUR_IN_SECONDS );
+	set_transient('wporg_theme_feature_list', $feature_list, 3 * HOUR_IN_SECONDS);
 
 	return $feature_list;
 }
@@ -53,15 +53,15 @@ 
  *
  * @param bool $type_selector
  */
-function install_theme_search_form( $type_selector = true ) {
-	$type = isset( $_REQUEST['type'] ) ? wp_unslash( $_REQUEST['type'] ) : 'term';
-	$term = isset( $_REQUEST['s'] ) ? wp_unslash( $_REQUEST['s'] ) : '';
-	if ( ! $type_selector )
-		echo '<p class="install-help">' . __( 'Search for themes by keyword.' ) . '</p>';
+function install_theme_search_form($type_selector = true) {
+	$type = isset($_REQUEST['type']) ? wp_unslash($_REQUEST['type']) : 'term';
+	$term = isset($_REQUEST['s']) ? wp_unslash($_REQUEST['s']) : '';
+	if ( ! $type_selector)
+		echo '<p class="install-help">'.__('Search for themes by keyword.').'</p>';
 	?>
 <form id="search-themes" method="get">
 	<input type="hidden" name="tab" value="search" />
-	<?php if ( $type_selector ) : ?>
+	<?php if ($type_selector) : ?>
 	<label class="screen-reader-text" for="typeselector"><?php _e('Type of search'); ?></label>
 	<select	name="type" id="typeselector">
 	<option value="term" <?php selected('term', $type) ?>><?php _e('Keyword'); ?></option>
@@ -69,15 +69,15 @@ 
 	<option value="tag" <?php selected('tag', $type) ?>><?php _ex('Tag', 'Theme Installer'); ?></option>
 	</select>
 	<label class="screen-reader-text" for="s"><?php
-	switch ( $type ) {
+	switch ($type) {
 		case 'term':
-			_e( 'Search by keyword' );
+			_e('Search by keyword');
 			break;
 		case 'author':
-			_e( 'Search by author' );
+			_e('Search by author');
 			break;
 		case 'tag':
-			_e( 'Search by tag' );
+			_e('Search by tag');
 			break;
 	}
 	?></label>
@@ -85,7 +85,7 @@ 
 	<label class="screen-reader-text" for="s"><?php _e('Search by keyword'); ?></label>
 	<?php endif; ?>
 	<input type="search" name="s" id="s" size="30" value="<?php echo esc_attr($term) ?>" autofocus="autofocus" />
-	<?php submit_button( __( 'Search' ), 'button', 'search', false ); ?>
+	<?php submit_button(__('Search'), 'button', 'search', false); ?>
 </form>
 <?php
 }
@@ -96,10 +96,10 @@ 
  * @since 2.8.0
  */
 function install_themes_dashboard() {
-	install_theme_search_form( false );
+	install_theme_search_form(false);
 ?>
 <h4><?php _e('Feature Filter') ?></h4>
-<p class="install-help"><?php _e( 'Find a theme based on specific features.' ); ?></p>
+<p class="install-help"><?php _e('Find a theme based on specific features.'); ?></p>
 
 <form method="get">
 	<input type="hidden" name="tab" value="search" />
@@ -107,13 +107,13 @@ 
 	$feature_list = get_theme_feature_list();
 	echo '<div class="feature-filter">';
 
-	foreach ( (array) $feature_list as $feature_name => $features ) {
-		$feature_name = esc_html( $feature_name );
-		echo '<div class="feature-name">' . $feature_name . '</div>';
+	foreach ((array) $feature_list as $feature_name => $features) {
+		$feature_name = esc_html($feature_name);
+		echo '<div class="feature-name">'.$feature_name.'</div>';
 
 		echo '<ol class="feature-group">';
-		foreach ( $features as $feature => $feature_name ) {
-			$feature_name = esc_html( $feature_name );
+		foreach ($features as $feature => $feature_name) {
+			$feature_name = esc_html($feature_name);
 			$feature = esc_attr($feature);
 ?>
 
@@ -130,7 +130,7 @@ 
 
 </div>
 <br class="clear" />
-<?php submit_button( __( 'Find Themes' ), 'button', 'search' ); ?>
+<?php submit_button(__('Find Themes'), 'button', 'search'); ?>
 </form>
 <?php
 }
@@ -142,9 +142,9 @@ 
 ?>
 <p class="install-help"><?php _e('If you have a theme in a .zip format, you may install it by uploading it here.'); ?></p>
 <form method="post" enctype="multipart/form-data" class="wp-upload-form" action="<?php echo self_admin_url('update.php?action=upload-theme'); ?>">
-	<?php wp_nonce_field( 'theme-upload'); ?>
+	<?php wp_nonce_field('theme-upload'); ?>
 	<input type="file" name="themezip" />
-	<?php submit_button( __( 'Install Now' ), 'button', 'install-theme-submit', false ); ?>
+	<?php submit_button(__('Install Now'), 'button', 'install-theme-submit', false); ?>
 </form>
 	<?php
 }
@@ -158,14 +158,14 @@ 
  *
  * @param object $theme
  */
-function display_theme( $theme ) {
-	_deprecated_function( __FUNCTION__, '3.4' );
+function display_theme($theme) {
+	_deprecated_function(__FUNCTION__, '3.4');
 	global $wp_list_table;
-	if ( ! isset( $wp_list_table ) ) {
+	if ( ! isset($wp_list_table)) {
 		$wp_list_table = _get_list_table('WP_Theme_Install_List_Table');
 	}
 	$wp_list_table->prepare_items();
-	$wp_list_table->single_row( $theme );
+	$wp_list_table->single_row($theme);
 }
 
 /**
@@ -178,7 +178,7 @@ 
 function display_themes() {
 	global $wp_list_table;
 
-	if ( ! isset( $wp_list_table ) ) {
+	if ( ! isset($wp_list_table)) {
 		$wp_list_table = _get_list_table('WP_Theme_Install_List_Table');
 	}
 	$wp_list_table->prepare_items();
@@ -196,16 +196,16 @@ 
 function install_theme_information() {
 	global $wp_list_table;
 
-	$theme = themes_api( 'theme_information', array( 'slug' => wp_unslash( $_REQUEST['theme'] ) ) );
+	$theme = themes_api('theme_information', array('slug' => wp_unslash($_REQUEST['theme'])));
 
-	if ( is_wp_error( $theme ) )
-		wp_die( $theme );
+	if (is_wp_error($theme))
+		wp_die($theme);
 
-	iframe_header( __('Theme Install') );
-	if ( ! isset( $wp_list_table ) ) {
+	iframe_header(__('Theme Install'));
+	if ( ! isset($wp_list_table)) {
 		$wp_list_table = _get_list_table('WP_Theme_Install_List_Table');
 	}
-	$wp_list_table->theme_installer_single( $theme );
+	$wp_list_table->theme_installer_single($theme);
 	iframe_footer();
 	exit;
 }

Braces +20 added lines, -12 removed lines

@@ -31,15 +31,18 @@ 
 function install_themes_feature_list() {
 	_deprecated_function( __FUNCTION__, '3.1', 'get_theme_feature_list()' );
 
-	if ( !$cache = get_transient( 'wporg_theme_feature_list' ) )
-		set_transient( 'wporg_theme_feature_list', array(), 3 * HOUR_IN_SECONDS );
+	if ( !$cache = get_transient( 'wporg_theme_feature_list' ) ) {
+			set_transient( 'wporg_theme_feature_list', array(), 3 * HOUR_IN_SECONDS );
+	}
 
-	if ( $cache )
-		return $cache;
+	if ( $cache ) {
+			return $cache;
+	}
 
 	$feature_list = themes_api( 'feature_list', array() );
-	if ( is_wp_error( $feature_list ) )
-		return array();
+	if ( is_wp_error( $feature_list ) ) {
+			return array();
+	}
 
 	set_transient( 'wporg_theme_feature_list', $feature_list, 3 * HOUR_IN_SECONDS );
 
@@ -56,8 +59,9 @@ 
 function install_theme_search_form( $type_selector = true ) {
 	$type = isset( $_REQUEST['type'] ) ? wp_unslash( $_REQUEST['type'] ) : 'term';
 	$term = isset( $_REQUEST['s'] ) ? wp_unslash( $_REQUEST['s'] ) : '';
-	if ( ! $type_selector )
-		echo '<p class="install-help">' . __( 'Search for themes by keyword.' ) . '</p>';
+	if ( ! $type_selector ) {
+			echo '<p class="install-help">' . __( 'Search for themes by keyword.' ) . '</p>';
+	}
 	?>
 <form id="search-themes" method="get">
 	<input type="hidden" name="tab" value="search" />
@@ -81,8 +85,11 @@ 
 			break;
 	}
 	?></label>
-	<?php else : ?>
-	<label class="screen-reader-text" for="s"><?php _e('Search by keyword'); ?></label>
+	<?php else {
+	: ?>
+	<label class="screen-reader-text" for="s"><?php _e('Search by keyword');
+}
+?></label>
 	<?php endif; ?>
 	<input type="search" name="s" id="s" size="30" value="<?php echo esc_attr($term) ?>" autofocus="autofocus" />
 	<?php submit_button( __( 'Search' ), 'button', 'search', false ); ?>
@@ -198,8 +205,9 @@ 
 
 	$theme = themes_api( 'theme_information', array( 'slug' => wp_unslash( $_REQUEST['theme'] ) ) );
 
-	if ( is_wp_error( $theme ) )
-		wp_die( $theme );
+	if ( is_wp_error( $theme ) ) {
+			wp_die( $theme );
+	}
 
 	iframe_header( __('Theme Install') );
 	if ( ! isset( $wp_list_table ) ) {

src/wp-admin/includes/post.php

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * WordPress Post Administration API.
- *
- * @package WordPress
- * @subpackage Administration
- */
+	 * WordPress Post Administration API.
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 */
 
 /**
  * Rename $_POST data from form names to DB post columns.

Spacing +499 added lines, -499 removed lines

@@ -18,151 +18,151 @@ 
  * @param array $post_data Array of post data. Defaults to the contents of $_POST.
  * @return object|bool WP_Error on failure, true on success.
  */
-function _wp_translate_postdata( $update = false, $post_data = null ) {
+function _wp_translate_postdata($update = false, $post_data = null) {
 
-	if ( empty($post_data) )
+	if (empty($post_data))
 		$post_data = &$_POST;
 
-	if ( $update )
+	if ($update)
 		$post_data['ID'] = (int) $post_data['post_ID'];
 
-	$ptype = get_post_type_object( $post_data['post_type'] );
+	$ptype = get_post_type_object($post_data['post_type']);
 
-	if ( $update && ! current_user_can( 'edit_post', $post_data['ID'] ) ) {
-		if ( 'page' == $post_data['post_type'] )
-			return new WP_Error( 'edit_others_pages', __( 'You are not allowed to edit pages as this user.' ) );
+	if ($update && ! current_user_can('edit_post', $post_data['ID'])) {
+		if ('page' == $post_data['post_type'])
+			return new WP_Error('edit_others_pages', __('You are not allowed to edit pages as this user.'));
 		else
-			return new WP_Error( 'edit_others_posts', __( 'You are not allowed to edit posts as this user.' ) );
-	} elseif ( ! $update && ! current_user_can( $ptype->cap->create_posts ) ) {
-		if ( 'page' == $post_data['post_type'] )
-			return new WP_Error( 'edit_others_pages', __( 'You are not allowed to create pages as this user.' ) );
+			return new WP_Error('edit_others_posts', __('You are not allowed to edit posts as this user.'));
+	} elseif ( ! $update && ! current_user_can($ptype->cap->create_posts)) {
+		if ('page' == $post_data['post_type'])
+			return new WP_Error('edit_others_pages', __('You are not allowed to create pages as this user.'));
 		else
-			return new WP_Error( 'edit_others_posts', __( 'You are not allowed to create posts as this user.' ) );
+			return new WP_Error('edit_others_posts', __('You are not allowed to create posts as this user.'));
 	}
 
-	if ( isset( $post_data['content'] ) )
+	if (isset($post_data['content']))
 		$post_data['post_content'] = $post_data['content'];
 
-	if ( isset( $post_data['excerpt'] ) )
+	if (isset($post_data['excerpt']))
 		$post_data['post_excerpt'] = $post_data['excerpt'];
 
-	if ( isset( $post_data['parent_id'] ) )
+	if (isset($post_data['parent_id']))
 		$post_data['post_parent'] = (int) $post_data['parent_id'];
 
-	if ( isset($post_data['trackback_url']) )
+	if (isset($post_data['trackback_url']))
 		$post_data['to_ping'] = $post_data['trackback_url'];
 
 	$post_data['user_ID'] = get_current_user_id();
 
-	if (!empty ( $post_data['post_author_override'] ) ) {
+	if ( ! empty ($post_data['post_author_override'])) {
 		$post_data['post_author'] = (int) $post_data['post_author_override'];
 	} else {
-		if (!empty ( $post_data['post_author'] ) ) {
+		if ( ! empty ($post_data['post_author'])) {
 			$post_data['post_author'] = (int) $post_data['post_author'];
 		} else {
 			$post_data['post_author'] = (int) $post_data['user_ID'];
 		}
 	}
 
-	if ( isset( $post_data['user_ID'] ) && ( $post_data['post_author'] != $post_data['user_ID'] )
-		 && ! current_user_can( $ptype->cap->edit_others_posts ) ) {
-		if ( $update ) {
-			if ( 'page' == $post_data['post_type'] )
-				return new WP_Error( 'edit_others_pages', __( 'You are not allowed to edit pages as this user.' ) );
+	if (isset($post_data['user_ID']) && ($post_data['post_author'] != $post_data['user_ID'])
+		 && ! current_user_can($ptype->cap->edit_others_posts)) {
+		if ($update) {
+			if ('page' == $post_data['post_type'])
+				return new WP_Error('edit_others_pages', __('You are not allowed to edit pages as this user.'));
 			else
-				return new WP_Error( 'edit_others_posts', __( 'You are not allowed to edit posts as this user.' ) );
+				return new WP_Error('edit_others_posts', __('You are not allowed to edit posts as this user.'));
 		} else {
-			if ( 'page' == $post_data['post_type'] )
-				return new WP_Error( 'edit_others_pages', __( 'You are not allowed to create pages as this user.' ) );
+			if ('page' == $post_data['post_type'])
+				return new WP_Error('edit_others_pages', __('You are not allowed to create pages as this user.'));
 			else
-				return new WP_Error( 'edit_others_posts', __( 'You are not allowed to create posts as this user.' ) );
+				return new WP_Error('edit_others_posts', __('You are not allowed to create posts as this user.'));
 		}
 	}
 
-	if ( ! empty( $post_data['post_status'] ) ) {
-		$post_data['post_status'] = sanitize_key( $post_data['post_status'] );
+	if ( ! empty($post_data['post_status'])) {
+		$post_data['post_status'] = sanitize_key($post_data['post_status']);
 
 		// No longer an auto-draft
-		if ( 'auto-draft' === $post_data['post_status'] ) {
+		if ('auto-draft' === $post_data['post_status']) {
 			$post_data['post_status'] = 'draft';
 		}
 
-		if ( ! get_post_status_object( $post_data['post_status'] ) ) {
-			unset( $post_data['post_status'] );
+		if ( ! get_post_status_object($post_data['post_status'])) {
+			unset($post_data['post_status']);
 		}
 	}
 
 	// What to do based on which button they pressed
-	if ( isset($post_data['saveasdraft']) && '' != $post_data['saveasdraft'] )
+	if (isset($post_data['saveasdraft']) && '' != $post_data['saveasdraft'])
 		$post_data['post_status'] = 'draft';
-	if ( isset($post_data['saveasprivate']) && '' != $post_data['saveasprivate'] )
+	if (isset($post_data['saveasprivate']) && '' != $post_data['saveasprivate'])
 		$post_data['post_status'] = 'private';
-	if ( isset($post_data['publish']) && ( '' != $post_data['publish'] ) && ( !isset($post_data['post_status']) || $post_data['post_status'] != 'private' ) )
+	if (isset($post_data['publish']) && ('' != $post_data['publish']) && ( ! isset($post_data['post_status']) || $post_data['post_status'] != 'private'))
 		$post_data['post_status'] = 'publish';
-	if ( isset($post_data['advanced']) && '' != $post_data['advanced'] )
+	if (isset($post_data['advanced']) && '' != $post_data['advanced'])
 		$post_data['post_status'] = 'draft';
-	if ( isset($post_data['pending']) && '' != $post_data['pending'] )
+	if (isset($post_data['pending']) && '' != $post_data['pending'])
 		$post_data['post_status'] = 'pending';
 
-	if ( isset( $post_data['ID'] ) )
+	if (isset($post_data['ID']))
 		$post_id = $post_data['ID'];
 	else
 		$post_id = false;
-	$previous_status = $post_id ? get_post_field( 'post_status', $post_id ) : false;
+	$previous_status = $post_id ? get_post_field('post_status', $post_id) : false;
 
-	if ( isset( $post_data['post_status'] ) && 'private' == $post_data['post_status'] && ! current_user_can( $ptype->cap->publish_posts ) ) {
+	if (isset($post_data['post_status']) && 'private' == $post_data['post_status'] && ! current_user_can($ptype->cap->publish_posts)) {
 		$post_data['post_status'] = $previous_status ? $previous_status : 'pending';
 	}
 
-	$published_statuses = array( 'publish', 'future' );
+	$published_statuses = array('publish', 'future');
 
 	// Posts 'submitted for approval' present are submitted to $_POST the same as if they were being published.
 	// Change status from 'publish' to 'pending' if user lacks permissions to publish or to resave published posts.
-	if ( isset($post_data['post_status']) && (in_array( $post_data['post_status'], $published_statuses ) && !current_user_can( $ptype->cap->publish_posts )) )
-		if ( ! in_array( $previous_status, $published_statuses ) || !current_user_can( 'edit_post', $post_id ) )
+	if (isset($post_data['post_status']) && (in_array($post_data['post_status'], $published_statuses) && ! current_user_can($ptype->cap->publish_posts)))
+		if ( ! in_array($previous_status, $published_statuses) || ! current_user_can('edit_post', $post_id))
 			$post_data['post_status'] = 'pending';
 
-	if ( ! isset( $post_data['post_status'] ) ) {
+	if ( ! isset($post_data['post_status'])) {
 		$post_data['post_status'] = 'auto-draft' === $previous_status ? 'draft' : $previous_status;
 	}
 
-	if ( isset( $post_data['post_password'] ) && ! current_user_can( $ptype->cap->publish_posts ) ) {
-		unset( $post_data['post_password'] );
+	if (isset($post_data['post_password']) && ! current_user_can($ptype->cap->publish_posts)) {
+		unset($post_data['post_password']);
 	}
 
-	if (!isset( $post_data['comment_status'] ))
+	if ( ! isset($post_data['comment_status']))
 		$post_data['comment_status'] = 'closed';
 
-	if (!isset( $post_data['ping_status'] ))
+	if ( ! isset($post_data['ping_status']))
 		$post_data['ping_status'] = 'closed';
 
-	foreach ( array('aa', 'mm', 'jj', 'hh', 'mn') as $timeunit ) {
-		if ( !empty( $post_data['hidden_' . $timeunit] ) && $post_data['hidden_' . $timeunit] != $post_data[$timeunit] ) {
+	foreach (array('aa', 'mm', 'jj', 'hh', 'mn') as $timeunit) {
+		if ( ! empty($post_data['hidden_'.$timeunit]) && $post_data['hidden_'.$timeunit] != $post_data[$timeunit]) {
 			$post_data['edit_date'] = '1';
 			break;
 		}
 	}
 
-	if ( !empty( $post_data['edit_date'] ) ) {
+	if ( ! empty($post_data['edit_date'])) {
 		$aa = $post_data['aa'];
 		$mm = $post_data['mm'];
 		$jj = $post_data['jj'];
 		$hh = $post_data['hh'];
 		$mn = $post_data['mn'];
 		$ss = $post_data['ss'];
-		$aa = ($aa <= 0 ) ? date('Y') : $aa;
-		$mm = ($mm <= 0 ) ? date('n') : $mm;
-		$jj = ($jj > 31 ) ? 31 : $jj;
-		$jj = ($jj <= 0 ) ? date('j') : $jj;
-		$hh = ($hh > 23 ) ? $hh -24 : $hh;
-		$mn = ($mn > 59 ) ? $mn -60 : $mn;
-		$ss = ($ss > 59 ) ? $ss -60 : $ss;
-		$post_data['post_date'] = sprintf( "%04d-%02d-%02d %02d:%02d:%02d", $aa, $mm, $jj, $hh, $mn, $ss );
-		$valid_date = wp_checkdate( $mm, $jj, $aa, $post_data['post_date'] );
-		if ( !$valid_date ) {
-			return new WP_Error( 'invalid_date', __( 'Whoops, the provided date is invalid.' ) );
+		$aa = ($aa <= 0) ? date('Y') : $aa;
+		$mm = ($mm <= 0) ? date('n') : $mm;
+		$jj = ($jj > 31) ? 31 : $jj;
+		$jj = ($jj <= 0) ? date('j') : $jj;
+		$hh = ($hh > 23) ? $hh - 24 : $hh;
+		$mn = ($mn > 59) ? $mn - 60 : $mn;
+		$ss = ($ss > 59) ? $ss - 60 : $ss;
+		$post_data['post_date'] = sprintf("%04d-%02d-%02d %02d:%02d:%02d", $aa, $mm, $jj, $hh, $mn, $ss);
+		$valid_date = wp_checkdate($mm, $jj, $aa, $post_data['post_date']);
+		if ( ! $valid_date) {
+			return new WP_Error('invalid_date', __('Whoops, the provided date is invalid.'));
 		}
-		$post_data['post_date_gmt'] = get_gmt_from_date( $post_data['post_date'] );
+		$post_data['post_date_gmt'] = get_gmt_from_date($post_data['post_date']);
 	}
 
 	return $post_data;
@@ -178,149 +178,149 @@ 
  * @param array $post_data Optional.
  * @return int Post ID.
  */
-function edit_post( $post_data = null ) {
+function edit_post($post_data = null) {
 	global $wpdb;
 
-	if ( empty($post_data) )
+	if (empty($post_data))
 		$post_data = &$_POST;
 
 	// Clear out any data in internal vars.
-	unset( $post_data['filter'] );
+	unset($post_data['filter']);
 
 	$post_ID = (int) $post_data['post_ID'];
-	$post = get_post( $post_ID );
+	$post = get_post($post_ID);
 	$post_data['post_type'] = $post->post_type;
 	$post_data['post_mime_type'] = $post->post_mime_type;
 
-	if ( ! empty( $post_data['post_status'] ) ) {
-		$post_data['post_status'] = sanitize_key( $post_data['post_status'] );
+	if ( ! empty($post_data['post_status'])) {
+		$post_data['post_status'] = sanitize_key($post_data['post_status']);
 
-		if ( 'inherit' == $post_data['post_status'] ) {
-			unset( $post_data['post_status'] );
+		if ('inherit' == $post_data['post_status']) {
+			unset($post_data['post_status']);
 		}
 	}
 
 	$ptype = get_post_type_object($post_data['post_type']);
-	if ( !current_user_can( 'edit_post', $post_ID ) ) {
-		if ( 'page' == $post_data['post_type'] )
-			wp_die( __('You are not allowed to edit this page.' ));
+	if ( ! current_user_can('edit_post', $post_ID)) {
+		if ('page' == $post_data['post_type'])
+			wp_die(__('You are not allowed to edit this page.'));
 		else
-			wp_die( __('You are not allowed to edit this post.' ));
+			wp_die(__('You are not allowed to edit this post.'));
 	}
 
-	if ( post_type_supports( $ptype->name, 'revisions' ) ) {
-		$revisions = wp_get_post_revisions( $post_ID, array( 'order' => 'ASC', 'posts_per_page' => 1 ) );
-		$revision = current( $revisions );
+	if (post_type_supports($ptype->name, 'revisions')) {
+		$revisions = wp_get_post_revisions($post_ID, array('order' => 'ASC', 'posts_per_page' => 1));
+		$revision = current($revisions);
 
 		// Check if the revisions have been upgraded
-		if ( $revisions && _wp_get_post_revision_version( $revision ) < 1 )
-			_wp_upgrade_revisions_of_post( $post, wp_get_post_revisions( $post_ID ) );
+		if ($revisions && _wp_get_post_revision_version($revision) < 1)
+			_wp_upgrade_revisions_of_post($post, wp_get_post_revisions($post_ID));
 	}
 
-	if ( isset($post_data['visibility']) ) {
-		switch ( $post_data['visibility'] ) {
+	if (isset($post_data['visibility'])) {
+		switch ($post_data['visibility']) {
 			case 'public' :
 				$post_data['post_password'] = '';
 				break;
 			case 'password' :
-				unset( $post_data['sticky'] );
+				unset($post_data['sticky']);
 				break;
 			case 'private' :
 				$post_data['post_status'] = 'private';
 				$post_data['post_password'] = '';
-				unset( $post_data['sticky'] );
+				unset($post_data['sticky']);
 				break;
 		}
 	}
 
-	$post_data = _wp_translate_postdata( true, $post_data );
-	if ( is_wp_error($post_data) )
-		wp_die( $post_data->get_error_message() );
+	$post_data = _wp_translate_postdata(true, $post_data);
+	if (is_wp_error($post_data))
+		wp_die($post_data->get_error_message());
 
 	// Post Formats
-	if ( isset( $post_data['post_format'] ) )
-		set_post_format( $post_ID, $post_data['post_format'] );
+	if (isset($post_data['post_format']))
+		set_post_format($post_ID, $post_data['post_format']);
 
-	$format_meta_urls = array( 'url', 'link_url', 'quote_source_url' );
-	foreach ( $format_meta_urls as $format_meta_url ) {
-		$keyed = '_format_' . $format_meta_url;
-		if ( isset( $post_data[ $keyed ] ) )
-			update_post_meta( $post_ID, $keyed, wp_slash( esc_url_raw( wp_unslash( $post_data[ $keyed ] ) ) ) );
+	$format_meta_urls = array('url', 'link_url', 'quote_source_url');
+	foreach ($format_meta_urls as $format_meta_url) {
+		$keyed = '_format_'.$format_meta_url;
+		if (isset($post_data[$keyed]))
+			update_post_meta($post_ID, $keyed, wp_slash(esc_url_raw(wp_unslash($post_data[$keyed]))));
 	}
 
-	$format_keys = array( 'quote', 'quote_source_name', 'image', 'gallery', 'audio_embed', 'video_embed' );
+	$format_keys = array('quote', 'quote_source_name', 'image', 'gallery', 'audio_embed', 'video_embed');
 
-	foreach ( $format_keys as $key ) {
-		$keyed = '_format_' . $key;
-		if ( isset( $post_data[ $keyed ] ) ) {
-			if ( current_user_can( 'unfiltered_html' ) )
-				update_post_meta( $post_ID, $keyed, $post_data[ $keyed ] );
+	foreach ($format_keys as $key) {
+		$keyed = '_format_'.$key;
+		if (isset($post_data[$keyed])) {
+			if (current_user_can('unfiltered_html'))
+				update_post_meta($post_ID, $keyed, $post_data[$keyed]);
 			else
-				update_post_meta( $post_ID, $keyed, wp_filter_post_kses( $post_data[ $keyed ] ) );
+				update_post_meta($post_ID, $keyed, wp_filter_post_kses($post_data[$keyed]));
 		}
 	}
 
-	if ( 'attachment' === $post_data['post_type'] && preg_match( '#^(audio|video)/#', $post_data['post_mime_type'] ) ) {
-		$id3data = wp_get_attachment_metadata( $post_ID );
-		if ( ! is_array( $id3data ) ) {
+	if ('attachment' === $post_data['post_type'] && preg_match('#^(audio|video)/#', $post_data['post_mime_type'])) {
+		$id3data = wp_get_attachment_metadata($post_ID);
+		if ( ! is_array($id3data)) {
 			$id3data = array();
 		}
 
-		foreach ( wp_get_attachment_id3_keys( $post, 'edit' ) as $key => $label ) {
-			if ( isset( $post_data[ 'id3_' . $key ] ) ) {
-				$id3data[ $key ] = sanitize_text_field( wp_unslash( $post_data[ 'id3_' . $key ] ) );
+		foreach (wp_get_attachment_id3_keys($post, 'edit') as $key => $label) {
+			if (isset($post_data['id3_'.$key])) {
+				$id3data[$key] = sanitize_text_field(wp_unslash($post_data['id3_'.$key]));
 			}
 		}
-		wp_update_attachment_metadata( $post_ID, $id3data );
+		wp_update_attachment_metadata($post_ID, $id3data);
 	}
 
 	// Meta Stuff
-	if ( isset($post_data['meta']) && $post_data['meta'] ) {
-		foreach ( $post_data['meta'] as $key => $value ) {
-			if ( !$meta = get_post_meta_by_id( $key ) )
+	if (isset($post_data['meta']) && $post_data['meta']) {
+		foreach ($post_data['meta'] as $key => $value) {
+			if ( ! $meta = get_post_meta_by_id($key))
 				continue;
-			if ( $meta->post_id != $post_ID )
+			if ($meta->post_id != $post_ID)
 				continue;
-			if ( is_protected_meta( $value['key'], 'post' ) || ! current_user_can( 'edit_post_meta', $post_ID, $value['key'] ) )
+			if (is_protected_meta($value['key'], 'post') || ! current_user_can('edit_post_meta', $post_ID, $value['key']))
 				continue;
-			update_meta( $key, $value['key'], $value['value'] );
+			update_meta($key, $value['key'], $value['value']);
 		}
 	}
 
-	if ( isset($post_data['deletemeta']) && $post_data['deletemeta'] ) {
-		foreach ( $post_data['deletemeta'] as $key => $value ) {
-			if ( !$meta = get_post_meta_by_id( $key ) )
+	if (isset($post_data['deletemeta']) && $post_data['deletemeta']) {
+		foreach ($post_data['deletemeta'] as $key => $value) {
+			if ( ! $meta = get_post_meta_by_id($key))
 				continue;
-			if ( $meta->post_id != $post_ID )
+			if ($meta->post_id != $post_ID)
 				continue;
-			if ( is_protected_meta( $meta->meta_key, 'post' ) || ! current_user_can( 'delete_post_meta', $post_ID, $meta->meta_key ) )
+			if (is_protected_meta($meta->meta_key, 'post') || ! current_user_can('delete_post_meta', $post_ID, $meta->meta_key))
 				continue;
-			delete_meta( $key );
+			delete_meta($key);
 		}
 	}
 
 	// Attachment stuff
-	if ( 'attachment' == $post_data['post_type'] ) {
-		if ( isset( $post_data[ '_wp_attachment_image_alt' ] ) ) {
-			$image_alt = wp_unslash( $post_data['_wp_attachment_image_alt'] );
-			if ( $image_alt != get_post_meta( $post_ID, '_wp_attachment_image_alt', true ) ) {
-				$image_alt = wp_strip_all_tags( $image_alt, true );
+	if ('attachment' == $post_data['post_type']) {
+		if (isset($post_data['_wp_attachment_image_alt'])) {
+			$image_alt = wp_unslash($post_data['_wp_attachment_image_alt']);
+			if ($image_alt != get_post_meta($post_ID, '_wp_attachment_image_alt', true)) {
+				$image_alt = wp_strip_all_tags($image_alt, true);
 				// update_meta expects slashed.
-				update_post_meta( $post_ID, '_wp_attachment_image_alt', wp_slash( $image_alt ) );
+				update_post_meta($post_ID, '_wp_attachment_image_alt', wp_slash($image_alt));
 			}
 		}
 
-		$attachment_data = isset( $post_data['attachments'][ $post_ID ] ) ? $post_data['attachments'][ $post_ID ] : array();
+		$attachment_data = isset($post_data['attachments'][$post_ID]) ? $post_data['attachments'][$post_ID] : array();
 
 		/** This filter is documented in wp-admin/includes/media.php */
-		$post_data = apply_filters( 'attachment_fields_to_save', $post_data, $attachment_data );
+		$post_data = apply_filters('attachment_fields_to_save', $post_data, $attachment_data);
 	}
 
 	// Convert taxonomy input to term IDs, to avoid ambiguity.
-	if ( isset( $post_data['tax_input'] ) ) {
-		foreach ( (array) $post_data['tax_input'] as $taxonomy => $terms ) {
+	if (isset($post_data['tax_input'])) {
+		foreach ((array) $post_data['tax_input'] as $taxonomy => $terms) {
 			// Hierarchical taxonomy data is already sent as term IDs, so no conversion is necessary.
-			if ( is_taxonomy_hierarchical( $taxonomy ) ) {
+			if (is_taxonomy_hierarchical($taxonomy)) {
 				continue;
 			}
 
@@ -329,67 +329,67 @@ 
 			 * Some languages may use a character other than a comma as a delimiter, so we standardize on
 			 * commas before parsing the list.
 			 */
-			if ( ! is_array( $terms ) ) {
-				$comma = _x( ',', 'tag delimiter' );
-				if ( ',' !== $comma ) {
-					$terms = str_replace( $comma, ',', $terms );
+			if ( ! is_array($terms)) {
+				$comma = _x(',', 'tag delimiter');
+				if (',' !== $comma) {
+					$terms = str_replace($comma, ',', $terms);
 				}
-				$terms = explode( ',', trim( $terms, " \n\t\r\0\x0B," ) );
+				$terms = explode(',', trim($terms, " \n\t\r\0\x0B,"));
 			}
 
 			$clean_terms = array();
-			foreach ( $terms as $term ) {
+			foreach ($terms as $term) {
 				// Empty terms are invalid input.
-				if ( empty( $term ) ) {
+				if (empty($term)) {
 					continue;
 				}
 
-				$_term = get_terms( $taxonomy, array(
+				$_term = get_terms($taxonomy, array(
 					'name' => $term,
 					'fields' => 'ids',
 					'hide_empty' => false,
-				) );
+				));
 
-				if ( ! empty( $_term ) ) {
-					$clean_terms[] = intval( $_term[0] );
+				if ( ! empty($_term)) {
+					$clean_terms[] = intval($_term[0]);
 				} else {
 					// No existing term was found, so pass the string. A new term will be created.
 					$clean_terms[] = $term;
 				}
 			}
 
-			$post_data['tax_input'][ $taxonomy ] = $clean_terms;
+			$post_data['tax_input'][$taxonomy] = $clean_terms;
 		}
 	}
 
-	add_meta( $post_ID );
+	add_meta($post_ID);
 
-	update_post_meta( $post_ID, '_edit_last', get_current_user_id() );
+	update_post_meta($post_ID, '_edit_last', get_current_user_id());
 
-	$success = wp_update_post( $post_data );
+	$success = wp_update_post($post_data);
 	// If the save failed, see if we can sanity check the main fields and try again
-	if ( ! $success && is_callable( array( $wpdb, 'strip_invalid_text_for_column' ) ) ) {
-		$fields = array( 'post_title', 'post_content', 'post_excerpt' );
+	if ( ! $success && is_callable(array($wpdb, 'strip_invalid_text_for_column'))) {
+		$fields = array('post_title', 'post_content', 'post_excerpt');
 
-		foreach( $fields as $field ) {
-			if ( isset( $post_data[ $field ] ) ) {
-				$post_data[ $field ] = $wpdb->strip_invalid_text_for_column( $wpdb->posts, $field, $post_data[ $field ] );
+		foreach ($fields as $field) {
+			if (isset($post_data[$field])) {
+				$post_data[$field] = $wpdb->strip_invalid_text_for_column($wpdb->posts, $field, $post_data[$field]);
 			}
 		}
 
-		wp_update_post( $post_data );
+		wp_update_post($post_data);
 	}
 
 	// Now that we have an ID we can fix any attachment anchor hrefs
-	_fix_attachment_links( $post_ID );
+	_fix_attachment_links($post_ID);
 
-	wp_set_post_lock( $post_ID );
+	wp_set_post_lock($post_ID);
 
-	if ( current_user_can( $ptype->cap->edit_others_posts ) && current_user_can( $ptype->cap->publish_posts ) ) {
-		if ( ! empty( $post_data['sticky'] ) )
-			stick_post( $post_ID );
+	if (current_user_can($ptype->cap->edit_others_posts) && current_user_can($ptype->cap->publish_posts)) {
+		if ( ! empty($post_data['sticky']))
+			stick_post($post_ID);
 		else
-			unstick_post( $post_ID );
+			unstick_post($post_ID);
 	}
 
 	return $post_ID;
@@ -408,22 +408,22 @@ 
  * @param array $post_data Optional, the array of post data to process if not provided will use $_POST superglobal.
  * @return array
  */
-function bulk_edit_posts( $post_data = null ) {
+function bulk_edit_posts($post_data = null) {
 	global $wpdb;
 
-	if ( empty($post_data) )
+	if (empty($post_data))
 		$post_data = &$_POST;
 
-	if ( isset($post_data['post_type']) )
+	if (isset($post_data['post_type']))
 		$ptype = get_post_type_object($post_data['post_type']);
 	else
 		$ptype = get_post_type_object('post');
 
-	if ( !current_user_can( $ptype->cap->edit_posts ) ) {
-		if ( 'page' == $ptype->name )
-			wp_die( __('You are not allowed to edit pages.'));
+	if ( ! current_user_can($ptype->cap->edit_posts)) {
+		if ('page' == $ptype->name)
+			wp_die(__('You are not allowed to edit pages.'));
 		else
-			wp_die( __('You are not allowed to edit posts.'));
+			wp_die(__('You are not allowed to edit posts.'));
 	}
 
 	if ( -1 == $post_data['_status'] ) {
@@ -434,15 +434,15 @@ 
 	}
 	unset($post_data['_status']);
 
-	if ( ! empty( $post_data['post_status'] ) ) {
-		$post_data['post_status'] = sanitize_key( $post_data['post_status'] );
+	if ( ! empty($post_data['post_status'])) {
+		$post_data['post_status'] = sanitize_key($post_data['post_status']);
 
-		if ( 'inherit' == $post_data['post_status'] ) {
-			unset( $post_data['post_status'] );
+		if ('inherit' == $post_data['post_status']) {
+			unset($post_data['post_status']);
 		}
 	}
 
-	$post_IDs = array_map( 'intval', (array) $post_data['post'] );
+	$post_IDs = array_map('intval', (array) $post_data['post']);
 
 	$reset = array(
 		'post_author', 'post_status', 'post_password',
@@ -451,43 +451,43 @@ 
 		'post_category', 'sticky', 'post_format',
 	);
 
-	foreach ( $reset as $field ) {
-		if ( isset($post_data[$field]) && ( '' == $post_data[$field] || -1 == $post_data[$field] ) )
+	foreach ($reset as $field) {
+		if (isset($post_data[$field]) && ('' == $post_data[$field] || -1 == $post_data[$field]))
 			unset($post_data[$field]);
 	}
 
-	if ( isset($post_data['post_category']) ) {
-		if ( is_array($post_data['post_category']) && ! empty($post_data['post_category']) )
-			$new_cats = array_map( 'absint', $post_data['post_category'] );
+	if (isset($post_data['post_category'])) {
+		if (is_array($post_data['post_category']) && ! empty($post_data['post_category']))
+			$new_cats = array_map('absint', $post_data['post_category']);
 		else
 			unset($post_data['post_category']);
 	}
 
 	$tax_input = array();
-	if ( isset($post_data['tax_input'])) {
-		foreach ( $post_data['tax_input'] as $tax_name => $terms ) {
-			if ( empty($terms) )
+	if (isset($post_data['tax_input'])) {
+		foreach ($post_data['tax_input'] as $tax_name => $terms) {
+			if (empty($terms))
 				continue;
-			if ( is_taxonomy_hierarchical( $tax_name ) ) {
-				$tax_input[ $tax_name ] = array_map( 'absint', $terms );
+			if (is_taxonomy_hierarchical($tax_name)) {
+				$tax_input[$tax_name] = array_map('absint', $terms);
 			} else {
-				$comma = _x( ',', 'tag delimiter' );
-				if ( ',' !== $comma )
-					$terms = str_replace( $comma, ',', $terms );
-				$tax_input[ $tax_name ] = explode( ',', trim( $terms, " \n\t\r\0\x0B," ) );
+				$comma = _x(',', 'tag delimiter');
+				if (',' !== $comma)
+					$terms = str_replace($comma, ',', $terms);
+				$tax_input[$tax_name] = explode(',', trim($terms, " \n\t\r\0\x0B,"));
 			}
 		}
 	}
 
-	if ( isset($post_data['post_parent']) && ($parent = (int) $post_data['post_parent']) ) {
+	if (isset($post_data['post_parent']) && ($parent = (int) $post_data['post_parent'])) {
 		$pages = $wpdb->get_results("SELECT ID, post_parent FROM $wpdb->posts WHERE post_type = 'page'");
 		$children = array();
 
-		for ( $i = 0; $i < 50 && $parent > 0; $i++ ) {
+		for ($i = 0; $i < 50 && $parent > 0; $i++) {
 			$children[] = $parent;
 
-			foreach ( $pages as $page ) {
-				if ( $page->ID == $parent ) {
+			foreach ($pages as $page) {
+				if ($page->ID == $parent) {
 					$parent = $page->post_parent;
 					break;
 				}
@@ -498,78 +498,78 @@ 
 	$updated = $skipped = $locked = array();
 	$shared_post_data = $post_data;
 
-	foreach ( $post_IDs as $post_ID ) {
+	foreach ($post_IDs as $post_ID) {
 		// Start with fresh post data with each iteration.
 		$post_data = $shared_post_data;
 
-		$post_type_object = get_post_type_object( get_post_type( $post_ID ) );
+		$post_type_object = get_post_type_object(get_post_type($post_ID));
 
-		if ( !isset( $post_type_object ) || ( isset($children) && in_array($post_ID, $children) ) || !current_user_can( 'edit_post', $post_ID ) ) {
+		if ( ! isset($post_type_object) || (isset($children) && in_array($post_ID, $children)) || ! current_user_can('edit_post', $post_ID)) {
 			$skipped[] = $post_ID;
 			continue;
 		}
 
-		if ( wp_check_post_lock( $post_ID ) ) {
+		if (wp_check_post_lock($post_ID)) {
 			$locked[] = $post_ID;
 			continue;
 		}
 
-		$post = get_post( $post_ID );
-		$tax_names = get_object_taxonomies( $post );
-		foreach ( $tax_names as $tax_name ) {
+		$post = get_post($post_ID);
+		$tax_names = get_object_taxonomies($post);
+		foreach ($tax_names as $tax_name) {
 			$taxonomy_obj = get_taxonomy($tax_name);
-			if ( isset( $tax_input[$tax_name]) && current_user_can( $taxonomy_obj->cap->assign_terms ) )
+			if (isset($tax_input[$tax_name]) && current_user_can($taxonomy_obj->cap->assign_terms))
 				$new_terms = $tax_input[$tax_name];
 			else
 				$new_terms = array();
 
-			if ( $taxonomy_obj->hierarchical )
-				$current_terms = (array) wp_get_object_terms( $post_ID, $tax_name, array('fields' => 'ids') );
+			if ($taxonomy_obj->hierarchical)
+				$current_terms = (array) wp_get_object_terms($post_ID, $tax_name, array('fields' => 'ids'));
 			else
-				$current_terms = (array) wp_get_object_terms( $post_ID, $tax_name, array('fields' => 'names') );
+				$current_terms = (array) wp_get_object_terms($post_ID, $tax_name, array('fields' => 'names'));
 
-			$post_data['tax_input'][$tax_name] = array_merge( $current_terms, $new_terms );
+			$post_data['tax_input'][$tax_name] = array_merge($current_terms, $new_terms);
 		}
 
-		if ( isset($new_cats) && in_array( 'category', $tax_names ) ) {
+		if (isset($new_cats) && in_array('category', $tax_names)) {
 			$cats = (array) wp_get_post_categories($post_ID);
-			$post_data['post_category'] = array_unique( array_merge($cats, $new_cats) );
-			unset( $post_data['tax_input']['category'] );
+			$post_data['post_category'] = array_unique(array_merge($cats, $new_cats));
+			unset($post_data['tax_input']['category']);
 		}
 
 		$post_data['post_type'] = $post->post_type;
 		$post_data['post_mime_type'] = $post->post_mime_type;
 		$post_data['guid'] = $post->guid;
 
-		foreach ( array( 'comment_status', 'ping_status', 'post_author' ) as $field ) {
-			if ( ! isset( $post_data[ $field ] ) ) {
-				$post_data[ $field ] = $post->$field;
+		foreach (array('comment_status', 'ping_status', 'post_author') as $field) {
+			if ( ! isset($post_data[$field])) {
+				$post_data[$field] = $post->$field;
 			}
 		}
 
 		$post_data['ID'] = $post_ID;
 		$post_data['post_ID'] = $post_ID;
 
-		$post_data = _wp_translate_postdata( true, $post_data );
-		if ( is_wp_error( $post_data ) ) {
+		$post_data = _wp_translate_postdata(true, $post_data);
+		if (is_wp_error($post_data)) {
 			$skipped[] = $post_ID;
 			continue;
 		}
 
-		$updated[] = wp_update_post( $post_data );
+		$updated[] = wp_update_post($post_data);
 
-		if ( isset( $post_data['sticky'] ) && current_user_can( $ptype->cap->edit_others_posts ) ) {
-			if ( 'sticky' == $post_data['sticky'] )
-				stick_post( $post_ID );
+		if (isset($post_data['sticky']) && current_user_can($ptype->cap->edit_others_posts)) {
+			if ('sticky' == $post_data['sticky'])
+				stick_post($post_ID);
 			else
-				unstick_post( $post_ID );
+				unstick_post($post_ID);
 		}
 
-		if ( isset( $post_data['post_format'] ) )
-			set_post_format( $post_ID, $post_data['post_format'] );
+		if (isset($post_data['post_format']))
+			set_post_format($post_ID, $post_data['post_format']);
 	}
 
-	return array( 'updated' => $updated, 'skipped' => $skipped, 'locked' => $locked );
+	return array('updated' => $updated, 'skipped' => $skipped, 'locked' => $locked);
 }
 
 /**
@@ -580,24 +580,24 @@ 
  * @param string $post_type A post type string, defaults to 'post'.
  * @return WP_Post Post object containing all the default post data as attributes
  */
-function get_default_post_to_edit( $post_type = 'post', $create_in_db = false ) {
+function get_default_post_to_edit($post_type = 'post', $create_in_db = false) {
 	$post_title = '';
-	if ( !empty( $_REQUEST['post_title'] ) )
-		$post_title = esc_html( wp_unslash( $_REQUEST['post_title'] ));
+	if ( ! empty($_REQUEST['post_title']))
+		$post_title = esc_html(wp_unslash($_REQUEST['post_title']));
 
 	$post_content = '';
-	if ( !empty( $_REQUEST['content'] ) )
-		$post_content = esc_html( wp_unslash( $_REQUEST['content'] ));
+	if ( ! empty($_REQUEST['content']))
+		$post_content = esc_html(wp_unslash($_REQUEST['content']));
 
 	$post_excerpt = '';
-	if ( !empty( $_REQUEST['excerpt'] ) )
-		$post_excerpt = esc_html( wp_unslash( $_REQUEST['excerpt'] ));
-
-	if ( $create_in_db ) {
-		$post_id = wp_insert_post( array( 'post_title' => __( 'Auto Draft' ), 'post_type' => $post_type, 'post_status' => 'auto-draft' ) );
-		$post = get_post( $post_id );
-		if ( current_theme_supports( 'post-formats' ) && post_type_supports( $post->post_type, 'post-formats' ) && get_option( 'default_post_format' ) )
-			set_post_format( $post, get_option( 'default_post_format' ) );
+	if ( ! empty($_REQUEST['excerpt']))
+		$post_excerpt = esc_html(wp_unslash($_REQUEST['excerpt']));
+
+	if ($create_in_db) {
+		$post_id = wp_insert_post(array('post_title' => __('Auto Draft'), 'post_type' => $post_type, 'post_status' => 'auto-draft'));
+		$post = get_post($post_id);
+		if (current_theme_supports('post-formats') && post_type_supports($post->post_type, 'post-formats') && get_option('default_post_format'))
+			set_post_format($post, get_option('default_post_format'));
 	} else {
 		$post = new stdClass;
 		$post->ID = 0;
@@ -610,14 +610,14 @@ 
 		$post->post_status = 'draft';
 		$post->to_ping = '';
 		$post->pinged = '';
-		$post->comment_status = get_default_comment_status( $post_type );
-		$post->ping_status = get_default_comment_status( $post_type, 'pingback' );
-		$post->post_pingback = get_option( 'default_pingback_flag' );
-		$post->post_category = get_option( 'default_category' );
+		$post->comment_status = get_default_comment_status($post_type);
+		$post->ping_status = get_default_comment_status($post_type, 'pingback');
+		$post->post_pingback = get_option('default_pingback_flag');
+		$post->post_category = get_option('default_category');
 		$post->page_template = 'default';
 		$post->post_parent = 0;
 		$post->menu_order = 0;
-		$post = new WP_Post( $post );
+		$post = new WP_Post($post);
 	}
 
 	/**
@@ -628,7 +628,7 @@ 
 	 * @param string  $post_content Default post content.
 	 * @param WP_Post $post         Post object.
 	 */
-	$post->post_content = apply_filters( 'default_content', $post_content, $post );
+	$post->post_content = apply_filters('default_content', $post_content, $post);
 
 	/**
 	 * Filter the default post title initially used in the "Write Post" form.
@@ -638,7 +638,7 @@ 
 	 * @param string  $post_title Default post title.
 	 * @param WP_Post $post       Post object.
 	 */
-	$post->post_title = apply_filters( 'default_title', $post_title, $post );
+	$post->post_title = apply_filters('default_title', $post_title, $post);
 
 	/**
 	 * Filter the default post excerpt initially used in the "Write Post" form.
@@ -648,7 +648,7 @@ 
 	 * @param string  $post_excerpt Default post excerpt.
 	 * @param WP_Post $post         Post object.
 	 */
-	$post->post_excerpt = apply_filters( 'default_excerpt', $post_excerpt, $post );
+	$post->post_excerpt = apply_filters('default_excerpt', $post_excerpt, $post);
 
 	return $post;
 }
@@ -668,30 +668,30 @@ 
 function post_exists($title, $content = '', $date = '') {
 	global $wpdb;
 
-	$post_title = wp_unslash( sanitize_post_field( 'post_title', $title, 0, 'db' ) );
-	$post_content = wp_unslash( sanitize_post_field( 'post_content', $content, 0, 'db' ) );
-	$post_date = wp_unslash( sanitize_post_field( 'post_date', $date, 0, 'db' ) );
+	$post_title = wp_unslash(sanitize_post_field('post_title', $title, 0, 'db'));
+	$post_content = wp_unslash(sanitize_post_field('post_content', $content, 0, 'db'));
+	$post_date = wp_unslash(sanitize_post_field('post_date', $date, 0, 'db'));
 
 	$query = "SELECT ID FROM $wpdb->posts WHERE 1=1";
 	$args = array();
 
-	if ( !empty ( $date ) ) {
+	if ( ! empty ($date)) {
 		$query .= ' AND post_date = %s';
 		$args[] = $post_date;
 	}
 
-	if ( !empty ( $title ) ) {
+	if ( ! empty ($title)) {
 		$query .= ' AND post_title = %s';
 		$args[] = $post_title;
 	}
 
-	if ( !empty ( $content ) ) {
+	if ( ! empty ($content)) {
 		$query .= 'AND post_content = %s';
 		$args[] = $post_content;
 	}
 
-	if ( !empty ( $args ) )
-		return (int) $wpdb->get_var( $wpdb->prepare($query, $args) );
+	if ( ! empty ($args))
+		return (int) $wpdb->get_var($wpdb->prepare($query, $args));
 
 	return 0;
 }
@@ -706,63 +706,63 @@ 
  * @return int|WP_Error
  */
 function wp_write_post() {
-	if ( isset($_POST['post_type']) )
+	if (isset($_POST['post_type']))
 		$ptype = get_post_type_object($_POST['post_type']);
 	else
 		$ptype = get_post_type_object('post');
 
-	if ( !current_user_can( $ptype->cap->edit_posts ) ) {
-		if ( 'page' == $ptype->name )
-			return new WP_Error( 'edit_pages', __( 'You are not allowed to create pages on this site.' ) );
+	if ( ! current_user_can($ptype->cap->edit_posts)) {
+		if ('page' == $ptype->name)
+			return new WP_Error('edit_pages', __('You are not allowed to create pages on this site.'));
 		else
-			return new WP_Error( 'edit_posts', __( 'You are not allowed to create posts or drafts on this site.' ) );
+			return new WP_Error('edit_posts', __('You are not allowed to create posts or drafts on this site.'));
 	}
 
 	$_POST['post_mime_type'] = '';
 
 	// Clear out any data in internal vars.
-	unset( $_POST['filter'] );
+	unset($_POST['filter']);
 
 	// Edit don't write if we have a post id.
-	if ( isset( $_POST['post_ID'] ) )
+	if (isset($_POST['post_ID']))
 		return edit_post();
 
-	if ( isset($_POST['visibility']) ) {
-		switch ( $_POST['visibility'] ) {
+	if (isset($_POST['visibility'])) {
+		switch ($_POST['visibility']) {
 			case 'public' :
 				$_POST['post_password'] = '';
 				break;
 			case 'password' :
-				unset( $_POST['sticky'] );
+				unset($_POST['sticky']);
 				break;
 			case 'private' :
 				$_POST['post_status'] = 'private';
 				$_POST['post_password'] = '';
-				unset( $_POST['sticky'] );
+				unset($_POST['sticky']);
 				break;
 		}
 	}
 
-	$translated = _wp_translate_postdata( false );
-	if ( is_wp_error($translated) )
+	$translated = _wp_translate_postdata(false);
+	if (is_wp_error($translated))
 		return $translated;
 
 	// Create the post.
-	$post_ID = wp_insert_post( $_POST );
-	if ( is_wp_error( $post_ID ) )
+	$post_ID = wp_insert_post($_POST);
+	if (is_wp_error($post_ID))
 		return $post_ID;
 
-	if ( empty($post_ID) )
+	if (empty($post_ID))
 		return 0;
 
-	add_meta( $post_ID );
+	add_meta($post_ID);
 
-	add_post_meta( $post_ID, '_edit_last', $GLOBALS['current_user']->ID );
+	add_post_meta($post_ID, '_edit_last', $GLOBALS['current_user']->ID);
 
 	// Now that we have an ID we can fix any attachment anchor hrefs
-	_fix_attachment_links( $post_ID );
+	_fix_attachment_links($post_ID);
 
-	wp_set_post_lock( $post_ID );
+	wp_set_post_lock($post_ID);
 
 	return $post_ID;
 }
@@ -776,8 +776,8 @@ 
  */
 function write_post() {
 	$result = wp_write_post();
-	if ( is_wp_error( $result ) )
-		wp_die( $result->get_error_message() );
+	if (is_wp_error($result))
+		wp_die($result->get_error_message());
 	else
 		return $result;
 }
@@ -794,32 +794,32 @@ 
  * @param int $post_ID
  * @return int|bool
  */
-function add_meta( $post_ID ) {
+function add_meta($post_ID) {
 	$post_ID = (int) $post_ID;
 
-	$metakeyselect = isset($_POST['metakeyselect']) ? wp_unslash( trim( $_POST['metakeyselect'] ) ) : '';
-	$metakeyinput = isset($_POST['metakeyinput']) ? wp_unslash( trim( $_POST['metakeyinput'] ) ) : '';
+	$metakeyselect = isset($_POST['metakeyselect']) ? wp_unslash(trim($_POST['metakeyselect'])) : '';
+	$metakeyinput = isset($_POST['metakeyinput']) ? wp_unslash(trim($_POST['metakeyinput'])) : '';
 	$metavalue = isset($_POST['metavalue']) ? $_POST['metavalue'] : '';
-	if ( is_string( $metavalue ) )
-		$metavalue = trim( $metavalue );
+	if (is_string($metavalue))
+		$metavalue = trim($metavalue);
 
-	if ( ('0' === $metavalue || ! empty ( $metavalue ) ) && ( ( ( '#NONE#' != $metakeyselect ) && !empty ( $metakeyselect) ) || !empty ( $metakeyinput ) ) ) {
+	if (('0' === $metavalue || ! empty ($metavalue)) && ((('#NONE#' != $metakeyselect) && ! empty ($metakeyselect)) || ! empty ($metakeyinput))) {
 		/*
 		 * We have a key/value pair. If both the select and the input
 		 * for the key have data, the input takes precedence.
 		 */
- 		if ( '#NONE#' != $metakeyselect )
+ 		if ('#NONE#' != $metakeyselect)
 			$metakey = $metakeyselect;
 
-		if ( $metakeyinput )
+		if ($metakeyinput)
 			$metakey = $metakeyinput; // default
 
-		if ( is_protected_meta( $metakey, 'post' ) || ! current_user_can( 'add_post_meta', $post_ID, $metakey ) )
+		if (is_protected_meta($metakey, 'post') || ! current_user_can('add_post_meta', $post_ID, $metakey))
 			return false;
 
-		$metakey = wp_slash( $metakey );
+		$metakey = wp_slash($metakey);
 
-		return add_post_meta( $post_ID, $metakey, $metavalue );
+		return add_post_meta($post_ID, $metakey, $metavalue);
 	}
 
 	return false;
@@ -833,8 +833,8 @@ 
  * @param int $mid
  * @return bool
  */
-function delete_meta( $mid ) {
-	return delete_metadata_by_mid( 'post' , $mid );
+function delete_meta($mid) {
+	return delete_metadata_by_mid('post', $mid);
 }
 
 /**
@@ -849,11 +849,11 @@ 
 function get_meta_keys() {
 	global $wpdb;
 
-	$keys = $wpdb->get_col( "
+	$keys = $wpdb->get_col("
 			SELECT meta_key
 			FROM $wpdb->postmeta
 			GROUP BY meta_key
-			ORDER BY meta_key" );
+			ORDER BY meta_key");
 
 	return $keys;
 }
@@ -866,8 +866,8 @@ 
  * @param int $mid
  * @return object|bool
  */
-function get_post_meta_by_id( $mid ) {
-	return get_metadata_by_mid( 'post', $mid );
+function get_post_meta_by_id($mid) {
+	return get_metadata_by_mid('post', $mid);
 }
 
 /**
@@ -880,12 +880,12 @@ 
  * @param int $postid
  * @return mixed
  */
-function has_meta( $postid ) {
+function has_meta($postid) {
 	global $wpdb;
 
-	return $wpdb->get_results( $wpdb->prepare("SELECT meta_key, meta_value, meta_id, post_id
+	return $wpdb->get_results($wpdb->prepare("SELECT meta_key, meta_value, meta_id, post_id
 			FROM $wpdb->postmeta WHERE post_id = %d
-			ORDER BY meta_key,meta_id", $postid), ARRAY_A );
+			ORDER BY meta_key,meta_id", $postid), ARRAY_A);
 }
 
 /**
@@ -898,11 +898,11 @@ 
  * @param string $meta_value Expect Slashed
  * @return bool
  */
-function update_meta( $meta_id, $meta_key, $meta_value ) {
-	$meta_key = wp_unslash( $meta_key );
-	$meta_value = wp_unslash( $meta_value );
+function update_meta($meta_id, $meta_key, $meta_value) {
+	$meta_key = wp_unslash($meta_key);
+	$meta_value = wp_unslash($meta_value);
 
-	return update_metadata_by_mid( 'post', $meta_id, $meta_value, $meta_key );
+	return update_metadata_by_mid('post', $meta_id, $meta_value, $meta_key);
 }
 
 //
@@ -918,42 +918,42 @@ 
  * @param int|object $post Post ID or post object.
  * @return void|int|WP_Error Void if nothing fixed. 0 or WP_Error on update failure. The post ID on update success.
  */
-function _fix_attachment_links( $post ) {
-	$post = get_post( $post, ARRAY_A );
+function _fix_attachment_links($post) {
+	$post = get_post($post, ARRAY_A);
 	$content = $post['post_content'];
 
 	// Don't run if no pretty permalinks or post is not published, scheduled, or privately published.
-	if ( ! get_option( 'permalink_structure' ) || ! in_array( $post['post_status'], array( 'publish', 'future', 'private' ) ) )
+	if ( ! get_option('permalink_structure') || ! in_array($post['post_status'], array('publish', 'future', 'private')))
 		return;
 
 	// Short if there aren't any links or no '?attachment_id=' strings (strpos cannot be zero)
-	if ( !strpos($content, '?attachment_id=') || !preg_match_all( '/<a ([^>]+)>[\s\S]+?<\/a>/', $content, $link_matches ) )
+	if ( ! strpos($content, '?attachment_id=') || ! preg_match_all('/<a ([^>]+)>[\s\S]+?<\/a>/', $content, $link_matches))
 		return;
 
 	$site_url = get_bloginfo('url');
-	$site_url = substr( $site_url, (int) strpos($site_url, '://') ); // remove the http(s)
+	$site_url = substr($site_url, (int) strpos($site_url, '://')); // remove the http(s)
 	$replace = '';
 
-	foreach ( $link_matches[1] as $key => $value ) {
-		if ( !strpos($value, '?attachment_id=') || !strpos($value, 'wp-att-')
-			|| !preg_match( '/href=(["\'])[^"\']*\?attachment_id=(\d+)[^"\']*\\1/', $value, $url_match )
-			|| !preg_match( '/rel=["\'][^"\']*wp-att-(\d+)/', $value, $rel_match ) )
+	foreach ($link_matches[1] as $key => $value) {
+		if ( ! strpos($value, '?attachment_id=') || ! strpos($value, 'wp-att-')
+			|| ! preg_match('/href=(["\'])[^"\']*\?attachment_id=(\d+)[^"\']*\\1/', $value, $url_match)
+			|| ! preg_match('/rel=["\'][^"\']*wp-att-(\d+)/', $value, $rel_match))
 				continue;
 
 		$quote = $url_match[1]; // the quote (single or double)
 		$url_id = (int) $url_match[2];
 		$rel_id = (int) $rel_match[1];
 
-		if ( !$url_id || !$rel_id || $url_id != $rel_id || strpos($url_match[0], $site_url) === false )
+		if ( ! $url_id || ! $rel_id || $url_id != $rel_id || strpos($url_match[0], $site_url) === false)
 			continue;
 
 		$link = $link_matches[0][$key];
-		$replace = str_replace( $url_match[0], 'href=' . $quote . get_attachment_link( $url_id ) . $quote, $link );
+		$replace = str_replace($url_match[0], 'href='.$quote.get_attachment_link($url_id).$quote, $link);
 
-		$content = str_replace( $link, $replace, $content );
+		$content = str_replace($link, $replace, $content);
 	}
 
-	if ( $replace ) {
+	if ($replace) {
 		$post['post_content'] = $content;
 		// Escape data pulled from DB.
 		$post = add_magic_quotes($post);
@@ -984,38 +984,38 @@ 
  * @param array|bool $q Array of query variables to use to build the query or false to use $_GET superglobal.
  * @return array
  */
-function wp_edit_posts_query( $q = false ) {
-	if ( false === $q )
+function wp_edit_posts_query($q = false) {
+	if (false === $q)
 		$q = $_GET;
 	$q['m'] = isset($q['m']) ? (int) $q['m'] : 0;
 	$q['cat'] = isset($q['cat']) ? (int) $q['cat'] : 0;
-	$post_stati  = get_post_stati();
+	$post_stati = get_post_stati();
 
-	if ( isset($q['post_type']) && in_array( $q['post_type'], get_post_types() ) )
+	if (isset($q['post_type']) && in_array($q['post_type'], get_post_types()))
 		$post_type = $q['post_type'];
 	else
 		$post_type = 'post';
 
 	$avail_post_stati = get_available_post_statuses($post_type);
 
-	if ( isset($q['post_status']) && in_array( $q['post_status'], $post_stati ) ) {
+	if (isset($q['post_status']) && in_array($q['post_status'], $post_stati)) {
 		$post_status = $q['post_status'];
 		$perm = 'readable';
 	}
 
-	if ( isset($q['orderby']) )
+	if (isset($q['orderby']))
 		$orderby = $q['orderby'];
-	elseif ( isset($q['post_status']) && in_array($q['post_status'], array('pending', 'draft')) )
+	elseif (isset($q['post_status']) && in_array($q['post_status'], array('pending', 'draft')))
 		$orderby = 'modified';
 
-	if ( isset($q['order']) )
+	if (isset($q['order']))
 		$order = $q['order'];
-	elseif ( isset($q['post_status']) && 'pending' == $q['post_status'] )
+	elseif (isset($q['post_status']) && 'pending' == $q['post_status'])
 		$order = 'ASC';
 
 	$per_page = "edit_{$post_type}_per_page";
-	$posts_per_page = (int) get_user_option( $per_page );
-	if ( empty( $posts_per_page ) || $posts_per_page < 1 )
+	$posts_per_page = (int) get_user_option($per_page);
+	if (empty($posts_per_page) || $posts_per_page < 1)
 		$posts_per_page = 20;
 
 	/**
@@ -1031,7 +1031,7 @@ 
 	 * @param int $posts_per_page Number of posts to display per page for the given post
 	 *                            type. Default 20.
 	 */
-	$posts_per_page = apply_filters( "edit_{$post_type}_per_page", $posts_per_page );
+	$posts_per_page = apply_filters("edit_{$post_type}_per_page", $posts_per_page);
 
 	/**
 	 * Filter the number of posts displayed per page when specifically listing "posts".
@@ -1041,12 +1041,12 @@ 
 	 * @param int    $posts_per_page Number of posts to be displayed. Default 20.
 	 * @param string $post_type      The post type.
 	 */
-	$posts_per_page = apply_filters( 'edit_posts_per_page', $posts_per_page, $post_type );
+	$posts_per_page = apply_filters('edit_posts_per_page', $posts_per_page, $post_type);
 
 	$query = compact('post_type', 'post_status', 'perm', 'order', 'orderby', 'posts_per_page');
 
 	// Hierarchical types require special args.
-	if ( is_post_type_hierarchical( $post_type ) && !isset($orderby) ) {
+	if (is_post_type_hierarchical($post_type) && ! isset($orderby)) {
 		$query['orderby'] = 'menu_order title';
 		$query['order'] = 'asc';
 		$query['posts_per_page'] = -1;
@@ -1054,10 +1054,10 @@ 
 		$query['fields'] = 'id=>parent';
 	}
 
-	if ( ! empty( $q['show_sticky'] ) )
-		$query['post__in'] = (array) get_option( 'sticky_posts' );
+	if ( ! empty($q['show_sticky']))
+		$query['post__in'] = (array) get_option('sticky_posts');
 
-	wp( $query );
+	wp($query);
 
 	return $avail_post_stati;
 }
@@ -1088,24 +1088,24 @@ 
  *                       to use $_GET superglobal. Default false.
  * @return array The parsed query vars.
  */
-function wp_edit_attachments_query_vars( $q = false ) {
-	if ( false === $q ) {
+function wp_edit_attachments_query_vars($q = false) {
+	if (false === $q) {
 		$q = $_GET;
 	}
-	$q['m']   = isset( $q['m'] ) ? (int) $q['m'] : 0;
-	$q['cat'] = isset( $q['cat'] ) ? (int) $q['cat'] : 0;
+	$q['m']   = isset($q['m']) ? (int) $q['m'] : 0;
+	$q['cat'] = isset($q['cat']) ? (int) $q['cat'] : 0;
 	$q['post_type'] = 'attachment';
-	$post_type = get_post_type_object( 'attachment' );
+	$post_type = get_post_type_object('attachment');
 	$states = 'inherit';
-	if ( current_user_can( $post_type->cap->read_private_posts ) ) {
+	if (current_user_can($post_type->cap->read_private_posts)) {
 		$states .= ',private';
 	}
 
-	$q['post_status'] = isset( $q['status'] ) && 'trash' == $q['status'] ? 'trash' : $states;
-	$q['post_status'] = isset( $q['attachment-filter'] ) && 'trash' == $q['attachment-filter'] ? 'trash' : $states;
+	$q['post_status'] = isset($q['status']) && 'trash' == $q['status'] ? 'trash' : $states;
+	$q['post_status'] = isset($q['attachment-filter']) && 'trash' == $q['attachment-filter'] ? 'trash' : $states;
 
-	$media_per_page = (int) get_user_option( 'upload_per_page' );
-	if ( empty( $media_per_page ) || $media_per_page < 1 ) {
+	$media_per_page = (int) get_user_option('upload_per_page');
+	if (empty($media_per_page) || $media_per_page < 1) {
 		$media_per_page = 20;
 	}
 
@@ -1116,21 +1116,21 @@ 
 	 *
 	 * @param int $media_per_page Number of media to list. Default 20.
 	 */
-	$q['posts_per_page'] = apply_filters( 'upload_per_page', $media_per_page );
+	$q['posts_per_page'] = apply_filters('upload_per_page', $media_per_page);
 
 	$post_mime_types = get_post_mime_types();
-	if ( isset($q['post_mime_type']) && !array_intersect( (array) $q['post_mime_type'], array_keys($post_mime_types) ) ) {
+	if (isset($q['post_mime_type']) && ! array_intersect((array) $q['post_mime_type'], array_keys($post_mime_types))) {
 		unset($q['post_mime_type']);
 	}
 
-	foreach( array_keys( $post_mime_types ) as $type ) {
-		if ( isset( $q['attachment-filter'] ) && "post_mime_type:$type" == $q['attachment-filter'] ) {
+	foreach (array_keys($post_mime_types) as $type) {
+		if (isset($q['attachment-filter']) && "post_mime_type:$type" == $q['attachment-filter']) {
 			$q['post_mime_type'] = $type;
 			break;
 		}
 	}
 
-	if ( isset( $q['detached'] ) || ( isset( $q['attachment-filter'] ) && 'detached' == $q['attachment-filter'] ) ) {
+	if (isset($q['detached']) || (isset($q['attachment-filter']) && 'detached' == $q['attachment-filter'])) {
 		$q['post_parent'] = 0;
 	}
 
@@ -1146,13 +1146,13 @@ 
  * @param array|false $q Array of query variables to use to build the query or false to use $_GET superglobal.
  * @return array
  */
-function wp_edit_attachments_query( $q = false ) {
-	wp( wp_edit_attachments_query_vars( $q ) );
+function wp_edit_attachments_query($q = false) {
+	wp(wp_edit_attachments_query_vars($q));
 
 	$post_mime_types = get_post_mime_types();
-	$avail_post_mime_types = get_available_post_mime_types( 'attachment' );
+	$avail_post_mime_types = get_available_post_mime_types('attachment');
 
-	return array( $post_mime_types, $avail_post_mime_types );
+	return array($post_mime_types, $avail_post_mime_types);
 }
 
 /**
@@ -1164,17 +1164,17 @@ 
  * @param string $page
  * @return string
  */
-function postbox_classes( $id, $page ) {
-	if ( isset( $_GET['edit'] ) && $_GET['edit'] == $id ) {
-		$classes = array( '' );
-	} elseif ( $closed = get_user_option('closedpostboxes_'.$page ) ) {
-		if ( !is_array( $closed ) ) {
-			$classes = array( '' );
+function postbox_classes($id, $page) {
+	if (isset($_GET['edit']) && $_GET['edit'] == $id) {
+		$classes = array('');
+	} elseif ($closed = get_user_option('closedpostboxes_'.$page)) {
+		if ( ! is_array($closed)) {
+			$classes = array('');
 		} else {
-			$classes = in_array( $id, $closed ) ? array( 'closed' ) : array( '' );
+			$classes = in_array($id, $closed) ? array('closed') : array('');
 		}
 	} else {
-		$classes = array( '' );
+		$classes = array('');
 	}
 
 	/**
@@ -1187,8 +1187,8 @@ 
 	 *
 	 * @param array $classes An array of postbox classes.
 	 */
-	$classes = apply_filters( "postbox_classes_{$page}_{$id}", $classes );
-	return implode( ' ', $classes );
+	$classes = apply_filters("postbox_classes_{$page}_{$id}", $classes);
+	return implode(' ', $classes);
 }
 
 /**
@@ -1202,9 +1202,9 @@ 
  * @return array Array with two entries of type string.
  */
 function get_sample_permalink($id, $title = null, $name = null) {
-	$post = get_post( $id );
-	if ( ! $post )
-		return array( '', '' );
+	$post = get_post($id);
+	if ( ! $post)
+		return array('', '');
 
 	$ptype = get_post_type_object($post->post_type);
 
@@ -1213,14 +1213,14 @@ 
 	$original_name = $post->post_name;
 
 	// Hack: get_permalink() would return ugly permalink for drafts, so we will fake that our post is published.
-	if ( in_array( $post->post_status, array( 'draft', 'pending', 'future' ) ) ) {
+	if (in_array($post->post_status, array('draft', 'pending', 'future'))) {
 		$post->post_status = 'publish';
 		$post->post_name = sanitize_title($post->post_name ? $post->post_name : $post->post_title, $post->ID);
 	}
 
 	// If the user wants to set a new name -- override the current one
 	// Note: if empty name is supplied -- use the title instead, see #6072
-	if ( !is_null($name) )
+	if ( ! is_null($name))
 		$post->post_name = sanitize_title($name ? $name : $title, $post->ID);
 
 	$post->post_name = wp_unique_post_slug($post->post_name, $post->ID, $post->post_status, $post->post_type, $post->post_parent);
@@ -1233,23 +1233,23 @@ 
 	$permalink = str_replace("%$post->post_type%", '%pagename%', $permalink);
 
 	// Handle page hierarchy
-	if ( $ptype->hierarchical ) {
+	if ($ptype->hierarchical) {
 		$uri = get_page_uri($post);
-		if ( $uri ) {
+		if ($uri) {
 			$uri = untrailingslashit($uri);
-			$uri = strrev( stristr( strrev( $uri ), '/' ) );
+			$uri = strrev(stristr(strrev($uri), '/'));
 			$uri = untrailingslashit($uri);
 		}
 
 		/** This filter is documented in wp-admin/edit-tag-form.php */
-		$uri = apply_filters( 'editable_slug', $uri );
-		if ( !empty($uri) )
+		$uri = apply_filters('editable_slug', $uri);
+		if ( ! empty($uri))
 			$uri .= '/';
 		$permalink = str_replace('%pagename%', "{$uri}%pagename%", $permalink);
 	}
 
 	/** This filter is documented in wp-admin/edit-tag-form.php */
-	$permalink = array( $permalink, apply_filters( 'editable_slug', $post->post_name ) );
+	$permalink = array($permalink, apply_filters('editable_slug', $post->post_name));
 	$post->post_status = $original_status;
 	$post->post_date = $original_date;
 	$post->post_name = $original_name;
@@ -1268,67 +1268,67 @@ 
  * @param string $new_slug  Optional. New slug. Default null.
  * @return string The HTML of the sample permalink slug editor.
  */
-function get_sample_permalink_html( $id, $new_title = null, $new_slug = null ) {
-	$post = get_post( $id );
-	if ( ! $post )
+function get_sample_permalink_html($id, $new_title = null, $new_slug = null) {
+	$post = get_post($id);
+	if ( ! $post)
 		return '';
 
 	list($permalink, $post_name) = get_sample_permalink($post->ID, $new_title, $new_slug);
 
-	if ( current_user_can( 'read_post', $post->ID ) ) {
-		$ptype = get_post_type_object( $post->post_type );
+	if (current_user_can('read_post', $post->ID)) {
+		$ptype = get_post_type_object($post->post_type);
 		$view_post = $ptype->labels->view_item;
 	}
 
-	if ( 'publish' == get_post_status( $post ) ) {
+	if ('publish' == get_post_status($post)) {
 		$title = __('Click to edit this part of the permalink');
 	} else {
 		$title = __('Temporary permalink. Click to edit this part.');
 	}
 
-	if ( false === strpos( $permalink, '%postname%' ) && false === strpos( $permalink, '%pagename%' ) ) {
-		$return = '<strong>' . __('Permalink:') . "</strong>\n" . '<span id="sample-permalink" tabindex="-1">' . $permalink . "</span>\n";
-		if ( '' == get_option( 'permalink_structure' ) && current_user_can( 'manage_options' ) && !( 'page' == get_option('show_on_front') && $id == get_option('page_on_front') ) ) {
-			$return .= '<span id="change-permalinks"><a href="options-permalink.php" class="button button-small" target="_blank">' . __('Change Permalinks') . "</a></span>\n";
+	if (false === strpos($permalink, '%postname%') && false === strpos($permalink, '%pagename%')) {
+		$return = '<strong>'.__('Permalink:')."</strong>\n".'<span id="sample-permalink" tabindex="-1">'.$permalink."</span>\n";
+		if ('' == get_option('permalink_structure') && current_user_can('manage_options') && ! ('page' == get_option('show_on_front') && $id == get_option('page_on_front'))) {
+			$return .= '<span id="change-permalinks"><a href="options-permalink.php" class="button button-small" target="_blank">'.__('Change Permalinks')."</a></span>\n";
 		}
 	} else {
-		if ( function_exists( 'mb_strlen' ) ) {
-			if ( mb_strlen( $post_name ) > 30 ) {
-				$post_name_abridged = mb_substr( $post_name, 0, 14 ) . '&hellip;' . mb_substr( $post_name, -14 );
+		if (function_exists('mb_strlen')) {
+			if (mb_strlen($post_name) > 30) {
+				$post_name_abridged = mb_substr($post_name, 0, 14).'&hellip;'.mb_substr($post_name, -14);
 			} else {
 				$post_name_abridged = $post_name;
 			}
 		} else {
-			if ( strlen( $post_name ) > 30 ) {
-				$post_name_abridged = substr( $post_name, 0, 14 ) . '&hellip;' . substr( $post_name, -14 );
+			if (strlen($post_name) > 30) {
+				$post_name_abridged = substr($post_name, 0, 14).'&hellip;'.substr($post_name, -14);
 			} else {
 				$post_name_abridged = $post_name;
 			}
 		}
 
-		$post_name_html = '<span id="editable-post-name" title="' . $title . '">' . $post_name_abridged . '</span>';
-		$display_link = str_replace( array( '%pagename%', '%postname%' ), $post_name_html, urldecode( $permalink ) );
-		$pretty_permalink = str_replace( array( '%pagename%', '%postname%' ), $post_name, urldecode( $permalink ) );
+		$post_name_html = '<span id="editable-post-name" title="'.$title.'">'.$post_name_abridged.'</span>';
+		$display_link = str_replace(array('%pagename%', '%postname%'), $post_name_html, urldecode($permalink));
+		$pretty_permalink = str_replace(array('%pagename%', '%postname%'), $post_name, urldecode($permalink));
 
-		$return =  '<strong>' . __( 'Permalink:' ) . "</strong>\n";
-		$return .= '<span id="sample-permalink" tabindex="-1">' . $display_link . "</span>\n";
+		$return = '<strong>'.__('Permalink:')."</strong>\n";
+		$return .= '<span id="sample-permalink" tabindex="-1">'.$display_link."</span>\n";
 		$return .= '&lrm;'; // Fix bi-directional text display defect in RTL languages.
-		$return .= '<span id="edit-slug-buttons"><a href="#post_name" class="edit-slug button button-small hide-if-no-js" onclick="editPermalink(' . $id . '); return false;">' . __( 'Edit' ) . "</a></span>\n";
-		$return .= '<span id="editable-post-name-full">' . $post_name . "</span>\n";
+		$return .= '<span id="edit-slug-buttons"><a href="#post_name" class="edit-slug button button-small hide-if-no-js" onclick="editPermalink('.$id.'); return false;">'.__('Edit')."</a></span>\n";
+		$return .= '<span id="editable-post-name-full">'.$post_name."</span>\n";
 	}
 
-	if ( isset( $view_post ) ) {
-		if ( 'draft' == $post->post_status ) {
-			$preview_link = set_url_scheme( get_permalink( $post->ID ) );
+	if (isset($view_post)) {
+		if ('draft' == $post->post_status) {
+			$preview_link = set_url_scheme(get_permalink($post->ID));
 			/** This filter is documented in wp-admin/includes/meta-boxes.php */
-			$preview_link = apply_filters( 'preview_post_link', add_query_arg( 'preview', 'true', $preview_link ), $post );
-			$return .= "<span id='view-post-btn'><a href='" . esc_url( $preview_link ) . "' class='button button-small' target='wp-preview-{$post->ID}'>$view_post</a></span>\n";
+			$preview_link = apply_filters('preview_post_link', add_query_arg('preview', 'true', $preview_link), $post);
+			$return .= "<span id='view-post-btn'><a href='".esc_url($preview_link)."' class='button button-small' target='wp-preview-{$post->ID}'>$view_post</a></span>\n";
 		} else {
-			if ( empty( $pretty_permalink ) ) {
+			if (empty($pretty_permalink)) {
 				$pretty_permalink = $permalink;
 			}
 
-			$return .= "<span id='view-post-btn'><a href='" . $pretty_permalink . "' class='button button-small'>$view_post</a></span>\n";
+			$return .= "<span id='view-post-btn'><a href='".$pretty_permalink."' class='button button-small'>$view_post</a></span>\n";
 		}
 	}
 
@@ -1342,7 +1342,7 @@ 
 	 * @param string      $new_title New sample permalink title.
 	 * @param string      $new_slug  New sample permalink slug.
 	 */
-	$return = apply_filters( 'get_sample_permalink_html', $return, $id, $new_title, $new_slug );
+	$return = apply_filters('get_sample_permalink_html', $return, $id, $new_title, $new_slug);
 
 	return $return;
 }
@@ -1359,35 +1359,35 @@ 
  * @param mixed $post The post ID or object associated with the thumbnail, defaults to global $post.
  * @return string html
  */
-function _wp_post_thumbnail_html( $thumbnail_id = null, $post = null ) {
+function _wp_post_thumbnail_html($thumbnail_id = null, $post = null) {
 	global $content_width, $_wp_additional_image_sizes;
 
-	$post               = get_post( $post );
-	$post_type_object   = get_post_type_object( $post->post_type );
+	$post               = get_post($post);
+	$post_type_object   = get_post_type_object($post->post_type);
 	$set_thumbnail_link = '<p class="hide-if-no-js"><a title="%s" href="%s" id="set-post-thumbnail" class="thickbox">%s</a></p>';
-	$upload_iframe_src  = get_upload_iframe_src( 'image', $post->ID );
+	$upload_iframe_src  = get_upload_iframe_src('image', $post->ID);
 
-	$content = sprintf( $set_thumbnail_link,
-		esc_attr( $post_type_object->labels->set_featured_image ),
-		esc_url( $upload_iframe_src ),
-		esc_html( $post_type_object->labels->set_featured_image )
+	$content = sprintf($set_thumbnail_link,
+		esc_attr($post_type_object->labels->set_featured_image),
+		esc_url($upload_iframe_src),
+		esc_html($post_type_object->labels->set_featured_image)
 	);
 
-	if ( $thumbnail_id && get_post( $thumbnail_id ) ) {
+	if ($thumbnail_id && get_post($thumbnail_id)) {
 		$old_content_width = $content_width;
 		$content_width = 266;
-		if ( !isset( $_wp_additional_image_sizes['post-thumbnail'] ) )
-			$thumbnail_html = wp_get_attachment_image( $thumbnail_id, array( $content_width, $content_width ) );
+		if ( ! isset($_wp_additional_image_sizes['post-thumbnail']))
+			$thumbnail_html = wp_get_attachment_image($thumbnail_id, array($content_width, $content_width));
 		else
-			$thumbnail_html = wp_get_attachment_image( $thumbnail_id, 'post-thumbnail' );
-		if ( !empty( $thumbnail_html ) ) {
-			$ajax_nonce = wp_create_nonce( 'set_post_thumbnail-' . $post->ID );
-			$content = sprintf( $set_thumbnail_link,
-				esc_attr( $post_type_object->labels->set_featured_image ),
-				esc_url( $upload_iframe_src ),
+			$thumbnail_html = wp_get_attachment_image($thumbnail_id, 'post-thumbnail');
+		if ( ! empty($thumbnail_html)) {
+			$ajax_nonce = wp_create_nonce('set_post_thumbnail-'.$post->ID);
+			$content = sprintf($set_thumbnail_link,
+				esc_attr($post_type_object->labels->set_featured_image),
+				esc_url($upload_iframe_src),
 				$thumbnail_html
 			);
-			$content .= '<p class="hide-if-no-js"><a href="#" id="remove-post-thumbnail" onclick="WPRemoveThumbnail(\'' . $ajax_nonce . '\');return false;">' . esc_html( $post_type_object->labels->remove_featured_image ) . '</a></p>';
+			$content .= '<p class="hide-if-no-js"><a href="#" id="remove-post-thumbnail" onclick="WPRemoveThumbnail(\''.$ajax_nonce.'\');return false;">'.esc_html($post_type_object->labels->remove_featured_image).'</a></p>';
 		}
 		$content_width = $old_content_width;
 	}
@@ -1400,7 +1400,7 @@ 
 	 * @param string $content Admin post thumbnail HTML markup.
 	 * @param int    $post_id Post ID.
 	 */
-	return apply_filters( 'admin_post_thumbnail_html', $content, $post->ID );
+	return apply_filters('admin_post_thumbnail_html', $content, $post->ID);
 }
 
 /**
@@ -1411,21 +1411,21 @@ 
  * @param int $post_id ID of the post to check for editing
  * @return integer False: not locked or locked by current user. Int: user ID of user with lock.
  */
-function wp_check_post_lock( $post_id ) {
-	if ( !$post = get_post( $post_id ) )
+function wp_check_post_lock($post_id) {
+	if ( ! $post = get_post($post_id))
 		return false;
 
-	if ( !$lock = get_post_meta( $post->ID, '_edit_lock', true ) )
+	if ( ! $lock = get_post_meta($post->ID, '_edit_lock', true))
 		return false;
 
-	$lock = explode( ':', $lock );
+	$lock = explode(':', $lock);
 	$time = $lock[0];
-	$user = isset( $lock[1] ) ? $lock[1] : get_post_meta( $post->ID, '_edit_last', true );
+	$user = isset($lock[1]) ? $lock[1] : get_post_meta($post->ID, '_edit_last', true);
 
 	/** This filter is documented in wp-admin/includes/ajax-actions.php */
-	$time_window = apply_filters( 'wp_check_post_lock_window', 150 );
+	$time_window = apply_filters('wp_check_post_lock_window', 150);
 
-	if ( $time && $time > time() - $time_window && $user != get_current_user_id() )
+	if ($time && $time > time() - $time_window && $user != get_current_user_id())
 		return $user;
 	return false;
 }
@@ -1439,17 +1439,17 @@ 
  * @return bool|array Returns false if the post doesn't exist of there is no current user, or
  * 	an array of the lock time and the user ID.
  */
-function wp_set_post_lock( $post_id ) {
-	if ( !$post = get_post( $post_id ) )
+function wp_set_post_lock($post_id) {
+	if ( ! $post = get_post($post_id))
 		return false;
-	if ( 0 == ($user_id = get_current_user_id()) )
+	if (0 == ($user_id = get_current_user_id()))
 		return false;
 
 	$now = time();
 	$lock = "$now:$user_id";
 
-	update_post_meta( $post->ID, '_edit_lock', $lock );
-	return array( $now, $user_id );
+	update_post_meta($post->ID, '_edit_lock', $lock);
+	return array($now, $user_id);
 }
 
 /**
@@ -1459,14 +1459,14 @@ 
  * @return none
  */
 function _admin_notice_post_locked() {
-	if ( ! $post = get_post() )
+	if ( ! $post = get_post())
 		return;
 
 	$user = null;
-	if (  $user_id = wp_check_post_lock( $post->ID ) )
-		$user = get_userdata( $user_id );
+	if ($user_id = wp_check_post_lock($post->ID))
+		$user = get_userdata($user_id);
 
-	if ( $user ) {
+	if ($user) {
 
 		/**
 		 * Filter whether to show the post locked dialog.
@@ -1478,7 +1478,7 @@ 
 		 * @param bool         $display Whether to display the dialog. Default true.
 		 * @param WP_User|bool $user    WP_User object on success, false otherwise.
 		 */
-		if ( ! apply_filters( 'show_post_locked_dialog', true, $post, $user ) )
+		if ( ! apply_filters('show_post_locked_dialog', true, $post, $user))
 			return;
 
 		$locked = true;
@@ -1486,17 +1486,17 @@ 
 		$locked = false;
 	}
 
-	if ( $locked && ( $sendback = wp_get_referer() ) &&
-		false === strpos( $sendback, 'post.php' ) && false === strpos( $sendback, 'post-new.php' ) ) {
+	if ($locked && ($sendback = wp_get_referer()) &&
+		false === strpos($sendback, 'post.php') && false === strpos($sendback, 'post-new.php')) {
 
 		$sendback_text = __('Go back');
 	} else {
-		$sendback = admin_url( 'edit.php' );
+		$sendback = admin_url('edit.php');
 
-		if ( 'post' != $post->post_type )
-			$sendback = add_query_arg( 'post_type', $post->post_type, $sendback );
+		if ('post' != $post->post_type)
+			$sendback = add_query_arg('post_type', $post->post_type, $sendback);
 
-		$sendback_text = get_post_type_object( $post->post_type )->labels->all_items;
+		$sendback_text = get_post_type_object($post->post_type)->labels->all_items;
 	}
 
 	$hidden = $locked ? '' : ' hidden';
@@ -1507,21 +1507,21 @@ 
 	<div class="notification-dialog">
 	<?php
 
-	if ( $locked ) {
-		if ( get_post_type_object( $post->post_type )->public ) {
-			$preview_link = set_url_scheme( add_query_arg( 'preview', 'true', get_permalink( $post->ID ) ) );
+	if ($locked) {
+		if (get_post_type_object($post->post_type)->public) {
+			$preview_link = set_url_scheme(add_query_arg('preview', 'true', get_permalink($post->ID)));
 
-			if ( 'publish' == $post->post_status || $user->ID != $post->post_author ) {
+			if ('publish' == $post->post_status || $user->ID != $post->post_author) {
 				// Latest content is in autosave
-				$nonce = wp_create_nonce( 'post_preview_' . $post->ID );
-				$preview_link = add_query_arg( array( 'preview_id' => $post->ID, 'preview_nonce' => $nonce ), $preview_link );
+				$nonce = wp_create_nonce('post_preview_'.$post->ID);
+				$preview_link = add_query_arg(array('preview_id' => $post->ID, 'preview_nonce' => $nonce), $preview_link);
 			}
 		} else {
 			$preview_link = '';
 		}
 
 		/** This filter is documented in wp-admin/includes/meta-boxes.php */
-		$preview_link = apply_filters( 'preview_post_link', $preview_link, $post );
+		$preview_link = apply_filters('preview_post_link', $preview_link, $post);
 
 		/**
 		 * Filter whether to allow the post lock to be overridden.
@@ -1535,17 +1535,17 @@ 
 		 * @param WP_Post $post     Post object.
 		 * @param WP_User $user     User object.
 		 */
-		$override = apply_filters( 'override_post_lock', true, $post, $user );
+		$override = apply_filters('override_post_lock', true, $post, $user);
 		$tab_last = $override ? '' : ' wp-tab-last';
 
 		?>
 		<div class="post-locked-message">
-		<div class="post-locked-avatar"><?php echo get_avatar( $user->ID, 64 ); ?></div>
+		<div class="post-locked-avatar"><?php echo get_avatar($user->ID, 64); ?></div>
 		<p class="currently-editing wp-tab-first" tabindex="0">
 		<?php
-			_e( 'This content is currently locked.' );
-			if ( $override )
-				printf( ' ' . __( 'If you take over, %s will be blocked from continuing to edit.' ), esc_html( $user->display_name ) );
+			_e('This content is currently locked.');
+			if ($override)
+				printf(' '.__('If you take over, %s will be blocked from continuing to edit.'), esc_html($user->display_name));
 		?>
 		</p>
 		<?php
@@ -1556,19 +1556,19 @@ 
 		 *
 		 * @param WP_Post $post Post object.
 		 */
-		do_action( 'post_locked_dialog', $post );
+		do_action('post_locked_dialog', $post);
 		?>
 		<p>
-		<a class="button" href="<?php echo esc_url( $sendback ); ?>"><?php echo $sendback_text; ?></a>
-		<?php if ( $preview_link ) { ?>
-		<a class="button<?php echo $tab_last; ?>" href="<?php echo esc_url( $preview_link ); ?>"><?php _e('Preview'); ?></a>
+		<a class="button" href="<?php echo esc_url($sendback); ?>"><?php echo $sendback_text; ?></a>
+		<?php if ($preview_link) { ?>
+		<a class="button<?php echo $tab_last; ?>" href="<?php echo esc_url($preview_link); ?>"><?php _e('Preview'); ?></a>
 		<?php
 		}
 
 		// Allow plugins to prevent some users overriding the post lock
-		if ( $override ) {
+		if ($override) {
 			?>
-			<a class="button button-primary wp-tab-last" href="<?php echo esc_url( add_query_arg( 'get-post-lock', '1', wp_nonce_url( get_edit_post_link( $post->ID, 'url' ), 'lock-post_' . $post->ID ) ) ); ?>"><?php _e('Take over'); ?></a>
+			<a class="button button-primary wp-tab-last" href="<?php echo esc_url(add_query_arg('get-post-lock', '1', wp_nonce_url(get_edit_post_link($post->ID, 'url'), 'lock-post_'.$post->ID))); ?>"><?php _e('Take over'); ?></a>
 			<?php
 		}
 
@@ -1582,7 +1582,7 @@ 
 			<div class="post-locked-avatar"></div>
 			<p class="wp-tab-first" tabindex="0">
 			<span class="currently-editing"></span><br />
-			<span class="locked-saving hidden"><img src="<?php echo esc_url( admin_url( 'images/spinner-2x.gif' ) ); ?>" width="16" height="16" /> <?php _e('Saving revision...'); ?></span>
+			<span class="locked-saving hidden"><img src="<?php echo esc_url(admin_url('images/spinner-2x.gif')); ?>" width="16" height="16" /> <?php _e('Saving revision...'); ?></span>
 			<span class="locked-saved hidden"><?php _e('Your latest changes were saved as a revision.'); ?></span>
 			</p>
 			<?php
@@ -1593,9 +1593,9 @@ 
 			 *
 			 * @param WP_Post $post Post object.
 			 */
-			do_action( 'post_lock_lost_dialog', $post );
+			do_action('post_lock_lost_dialog', $post);
 			?>
-			<p><a class="button button-primary wp-tab-last" href="<?php echo esc_url( $sendback ); ?>"><?php echo $sendback_text; ?></a></p>
+			<p><a class="button button-primary wp-tab-last" href="<?php echo esc_url($sendback); ?>"><?php echo $sendback_text; ?></a></p>
 		</div>
 		<?php
 	}
@@ -1616,38 +1616,38 @@ 
  * @param mixed $post_data Associative array containing the post data or int post ID.
  * @return mixed The autosave revision ID. WP_Error or 0 on error.
  */
-function wp_create_post_autosave( $post_data ) {
-	if ( is_numeric( $post_data ) ) {
+function wp_create_post_autosave($post_data) {
+	if (is_numeric($post_data)) {
 		$post_id = $post_data;
 		$post_data = &$_POST;
 	} else {
 		$post_id = (int) $post_data['post_ID'];
 	}
 
-	$post_data = _wp_translate_postdata( true, $post_data );
-	if ( is_wp_error( $post_data ) )
+	$post_data = _wp_translate_postdata(true, $post_data);
+	if (is_wp_error($post_data))
 		return $post_data;
 
 	$post_author = get_current_user_id();
 
 	// Store one autosave per author. If there is already an autosave, overwrite it.
-	if ( $old_autosave = wp_get_post_autosave( $post_id, $post_author ) ) {
-		$new_autosave = _wp_post_revision_fields( $post_data, true );
+	if ($old_autosave = wp_get_post_autosave($post_id, $post_author)) {
+		$new_autosave = _wp_post_revision_fields($post_data, true);
 		$new_autosave['ID'] = $old_autosave->ID;
 		$new_autosave['post_author'] = $post_author;
 
 		// If the new autosave has the same content as the post, delete the autosave.
-		$post = get_post( $post_id );
+		$post = get_post($post_id);
 		$autosave_is_different = false;
-		foreach ( array_intersect( array_keys( $new_autosave ), array_keys( _wp_post_revision_fields() ) ) as $field ) {
-			if ( normalize_whitespace( $new_autosave[ $field ] ) != normalize_whitespace( $post->$field ) ) {
+		foreach (array_intersect(array_keys($new_autosave), array_keys(_wp_post_revision_fields())) as $field) {
+			if (normalize_whitespace($new_autosave[$field]) != normalize_whitespace($post->$field)) {
 				$autosave_is_different = true;
 				break;
 			}
 		}
 
-		if ( ! $autosave_is_different ) {
-			wp_delete_post_revision( $old_autosave->ID );
+		if ( ! $autosave_is_different) {
+			wp_delete_post_revision($old_autosave->ID);
 			return 0;
 		}
 
@@ -1658,16 +1658,16 @@ 
 		 *
 		 * @param array $new_autosave Post array - the autosave that is about to be saved.
 		 */
-		do_action( 'wp_creating_autosave', $new_autosave );
+		do_action('wp_creating_autosave', $new_autosave);
 
-		return wp_update_post( $new_autosave );
+		return wp_update_post($new_autosave);
 	}
 
 	// _wp_put_post_revision() expects unescaped.
-	$post_data = wp_unslash( $post_data );
+	$post_data = wp_unslash($post_data);
 
 	// Otherwise create the new autosave as a special post revision
-	return _wp_put_post_revision( $post_data, true );
+	return _wp_put_post_revision($post_data, true);
 }
 
 /**
@@ -1683,44 +1683,44 @@ 
 	$post_ID = (int) $_POST['post_ID'];
 	$_POST['ID'] = $post_ID;
 
-	if ( ! $post = get_post( $post_ID ) ) {
-		wp_die( __( 'You are not allowed to edit this post.' ) );
+	if ( ! $post = get_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 ( ! current_user_can('edit_post', $post->ID)) {
+		wp_die(__('You are not allowed to edit this post.'));
 	}
 
 	$is_autosave = false;
 
-	if ( ! wp_check_post_lock( $post->ID ) && get_current_user_id() == $post->post_author && ( 'draft' == $post->post_status || 'auto-draft' == $post->post_status ) ) {
+	if ( ! wp_check_post_lock($post->ID) && get_current_user_id() == $post->post_author && ('draft' == $post->post_status || 'auto-draft' == $post->post_status)) {
 		$saved_post_id = edit_post();
 	} else {
 		$is_autosave = true;
 
-		if ( isset( $_POST['post_status'] ) && 'auto-draft' == $_POST['post_status'] )
+		if (isset($_POST['post_status']) && 'auto-draft' == $_POST['post_status'])
 			$_POST['post_status'] = 'draft';
 
-		$saved_post_id = wp_create_post_autosave( $post->ID );
+		$saved_post_id = wp_create_post_autosave($post->ID);
 	}
 
-	if ( is_wp_error( $saved_post_id ) )
-		wp_die( $saved_post_id->get_error_message() );
+	if (is_wp_error($saved_post_id))
+		wp_die($saved_post_id->get_error_message());
 
-	$query_args = array( 'preview' => 'true' );
+	$query_args = array('preview' => 'true');
 
-	if ( $is_autosave && $saved_post_id ) {
+	if ($is_autosave && $saved_post_id) {
 		$query_args['preview_id'] = $post->ID;
-		$query_args['preview_nonce'] = wp_create_nonce( 'post_preview_' . $post->ID );
+		$query_args['preview_nonce'] = wp_create_nonce('post_preview_'.$post->ID);
 
-		if ( isset( $_POST['post_format'] ) )
-			$query_args['post_format'] = empty( $_POST['post_format'] ) ? 'standard' : sanitize_key( $_POST['post_format'] );
+		if (isset($_POST['post_format']))
+			$query_args['post_format'] = empty($_POST['post_format']) ? 'standard' : sanitize_key($_POST['post_format']);
 	}
 
-	$url = add_query_arg( $query_args, get_permalink( $post->ID ) );
+	$url = add_query_arg($query_args, get_permalink($post->ID));
 
 	/** This filter is documented in wp-admin/includes/meta-boxes.php */
-	return apply_filters( 'preview_post_link', $url, $post );
+	return apply_filters('preview_post_link', $url, $post);
 }
 
 /**
@@ -1734,35 +1734,35 @@ 
  * @return mixed The value 0 or WP_Error on failure. The saved post ID on success.
  *               Te ID can be the draft post_id or the autosave revision post_id.
  */
-function wp_autosave( $post_data ) {
+function wp_autosave($post_data) {
 	// Back-compat
-	if ( ! defined( 'DOING_AUTOSAVE' ) )
-		define( 'DOING_AUTOSAVE', true );
+	if ( ! defined('DOING_AUTOSAVE'))
+		define('DOING_AUTOSAVE', true);
 
 	$post_id = (int) $post_data['post_id'];
 	$post_data['ID'] = $post_data['post_ID'] = $post_id;
 
-	if ( false === wp_verify_nonce( $post_data['_wpnonce'], 'update-post_' . $post_id ) ) {
-		return new WP_Error( 'invalid_nonce', __( 'Error while saving.' ) );
+	if (false === wp_verify_nonce($post_data['_wpnonce'], 'update-post_'.$post_id)) {
+		return new WP_Error('invalid_nonce', __('Error while saving.'));
 	}
 
-	$post = get_post( $post_id );
+	$post = get_post($post_id);
 
-	if ( ! current_user_can( 'edit_post', $post->ID ) ) {
-		return new WP_Error( 'edit_posts', __( 'You are not allowed to edit this item.' ) );
+	if ( ! current_user_can('edit_post', $post->ID)) {
+		return new WP_Error('edit_posts', __('You are not allowed to edit this item.'));
 	}
 
-	if ( 'auto-draft' == $post->post_status )
+	if ('auto-draft' == $post->post_status)
 		$post_data['post_status'] = 'draft';
 
-	if ( $post_data['post_type'] != 'page' && ! empty( $post_data['catslist'] ) )
-		$post_data['post_category'] = explode( ',', $post_data['catslist'] );
+	if ($post_data['post_type'] != 'page' && ! empty($post_data['catslist']))
+		$post_data['post_category'] = explode(',', $post_data['catslist']);
 
-	if ( ! wp_check_post_lock( $post->ID ) && get_current_user_id() == $post->post_author && ( 'auto-draft' == $post->post_status || 'draft' == $post->post_status ) ) {
+	if ( ! wp_check_post_lock($post->ID) && get_current_user_id() == $post->post_author && ('auto-draft' == $post->post_status || 'draft' == $post->post_status)) {
 		// Drafts and auto-drafts are just overwritten by autosave for the same user if the post is not locked
-		return edit_post( wp_slash( $post_data ) );
+		return edit_post(wp_slash($post_data));
 	} else {
 		// Non drafts or other users drafts are not overwritten. The autosave is stored in a special post revision for each user.
-		return wp_create_post_autosave( wp_slash( $post_data ) );
+		return wp_create_post_autosave(wp_slash($post_data));
 	}
 }

Braces +321 added lines, -228 removed lines

@@ -20,37 +20,45 @@ 
  */
 function _wp_translate_postdata( $update = false, $post_data = null ) {
 
-	if ( empty($post_data) )
-		$post_data = &$_POST;
+	if ( empty($post_data) ) {
+			$post_data = &$_POST;
+	}
 
-	if ( $update )
-		$post_data['ID'] = (int) $post_data['post_ID'];
+	if ( $update ) {
+			$post_data['ID'] = (int) $post_data['post_ID'];
+	}
 
 	$ptype = get_post_type_object( $post_data['post_type'] );
 
 	if ( $update && ! current_user_can( 'edit_post', $post_data['ID'] ) ) {
-		if ( 'page' == $post_data['post_type'] )
-			return new WP_Error( 'edit_others_pages', __( 'You are not allowed to edit pages as this user.' ) );
-		else
-			return new WP_Error( 'edit_others_posts', __( 'You are not allowed to edit posts as this user.' ) );
+		if ( 'page' == $post_data['post_type'] ) {
+					return new WP_Error( 'edit_others_pages', __( 'You are not allowed to edit pages as this user.' ) );
+		} else {
+					return new WP_Error( 'edit_others_posts', __( 'You are not allowed to edit posts as this user.' ) );
+		}
 	} elseif ( ! $update && ! current_user_can( $ptype->cap->create_posts ) ) {
-		if ( 'page' == $post_data['post_type'] )
-			return new WP_Error( 'edit_others_pages', __( 'You are not allowed to create pages as this user.' ) );
-		else
-			return new WP_Error( 'edit_others_posts', __( 'You are not allowed to create posts as this user.' ) );
+		if ( 'page' == $post_data['post_type'] ) {
+					return new WP_Error( 'edit_others_pages', __( 'You are not allowed to create pages as this user.' ) );
+		} else {
+					return new WP_Error( 'edit_others_posts', __( 'You are not allowed to create posts as this user.' ) );
+		}
 	}
 
-	if ( isset( $post_data['content'] ) )
-		$post_data['post_content'] = $post_data['content'];
+	if ( isset( $post_data['content'] ) ) {
+			$post_data['post_content'] = $post_data['content'];
+	}
 
-	if ( isset( $post_data['excerpt'] ) )
-		$post_data['post_excerpt'] = $post_data['excerpt'];
+	if ( isset( $post_data['excerpt'] ) ) {
+			$post_data['post_excerpt'] = $post_data['excerpt'];
+	}
 
-	if ( isset( $post_data['parent_id'] ) )
-		$post_data['post_parent'] = (int) $post_data['parent_id'];
+	if ( isset( $post_data['parent_id'] ) ) {
+			$post_data['post_parent'] = (int) $post_data['parent_id'];
+	}
 
-	if ( isset($post_data['trackback_url']) )
-		$post_data['to_ping'] = $post_data['trackback_url'];
+	if ( isset($post_data['trackback_url']) ) {
+			$post_data['to_ping'] = $post_data['trackback_url'];
+	}
 
 	$post_data['user_ID'] = get_current_user_id();
 
@@ -67,15 +75,17 @@ 
 	if ( isset( $post_data['user_ID'] ) && ( $post_data['post_author'] != $post_data['user_ID'] )
 		 && ! current_user_can( $ptype->cap->edit_others_posts ) ) {
 		if ( $update ) {
-			if ( 'page' == $post_data['post_type'] )
-				return new WP_Error( 'edit_others_pages', __( 'You are not allowed to edit pages as this user.' ) );
-			else
-				return new WP_Error( 'edit_others_posts', __( 'You are not allowed to edit posts as this user.' ) );
+			if ( 'page' == $post_data['post_type'] ) {
+							return new WP_Error( 'edit_others_pages', __( 'You are not allowed to edit pages as this user.' ) );
+			} else {
+							return new WP_Error( 'edit_others_posts', __( 'You are not allowed to edit posts as this user.' ) );
+			}
 		} else {
-			if ( 'page' == $post_data['post_type'] )
-				return new WP_Error( 'edit_others_pages', __( 'You are not allowed to create pages as this user.' ) );
-			else
-				return new WP_Error( 'edit_others_posts', __( 'You are not allowed to create posts as this user.' ) );
+			if ( 'page' == $post_data['post_type'] ) {
+							return new WP_Error( 'edit_others_pages', __( 'You are not allowed to create pages as this user.' ) );
+			} else {
+							return new WP_Error( 'edit_others_posts', __( 'You are not allowed to create posts as this user.' ) );
+			}
 		}
 	}
 
@@ -93,21 +103,27 @@ 
 	}
 
 	// What to do based on which button they pressed
-	if ( isset($post_data['saveasdraft']) && '' != $post_data['saveasdraft'] )
-		$post_data['post_status'] = 'draft';
-	if ( isset($post_data['saveasprivate']) && '' != $post_data['saveasprivate'] )
-		$post_data['post_status'] = 'private';
-	if ( isset($post_data['publish']) && ( '' != $post_data['publish'] ) && ( !isset($post_data['post_status']) || $post_data['post_status'] != 'private' ) )
-		$post_data['post_status'] = 'publish';
-	if ( isset($post_data['advanced']) && '' != $post_data['advanced'] )
-		$post_data['post_status'] = 'draft';
-	if ( isset($post_data['pending']) && '' != $post_data['pending'] )
-		$post_data['post_status'] = 'pending';
-
-	if ( isset( $post_data['ID'] ) )
-		$post_id = $post_data['ID'];
-	else
-		$post_id = false;
+	if ( isset($post_data['saveasdraft']) && '' != $post_data['saveasdraft'] ) {
+			$post_data['post_status'] = 'draft';
+	}
+	if ( isset($post_data['saveasprivate']) && '' != $post_data['saveasprivate'] ) {
+			$post_data['post_status'] = 'private';
+	}
+	if ( isset($post_data['publish']) && ( '' != $post_data['publish'] ) && ( !isset($post_data['post_status']) || $post_data['post_status'] != 'private' ) ) {
+			$post_data['post_status'] = 'publish';
+	}
+	if ( isset($post_data['advanced']) && '' != $post_data['advanced'] ) {
+			$post_data['post_status'] = 'draft';
+	}
+	if ( isset($post_data['pending']) && '' != $post_data['pending'] ) {
+			$post_data['post_status'] = 'pending';
+	}
+
+	if ( isset( $post_data['ID'] ) ) {
+			$post_id = $post_data['ID'];
+	} else {
+			$post_id = false;
+	}
 	$previous_status = $post_id ? get_post_field( 'post_status', $post_id ) : false;
 
 	if ( isset( $post_data['post_status'] ) && 'private' == $post_data['post_status'] && ! current_user_can( $ptype->cap->publish_posts ) ) {
@@ -118,9 +134,10 @@ 
 
 	// Posts 'submitted for approval' present are submitted to $_POST the same as if they were being published.
 	// Change status from 'publish' to 'pending' if user lacks permissions to publish or to resave published posts.
-	if ( isset($post_data['post_status']) && (in_array( $post_data['post_status'], $published_statuses ) && !current_user_can( $ptype->cap->publish_posts )) )
-		if ( ! in_array( $previous_status, $published_statuses ) || !current_user_can( 'edit_post', $post_id ) )
+	if ( isset($post_data['post_status']) && (in_array( $post_data['post_status'], $published_statuses ) && !current_user_can( $ptype->cap->publish_posts )) ) {
+			if ( ! in_array( $previous_status, $published_statuses ) || !current_user_can( 'edit_post', $post_id ) )
 			$post_data['post_status'] = 'pending';
+	}
 
 	if ( ! isset( $post_data['post_status'] ) ) {
 		$post_data['post_status'] = 'auto-draft' === $previous_status ? 'draft' : $previous_status;
@@ -130,11 +147,13 @@ 
 		unset( $post_data['post_password'] );
 	}
 
-	if (!isset( $post_data['comment_status'] ))
-		$post_data['comment_status'] = 'closed';
+	if (!isset( $post_data['comment_status'] )) {
+			$post_data['comment_status'] = 'closed';
+	}
 
-	if (!isset( $post_data['ping_status'] ))
-		$post_data['ping_status'] = 'closed';
+	if (!isset( $post_data['ping_status'] )) {
+			$post_data['ping_status'] = 'closed';
+	}
 
 	foreach ( array('aa', 'mm', 'jj', 'hh', 'mn') as $timeunit ) {
 		if ( !empty( $post_data['hidden_' . $timeunit] ) && $post_data['hidden_' . $timeunit] != $post_data[$timeunit] ) {
@@ -181,8 +200,9 @@ 
 function edit_post( $post_data = null ) {
 	global $wpdb;
 
-	if ( empty($post_data) )
-		$post_data = &$_POST;
+	if ( empty($post_data) ) {
+			$post_data = &$_POST;
+	}
 
 	// Clear out any data in internal vars.
 	unset( $post_data['filter'] );
@@ -202,10 +222,11 @@ 
 
 	$ptype = get_post_type_object($post_data['post_type']);
 	if ( !current_user_can( 'edit_post', $post_ID ) ) {
-		if ( 'page' == $post_data['post_type'] )
-			wp_die( __('You are not allowed to edit this page.' ));
-		else
-			wp_die( __('You are not allowed to edit this post.' ));
+		if ( 'page' == $post_data['post_type'] ) {
+					wp_die( __('You are not allowed to edit this page.' ));
+		} else {
+					wp_die( __('You are not allowed to edit this post.' ));
+		}
 	}
 
 	if ( post_type_supports( $ptype->name, 'revisions' ) ) {
@@ -213,8 +234,9 @@ 
 		$revision = current( $revisions );
 
 		// Check if the revisions have been upgraded
-		if ( $revisions && _wp_get_post_revision_version( $revision ) < 1 )
-			_wp_upgrade_revisions_of_post( $post, wp_get_post_revisions( $post_ID ) );
+		if ( $revisions && _wp_get_post_revision_version( $revision ) < 1 ) {
+					_wp_upgrade_revisions_of_post( $post, wp_get_post_revisions( $post_ID ) );
+		}
 	}
 
 	if ( isset($post_data['visibility']) ) {
@@ -234,18 +256,21 @@ 
 	}
 
 	$post_data = _wp_translate_postdata( true, $post_data );
-	if ( is_wp_error($post_data) )
-		wp_die( $post_data->get_error_message() );
+	if ( is_wp_error($post_data) ) {
+			wp_die( $post_data->get_error_message() );
+	}
 
 	// Post Formats
-	if ( isset( $post_data['post_format'] ) )
-		set_post_format( $post_ID, $post_data['post_format'] );
+	if ( isset( $post_data['post_format'] ) ) {
+			set_post_format( $post_ID, $post_data['post_format'] );
+	}
 
 	$format_meta_urls = array( 'url', 'link_url', 'quote_source_url' );
 	foreach ( $format_meta_urls as $format_meta_url ) {
 		$keyed = '_format_' . $format_meta_url;
-		if ( isset( $post_data[ $keyed ] ) )
-			update_post_meta( $post_ID, $keyed, wp_slash( esc_url_raw( wp_unslash( $post_data[ $keyed ] ) ) ) );
+		if ( isset( $post_data[ $keyed ] ) ) {
+					update_post_meta( $post_ID, $keyed, wp_slash( esc_url_raw( wp_unslash( $post_data[ $keyed ] ) ) ) );
+		}
 	}
 
 	$format_keys = array( 'quote', 'quote_source_name', 'image', 'gallery', 'audio_embed', 'video_embed' );
@@ -253,10 +278,11 @@ 
 	foreach ( $format_keys as $key ) {
 		$keyed = '_format_' . $key;
 		if ( isset( $post_data[ $keyed ] ) ) {
-			if ( current_user_can( 'unfiltered_html' ) )
-				update_post_meta( $post_ID, $keyed, $post_data[ $keyed ] );
-			else
-				update_post_meta( $post_ID, $keyed, wp_filter_post_kses( $post_data[ $keyed ] ) );
+			if ( current_user_can( 'unfiltered_html' ) ) {
+							update_post_meta( $post_ID, $keyed, $post_data[ $keyed ] );
+			} else {
+							update_post_meta( $post_ID, $keyed, wp_filter_post_kses( $post_data[ $keyed ] ) );
+			}
 		}
 	}
 
@@ -277,24 +303,30 @@ 
 	// Meta Stuff
 	if ( isset($post_data['meta']) && $post_data['meta'] ) {
 		foreach ( $post_data['meta'] as $key => $value ) {
-			if ( !$meta = get_post_meta_by_id( $key ) )
-				continue;
-			if ( $meta->post_id != $post_ID )
-				continue;
-			if ( is_protected_meta( $value['key'], 'post' ) || ! current_user_can( 'edit_post_meta', $post_ID, $value['key'] ) )
-				continue;
+			if ( !$meta = get_post_meta_by_id( $key ) ) {
+							continue;
+			}
+			if ( $meta->post_id != $post_ID ) {
+							continue;
+			}
+			if ( is_protected_meta( $value['key'], 'post' ) || ! current_user_can( 'edit_post_meta', $post_ID, $value['key'] ) ) {
+							continue;
+			}
 			update_meta( $key, $value['key'], $value['value'] );
 		}
 	}
 
 	if ( isset($post_data['deletemeta']) && $post_data['deletemeta'] ) {
 		foreach ( $post_data['deletemeta'] as $key => $value ) {
-			if ( !$meta = get_post_meta_by_id( $key ) )
-				continue;
-			if ( $meta->post_id != $post_ID )
-				continue;
-			if ( is_protected_meta( $meta->meta_key, 'post' ) || ! current_user_can( 'delete_post_meta', $post_ID, $meta->meta_key ) )
-				continue;
+			if ( !$meta = get_post_meta_by_id( $key ) ) {
+							continue;
+			}
+			if ( $meta->post_id != $post_ID ) {
+							continue;
+			}
+			if ( is_protected_meta( $meta->meta_key, 'post' ) || ! current_user_can( 'delete_post_meta', $post_ID, $meta->meta_key ) ) {
+							continue;
+			}
 			delete_meta( $key );
 		}
 	}
@@ -386,10 +418,11 @@ 
 	wp_set_post_lock( $post_ID );
 
 	if ( current_user_can( $ptype->cap->edit_others_posts ) && current_user_can( $ptype->cap->publish_posts ) ) {
-		if ( ! empty( $post_data['sticky'] ) )
-			stick_post( $post_ID );
-		else
-			unstick_post( $post_ID );
+		if ( ! empty( $post_data['sticky'] ) ) {
+					stick_post( $post_ID );
+		} else {
+					unstick_post( $post_ID );
+		}
 	}
 
 	return $post_ID;
@@ -411,19 +444,22 @@ 
 function bulk_edit_posts( $post_data = null ) {
 	global $wpdb;
 
-	if ( empty($post_data) )
-		$post_data = &$_POST;
+	if ( empty($post_data) ) {
+			$post_data = &$_POST;
+	}
 
-	if ( isset($post_data['post_type']) )
-		$ptype = get_post_type_object($post_data['post_type']);
-	else
-		$ptype = get_post_type_object('post');
+	if ( isset($post_data['post_type']) ) {
+			$ptype = get_post_type_object($post_data['post_type']);
+	} else {
+			$ptype = get_post_type_object('post');
+	}
 
 	if ( !current_user_can( $ptype->cap->edit_posts ) ) {
-		if ( 'page' == $ptype->name )
-			wp_die( __('You are not allowed to edit pages.'));
-		else
-			wp_die( __('You are not allowed to edit posts.'));
+		if ( 'page' == $ptype->name ) {
+					wp_die( __('You are not allowed to edit pages.'));
+		} else {
+					wp_die( __('You are not allowed to edit posts.'));
+		}
 	}
 
 	if ( -1 == $post_data['_status'] ) {
@@ -452,28 +488,32 @@ 
 	);
 
 	foreach ( $reset as $field ) {
-		if ( isset($post_data[$field]) && ( '' == $post_data[$field] || -1 == $post_data[$field] ) )
-			unset($post_data[$field]);
+		if ( isset($post_data[$field]) && ( '' == $post_data[$field] || -1 == $post_data[$field] ) ) {
+					unset($post_data[$field]);
+		}
 	}
 
 	if ( isset($post_data['post_category']) ) {
-		if ( is_array($post_data['post_category']) && ! empty($post_data['post_category']) )
-			$new_cats = array_map( 'absint', $post_data['post_category'] );
-		else
-			unset($post_data['post_category']);
+		if ( is_array($post_data['post_category']) && ! empty($post_data['post_category']) ) {
+					$new_cats = array_map( 'absint', $post_data['post_category'] );
+		} else {
+					unset($post_data['post_category']);
+		}
 	}
 
 	$tax_input = array();
 	if ( isset($post_data['tax_input'])) {
 		foreach ( $post_data['tax_input'] as $tax_name => $terms ) {
-			if ( empty($terms) )
-				continue;
+			if ( empty($terms) ) {
+							continue;
+			}
 			if ( is_taxonomy_hierarchical( $tax_name ) ) {
 				$tax_input[ $tax_name ] = array_map( 'absint', $terms );
 			} else {
 				$comma = _x( ',', 'tag delimiter' );
-				if ( ',' !== $comma )
-					$terms = str_replace( $comma, ',', $terms );
+				if ( ',' !== $comma ) {
+									$terms = str_replace( $comma, ',', $terms );
+				}
 				$tax_input[ $tax_name ] = explode( ',', trim( $terms, " \n\t\r\0\x0B," ) );
 			}
 		}
@@ -518,15 +558,17 @@ 
 		$tax_names = get_object_taxonomies( $post );
 		foreach ( $tax_names as $tax_name ) {
 			$taxonomy_obj = get_taxonomy($tax_name);
-			if ( isset( $tax_input[$tax_name]) && current_user_can( $taxonomy_obj->cap->assign_terms ) )
-				$new_terms = $tax_input[$tax_name];
-			else
-				$new_terms = array();
+			if ( isset( $tax_input[$tax_name]) && current_user_can( $taxonomy_obj->cap->assign_terms ) ) {
+							$new_terms = $tax_input[$tax_name];
+			} else {
+							$new_terms = array();
+			}
 
-			if ( $taxonomy_obj->hierarchical )
-				$current_terms = (array) wp_get_object_terms( $post_ID, $tax_name, array('fields' => 'ids') );
-			else
-				$current_terms = (array) wp_get_object_terms( $post_ID, $tax_name, array('fields' => 'names') );
+			if ( $taxonomy_obj->hierarchical ) {
+							$current_terms = (array) wp_get_object_terms( $post_ID, $tax_name, array('fields' => 'ids') );
+			} else {
+							$current_terms = (array) wp_get_object_terms( $post_ID, $tax_name, array('fields' => 'names') );
+			}
 
 			$post_data['tax_input'][$tax_name] = array_merge( $current_terms, $new_terms );
 		}
@@ -559,14 +601,16 @@ 
 		$updated[] = wp_update_post( $post_data );
 
 		if ( isset( $post_data['sticky'] ) && current_user_can( $ptype->cap->edit_others_posts ) ) {
-			if ( 'sticky' == $post_data['sticky'] )
-				stick_post( $post_ID );
-			else
-				unstick_post( $post_ID );
+			if ( 'sticky' == $post_data['sticky'] ) {
+							stick_post( $post_ID );
+			} else {
+							unstick_post( $post_ID );
+			}
 		}
 
-		if ( isset( $post_data['post_format'] ) )
-			set_post_format( $post_ID, $post_data['post_format'] );
+		if ( isset( $post_data['post_format'] ) ) {
+					set_post_format( $post_ID, $post_data['post_format'] );
+		}
 	}
 
 	return array( 'updated' => $updated, 'skipped' => $skipped, 'locked' => $locked );
@@ -582,22 +626,26 @@ 
  */
 function get_default_post_to_edit( $post_type = 'post', $create_in_db = false ) {
 	$post_title = '';
-	if ( !empty( $_REQUEST['post_title'] ) )
-		$post_title = esc_html( wp_unslash( $_REQUEST['post_title'] ));
+	if ( !empty( $_REQUEST['post_title'] ) ) {
+			$post_title = esc_html( wp_unslash( $_REQUEST['post_title'] ));
+	}
 
 	$post_content = '';
-	if ( !empty( $_REQUEST['content'] ) )
-		$post_content = esc_html( wp_unslash( $_REQUEST['content'] ));
+	if ( !empty( $_REQUEST['content'] ) ) {
+			$post_content = esc_html( wp_unslash( $_REQUEST['content'] ));
+	}
 
 	$post_excerpt = '';
-	if ( !empty( $_REQUEST['excerpt'] ) )
-		$post_excerpt = esc_html( wp_unslash( $_REQUEST['excerpt'] ));
+	if ( !empty( $_REQUEST['excerpt'] ) ) {
+			$post_excerpt = esc_html( wp_unslash( $_REQUEST['excerpt'] ));
+	}
 
 	if ( $create_in_db ) {
 		$post_id = wp_insert_post( array( 'post_title' => __( 'Auto Draft' ), 'post_type' => $post_type, 'post_status' => 'auto-draft' ) );
 		$post = get_post( $post_id );
-		if ( current_theme_supports( 'post-formats' ) && post_type_supports( $post->post_type, 'post-formats' ) && get_option( 'default_post_format' ) )
-			set_post_format( $post, get_option( 'default_post_format' ) );
+		if ( current_theme_supports( 'post-formats' ) && post_type_supports( $post->post_type, 'post-formats' ) && get_option( 'default_post_format' ) ) {
+					set_post_format( $post, get_option( 'default_post_format' ) );
+		}
 	} else {
 		$post = new stdClass;
 		$post->ID = 0;
@@ -690,8 +738,9 @@ 
 		$args[] = $post_content;
 	}
 
-	if ( !empty ( $args ) )
-		return (int) $wpdb->get_var( $wpdb->prepare($query, $args) );
+	if ( !empty ( $args ) ) {
+			return (int) $wpdb->get_var( $wpdb->prepare($query, $args) );
+	}
 
 	return 0;
 }
@@ -706,16 +755,18 @@ 
  * @return int|WP_Error
  */
 function wp_write_post() {
-	if ( isset($_POST['post_type']) )
-		$ptype = get_post_type_object($_POST['post_type']);
-	else
-		$ptype = get_post_type_object('post');
+	if ( isset($_POST['post_type']) ) {
+			$ptype = get_post_type_object($_POST['post_type']);
+	} else {
+			$ptype = get_post_type_object('post');
+	}
 
 	if ( !current_user_can( $ptype->cap->edit_posts ) ) {
-		if ( 'page' == $ptype->name )
-			return new WP_Error( 'edit_pages', __( 'You are not allowed to create pages on this site.' ) );
-		else
-			return new WP_Error( 'edit_posts', __( 'You are not allowed to create posts or drafts on this site.' ) );
+		if ( 'page' == $ptype->name ) {
+					return new WP_Error( 'edit_pages', __( 'You are not allowed to create pages on this site.' ) );
+		} else {
+					return new WP_Error( 'edit_posts', __( 'You are not allowed to create posts or drafts on this site.' ) );
+		}
 	}
 
 	$_POST['post_mime_type'] = '';
@@ -724,8 +775,9 @@ 
 	unset( $_POST['filter'] );
 
 	// Edit don't write if we have a post id.
-	if ( isset( $_POST['post_ID'] ) )
-		return edit_post();
+	if ( isset( $_POST['post_ID'] ) ) {
+			return edit_post();
+	}
 
 	if ( isset($_POST['visibility']) ) {
 		switch ( $_POST['visibility'] ) {
@@ -744,16 +796,19 @@ 
 	}
 
 	$translated = _wp_translate_postdata( false );
-	if ( is_wp_error($translated) )
-		return $translated;
+	if ( is_wp_error($translated) ) {
+			return $translated;
+	}
 
 	// Create the post.
 	$post_ID = wp_insert_post( $_POST );
-	if ( is_wp_error( $post_ID ) )
-		return $post_ID;
+	if ( is_wp_error( $post_ID ) ) {
+			return $post_ID;
+	}
 
-	if ( empty($post_ID) )
-		return 0;
+	if ( empty($post_ID) ) {
+			return 0;
+	}
 
 	add_meta( $post_ID );
 
@@ -776,11 +831,12 @@ 
  */
 function write_post() {
 	$result = wp_write_post();
-	if ( is_wp_error( $result ) )
-		wp_die( $result->get_error_message() );
-	else
-		return $result;
-}
+	if ( is_wp_error( $result ) ) {
+			wp_die( $result->get_error_message() );
+	} else {
+			return $result;
+	}
+	}
 
 //
 // Post Meta
@@ -800,22 +856,27 @@ 
 	$metakeyselect = isset($_POST['metakeyselect']) ? wp_unslash( trim( $_POST['metakeyselect'] ) ) : '';
 	$metakeyinput = isset($_POST['metakeyinput']) ? wp_unslash( trim( $_POST['metakeyinput'] ) ) : '';
 	$metavalue = isset($_POST['metavalue']) ? $_POST['metavalue'] : '';
-	if ( is_string( $metavalue ) )
-		$metavalue = trim( $metavalue );
+	if ( is_string( $metavalue ) ) {
+			$metavalue = trim( $metavalue );
+	}
 
 	if ( ('0' === $metavalue || ! empty ( $metavalue ) ) && ( ( ( '#NONE#' != $metakeyselect ) && !empty ( $metakeyselect) ) || !empty ( $metakeyinput ) ) ) {
 		/*
 		 * We have a key/value pair. If both the select and the input
 		 * for the key have data, the input takes precedence.
 		 */
- 		if ( '#NONE#' != $metakeyselect )
-			$metakey = $metakeyselect;
+ 		if ( '#NONE#' != $metakeyselect ) {
+ 					$metakey = $metakeyselect;
+ 		}
 
-		if ( $metakeyinput )
-			$metakey = $metakeyinput; // default
+		if ( $metakeyinput ) {
+					$metakey = $metakeyinput;
+		}
+		// default
 
-		if ( is_protected_meta( $metakey, 'post' ) || ! current_user_can( 'add_post_meta', $post_ID, $metakey ) )
-			return false;
+		if ( is_protected_meta( $metakey, 'post' ) || ! current_user_can( 'add_post_meta', $post_ID, $metakey ) ) {
+					return false;
+		}
 
 		$metakey = wp_slash( $metakey );
 
@@ -923,12 +984,14 @@ 
 	$content = $post['post_content'];
 
 	// Don't run if no pretty permalinks or post is not published, scheduled, or privately published.
-	if ( ! get_option( 'permalink_structure' ) || ! in_array( $post['post_status'], array( 'publish', 'future', 'private' ) ) )
-		return;
+	if ( ! get_option( 'permalink_structure' ) || ! in_array( $post['post_status'], array( 'publish', 'future', 'private' ) ) ) {
+			return;
+	}
 
 	// Short if there aren't any links or no '?attachment_id=' strings (strpos cannot be zero)
-	if ( !strpos($content, '?attachment_id=') || !preg_match_all( '/<a ([^>]+)>[\s\S]+?<\/a>/', $content, $link_matches ) )
-		return;
+	if ( !strpos($content, '?attachment_id=') || !preg_match_all( '/<a ([^>]+)>[\s\S]+?<\/a>/', $content, $link_matches ) ) {
+			return;
+	}
 
 	$site_url = get_bloginfo('url');
 	$site_url = substr( $site_url, (int) strpos($site_url, '://') ); // remove the http(s)
@@ -937,15 +1000,17 @@ 
 	foreach ( $link_matches[1] as $key => $value ) {
 		if ( !strpos($value, '?attachment_id=') || !strpos($value, 'wp-att-')
 			|| !preg_match( '/href=(["\'])[^"\']*\?attachment_id=(\d+)[^"\']*\\1/', $value, $url_match )
-			|| !preg_match( '/rel=["\'][^"\']*wp-att-(\d+)/', $value, $rel_match ) )
-				continue;
+			|| !preg_match( '/rel=["\'][^"\']*wp-att-(\d+)/', $value, $rel_match ) ) {
+						continue;
+		}
 
 		$quote = $url_match[1]; // the quote (single or double)
 		$url_id = (int) $url_match[2];
 		$rel_id = (int) $rel_match[1];
 
-		if ( !$url_id || !$rel_id || $url_id != $rel_id || strpos($url_match[0], $site_url) === false )
-			continue;
+		if ( !$url_id || !$rel_id || $url_id != $rel_id || strpos($url_match[0], $site_url) === false ) {
+					continue;
+		}
 
 		$link = $link_matches[0][$key];
 		$replace = str_replace( $url_match[0], 'href=' . $quote . get_attachment_link( $url_id ) . $quote, $link );
@@ -985,16 +1050,18 @@ 
  * @return array
  */
 function wp_edit_posts_query( $q = false ) {
-	if ( false === $q )
-		$q = $_GET;
+	if ( false === $q ) {
+			$q = $_GET;
+	}
 	$q['m'] = isset($q['m']) ? (int) $q['m'] : 0;
 	$q['cat'] = isset($q['cat']) ? (int) $q['cat'] : 0;
 	$post_stati  = get_post_stati();
 
-	if ( isset($q['post_type']) && in_array( $q['post_type'], get_post_types() ) )
-		$post_type = $q['post_type'];
-	else
-		$post_type = 'post';
+	if ( isset($q['post_type']) && in_array( $q['post_type'], get_post_types() ) ) {
+			$post_type = $q['post_type'];
+	} else {
+			$post_type = 'post';
+	}
 
 	$avail_post_stati = get_available_post_statuses($post_type);
 
@@ -1003,20 +1070,23 @@ 
 		$perm = 'readable';
 	}
 
-	if ( isset($q['orderby']) )
-		$orderby = $q['orderby'];
-	elseif ( isset($q['post_status']) && in_array($q['post_status'], array('pending', 'draft')) )
-		$orderby = 'modified';
+	if ( isset($q['orderby']) ) {
+			$orderby = $q['orderby'];
+	} elseif ( isset($q['post_status']) && in_array($q['post_status'], array('pending', 'draft')) ) {
+			$orderby = 'modified';
+	}
 
-	if ( isset($q['order']) )
-		$order = $q['order'];
-	elseif ( isset($q['post_status']) && 'pending' == $q['post_status'] )
-		$order = 'ASC';
+	if ( isset($q['order']) ) {
+			$order = $q['order'];
+	} elseif ( isset($q['post_status']) && 'pending' == $q['post_status'] ) {
+			$order = 'ASC';
+	}
 
 	$per_page = "edit_{$post_type}_per_page";
 	$posts_per_page = (int) get_user_option( $per_page );
-	if ( empty( $posts_per_page ) || $posts_per_page < 1 )
-		$posts_per_page = 20;
+	if ( empty( $posts_per_page ) || $posts_per_page < 1 ) {
+			$posts_per_page = 20;
+	}
 
 	/**
 	 * Filter the number of items per page to show for a specific 'per_page' type.
@@ -1054,8 +1124,9 @@ 
 		$query['fields'] = 'id=>parent';
 	}
 
-	if ( ! empty( $q['show_sticky'] ) )
-		$query['post__in'] = (array) get_option( 'sticky_posts' );
+	if ( ! empty( $q['show_sticky'] ) ) {
+			$query['post__in'] = (array) get_option( 'sticky_posts' );
+	}
 
 	wp( $query );
 
@@ -1203,8 +1274,9 @@ 
  */
 function get_sample_permalink($id, $title = null, $name = null) {
 	$post = get_post( $id );
-	if ( ! $post )
-		return array( '', '' );
+	if ( ! $post ) {
+			return array( '', '' );
+	}
 
 	$ptype = get_post_type_object($post->post_type);
 
@@ -1220,8 +1292,9 @@ 
 
 	// If the user wants to set a new name -- override the current one
 	// Note: if empty name is supplied -- use the title instead, see #6072
-	if ( !is_null($name) )
-		$post->post_name = sanitize_title($name ? $name : $title, $post->ID);
+	if ( !is_null($name) ) {
+			$post->post_name = sanitize_title($name ? $name : $title, $post->ID);
+	}
 
 	$post->post_name = wp_unique_post_slug($post->post_name, $post->ID, $post->post_status, $post->post_type, $post->post_parent);
 
@@ -1243,8 +1316,9 @@ 
 
 		/** This filter is documented in wp-admin/edit-tag-form.php */
 		$uri = apply_filters( 'editable_slug', $uri );
-		if ( !empty($uri) )
-			$uri .= '/';
+		if ( !empty($uri) ) {
+					$uri .= '/';
+		}
 		$permalink = str_replace('%pagename%', "{$uri}%pagename%", $permalink);
 	}
 
@@ -1270,8 +1344,9 @@ 
  */
 function get_sample_permalink_html( $id, $new_title = null, $new_slug = null ) {
 	$post = get_post( $id );
-	if ( ! $post )
-		return '';
+	if ( ! $post ) {
+			return '';
+	}
 
 	list($permalink, $post_name) = get_sample_permalink($post->ID, $new_title, $new_slug);
 
@@ -1376,10 +1451,11 @@ 
 	if ( $thumbnail_id && get_post( $thumbnail_id ) ) {
 		$old_content_width = $content_width;
 		$content_width = 266;
-		if ( !isset( $_wp_additional_image_sizes['post-thumbnail'] ) )
-			$thumbnail_html = wp_get_attachment_image( $thumbnail_id, array( $content_width, $content_width ) );
-		else
-			$thumbnail_html = wp_get_attachment_image( $thumbnail_id, 'post-thumbnail' );
+		if ( !isset( $_wp_additional_image_sizes['post-thumbnail'] ) ) {
+					$thumbnail_html = wp_get_attachment_image( $thumbnail_id, array( $content_width, $content_width ) );
+		} else {
+					$thumbnail_html = wp_get_attachment_image( $thumbnail_id, 'post-thumbnail' );
+		}
 		if ( !empty( $thumbnail_html ) ) {
 			$ajax_nonce = wp_create_nonce( 'set_post_thumbnail-' . $post->ID );
 			$content = sprintf( $set_thumbnail_link,
@@ -1412,11 +1488,13 @@ 
  * @return integer False: not locked or locked by current user. Int: user ID of user with lock.
  */
 function wp_check_post_lock( $post_id ) {
-	if ( !$post = get_post( $post_id ) )
-		return false;
+	if ( !$post = get_post( $post_id ) ) {
+			return false;
+	}
 
-	if ( !$lock = get_post_meta( $post->ID, '_edit_lock', true ) )
-		return false;
+	if ( !$lock = get_post_meta( $post->ID, '_edit_lock', true ) ) {
+			return false;
+	}
 
 	$lock = explode( ':', $lock );
 	$time = $lock[0];
@@ -1425,8 +1503,9 @@ 
 	/** This filter is documented in wp-admin/includes/ajax-actions.php */
 	$time_window = apply_filters( 'wp_check_post_lock_window', 150 );
 
-	if ( $time && $time > time() - $time_window && $user != get_current_user_id() )
-		return $user;
+	if ( $time && $time > time() - $time_window && $user != get_current_user_id() ) {
+			return $user;
+	}
 	return false;
 }
 
@@ -1440,10 +1519,12 @@ 
  * 	an array of the lock time and the user ID.
  */
 function wp_set_post_lock( $post_id ) {
-	if ( !$post = get_post( $post_id ) )
-		return false;
-	if ( 0 == ($user_id = get_current_user_id()) )
-		return false;
+	if ( !$post = get_post( $post_id ) ) {
+			return false;
+	}
+	if ( 0 == ($user_id = get_current_user_id()) ) {
+			return false;
+	}
 
 	$now = time();
 	$lock = "$now:$user_id";
@@ -1459,12 +1540,14 @@ 
  * @return none
  */
 function _admin_notice_post_locked() {
-	if ( ! $post = get_post() )
-		return;
+	if ( ! $post = get_post() ) {
+			return;
+	}
 
 	$user = null;
-	if (  $user_id = wp_check_post_lock( $post->ID ) )
-		$user = get_userdata( $user_id );
+	if (  $user_id = wp_check_post_lock( $post->ID ) ) {
+			$user = get_userdata( $user_id );
+	}
 
 	if ( $user ) {
 
@@ -1478,8 +1561,9 @@ 
 		 * @param bool         $display Whether to display the dialog. Default true.
 		 * @param WP_User|bool $user    WP_User object on success, false otherwise.
 		 */
-		if ( ! apply_filters( 'show_post_locked_dialog', true, $post, $user ) )
-			return;
+		if ( ! apply_filters( 'show_post_locked_dialog', true, $post, $user ) ) {
+					return;
+		}
 
 		$locked = true;
 	} else {
@@ -1493,8 +1577,9 @@ 
 	} else {
 		$sendback = admin_url( 'edit.php' );
 
-		if ( 'post' != $post->post_type )
-			$sendback = add_query_arg( 'post_type', $post->post_type, $sendback );
+		if ( 'post' != $post->post_type ) {
+					$sendback = add_query_arg( 'post_type', $post->post_type, $sendback );
+		}
 
 		$sendback_text = get_post_type_object( $post->post_type )->labels->all_items;
 	}
@@ -1544,8 +1629,9 @@ 
 		<p class="currently-editing wp-tab-first" tabindex="0">
 		<?php
 			_e( 'This content is currently locked.' );
-			if ( $override )
-				printf( ' ' . __( 'If you take over, %s will be blocked from continuing to edit.' ), esc_html( $user->display_name ) );
+			if ( $override ) {
+							printf( ' ' . __( 'If you take over, %s will be blocked from continuing to edit.' ), esc_html( $user->display_name ) );
+			}
 		?>
 		</p>
 		<?php
@@ -1625,8 +1711,9 @@ 
 	}
 
 	$post_data = _wp_translate_postdata( true, $post_data );
-	if ( is_wp_error( $post_data ) )
-		return $post_data;
+	if ( is_wp_error( $post_data ) ) {
+			return $post_data;
+	}
 
 	$post_author = get_current_user_id();
 
@@ -1698,14 +1785,16 @@ 
 	} else {
 		$is_autosave = true;
 
-		if ( isset( $_POST['post_status'] ) && 'auto-draft' == $_POST['post_status'] )
-			$_POST['post_status'] = 'draft';
+		if ( isset( $_POST['post_status'] ) && 'auto-draft' == $_POST['post_status'] ) {
+					$_POST['post_status'] = 'draft';
+		}
 
 		$saved_post_id = wp_create_post_autosave( $post->ID );
 	}
 
-	if ( is_wp_error( $saved_post_id ) )
-		wp_die( $saved_post_id->get_error_message() );
+	if ( is_wp_error( $saved_post_id ) ) {
+			wp_die( $saved_post_id->get_error_message() );
+	}
 
 	$query_args = array( 'preview' => 'true' );
 
@@ -1713,8 +1802,9 @@ 
 		$query_args['preview_id'] = $post->ID;
 		$query_args['preview_nonce'] = wp_create_nonce( 'post_preview_' . $post->ID );
 
-		if ( isset( $_POST['post_format'] ) )
-			$query_args['post_format'] = empty( $_POST['post_format'] ) ? 'standard' : sanitize_key( $_POST['post_format'] );
+		if ( isset( $_POST['post_format'] ) ) {
+					$query_args['post_format'] = empty( $_POST['post_format'] ) ? 'standard' : sanitize_key( $_POST['post_format'] );
+		}
 	}
 
 	$url = add_query_arg( $query_args, get_permalink( $post->ID ) );
@@ -1736,8 +1826,9 @@ 
  */
 function wp_autosave( $post_data ) {
 	// Back-compat
-	if ( ! defined( 'DOING_AUTOSAVE' ) )
-		define( 'DOING_AUTOSAVE', true );
+	if ( ! defined( 'DOING_AUTOSAVE' ) ) {
+			define( 'DOING_AUTOSAVE', true );
+	}
 
 	$post_id = (int) $post_data['post_id'];
 	$post_data['ID'] = $post_data['post_ID'] = $post_id;
@@ -1752,11 +1843,13 @@ 
 		return new WP_Error( 'edit_posts', __( 'You are not allowed to edit this item.' ) );
 	}
 
-	if ( 'auto-draft' == $post->post_status )
-		$post_data['post_status'] = 'draft';
+	if ( 'auto-draft' == $post->post_status ) {
+			$post_data['post_status'] = 'draft';
+	}
 
-	if ( $post_data['post_type'] != 'page' && ! empty( $post_data['catslist'] ) )
-		$post_data['post_category'] = explode( ',', $post_data['catslist'] );
+	if ( $post_data['post_type'] != 'page' && ! empty( $post_data['catslist'] ) ) {
+			$post_data['post_category'] = explode( ',', $post_data['catslist'] );
+	}
 
 	if ( ! wp_check_post_lock( $post->ID ) && get_current_user_id() == $post->post_author && ( 'auto-draft' == $post->post_status || 'draft' == $post->post_status ) ) {
 		// Drafts and auto-drafts are just overwritten by autosave for the same user if the post is not locked

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

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * WordPress Core Ajax Handlers.
- *
- * @package WordPress
- * @subpackage Administration
- */
+	 * WordPress Core Ajax Handlers.
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 */
 
 //
 // No-privilege Ajax handlers.

Spacing +1004 added lines, -1004 removed lines

@@ -22,13 +22,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.
@@ -39,7 +39,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);
 	}
 
 	/**
@@ -50,7 +50,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.
@@ -62,7 +62,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();
@@ -85,18 +85,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);
 }
 
 /**
@@ -105,30 +105,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.
@@ -139,19 +139,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();
 }
 
@@ -161,48 +161,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);
 }
 
 /**
@@ -212,13 +212,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();
@@ -232,8 +232,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);
 }
 
 /**
@@ -242,18 +242,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';
@@ -261,39 +261,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( __( '%1$s (%2$s)' ), $user->user_login, $user->user_email ),
+			'label' => sprintf(__('%1$s (%2$s)'), $user->user_login, $user->user_email),
 			'value' => $user->$field,
 		);
 	}
 
-	wp_die( wp_json_encode( $return ) );
+	wp_die(wp_json_encode($return));
 }
 
 /**
@@ -302,14 +302,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;
@@ -323,7 +323,7 @@ 
  * @since 3.4.0
  */
 function wp_ajax_logged_in() {
-	wp_die( 1 );
+	wp_die(1);
 }
 
 //
@@ -340,18 +340,18 @@ 
  * @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);
 
-		$x = new WP_Ajax_Response( array(
+		$x = new WP_Ajax_Response(array(
 			'what' => 'comment',
 			// Here for completeness - not used.
 			'id' => $comment_id,
@@ -360,53 +360,53 @@ 
 				'postId' => $comment ? $comment->comment_post_ID : '',
 				'time' => $time
 			)
-		) );
+		));
 		$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;
 		$status = 'total_comments'; // What type of comment count are we looking for?
-		$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();
 }
 
@@ -422,87 +422,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();
 }
 
@@ -512,46 +512,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->comment_ID );
+	check_ajax_referer("delete-comment_$id");
+	$status = wp_get_comment_status($comment->comment_ID);
 
 	$delta = -1;
-	if ( isset($_POST['trash']) && 1 == $_POST['trash'] ) {
-		if ( 'trash' == $status )
-			wp_die( time() );
-		$r = wp_trash_comment( $comment->comment_ID );
-	} elseif ( isset($_POST['untrash']) && 1 == $_POST['untrash'] ) {
-		if ( 'trash' != $status )
-			wp_die( time() );
-		$r = wp_untrash_comment( $comment->comment_ID );
-		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->comment_ID);
+	} elseif (isset($_POST['untrash']) && 1 == $_POST['untrash']) {
+		if ('trash' != $status)
+			wp_die(time());
+		$r = wp_untrash_comment($comment->comment_ID);
+		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->comment_ID );
-	} elseif ( isset($_POST['unspam']) && 1 == $_POST['unspam'] ) {
-		if ( 'spam' != $status )
-			wp_die( time() );
-		$r = wp_unspam_comment( $comment->comment_ID );
-		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->comment_ID);
+	} elseif (isset($_POST['unspam']) && 1 == $_POST['unspam']) {
+		if ('spam' != $status)
+			wp_die(time());
+		$r = wp_unspam_comment($comment->comment_ID);
+		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->comment_ID );
+	} elseif (isset($_POST['delete']) && 1 == $_POST['delete']) {
+		$r = wp_delete_comment($comment->comment_ID);
 	} 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);
 }
 
 /**
@@ -561,22 +561,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);
 }
 
 /**
@@ -585,20 +585,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);
 }
 
 /**
@@ -607,17 +607,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);
 }
 
 /**
@@ -627,22 +627,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);
 }
 
 /**
@@ -652,27 +652,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);
 }
 
 /**
@@ -682,10 +682,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);
 }
 
 /**
@@ -693,22 +693,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);
 }
 
 /**
@@ -717,40 +717,40 @@ 
  * @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->comment_ID );
-	if ( isset( $_POST['new'] ) && $_POST['new'] == $current )
-		wp_die( time() );
+	$current = wp_get_comment_status($comment->comment_ID);
+	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->comment_ID, 'approve', true );
+	check_ajax_referer("approve-comment_$id");
+	if (in_array($current, array('unapproved', 'spam')))
+		$result = wp_set_comment_status($comment->comment_ID, 'approve', true);
 	else
-		$result = wp_set_comment_status( $comment->comment_ID, 'hold', true );
+		$result = wp_set_comment_status($comment->comment_ID, '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);
 }
 
 /**
@@ -760,33 +760,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();
 }
@@ -801,52 +801,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();
 }
 
@@ -856,38 +856,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;
 
@@ -904,46 +904,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();
 }
 
@@ -956,98 +956,98 @@ 
  *
  * @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 ( wp_set_comment_status( $parent->comment_ID, 'approve' ) )
+		if ($parent && $parent->comment_approved === '0' && $parent->comment_post_ID == $comment_post_ID) {
+			if (wp_set_comment_status($parent->comment_ID, '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,
 		'position' => $position
 	);
 
-	if ( $comment_auto_approved )
-		$response['supplemental'] = array( 'parent_approved' => $parent->comment_ID, 'parent_post_id' => $parent->comment_post_ID );
+	if ($comment_auto_approved)
+		$response['supplemental'] = array('parent_approved' => $parent->comment_ID, 'parent_post_id' => $parent->comment_post_ID);
 
 	$x = new WP_Ajax_Response();
-	$x->add( $response );
+	$x->add($response);
 	$x->send();
 }
 
@@ -1061,34 +1061,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,
@@ -1104,35 +1104,35 @@ 
  * @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 '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;
@@ -1141,28 +1141,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' => '',
@@ -1170,7 +1170,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();
 }
@@ -1181,19 +1181,19 @@ 
  * @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') {
 			$save_POST = $_POST; // Backup $_POST
 			$_POST = array(); // Make it empty for edit_post()
 			$_POST['action'] = 'draft'; // Warning fix
@@ -1201,66 +1201,66 @@ 
 			$_POST['post_type'] = $post->post_type;
 			$_POST['post_status'] = 'draft';
 			$now = current_time('timestamp', 1);
-			$_POST['post_title'] = sprintf( __( 'Draft created on %1$s at %2$s' ), date( get_option( 'date_format' ), $now ), date( get_option( 'time_format' ), $now ) );
+			$_POST['post_title'] = sprintf(__('Draft created on %1$s at %2$s'), date(get_option('date_format'), $now), date(get_option('time_format'), $now));
 
-			if ( $pid = edit_post() ) {
-				if ( is_wp_error( $pid ) ) {
-					$x = new WP_Ajax_Response( array(
+			if ($pid = edit_post()) {
+				if (is_wp_error($pid)) {
+					$x = new WP_Ajax_Response(array(
 						'what' => 'meta',
 						'data' => $pid
-					) );
+					));
 					$x->send();
 				}
 				$_POST = $save_POST; // Now we can restore original $_POST again
-				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();
 }
@@ -1274,38 +1274,38 @@ 
  *
  * @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(__( 'User <a href="#%s">%s</a> added' ), "user-$user_id", $user_object->user_login),
+			'show-link' => sprintf(__('User <a href="#%s">%s</a> added'), "user-$user_id", $user_object->user_login),
 			'role' => $role,
 		)
-	) );
+	));
 	$x->send();
 }
 
@@ -1315,30 +1315,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);
 }
 
 /**
@@ -1347,19 +1347,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);
 }
 
 /**
@@ -1368,14 +1368,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);
 }
 
 /**
@@ -1384,31 +1384,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,
@@ -1418,7 +1418,7 @@ 
 		$markup = ob_get_clean();
 
 		echo wp_json_encode(array(
-			'replace-id' => $type . '-' . $item->name,
+			'replace-id' => $type.'-'.$item->name,
 			'markup' => $markup,
 		));
 	}
@@ -1432,21 +1432,21 @@ 
  * @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'] );
-	$args['pagenum'] = ! empty( $_POST['page'] ) ? absint( $_POST['page'] ) : 1;
+	if (isset($_POST['search']))
+		$args['s'] = wp_unslash($_POST['search']);
+	$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();
@@ -1458,13 +1458,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);
 }
 
 /**
@@ -1473,28 +1473,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);
 }
 
 /**
@@ -1503,12 +1503,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();
 }
@@ -1519,9 +1519,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( add_query_arg( array( 'preview' => 'true' ), get_permalink( $post_id ) ) );
+	check_ajax_referer('getpermalink', 'getpermalinknonce');
+	$post_id = isset($_POST['post_id']) ? intval($_POST['post_id']) : 0;
+	wp_die(add_query_arg(array('preview' => 'true'), get_permalink($post_id)));
 }
 
 /**
@@ -1530,11 +1530,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));
 }
 
 /**
@@ -1547,29 +1547,29 @@ 
 function wp_ajax_inline_save() {
 	global $wp_list_table;
 
-	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);
@@ -1580,55 +1580,55 @@ 
 	// 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']));
 
 	$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();
 }
@@ -1643,45 +1643,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();
 }
 
@@ -1693,33 +1693,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');
@@ -1735,20 +1735,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);
 }
 
 /**
@@ -1757,22 +1757,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);
@@ -1781,7 +1781,7 @@ 
 			$sidebars[$key] = $sb;
 		}
 		wp_set_sidebars_widgets($sidebars);
-		wp_die( 1 );
+		wp_die(1);
 	}
 
 	wp_die( -1 );
@@ -1799,83 +1799,83 @@ 
 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');
-	} elseif ( $settings && preg_match( '/__i__|%i%/', key($settings) ) ) {
-		if ( !$multi_number )
-			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');
+	} 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();
 }
@@ -1898,35 +1898,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 don't have permission to upload files." ),
+				'message'  => __("You don't 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();
 		}
@@ -1934,53 +1934,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();
 }
@@ -1992,18 +1992,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);
@@ -2023,34 +2023,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);
 }
 
 /**
@@ -2061,41 +2061,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();
@@ -2110,7 +2110,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']))));
 }
 
 /**
@@ -2119,7 +2119,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']))));
 }
 
 /**
@@ -2129,37 +2129,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( get_option('date_format'), $post->post_modified );
-		$last_time = mysql2date( get_option('time_format'), $post->post_modified );
+	if ($post) {
+		$last_date = mysql2date(get_option('date_format'), $post->post_modified);
+		$last_time = mysql2date(get_option('time_format'), $post->post_modified);
 	} else {
-		$last_date = date_i18n( get_option('date_format') );
-		$last_time = date_i18n( get_option('time_format') );
+		$last_date = date_i18n(get_option('date_format'));
+		$last_time = date_i18n(get_option('time_format'));
 	}
 
-	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));
 }
 
 /**
@@ -2168,20 +2168,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.
@@ -2191,9 +2191,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);
 }
 
 /**
@@ -2203,21 +2203,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);
 }
 
 /**
@@ -2226,25 +2226,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);
 }
 
 /**
@@ -2253,31 +2253,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';
 
 	/**
@@ -2290,13 +2290,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);
 }
 
 /**
@@ -2305,69 +2305,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();
@@ -2379,45 +2379,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);
 }
 
 /**
@@ -2426,31 +2426,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();
@@ -2466,57 +2466,57 @@ 
  * @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 = '';
-	$html = isset( $attachment['post_title'] ) ? $attachment['post_title'] : '';
-	if ( ! empty( $attachment['url'] ) ) {
+	$html = isset($attachment['post_title']) ? $attachment['post_title'] : '';
+	if ( ! empty($attachment['url'])) {
 		$url = $attachment['url'];
-		if ( strpos( $url, 'attachment_id') || get_attachment_link( $id ) == $url )
-			$rel = ' rel="attachment wp-att-' . $id . '"';
-		$html = '<a href="' . esc_url( $url ) . '"' . $rel . '>' . $html . '</a>';
+		if (strpos($url, 'attachment_id') || get_attachment_link($id) == $url)
+			$rel = ' rel="attachment wp-att-'.$id.'"';
+		$html = '<a href="'.esc_url($url).'"'.$rel.'>'.$html.'</a>';
 	}
 
-	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, (bool) $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, (bool) $rel, $size, $alt);
+	} elseif (wp_attachment_is('video', $post) || wp_attachment_is('audio', $post)) {
+		$html = stripslashes_deep($_POST['html']);
 	}
 
 	/** 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);
 }
 
 /**
@@ -2537,47 +2537,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);
 }
 
 /**
@@ -2588,35 +2588,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.
 		 *
@@ -2626,7 +2626,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);
 	}
 
 	/**
@@ -2637,7 +2637,7 @@ 
 	 * @param array|object $response  The Heartbeat response object or array.
 	 * @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.
@@ -2649,12 +2649,12 @@ 
 	 * @param array|object $response  The Heartbeat response object or array.
 	 * @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);
 }
 
 /**
@@ -2663,30 +2663,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);
 }
 
 /**
@@ -2700,21 +2700,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
+	));
 }
 
 /**
@@ -2728,42 +2728,42 @@ 
 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
-	) );
+	));
 
-	$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->num_ratings = sprintf( _n( '(based on %s rating)', '(based on %s ratings)', $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->num_ratings = sprintf(_n('(based on %s rating)', '(based on %s ratings)', $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);
 }
 
 /**
@@ -2778,87 +2778,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
-	) );
+	));
 }
 
 /**
@@ -2870,42 +2870,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();
 	}
 
@@ -2913,18 +2913,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()
-	) );
+	));
 }
 
 /**
@@ -2933,33 +2933,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));
 }
 
 
@@ -2973,42 +2973,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
@@ -3018,32 +3018,32 @@ 
 		 * 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 ) {
- 			wp_send_json_error( $status );
+		if ($plugin_update_data === true) {
+ 			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);
 
 	}
 }
@@ -3056,8 +3056,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();
@@ -3071,8 +3071,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();
@@ -3086,49 +3086,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:
@@ -3144,27 +3144,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 = get_post( $attachment_id )->guid;
-			$url        = str_replace( basename( $parent_url ), basename( $cropped ), $parent_url );
+			$parent_url = get_post($attachment_id)->guid;
+			$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.
@@ -3175,8 +3175,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.
@@ -3186,8 +3186,8 @@ 
 			 * @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));
 }

Braces +596 added lines, -399 removed lines

@@ -22,10 +22,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'] );
@@ -88,11 +89,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();
 
@@ -122,8 +125,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];
@@ -161,8 +165,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);
@@ -182,8 +187,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 );
@@ -212,14 +218,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();
 }
@@ -242,12 +250,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();
 
@@ -365,8 +375,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 ) ) {
@@ -375,17 +386,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.
 	}
 
@@ -423,34 +437,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();
 
@@ -472,8 +493,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;
 		}
 
@@ -514,43 +536,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->comment_ID );
 
 	$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->comment_ID );
 	} elseif ( isset($_POST['untrash']) && 1 == $_POST['untrash'] ) {
-		if ( 'trash' != $status )
-			wp_die( time() );
+		if ( 'trash' != $status ) {
+					wp_die( time() );
+		}
 		$r = wp_untrash_comment( $comment->comment_ID );
-		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->comment_ID );
 	} elseif ( isset($_POST['unspam']) && 1 == $_POST['unspam'] ) {
-		if ( 'spam' != $status )
-			wp_die( time() );
+		if ( 'spam' != $status ) {
+					wp_die( time() );
+		}
 		$r = wp_unspam_comment( $comment->comment_ID );
-		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->comment_ID );
 	} 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 );
 }
 
@@ -566,18 +600,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.
@@ -588,18 +625,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.
@@ -610,13 +650,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 );
 }
 
@@ -628,22 +671,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.
@@ -653,24 +700,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 );
 }
@@ -683,8 +735,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 );
 }
 
@@ -694,22 +747,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.
@@ -727,18 +784,21 @@ 
 		$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->comment_ID );
-	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' ) ) )
-		$result = wp_set_comment_status( $comment->comment_ID, 'approve', true );
-	else
-		$result = wp_set_comment_status( $comment->comment_ID, 'hold', true );
+	if ( in_array( $current, array( 'unapproved', 'spam' ) ) ) {
+			$result = wp_set_comment_status( $comment->comment_ID, 'approve', true );
+	} else {
+			$result = wp_set_comment_status( $comment->comment_ID, 'hold', true );
+	}
 
 	if ( is_wp_error($result) ) {
 		$x = new WP_Ajax_Response( array(
@@ -761,20 +821,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 ) ) {
@@ -805,8 +869,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();
 
@@ -814,8 +879,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',
@@ -872,11 +938,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 = '#';
@@ -886,8 +954,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;
 
@@ -906,35 +975,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 );
 	}
@@ -958,23 +1033,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() ) {
@@ -985,8 +1064,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
@@ -997,12 +1077,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');
 
@@ -1011,14 +1093,17 @@ 
 		$parent = get_comment( $comment_parent );
 
 		if ( $parent && $parent->comment_approved === '0' && $parent->comment_post_ID == $comment_post_ID ) {
-			if ( wp_set_comment_status( $parent->comment_ID, 'approve' ) )
-				$comment_auto_approved = true;
+			if ( wp_set_comment_status( $parent->comment_ID, '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';
 
@@ -1043,8 +1128,9 @@ 
 		'position' => $position
 	);
 
-	if ( $comment_auto_approved )
-		$response['supplemental'] = array( 'parent_approved' => $parent->comment_ID, 'parent_post_id' => $parent->comment_post_ID );
+	if ( $comment_auto_approved ) {
+			$response['supplemental'] = array( 'parent_approved' => $parent->comment_ID, 'parent_post_id' => $parent->comment_post_ID );
+	}
 
 	$x = new WP_Ajax_Response();
 	$x->add( $response );
@@ -1064,14 +1150,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';
@@ -1079,8 +1168,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 );
@@ -1106,8 +1196,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';
 
@@ -1142,8 +1233,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();
 
@@ -1159,8 +1251,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(
@@ -1187,10 +1280,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' ) {
@@ -1212,8 +1307,9 @@ 
 					$x->send();
 				}
 				$_POST = $save_POST; // Now we can restore original $_POST again
-				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 );
 			}
@@ -1235,19 +1331,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(
@@ -1276,12 +1379,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 ) ) {
@@ -1324,14 +1429,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
@@ -1350,11 +1458,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 );
@@ -1370,8 +1480,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 );
 
@@ -1384,8 +1495,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';
 
@@ -1436,15 +1548,17 @@ 
 
 	$args = array();
 
-	if ( isset( $_POST['search'] ) )
-		$args['s'] = wp_unslash( $_POST['search'] );
+	if ( isset( $_POST['search'] ) ) {
+			$args['s'] = wp_unslash( $_POST['search'] );
+	}
 	$args['pagenum'] = ! empty( $_POST['page'] ) ? absint( $_POST['page'] ) : 1;
 
 	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";
@@ -1458,11 +1572,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 );
 }
@@ -1477,22 +1593,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 );
 }
@@ -1503,8 +1624,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';
 
@@ -1549,15 +1671,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 ) ) {
@@ -1580,8 +1705,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'] ) {
@@ -1591,10 +1717,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'] ) ) {
@@ -1647,16 +1775,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;
@@ -1665,13 +1796,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;
@@ -1704,8 +1837,9 @@ 
 		'post_status' => 'any',
 		'posts_per_page' => 50,
 	);
-	if ( '' !== $s )
-		$args['s'] = $s;
+	if ( '' !== $s ) {
+			$args['s'] = $s;
+	}
 
 	$posts = get_posts( $args );
 
@@ -1759,8 +1893,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'] );
 
@@ -1772,8 +1907,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);
 				}
@@ -1801,8 +1937,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'] );
 
@@ -1836,14 +1973,16 @@ 
 	// 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');
 	} 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;
@@ -1854,8 +1993,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'] );
@@ -1871,11 +2011,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();
 }
@@ -1967,15 +2109,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,
@@ -1992,8 +2137,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' );
@@ -2026,15 +2172,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 ) ) {
@@ -2133,8 +2281,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');
 
@@ -2168,20 +2317,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.
@@ -2203,15 +2356,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 );
@@ -2226,23 +2381,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 );
 }
@@ -2253,8 +2414,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(
@@ -2277,8 +2439,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
@@ -2305,37 +2468,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'] );
@@ -2379,25 +2551,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 );
@@ -2410,12 +2587,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 );
 }
@@ -2426,29 +2605,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 ) );
 	}
@@ -2472,11 +2658,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.
@@ -2489,8 +2677,9 @@ 
 	$html = isset( $attachment['post_title'] ) ? $attachment['post_title'] : '';
 	if ( ! empty( $attachment['url'] ) ) {
 		$url = $attachment['url'];
-		if ( strpos( $url, 'attachment_id') || get_attachment_link( $id ) == $url )
-			$rel = ' rel="attachment wp-att-' . $id . '"';
+		if ( strpos( $url, 'attachment_id') || get_attachment_link( $id ) == $url ) {
+					$rel = ' rel="attachment wp-att-' . $id . '"';
+		}
 		$html = '<a href="' . esc_url( $url ) . '"' . $rel . '>' . $html . '</a>';
 	}
 
@@ -2539,17 +2728,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 );
 
@@ -2571,8 +2764,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 );
@@ -2665,15 +2859,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/class-wp-filesystem-direct.php

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * WordPress Direct Filesystem.
- *
- * @package WordPress
- * @subpackage Filesystem
- */
+	 * WordPress Direct Filesystem.
+	 *
+	 * @package WordPress
+	 * @subpackage Filesystem
+	 */
 
 /**
  * WordPress Filesystem Class for direct PHP file and folder manipulation.

Spacing +62 added lines, -62 removed lines

@@ -55,25 +55,25 @@ 
 	 *                         Default false.
 	 * @return bool False upon failure, true otherwise.
 	 */
-	public function put_contents( $file, $contents, $mode = false ) {
-		$fp = @fopen( $file, 'wb' );
-		if ( ! $fp )
+	public function put_contents($file, $contents, $mode = false) {
+		$fp = @fopen($file, 'wb');
+		if ( ! $fp)
 			return false;
 
 		mbstring_binary_safe_encoding();
 
-		$data_length = strlen( $contents );
+		$data_length = strlen($contents);
 
-		$bytes_written = fwrite( $fp, $contents );
+		$bytes_written = fwrite($fp, $contents);
 
 		reset_mbstring_encoding();
 
-		fclose( $fp );
+		fclose($fp);
 
-		if ( $data_length !== $bytes_written )
+		if ($data_length !== $bytes_written)
 			return false;
 
-		$this->chmod( $file, $mode );
+		$this->chmod($file, $mode);
 
 		return true;
 	}
@@ -106,17 +106,17 @@ 
 	 * @return bool Returns true on success or false on failure.
 	 */
 	public function chgrp($file, $group, $recursive = false) {
-		if ( ! $this->exists($file) )
+		if ( ! $this->exists($file))
 			return false;
-		if ( ! $recursive )
+		if ( ! $recursive)
 			return @chgrp($file, $group);
-		if ( ! $this->is_dir($file) )
+		if ( ! $this->is_dir($file))
 			return @chgrp($file, $group);
 		// Is a directory, and we want recursive
 		$file = trailingslashit($file);
 		$filelist = $this->dirlist($file);
 		foreach ($filelist as $filename)
-			$this->chgrp($file . $filename, $group, $recursive);
+			$this->chgrp($file.$filename, $group, $recursive);
 
 		return true;
 	}
@@ -131,22 +131,22 @@ 
 	 * @return bool Returns true on success or false on failure.
 	 */
 	public function chmod($file, $mode = false, $recursive = false) {
-		if ( ! $mode ) {
-			if ( $this->is_file($file) )
+		if ( ! $mode) {
+			if ($this->is_file($file))
 				$mode = FS_CHMOD_FILE;
-			elseif ( $this->is_dir($file) )
+			elseif ($this->is_dir($file))
 				$mode = FS_CHMOD_DIR;
 			else
 				return false;
 		}
 
-		if ( ! $recursive || ! $this->is_dir($file) )
+		if ( ! $recursive || ! $this->is_dir($file))
 			return @chmod($file, $mode);
 		// Is a directory, and we want recursive
 		$file = trailingslashit($file);
 		$filelist = $this->dirlist($file);
-		foreach ( (array)$filelist as $filename => $filemeta)
-			$this->chmod($file . $filename, $mode, $recursive);
+		foreach ((array) $filelist as $filename => $filemeta)
+			$this->chmod($file.$filename, $mode, $recursive);
 
 		return true;
 	}
@@ -161,16 +161,16 @@ 
 	 * @return bool Returns true on success or false on failure.
 	 */
 	public function chown($file, $owner, $recursive = false) {
-		if ( ! $this->exists($file) )
+		if ( ! $this->exists($file))
 			return false;
-		if ( ! $recursive )
+		if ( ! $recursive)
 			return @chown($file, $owner);
-		if ( ! $this->is_dir($file) )
+		if ( ! $this->is_dir($file))
 			return @chown($file, $owner);
 		// Is a directory, and we want recursive
 		$filelist = $this->dirlist($file);
 		foreach ($filelist as $filename) {
-			$this->chown($file . '/' . $filename, $owner, $recursive);
+			$this->chown($file.'/'.$filename, $owner, $recursive);
 		}
 		return true;
 	}
@@ -183,9 +183,9 @@ 
 	 */
 	public function owner($file) {
 		$owneruid = @fileowner($file);
-		if ( ! $owneruid )
+		if ( ! $owneruid)
 			return false;
-		if ( ! function_exists('posix_getpwuid') )
+		if ( ! function_exists('posix_getpwuid'))
 			return $owneruid;
 		$ownerarray = posix_getpwuid($owneruid);
 		return $ownerarray['name'];
@@ -200,7 +200,7 @@ 
 	 * @return string Mode of the file (last 3 digits).
 	 */
 	public function getchmod($file) {
-		return substr( decoct( @fileperms( $file ) ), -3 );
+		return substr(decoct(@fileperms($file)), -3);
 	}
 
 	/**
@@ -209,9 +209,9 @@ 
 	 */
 	public function group($file) {
 		$gid = @filegroup($file);
-		if ( ! $gid )
+		if ( ! $gid)
 			return false;
-		if ( ! function_exists('posix_getgrgid') )
+		if ( ! function_exists('posix_getgrgid'))
 			return $gid;
 		$grouparray = posix_getgrgid($gid);
 		return $grouparray['name'];
@@ -225,11 +225,11 @@ 
 	 * @return bool
 	 */
 	public function copy($source, $destination, $overwrite = false, $mode = false) {
-		if ( ! $overwrite && $this->exists($destination) )
+		if ( ! $overwrite && $this->exists($destination))
 			return false;
 
 		$rtval = copy($source, $destination);
-		if ( $mode )
+		if ($mode)
 			$this->chmod($destination, $mode);
 		return $rtval;
 	}
@@ -241,14 +241,14 @@ 
 	 * @return bool
 	 */
 	public function move($source, $destination, $overwrite = false) {
-		if ( ! $overwrite && $this->exists($destination) )
+		if ( ! $overwrite && $this->exists($destination))
 			return false;
 
 		// Try using rename first. if that fails (for example, source is read only) try copy.
-		if ( @rename($source, $destination) )
+		if (@rename($source, $destination))
 			return true;
 
-		if ( $this->copy($source, $destination, $overwrite) && $this->exists($destination) ) {
+		if ($this->copy($source, $destination, $overwrite) && $this->exists($destination)) {
 			$this->delete($source);
 			return true;
 		} else {
@@ -263,13 +263,13 @@ 
 	 * @return bool
 	 */
 	public function delete($file, $recursive = false, $type = false) {
-		if ( empty( $file ) ) // Some filesystems report this as /, which can cause non-expected recursive deletion of all files in the filesystem.
+		if (empty($file)) // Some filesystems report this as /, which can cause non-expected recursive deletion of all files in the filesystem.
 			return false;
-		$file = str_replace( '\\', '/', $file ); // for win32, occasional problems deleting files otherwise
+		$file = str_replace('\\', '/', $file); // for win32, occasional problems deleting files otherwise
 
-		if ( 'f' == $type || $this->is_file($file) )
+		if ('f' == $type || $this->is_file($file))
 			return @unlink($file);
-		if ( ! $recursive && $this->is_dir($file) )
+		if ( ! $recursive && $this->is_dir($file))
 			return @rmdir($file);
 
 		// At this point it's a folder, and we're in recursive mode
@@ -277,14 +277,14 @@ 
 		$filelist = $this->dirlist($file, true);
 
 		$retval = true;
-		if ( is_array( $filelist ) ) {
-			foreach ( $filelist as $filename => $fileinfo ) {
-				if ( ! $this->delete($file . $filename, $recursive, $fileinfo['type']) )
+		if (is_array($filelist)) {
+			foreach ($filelist as $filename => $fileinfo) {
+				if ( ! $this->delete($file.$filename, $recursive, $fileinfo['type']))
 					$retval = false;
 			}
 		}
 
-		if ( file_exists($file) && ! @rmdir($file) )
+		if (file_exists($file) && ! @rmdir($file))
 			$retval = false;
 
 		return $retval;
@@ -375,18 +375,18 @@ 
 	public function mkdir($path, $chmod = false, $chown = false, $chgrp = false) {
 		// Safe mode fails with a trailing slash under certain PHP versions.
 		$path = untrailingslashit($path);
-		if ( empty($path) )
+		if (empty($path))
 			return false;
 
-		if ( ! $chmod )
+		if ( ! $chmod)
 			$chmod = FS_CHMOD_DIR;
 
-		if ( ! @mkdir($path) )
+		if ( ! @mkdir($path))
 			return false;
 		$this->chmod($path, $chmod);
-		if ( $chown )
+		if ($chown)
 			$this->chown($path, $chown);
-		if ( $chgrp )
+		if ($chgrp)
 			$this->chgrp($path, $chgrp);
 		return true;
 	}
@@ -407,54 +407,54 @@ 
 	 * @return bool|array
 	 */
 	public function dirlist($path, $include_hidden = true, $recursive = false) {
-		if ( $this->is_file($path) ) {
+		if ($this->is_file($path)) {
 			$limit_file = basename($path);
 			$path = dirname($path);
 		} else {
 			$limit_file = false;
 		}
 
-		if ( ! $this->is_dir($path) )
+		if ( ! $this->is_dir($path))
 			return false;
 
 		$dir = @dir($path);
-		if ( ! $dir )
+		if ( ! $dir)
 			return false;
 
 		$ret = array();
 
-		while (false !== ($entry = $dir->read()) ) {
+		while (false !== ($entry = $dir->read())) {
 			$struc = array();
 			$struc['name'] = $entry;
 
-			if ( '.' == $struc['name'] || '..' == $struc['name'] )
+			if ('.' == $struc['name'] || '..' == $struc['name'])
 				continue;
 
-			if ( ! $include_hidden && '.' == $struc['name'][0] )
+			if ( ! $include_hidden && '.' == $struc['name'][0])
 				continue;
 
-			if ( $limit_file && $struc['name'] != $limit_file)
+			if ($limit_file && $struc['name'] != $limit_file)
 				continue;
 
 			$struc['perms'] 	= $this->gethchmod($path.'/'.$entry);
 			$struc['permsn']	= $this->getnumchmodfromh($struc['perms']);
-			$struc['number'] 	= false;
+			$struc['number'] = false;
 			$struc['owner']    	= $this->owner($path.'/'.$entry);
 			$struc['group']    	= $this->group($path.'/'.$entry);
 			$struc['size']    	= $this->size($path.'/'.$entry);
-			$struc['lastmodunix']= $this->mtime($path.'/'.$entry);
-			$struc['lastmod']   = date('M j',$struc['lastmodunix']);
-			$struc['time']    	= date('h:i:s',$struc['lastmodunix']);
-			$struc['type']		= $this->is_dir($path.'/'.$entry) ? 'd' : 'f';
-
-			if ( 'd' == $struc['type'] ) {
-				if ( $recursive )
-					$struc['files'] = $this->dirlist($path . '/' . $struc['name'], $include_hidden, $recursive);
+			$struc['lastmodunix'] = $this->mtime($path.'/'.$entry);
+			$struc['lastmod']   = date('M j', $struc['lastmodunix']);
+			$struc['time']    	= date('h:i:s', $struc['lastmodunix']);
+			$struc['type'] = $this->is_dir($path.'/'.$entry) ? 'd' : 'f';
+
+			if ('d' == $struc['type']) {
+				if ($recursive)
+					$struc['files'] = $this->dirlist($path.'/'.$struc['name'], $include_hidden, $recursive);
 				else
 					$struc['files'] = array();
 			}
 
-			$ret[ $struc['name'] ] = $struc;
+			$ret[$struc['name']] = $struc;
 		}
 		$dir->close();
 		unset($dir);

Braces +120 added lines, -81 removed lines

@@ -57,8 +57,9 @@ 
 	 */
 	public function put_contents( $file, $contents, $mode = false ) {
 		$fp = @fopen( $file, 'wb' );
-		if ( ! $fp )
-			return false;
+		if ( ! $fp ) {
+					return false;
+		}
 
 		mbstring_binary_safe_encoding();
 
@@ -70,8 +71,9 @@ 
 
 		fclose( $fp );
 
-		if ( $data_length !== $bytes_written )
-			return false;
+		if ( $data_length !== $bytes_written ) {
+					return false;
+		}
 
 		$this->chmod( $file, $mode );
 
@@ -106,17 +108,21 @@ 
 	 * @return bool Returns true on success or false on failure.
 	 */
 	public function chgrp($file, $group, $recursive = false) {
-		if ( ! $this->exists($file) )
-			return false;
-		if ( ! $recursive )
-			return @chgrp($file, $group);
-		if ( ! $this->is_dir($file) )
-			return @chgrp($file, $group);
+		if ( ! $this->exists($file) ) {
+					return false;
+		}
+		if ( ! $recursive ) {
+					return @chgrp($file, $group);
+		}
+		if ( ! $this->is_dir($file) ) {
+					return @chgrp($file, $group);
+		}
 		// Is a directory, and we want recursive
 		$file = trailingslashit($file);
 		$filelist = $this->dirlist($file);
-		foreach ($filelist as $filename)
-			$this->chgrp($file . $filename, $group, $recursive);
+		foreach ($filelist as $filename) {
+					$this->chgrp($file . $filename, $group, $recursive);
+		}
 
 		return true;
 	}
@@ -132,21 +138,24 @@ 
 	 */
 	public function chmod($file, $mode = false, $recursive = false) {
 		if ( ! $mode ) {
-			if ( $this->is_file($file) )
-				$mode = FS_CHMOD_FILE;
-			elseif ( $this->is_dir($file) )
-				$mode = FS_CHMOD_DIR;
-			else
-				return false;
+			if ( $this->is_file($file) ) {
+							$mode = FS_CHMOD_FILE;
+			} elseif ( $this->is_dir($file) ) {
+							$mode = FS_CHMOD_DIR;
+			} else {
+							return false;
+			}
 		}
 
-		if ( ! $recursive || ! $this->is_dir($file) )
-			return @chmod($file, $mode);
+		if ( ! $recursive || ! $this->is_dir($file) ) {
+					return @chmod($file, $mode);
+		}
 		// Is a directory, and we want recursive
 		$file = trailingslashit($file);
 		$filelist = $this->dirlist($file);
-		foreach ( (array)$filelist as $filename => $filemeta)
-			$this->chmod($file . $filename, $mode, $recursive);
+		foreach ( (array)$filelist as $filename => $filemeta) {
+					$this->chmod($file . $filename, $mode, $recursive);
+		}
 
 		return true;
 	}
@@ -161,12 +170,15 @@ 
 	 * @return bool Returns true on success or false on failure.
 	 */
 	public function chown($file, $owner, $recursive = false) {
-		if ( ! $this->exists($file) )
-			return false;
-		if ( ! $recursive )
-			return @chown($file, $owner);
-		if ( ! $this->is_dir($file) )
-			return @chown($file, $owner);
+		if ( ! $this->exists($file) ) {
+					return false;
+		}
+		if ( ! $recursive ) {
+					return @chown($file, $owner);
+		}
+		if ( ! $this->is_dir($file) ) {
+					return @chown($file, $owner);
+		}
 		// Is a directory, and we want recursive
 		$filelist = $this->dirlist($file);
 		foreach ($filelist as $filename) {
@@ -183,10 +195,12 @@ 
 	 */
 	public function owner($file) {
 		$owneruid = @fileowner($file);
-		if ( ! $owneruid )
-			return false;
-		if ( ! function_exists('posix_getpwuid') )
-			return $owneruid;
+		if ( ! $owneruid ) {
+					return false;
+		}
+		if ( ! function_exists('posix_getpwuid') ) {
+					return $owneruid;
+		}
 		$ownerarray = posix_getpwuid($owneruid);
 		return $ownerarray['name'];
 	}
@@ -209,10 +223,12 @@ 
 	 */
 	public function group($file) {
 		$gid = @filegroup($file);
-		if ( ! $gid )
-			return false;
-		if ( ! function_exists('posix_getgrgid') )
-			return $gid;
+		if ( ! $gid ) {
+					return false;
+		}
+		if ( ! function_exists('posix_getgrgid') ) {
+					return $gid;
+		}
 		$grouparray = posix_getgrgid($gid);
 		return $grouparray['name'];
 	}
@@ -225,12 +241,14 @@ 
 	 * @return bool
 	 */
 	public function copy($source, $destination, $overwrite = false, $mode = false) {
-		if ( ! $overwrite && $this->exists($destination) )
-			return false;
+		if ( ! $overwrite && $this->exists($destination) ) {
+					return false;
+		}
 
 		$rtval = copy($source, $destination);
-		if ( $mode )
-			$this->chmod($destination, $mode);
+		if ( $mode ) {
+					$this->chmod($destination, $mode);
+		}
 		return $rtval;
 	}
 
@@ -241,12 +259,14 @@ 
 	 * @return bool
 	 */
 	public function move($source, $destination, $overwrite = false) {
-		if ( ! $overwrite && $this->exists($destination) )
-			return false;
+		if ( ! $overwrite && $this->exists($destination) ) {
+					return false;
+		}
 
 		// Try using rename first. if that fails (for example, source is read only) try copy.
-		if ( @rename($source, $destination) )
-			return true;
+		if ( @rename($source, $destination) ) {
+					return true;
+		}
 
 		if ( $this->copy($source, $destination, $overwrite) && $this->exists($destination) ) {
 			$this->delete($source);
@@ -263,14 +283,18 @@ 
 	 * @return bool
 	 */
 	public function delete($file, $recursive = false, $type = false) {
-		if ( empty( $file ) ) // Some filesystems report this as /, which can cause non-expected recursive deletion of all files in the filesystem.
+		if ( empty( $file ) ) {
+			// Some filesystems report this as /, which can cause non-expected recursive deletion of all files in the filesystem.
 			return false;
+		}
 		$file = str_replace( '\\', '/', $file ); // for win32, occasional problems deleting files otherwise
 
-		if ( 'f' == $type || $this->is_file($file) )
-			return @unlink($file);
-		if ( ! $recursive && $this->is_dir($file) )
-			return @rmdir($file);
+		if ( 'f' == $type || $this->is_file($file) ) {
+					return @unlink($file);
+		}
+		if ( ! $recursive && $this->is_dir($file) ) {
+					return @rmdir($file);
+		}
 
 		// At this point it's a folder, and we're in recursive mode
 		$file = trailingslashit($file);
@@ -279,13 +303,15 @@ 
 		$retval = true;
 		if ( is_array( $filelist ) ) {
 			foreach ( $filelist as $filename => $fileinfo ) {
-				if ( ! $this->delete($file . $filename, $recursive, $fileinfo['type']) )
-					$retval = false;
+				if ( ! $this->delete($file . $filename, $recursive, $fileinfo['type']) ) {
+									$retval = false;
+				}
 			}
 		}
 
-		if ( file_exists($file) && ! @rmdir($file) )
-			$retval = false;
+		if ( file_exists($file) && ! @rmdir($file) ) {
+					$retval = false;
+		}
 
 		return $retval;
 	}
@@ -358,10 +384,12 @@ 
 	 * @return bool
 	 */
 	public function touch($file, $time = 0, $atime = 0) {
-		if ($time == 0)
-			$time = time();
-		if ($atime == 0)
-			$atime = time();
+		if ($time == 0) {
+					$time = time();
+		}
+		if ($atime == 0) {
+					$atime = time();
+		}
 		return @touch($file, $time, $atime);
 	}
 
@@ -375,19 +403,24 @@ 
 	public function mkdir($path, $chmod = false, $chown = false, $chgrp = false) {
 		// Safe mode fails with a trailing slash under certain PHP versions.
 		$path = untrailingslashit($path);
-		if ( empty($path) )
-			return false;
+		if ( empty($path) ) {
+					return false;
+		}
 
-		if ( ! $chmod )
-			$chmod = FS_CHMOD_DIR;
+		if ( ! $chmod ) {
+					$chmod = FS_CHMOD_DIR;
+		}
 
-		if ( ! @mkdir($path) )
-			return false;
+		if ( ! @mkdir($path) ) {
+					return false;
+		}
 		$this->chmod($path, $chmod);
-		if ( $chown )
-			$this->chown($path, $chown);
-		if ( $chgrp )
-			$this->chgrp($path, $chgrp);
+		if ( $chown ) {
+					$this->chown($path, $chown);
+		}
+		if ( $chgrp ) {
+					$this->chgrp($path, $chgrp);
+		}
 		return true;
 	}
 
@@ -414,12 +447,14 @@ 
 			$limit_file = false;
 		}
 
-		if ( ! $this->is_dir($path) )
-			return false;
+		if ( ! $this->is_dir($path) ) {
+					return false;
+		}
 
 		$dir = @dir($path);
-		if ( ! $dir )
-			return false;
+		if ( ! $dir ) {
+					return false;
+		}
 
 		$ret = array();
 
@@ -427,14 +462,17 @@ 
 			$struc = array();
 			$struc['name'] = $entry;
 
-			if ( '.' == $struc['name'] || '..' == $struc['name'] )
-				continue;
+			if ( '.' == $struc['name'] || '..' == $struc['name'] ) {
+							continue;
+			}
 
-			if ( ! $include_hidden && '.' == $struc['name'][0] )
-				continue;
+			if ( ! $include_hidden && '.' == $struc['name'][0] ) {
+							continue;
+			}
 
-			if ( $limit_file && $struc['name'] != $limit_file)
-				continue;
+			if ( $limit_file && $struc['name'] != $limit_file) {
+							continue;
+			}
 
 			$struc['perms'] 	= $this->gethchmod($path.'/'.$entry);
 			$struc['permsn']	= $this->getnumchmodfromh($struc['perms']);
@@ -448,10 +486,11 @@ 
 			$struc['type']		= $this->is_dir($path.'/'.$entry) ? 'd' : 'f';
 
 			if ( 'd' == $struc['type'] ) {
-				if ( $recursive )
-					$struc['files'] = $this->dirlist($path . '/' . $struc['name'], $include_hidden, $recursive);
-				else
-					$struc['files'] = array();
+				if ( $recursive ) {
+									$struc['files'] = $this->dirlist($path . '/' . $struc['name'], $include_hidden, $recursive);
+				} else {
+									$struc['files'] = array();
+				}
 			}
 
 			$ret[ $struc['name'] ] = $struc;

src/wp-admin/includes/menu.php

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * Build Administration Menu.
- *
- * @package WordPress
- * @subpackage Administration
- */
+	 * Build Administration Menu.
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 */
 
 if ( is_network_admin() ) {
 

Spacing +54 added lines, -54 removed lines

@@ -6,7 +6,7 @@ 
  * @subpackage Administration
  */
 
-if ( is_network_admin() ) {
+if (is_network_admin()) {
 
 	/**
 	 * Fires before the administration menu loads in the Network Admin.
@@ -16,8 +16,8 @@ 
 	 * @private
 	 * @since 3.1.0
 	 */
-	do_action( '_network_admin_menu' );
-} elseif ( is_user_admin() ) {
+	do_action('_network_admin_menu');
+} elseif (is_user_admin()) {
 
 	/**
 	 * Fires before the administration menu loads in the User Admin.
@@ -27,7 +27,7 @@ 
 	 * @private
 	 * @since 3.1.0
 	 */
-	do_action( '_user_admin_menu' );
+	do_action('_user_admin_menu');
 } else {
 
 	/**
@@ -38,18 +38,18 @@ 
 	 * @private
 	 * @since 2.2.0
 	 */
-	do_action( '_admin_menu' );
+	do_action('_admin_menu');
 }
 
 // Create list of page plugin hook names.
 foreach ($menu as $menu_page) {
-	if ( false !== $pos = strpos($menu_page[2], '?') ) {
+	if (false !== $pos = strpos($menu_page[2], '?')) {
 		// Handle post_type=post|page|foo pages.
 		$hook_name = substr($menu_page[2], 0, $pos);
 		$hook_args = substr($menu_page[2], $pos + 1);
 		wp_parse_str($hook_args, $hook_args);
 		// Set the hook name to be the post type.
-		if ( isset($hook_args['post_type']) )
+		if (isset($hook_args['post_type']))
 			$hook_name = $hook_args['post_type'];
 		else
 			$hook_name = basename($hook_name, '.php');
@@ -59,9 +59,9 @@ 
 	}
 	$hook_name = sanitize_title($hook_name);
 
-	if ( isset($compat[$hook_name]) )
+	if (isset($compat[$hook_name]))
 		$hook_name = $compat[$hook_name];
-	elseif ( !$hook_name )
+	elseif ( ! $hook_name)
 		continue;
 
 	$admin_page_hooks[$menu_page[2]] = $hook_name;
@@ -73,14 +73,14 @@ 
 // Loop over submenus and remove pages for which the user does not have privs.
 foreach ($submenu as $parent => $sub) {
 	foreach ($sub as $index => $data) {
-		if ( ! current_user_can($data[1]) ) {
+		if ( ! current_user_can($data[1])) {
 			unset($submenu[$parent][$index]);
 			$_wp_submenu_nopriv[$parent][$data[2]] = true;
 		}
 	}
 	unset($index, $data);
 
-	if ( empty($submenu[$parent]) )
+	if (empty($submenu[$parent]))
 		unset($submenu[$parent]);
 }
 unset($sub, $parent);
@@ -90,18 +90,18 @@ 
  * Menus for which the original parent is not accessible due to lack of privileges
  * will have the next submenu in line be assigned as the new menu parent.
  */
-foreach ( $menu as $id => $data ) {
-	if ( empty($submenu[$data[2]]) )
+foreach ($menu as $id => $data) {
+	if (empty($submenu[$data[2]]))
 		continue;
 	$subs = $submenu[$data[2]];
-	$first_sub = reset( $subs );
+	$first_sub = reset($subs);
 	$old_parent = $data[2];
 	$new_parent = $first_sub[2];
 	/*
 	 * If the first submenu is not the same as the assigned parent,
 	 * make the first submenu the new parent.
 	 */
-	if ( $new_parent != $old_parent ) {
+	if ($new_parent != $old_parent) {
 		$_wp_real_parent_file[$old_parent] = $new_parent;
 		$menu[$id][2] = $new_parent;
 
@@ -111,13 +111,13 @@ 
 		}
 		unset($submenu[$old_parent], $index);
 
-		if ( isset($_wp_submenu_nopriv[$old_parent]) )
+		if (isset($_wp_submenu_nopriv[$old_parent]))
 			$_wp_submenu_nopriv[$new_parent] = $_wp_submenu_nopriv[$old_parent];
 	}
 }
 unset($id, $data, $subs, $first_sub, $old_parent, $new_parent);
 
-if ( is_network_admin() ) {
+if (is_network_admin()) {
 
 	/**
 	 * Fires before the administration menu loads in the Network Admin.
@@ -126,8 +126,8 @@ 
 	 *
 	 * @param string $context Empty context.
 	 */
-	do_action( 'network_admin_menu', '' );
-} elseif ( is_user_admin() ) {
+	do_action('network_admin_menu', '');
+} elseif (is_user_admin()) {
 
 	/**
 	 * Fires before the administration menu loads in the User Admin.
@@ -136,7 +136,7 @@ 
 	 *
 	 * @param string $context Empty context.
 	 */
-	do_action( 'user_admin_menu', '' );
+	do_action('user_admin_menu', '');
 } else {
 
 	/**
@@ -146,32 +146,32 @@ 
 	 *
 	 * @param string $context Empty context.
 	 */
-	do_action( 'admin_menu', '' );
+	do_action('admin_menu', '');
 }
 
 /*
  * Remove menus that have no accessible submenus and require privileges
  * that the user does not have. Run re-parent loop again.
  */
-foreach ( $menu as $id => $data ) {
-	if ( ! current_user_can($data[1]) )
+foreach ($menu as $id => $data) {
+	if ( ! current_user_can($data[1]))
 		$_wp_menu_nopriv[$data[2]] = true;
 
 	/*
 	 * If there is only one submenu and it is has same destination as the parent,
 	 * remove the submenu.
 	 */
-	if ( ! empty( $submenu[$data[2]] ) && 1 == count ( $submenu[$data[2]] ) ) {
+	if ( ! empty($submenu[$data[2]]) && 1 == count($submenu[$data[2]])) {
 		$subs = $submenu[$data[2]];
-		$first_sub = reset( $subs );
-		if ( $data[2] == $first_sub[2] )
-			unset( $submenu[$data[2]] );
+		$first_sub = reset($subs);
+		if ($data[2] == $first_sub[2])
+			unset($submenu[$data[2]]);
 	}
 
 	// If submenu is empty...
-	if ( empty($submenu[$data[2]]) ) {
+	if (empty($submenu[$data[2]])) {
 		// And user doesn't have privs, remove menu.
-		if ( isset( $_wp_menu_nopriv[$data[2]] ) ) {
+		if (isset($_wp_menu_nopriv[$data[2]])) {
 			unset($menu[$id]);
 		}
 	}
@@ -180,9 +180,9 @@ 
 
 // Remove any duplicated separators
 $separator_found = false;
-foreach ( $menu as $id => $data ) {
-	if ( 0 == strcmp('wp-menu-separator', $data[4] ) ) {
-		if ( ! $separator_found ) {
+foreach ($menu as $id => $data) {
+	if (0 == strcmp('wp-menu-separator', $data[4])) {
+		if ( ! $separator_found) {
 			$separator_found = true;
 		} else {
 			unset($menu[$id]);
@@ -201,7 +201,7 @@ 
  * @return string
  */
 function add_cssclass($add, $class) {
-	$class = empty($class) ? $add : $class .= ' ' . $add;
+	$class = empty($class) ? $add : $class .= ' '.$add;
 	return $class;
 }
 
@@ -214,29 +214,29 @@ 
 	$first = $lastorder = false;
 	$i = 0;
 	$mc = count($menu);
-	foreach ( $menu as $order => $top ) {
+	foreach ($menu as $order => $top) {
 		$i++;
 
-		if ( 0 == $order ) { // dashboard is always shown/single
+		if (0 == $order) { // dashboard is always shown/single
 			$menu[0][4] = add_cssclass('menu-top-first', $top[4]);
 			$lastorder = 0;
 			continue;
 		}
 
-		if ( 0 === strpos($top[2], 'separator') && false !== $lastorder ) { // if separator
+		if (0 === strpos($top[2], 'separator') && false !== $lastorder) { // if separator
 			$first = true;
 			$c = $menu[$lastorder][4];
 			$menu[$lastorder][4] = add_cssclass('menu-top-last', $c);
 			continue;
 		}
 
-		if ( $first ) {
+		if ($first) {
 			$c = $menu[$order][4];
 			$menu[$order][4] = add_cssclass('menu-top-first', $c);
 			$first = false;
 		}
 
-		if ( $mc == $i ) { // last item
+		if ($mc == $i) { // last item
 			$c = $menu[$order][4];
 			$menu[$order][4] = add_cssclass('menu-top-last', $c);
 		}
@@ -251,7 +251,7 @@ 
 	 *
 	 * @param array $menu Associative array of administration menu items.
 	 */
-	return apply_filters( 'add_menu_classes', $menu );
+	return apply_filters('add_menu_classes', $menu);
 }
 
 uksort($menu, "strnatcasecmp"); // make it all pretty
@@ -265,9 +265,9 @@ 
  *
  * @param bool $custom Whether custom ordering is enabled. Default false.
  */
-if ( apply_filters( 'custom_menu_order', false ) ) {
+if (apply_filters('custom_menu_order', false)) {
 	$menu_order = array();
-	foreach ( $menu as $menu_item ) {
+	foreach ($menu as $menu_item) {
 		$menu_order[] = $menu_item[2];
 	}
 	unset($menu_item);
@@ -285,7 +285,7 @@ 
 	 *
 	 * @param array $menu_order An ordered array of menu items.
 	 */
-	$menu_order = apply_filters( 'menu_order', $menu_order );
+	$menu_order = apply_filters('menu_order', $menu_order);
 	$menu_order = array_flip($menu_order);
 	$default_menu_order = array_flip($default_menu_order);
 
@@ -302,12 +302,12 @@ 
 		global $menu_order, $default_menu_order;
 		$a = $a[2];
 		$b = $b[2];
-		if ( isset($menu_order[$a]) && !isset($menu_order[$b]) ) {
+		if (isset($menu_order[$a]) && ! isset($menu_order[$b])) {
 			return -1;
-		} elseif ( !isset($menu_order[$a]) && isset($menu_order[$b]) ) {
+		} elseif ( ! isset($menu_order[$a]) && isset($menu_order[$b])) {
 			return 1;
-		} elseif ( isset($menu_order[$a]) && isset($menu_order[$b]) ) {
-			if ( $menu_order[$a] == $menu_order[$b] )
+		} elseif (isset($menu_order[$a]) && isset($menu_order[$b])) {
+			if ($menu_order[$a] == $menu_order[$b])
 				return 0;
 			return ($menu_order[$a] < $menu_order[$b]) ? -1 : 1;
 		} else {
@@ -320,22 +320,22 @@ 
 }
 
 // Remove the last menu item if it is a separator.
-$last_menu_key = array_keys( $menu );
-$last_menu_key = array_pop( $last_menu_key );
-if ( !empty( $menu ) && 'wp-menu-separator' == $menu[ $last_menu_key ][ 4 ] )
-	unset( $menu[ $last_menu_key ] );
-unset( $last_menu_key );
+$last_menu_key = array_keys($menu);
+$last_menu_key = array_pop($last_menu_key);
+if ( ! empty($menu) && 'wp-menu-separator' == $menu[$last_menu_key][4])
+	unset($menu[$last_menu_key]);
+unset($last_menu_key);
 
-if ( !user_can_access_admin_page() ) {
+if ( ! user_can_access_admin_page()) {
 
 	/**
 	 * Fires when access to an admin page is denied.
 	 *
 	 * @since 2.5.0
 	 */
-	do_action( 'admin_page_access_denied' );
+	do_action('admin_page_access_denied');
 
-	wp_die( __( 'You do not have sufficient permissions to access this page.' ), 403 );
+	wp_die(__('You do not have sufficient permissions to access this page.'), 403);
 }
 
 $menu = add_menu_classes($menu);

Braces +31 added lines, -22 removed lines

@@ -49,20 +49,22 @@ 
 		$hook_args = substr($menu_page[2], $pos + 1);
 		wp_parse_str($hook_args, $hook_args);
 		// Set the hook name to be the post type.
-		if ( isset($hook_args['post_type']) )
-			$hook_name = $hook_args['post_type'];
-		else
-			$hook_name = basename($hook_name, '.php');
+		if ( isset($hook_args['post_type']) ) {
+					$hook_name = $hook_args['post_type'];
+		} else {
+					$hook_name = basename($hook_name, '.php');
+		}
 		unset($hook_args);
 	} else {
 		$hook_name = basename($menu_page[2], '.php');
 	}
 	$hook_name = sanitize_title($hook_name);
 
-	if ( isset($compat[$hook_name]) )
-		$hook_name = $compat[$hook_name];
-	elseif ( !$hook_name )
-		continue;
+	if ( isset($compat[$hook_name]) ) {
+			$hook_name = $compat[$hook_name];
+	} elseif ( !$hook_name ) {
+			continue;
+	}
 
 	$admin_page_hooks[$menu_page[2]] = $hook_name;
 }
@@ -80,9 +82,10 @@ 
 	}
 	unset($index, $data);
 
-	if ( empty($submenu[$parent]) )
-		unset($submenu[$parent]);
-}
+	if ( empty($submenu[$parent]) ) {
+			unset($submenu[$parent]);
+	}
+	}
 unset($sub, $parent);
 
 /*
@@ -91,8 +94,9 @@ 
  * will have the next submenu in line be assigned as the new menu parent.
  */
 foreach ( $menu as $id => $data ) {
-	if ( empty($submenu[$data[2]]) )
-		continue;
+	if ( empty($submenu[$data[2]]) ) {
+			continue;
+	}
 	$subs = $submenu[$data[2]];
 	$first_sub = reset( $subs );
 	$old_parent = $data[2];
@@ -111,8 +115,9 @@ 
 		}
 		unset($submenu[$old_parent], $index);
 
-		if ( isset($_wp_submenu_nopriv[$old_parent]) )
-			$_wp_submenu_nopriv[$new_parent] = $_wp_submenu_nopriv[$old_parent];
+		if ( isset($_wp_submenu_nopriv[$old_parent]) ) {
+					$_wp_submenu_nopriv[$new_parent] = $_wp_submenu_nopriv[$old_parent];
+		}
 	}
 }
 unset($id, $data, $subs, $first_sub, $old_parent, $new_parent);
@@ -154,8 +159,9 @@ 
  * that the user does not have. Run re-parent loop again.
  */
 foreach ( $menu as $id => $data ) {
-	if ( ! current_user_can($data[1]) )
-		$_wp_menu_nopriv[$data[2]] = true;
+	if ( ! current_user_can($data[1]) ) {
+			$_wp_menu_nopriv[$data[2]] = true;
+	}
 
 	/*
 	 * If there is only one submenu and it is has same destination as the parent,
@@ -164,8 +170,9 @@ 
 	if ( ! empty( $submenu[$data[2]] ) && 1 == count ( $submenu[$data[2]] ) ) {
 		$subs = $submenu[$data[2]];
 		$first_sub = reset( $subs );
-		if ( $data[2] == $first_sub[2] )
-			unset( $submenu[$data[2]] );
+		if ( $data[2] == $first_sub[2] ) {
+					unset( $submenu[$data[2]] );
+		}
 	}
 
 	// If submenu is empty...
@@ -307,8 +314,9 @@ 
 		} elseif ( !isset($menu_order[$a]) && isset($menu_order[$b]) ) {
 			return 1;
 		} elseif ( isset($menu_order[$a]) && isset($menu_order[$b]) ) {
-			if ( $menu_order[$a] == $menu_order[$b] )
-				return 0;
+			if ( $menu_order[$a] == $menu_order[$b] ) {
+							return 0;
+			}
 			return ($menu_order[$a] < $menu_order[$b]) ? -1 : 1;
 		} else {
 			return ($default_menu_order[$a] <= $default_menu_order[$b]) ? -1 : 1;
@@ -322,8 +330,9 @@ 
 // Remove the last menu item if it is a separator.
 $last_menu_key = array_keys( $menu );
 $last_menu_key = array_pop( $last_menu_key );
-if ( !empty( $menu ) && 'wp-menu-separator' == $menu[ $last_menu_key ][ 4 ] )
+if ( !empty( $menu ) && 'wp-menu-separator' == $menu[ $last_menu_key ][ 4 ] ) {
 	unset( $menu[ $last_menu_key ] );
+}
 unset( $last_menu_key );
 
 if ( !user_can_access_admin_page() ) {

src/wp-admin/includes/update.php

Indentation +15 added lines, -15 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 /**
- * WordPress Administration Update API
- *
- * @package WordPress
- * @subpackage Administration
- */
+	 * WordPress Administration Update API
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 */
 
 /**
  * Selects the first update version from the update_core option.
@@ -354,16 +354,16 @@ 
 		 *     @type string $title        The human-readable title of the plugin.
 		 *     @type string $author_name  Plugin author's name.
 		 *     @type bool   $update       Whether there's an available update. Default null.
-	 	 * }
-	 	 * @param array $r {
-	 	 *     An array of metadata about the available plugin update.
-	 	 *
-	 	 *     @type int    $id           Plugin ID.
-	 	 *     @type string $slug         Plugin slug.
-	 	 *     @type string $new_version  New plugin version.
-	 	 *     @type string $url          Plugin URL.
-	 	 *     @type string $package      Plugin update package URL.
-	 	 * }
+		 * }
+		 * @param array $r {
+		 *     An array of metadata about the available plugin update.
+		 *
+		 *     @type int    $id           Plugin ID.
+		 *     @type string $slug         Plugin slug.
+		 *     @type string $new_version  New plugin version.
+		 *     @type string $url          Plugin URL.
+		 *     @type string $package      Plugin update package URL.
+		 * }
 		 */
 		do_action( "in_plugin_update_message-{$file}", $plugin_data, $r );
 

Switch Indentation +7 added lines, -7 removed lines

@@ -199,15 +199,15 @@
 		$cur->response = '';
 
 	switch ( $cur->response ) {
-	case 'development' :
-		return sprintf( __( 'You are using a development version (%1$s). Cool! Please <a href="%2$s">stay updated</a>.' ), get_bloginfo( 'version', 'display' ), network_admin_url( 'update-core.php' ) );
+		case 'development' :
+			return sprintf( __( 'You are using a development version (%1$s). Cool! Please <a href="%2$s">stay updated</a>.' ), get_bloginfo( 'version', 'display' ), network_admin_url( 'update-core.php' ) );
 
-	case 'upgrade' :
-		return sprintf( '<strong>'.__( '<a href="%1$s">Get Version %2$s</a>' ).'</strong>', network_admin_url( 'update-core.php' ), $cur->current);
+		case 'upgrade' :
+			return sprintf( '<strong>'.__( '<a href="%1$s">Get Version %2$s</a>' ).'</strong>', network_admin_url( 'update-core.php' ), $cur->current);
 
-	case 'latest' :
-	default :
-		return sprintf( __( 'Version %s' ), get_bloginfo( 'version', 'display' ) );
+		case 'latest' :
+		default :
+			return sprintf( __( 'Version %s' ), get_bloginfo( 'version', 'display' ) );
 	}
 }
 

Spacing +132 added lines, -132 removed lines

@@ -13,10 +13,10 @@ 
  */
 function get_preferred_from_update_core() {
 	$updates = get_core_updates();
-	if ( ! is_array( $updates ) )
+	if ( ! is_array($updates))
 		return false;
-	if ( empty( $updates ) )
-		return (object) array( 'response' => 'latest' );
+	if (empty($updates))
+		return (object) array('response' => 'latest');
 	return $updates[0];
 }
 
@@ -27,31 +27,31 @@ 
  * 	                     set $options['available'] to false to skip not-dismissed updates.
  * @return array|false Array of the update objects on success, false on failure.
  */
-function get_core_updates( $options = array() ) {
-	$options = array_merge( array( 'available' => true, 'dismissed' => false ), $options );
-	$dismissed = get_site_option( 'dismissed_update_core' );
+function get_core_updates($options = array()) {
+	$options = array_merge(array('available' => true, 'dismissed' => false), $options);
+	$dismissed = get_site_option('dismissed_update_core');
 
-	if ( ! is_array( $dismissed ) )
+	if ( ! is_array($dismissed))
 		$dismissed = array();
 
-	$from_api = get_site_transient( 'update_core' );
+	$from_api = get_site_transient('update_core');
 
-	if ( ! isset( $from_api->updates ) || ! is_array( $from_api->updates ) )
+	if ( ! isset($from_api->updates) || ! is_array($from_api->updates))
 		return false;
 
 	$updates = $from_api->updates;
 	$result = array();
-	foreach ( $updates as $update ) {
-		if ( $update->response == 'autoupdate' )
+	foreach ($updates as $update) {
+		if ($update->response == 'autoupdate')
 			continue;
 
-		if ( array_key_exists( $update->current . '|' . $update->locale, $dismissed ) ) {
-			if ( $options['dismissed'] ) {
+		if (array_key_exists($update->current.'|'.$update->locale, $dismissed)) {
+			if ($options['dismissed']) {
 				$update->dismissed = true;
 				$result[] = $update;
 			}
 		} else {
-			if ( $options['available'] ) {
+			if ($options['available']) {
 				$update->dismissed = false;
 				$result[] = $update;
 			}
@@ -70,22 +70,22 @@ 
  * @return array|false False on failure, otherwise the core update offering.
  */
 function find_core_auto_update() {
-	$updates = get_site_transient( 'update_core' );
-	if ( ! $updates || empty( $updates->updates ) )
+	$updates = get_site_transient('update_core');
+	if ( ! $updates || empty($updates->updates))
 		return false;
 
-	include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
+	include_once(ABSPATH.'wp-admin/includes/class-wp-upgrader.php');
 
 	$auto_update = false;
 	$upgrader = new WP_Automatic_Updater;
-	foreach ( $updates->updates as $update ) {
-		if ( 'autoupdate' != $update->response )
+	foreach ($updates->updates as $update) {
+		if ('autoupdate' != $update->response)
 			continue;
 
-		if ( ! $upgrader->should_update( 'core', $update, ABSPATH ) )
+		if ( ! $upgrader->should_update('core', $update, ABSPATH))
 			continue;
 
-		if ( ! $auto_update || version_compare( $update->current, $auto_update->current, '>' ) )
+		if ( ! $auto_update || version_compare($update->current, $auto_update->current, '>'))
 			$auto_update = $update;
 	}
 	return $auto_update;
@@ -100,29 +100,29 @@ 
  * @param string $locale  Locale to query.
  * @return bool|array False on failure. An array of checksums on success.
  */
-function get_core_checksums( $version, $locale ) {
-	$url = $http_url = 'http://api.wordpress.org/core/checksums/1.0/?' . http_build_query( compact( 'version', 'locale' ), null, '&' );
+function get_core_checksums($version, $locale) {
+	$url = $http_url = 'http://api.wordpress.org/core/checksums/1.0/?'.http_build_query(compact('version', 'locale'), null, '&');
 
-	if ( $ssl = wp_http_supports( array( 'ssl' ) ) )
-		$url = set_url_scheme( $url, 'https' );
+	if ($ssl = wp_http_supports(array('ssl')))
+		$url = set_url_scheme($url, 'https');
 
 	$options = array(
-		'timeout' => ( ( defined('DOING_CRON') && DOING_CRON ) ? 30 : 3 ),
+		'timeout' => ((defined('DOING_CRON') && DOING_CRON) ? 30 : 3),
 	);
 
-	$response = wp_remote_get( $url, $options );
-	if ( $ssl && is_wp_error( $response ) ) {
-		trigger_error( __( 'An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.' ) . ' ' . __( '(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)' ), headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE );
-		$response = wp_remote_get( $http_url, $options );
+	$response = wp_remote_get($url, $options);
+	if ($ssl && is_wp_error($response)) {
+		trigger_error(__('An unexpected error occurred. Something may be wrong with WordPress.org or this server&#8217;s configuration. If you continue to have problems, please try the <a href="https://wordpress.org/support/">support forums</a>.').' '.__('(WordPress could not establish a secure connection to WordPress.org. Please contact your server administrator.)'), headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE);
+		$response = wp_remote_get($http_url, $options);
 	}
 
-	if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) )
+	if (is_wp_error($response) || 200 != wp_remote_retrieve_response_code($response))
 		return false;
 
-	$body = trim( wp_remote_retrieve_body( $response ) );
-	$body = json_decode( $body, true );
+	$body = trim(wp_remote_retrieve_body($response));
+	$body = json_decode($body, true);
 
-	if ( ! is_array( $body ) || ! isset( $body['checksums'] ) || ! is_array( $body['checksums'] ) )
+	if ( ! is_array($body) || ! isset($body['checksums']) || ! is_array($body['checksums']))
 		return false;
 
 	return $body['checksums'];
@@ -133,10 +133,10 @@ 
  * @param object $update
  * @return bool
  */
-function dismiss_core_update( $update ) {
-	$dismissed = get_site_option( 'dismissed_update_core' );
-	$dismissed[ $update->current . '|' . $update->locale ] = true;
-	return update_site_option( 'dismissed_update_core', $dismissed );
+function dismiss_core_update($update) {
+	$dismissed = get_site_option('dismissed_update_core');
+	$dismissed[$update->current.'|'.$update->locale] = true;
+	return update_site_option('dismissed_update_core', $dismissed);
 }
 
 /**
@@ -145,15 +145,15 @@ 
  * @param string $locale
  * @return bool
  */
-function undismiss_core_update( $version, $locale ) {
-	$dismissed = get_site_option( 'dismissed_update_core' );
-	$key = $version . '|' . $locale;
+function undismiss_core_update($version, $locale) {
+	$dismissed = get_site_option('dismissed_update_core');
+	$key = $version.'|'.$locale;
 
-	if ( ! isset( $dismissed[$key] ) )
+	if ( ! isset($dismissed[$key]))
 		return false;
 
-	unset( $dismissed[$key] );
-	return update_site_option( 'dismissed_update_core', $dismissed );
+	unset($dismissed[$key]);
+	return update_site_option('dismissed_update_core', $dismissed);
 }
 
 /**
@@ -162,15 +162,15 @@ 
  * @param string $locale
  * @return object|false
  */
-function find_core_update( $version, $locale ) {
-	$from_api = get_site_transient( 'update_core' );
+function find_core_update($version, $locale) {
+	$from_api = get_site_transient('update_core');
 
-	if ( ! isset( $from_api->updates ) || ! is_array( $from_api->updates ) )
+	if ( ! isset($from_api->updates) || ! is_array($from_api->updates))
 		return false;
 
 	$updates = $from_api->updates;
-	foreach ( $updates as $update ) {
-		if ( $update->current == $version && $update->locale == $locale )
+	foreach ($updates as $update) {
+		if ($update->current == $version && $update->locale == $locale)
 			return $update;
 	}
 	return false;
@@ -181,33 +181,33 @@ 
  * @param string $msg
  * @return string
  */
-function core_update_footer( $msg = '' ) {
-	if ( !current_user_can('update_core') )
-		return sprintf( __( 'Version %s' ), get_bloginfo( 'version', 'display' ) );
+function core_update_footer($msg = '') {
+	if ( ! current_user_can('update_core'))
+		return sprintf(__('Version %s'), get_bloginfo('version', 'display'));
 
 	$cur = get_preferred_from_update_core();
-	if ( ! is_object( $cur ) )
+	if ( ! is_object($cur))
 		$cur = new stdClass;
 
-	if ( ! isset( $cur->current ) )
+	if ( ! isset($cur->current))
 		$cur->current = '';
 
-	if ( ! isset( $cur->url ) )
+	if ( ! isset($cur->url))
 		$cur->url = '';
 
-	if ( ! isset( $cur->response ) )
+	if ( ! isset($cur->response))
 		$cur->response = '';
 
-	switch ( $cur->response ) {
+	switch ($cur->response) {
 	case 'development' :
-		return sprintf( __( 'You are using a development version (%1$s). Cool! Please <a href="%2$s">stay updated</a>.' ), get_bloginfo( 'version', 'display' ), network_admin_url( 'update-core.php' ) );
+		return sprintf(__('You are using a development version (%1$s). Cool! Please <a href="%2$s">stay updated</a>.'), get_bloginfo('version', 'display'), network_admin_url('update-core.php'));
 
 	case 'upgrade' :
-		return sprintf( '<strong>'.__( '<a href="%1$s">Get Version %2$s</a>' ).'</strong>', network_admin_url( 'update-core.php' ), $cur->current);
+		return sprintf('<strong>'.__('<a href="%1$s">Get Version %2$s</a>').'</strong>', network_admin_url('update-core.php'), $cur->current);
 
 	case 'latest' :
 	default :
-		return sprintf( __( 'Version %s' ), get_bloginfo( 'version', 'display' ) );
+		return sprintf(__('Version %s'), get_bloginfo('version', 'display'));
 	}
 }
 
@@ -217,23 +217,23 @@ 
  * @return false|void
  */
 function update_nag() {
-	if ( is_multisite() && !current_user_can('update_core') )
+	if (is_multisite() && ! current_user_can('update_core'))
 		return false;
 
 	global $pagenow;
 
-	if ( 'update-core.php' == $pagenow )
+	if ('update-core.php' == $pagenow)
 		return;
 
 	$cur = get_preferred_from_update_core();
 
-	if ( ! isset( $cur->response ) || $cur->response != 'upgrade' )
+	if ( ! isset($cur->response) || $cur->response != 'upgrade')
 		return false;
 
-	if ( current_user_can('update_core') ) {
-		$msg = sprintf( __('<a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> is available! <a href="%2$s">Please update now</a>.'), $cur->current, network_admin_url( 'update-core.php' ) );
+	if (current_user_can('update_core')) {
+		$msg = sprintf(__('<a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> is available! <a href="%2$s">Please update now</a>.'), $cur->current, network_admin_url('update-core.php'));
 	} else {
-		$msg = sprintf( __('<a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> is available! Please notify the site administrator.'), $cur->current );
+		$msg = sprintf(__('<a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> is available! Please notify the site administrator.'), $cur->current);
 	}
 	echo "<div class='update-nag'>$msg</div>";
 }
@@ -241,20 +241,20 @@ 
 // Called directly from dashboard
 function update_right_now_message() {
 	$theme_name = wp_get_theme();
-	if ( current_user_can( 'switch_themes' ) ) {
-		$theme_name = sprintf( '<a href="themes.php">%1$s</a>', $theme_name );
+	if (current_user_can('switch_themes')) {
+		$theme_name = sprintf('<a href="themes.php">%1$s</a>', $theme_name);
 	}
 
 	$msg = '';
 
-	if ( current_user_can('update_core') ) {
+	if (current_user_can('update_core')) {
 		$cur = get_preferred_from_update_core();
 
-		if ( isset( $cur->response ) && $cur->response == 'upgrade' )
-			$msg .= '<a href="' . network_admin_url( 'update-core.php' ) . '" class="button" aria-describedby="wp-version">' . sprintf( __( 'Update to %s' ), $cur->current ? $cur->current : __( 'Latest' ) ) . '</a> ';
+		if (isset($cur->response) && $cur->response == 'upgrade')
+			$msg .= '<a href="'.network_admin_url('update-core.php').'" class="button" aria-describedby="wp-version">'.sprintf(__('Update to %s'), $cur->current ? $cur->current : __('Latest')).'</a> ';
 	}
 
-	$msg .= sprintf( '<span id="wp-version">' . __( 'WordPress %1$s running %2$s theme.' ) . '</span>', get_bloginfo( 'version', 'display' ), $theme_name );
+	$msg .= sprintf('<span id="wp-version">'.__('WordPress %1$s running %2$s theme.').'</span>', get_bloginfo('version', 'display'), $theme_name);
 
 	echo "<p id='wp-version-message'>$msg</p>";
 }
@@ -267,11 +267,11 @@ 
 function get_plugin_updates() {
 	$all_plugins = get_plugins();
 	$upgrade_plugins = array();
-	$current = get_site_transient( 'update_plugins' );
-	foreach ( (array)$all_plugins as $plugin_file => $plugin_data) {
-		if ( isset( $current->response[ $plugin_file ] ) ) {
-			$upgrade_plugins[ $plugin_file ] = (object) $plugin_data;
-			$upgrade_plugins[ $plugin_file ]->update = $current->response[ $plugin_file ];
+	$current = get_site_transient('update_plugins');
+	foreach ((array) $all_plugins as $plugin_file => $plugin_data) {
+		if (isset($current->response[$plugin_file])) {
+			$upgrade_plugins[$plugin_file] = (object) $plugin_data;
+			$upgrade_plugins[$plugin_file]->update = $current->response[$plugin_file];
 		}
 	}
 
@@ -282,14 +282,14 @@ 
  * @since 2.9.0
  */
 function wp_plugin_update_rows() {
-	if ( !current_user_can('update_plugins' ) )
+	if ( ! current_user_can('update_plugins'))
 		return;
 
-	$plugins = get_site_transient( 'update_plugins' );
-	if ( isset($plugins->response) && is_array($plugins->response) ) {
-		$plugins = array_keys( $plugins->response );
-		foreach( $plugins as $plugin_file ) {
-			add_action( "after_plugin_row_$plugin_file", 'wp_plugin_update_row', 10, 2 );
+	$plugins = get_site_transient('update_plugins');
+	if (isset($plugins->response) && is_array($plugins->response)) {
+		$plugins = array_keys($plugins->response);
+		foreach ($plugins as $plugin_file) {
+			add_action("after_plugin_row_$plugin_file", 'wp_plugin_update_row', 10, 2);
 		}
 	}
 }
@@ -300,35 +300,35 @@ 
  * @param array  $plugin_data
  * @return false|void
  */
-function wp_plugin_update_row( $file, $plugin_data ) {
-	$current = get_site_transient( 'update_plugins' );
-	if ( !isset( $current->response[ $file ] ) )
+function wp_plugin_update_row($file, $plugin_data) {
+	$current = get_site_transient('update_plugins');
+	if ( ! isset($current->response[$file]))
 		return false;
 
-	$r = $current->response[ $file ];
+	$r = $current->response[$file];
 
-	$plugins_allowedtags = array('a' => array('href' => array(),'title' => array()),'abbr' => array('title' => array()),'acronym' => array('title' => array()),'code' => array(),'em' => array(),'strong' => array());
-	$plugin_name = wp_kses( $plugin_data['Name'], $plugins_allowedtags );
+	$plugins_allowedtags = array('a' => array('href' => array(), 'title' => array()), 'abbr' => array('title' => array()), 'acronym' => array('title' => array()), 'code' => array(), 'em' => array(), 'strong' => array());
+	$plugin_name = wp_kses($plugin_data['Name'], $plugins_allowedtags);
 
-	$details_url = self_admin_url('plugin-install.php?tab=plugin-information&plugin=' . $r->slug . '&section=changelog&TB_iframe=true&width=600&height=800');
+	$details_url = self_admin_url('plugin-install.php?tab=plugin-information&plugin='.$r->slug.'&section=changelog&TB_iframe=true&width=600&height=800');
 
 	$wp_list_table = _get_list_table('WP_Plugins_List_Table');
 
-	if ( is_network_admin() || !is_multisite() ) {
-		if ( is_network_admin() ) {
-			$active_class = is_plugin_active_for_network( $file ) ? ' active': '';
+	if (is_network_admin() || ! is_multisite()) {
+		if (is_network_admin()) {
+			$active_class = is_plugin_active_for_network($file) ? ' active' : '';
 		} else {
-			$active_class = is_plugin_active( $file ) ? ' active' : '';
+			$active_class = is_plugin_active($file) ? ' active' : '';
 		}
 
-		echo '<tr class="plugin-update-tr' . $active_class . '" id="' . esc_attr( $r->slug . '-update' ) . '" data-slug="' . esc_attr( $r->slug ) . '" data-plugin="' . esc_attr( $file ) . '"><td colspan="' . esc_attr( $wp_list_table->get_column_count() ) . '" class="plugin-update colspanchange"><div class="update-message">';
+		echo '<tr class="plugin-update-tr'.$active_class.'" id="'.esc_attr($r->slug.'-update').'" data-slug="'.esc_attr($r->slug).'" data-plugin="'.esc_attr($file).'"><td colspan="'.esc_attr($wp_list_table->get_column_count()).'" class="plugin-update colspanchange"><div class="update-message">';
 
-		if ( ! current_user_can( 'update_plugins' ) ) {
-			printf( __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a>.'), $plugin_name, esc_url($details_url), esc_attr($plugin_name), $r->new_version );
-		} elseif ( empty($r->package) ) {
-			printf( __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a>. <em>Automatic update is unavailable for this plugin.</em>'), $plugin_name, esc_url($details_url), esc_attr($plugin_name), $r->new_version );
+		if ( ! current_user_can('update_plugins')) {
+			printf(__('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a>.'), $plugin_name, esc_url($details_url), esc_attr($plugin_name), $r->new_version);
+		} elseif (empty($r->package)) {
+			printf(__('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a>. <em>Automatic update is unavailable for this plugin.</em>'), $plugin_name, esc_url($details_url), esc_attr($plugin_name), $r->new_version);
 		} else {
-			printf( __( 'There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a> or <a href="%5$s" class="update-link">update now</a>.' ), $plugin_name, esc_url( $details_url ), esc_attr( $plugin_name ), $r->new_version, wp_nonce_url( self_admin_url( 'update.php?action=upgrade-plugin&plugin=' ) . $file, 'upgrade-plugin_' . $file ) );
+			printf(__('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a> or <a href="%5$s" class="update-link">update now</a>.'), $plugin_name, esc_url($details_url), esc_attr($plugin_name), $r->new_version, wp_nonce_url(self_admin_url('update.php?action=upgrade-plugin&plugin=').$file, 'upgrade-plugin_'.$file));
 		}
 		/**
 		 * Fires at the end of the update message container in each
@@ -365,7 +365,7 @@ 
 	 	 *     @type string $package      Plugin update package URL.
 	 	 * }
 		 */
-		do_action( "in_plugin_update_message-{$file}", $plugin_data, $r );
+		do_action("in_plugin_update_message-{$file}", $plugin_data, $r);
 
 		echo '</div></td></tr>';
 	}
@@ -378,13 +378,13 @@ 
 function get_theme_updates() {
 	$current = get_site_transient('update_themes');
 
-	if ( ! isset( $current->response ) )
+	if ( ! isset($current->response))
 		return array();
 
 	$update_themes = array();
-	foreach ( $current->response as $stylesheet => $data ) {
-		$update_themes[ $stylesheet ] = wp_get_theme( $stylesheet );
-		$update_themes[ $stylesheet ]->update = $data;
+	foreach ($current->response as $stylesheet => $data) {
+		$update_themes[$stylesheet] = wp_get_theme($stylesheet);
+		$update_themes[$stylesheet]->update = $data;
 	}
 
 	return $update_themes;
@@ -394,15 +394,15 @@ 
  * @since 3.1.0
  */
 function wp_theme_update_rows() {
-	if ( !current_user_can('update_themes' ) )
+	if ( ! current_user_can('update_themes'))
 		return;
 
-	$themes = get_site_transient( 'update_themes' );
-	if ( isset($themes->response) && is_array($themes->response) ) {
-		$themes = array_keys( $themes->response );
+	$themes = get_site_transient('update_themes');
+	if (isset($themes->response) && is_array($themes->response)) {
+		$themes = array_keys($themes->response);
 
-		foreach( $themes as $theme ) {
-			add_action( "after_theme_row_$theme", 'wp_theme_update_row', 10, 2 );
+		foreach ($themes as $theme) {
+			add_action("after_theme_row_$theme", 'wp_theme_update_row', 10, 2);
 		}
 	}
 }
@@ -413,23 +413,23 @@ 
  * @param WP_Theme $theme
  * @return false|void
  */
-function wp_theme_update_row( $theme_key, $theme ) {
-	$current = get_site_transient( 'update_themes' );
-	if ( !isset( $current->response[ $theme_key ] ) )
+function wp_theme_update_row($theme_key, $theme) {
+	$current = get_site_transient('update_themes');
+	if ( ! isset($current->response[$theme_key]))
 		return false;
-	$r = $current->response[ $theme_key ];
+	$r = $current->response[$theme_key];
 
-	$details_url = add_query_arg( array( 'TB_iframe' => 'true', 'width' => 1024, 'height' => 800 ), $current->response[ $theme_key ]['url'] );
+	$details_url = add_query_arg(array('TB_iframe' => 'true', 'width' => 1024, 'height' => 800), $current->response[$theme_key]['url']);
 
 	$wp_list_table = _get_list_table('WP_MS_Themes_List_Table');
 
-	echo '<tr class="plugin-update-tr"><td colspan="' . $wp_list_table->get_column_count() . '" class="plugin-update colspanchange"><div class="update-message">';
-	if ( ! current_user_can('update_themes') ) {
-		printf( __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a>.'), $theme['Name'], esc_url($details_url), esc_attr($theme['Name']), $r->new_version );
-	} elseif ( empty( $r['package'] ) ) {
-		printf( __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a>. <em>Automatic update is unavailable for this theme.</em>'), $theme['Name'], esc_url($details_url), esc_attr($theme['Name']), $r['new_version'] );
+	echo '<tr class="plugin-update-tr"><td colspan="'.$wp_list_table->get_column_count().'" class="plugin-update colspanchange"><div class="update-message">';
+	if ( ! current_user_can('update_themes')) {
+		printf(__('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a>.'), $theme['Name'], esc_url($details_url), esc_attr($theme['Name']), $r->new_version);
+	} elseif (empty($r['package'])) {
+		printf(__('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a>. <em>Automatic update is unavailable for this theme.</em>'), $theme['Name'], esc_url($details_url), esc_attr($theme['Name']), $r['new_version']);
 	} else {
-		printf( __('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a> or <a href="%5$s">update now</a>.'), $theme['Name'], esc_url($details_url), esc_attr($theme['Name']), $r['new_version'], wp_nonce_url( self_admin_url('update.php?action=upgrade-theme&theme=') . $theme_key, 'upgrade-theme_' . $theme_key) );
+		printf(__('There is a new version of %1$s available. <a href="%2$s" class="thickbox" title="%3$s">View version %4$s details</a> or <a href="%5$s">update now</a>.'), $theme['Name'], esc_url($details_url), esc_attr($theme['Name']), $r['new_version'], wp_nonce_url(self_admin_url('update.php?action=upgrade-theme&theme=').$theme_key, 'upgrade-theme_'.$theme_key));
 	}
 	/**
 	 * Fires at the end of the update message container in each
@@ -449,7 +449,7 @@ 
 	 *     @type string $package     Theme update package URL.
 	 * }
 	 */
-	do_action( "in_theme_update_message-{$theme_key}", $theme, $r );
+	do_action("in_theme_update_message-{$theme_key}", $theme, $r);
 
 	echo '</div></td></tr>';
 }
@@ -460,11 +460,11 @@ 
  * @return false|void
  */
 function maintenance_nag() {
-	include( ABSPATH . WPINC . '/version.php' ); // include an unmodified $wp_version
+	include(ABSPATH.WPINC.'/version.php'); // include an unmodified $wp_version
 	global $upgrading;
-	$nag = isset( $upgrading );
-	if ( ! $nag ) {
-		$failed = get_site_option( 'auto_core_update_failed' );
+	$nag = isset($upgrading);
+	if ( ! $nag) {
+		$failed = get_site_option('auto_core_update_failed');
 		/*
 		 * If an update failed critically, we may have copied over version.php but not other files.
 		 * In that case, if the install claims we're running the version we attempted, nag.
@@ -475,16 +475,16 @@ 
 		 *
 		 * This flag is cleared whenever a successful update occurs using Core_Upgrader.
 		 */
-		$comparison = ! empty( $failed['critical'] ) ? '>=' : '>';
-		if ( version_compare( $failed['attempted'], $wp_version, $comparison ) )
+		$comparison = ! empty($failed['critical']) ? '>=' : '>';
+		if (version_compare($failed['attempted'], $wp_version, $comparison))
 			$nag = true;
 	}
 
-	if ( ! $nag )
+	if ( ! $nag)
 		return false;
 
-	if ( current_user_can('update_core') )
-		$msg = sprintf( __('An automated WordPress update has failed to complete - <a href="%s">please attempt the update again now</a>.'), 'update-core.php' );
+	if (current_user_can('update_core'))
+		$msg = sprintf(__('An automated WordPress update has failed to complete - <a href="%s">please attempt the update again now</a>.'), 'update-core.php');
 	else
 		$msg = __('An automated WordPress update has failed to complete! Please notify the site administrator.');
 

Braces +98 added lines, -66 removed lines

@@ -13,10 +13,12 @@ 
  */
 function get_preferred_from_update_core() {
 	$updates = get_core_updates();
-	if ( ! is_array( $updates ) )
-		return false;
-	if ( empty( $updates ) )
-		return (object) array( 'response' => 'latest' );
+	if ( ! is_array( $updates ) ) {
+			return false;
+	}
+	if ( empty( $updates ) ) {
+			return (object) array( 'response' => 'latest' );
+	}
 	return $updates[0];
 }
 
@@ -31,19 +33,22 @@ 
 	$options = array_merge( array( 'available' => true, 'dismissed' => false ), $options );
 	$dismissed = get_site_option( 'dismissed_update_core' );
 
-	if ( ! is_array( $dismissed ) )
-		$dismissed = array();
+	if ( ! is_array( $dismissed ) ) {
+			$dismissed = array();
+	}
 
 	$from_api = get_site_transient( 'update_core' );
 
-	if ( ! isset( $from_api->updates ) || ! is_array( $from_api->updates ) )
-		return false;
+	if ( ! isset( $from_api->updates ) || ! is_array( $from_api->updates ) ) {
+			return false;
+	}
 
 	$updates = $from_api->updates;
 	$result = array();
 	foreach ( $updates as $update ) {
-		if ( $update->response == 'autoupdate' )
-			continue;
+		if ( $update->response == 'autoupdate' ) {
+					continue;
+		}
 
 		if ( array_key_exists( $update->current . '|' . $update->locale, $dismissed ) ) {
 			if ( $options['dismissed'] ) {
@@ -71,22 +76,26 @@ 
  */
 function find_core_auto_update() {
 	$updates = get_site_transient( 'update_core' );
-	if ( ! $updates || empty( $updates->updates ) )
-		return false;
+	if ( ! $updates || empty( $updates->updates ) ) {
+			return false;
+	}
 
 	include_once( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
 
 	$auto_update = false;
 	$upgrader = new WP_Automatic_Updater;
 	foreach ( $updates->updates as $update ) {
-		if ( 'autoupdate' != $update->response )
-			continue;
+		if ( 'autoupdate' != $update->response ) {
+					continue;
+		}
 
-		if ( ! $upgrader->should_update( 'core', $update, ABSPATH ) )
-			continue;
+		if ( ! $upgrader->should_update( 'core', $update, ABSPATH ) ) {
+					continue;
+		}
 
-		if ( ! $auto_update || version_compare( $update->current, $auto_update->current, '>' ) )
-			$auto_update = $update;
+		if ( ! $auto_update || version_compare( $update->current, $auto_update->current, '>' ) ) {
+					$auto_update = $update;
+		}
 	}
 	return $auto_update;
 }
@@ -103,8 +112,9 @@ 
 function get_core_checksums( $version, $locale ) {
 	$url = $http_url = 'http://api.wordpress.org/core/checksums/1.0/?' . http_build_query( compact( 'version', 'locale' ), null, '&' );
 
-	if ( $ssl = wp_http_supports( array( 'ssl' ) ) )
-		$url = set_url_scheme( $url, 'https' );
+	if ( $ssl = wp_http_supports( array( 'ssl' ) ) ) {
+			$url = set_url_scheme( $url, 'https' );
+	}
 
 	$options = array(
 		'timeout' => ( ( defined('DOING_CRON') && DOING_CRON ) ? 30 : 3 ),
@@ -116,14 +126,16 @@ 
 		$response = wp_remote_get( $http_url, $options );
 	}
 
-	if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) )
-		return false;
+	if ( is_wp_error( $response ) || 200 != wp_remote_retrieve_response_code( $response ) ) {
+			return false;
+	}
 
 	$body = trim( wp_remote_retrieve_body( $response ) );
 	$body = json_decode( $body, true );
 
-	if ( ! is_array( $body ) || ! isset( $body['checksums'] ) || ! is_array( $body['checksums'] ) )
-		return false;
+	if ( ! is_array( $body ) || ! isset( $body['checksums'] ) || ! is_array( $body['checksums'] ) ) {
+			return false;
+	}
 
 	return $body['checksums'];
 }
@@ -149,8 +161,9 @@ 
 	$dismissed = get_site_option( 'dismissed_update_core' );
 	$key = $version . '|' . $locale;
 
-	if ( ! isset( $dismissed[$key] ) )
-		return false;
+	if ( ! isset( $dismissed[$key] ) ) {
+			return false;
+	}
 
 	unset( $dismissed[$key] );
 	return update_site_option( 'dismissed_update_core', $dismissed );
@@ -165,13 +178,15 @@ 
 function find_core_update( $version, $locale ) {
 	$from_api = get_site_transient( 'update_core' );
 
-	if ( ! isset( $from_api->updates ) || ! is_array( $from_api->updates ) )
-		return false;
+	if ( ! isset( $from_api->updates ) || ! is_array( $from_api->updates ) ) {
+			return false;
+	}
 
 	$updates = $from_api->updates;
 	foreach ( $updates as $update ) {
-		if ( $update->current == $version && $update->locale == $locale )
-			return $update;
+		if ( $update->current == $version && $update->locale == $locale ) {
+					return $update;
+		}
 	}
 	return false;
 }
@@ -182,21 +197,26 @@ 
  * @return string
  */
 function core_update_footer( $msg = '' ) {
-	if ( !current_user_can('update_core') )
-		return sprintf( __( 'Version %s' ), get_bloginfo( 'version', 'display' ) );
+	if ( !current_user_can('update_core') ) {
+			return sprintf( __( 'Version %s' ), get_bloginfo( 'version', 'display' ) );
+	}
 
 	$cur = get_preferred_from_update_core();
-	if ( ! is_object( $cur ) )
-		$cur = new stdClass;
+	if ( ! is_object( $cur ) ) {
+			$cur = new stdClass;
+	}
 
-	if ( ! isset( $cur->current ) )
-		$cur->current = '';
+	if ( ! isset( $cur->current ) ) {
+			$cur->current = '';
+	}
 
-	if ( ! isset( $cur->url ) )
-		$cur->url = '';
+	if ( ! isset( $cur->url ) ) {
+			$cur->url = '';
+	}
 
-	if ( ! isset( $cur->response ) )
-		$cur->response = '';
+	if ( ! isset( $cur->response ) ) {
+			$cur->response = '';
+	}
 
 	switch ( $cur->response ) {
 	case 'development' :
@@ -217,18 +237,21 @@ 
  * @return false|void
  */
 function update_nag() {
-	if ( is_multisite() && !current_user_can('update_core') )
-		return false;
+	if ( is_multisite() && !current_user_can('update_core') ) {
+			return false;
+	}
 
 	global $pagenow;
 
-	if ( 'update-core.php' == $pagenow )
-		return;
+	if ( 'update-core.php' == $pagenow ) {
+			return;
+	}
 
 	$cur = get_preferred_from_update_core();
 
-	if ( ! isset( $cur->response ) || $cur->response != 'upgrade' )
-		return false;
+	if ( ! isset( $cur->response ) || $cur->response != 'upgrade' ) {
+			return false;
+	}
 
 	if ( current_user_can('update_core') ) {
 		$msg = sprintf( __('<a href="https://codex.wordpress.org/Version_%1$s">WordPress %1$s</a> is available! <a href="%2$s">Please update now</a>.'), $cur->current, network_admin_url( 'update-core.php' ) );
@@ -250,8 +273,9 @@ 
 	if ( current_user_can('update_core') ) {
 		$cur = get_preferred_from_update_core();
 
-		if ( isset( $cur->response ) && $cur->response == 'upgrade' )
-			$msg .= '<a href="' . network_admin_url( 'update-core.php' ) . '" class="button" aria-describedby="wp-version">' . sprintf( __( 'Update to %s' ), $cur->current ? $cur->current : __( 'Latest' ) ) . '</a> ';
+		if ( isset( $cur->response ) && $cur->response == 'upgrade' ) {
+					$msg .= '<a href="' . network_admin_url( 'update-core.php' ) . '" class="button" aria-describedby="wp-version">' . sprintf( __( 'Update to %s' ), $cur->current ? $cur->current : __( 'Latest' ) ) . '</a> ';
+		}
 	}
 
 	$msg .= sprintf( '<span id="wp-version">' . __( 'WordPress %1$s running %2$s theme.' ) . '</span>', get_bloginfo( 'version', 'display' ), $theme_name );
@@ -282,8 +306,9 @@ 
  * @since 2.9.0
  */
 function wp_plugin_update_rows() {
-	if ( !current_user_can('update_plugins' ) )
-		return;
+	if ( !current_user_can('update_plugins' ) ) {
+			return;
+	}
 
 	$plugins = get_site_transient( 'update_plugins' );
 	if ( isset($plugins->response) && is_array($plugins->response) ) {
@@ -302,8 +327,9 @@ 
  */
 function wp_plugin_update_row( $file, $plugin_data ) {
 	$current = get_site_transient( 'update_plugins' );
-	if ( !isset( $current->response[ $file ] ) )
-		return false;
+	if ( !isset( $current->response[ $file ] ) ) {
+			return false;
+	}
 
 	$r = $current->response[ $file ];
 
@@ -378,8 +404,9 @@ 
 function get_theme_updates() {
 	$current = get_site_transient('update_themes');
 
-	if ( ! isset( $current->response ) )
-		return array();
+	if ( ! isset( $current->response ) ) {
+			return array();
+	}
 
 	$update_themes = array();
 	foreach ( $current->response as $stylesheet => $data ) {
@@ -394,8 +421,9 @@ 
  * @since 3.1.0
  */
 function wp_theme_update_rows() {
-	if ( !current_user_can('update_themes' ) )
-		return;
+	if ( !current_user_can('update_themes' ) ) {
+			return;
+	}
 
 	$themes = get_site_transient( 'update_themes' );
 	if ( isset($themes->response) && is_array($themes->response) ) {
@@ -415,8 +443,9 @@ 
  */
 function wp_theme_update_row( $theme_key, $theme ) {
 	$current = get_site_transient( 'update_themes' );
-	if ( !isset( $current->response[ $theme_key ] ) )
-		return false;
+	if ( !isset( $current->response[ $theme_key ] ) ) {
+			return false;
+	}
 	$r = $current->response[ $theme_key ];
 
 	$details_url = add_query_arg( array( 'TB_iframe' => 'true', 'width' => 1024, 'height' => 800 ), $current->response[ $theme_key ]['url'] );
@@ -476,17 +505,20 @@ 
 		 * This flag is cleared whenever a successful update occurs using Core_Upgrader.
 		 */
 		$comparison = ! empty( $failed['critical'] ) ? '>=' : '>';
-		if ( version_compare( $failed['attempted'], $wp_version, $comparison ) )
-			$nag = true;
+		if ( version_compare( $failed['attempted'], $wp_version, $comparison ) ) {
+					$nag = true;
+		}
 	}
 
-	if ( ! $nag )
-		return false;
+	if ( ! $nag ) {
+			return false;
+	}
 
-	if ( current_user_can('update_core') )
-		$msg = sprintf( __('An automated WordPress update has failed to complete - <a href="%s">please attempt the update again now</a>.'), 'update-core.php' );
-	else
-		$msg = __('An automated WordPress update has failed to complete! Please notify the site administrator.');
+	if ( current_user_can('update_core') ) {
+			$msg = sprintf( __('An automated WordPress update has failed to complete - <a href="%s">please attempt the update again now</a>.'), 'update-core.php' );
+	} else {
+			$msg = __('An automated WordPress update has failed to complete! Please notify the site administrator.');
+	}
 
 	echo "<div class='update-nag'>$msg</div>";
 }

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

Indentation +7 added lines, -7 removed lines

@@ -1,12 +1,12 @@
 <?php
 /**
- * Themes List Table class.
- *
- * @package WordPress
- * @subpackage List_Table
- * @since 3.1.0
- * @access private
- */
+	 * Themes List Table class.
+	 *
+	 * @package WordPress
+	 * @subpackage List_Table
+	 * @since 3.1.0
+	 * @access private
+	 */
 class WP_Themes_List_Table extends WP_List_Table {
 
 	protected $search_terms = array();

Spacing +79 added lines, -79 removed lines

@@ -22,11 +22,11 @@ 
 	 *
 	 * @param array $args An associative array of arguments.
 	 */
-	public function __construct( $args = array() ) {
-		parent::__construct( array(
+	public function __construct($args = array()) {
+		parent::__construct(array(
 			'ajax' => true,
-			'screen' => isset( $args['screen'] ) ? $args['screen'] : null,
-		) );
+			'screen' => isset($args['screen']) ? $args['screen'] : null,
+		));
 	}
 
 	/**
@@ -35,85 +35,85 @@ 
 	 */
 	public function ajax_user_can() {
 		// Do not check edit_theme_options here. AJAX calls for available themes require switch_themes.
-		return current_user_can( 'switch_themes' );
+		return current_user_can('switch_themes');
 	}
 
 	/**
 	 * @access public
 	 */
 	public function prepare_items() {
-		$themes = wp_get_themes( array( 'allowed' => true ) );
+		$themes = wp_get_themes(array('allowed' => true));
 
-		if ( ! empty( $_REQUEST['s'] ) )
-			$this->search_terms = array_unique( array_filter( array_map( 'trim', explode( ',', strtolower( wp_unslash( $_REQUEST['s'] ) ) ) ) ) );
+		if ( ! empty($_REQUEST['s']))
+			$this->search_terms = array_unique(array_filter(array_map('trim', explode(',', strtolower(wp_unslash($_REQUEST['s']))))));
 
-		if ( ! empty( $_REQUEST['features'] ) )
+		if ( ! empty($_REQUEST['features']))
 			$this->features = $_REQUEST['features'];
 
-		if ( $this->search_terms || $this->features ) {
-			foreach ( $themes as $key => $theme ) {
-				if ( ! $this->search_theme( $theme ) )
-					unset( $themes[ $key ] );
+		if ($this->search_terms || $this->features) {
+			foreach ($themes as $key => $theme) {
+				if ( ! $this->search_theme($theme))
+					unset($themes[$key]);
 			}
 		}
 
-		unset( $themes[ get_option( 'stylesheet' ) ] );
-		WP_Theme::sort_by_name( $themes );
+		unset($themes[get_option('stylesheet')]);
+		WP_Theme::sort_by_name($themes);
 
 		$per_page = 36;
 		$page = $this->get_pagenum();
 
-		$start = ( $page - 1 ) * $per_page;
+		$start = ($page - 1) * $per_page;
 
-		$this->items = array_slice( $themes, $start, $per_page, true );
+		$this->items = array_slice($themes, $start, $per_page, true);
 
-		$this->set_pagination_args( array(
-			'total_items' => count( $themes ),
+		$this->set_pagination_args(array(
+			'total_items' => count($themes),
 			'per_page' => $per_page,
 			'infinite_scroll' => true,
-		) );
+		));
 	}
 
 	/**
 	 * @access public
 	 */
 	public function no_items() {
-		if ( $this->search_terms || $this->features ) {
-			_e( 'No items found.' );
+		if ($this->search_terms || $this->features) {
+			_e('No items found.');
 			return;
 		}
 
-		if ( is_multisite() ) {
-			if ( current_user_can( 'install_themes' ) && current_user_can( 'manage_network_themes' ) ) {
-				printf( __( 'You only have one theme enabled for this site right now. Visit the Network Admin to <a href="%1$s">enable</a> or <a href="%2$s">install</a> more themes.' ), network_admin_url( 'site-themes.php?id=' . $GLOBALS['blog_id'] ), network_admin_url( 'theme-install.php' ) );
+		if (is_multisite()) {
+			if (current_user_can('install_themes') && current_user_can('manage_network_themes')) {
+				printf(__('You only have one theme enabled for this site right now. Visit the Network Admin to <a href="%1$s">enable</a> or <a href="%2$s">install</a> more themes.'), network_admin_url('site-themes.php?id='.$GLOBALS['blog_id']), network_admin_url('theme-install.php'));
 
 				return;
-			} elseif ( current_user_can( 'manage_network_themes' ) ) {
-				printf( __( 'You only have one theme enabled for this site right now. Visit the Network Admin to <a href="%1$s">enable</a> more themes.' ), network_admin_url( 'site-themes.php?id=' . $GLOBALS['blog_id'] ) );
+			} elseif (current_user_can('manage_network_themes')) {
+				printf(__('You only have one theme enabled for this site right now. Visit the Network Admin to <a href="%1$s">enable</a> more themes.'), network_admin_url('site-themes.php?id='.$GLOBALS['blog_id']));
 
 				return;
 			}
 			// Else, fallthrough. install_themes doesn't help if you can't enable it.
 		} else {
-			if ( current_user_can( 'install_themes' ) ) {
-				printf( __( 'You only have one theme installed right now. Live a little! You can choose from over 1,000 free themes in the WordPress.org Theme Directory at any time: just click on the <a href="%s">Install Themes</a> tab above.' ), admin_url( 'theme-install.php' ) );
+			if (current_user_can('install_themes')) {
+				printf(__('You only have one theme installed right now. Live a little! You can choose from over 1,000 free themes in the WordPress.org Theme Directory at any time: just click on the <a href="%s">Install Themes</a> tab above.'), admin_url('theme-install.php'));
 
 				return;
 			}
 		}
 		// Fallthrough.
-		printf( __( 'Only the current theme is available to you. Contact the %s administrator for information about accessing additional themes.' ), get_site_option( 'site_name' ) );
+		printf(__('Only the current theme is available to you. Contact the %s administrator for information about accessing additional themes.'), get_site_option('site_name'));
 	}
 
 	/**
 	 * @param string $which
 	 */
-	public function tablenav( $which = 'top' ) {
-		if ( $this->get_pagination_arg( 'total_pages' ) <= 1 )
+	public function tablenav($which = 'top') {
+		if ($this->get_pagination_arg('total_pages') <= 1)
 			return;
 		?>
 		<div class="tablenav themes <?php echo $which; ?>">
-			<?php $this->pagination( $which ); ?>
+			<?php $this->pagination($which); ?>
 			<span class="spinner"></span>
 			<br class="clear" />
 		</div>
@@ -124,15 +124,15 @@ 
 	 * @access public
 	 */
 	public function display() {
-		wp_nonce_field( "fetch-list-" . get_class( $this ), '_ajax_fetch_list_nonce' );
+		wp_nonce_field("fetch-list-".get_class($this), '_ajax_fetch_list_nonce');
 ?>
-		<?php $this->tablenav( 'top' ); ?>
+		<?php $this->tablenav('top'); ?>
 
 		<div id="availablethemes">
 			<?php $this->display_rows_or_placeholder(); ?>
 		</div>
 
-		<?php $this->tablenav( 'bottom' ); ?>
+		<?php $this->tablenav('bottom'); ?>
 <?php
 	}
 
@@ -148,7 +148,7 @@ 
 	 * @access public
 	 */
 	public function display_rows_or_placeholder() {
-		if ( $this->has_items() ) {
+		if ($this->has_items()) {
 			$this->display_rows();
 		} else {
 			echo '<div class="no-items">';
@@ -163,7 +163,7 @@ 
 	public function display_rows() {
 		$themes = $this->items;
 
-		foreach ( $themes as $theme ):
+		foreach ($themes as $theme):
 			?><div class="available-theme"><?php
 
 			$template   = $theme->get_template();
@@ -172,64 +172,64 @@ 
 			$version    = $theme->display('Version');
 			$author     = $theme->display('Author');
 
-			$activate_link = wp_nonce_url( "themes.php?action=activate&amp;template=" . urlencode( $template ) . "&amp;stylesheet=" . urlencode( $stylesheet ), 'switch-theme_' . $stylesheet );
+			$activate_link = wp_nonce_url("themes.php?action=activate&amp;template=".urlencode($template)."&amp;stylesheet=".urlencode($stylesheet), 'switch-theme_'.$stylesheet);
 
 			$actions = array();
-			$actions['activate'] = '<a href="' . $activate_link . '" class="activatelink" title="'
-				. esc_attr( sprintf( __( 'Activate &#8220;%s&#8221;' ), $title ) ) . '">' . __( 'Activate' ) . '</a>';
+			$actions['activate'] = '<a href="'.$activate_link.'" class="activatelink" title="'
+				. esc_attr(sprintf(__('Activate &#8220;%s&#8221;'), $title)).'">'.__('Activate').'</a>';
 
-			if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) {
-				$actions['preview'] .= '<a href="' . wp_customize_url( $stylesheet ) . '" class="load-customize hide-if-no-customize">'
-					. __( 'Live Preview' ) . '</a>';
+			if (current_user_can('edit_theme_options') && current_user_can('customize')) {
+				$actions['preview'] .= '<a href="'.wp_customize_url($stylesheet).'" class="load-customize hide-if-no-customize">'
+					. __('Live Preview').'</a>';
 			}
 
-			if ( ! is_multisite() && current_user_can( 'delete_themes' ) )
-				$actions['delete'] = '<a class="submitdelete deletion" href="' . wp_nonce_url( 'themes.php?action=delete&amp;stylesheet=' . urlencode( $stylesheet ), 'delete-theme_' . $stylesheet )
-					. '" onclick="' . "return confirm( '" . esc_js( sprintf( __( "You are about to delete this theme '%s'\n  'Cancel' to stop, 'OK' to delete." ), $title ) )
-					. "' );" . '">' . __( 'Delete' ) . '</a>';
+			if ( ! is_multisite() && current_user_can('delete_themes'))
+				$actions['delete'] = '<a class="submitdelete deletion" href="'.wp_nonce_url('themes.php?action=delete&amp;stylesheet='.urlencode($stylesheet), 'delete-theme_'.$stylesheet)
+					. '" onclick="'."return confirm( '".esc_js(sprintf(__("You are about to delete this theme '%s'\n  'Cancel' to stop, 'OK' to delete."), $title))
+					. "' );".'">'.__('Delete').'</a>';
 
 			/** This filter is documented in wp-admin/includes/class-wp-ms-themes-list-table.php */
-			$actions       = apply_filters( 'theme_action_links', $actions, $theme );
+			$actions       = apply_filters('theme_action_links', $actions, $theme);
 
 			/** This filter is documented in wp-admin/includes/class-wp-ms-themes-list-table.php */
-			$actions       = apply_filters( "theme_action_links_$stylesheet", $actions, $theme );
-			$delete_action = isset( $actions['delete'] ) ? '<div class="delete-theme">' . $actions['delete'] . '</div>' : '';
-			unset( $actions['delete'] );
+			$actions       = apply_filters("theme_action_links_$stylesheet", $actions, $theme);
+			$delete_action = isset($actions['delete']) ? '<div class="delete-theme">'.$actions['delete'].'</div>' : '';
+			unset($actions['delete']);
 
 			?>
 
 			<span class="screenshot hide-if-customize">
-				<?php if ( $screenshot = $theme->get_screenshot() ) : ?>
-					<img src="<?php echo esc_url( $screenshot ); ?>" alt="" />
+				<?php if ($screenshot = $theme->get_screenshot()) : ?>
+					<img src="<?php echo esc_url($screenshot); ?>" alt="" />
 				<?php endif; ?>
 			</span>
-			<a href="<?php echo wp_customize_url( $stylesheet ); ?>" class="screenshot load-customize hide-if-no-customize">
-				<?php if ( $screenshot = $theme->get_screenshot() ) : ?>
-					<img src="<?php echo esc_url( $screenshot ); ?>" alt="" />
+			<a href="<?php echo wp_customize_url($stylesheet); ?>" class="screenshot load-customize hide-if-no-customize">
+				<?php if ($screenshot = $theme->get_screenshot()) : ?>
+					<img src="<?php echo esc_url($screenshot); ?>" alt="" />
 				<?php endif; ?>
 			</a>
 
 			<h3><?php echo $title; ?></h3>
-			<div class="theme-author"><?php printf( __( 'By %s' ), $author ); ?></div>
+			<div class="theme-author"><?php printf(__('By %s'), $author); ?></div>
 			<div class="action-links">
 				<ul>
-					<?php foreach ( $actions as $action ): ?>
+					<?php foreach ($actions as $action): ?>
 						<li><?php echo $action; ?></li>
 					<?php endforeach; ?>
 					<li class="hide-if-no-js"><a href="#" class="theme-detail"><?php _e('Details') ?></a></li>
 				</ul>
 				<?php echo $delete_action; ?>
 
-				<?php theme_update_available( $theme ); ?>
+				<?php theme_update_available($theme); ?>
 			</div>
 
 			<div class="themedetaildiv hide-if-js">
 				<p><strong><?php _e('Version:'); ?></strong> <?php echo $version; ?></p>
 				<p><?php echo $theme->display('Description'); ?></p>
-				<?php if ( $theme->parent() ) {
-					printf( ' <p class="howto">' . __( 'This <a href="%1$s">child theme</a> requires its parent theme, %2$s.' ) . '</p>',
-						__( 'https://codex.wordpress.org/Child_Themes' ),
-						$theme->parent()->display( 'Name' ) );
+				<?php if ($theme->parent()) {
+					printf(' <p class="howto">'.__('This <a href="%1$s">child theme</a> requires its parent theme, %2$s.').'</p>',
+						__('https://codex.wordpress.org/Child_Themes'),
+						$theme->parent()->display('Name'));
 				} ?>
 			</div>
 
@@ -242,29 +242,29 @@ 
 	 * @param WP_Theme $theme
 	 * @return bool
 	 */
-	public function search_theme( $theme ) {
+	public function search_theme($theme) {
 		// Search the features
-		foreach ( $this->features as $word ) {
-			if ( ! in_array( $word, $theme->get('Tags') ) )
+		foreach ($this->features as $word) {
+			if ( ! in_array($word, $theme->get('Tags')))
 				return false;
 		}
 
 		// Match all phrases
-		foreach ( $this->search_terms as $word ) {
-			if ( in_array( $word, $theme->get('Tags') ) )
+		foreach ($this->search_terms as $word) {
+			if (in_array($word, $theme->get('Tags')))
 				continue;
 
-			foreach ( array( 'Name', 'Description', 'Author', 'AuthorURI' ) as $header ) {
+			foreach (array('Name', 'Description', 'Author', 'AuthorURI') as $header) {
 				// Don't mark up; Do translate.
-				if ( false !== stripos( strip_tags( $theme->display( $header, false, true ) ), $word ) ) {
+				if (false !== stripos(strip_tags($theme->display($header, false, true)), $word)) {
 					continue 2;
 				}
 			}
 
-			if ( false !== stripos( $theme->get_stylesheet(), $word ) )
+			if (false !== stripos($theme->get_stylesheet(), $word))
 				continue;
 
-			if ( false !== stripos( $theme->get_template(), $word ) )
+			if (false !== stripos($theme->get_template(), $word))
 				continue;
 
 			return false;
@@ -281,20 +281,20 @@ 
 	 *
 	 * @param array $extra_args
 	 */
-	public function _js_vars( $extra_args = array() ) {
-		$search_string = isset( $_REQUEST['s'] ) ? esc_attr( wp_unslash( $_REQUEST['s'] ) ) : '';
+	public function _js_vars($extra_args = array()) {
+		$search_string = isset($_REQUEST['s']) ? esc_attr(wp_unslash($_REQUEST['s'])) : '';
 
 		$args = array(
 			'search' => $search_string,
 			'features' => $this->features,
 			'paged' => $this->get_pagenum(),
-			'total_pages' => ! empty( $this->_pagination_args['total_pages'] ) ? $this->_pagination_args['total_pages'] : 1,
+			'total_pages' => ! empty($this->_pagination_args['total_pages']) ? $this->_pagination_args['total_pages'] : 1,
 		);
 
-		if ( is_array( $extra_args ) )
-			$args = array_merge( $args, $extra_args );
+		if (is_array($extra_args))
+			$args = array_merge($args, $extra_args);
 
-		printf( "<script type='text/javascript'>var theme_list_args = %s;</script>\n", wp_json_encode( $args ) );
+		printf("<script type='text/javascript'>var theme_list_args = %s;</script>\n", wp_json_encode($args));
 		parent::_js_vars();
 	}
 }

Braces +30 added lines, -20 removed lines

@@ -44,16 +44,19 @@ 
 	public function prepare_items() {
 		$themes = wp_get_themes( array( 'allowed' => true ) );
 
-		if ( ! empty( $_REQUEST['s'] ) )
-			$this->search_terms = array_unique( array_filter( array_map( 'trim', explode( ',', strtolower( wp_unslash( $_REQUEST['s'] ) ) ) ) ) );
+		if ( ! empty( $_REQUEST['s'] ) ) {
+					$this->search_terms = array_unique( array_filter( array_map( 'trim', explode( ',', strtolower( wp_unslash( $_REQUEST['s'] ) ) ) ) ) );
+		}
 
-		if ( ! empty( $_REQUEST['features'] ) )
-			$this->features = $_REQUEST['features'];
+		if ( ! empty( $_REQUEST['features'] ) ) {
+					$this->features = $_REQUEST['features'];
+		}
 
 		if ( $this->search_terms || $this->features ) {
 			foreach ( $themes as $key => $theme ) {
-				if ( ! $this->search_theme( $theme ) )
-					unset( $themes[ $key ] );
+				if ( ! $this->search_theme( $theme ) ) {
+									unset( $themes[ $key ] );
+				}
 			}
 		}
 
@@ -109,8 +112,9 @@ 
 	 * @param string $which
 	 */
 	public function tablenav( $which = 'top' ) {
-		if ( $this->get_pagination_arg( 'total_pages' ) <= 1 )
-			return;
+		if ( $this->get_pagination_arg( 'total_pages' ) <= 1 ) {
+					return;
+		}
 		?>
 		<div class="tablenav themes <?php echo $which; ?>">
 			<?php $this->pagination( $which ); ?>
@@ -183,10 +187,11 @@ 
 					. __( 'Live Preview' ) . '</a>';
 			}
 
-			if ( ! is_multisite() && current_user_can( 'delete_themes' ) )
-				$actions['delete'] = '<a class="submitdelete deletion" href="' . wp_nonce_url( 'themes.php?action=delete&amp;stylesheet=' . urlencode( $stylesheet ), 'delete-theme_' . $stylesheet )
+			if ( ! is_multisite() && current_user_can( 'delete_themes' ) ) {
+							$actions['delete'] = '<a class="submitdelete deletion" href="' . wp_nonce_url( 'themes.php?action=delete&amp;stylesheet=' . urlencode( $stylesheet ), 'delete-theme_' . $stylesheet )
 					. '" onclick="' . "return confirm( '" . esc_js( sprintf( __( "You are about to delete this theme '%s'\n  'Cancel' to stop, 'OK' to delete." ), $title ) )
 					. "' );" . '">' . __( 'Delete' ) . '</a>';
+			}
 
 			/** This filter is documented in wp-admin/includes/class-wp-ms-themes-list-table.php */
 			$actions       = apply_filters( 'theme_action_links', $actions, $theme );
@@ -245,14 +250,16 @@ 
 	public function search_theme( $theme ) {
 		// Search the features
 		foreach ( $this->features as $word ) {
-			if ( ! in_array( $word, $theme->get('Tags') ) )
-				return false;
+			if ( ! in_array( $word, $theme->get('Tags') ) ) {
+							return false;
+			}
 		}
 
 		// Match all phrases
 		foreach ( $this->search_terms as $word ) {
-			if ( in_array( $word, $theme->get('Tags') ) )
-				continue;
+			if ( in_array( $word, $theme->get('Tags') ) ) {
+							continue;
+			}
 
 			foreach ( array( 'Name', 'Description', 'Author', 'AuthorURI' ) as $header ) {
 				// Don't mark up; Do translate.
@@ -261,11 +268,13 @@ 
 				}
 			}
 
-			if ( false !== stripos( $theme->get_stylesheet(), $word ) )
-				continue;
+			if ( false !== stripos( $theme->get_stylesheet(), $word ) ) {
+							continue;
+			}
 
-			if ( false !== stripos( $theme->get_template(), $word ) )
-				continue;
+			if ( false !== stripos( $theme->get_template(), $word ) ) {
+							continue;
+			}
 
 			return false;
 		}
@@ -291,8 +300,9 @@ 
 			'total_pages' => ! empty( $this->_pagination_args['total_pages'] ) ? $this->_pagination_args['total_pages'] : 1,
 		);
 
-		if ( is_array( $extra_args ) )
-			$args = array_merge( $args, $extra_args );
+		if ( is_array( $extra_args ) ) {
+					$args = array_merge( $args, $extra_args );
+		}
 
 		printf( "<script type='text/javascript'>var theme_list_args = %s;</script>\n", wp_json_encode( $args ) );
 		parent::_js_vars();

src/wp-admin/includes/import.php

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * WordPress Administration Importer API.
- *
- * @package WordPress
- * @subpackage Administration
- */
+	 * WordPress Administration Importer API.
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 */
 
 /**
  * Retrieve list of importers.

Spacing +48 added lines, -48 removed lines

@@ -16,8 +16,8 @@ 
  */
 function get_importers() {
 	global $wp_importers;
-	if ( is_array( $wp_importers ) ) {
-		uasort( $wp_importers, '_usort_by_first_member' );
+	if (is_array($wp_importers)) {
+		uasort($wp_importers, '_usort_by_first_member');
 	}
 	return $wp_importers;
 }
@@ -34,8 +34,8 @@ 
  * @param array $b
  * @return int
  */
-function _usort_by_first_member( $a, $b ) {
-	return strnatcasecmp( $a[0], $b[0] );
+function _usort_by_first_member($a, $b) {
+	return strnatcasecmp($a[0], $b[0]);
 }
 
 /**
@@ -51,11 +51,11 @@ 
  * @param callback $callback    Callback to run.
  * @return WP_Error Returns WP_Error when $callback is WP_Error.
  */
-function register_importer( $id, $name, $description, $callback ) {
+function register_importer($id, $name, $description, $callback) {
 	global $wp_importers;
-	if ( is_wp_error( $callback ) )
+	if (is_wp_error($callback))
 		return $callback;
-	$wp_importers[$id] = array ( $name, $description, $callback );
+	$wp_importers[$id] = array($name, $description, $callback);
 }
 
 /**
@@ -67,8 +67,8 @@ 
  *
  * @param string $id Importer ID.
  */
-function wp_import_cleanup( $id ) {
-	wp_delete_attachment( $id );
+function wp_import_cleanup($id) {
+	wp_delete_attachment($id);
 }
 
 /**
@@ -79,23 +79,23 @@ 
  * @return array Uploaded file's details on success, error message on failure
  */
 function wp_import_handle_upload() {
-	if ( ! isset( $_FILES['import'] ) ) {
+	if ( ! isset($_FILES['import'])) {
 		return array(
-			'error' => __( 'File is empty. Please upload something more substantial. This error could also be caused by uploads being disabled in your php.ini or by post_max_size being defined as smaller than upload_max_filesize in php.ini.' )
+			'error' => __('File is empty. Please upload something more substantial. This error could also be caused by uploads being disabled in your php.ini or by post_max_size being defined as smaller than upload_max_filesize in php.ini.')
 		);
 	}
 
-	$overrides = array( 'test_form' => false, 'test_type' => false );
+	$overrides = array('test_form' => false, 'test_type' => false);
 	$_FILES['import']['name'] .= '.txt';
-	$upload = wp_handle_upload( $_FILES['import'], $overrides );
+	$upload = wp_handle_upload($_FILES['import'], $overrides);
 
-	if ( isset( $upload['error'] ) ) {
+	if (isset($upload['error'])) {
 		return $upload;
 	}
 
 	// Construct the object array
 	$object = array(
-		'post_title' => basename( $upload['file'] ),
+		'post_title' => basename($upload['file']),
 		'post_content' => $upload['url'],
 		'post_mime_type' => $upload['type'],
 		'guid' => $upload['url'],
@@ -104,15 +104,15 @@ 
 	);
 
 	// Save the data
-	$id = wp_insert_attachment( $object, $upload['file'] );
+	$id = wp_insert_attachment($object, $upload['file']);
 
 	/*
 	 * Schedule a cleanup for one day from now in case of failed
 	 * import or missing wp_import_cleanup() call.
 	 */
-	wp_schedule_single_event( time() + DAY_IN_SECONDS, 'importer_scheduled_cleanup', array( $id ) );
+	wp_schedule_single_event(time() + DAY_IN_SECONDS, 'importer_scheduled_cleanup', array($id));
 
-	return array( 'file' => $upload['file'], 'id' => $id );
+	return array('file' => $upload['file'], 'id' => $id);
 }
 
 /**
@@ -123,32 +123,32 @@ 
  * @return array Importers with metadata for each.
  */
 function wp_get_popular_importers() {
-	include( ABSPATH . WPINC . '/version.php' ); // include an unmodified $wp_version
+	include(ABSPATH.WPINC.'/version.php'); // include an unmodified $wp_version
 
 	$locale = get_locale();
-	$popular_importers = get_site_transient( 'popular_importers_' . $locale );
+	$popular_importers = get_site_transient('popular_importers_'.$locale);
 
-	if ( ! $popular_importers ) {
-		$url = add_query_arg( 'locale', get_locale(), 'http://api.wordpress.org/core/importers/1.1/' );
-		$options = array( 'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url() );
-		$response = wp_remote_get( $url, $options );
-		$popular_importers = json_decode( wp_remote_retrieve_body( $response ), true );
+	if ( ! $popular_importers) {
+		$url = add_query_arg('locale', get_locale(), 'http://api.wordpress.org/core/importers/1.1/');
+		$options = array('user-agent' => 'WordPress/'.$wp_version.'; '.home_url());
+		$response = wp_remote_get($url, $options);
+		$popular_importers = json_decode(wp_remote_retrieve_body($response), true);
 
-		if ( is_array( $popular_importers ) )
-			set_site_transient( 'popular_importers_' . $locale, $popular_importers, 2 * DAY_IN_SECONDS );
+		if (is_array($popular_importers))
+			set_site_transient('popular_importers_'.$locale, $popular_importers, 2 * DAY_IN_SECONDS);
 		else
 			$popular_importers = false;
 	}
 
-	if ( is_array( $popular_importers ) ) {
+	if (is_array($popular_importers)) {
 		// If the data was received as translated, return it as-is.
-		if ( $popular_importers['translated'] )
+		if ($popular_importers['translated'])
 			return $popular_importers['importers'];
 
-		foreach ( $popular_importers['importers'] as &$importer ) {
-			$importer['description'] = translate( $importer['description'] );
-			if ( $importer['name'] != 'WordPress' )
-				$importer['name'] = translate( $importer['name'] );
+		foreach ($popular_importers['importers'] as &$importer) {
+			$importer['description'] = translate($importer['description']);
+			if ($importer['name'] != 'WordPress')
+				$importer['name'] = translate($importer['name']);
 		}
 		return $popular_importers['importers'];
 	}
@@ -156,50 +156,50 @@ 
 	return array(
 		// slug => name, description, plugin slug, and register_importer() slug
 		'blogger' => array(
-			'name' => __( 'Blogger' ),
-			'description' => __( 'Install the Blogger importer to import posts, comments, and users from a Blogger blog.' ),
+			'name' => __('Blogger'),
+			'description' => __('Install the Blogger importer to import posts, comments, and users from a Blogger blog.'),
 			'plugin-slug' => 'blogger-importer',
 			'importer-id' => 'blogger',
 		),
 		'wpcat2tag' => array(
-			'name' => __( 'Categories and Tags Converter' ),
-			'description' => __( 'Install the category/tag converter to convert existing categories to tags or tags to categories, selectively.' ),
+			'name' => __('Categories and Tags Converter'),
+			'description' => __('Install the category/tag converter to convert existing categories to tags or tags to categories, selectively.'),
 			'plugin-slug' => 'wpcat2tag-importer',
 			'importer-id' => 'wp-cat2tag',
 		),
 		'livejournal' => array(
-			'name' => __( 'LiveJournal' ),
-			'description' => __( 'Install the LiveJournal importer to import posts from LiveJournal using their API.' ),
+			'name' => __('LiveJournal'),
+			'description' => __('Install the LiveJournal importer to import posts from LiveJournal using their API.'),
 			'plugin-slug' => 'livejournal-importer',
 			'importer-id' => 'livejournal',
 		),
 		'movabletype' => array(
-			'name' => __( 'Movable Type and TypePad' ),
-			'description' => __( 'Install the Movable Type importer to import posts and comments from a Movable Type or TypePad blog.' ),
+			'name' => __('Movable Type and TypePad'),
+			'description' => __('Install the Movable Type importer to import posts and comments from a Movable Type or TypePad blog.'),
 			'plugin-slug' => 'movabletype-importer',
 			'importer-id' => 'mt',
 		),
 		'opml' => array(
-			'name' => __( 'Blogroll' ),
-			'description' => __( 'Install the blogroll importer to import links in OPML format.' ),
+			'name' => __('Blogroll'),
+			'description' => __('Install the blogroll importer to import links in OPML format.'),
 			'plugin-slug' => 'opml-importer',
 			'importer-id' => 'opml',
 		),
 		'rss' => array(
-			'name' => __( 'RSS' ),
-			'description' => __( 'Install the RSS importer to import posts from an RSS feed.' ),
+			'name' => __('RSS'),
+			'description' => __('Install the RSS importer to import posts from an RSS feed.'),
 			'plugin-slug' => 'rss-importer',
 			'importer-id' => 'rss',
 		),
 		'tumblr' => array(
-			'name' => __( 'Tumblr' ),
-			'description' => __( 'Install the Tumblr importer to import posts & media from Tumblr using their API.' ),
+			'name' => __('Tumblr'),
+			'description' => __('Install the Tumblr importer to import posts & media from Tumblr using their API.'),
 			'plugin-slug' => 'tumblr-importer',
 			'importer-id' => 'tumblr',
 		),
 		'wordpress' => array(
 			'name' => 'WordPress',
-			'description' => __( 'Install the WordPress importer to import posts, pages, comments, custom fields, categories, and tags from a WordPress export file.' ),
+			'description' => __('Install the WordPress importer to import posts, pages, comments, custom fields, categories, and tags from a WordPress export file.'),
 			'plugin-slug' => 'wordpress-importer',
 			'importer-id' => 'wordpress',
 		),

Braces +14 added lines, -10 removed lines

@@ -53,8 +53,9 @@ 
  */
 function register_importer( $id, $name, $description, $callback ) {
 	global $wp_importers;
-	if ( is_wp_error( $callback ) )
-		return $callback;
+	if ( is_wp_error( $callback ) ) {
+			return $callback;
+	}
 	$wp_importers[$id] = array ( $name, $description, $callback );
 }
 
@@ -134,21 +135,24 @@ 
 		$response = wp_remote_get( $url, $options );
 		$popular_importers = json_decode( wp_remote_retrieve_body( $response ), true );
 
-		if ( is_array( $popular_importers ) )
-			set_site_transient( 'popular_importers_' . $locale, $popular_importers, 2 * DAY_IN_SECONDS );
-		else
-			$popular_importers = false;
+		if ( is_array( $popular_importers ) ) {
+					set_site_transient( 'popular_importers_' . $locale, $popular_importers, 2 * DAY_IN_SECONDS );
+		} else {
+					$popular_importers = false;
+		}
 	}
 
 	if ( is_array( $popular_importers ) ) {
 		// If the data was received as translated, return it as-is.
-		if ( $popular_importers['translated'] )
-			return $popular_importers['importers'];
+		if ( $popular_importers['translated'] ) {
+					return $popular_importers['importers'];
+		}
 
 		foreach ( $popular_importers['importers'] as &$importer ) {
 			$importer['description'] = translate( $importer['description'] );
-			if ( $importer['name'] != 'WordPress' )
-				$importer['name'] = translate( $importer['name'] );
+			if ( $importer['name'] != 'WordPress' ) {
+							$importer['name'] = translate( $importer['name'] );
+			}
 		}
 		return $popular_importers['importers'];
 	}