ntwb / wordpress

src/wp-admin/includes/comment.php

Braces +40 added lines, -28 removed lines

@@ -33,21 +33,28 @@ 
  * @since 2.0.0
  */
 function edit_comment() {
-	if ( ! current_user_can( 'edit_comment', (int) $_POST['comment_ID'] ) )
-		wp_die ( __( 'You are not allowed to edit comments on this post.' ) );
-
-	if ( isset( $_POST['newcomment_author'] ) )
-		$_POST['comment_author'] = $_POST['newcomment_author'];
-	if ( isset( $_POST['newcomment_author_email'] ) )
-		$_POST['comment_author_email'] = $_POST['newcomment_author_email'];
-	if ( isset( $_POST['newcomment_author_url'] ) )
-		$_POST['comment_author_url'] = $_POST['newcomment_author_url'];
-	if ( isset( $_POST['comment_status'] ) )
-		$_POST['comment_approved'] = $_POST['comment_status'];
-	if ( isset( $_POST['content'] ) )
-		$_POST['comment_content'] = $_POST['content'];
-	if ( isset( $_POST['comment_ID'] ) )
-		$_POST['comment_ID'] = (int) $_POST['comment_ID'];
+	if ( ! current_user_can( 'edit_comment', (int) $_POST['comment_ID'] ) ) {
+			wp_die ( __( 'You are not allowed to edit comments on this post.' ) );
+	}
+
+	if ( isset( $_POST['newcomment_author'] ) ) {
+			$_POST['comment_author'] = $_POST['newcomment_author'];
+	}
+	if ( isset( $_POST['newcomment_author_email'] ) ) {
+			$_POST['comment_author_email'] = $_POST['newcomment_author_email'];
+	}
+	if ( isset( $_POST['newcomment_author_url'] ) ) {
+			$_POST['comment_author_url'] = $_POST['newcomment_author_url'];
+	}
+	if ( isset( $_POST['comment_status'] ) ) {
+			$_POST['comment_approved'] = $_POST['comment_status'];
+	}
+	if ( isset( $_POST['content'] ) ) {
+			$_POST['comment_content'] = $_POST['content'];
+	}
+	if ( isset( $_POST['comment_ID'] ) ) {
+			$_POST['comment_ID'] = (int) $_POST['comment_ID'];
+	}
 
 	foreach ( array ('aa', 'mm', 'jj', 'hh', 'mn') as $timeunit ) {
 		if ( !empty( $_POST['hidden_' . $timeunit] ) && $_POST['hidden_' . $timeunit] != $_POST[$timeunit] ) {
@@ -82,8 +89,9 @@ 
  * @return object|false Comment if found. False on failure.
  */
 function get_comment_to_edit( $id ) {
-	if ( !$comment = get_comment($id) )
-		return false;
+	if ( !$comment = get_comment($id) ) {
+			return false;
+	}
 
 	$comment->comment_ID = (int) $comment->comment_ID;
 	$comment->comment_post_ID = (int) $comment->comment_post_ID;
@@ -132,21 +140,24 @@ 
 	$pending = $wpdb->get_results( "SELECT comment_post_ID, COUNT(comment_ID) as num_comments FROM $wpdb->comments WHERE comment_post_ID IN ( $post_id_in ) AND comment_approved = '0' GROUP BY comment_post_ID", ARRAY_A );
 
 	if ( $single ) {
-		if ( empty($pending) )
-			return 0;
-		else
-			return absint($pending[0]['num_comments']);
+		if ( empty($pending) ) {
+					return 0;
+		} else {
+					return absint($pending[0]['num_comments']);
+		}
 	}
 
 	$pending_keyed = array();
 
 	// Default to zero pending for all posts in request
-	foreach ( $post_id_array as $id )
-		$pending_keyed[$id] = 0;
+	foreach ( $post_id_array as $id ) {
+			$pending_keyed[$id] = 0;
+	}
 
-	if ( !empty($pending) )
-		foreach ( $pending as $pend )
+	if ( !empty($pending) ) {
+			foreach ( $pending as $pend )
 			$pending_keyed[$pend['comment_post_ID']] = absint($pend['num_comments']);
+	}
 
 	return $pending_keyed;
 }
@@ -171,6 +182,7 @@ 
  * @since 2.7.0
  */
 function enqueue_comment_hotkeys_js() {
-	if ( 'true' == get_user_option( 'comment_shortcuts' ) )
-		wp_enqueue_script( 'jquery-table-hotkeys' );
-}
+	if ( 'true' == get_user_option( 'comment_shortcuts' ) ) {
+			wp_enqueue_script( 'jquery-table-hotkeys' );
+	}
+	}

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * WordPress Comment Administration API.
- *
- * @package WordPress
- * @subpackage Administration
- * @since 2.3.0
- */
+	 * WordPress Comment Administration API.
+	 *
+	 * @package WordPress
+	 * @subpackage Administration
+	 * @since 2.3.0
+	 */
 
 /**
  * Determine if a comment exists based on author and date.

Spacing +44 added lines, -44 removed lines

@@ -24,19 +24,19 @@ 
  *
  * @return mixed Comment post ID on success.
  */
-function comment_exists( $comment_author, $comment_date, $timezone = 'blog' ) {
+function comment_exists($comment_author, $comment_date, $timezone = 'blog') {
 	global $wpdb;
 
 	$date_field = 'comment_date';
-	if ( 'gmt' === $timezone ) {
+	if ('gmt' === $timezone) {
 		$date_field = 'comment_date_gmt';
 	}
 
-	return $wpdb->get_var( $wpdb->prepare("SELECT comment_post_ID FROM $wpdb->comments
+	return $wpdb->get_var($wpdb->prepare("SELECT comment_post_ID FROM $wpdb->comments
 			WHERE comment_author = %s AND $date_field = %s",
-			stripslashes( $comment_author ),
-			stripslashes( $comment_date )
-	) );
+			stripslashes($comment_author),
+			stripslashes($comment_date)
+	));
 }
 
 /**
@@ -45,44 +45,44 @@ 
  * @since 2.0.0
  */
 function edit_comment() {
-	if ( ! current_user_can( 'edit_comment', (int) $_POST['comment_ID'] ) )
-		wp_die ( __( 'You are not allowed to edit comments on this post.' ) );
+	if ( ! current_user_can('edit_comment', (int) $_POST['comment_ID']))
+		wp_die(__('You are not allowed to edit comments on this post.'));
 
-	if ( isset( $_POST['newcomment_author'] ) )
+	if (isset($_POST['newcomment_author']))
 		$_POST['comment_author'] = $_POST['newcomment_author'];
-	if ( isset( $_POST['newcomment_author_email'] ) )
+	if (isset($_POST['newcomment_author_email']))
 		$_POST['comment_author_email'] = $_POST['newcomment_author_email'];
-	if ( isset( $_POST['newcomment_author_url'] ) )
+	if (isset($_POST['newcomment_author_url']))
 		$_POST['comment_author_url'] = $_POST['newcomment_author_url'];
-	if ( isset( $_POST['comment_status'] ) )
+	if (isset($_POST['comment_status']))
 		$_POST['comment_approved'] = $_POST['comment_status'];
-	if ( isset( $_POST['content'] ) )
+	if (isset($_POST['content']))
 		$_POST['comment_content'] = $_POST['content'];
-	if ( isset( $_POST['comment_ID'] ) )
+	if (isset($_POST['comment_ID']))
 		$_POST['comment_ID'] = (int) $_POST['comment_ID'];
 
-	foreach ( array ('aa', 'mm', 'jj', 'hh', 'mn') as $timeunit ) {
-		if ( !empty( $_POST['hidden_' . $timeunit] ) && $_POST['hidden_' . $timeunit] != $_POST[$timeunit] ) {
+	foreach (array('aa', 'mm', 'jj', 'hh', 'mn') as $timeunit) {
+		if ( ! empty($_POST['hidden_'.$timeunit]) && $_POST['hidden_'.$timeunit] != $_POST[$timeunit]) {
 			$_POST['edit_date'] = '1';
 			break;
 		}
 	}
 
-	if ( !empty ( $_POST['edit_date'] ) ) {
+	if ( ! empty ($_POST['edit_date'])) {
 		$aa = $_POST['aa'];
 		$mm = $_POST['mm'];
 		$jj = $_POST['jj'];
 		$hh = $_POST['hh'];
 		$mn = $_POST['mn'];
 		$ss = $_POST['ss'];
-		$jj = ($jj > 31 ) ? 31 : $jj;
-		$hh = ($hh > 23 ) ? $hh -24 : $hh;
-		$mn = ($mn > 59 ) ? $mn -60 : $mn;
-		$ss = ($ss > 59 ) ? $ss -60 : $ss;
+		$jj = ($jj > 31) ? 31 : $jj;
+		$hh = ($hh > 23) ? $hh - 24 : $hh;
+		$mn = ($mn > 59) ? $mn - 60 : $mn;
+		$ss = ($ss > 59) ? $ss - 60 : $ss;
 		$_POST['comment_date'] = "$aa-$mm-$jj $hh:$mn:$ss";
 	}
 
-	wp_update_comment( $_POST );
+	wp_update_comment($_POST);
 }
 
 /**
@@ -93,14 +93,14 @@ 
  * @param int $id ID of comment to retrieve.
  * @return WP_Comment|false Comment if found. False on failure.
  */
-function get_comment_to_edit( $id ) {
-	if ( !$comment = get_comment($id) )
+function get_comment_to_edit($id) {
+	if ( ! $comment = get_comment($id))
 		return false;
 
 	$comment->comment_ID = (int) $comment->comment_ID;
 	$comment->comment_post_ID = (int) $comment->comment_post_ID;
 
-	$comment->comment_content = format_to_edit( $comment->comment_content );
+	$comment->comment_content = format_to_edit($comment->comment_content);
 	/**
 	 * Filter the comment content before editing.
 	 *
@@ -108,11 +108,11 @@ 
 	 *
 	 * @param string $comment->comment_content Comment content.
 	 */
-	$comment->comment_content = apply_filters( 'comment_edit_pre', $comment->comment_content );
+	$comment->comment_content = apply_filters('comment_edit_pre', $comment->comment_content);
 
-	$comment->comment_author = format_to_edit( $comment->comment_author );
-	$comment->comment_author_email = format_to_edit( $comment->comment_author_email );
-	$comment->comment_author_url = format_to_edit( $comment->comment_author_url );
+	$comment->comment_author = format_to_edit($comment->comment_author);
+	$comment->comment_author_email = format_to_edit($comment->comment_author_email);
+	$comment->comment_author_url = format_to_edit($comment->comment_author_url);
 	$comment->comment_author_url = esc_url($comment->comment_author_url);
 
 	return $comment;
@@ -128,23 +128,23 @@ 
  * @param int|array $post_id Either a single Post ID or an array of Post IDs
  * @return int|array Either a single Posts pending comments as an int or an array of ints keyed on the Post IDs
  */
-function get_pending_comments_num( $post_id ) {
+function get_pending_comments_num($post_id) {
 	global $wpdb;
 
 	$single = false;
-	if ( !is_array($post_id) ) {
+	if ( ! is_array($post_id)) {
 		$post_id_array = (array) $post_id;
 		$single = true;
 	} else {
 		$post_id_array = $post_id;
 	}
 	$post_id_array = array_map('intval', $post_id_array);
-	$post_id_in = "'" . implode("', '", $post_id_array) . "'";
+	$post_id_in = "'".implode("', '", $post_id_array)."'";
 
-	$pending = $wpdb->get_results( "SELECT comment_post_ID, COUNT(comment_ID) as num_comments FROM $wpdb->comments WHERE comment_post_ID IN ( $post_id_in ) AND comment_approved = '0' GROUP BY comment_post_ID", ARRAY_A );
+	$pending = $wpdb->get_results("SELECT comment_post_ID, COUNT(comment_ID) as num_comments FROM $wpdb->comments WHERE comment_post_ID IN ( $post_id_in ) AND comment_approved = '0' GROUP BY comment_post_ID", ARRAY_A);
 
-	if ( $single ) {
-		if ( empty($pending) )
+	if ($single) {
+		if (empty($pending))
 			return 0;
 		else
 			return absint($pending[0]['num_comments']);
@@ -153,11 +153,11 @@ 
 	$pending_keyed = array();
 
 	// Default to zero pending for all posts in request
-	foreach ( $post_id_array as $id )
+	foreach ($post_id_array as $id)
 		$pending_keyed[$id] = 0;
 
-	if ( !empty($pending) )
-		foreach ( $pending as $pend )
+	if ( ! empty($pending))
+		foreach ($pending as $pend)
 			$pending_keyed[$pend['comment_post_ID']] = absint($pend['num_comments']);
 
 	return $pending_keyed;
@@ -171,8 +171,8 @@ 
  * @param string $name User name.
  * @return string Avatar with Admin name.
  */
-function floated_admin_avatar( $name ) {
-	$avatar = get_avatar( get_comment(), 32, 'mystery' );
+function floated_admin_avatar($name) {
+	$avatar = get_avatar(get_comment(), 32, 'mystery');
 	return "$avatar $name";
 }
 
@@ -180,8 +180,8 @@ 
  * @since 2.7.0
  */
 function enqueue_comment_hotkeys_js() {
-	if ( 'true' == get_user_option( 'comment_shortcuts' ) )
-		wp_enqueue_script( 'jquery-table-hotkeys' );
+	if ('true' == get_user_option('comment_shortcuts'))
+		wp_enqueue_script('jquery-table-hotkeys');
 }
 
 /**
@@ -189,8 +189,8 @@ 
  *
  * @param string $msg Error Message. Assumed to contain HTML and be sanitized.
  */
-function comment_footer_die( $msg ) {
+function comment_footer_die($msg) {
 	echo "<div class='wrap'><p>$msg</p></div>";
-	include( ABSPATH . 'wp-admin/admin-footer.php' );
+	include(ABSPATH.'wp-admin/admin-footer.php');
 	die;
 }
\ No newline at end of file

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()),

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 ) ) {

Spacing +41 added lines, -41 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,10 +142,10 @@ 
 ?>
 <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' ); ?>
-	<label class="screen-reader-text" for="themezip"><?php _e( 'Theme zip file' ); ?></label>
+	<?php wp_nonce_field('theme-upload'); ?>
+	<label class="screen-reader-text" for="themezip"><?php _e('Theme zip file'); ?></label>
 	<input type="file" id="themezip" name="themezip" />
-	<?php submit_button( __( 'Install Now' ), 'button', 'install-theme-submit', false ); ?>
+	<?php submit_button(__('Install Now'), 'button', 'install-theme-submit', false); ?>
 </form>
 	<?php
 }
@@ -159,14 +159,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);
 }
 
 /**
@@ -179,7 +179,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();
@@ -197,16 +197,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;
 }

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.

Doc Comments +1 added lines, -1 removed lines

@@ -1372,7 +1372,7 @@
  * @global array $_wp_additional_image_sizes
  *
  * @param int $thumbnail_id ID of the attachment used for thumbnail
- * @param mixed $post The post ID or object associated with the thumbnail, defaults to global $post.
+ * @param integer $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 ) {

Spacing +507 added lines, -507 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);
 }
 
 /**
@@ -581,24 +581,24 @@ 
  * @param bool   $create_in_db Optional. Whether to insert the post into database. Default false.
  * @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;
@@ -611,14 +611,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);
 	}
 
 	/**
@@ -629,7 +629,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.
@@ -639,7 +639,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.
@@ -649,7 +649,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;
 }
@@ -669,30 +669,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;
 }
@@ -707,63 +707,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;
 }
@@ -777,8 +777,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;
 }
@@ -795,32 +795,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;
@@ -834,8 +834,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);
 }
 
 /**
@@ -850,11 +850,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;
 }
@@ -867,8 +867,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);
 }
 
 /**
@@ -881,12 +881,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);
 }
 
 /**
@@ -899,11 +899,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);
 }
 
 //
@@ -919,42 +919,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);
@@ -985,40 +985,40 @@ 
  * @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;
 
 	/**
@@ -1034,7 +1034,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".
@@ -1044,12 +1044,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;
@@ -1057,10 +1057,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;
 }
@@ -1091,24 +1091,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;
 	}
 
@@ -1119,21 +1119,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;
 	}
 
@@ -1149,13 +1149,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);
 }
 
 /**
@@ -1167,17 +1167,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('');
 	}
 
 	/**
@@ -1190,8 +1190,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);
 }
 
 /**
@@ -1205,9 +1205,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);
 
@@ -1216,14 +1216,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);
@@ -1236,23 +1236,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, $post );
-		if ( !empty($uri) )
+		$uri = apply_filters('editable_slug', $uri, $post);
+		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, $post ) );
+	$permalink = array($permalink, apply_filters('editable_slug', $post->post_name, $post));
 	$post->post_status = $original_status;
 	$post->post_date = $original_date;
 	$post->post_name = $original_name;
@@ -1269,7 +1269,7 @@ 
 	 * @param string  $name      Post name (slug).
 	 * @param WP_Post $post      Post object.
 	 */
-	return apply_filters( 'get_sample_permalink', $permalink, $post->ID, $title, $name, $post );
+	return apply_filters('get_sample_permalink', $permalink, $post->ID, $title, $name, $post);
 }
 
 /**
@@ -1282,9 +1282,9 @@ 
  * @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);
@@ -1292,58 +1292,58 @@ 
 	$view_link = false;
 	$preview_target = '';
 
-	if ( current_user_can( 'read_post', $post->ID ) ) {
-		if ( 'draft' === $post->post_status ) {
-			$view_link = get_preview_post_link( $post );
+	if (current_user_can('read_post', $post->ID)) {
+		if ('draft' === $post->post_status) {
+			$view_link = get_preview_post_link($post);
 			$preview_target = " target='wp-preview-{$post->ID}'";
 		} else {
-			if ( 'publish' === $post->post_status || 'attachment' === $post->post_type ) {
-				$view_link = get_permalink( $post );
+			if ('publish' === $post->post_status || 'attachment' === $post->post_type) {
+				$view_link = get_permalink($post);
 			} else {
 				// Allow non-published (private, future) to be viewed at a pretty permalink.
-				$view_link = str_replace( array( '%pagename%', '%postname%' ), $post->post_name, $permalink );
+				$view_link = str_replace(array('%pagename%', '%postname%'), $post->post_name, $permalink);
 			}
 		}
 	}
 
 	// Permalinks without a post/page name placeholder don't have anything to edit
-	if ( false === strpos( $permalink, '%postname%' ) && false === strpos( $permalink, '%pagename%' ) ) {
-		$return = '<strong>' . __( 'Permalink:' ) . "</strong>\n";
+	if (false === strpos($permalink, '%postname%') && false === strpos($permalink, '%pagename%')) {
+		$return = '<strong>'.__('Permalink:')."</strong>\n";
 
-		if ( false !== $view_link ) {
-			$display_link = urldecode( $view_link );
-			$return .= '<a id="sample-permalink" href="' . esc_url( $view_link ) . '"' . $preview_target . '>' . $display_link . "</a>\n";
+		if (false !== $view_link) {
+			$display_link = urldecode($view_link);
+			$return .= '<a id="sample-permalink" href="'.esc_url($view_link).'"'.$preview_target.'>'.$display_link."</a>\n";
 		} else {
-			$return .= '<span id="sample-permalink">' . $permalink . "</span>\n";
+			$return .= '<span id="sample-permalink">'.$permalink."</span>\n";
 		}
 
 		// Encourage a pretty permalink setting
-		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 ('' == 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 ) > 34 ) {
-				$post_name_abridged = mb_substr( $post_name, 0, 16 ) . '&hellip;' . mb_substr( $post_name, -16 );
+		if (function_exists('mb_strlen')) {
+			if (mb_strlen($post_name) > 34) {
+				$post_name_abridged = mb_substr($post_name, 0, 16).'&hellip;'.mb_substr($post_name, -16);
 			} else {
 				$post_name_abridged = $post_name;
 			}
 		} else {
-			if ( strlen( $post_name ) > 34 ) {
-				$post_name_abridged = substr( $post_name, 0, 16 ) . '&hellip;' . substr( $post_name, -16 );
+			if (strlen($post_name) > 34) {
+				$post_name_abridged = substr($post_name, 0, 16).'&hellip;'.substr($post_name, -16);
 			} else {
 				$post_name_abridged = $post_name;
 			}
 		}
 
-		$post_name_html = '<span id="editable-post-name">' . $post_name_abridged . '</span>';
-		$display_link = str_replace( array( '%pagename%', '%postname%' ), $post_name_html, urldecode( $permalink ) );
+		$post_name_html = '<span id="editable-post-name">'.$post_name_abridged.'</span>';
+		$display_link = str_replace(array('%pagename%', '%postname%'), $post_name_html, urldecode($permalink));
 
-		$return = '<strong>' . __( 'Permalink:' ) . "</strong>\n";
-		$return .= '<span id="sample-permalink"><a href="' . esc_url( $view_link ) . '"' . $preview_target . '>' . $display_link . "</a></span>\n";
+		$return = '<strong>'.__('Permalink:')."</strong>\n";
+		$return .= '<span id="sample-permalink"><a href="'.esc_url($view_link).'"'.$preview_target.'>'.$display_link."</a></span>\n";
 		$return .= '&lrm;'; // Fix bi-directional text display defect in RTL languages.
-		$return .= '<span id="edit-slug-buttons"><button type="button" class="edit-slug button button-small hide-if-no-js" aria-label="' . __( 'Edit permalink' ) . '">' . __( 'Edit' ) . "</button></span>\n";
-		$return .= '<span id="editable-post-name-full">' . $post_name . "</span>\n";
+		$return .= '<span id="edit-slug-buttons"><button type="button" class="edit-slug button button-small hide-if-no-js" aria-label="'.__('Edit permalink').'">'.__('Edit')."</button></span>\n";
+		$return .= '<span id="editable-post-name-full">'.$post_name."</span>\n";
 	}
 
 	/**
@@ -1358,7 +1358,7 @@ 
 	 * @param string  $new_slug  New sample permalink slug.
 	 * @param WP_Post $post      Post object.
 	 */
-	$return = apply_filters( 'get_sample_permalink_html', $return, $post->ID, $new_title, $new_slug, $post );
+	$return = apply_filters('get_sample_permalink_html', $return, $post->ID, $new_title, $new_slug, $post);
 
 	return $return;
 }
@@ -1375,22 +1375,22 @@ 
  * @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 href="%s" id="set-post-thumbnail"%s 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_url( $upload_iframe_src ),
+	$content = sprintf($set_thumbnail_link,
+		esc_url($upload_iframe_src),
 		'', // Empty when there's no featured image set, `aria-describedby` attribute otherwise.
-		esc_html( $post_type_object->labels->set_featured_image )
+		esc_html($post_type_object->labels->set_featured_image)
 	);
 
-	if ( $thumbnail_id && get_post( $thumbnail_id ) ) {
-		$size = isset( $_wp_additional_image_sizes['post-thumbnail'] ) ? 'post-thumbnail' : array( 266, 266 );
+	if ($thumbnail_id && get_post($thumbnail_id)) {
+		$size = isset($_wp_additional_image_sizes['post-thumbnail']) ? 'post-thumbnail' : array(266, 266);
 
 		/**
 		 * Filter the size used to display the post thumbnail image in the 'Featured Image' meta box.
@@ -1409,19 +1409,19 @@ 
 		 * @param int          $thumbnail_id Post thumbnail attachment ID.
 		 * @param WP_Post      $post         The post object associated with the thumbnail.
 		 */
-		$size = apply_filters( 'admin_post_thumbnail_size', $size, $thumbnail_id, $post );
+		$size = apply_filters('admin_post_thumbnail_size', $size, $thumbnail_id, $post);
 
-		$thumbnail_html = wp_get_attachment_image( $thumbnail_id, $size );
+		$thumbnail_html = wp_get_attachment_image($thumbnail_id, $size);
 
-		if ( !empty( $thumbnail_html ) ) {
-			$ajax_nonce = wp_create_nonce( 'set_post_thumbnail-' . $post->ID );
-			$content = sprintf( $set_thumbnail_link,
-				esc_url( $upload_iframe_src ),
+		if ( ! empty($thumbnail_html)) {
+			$ajax_nonce = wp_create_nonce('set_post_thumbnail-'.$post->ID);
+			$content = sprintf($set_thumbnail_link,
+				esc_url($upload_iframe_src),
 				' aria-describedby="set-post-thumbnail-desc"',
 				$thumbnail_html
 			);
-			$content .= '<p class="hide-if-no-js howto" id="set-post-thumbnail-desc">' . __( 'Click the image to edit or update' ) . '</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 .= '<p class="hide-if-no-js howto" id="set-post-thumbnail-desc">'.__('Click the image to edit or update').'</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>';
 		}
 	}
 
@@ -1433,7 +1433,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);
 }
 
 /**
@@ -1444,21 +1444,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;
 }
@@ -1472,17 +1472,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);
 }
 
 /**
@@ -1492,14 +1492,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.
@@ -1511,7 +1511,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;
@@ -1519,17 +1519,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';
@@ -1540,18 +1540,18 @@ 
 	<div class="notification-dialog">
 	<?php
 
-	if ( $locked ) {
+	if ($locked) {
 		$query_args = array();
-		if ( get_post_type_object( $post->post_type )->public ) {
-			if ( 'publish' == $post->post_status || $user->ID != $post->post_author ) {
+		if (get_post_type_object($post->post_type)->public) {
+			if ('publish' == $post->post_status || $user->ID != $post->post_author) {
 				// Latest content is in autosave
-				$nonce = wp_create_nonce( 'post_preview_' . $post->ID );
+				$nonce = wp_create_nonce('post_preview_'.$post->ID);
 				$query_args['preview_id'] = $post->ID;
 				$query_args['preview_nonce'] = $nonce;
 			}
 		}
 
-		$preview_link = get_preview_post_link( $post->ID, $query_args );
+		$preview_link = get_preview_post_link($post->ID, $query_args);
 
 		/**
 		 * Filter whether to allow the post lock to be overridden.
@@ -1565,17 +1565,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
@@ -1586,19 +1586,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
 		}
 
@@ -1612,7 +1612,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" alt="" /> <?php _e( 'Saving revision&hellip;' ); ?></span>
+			<span class="locked-saving hidden"><img src="<?php echo esc_url(admin_url('images/spinner-2x.gif')); ?>" width="16" height="16" alt="" /> <?php _e('Saving revision&hellip;'); ?></span>
 			<span class="locked-saved hidden"><?php _e('Your latest changes were saved as a revision.'); ?></span>
 			</p>
 			<?php
@@ -1623,9 +1623,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
 	}
@@ -1646,38 +1646,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_data( $post_data, true );
+	if ($old_autosave = wp_get_post_autosave($post_id, $post_author)) {
+		$new_autosave = _wp_post_revision_data($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( $post ) ) ) 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($post))) 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;
 		}
 
@@ -1688,16 +1688,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);
 }
 
 /**
@@ -1713,41 +1713,41 @@ 
 	$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();
 
-	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']);
 	}
 
-	return get_preview_post_link( $post, $query_args );
+	return get_preview_post_link($post, $query_args);
 }
 
 /**
@@ -1761,36 +1761,36 @@ 
  * @return mixed The value 0 or WP_Error on failure. The saved post ID on success.
  *               The 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));
 	}
 }
 
@@ -1800,11 +1800,11 @@ 
  * @param int $post_id Optional. Post ID.
  */
 function redirect_post($post_id = '') {
-	if ( isset($_POST['save']) || isset($_POST['publish']) ) {
-		$status = get_post_status( $post_id );
+	if (isset($_POST['save']) || isset($_POST['publish'])) {
+		$status = get_post_status($post_id);
 
-		if ( isset( $_POST['publish'] ) ) {
-			switch ( $status ) {
+		if (isset($_POST['publish'])) {
+			switch ($status) {
 				case 'pending':
 					$message = 8;
 					break;
@@ -1818,17 +1818,17 @@ 
 			$message = 'draft' == $status ? 10 : 1;
 		}
 
-		$location = add_query_arg( 'message', $message, get_edit_post_link( $post_id, 'url' ) );
-	} elseif ( isset($_POST['addmeta']) && $_POST['addmeta'] ) {
-		$location = add_query_arg( 'message', 2, wp_get_referer() );
+		$location = add_query_arg('message', $message, get_edit_post_link($post_id, 'url'));
+	} elseif (isset($_POST['addmeta']) && $_POST['addmeta']) {
+		$location = add_query_arg('message', 2, wp_get_referer());
 		$location = explode('#', $location);
-		$location = $location[0] . '#postcustom';
-	} elseif ( isset($_POST['deletemeta']) && $_POST['deletemeta'] ) {
-		$location = add_query_arg( 'message', 3, wp_get_referer() );
+		$location = $location[0].'#postcustom';
+	} elseif (isset($_POST['deletemeta']) && $_POST['deletemeta']) {
+		$location = add_query_arg('message', 3, wp_get_referer());
 		$location = explode('#', $location);
-		$location = $location[0] . '#postcustom';
+		$location = $location[0].'#postcustom';
 	} else {
-		$location = add_query_arg( 'message', 4, get_edit_post_link( $post_id, 'url' ) );
+		$location = add_query_arg('message', 4, get_edit_post_link($post_id, 'url'));
 	}
 
 	/**
@@ -1839,6 +1839,6 @@ 
 	 * @param string $location The destination URL.
 	 * @param int    $post_id  The post ID.
 	 */
-	wp_redirect( apply_filters( 'redirect_post_location', $location, $post_id ) );
+	wp_redirect(apply_filters('redirect_post_location', $location, $post_id));
 	exit;
 }

Braces +306 added lines, -216 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 );
@@ -583,22 +627,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;
@@ -691,8 +739,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;
 }
@@ -707,16 +756,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'] = '';
@@ -725,8 +776,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'] ) {
@@ -745,16 +797,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 );
 
@@ -777,11 +832,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
@@ -801,22 +857,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 );
 
@@ -924,12 +985,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)
@@ -938,15 +1001,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 );
@@ -986,16 +1051,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);
 
@@ -1018,8 +1085,9 @@ 
 
 	$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.
@@ -1057,8 +1125,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 );
 
@@ -1206,8 +1275,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);
 
@@ -1223,8 +1293,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);
 
@@ -1246,8 +1317,9 @@ 
 
 		/** This filter is documented in wp-admin/edit-tag-form.php */
 		$uri = apply_filters( 'editable_slug', $uri, $post );
-		if ( !empty($uri) )
-			$uri .= '/';
+		if ( !empty($uri) ) {
+					$uri .= '/';
+		}
 		$permalink = str_replace('%pagename%', "{$uri}%pagename%", $permalink);
 	}
 
@@ -1284,8 +1356,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);
 
@@ -1445,11 +1518,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];
@@ -1458,8 +1533,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;
 }
 
@@ -1473,10 +1549,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";
@@ -1492,12 +1570,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 ) {
 
@@ -1511,8 +1591,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 {
@@ -1526,8 +1607,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;
 	}
@@ -1574,8 +1656,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
@@ -1655,8 +1738,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();
 
@@ -1728,14 +1812,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();
 
@@ -1743,8 +1829,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'] );
+		}
 	}
 
 	return get_preview_post_link( $post, $query_args );
@@ -1763,8 +1850,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;
@@ -1779,11 +1867,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/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() ) {
 

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() ) {

Spacing +56 added lines, -56 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]);
 		}
 	}
@@ -185,7 +185,7 @@ 
  * @return string
  */
 function add_cssclass($add, $class) {
-	$class = empty($class) ? $add : $class .= ' ' . $add;
+	$class = empty($class) ? $add : $class .= ' '.$add;
 	return $class;
 }
 
@@ -198,29 +198,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);
 		}
@@ -235,7 +235,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
@@ -249,9 +249,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);
@@ -269,7 +269,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);
 
@@ -286,12 +286,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 {
@@ -305,41 +305,41 @@ 
 
 // Prevent adjacent separators
 $prev_menu_was_separator = false;
-foreach ( $menu as $id => $data ) {
-	if ( false === stristr( $data[4], 'wp-menu-separator' ) ) {
+foreach ($menu as $id => $data) {
+	if (false === stristr($data[4], 'wp-menu-separator')) {
 
 		// This item is not a separator, so falsey the toggler and do nothing
 		$prev_menu_was_separator = false;
 	} else {
 
 		// The previous item was a separator, so unset this one
-		if ( true === $prev_menu_was_separator ) {
-			unset( $menu[ $id ] );
+		if (true === $prev_menu_was_separator) {
+			unset($menu[$id]);
 		}
 
 		// This item is a separator, so truthy the toggler and move on
 		$prev_menu_was_separator = true;
 	}
 }
-unset( $id, $data, $prev_menu_was_separator );
+unset($id, $data, $prev_menu_was_separator);
 
 // 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);

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 );
 

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>";
 }

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 '<strong><a href="' . network_admin_url( 'update-core.php' ) . '">' . sprintf( __( 'Get Version %s' ), $cur->current ) . '</a></strong>';
+		case 'upgrade' :
+			return '<strong><a href="' . network_admin_url( 'update-core.php' ) . '">' . sprintf( __( 'Get Version %s' ), $cur->current ) . '</a></strong>';
 
-	case 'latest' :
-	default :
-		return sprintf( __( 'Version %s' ), get_bloginfo( 'version', 'display' ) );
+		case 'latest' :
+		default :
+			return sprintf( __( 'Version %s' ), get_bloginfo( 'version', 'display' ) );
 	}
 }
 

Spacing +151 added lines, -151 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 '<strong><a href="' . network_admin_url( 'update-core.php' ) . '">' . sprintf( __( 'Get Version %s' ), $cur->current ) . '</a></strong>';
+		return '<strong><a href="'.network_admin_url('update-core.php').'">'.sprintf(__('Get Version %s'), $cur->current).'</a></strong>';
 
 	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" aria-label="Please update WordPress now">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" aria-label="Please update WordPress now">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,21 +241,21 @@ 
 // 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> ';
 	}
 
 	/* translators: 1: version number, 2: theme name */
-	$content = __( 'WordPress %1$s running %2$s theme.' );
+	$content = __('WordPress %1$s running %2$s theme.');
 
 	/**
 	 * Filter the text displayed in the 'At a Glance' dashboard widget.
@@ -266,9 +266,9 @@ 
 	 *
 	 * @param string $content Default text.
 	 */
-	$content = apply_filters( 'update_right_now_text', $content );
+	$content = apply_filters('update_right_now_text', $content);
 
-	$msg .= sprintf( '<span id="wp-version">' . $content . '</span>', get_bloginfo( 'version', 'display' ), $theme_name );
+	$msg .= sprintf('<span id="wp-version">'.$content.'</span>', get_bloginfo('version', 'display'), $theme_name);
 
 	echo "<p id='wp-version-message'>$msg</p>";
 }
@@ -281,11 +281,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];
 		}
 	}
 
@@ -296,14 +296,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);
 		}
 	}
 }
@@ -314,58 +314,58 @@ 
  * @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' ) ) {
+		if ( ! current_user_can('update_plugins')) {
 			/* translators: 1: plugin name, 2: details URL, 3: accessibility text, 4: version number */
-			printf( __( 'There is a new version of %1$s available. <a href="%2$s" class="thickbox open-plugin-details-modal" aria-label="%3$s">View version %4$s details</a>.' ),
+			printf(__('There is a new version of %1$s available. <a href="%2$s" class="thickbox open-plugin-details-modal" aria-label="%3$s">View version %4$s details</a>.'),
 				$plugin_name,
-				esc_url( $details_url ),
+				esc_url($details_url),
 				/* translators: 1: plugin name, 2: version number */
-				esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $plugin_name, $r->new_version ) ),
+				esc_attr(sprintf(__('View %1$s version %2$s details'), $plugin_name, $r->new_version)),
 				$r->new_version
 			);
-		} elseif ( empty( $r->package ) ) {
+		} elseif (empty($r->package)) {
 			/* translators: 1: plugin name, 2: details URL, 3: accessibility text, 4: version number */
-			printf( __( 'There is a new version of %1$s available. <a href="%2$s" class="thickbox open-plugin-details-modal" aria-label="%3$s">View version %4$s details</a>. <em>Automatic update is unavailable for this plugin.</em>' ),
+			printf(__('There is a new version of %1$s available. <a href="%2$s" class="thickbox open-plugin-details-modal" aria-label="%3$s">View version %4$s details</a>. <em>Automatic update is unavailable for this plugin.</em>'),
 				$plugin_name,
-				esc_url( $details_url ),
+				esc_url($details_url),
 				/* translators: 1: plugin name, 2: version number */
-				esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $plugin_name, $r->new_version ) ),
+				esc_attr(sprintf(__('View %1$s version %2$s details'), $plugin_name, $r->new_version)),
 				$r->new_version
 			);
 		} else {
 			/* translators: 1: plugin name, 2: details URL, 3: accessibility text, 4: version number, 5: update URL, 6: accessibility text */
-			printf( __( 'There is a new version of %1$s available. <a href="%2$s" class="thickbox open-plugin-details-modal" aria-label="%3$s">View version %4$s details</a> or <a href="%5$s" class="update-link" aria-label="%6$s">update now</a>.' ),
+			printf(__('There is a new version of %1$s available. <a href="%2$s" class="thickbox open-plugin-details-modal" aria-label="%3$s">View version %4$s details</a> or <a href="%5$s" class="update-link" aria-label="%6$s">update now</a>.'),
 				$plugin_name,
-				esc_url( $details_url ),
+				esc_url($details_url),
 				/* translators: 1: plugin name, 2: version number */
-				esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $plugin_name, $r->new_version ) ),
+				esc_attr(sprintf(__('View %1$s version %2$s details'), $plugin_name, $r->new_version)),
 				$r->new_version,
-				wp_nonce_url( self_admin_url( 'update.php?action=upgrade-plugin&plugin=' ) . $file, 'upgrade-plugin_' . $file ),
+				wp_nonce_url(self_admin_url('update.php?action=upgrade-plugin&plugin=').$file, 'upgrade-plugin_'.$file),
 				/* translators: %s: plugin name */
-				esc_attr( sprintf( __( 'Update %s now' ), $plugin_name ) )
+				esc_attr(sprintf(__('Update %s now'), $plugin_name))
 			);
 		}
 		/**
@@ -403,7 +403,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>';
 	}
@@ -416,13 +416,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;
@@ -432,15 +432,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);
 		}
 	}
 }
@@ -451,51 +451,51 @@ 
  * @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];
 
 	$theme_name = $theme['Name'];
 
-	$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');
 
-	$active = $theme->is_allowed( 'network' ) ? ' active': '';
+	$active = $theme->is_allowed('network') ? ' active' : '';
 
-	echo '<tr class="plugin-update-tr' . $active . '" id="' . esc_attr( $theme->get_stylesheet() . '-update' ) . '" data-slug="' . esc_attr( $theme->get_stylesheet() ) . '"><td colspan="' . $wp_list_table->get_column_count() . '" class="plugin-update colspanchange"><div class="update-message">';
-	if ( ! current_user_can('update_themes') ) {
+	echo '<tr class="plugin-update-tr'.$active.'" id="'.esc_attr($theme->get_stylesheet().'-update').'" data-slug="'.esc_attr($theme->get_stylesheet()).'"><td colspan="'.$wp_list_table->get_column_count().'" class="plugin-update colspanchange"><div class="update-message">';
+	if ( ! current_user_can('update_themes')) {
 		/* translators: 1: theme name, 2: details URL, 3: accessibility text, 4: version number */
-		printf( __( 'There is a new version of %1$s available. <a href="%2$s" class="thickbox open-plugin-details-modal" aria-label="%3$s">View version %4$s details</a>.'),
+		printf(__('There is a new version of %1$s available. <a href="%2$s" class="thickbox open-plugin-details-modal" aria-label="%3$s">View version %4$s details</a>.'),
 			$theme_name,
-			esc_url( $details_url ),
+			esc_url($details_url),
 			/* translators: 1: theme name, 2: version number */
-			esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $theme_name, $r['new_version'] ) ),
+			esc_attr(sprintf(__('View %1$s version %2$s details'), $theme_name, $r['new_version'])),
 			$r['new_version']
 		);
-	} elseif ( empty( $r['package'] ) ) {
+	} elseif (empty($r['package'])) {
 		/* translators: 1: theme name, 2: details URL, 3: accessibility text, 4: version number */
-		printf( __( 'There is a new version of %1$s available. <a href="%2$s" class="thickbox open-plugin-details-modal" aria-label="%3$s">View version %4$s details</a>. <em>Automatic update is unavailable for this theme.</em>' ),
+		printf(__('There is a new version of %1$s available. <a href="%2$s" class="thickbox open-plugin-details-modal" aria-label="%3$s">View version %4$s details</a>. <em>Automatic update is unavailable for this theme.</em>'),
 			$theme_name,
-			esc_url( $details_url ),
+			esc_url($details_url),
 			/* translators: 1: theme name, 2: version number */
-			esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $theme_name, $r['new_version'] ) ),
+			esc_attr(sprintf(__('View %1$s version %2$s details'), $theme_name, $r['new_version'])),
 			$r['new_version']
 		);
 	} else {
 		/* translators: 1: theme name, 2: details URL, 3: accessibility text, 4: version number, 5: update URL, 6: accessibility text */
-		printf( __( 'There is a new version of %1$s available. <a href="%2$s" class="thickbox open-plugin-details-modal" aria-label="%3$s">View version %4$s details</a> or <a href="%5$s" class="update-link" aria-label="%6$s">update now</a>.' ),
+		printf(__('There is a new version of %1$s available. <a href="%2$s" class="thickbox open-plugin-details-modal" aria-label="%3$s">View version %4$s details</a> or <a href="%5$s" class="update-link" aria-label="%6$s">update now</a>.'),
 			$theme_name,
-			esc_url( $details_url ),
+			esc_url($details_url),
 			/* translators: 1: theme name, 2: version number */
-			esc_attr( sprintf( __( 'View %1$s version %2$s details' ), $theme_name, $r['new_version'] ) ),
+			esc_attr(sprintf(__('View %1$s version %2$s details'), $theme_name, $r['new_version'])),
 			$r['new_version'],
-			wp_nonce_url( self_admin_url( 'update.php?action=upgrade-theme&theme=' ) . $theme_key, 'upgrade-theme_' . $theme_key ),
+			wp_nonce_url(self_admin_url('update.php?action=upgrade-theme&theme=').$theme_key, 'upgrade-theme_'.$theme_key),
 			/* translators: %s: theme name */
-			esc_attr( sprintf( __( 'Update %s now' ), $theme_name ) )
+			esc_attr(sprintf(__('Update %s now'), $theme_name))
 		);
 	}
 	/**
@@ -516,7 +516,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>';
 }
@@ -527,11 +527,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.
@@ -542,16 +542,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.');
 

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

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();

Indentation +6 added lines, -6 removed lines

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

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'];
 	}

src/wp-admin/includes/class-wp-press-this.php

Braces +3 added lines, -2 removed lines

@@ -449,8 +449,9 @@
 	private function _limit_embed( $src ) {
 		$src = $this->_limit_url( $src );
 
-		if ( empty( $src ) )
-			return '';
+		if ( empty( $src ) ) {
+					return '';
+		}
 
 		if ( preg_match( '/\/\/(m|www)\.youtube\.com\/(embed|v)\/([^\?]+)\?.+$/', $src, $src_matches ) ) {
 			// Embedded Youtube videos (www or mobile)

Indentation +7 added lines, -7 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 /**
- * Press This class and display functionality
- *
- * @package WordPress
- * @subpackage Press_This
- * @since 4.2.0
- */
+	 * Press This class and display functionality
+	 *
+	 * @package WordPress
+	 * @subpackage Press_This
+	 * @since 4.2.0
+	 */
 
 /**
  * Press This class.
@@ -1049,7 +1049,7 @@ 
 	 * @since 4.2.0
 	 * @access public
 	 *
- 	 * @param array $data The site's data.
+	 * @param array $data The site's data.
 	 * @return string Discovered canonical URL, or empty
 	 */
 	public function get_canonical_link( $data ) {

Spacing +395 added lines, -395 removed lines

@@ -48,7 +48,7 @@ 
 			 *
 			 * @param bool $redirect Whether to redirect in parent window or not. Default false.
 			 */
-			'redirInParent' => apply_filters( 'press_this_redirect_in_parent', false ),
+			'redirInParent' => apply_filters('press_this_redirect_in_parent', false),
 		);
 	}
 
@@ -62,37 +62,37 @@ 
 	 * @param string $content Optional. Current expected markup for Press This. Expects slashed. Default empty.
 	 * @return string New markup with old image URLs replaced with the local attachment ones if swapped.
 	 */
-	public function side_load_images( $post_id, $content = '' ) {
-		$content = wp_unslash( $content );
+	public function side_load_images($post_id, $content = '') {
+		$content = wp_unslash($content);
 
-		if ( preg_match_all( '/<img [^>]+>/', $content, $matches ) && current_user_can( 'upload_files' ) ) {
-			foreach ( (array) $matches[0] as $image ) {
+		if (preg_match_all('/<img [^>]+>/', $content, $matches) && current_user_can('upload_files')) {
+			foreach ((array) $matches[0] as $image) {
 				// This is inserted from our JS so HTML attributes should always be in double quotes.
-				if ( ! preg_match( '/src="([^"]+)"/', $image, $url_matches ) ) {
+				if ( ! preg_match('/src="([^"]+)"/', $image, $url_matches)) {
 					continue;
 				}
 
 				$image_src = $url_matches[1];
 
 				// Don't try to sideload a file without a file extension, leads to WP upload error.
-				if ( ! preg_match( '/[^\?]+\.(?:jpe?g|jpe|gif|png)(?:\?|$)/i', $image_src ) ) {
+				if ( ! preg_match('/[^\?]+\.(?:jpe?g|jpe|gif|png)(?:\?|$)/i', $image_src)) {
 					continue;
 				}
 
 				// Sideload image, which gives us a new image src.
-				$new_src = media_sideload_image( $image_src, $post_id, null, 'src' );
+				$new_src = media_sideload_image($image_src, $post_id, null, 'src');
 
-				if ( ! is_wp_error( $new_src ) ) {
+				if ( ! is_wp_error($new_src)) {
 					// Replace the POSTED content <img> with correct uploaded ones.
 					// Need to do it in two steps so we don't replace links to the original image if any.
-					$new_image = str_replace( $image_src, $new_src, $image );
-					$content = str_replace( $image, $new_image, $content );
+					$new_image = str_replace($image_src, $new_src, $image);
+					$content = str_replace($image, $new_image, $content);
 				}
 			}
 		}
 
 		// Expected slashed
-		return wp_slash( $content );
+		return wp_slash($content);
 	}
 
 	/**
@@ -102,36 +102,36 @@ 
 	 * @access public
 	 */
 	public function save_post() {
-		if ( empty( $_POST['post_ID'] ) || ! $post_id = (int) $_POST['post_ID'] ) {
-			wp_send_json_error( array( 'errorMessage' => __( 'Missing post ID.' ) ) );
+		if (empty($_POST['post_ID']) || ! $post_id = (int) $_POST['post_ID']) {
+			wp_send_json_error(array('errorMessage' => __('Missing post ID.')));
 		}
 
-		if ( empty( $_POST['_wpnonce'] ) || ! wp_verify_nonce( $_POST['_wpnonce'], 'update-post_' . $post_id ) ||
-			! current_user_can( 'edit_post', $post_id ) ) {
+		if (empty($_POST['_wpnonce']) || ! wp_verify_nonce($_POST['_wpnonce'], 'update-post_'.$post_id) ||
+			! current_user_can('edit_post', $post_id)) {
 
-			wp_send_json_error( array( 'errorMessage' => __( 'Invalid post.' ) ) );
+			wp_send_json_error(array('errorMessage' => __('Invalid post.')));
 		}
 
 		$post_data = array(
 			'ID'            => $post_id,
-			'post_title'    => ( ! empty( $_POST['post_title'] ) ) ? sanitize_text_field( trim( $_POST['post_title'] ) ) : '',
-			'post_content'  => ( ! empty( $_POST['post_content'] ) ) ? trim( $_POST['post_content'] ) : '',
+			'post_title'    => ( ! empty($_POST['post_title'])) ? sanitize_text_field(trim($_POST['post_title'])) : '',
+			'post_content'  => ( ! empty($_POST['post_content'])) ? trim($_POST['post_content']) : '',
 			'post_type'     => 'post',
 			'post_status'   => 'draft',
-			'post_format'   => ( ! empty( $_POST['post_format'] ) ) ? sanitize_text_field( $_POST['post_format'] ) : '',
-			'tax_input'     => ( ! empty( $_POST['tax_input'] ) ) ? $_POST['tax_input'] : array(),
-			'post_category' => ( ! empty( $_POST['post_category'] ) ) ? $_POST['post_category'] : array(),
+			'post_format'   => ( ! empty($_POST['post_format'])) ? sanitize_text_field($_POST['post_format']) : '',
+			'tax_input'     => ( ! empty($_POST['tax_input'])) ? $_POST['tax_input'] : array(),
+			'post_category' => ( ! empty($_POST['post_category'])) ? $_POST['post_category'] : array(),
 		);
 
-		if ( ! empty( $_POST['post_status'] ) && 'publish' === $_POST['post_status'] ) {
-			if ( current_user_can( 'publish_posts' ) ) {
+		if ( ! empty($_POST['post_status']) && 'publish' === $_POST['post_status']) {
+			if (current_user_can('publish_posts')) {
 				$post_data['post_status'] = 'publish';
 			} else {
 				$post_data['post_status'] = 'pending';
 			}
 		}
 
-		$post_data['post_content'] = $this->side_load_images( $post_id, $post_data['post_content'] );
+		$post_data['post_content'] = $this->side_load_images($post_id, $post_data['post_content']);
 
 		/**
 		 * Filter the post data of a Press This post before saving/updating, after
@@ -141,28 +141,28 @@ 
 		 *
 		 * @param array $post_data The post data.
 		 */
-		$post_data = apply_filters( 'press_this_save_post', $post_data );
+		$post_data = apply_filters('press_this_save_post', $post_data);
 
-		$updated = wp_update_post( $post_data, true );
+		$updated = wp_update_post($post_data, true);
 
-		if ( is_wp_error( $updated ) ) {
-			wp_send_json_error( array( 'errorMessage' => $updated->get_error_message() ) );
+		if (is_wp_error($updated)) {
+			wp_send_json_error(array('errorMessage' => $updated->get_error_message()));
 		} else {
-			if ( isset( $post_data['post_format'] ) ) {
-				if ( current_theme_supports( 'post-formats', $post_data['post_format'] ) ) {
-					set_post_format( $post_id, $post_data['post_format'] );
-				} elseif ( $post_data['post_format'] ) {
-					set_post_format( $post_id, false );
+			if (isset($post_data['post_format'])) {
+				if (current_theme_supports('post-formats', $post_data['post_format'])) {
+					set_post_format($post_id, $post_data['post_format']);
+				} elseif ($post_data['post_format']) {
+					set_post_format($post_id, false);
 				}
 			}
 
 			$forceRedirect = false;
 
-			if ( 'publish' === get_post_status( $post_id ) ) {
-				$redirect = get_post_permalink( $post_id );
-			} elseif ( isset( $_POST['pt-force-redirect'] ) && $_POST['pt-force-redirect'] === 'true' ) {
+			if ('publish' === get_post_status($post_id)) {
+				$redirect = get_post_permalink($post_id);
+			} elseif (isset($_POST['pt-force-redirect']) && $_POST['pt-force-redirect'] === 'true') {
 				$forceRedirect = true;
-				$redirect = get_edit_post_link( $post_id, 'js' );
+				$redirect = get_edit_post_link($post_id, 'js');
 			} else {
 				$redirect = false;
 			}
@@ -177,12 +177,12 @@ 
 			 * @param int    $post_id Post ID.
 			 * @param string $status  Post status.
 			 */
-			$redirect = apply_filters( 'press_this_save_redirect', $redirect, $post_id, $post_data['post_status'] );
+			$redirect = apply_filters('press_this_save_redirect', $redirect, $post_id, $post_data['post_status']);
 
-			if ( $redirect ) {
-				wp_send_json_success( array( 'redirect' => $redirect, 'force' => $forceRedirect ) );
+			if ($redirect) {
+				wp_send_json_success(array('redirect' => $redirect, 'force' => $forceRedirect));
 			} else {
-				wp_send_json_success( array( 'postSaved' => true ) );
+				wp_send_json_success(array('postSaved' => true));
 			}
 		}
 	}
@@ -194,57 +194,57 @@ 
 	 * @access public
 	 */
 	public function add_category() {
-		if ( false === wp_verify_nonce( $_POST['new_cat_nonce'], 'add-category' ) ) {
+		if (false === wp_verify_nonce($_POST['new_cat_nonce'], 'add-category')) {
 			wp_send_json_error();
 		}
 
-		$taxonomy = get_taxonomy( 'category' );
+		$taxonomy = get_taxonomy('category');
 
-		if ( ! current_user_can( $taxonomy->cap->edit_terms ) || empty( $_POST['name'] ) ) {
+		if ( ! current_user_can($taxonomy->cap->edit_terms) || empty($_POST['name'])) {
 			wp_send_json_error();
 		}
 
-		$parent = isset( $_POST['parent'] ) && (int) $_POST['parent'] > 0 ? (int) $_POST['parent'] : 0;
-		$names = explode( ',', $_POST['name'] );
+		$parent = isset($_POST['parent']) && (int) $_POST['parent'] > 0 ? (int) $_POST['parent'] : 0;
+		$names = explode(',', $_POST['name']);
 		$added = $data = array();
 
-		foreach ( $names as $cat_name ) {
-			$cat_name = trim( $cat_name );
-			$cat_nicename = sanitize_title( $cat_name );
+		foreach ($names as $cat_name) {
+			$cat_name = trim($cat_name);
+			$cat_nicename = sanitize_title($cat_name);
 
-			if ( empty( $cat_nicename ) ) {
+			if (empty($cat_nicename)) {
 				continue;
 			}
 
 			// @todo Find a more performant way to check existence, maybe get_term() with a separate parent check.
-			if ( term_exists( $cat_name, $taxonomy->name, $parent ) ) {
-				if ( count( $names ) === 1 ) {
-					wp_send_json_error( array( 'errorMessage' => __( 'This category already exists.' ) ) );
+			if (term_exists($cat_name, $taxonomy->name, $parent)) {
+				if (count($names) === 1) {
+					wp_send_json_error(array('errorMessage' => __('This category already exists.')));
 				} else {
 					continue;
 				}
 			}
 
-			$cat_id = wp_insert_term( $cat_name, $taxonomy->name, array( 'parent' => $parent ) );
+			$cat_id = wp_insert_term($cat_name, $taxonomy->name, array('parent' => $parent));
 
-			if ( is_wp_error( $cat_id ) ) {
+			if (is_wp_error($cat_id)) {
 				continue;
-			} elseif ( is_array( $cat_id ) ) {
+			} elseif (is_array($cat_id)) {
 				$cat_id = $cat_id['term_id'];
 			}
 
 			$added[] = $cat_id;
 		}
 
-		if ( empty( $added ) ) {
-			wp_send_json_error( array( 'errorMessage' => __( 'This category cannot be added. Please change the name and try again.' ) ) );
+		if (empty($added)) {
+			wp_send_json_error(array('errorMessage' => __('This category cannot be added. Please change the name and try again.')));
 		}
 
-		foreach ( $added as $new_cat_id ) {
-			$new_cat = get_category( $new_cat_id );
+		foreach ($added as $new_cat_id) {
+			$new_cat = get_category($new_cat_id);
 
-			if ( is_wp_error( $new_cat ) ) {
-				wp_send_json_error( array( 'errorMessage' => __( 'Error while adding the category. Please try again later.' ) ) );
+			if (is_wp_error($new_cat)) {
+				wp_send_json_error(array('errorMessage' => __('Error while adding the category. Please try again later.')));
 			}
 
 			$data[] = array(
@@ -253,7 +253,7 @@ 
 				'parent' => $new_cat->parent,
 			);
 		}
-		wp_send_json_success( $data );
+		wp_send_json_success($data);
 	}
 
 	/**
@@ -265,20 +265,20 @@ 
 	 * @param string $url URL to scan.
 	 * @return string Source's HTML sanitized markup
 	 */
-	public function fetch_source_html( $url ) {
+	public function fetch_source_html($url) {
 		global $wp_version;
 
-		if ( empty( $url ) ) {
-			return new WP_Error( 'invalid-url', __( 'A valid URL was not provided.' ) );
+		if (empty($url)) {
+			return new WP_Error('invalid-url', __('A valid URL was not provided.'));
 		}
 
-		$remote_url = wp_safe_remote_get( $url, array(
+		$remote_url = wp_safe_remote_get($url, array(
 			'timeout' => 30,
 			// Use an explicit user-agent for Press This
-			'user-agent' => 'Press This (WordPress/' . $wp_version . '); ' . get_bloginfo( 'url' )
-		) );
+			'user-agent' => 'Press This (WordPress/'.$wp_version.'); '.get_bloginfo('url')
+		));
 
-		if ( is_wp_error( $remote_url ) ) {
+		if (is_wp_error($remote_url)) {
 			return $remote_url;
 		}
 
@@ -303,8 +303,8 @@ 
 			)
 		);
 
-		$source_content = wp_remote_retrieve_body( $remote_url );
-		$source_content = wp_kses( $source_content, $allowed_elements );
+		$source_content = wp_remote_retrieve_body($remote_url);
+		$source_content = wp_kses($source_content, $allowed_elements);
 
 		return $source_content;
 	}
@@ -318,10 +318,10 @@ 
 	 * @param array $value Array to limit.
 	 * @return array Original array if fewer than 50 values, limited array, empty array otherwise.
 	 */
-	private function _limit_array( $value ) {
-		if ( is_array( $value ) ) {
-			if ( count( $value ) > 50 ) {
-				return array_slice( $value, 0, 50 );
+	private function _limit_array($value) {
+		if (is_array($value)) {
+			if (count($value) > 50) {
+				return array_slice($value, 0, 50);
 			}
 
 			return $value;
@@ -341,20 +341,20 @@ 
 	 *                         if fewer than 5,000 characters, a truncated version, otherwise an
 	 *                         empty string.
 	 */
-	private function _limit_string( $value ) {
+	private function _limit_string($value) {
 		$return = '';
 
-		if ( is_numeric( $value ) || is_bool( $value ) ) {
+		if (is_numeric($value) || is_bool($value)) {
 			$return = $value;
-		} else if ( is_string( $value ) ) {
-			if ( mb_strlen( $value ) > 5000 ) {
-				$return = mb_substr( $value, 0, 5000 );
+		} else if (is_string($value)) {
+			if (mb_strlen($value) > 5000) {
+				$return = mb_substr($value, 0, 5000);
 			} else {
 				$return = $value;
 			}
 
-			$return = html_entity_decode( $return, ENT_QUOTES, 'UTF-8' );
-			$return = sanitize_text_field( trim( $return ) );
+			$return = html_entity_decode($return, ENT_QUOTES, 'UTF-8');
+			$return = sanitize_text_field(trim($return));
 		}
 
 		return $return;
@@ -369,32 +369,32 @@ 
 	 * @param string $url URL to check for length and validity.
 	 * @return string Escaped URL if of valid length (< 2048) and makeup. Empty string otherwise.
 	 */
-	private function _limit_url( $url ) {
-		if ( ! is_string( $url ) ) {
+	private function _limit_url($url) {
+		if ( ! is_string($url)) {
 			return '';
 		}
 
 		// HTTP 1.1 allows 8000 chars but the "de-facto" standard supported in all current browsers is 2048.
-		if ( strlen( $url ) > 2048 ) {
+		if (strlen($url) > 2048) {
 			return ''; // Return empty rather than a truncated/invalid URL
 		}
 
 		// Does not look like a URL.
-		if ( ! preg_match( '/^([!#$&-;=?-\[\]_a-z~]|%[0-9a-fA-F]{2})+$/', $url ) ) {
+		if ( ! preg_match('/^([!#$&-;=?-\[\]_a-z~]|%[0-9a-fA-F]{2})+$/', $url)) {
 			return '';
 		}
 
 		// If the URL is root-relative, prepend the protocol and domain name
-		if ( $url && $this->domain && preg_match( '%^/[^/]+%', $url ) ) {
-			$url = $this->domain . $url;
+		if ($url && $this->domain && preg_match('%^/[^/]+%', $url)) {
+			$url = $this->domain.$url;
 		}
 
 		// Not absolute or protocol-relative URL.
-		if ( ! preg_match( '%^(?:https?:)?//[^/]+%', $url ) ) {
+		if ( ! preg_match('%^(?:https?:)?//[^/]+%', $url)) {
 			return '';
 		}
 
-		return esc_url_raw( $url, array( 'http', 'https' ) );
+		return esc_url_raw($url, array('http', 'https'));
 	}
 
 	/**
@@ -409,34 +409,34 @@ 
 	 * @param string $src Image source URL.
 	 * @return string If not matched an excluded URL type, the original URL, empty string otherwise.
 	 */
-	private function _limit_img( $src ) {
-		$src = $this->_limit_url( $src );
+	private function _limit_img($src) {
+		$src = $this->_limit_url($src);
 
-		if ( preg_match( '!/ad[sx]?/!i', $src ) ) {
+		if (preg_match('!/ad[sx]?/!i', $src)) {
 			// Ads
 			return '';
-		} else if ( preg_match( '!(/share-?this[^.]+?\.[a-z0-9]{3,4})(\?.*)?$!i', $src ) ) {
+		} else if (preg_match('!(/share-?this[^.]+?\.[a-z0-9]{3,4})(\?.*)?$!i', $src)) {
 			// Share-this type button
 			return '';
-		} else if ( preg_match( '!/(spinner|loading|spacer|blank|rss)\.(gif|jpg|png)!i', $src ) ) {
+		} else if (preg_match('!/(spinner|loading|spacer|blank|rss)\.(gif|jpg|png)!i', $src)) {
 			// Loaders, spinners, spacers
 			return '';
-		} else if ( preg_match( '!/([^./]+[-_])?(spinner|loading|spacer|blank)s?([-_][^./]+)?\.[a-z0-9]{3,4}!i', $src ) ) {
+		} else if (preg_match('!/([^./]+[-_])?(spinner|loading|spacer|blank)s?([-_][^./]+)?\.[a-z0-9]{3,4}!i', $src)) {
 			// Fancy loaders, spinners, spacers
 			return '';
-		} else if ( preg_match( '!([^./]+[-_])?thumb[^.]*\.(gif|jpg|png)$!i', $src ) ) {
+		} else if (preg_match('!([^./]+[-_])?thumb[^.]*\.(gif|jpg|png)$!i', $src)) {
 			// Thumbnails, too small, usually irrelevant to context
 			return '';
-		} else if ( false !== stripos( $src, '/wp-includes/' ) ) {
+		} else if (false !== stripos($src, '/wp-includes/')) {
 			// Classic WordPress interface images
 			return '';
-		} else if ( preg_match( '![^\d]\d{1,2}x\d+\.(gif|jpg|png)$!i', $src ) ) {
+		} else if (preg_match('![^\d]\d{1,2}x\d+\.(gif|jpg|png)$!i', $src)) {
 			// Most often tiny buttons/thumbs (< 100px wide)
 			return '';
-		} else if ( preg_match( '!/pixel\.(mathtag|quantserve)\.com!i', $src ) ) {
+		} else if (preg_match('!/pixel\.(mathtag|quantserve)\.com!i', $src)) {
 			// See mathtag.com and https://www.quantcast.com/how-we-do-it/iab-standard-measurement/how-we-collect-data/
 			return '';
-		} else if ( preg_match( '!/[gb]\.gif(\?.+)?$!i', $src ) ) {
+		} else if (preg_match('!/[gb]\.gif(\?.+)?$!i', $src)) {
 			// WordPress.com stats gif
 			return '';
 		}
@@ -456,32 +456,32 @@ 
 	 * @param string $src Embed source URL.
 	 * @return string If not from a supported provider, an empty string. Otherwise, a reformattd embed URL.
 	 */
-	private function _limit_embed( $src ) {
-		$src = $this->_limit_url( $src );
+	private function _limit_embed($src) {
+		$src = $this->_limit_url($src);
 
-		if ( empty( $src ) )
+		if (empty($src))
 			return '';
 
-		if ( preg_match( '!//(m|www)\.youtube\.com/(embed|v)/([^?]+)\?.+$!i', $src, $src_matches ) ) {
+		if (preg_match('!//(m|www)\.youtube\.com/(embed|v)/([^?]+)\?.+$!i', $src, $src_matches)) {
 			// Embedded Youtube videos (www or mobile)
-			$src = 'https://www.youtube.com/watch?v=' . $src_matches[3];
-		} else if ( preg_match( '!//player\.vimeo\.com/video/([\d]+)([?/].*)?$!i', $src, $src_matches ) ) {
+			$src = 'https://www.youtube.com/watch?v='.$src_matches[3];
+		} else if (preg_match('!//player\.vimeo\.com/video/([\d]+)([?/].*)?$!i', $src, $src_matches)) {
 			// Embedded Vimeo iframe videos
-			$src = 'https://vimeo.com/' . (int) $src_matches[1];
-		} else if ( preg_match( '!//vimeo\.com/moogaloop\.swf\?clip_id=([\d]+)$!i', $src, $src_matches ) ) {
+			$src = 'https://vimeo.com/'.(int) $src_matches[1];
+		} else if (preg_match('!//vimeo\.com/moogaloop\.swf\?clip_id=([\d]+)$!i', $src, $src_matches)) {
 			// Embedded Vimeo Flash videos
-			$src = 'https://vimeo.com/' . (int) $src_matches[1];
-		} else if ( preg_match( '!//vine\.co/v/([^/]+)/embed!i', $src, $src_matches ) ) {
+			$src = 'https://vimeo.com/'.(int) $src_matches[1];
+		} else if (preg_match('!//vine\.co/v/([^/]+)/embed!i', $src, $src_matches)) {
 			// Embedded Vine videos
-			$src = 'https://vine.co/v/' . $src_matches[1];
-		} else if ( preg_match( '!//(www\.)?dailymotion\.com/embed/video/([^/?]+)([/?].+)?!i', $src, $src_matches ) ) {
+			$src = 'https://vine.co/v/'.$src_matches[1];
+		} else if (preg_match('!//(www\.)?dailymotion\.com/embed/video/([^/?]+)([/?].+)?!i', $src, $src_matches)) {
 			// Embedded Daily Motion videos
-			$src = 'https://www.dailymotion.com/video/' . $src_matches[2];
+			$src = 'https://www.dailymotion.com/video/'.$src_matches[2];
 		} else {
-			require_once( ABSPATH . WPINC . '/class-oembed.php' );
+			require_once(ABSPATH.WPINC.'/class-oembed.php');
 			$oembed = _wp_oembed_get_object();
 
-			if ( ! $oembed->get_provider( $src, array( 'discover' => false ) ) ) {
+			if ( ! $oembed->get_provider($src, array('discover' => false))) {
 				$src = '';
 			}
 		}
@@ -500,21 +500,21 @@ 
 	 * @param array  $data       Associative array of source data.
 	 * @return array Processed data array.
 	 */
-	private function _process_meta_entry( $meta_name, $meta_value, $data ) {
-		if ( preg_match( '/:?(title|description|keywords|site_name)$/', $meta_name ) ) {
-			$data['_meta'][ $meta_name ] = $meta_value;
+	private function _process_meta_entry($meta_name, $meta_value, $data) {
+		if (preg_match('/:?(title|description|keywords|site_name)$/', $meta_name)) {
+			$data['_meta'][$meta_name] = $meta_value;
 		} else {
-			switch ( $meta_name ) {
+			switch ($meta_name) {
 				case 'og:url':
 				case 'og:video':
 				case 'og:video:secure_url':
-					$meta_value = $this->_limit_embed( $meta_value );
+					$meta_value = $this->_limit_embed($meta_value);
 
-					if ( ! isset( $data['_embeds'] ) ) {
+					if ( ! isset($data['_embeds'])) {
 						$data['_embeds'] = array();
 					}
 
-					if ( ! empty( $meta_value ) && ! in_array( $meta_value, $data['_embeds'] ) ) {
+					if ( ! empty($meta_value) && ! in_array($meta_value, $data['_embeds'])) {
 						$data['_embeds'][] = $meta_value;
 					}
 
@@ -525,13 +525,13 @@ 
 				case 'twitter:image0':
 				case 'twitter:image:src':
 				case 'twitter:image':
-					$meta_value = $this->_limit_img( $meta_value );
+					$meta_value = $this->_limit_img($meta_value);
 
-					if ( ! isset( $data['_images'] ) ) {
+					if ( ! isset($data['_images'])) {
 						$data['_images'] = array();
 					}
 
-					if ( ! empty( $meta_value ) && ! in_array( $meta_value, $data['_images'] ) ) {
+					if ( ! empty($meta_value) && ! in_array($meta_value, $data['_images'])) {
 						$data['_images'][] = $meta_value;
 					}
 
@@ -552,58 +552,58 @@ 
 	 * @param array  $data Optional. Existing data array if you have one. Default empty array.
 	 * @return array New data array.
 	 */
-	public function source_data_fetch_fallback( $url, $data = array() ) {
-		if ( empty( $url ) ) {
+	public function source_data_fetch_fallback($url, $data = array()) {
+		if (empty($url)) {
 			return array();
 		}
 
 		// Download source page to tmp file.
-		$source_content = $this->fetch_source_html( $url );
-		if ( is_wp_error( $source_content ) ) {
-			return array( 'errors' => $source_content->get_error_messages() );
+		$source_content = $this->fetch_source_html($url);
+		if (is_wp_error($source_content)) {
+			return array('errors' => $source_content->get_error_messages());
 		}
 
 		// Fetch and gather <meta> data first, so discovered media is offered 1st to user.
-		if ( empty( $data['_meta'] ) ) {
+		if (empty($data['_meta'])) {
 			$data['_meta'] = array();
 		}
 
-		if ( preg_match_all( '/<meta [^>]+>/', $source_content, $matches ) ) {
-			$items = $this->_limit_array( $matches[0] );
+		if (preg_match_all('/<meta [^>]+>/', $source_content, $matches)) {
+			$items = $this->_limit_array($matches[0]);
 
-			foreach ( $items as $value ) {
-				if ( preg_match( '/(property|name)="([^"]+)"[^>]+content="([^"]+)"/', $value, $new_matches ) ) {
-					$meta_name  = $this->_limit_string( $new_matches[2] );
-					$meta_value = $this->_limit_string( $new_matches[3] );
+			foreach ($items as $value) {
+				if (preg_match('/(property|name)="([^"]+)"[^>]+content="([^"]+)"/', $value, $new_matches)) {
+					$meta_name  = $this->_limit_string($new_matches[2]);
+					$meta_value = $this->_limit_string($new_matches[3]);
 
 					// Sanity check. $key is usually things like 'title', 'description', 'keywords', etc.
-					if ( strlen( $meta_name ) > 100 ) {
+					if (strlen($meta_name) > 100) {
 						continue;
 					}
 
-					$data = $this->_process_meta_entry( $meta_name, $meta_value, $data );
+					$data = $this->_process_meta_entry($meta_name, $meta_value, $data);
 				}
 			}
 		}
 
 		// Fetch and gather <img> data.
-		if ( empty( $data['_images'] ) ) {
+		if (empty($data['_images'])) {
 			$data['_images'] = array();
 		}
 
-		if ( preg_match_all( '/<img [^>]+>/', $source_content, $matches ) ) {
-			$items = $this->_limit_array( $matches[0] );
+		if (preg_match_all('/<img [^>]+>/', $source_content, $matches)) {
+			$items = $this->_limit_array($matches[0]);
 
-			foreach ( $items as $value ) {
-				if ( ( preg_match( '/width=(\'|")(\d+)\\1/i', $value, $new_matches ) && $new_matches[2] < 256 ) ||
-					( preg_match( '/height=(\'|")(\d+)\\1/i', $value, $new_matches ) && $new_matches[2] < 128 ) ) {
+			foreach ($items as $value) {
+				if ((preg_match('/width=(\'|")(\d+)\\1/i', $value, $new_matches) && $new_matches[2] < 256) ||
+					(preg_match('/height=(\'|")(\d+)\\1/i', $value, $new_matches) && $new_matches[2] < 128)) {
 
 					continue;
 				}
 
-				if ( preg_match( '/src=(\'|")([^\'"]+)\\1/i', $value, $new_matches ) ) {
-					$src = $this->_limit_img( $new_matches[2] );
-					if ( ! empty( $src ) && ! in_array( $src, $data['_images'] ) ) {
+				if (preg_match('/src=(\'|")([^\'"]+)\\1/i', $value, $new_matches)) {
+					$src = $this->_limit_img($new_matches[2]);
+					if ( ! empty($src) && ! in_array($src, $data['_images'])) {
 						$data['_images'][] = $src;
 					}
 				}
@@ -611,18 +611,18 @@ 
 		}
 
 		// Fetch and gather <iframe> data.
-		if ( empty( $data['_embeds'] ) ) {
+		if (empty($data['_embeds'])) {
 			$data['_embeds'] = array();
 		}
 
-		if ( preg_match_all( '/<iframe [^>]+>/', $source_content, $matches ) ) {
-			$items = $this->_limit_array( $matches[0] );
+		if (preg_match_all('/<iframe [^>]+>/', $source_content, $matches)) {
+			$items = $this->_limit_array($matches[0]);
 
-			foreach ( $items as $value ) {
-				if ( preg_match( '/src=(\'|")([^\'"]+)\\1/', $value, $new_matches ) ) {
-					$src = $this->_limit_embed( $new_matches[2] );
+			foreach ($items as $value) {
+				if (preg_match('/src=(\'|")([^\'"]+)\\1/', $value, $new_matches)) {
+					$src = $this->_limit_embed($new_matches[2]);
 
-					if ( ! empty( $src ) && ! in_array( $src, $data['_embeds'] ) ) {
+					if ( ! empty($src) && ! in_array($src, $data['_embeds'])) {
 						$data['_embeds'][] = $src;
 					}
 				}
@@ -630,20 +630,20 @@ 
 		}
 
 		// Fetch and gather <link> data.
-		if ( empty( $data['_links'] ) ) {
+		if (empty($data['_links'])) {
 			$data['_links'] = array();
 		}
 
-		if ( preg_match_all( '/<link [^>]+>/', $source_content, $matches ) ) {
-			$items = $this->_limit_array( $matches[0] );
+		if (preg_match_all('/<link [^>]+>/', $source_content, $matches)) {
+			$items = $this->_limit_array($matches[0]);
 
-			foreach ( $items as $value ) {
-				if ( preg_match( '/rel=["\'](canonical|shortlink|icon)["\']/i', $value, $matches_rel ) && preg_match( '/href=[\'"]([^\'" ]+)[\'"]/i', $value, $matches_url ) ) {
+			foreach ($items as $value) {
+				if (preg_match('/rel=["\'](canonical|shortlink|icon)["\']/i', $value, $matches_rel) && preg_match('/href=[\'"]([^\'" ]+)[\'"]/i', $value, $matches_url)) {
 					$rel = $matches_rel[1];
-					$url = $this->_limit_url( $matches_url[1] );
+					$url = $this->_limit_url($matches_url[1]);
 
-					if ( ! empty( $url ) && empty( $data['_links'][ $rel ] ) ) {
-						$data['_links'][ $rel ] = $url;
+					if ( ! empty($url) && empty($data['_links'][$rel])) {
+						$data['_links'][$rel] = $url;
 					}
 				}
 			}
@@ -665,27 +665,27 @@ 
 		$data = array();
 
 		// Only instantiate the keys we want. Sanity check and sanitize each one.
-		foreach ( array( 'u', 's', 't', 'v' ) as $key ) {
-			if ( ! empty( $_POST[ $key ] ) ) {
-				$value = wp_unslash( $_POST[ $key ] );
-			} else if ( ! empty( $_GET[ $key ] ) ) {
-				$value = wp_unslash( $_GET[ $key ] );
+		foreach (array('u', 's', 't', 'v') as $key) {
+			if ( ! empty($_POST[$key])) {
+				$value = wp_unslash($_POST[$key]);
+			} else if ( ! empty($_GET[$key])) {
+				$value = wp_unslash($_GET[$key]);
 			} else {
 				continue;
 			}
 
-			if ( 'u' === $key ) {
-				$value = $this->_limit_url( $value );
+			if ('u' === $key) {
+				$value = $this->_limit_url($value);
 
-				if ( preg_match( '%^(?:https?:)?//[^/]+%i', $value, $domain_match ) ) {
+				if (preg_match('%^(?:https?:)?//[^/]+%i', $value, $domain_match)) {
 					$this->domain = $domain_match[0];
 				}
 			} else {
-				$value = $this->_limit_string( $value );
+				$value = $this->_limit_string($value);
 			}
 
-			if ( ! empty( $value ) ) {
-				$data[ $key ] = $value;
+			if ( ! empty($value)) {
+				$data[$key] = $value;
 			}
 		}
 
@@ -696,58 +696,58 @@ 
 		 *
 		 * @param bool $enable Whether to enable media discovery.
 		 */
-		if ( apply_filters( 'enable_press_this_media_discovery', true ) ) {
+		if (apply_filters('enable_press_this_media_discovery', true)) {
 			/*
 			 * If no title, _images, _embed, and _meta was passed via $_POST, fetch data from source as fallback,
 			 * making PT fully backward compatible with the older bookmarklet.
 			 */
-			if ( empty( $_POST ) && ! empty( $data['u'] ) ) {
-				$data = $this->source_data_fetch_fallback( $data['u'], $data );
+			if (empty($_POST) && ! empty($data['u'])) {
+				$data = $this->source_data_fetch_fallback($data['u'], $data);
 			} else {
-				foreach ( array( '_images', '_embeds' ) as $type ) {
-					if ( empty( $_POST[ $type ] ) ) {
+				foreach (array('_images', '_embeds') as $type) {
+					if (empty($_POST[$type])) {
 						continue;
 					}
 
-					$data[ $type ] = array();
-					$items = $this->_limit_array( $_POST[ $type ] );
+					$data[$type] = array();
+					$items = $this->_limit_array($_POST[$type]);
 
-					foreach ( $items as $key => $value ) {
-						if ( $type === '_images' ) {
-							$value = $this->_limit_img( wp_unslash( $value ) );
+					foreach ($items as $key => $value) {
+						if ($type === '_images') {
+							$value = $this->_limit_img(wp_unslash($value));
 						} else {
-							$value = $this->_limit_embed( wp_unslash( $value ) );
+							$value = $this->_limit_embed(wp_unslash($value));
 						}
 
-						if ( ! empty( $value ) ) {
-							$data[ $type ][] = $value;
+						if ( ! empty($value)) {
+							$data[$type][] = $value;
 						}
 					}
 				}
 
-				foreach ( array( '_meta', '_links' ) as $type ) {
-					if ( empty( $_POST[ $type ] ) ) {
+				foreach (array('_meta', '_links') as $type) {
+					if (empty($_POST[$type])) {
 						continue;
 					}
 
-					$data[ $type ] = array();
-					$items = $this->_limit_array( $_POST[ $type ] );
+					$data[$type] = array();
+					$items = $this->_limit_array($_POST[$type]);
 
-					foreach ( $items as $key => $value ) {
+					foreach ($items as $key => $value) {
 						// Sanity check. These are associative arrays, $key is usually things like 'title', 'description', 'keywords', etc.
-						if ( empty( $key ) || strlen( $key ) > 100 ) {
+						if (empty($key) || strlen($key) > 100) {
 							continue;
 						}
 
-						if ( $type === '_meta' ) {
-							$value = $this->_limit_string( wp_unslash( $value ) );
+						if ($type === '_meta') {
+							$value = $this->_limit_string(wp_unslash($value));
 
-							if ( ! empty( $value ) ) {
-								$data = $this->_process_meta_entry( $key, $value, $data );
+							if ( ! empty($value)) {
+								$data = $this->_process_meta_entry($key, $value, $data);
 							}
 						} else {
-							if ( in_array( $key, array( 'canonical', 'shortlink', 'icon' ), true ) ) {
-								$data[ $type ][ $key ] = $this->_limit_url( wp_unslash( $value ) );
+							if (in_array($key, array('canonical', 'shortlink', 'icon'), true)) {
+								$data[$type][$key] = $this->_limit_url(wp_unslash($value));
 							}
 						}
 					}
@@ -755,11 +755,11 @@ 
 			}
 
 			// Support passing a single image src as `i`
-			if ( ! empty( $_REQUEST['i'] ) && ( $img_src = $this->_limit_img( wp_unslash( $_REQUEST['i'] ) ) ) ) {
-				if ( empty( $data['_images'] ) ) {
-					$data['_images'] = array( $img_src );
-				} elseif ( ! in_array( $img_src, $data['_images'], true ) ) {
-					array_unshift( $data['_images'], $img_src );
+			if ( ! empty($_REQUEST['i']) && ($img_src = $this->_limit_img(wp_unslash($_REQUEST['i'])))) {
+				if (empty($data['_images'])) {
+					$data['_images'] = array($img_src);
+				} elseif ( ! in_array($img_src, $data['_images'], true)) {
+					array_unshift($data['_images'], $img_src);
 				}
 			}
 		}
@@ -771,7 +771,7 @@ 
 		 *
 		 * @param array $data Press This Data array.
 		 */
-		return apply_filters( 'press_this_data', $data );
+		return apply_filters('press_this_data', $data);
 	}
 
 	/**
@@ -783,14 +783,14 @@ 
 	 * @param string $styles URL to editor stylesheet.
 	 * @return string Possibly modified stylesheets list.
 	 */
-	public function add_editor_style( $styles ) {
-		if ( ! empty( $styles ) ) {
+	public function add_editor_style($styles) {
+		if ( ! empty($styles)) {
 			$styles .= ',';
 		}
 
-		$press_this = admin_url( 'css/press-this-editor.css' );
-		if ( is_rtl() ) {
-			$press_this = str_replace( '.css', '-rtl.css', $press_this );
+		$press_this = admin_url('css/press-this-editor.css');
+		if (is_rtl()) {
+			$press_this = str_replace('.css', '-rtl.css', $press_this);
 		}
 
 		$open_sans_font_url = '';
@@ -798,31 +798,31 @@ 
 		/* translators: If there are characters in your language that are not supported
 		 * by Open Sans, translate this to 'off'. Do not translate into your own language.
 		 */
-		if ( 'off' !== _x( 'on', 'Open Sans font: on or off' ) ) {
+		if ('off' !== _x('on', 'Open Sans font: on or off')) {
 			$subsets = 'latin,latin-ext';
 
 			/* translators: To add an additional Open Sans character subset specific to your language,
 			 * translate this to 'greek', 'cyrillic' or 'vietnamese'. Do not translate into your own language.
 			 */
-			$subset = _x( 'no-subset', 'Open Sans font: add new subset (greek, cyrillic, vietnamese)' );
+			$subset = _x('no-subset', 'Open Sans font: add new subset (greek, cyrillic, vietnamese)');
 
-			if ( 'cyrillic' == $subset ) {
+			if ('cyrillic' == $subset) {
 				$subsets .= ',cyrillic,cyrillic-ext';
-			} elseif ( 'greek' == $subset ) {
+			} elseif ('greek' == $subset) {
 				$subsets .= ',greek,greek-ext';
-			} elseif ( 'vietnamese' == $subset ) {
+			} elseif ('vietnamese' == $subset) {
 				$subsets .= ',vietnamese';
 			}
 
 			$query_args = array(
-				'family' => urlencode( 'Open Sans:400italic,700italic,400,600,700' ),
-				'subset' => urlencode( $subsets ),
+				'family' => urlencode('Open Sans:400italic,700italic,400,600,700'),
+				'subset' => urlencode($subsets),
 			);
 
-			$open_sans_font_url = ',' . add_query_arg( $query_args, 'https://fonts.googleapis.com/css' );
+			$open_sans_font_url = ','.add_query_arg($query_args, 'https://fonts.googleapis.com/css');
 		}
 
-		return $styles . $press_this . $open_sans_font_url;
+		return $styles.$press_this.$open_sans_font_url;
 	}
 
 	/**
@@ -833,35 +833,35 @@ 
 	 *
 	 * @param WP_Post $post Post object.
 	 */
-	public function post_formats_html( $post ) {
-		if ( current_theme_supports( 'post-formats' ) && post_type_supports( $post->post_type, 'post-formats' ) ) {
-			$post_formats = get_theme_support( 'post-formats' );
+	public function post_formats_html($post) {
+		if (current_theme_supports('post-formats') && post_type_supports($post->post_type, 'post-formats')) {
+			$post_formats = get_theme_support('post-formats');
 
-			if ( is_array( $post_formats[0] ) ) {
-				$post_format = get_post_format( $post->ID );
+			if (is_array($post_formats[0])) {
+				$post_format = get_post_format($post->ID);
 
-				if ( ! $post_format ) {
+				if ( ! $post_format) {
 					$post_format = '0';
 				}
 
 				// Add in the current one if it isn't there yet, in case the current theme doesn't support it.
-				if ( $post_format && ! in_array( $post_format, $post_formats[0] ) ) {
+				if ($post_format && ! in_array($post_format, $post_formats[0])) {
 					$post_formats[0][] = $post_format;
 				}
 
 				?>
 				<div id="post-formats-select">
-				<fieldset><legend class="screen-reader-text"><?php _e( 'Post Formats' ); ?></legend>
-					<input type="radio" name="post_format" class="post-format" id="post-format-0" value="0" <?php checked( $post_format, '0' ); ?> />
-					<label for="post-format-0" class="post-format-icon post-format-standard"><?php echo get_post_format_string( 'standard' ); ?></label>
+				<fieldset><legend class="screen-reader-text"><?php _e('Post Formats'); ?></legend>
+					<input type="radio" name="post_format" class="post-format" id="post-format-0" value="0" <?php checked($post_format, '0'); ?> />
+					<label for="post-format-0" class="post-format-icon post-format-standard"><?php echo get_post_format_string('standard'); ?></label>
 					<?php
 
-					foreach ( $post_formats[0] as $format ) {
-						$attr_format = esc_attr( $format );
+					foreach ($post_formats[0] as $format) {
+						$attr_format = esc_attr($format);
 						?>
 						<br />
-						<input type="radio" name="post_format" class="post-format" id="post-format-<?php echo $attr_format; ?>" value="<?php echo $attr_format; ?>" <?php checked( $post_format, $format ); ?> />
-						<label for="post-format-<?php echo $attr_format ?>" class="post-format-icon post-format-<?php echo $attr_format; ?>"><?php echo esc_html( get_post_format_string( $format ) ); ?></label>
+						<input type="radio" name="post_format" class="post-format" id="post-format-<?php echo $attr_format; ?>" value="<?php echo $attr_format; ?>" <?php checked($post_format, $format); ?> />
+						<label for="post-format-<?php echo $attr_format ?>" class="post-format-icon post-format-<?php echo $attr_format; ?>"><?php echo esc_html(get_post_format_string($format)); ?></label>
 						<?php
 					 }
 
@@ -881,45 +881,45 @@ 
 	 *
 	 * @param WP_Post $post Post object.
 	 */
-	public function categories_html( $post ) {
-		$taxonomy = get_taxonomy( 'category' );
+	public function categories_html($post) {
+		$taxonomy = get_taxonomy('category');
 
-		if ( current_user_can( $taxonomy->cap->edit_terms ) ) {
+		if (current_user_can($taxonomy->cap->edit_terms)) {
 			?>
 			<button type="button" class="add-cat-toggle button-link" aria-expanded="false">
-				<span class="dashicons dashicons-plus"></span><span class="screen-reader-text"><?php _e( 'Toggle add category' ); ?></span>
+				<span class="dashicons dashicons-plus"></span><span class="screen-reader-text"><?php _e('Toggle add category'); ?></span>
 			</button>
 			<div class="add-category is-hidden">
 				<label class="screen-reader-text" for="new-category"><?php echo $taxonomy->labels->add_new_item; ?></label>
-				<input type="text" id="new-category" class="add-category-name" placeholder="<?php echo esc_attr( $taxonomy->labels->new_item_name ); ?>" value="" aria-required="true">
+				<input type="text" id="new-category" class="add-category-name" placeholder="<?php echo esc_attr($taxonomy->labels->new_item_name); ?>" value="" aria-required="true">
 				<label class="screen-reader-text" for="new-category-parent"><?php echo $taxonomy->labels->parent_item_colon; ?></label>
 				<div class="postform-wrapper">
 					<?php
-					wp_dropdown_categories( array(
+					wp_dropdown_categories(array(
 						'taxonomy'         => 'category',
 						'hide_empty'       => 0,
 						'name'             => 'new-category-parent',
 						'orderby'          => 'name',
 						'hierarchical'     => 1,
-						'show_option_none' => '&mdash; ' . $taxonomy->labels->parent_item . ' &mdash;'
-					) );
+						'show_option_none' => '&mdash; '.$taxonomy->labels->parent_item.' &mdash;'
+					));
 					?>
 				</div>
-				<button type="button" class="add-cat-submit"><?php _e( 'Add' ); ?></button>
+				<button type="button" class="add-cat-submit"><?php _e('Add'); ?></button>
 			</div>
 			<?php
 
 		}
 		?>
 		<div class="categories-search-wrapper">
-			<input id="categories-search" type="search" class="categories-search" placeholder="<?php esc_attr_e( 'Search categories by name' ) ?>">
+			<input id="categories-search" type="search" class="categories-search" placeholder="<?php esc_attr_e('Search categories by name') ?>">
 			<label for="categories-search">
-				<span class="dashicons dashicons-search"></span><span class="screen-reader-text"><?php _e( 'Search categories' ); ?></span>
+				<span class="dashicons dashicons-search"></span><span class="screen-reader-text"><?php _e('Search categories'); ?></span>
 			</label>
 		</div>
-		<div aria-label="<?php esc_attr_e( 'Categories' ); ?>">
+		<div aria-label="<?php esc_attr_e('Categories'); ?>">
 			<ul class="categories-select">
-				<?php wp_terms_checklist( $post->ID, array( 'taxonomy' => 'category', 'list_only' => true ) ); ?>
+				<?php wp_terms_checklist($post->ID, array('taxonomy' => 'category', 'list_only' => true)); ?>
 			</ul>
 		</div>
 		<?php
@@ -933,12 +933,12 @@ 
 	 *
 	 * @param WP_Post $post Post object.
 	 */
-	public function tags_html( $post ) {
-		$taxonomy              = get_taxonomy( 'post_tag' );
-		$user_can_assign_terms = current_user_can( $taxonomy->cap->assign_terms );
-		$esc_tags              = get_terms_to_edit( $post->ID, 'post_tag' );
+	public function tags_html($post) {
+		$taxonomy              = get_taxonomy('post_tag');
+		$user_can_assign_terms = current_user_can($taxonomy->cap->assign_terms);
+		$esc_tags              = get_terms_to_edit($post->ID, 'post_tag');
 
-		if ( ! $esc_tags || is_wp_error( $esc_tags ) ) {
+		if ( ! $esc_tags || is_wp_error($esc_tags)) {
 			$esc_tags = '';
 		}
 
@@ -948,13 +948,13 @@ 
 			<input type="hidden" name="tax_input[post_tag]" class="the-tags" value="<?php echo $esc_tags; // escaped in get_terms_to_edit() ?>">
 		 	<?php
 
-			if ( $user_can_assign_terms ) {
+			if ($user_can_assign_terms) {
 				?>
 				<div class="ajaxtag hide-if-no-js">
-					<label class="screen-reader-text" for="new-tag-post_tag"><?php _e( 'Tags' ); ?></label>
+					<label class="screen-reader-text" for="new-tag-post_tag"><?php _e('Tags'); ?></label>
 					<p>
 						<input type="text" id="new-tag-post_tag" name="newtag[post_tag]" class="newtag form-input-tip" size="16" autocomplete="off" value="" aria-describedby="new-tag-desc" />
-						<button type="button" class="tagadd"><?php _e( 'Add' ); ?></button>
+						<button type="button" class="tagadd"><?php _e('Add'); ?></button>
 					</p>
 				</div>
 				<p class="howto" id="new-tag-desc">
@@ -969,7 +969,7 @@ 
 		</div>
 		<?php
 
-		if ( $user_can_assign_terms ) {
+		if ($user_can_assign_terms) {
 			?>
 			<button type="button" class="button-link tagcloud-link" id="link-post_tag"><?php echo $taxonomy->labels->choose_from_most_used; ?></button>
 			<?php
@@ -985,19 +985,19 @@ 
 	 * @param array $data The site's data.
 	 * @return array Embeds selected to be available.
 	 */
-	public function get_embeds( $data ) {
+	public function get_embeds($data) {
 		$selected_embeds = array();
 
 		// Make sure to add the Pressed page if it's a valid oembed itself
-		if ( ! empty ( $data['u'] ) && $this->_limit_embed( $data['u'] ) ) {
+		if ( ! empty ($data['u']) && $this->_limit_embed($data['u'])) {
 			$data['_embeds'][] = $data['u'];
 		}
 
-		if ( ! empty( $data['_embeds'] ) ) {
-			foreach ( $data['_embeds'] as $src ) {
-				$prot_relative_src = preg_replace( '/^https?:/', '', $src );
+		if ( ! empty($data['_embeds'])) {
+			foreach ($data['_embeds'] as $src) {
+				$prot_relative_src = preg_replace('/^https?:/', '', $src);
 
-				if ( in_array( $prot_relative_src, $this->embeds ) ) {
+				if (in_array($prot_relative_src, $this->embeds)) {
 					continue;
 				}
 
@@ -1018,19 +1018,19 @@ 
 	 * @param array $data The site's data.
 	 * @return array
 	 */
-	public function get_images( $data ) {
+	public function get_images($data) {
 		$selected_images = array();
 
-		if ( ! empty( $data['_images'] ) ) {
-			foreach ( $data['_images'] as $src ) {
-				if ( false !== strpos( $src, 'gravatar.com' ) ) {
-					$src = preg_replace( '%http://[\d]+\.gravatar\.com/%', 'https://secure.gravatar.com/', $src );
+		if ( ! empty($data['_images'])) {
+			foreach ($data['_images'] as $src) {
+				if (false !== strpos($src, 'gravatar.com')) {
+					$src = preg_replace('%http://[\d]+\.gravatar\.com/%', 'https://secure.gravatar.com/', $src);
 				}
 
-				$prot_relative_src = preg_replace( '/^https?:/', '', $src );
+				$prot_relative_src = preg_replace('/^https?:/', '', $src);
 
-				if ( in_array( $prot_relative_src, $this->images ) ||
-					( false !== strpos( $src, 'avatar' ) && count( $this->images ) > 15 ) ) {
+				if (in_array($prot_relative_src, $this->images) ||
+					(false !== strpos($src, 'avatar') && count($this->images) > 15)) {
 					// Skip: already selected or some type of avatar and we've already gathered more than 15 images.
 					continue;
 				}
@@ -1052,22 +1052,22 @@ 
  	 * @param array $data The site's data.
 	 * @return string Discovered canonical URL, or empty
 	 */
-	public function get_canonical_link( $data ) {
+	public function get_canonical_link($data) {
 		$link = '';
 
-		if ( ! empty( $data['_links']['canonical'] ) ) {
+		if ( ! empty($data['_links']['canonical'])) {
 			$link = $data['_links']['canonical'];
-		} elseif ( ! empty( $data['u'] ) ) {
+		} elseif ( ! empty($data['u'])) {
 			$link = $data['u'];
-		} elseif ( ! empty( $data['_meta'] ) ) {
-			if ( ! empty( $data['_meta']['twitter:url'] ) ) {
+		} elseif ( ! empty($data['_meta'])) {
+			if ( ! empty($data['_meta']['twitter:url'])) {
 				$link = $data['_meta']['twitter:url'];
-			} else if ( ! empty( $data['_meta']['og:url'] ) ) {
+			} else if ( ! empty($data['_meta']['og:url'])) {
 				$link = $data['_meta']['og:url'];
 			}
 		}
 
-		if ( empty( $link ) && ! empty( $data['_links']['shortlink'] ) ) {
+		if (empty($link) && ! empty($data['_links']['shortlink'])) {
 			$link = $data['_links']['shortlink'];
 		}
 
@@ -1083,13 +1083,13 @@ 
 	 * @param array $data The site's data.
 	 * @return string Discovered site name, or empty
 	 */
-	public function get_source_site_name( $data ) {
+	public function get_source_site_name($data) {
 		$name = '';
 
-		if ( ! empty( $data['_meta'] ) ) {
-			if ( ! empty( $data['_meta']['og:site_name'] ) ) {
+		if ( ! empty($data['_meta'])) {
+			if ( ! empty($data['_meta']['og:site_name'])) {
 				$name = $data['_meta']['og:site_name'];
-			} else if ( ! empty( $data['_meta']['application-name'] ) ) {
+			} else if ( ! empty($data['_meta']['application-name'])) {
 				$name = $data['_meta']['application-name'];
 			}
 		}
@@ -1106,17 +1106,17 @@ 
 	 * @param array $data The site's data.
 	 * @return string Discovered page title, or empty
 	 */
-	public function get_suggested_title( $data ) {
+	public function get_suggested_title($data) {
 		$title = '';
 
-		if ( ! empty( $data['t'] ) ) {
+		if ( ! empty($data['t'])) {
 			$title = $data['t'];
-		} elseif ( ! empty( $data['_meta'] ) ) {
-			if ( ! empty( $data['_meta']['twitter:title'] ) ) {
+		} elseif ( ! empty($data['_meta'])) {
+			if ( ! empty($data['_meta']['twitter:title'])) {
 				$title = $data['_meta']['twitter:title'];
-			} else if ( ! empty( $data['_meta']['og:title'] ) ) {
+			} else if ( ! empty($data['_meta']['og:title'])) {
 				$title = $data['_meta']['og:title'];
-			} else if ( ! empty( $data['_meta']['title'] ) ) {
+			} else if ( ! empty($data['_meta']['title'])) {
 				$title = $data['_meta']['title'];
 			}
 		}
@@ -1135,38 +1135,38 @@ 
 	 * @param array $data The site's data.
 	 * @return string Discovered content, or empty
 	 */
-	public function get_suggested_content( $data ) {
+	public function get_suggested_content($data) {
 		$content = $text = '';
 
-		if ( ! empty( $data['s'] ) ) {
+		if ( ! empty($data['s'])) {
 			$text = $data['s'];
-		} else if ( ! empty( $data['_meta'] ) ) {
-			if ( ! empty( $data['_meta']['twitter:description'] ) ) {
+		} else if ( ! empty($data['_meta'])) {
+			if ( ! empty($data['_meta']['twitter:description'])) {
 				$text = $data['_meta']['twitter:description'];
-			} else if ( ! empty( $data['_meta']['og:description'] ) ) {
+			} else if ( ! empty($data['_meta']['og:description'])) {
 				$text = $data['_meta']['og:description'];
-			} else if ( ! empty( $data['_meta']['description'] ) ) {
+			} else if ( ! empty($data['_meta']['description'])) {
 				$text = $data['_meta']['description'];
 			}
 
 			// If there is an ellipsis at the end, the description is very likely auto-generated. Better to ignore it.
-			if ( $text && substr( $text, -3 ) === '...' ) {
+			if ($text && substr($text, -3) === '...') {
 				$text = '';
 			}
 		}
 
-		$default_html = array( 'quote' => '', 'link' => '', 'embed' => '' );
+		$default_html = array('quote' => '', 'link' => '', 'embed' => '');
 
-		if ( ! empty( $data['u'] ) && $this->_limit_embed( $data['u'] ) ) {
-			$default_html['embed'] = '<p>[embed]' . $data['u'] . '[/embed]</p>';
+		if ( ! empty($data['u']) && $this->_limit_embed($data['u'])) {
+			$default_html['embed'] = '<p>[embed]'.$data['u'].'[/embed]</p>';
 
-			if ( ! empty( $data['s'] ) ) {
+			if ( ! empty($data['s'])) {
 				// If the user has selected some text, do quote it.
 				$default_html['quote'] = '<blockquote>%1$s</blockquote>';
 			}
 		} else {
 			$default_html['quote'] = '<blockquote>%1$s</blockquote>';
-			$default_html['link'] = '<p>' . _x( 'Source:', 'Used in Press This to indicate where the content comes from.' ) .
+			$default_html['link'] = '<p>'._x('Source:', 'Used in Press This to indicate where the content comes from.').
 				' <em><a href="%1$s">%2$s</a></em></p>';
 		}
 
@@ -1183,28 +1183,28 @@ 
 		 *                                - 'embed' which contains an [embed] shortcode when the source page offers embeddable content.
 		 * @param array $data         Associative array containing the data from the source page.
 		 */
-		$default_html = apply_filters( 'press_this_suggested_html', $default_html, $data );
+		$default_html = apply_filters('press_this_suggested_html', $default_html, $data);
 
-		if ( ! empty( $default_html['embed'] ) ) {
+		if ( ! empty($default_html['embed'])) {
 			$content .= $default_html['embed'];
 		}
 
 		// Wrap suggested content in the specified HTML.
-		if ( ! empty( $default_html['quote'] ) && $text ) {
-			$content .= sprintf( $default_html['quote'], $text );
+		if ( ! empty($default_html['quote']) && $text) {
+			$content .= sprintf($default_html['quote'], $text);
 		}
 
 		// Add source attribution if there is one available.
-		if ( ! empty( $default_html['link'] ) ) {
-			$title = $this->get_suggested_title( $data );
-			$url = $this->get_canonical_link( $data );
+		if ( ! empty($default_html['link'])) {
+			$title = $this->get_suggested_title($data);
+			$url = $this->get_canonical_link($data);
 
-			if ( ! $title ) {
-				$title = $this->get_source_site_name( $data );
+			if ( ! $title) {
+				$title = $this->get_source_site_name($data);
 			}
 
-			if ( $url && $title ) {
-				$content .= sprintf( $default_html['link'], $url, $title );
+			if ($url && $title) {
+				$content .= sprintf($default_html['link'], $url, $title);
 			}
 		}
 
@@ -1227,41 +1227,41 @@ 
 		// Get data, new (POST) and old (GET).
 		$data = $this->merge_or_fetch_data();
 
-		$post_title = $this->get_suggested_title( $data );
+		$post_title = $this->get_suggested_title($data);
 
-		$post_content = $this->get_suggested_content( $data );
+		$post_content = $this->get_suggested_content($data);
 
 		// Get site settings array/data.
 		$site_settings = $this->site_settings();
 
 		// Pass the images and embeds
-		$images = $this->get_images( $data );
-		$embeds = $this->get_embeds( $data );
+		$images = $this->get_images($data);
+		$embeds = $this->get_embeds($data);
 
 		$site_data = array(
-			'v' => ! empty( $data['v'] ) ? $data['v'] : '',
-			'u' => ! empty( $data['u'] ) ? $data['u'] : '',
-			'hasData' => ! empty( $data ),
+			'v' => ! empty($data['v']) ? $data['v'] : '',
+			'u' => ! empty($data['u']) ? $data['u'] : '',
+			'hasData' => ! empty($data),
 		);
 
-		if ( ! empty( $images ) ) {
+		if ( ! empty($images)) {
 			$site_data['_images'] = $images;
 		}
 
-		if ( ! empty( $embeds ) ) {
+		if ( ! empty($embeds)) {
 			$site_data['_embeds'] = $embeds;
 		}
 
 		// Add press-this-editor.css and remove theme's editor-style.css, if any.
 		remove_editor_styles();
 
-		add_filter( 'mce_css', array( $this, 'add_editor_style' ) );
+		add_filter('mce_css', array($this, 'add_editor_style'));
 
-		if ( ! empty( $GLOBALS['is_IE'] ) ) {
-			@header( 'X-UA-Compatible: IE=edge' );
+		if ( ! empty($GLOBALS['is_IE'])) {
+			@header('X-UA-Compatible: IE=edge');
 		}
 
-		@header( 'Content-Type: ' . get_option( 'html_type' ) . '; charset=' . get_option( 'blog_charset' ) );
+		@header('Content-Type: '.get_option('html_type').'; charset='.get_option('blog_charset'));
 
 ?>
 <!DOCTYPE html>
@@ -1269,22 +1269,22 @@ 
 <!--[if IE 8]>         <html class="lt-ie9" <?php language_attributes(); ?>> <![endif]-->
 <!--[if gt IE 8]><!--> <html <?php language_attributes(); ?>> <!--<![endif]-->
 <head>
-	<meta http-equiv="Content-Type" content="<?php echo esc_attr( get_bloginfo( 'html_type' ) ); ?>; charset=<?php echo esc_attr( get_option( 'blog_charset' ) ); ?>" />
+	<meta http-equiv="Content-Type" content="<?php echo esc_attr(get_bloginfo('html_type')); ?>; charset=<?php echo esc_attr(get_option('blog_charset')); ?>" />
 	<meta name="viewport" content="width=device-width">
-	<title><?php esc_html_e( 'Press This!' ) ?></title>
+	<title><?php esc_html_e('Press This!') ?></title>
 
 	<script>
-		window.wpPressThisData   = <?php echo wp_json_encode( $site_data ); ?>;
-		window.wpPressThisConfig = <?php echo wp_json_encode( $site_settings ); ?>;
+		window.wpPressThisData   = <?php echo wp_json_encode($site_data); ?>;
+		window.wpPressThisConfig = <?php echo wp_json_encode($site_settings); ?>;
 	</script>
 
 	<script type="text/javascript">
-		var ajaxurl = '<?php echo esc_js( admin_url( 'admin-ajax.php', 'relative' ) ); ?>',
+		var ajaxurl = '<?php echo esc_js(admin_url('admin-ajax.php', 'relative')); ?>',
 			pagenow = 'press-this',
 			typenow = 'post',
 			adminpage = 'press-this-php',
-			thousandsSeparator = '<?php echo addslashes( $wp_locale->number_format['thousands_sep'] ); ?>',
-			decimalPoint = '<?php echo addslashes( $wp_locale->number_format['decimal_point'] ); ?>',
+			thousandsSeparator = '<?php echo addslashes($wp_locale->number_format['thousands_sep']); ?>',
+			decimalPoint = '<?php echo addslashes($wp_locale->number_format['decimal_point']); ?>',
 			isRtl = <?php echo (int) is_rtl(); ?>;
 	</script>
 
@@ -1293,82 +1293,82 @@ 
 		 * $post->ID is needed for the embed shortcode so we can show oEmbed previews in the editor.
 		 * Maybe find a way without it.
 		 */
-		$post = get_default_post_to_edit( 'post', true );
+		$post = get_default_post_to_edit('post', true);
 		$post_ID = (int) $post->ID;
 
-		wp_enqueue_media( array( 'post' => $post_ID ) );
-		wp_enqueue_style( 'press-this' );
-		wp_enqueue_script( 'press-this' );
-		wp_enqueue_script( 'json2' );
-		wp_enqueue_script( 'editor' );
+		wp_enqueue_media(array('post' => $post_ID));
+		wp_enqueue_style('press-this');
+		wp_enqueue_script('press-this');
+		wp_enqueue_script('json2');
+		wp_enqueue_script('editor');
 
 		$supports_formats = false;
 		$post_format      = 0;
 
-		if ( current_theme_supports( 'post-formats' ) && post_type_supports( $post->post_type, 'post-formats' ) ) {
+		if (current_theme_supports('post-formats') && post_type_supports($post->post_type, 'post-formats')) {
 			$supports_formats = true;
 
-			if ( ! ( $post_format = get_post_format( $post_ID ) ) ) {
+			if ( ! ($post_format = get_post_format($post_ID))) {
 				$post_format = 0;
 			}
 		}
 
 		/** This action is documented in wp-admin/admin-header.php */
-		do_action( 'admin_enqueue_scripts', 'press-this.php' );
+		do_action('admin_enqueue_scripts', 'press-this.php');
 
 		/** This action is documented in wp-admin/admin-header.php */
-		do_action( 'admin_print_styles-press-this.php' );
+		do_action('admin_print_styles-press-this.php');
 
 		/** This action is documented in wp-admin/admin-header.php */
-		do_action( 'admin_print_styles' );
+		do_action('admin_print_styles');
 
 		/** This action is documented in wp-admin/admin-header.php */
-		do_action( 'admin_print_scripts-press-this.php' );
+		do_action('admin_print_scripts-press-this.php');
 
 		/** This action is documented in wp-admin/admin-header.php */
-		do_action( 'admin_print_scripts' );
+		do_action('admin_print_scripts');
 
 		/** This action is documented in wp-admin/admin-header.php */
-		do_action( 'admin_head-press-this.php' );
+		do_action('admin_head-press-this.php');
 
 		/** This action is documented in wp-admin/admin-header.php */
-		do_action( 'admin_head' );
+		do_action('admin_head');
 	?>
 </head>
 <?php
 
 	$admin_body_class  = 'press-this';
-	$admin_body_class .= ( is_rtl() ) ? ' rtl' : '';
-	$admin_body_class .= ' branch-' . str_replace( array( '.', ',' ), '-', floatval( $wp_version ) );
-	$admin_body_class .= ' version-' . str_replace( '.', '-', preg_replace( '/^([.0-9]+).*/', '$1', $wp_version ) );
-	$admin_body_class .= ' admin-color-' . sanitize_html_class( get_user_option( 'admin_color' ), 'fresh' );
-	$admin_body_class .= ' locale-' . sanitize_html_class( strtolower( str_replace( '_', '-', get_locale() ) ) );
+	$admin_body_class .= (is_rtl()) ? ' rtl' : '';
+	$admin_body_class .= ' branch-'.str_replace(array('.', ','), '-', floatval($wp_version));
+	$admin_body_class .= ' version-'.str_replace('.', '-', preg_replace('/^([.0-9]+).*/', '$1', $wp_version));
+	$admin_body_class .= ' admin-color-'.sanitize_html_class(get_user_option('admin_color'), 'fresh');
+	$admin_body_class .= ' locale-'.sanitize_html_class(strtolower(str_replace('_', '-', get_locale())));
 
 	/** This filter is documented in wp-admin/admin-header.php */
-	$admin_body_classes = apply_filters( 'admin_body_class', '' );
+	$admin_body_classes = apply_filters('admin_body_class', '');
 
 ?>
-<body class="wp-admin wp-core-ui <?php echo $admin_body_classes . ' ' . $admin_body_class; ?>">
+<body class="wp-admin wp-core-ui <?php echo $admin_body_classes.' '.$admin_body_class; ?>">
 	<div id="adminbar" class="adminbar">
 		<h1 id="current-site" class="current-site">
-			<a class="current-site-link" href="<?php echo esc_url( home_url( '/' ) ); ?>" target="_blank" rel="home">
+			<a class="current-site-link" href="<?php echo esc_url(home_url('/')); ?>" target="_blank" rel="home">
 				<span class="dashicons dashicons-wordpress"></span>
-				<span class="current-site-name"><?php bloginfo( 'name' ); ?></span>
+				<span class="current-site-name"><?php bloginfo('name'); ?></span>
 			</a>
 		</h1>
 		<button type="button" class="options button-link closed">
 			<span class="dashicons dashicons-tag on-closed"></span>
-			<span class="screen-reader-text on-closed"><?php _e( 'Show post options' ); ?></span>
-			<span aria-hidden="true" class="on-open"><?php _e( 'Done' ); ?></span>
-			<span class="screen-reader-text on-open"><?php _e( 'Hide post options' ); ?></span>
+			<span class="screen-reader-text on-closed"><?php _e('Show post options'); ?></span>
+			<span aria-hidden="true" class="on-open"><?php _e('Done'); ?></span>
+			<span class="screen-reader-text on-open"><?php _e('Hide post options'); ?></span>
 		</button>
 	</div>
 
 	<div id="scanbar" class="scan">
 		<form method="GET">
-			<label for="url-scan" class="screen-reader-text"><?php _e( 'Scan site for content' ); ?></label>
-			<input type="url" name="u" id="url-scan" class="scan-url" value="" placeholder="<?php esc_attr_e( 'Enter a URL to scan' ) ?>" />
-			<input type="submit" name="url-scan-submit" id="url-scan-submit" class="scan-submit" value="<?php esc_attr_e( 'Scan' ) ?>" />
+			<label for="url-scan" class="screen-reader-text"><?php _e('Scan site for content'); ?></label>
+			<input type="url" name="u" id="url-scan" class="scan-url" value="" placeholder="<?php esc_attr_e('Enter a URL to scan') ?>" />
+			<input type="submit" name="url-scan-submit" id="url-scan-submit" class="scan-submit" value="<?php esc_attr_e('Scan') ?>" />
 		</form>
 	</div>
 
@@ -1381,8 +1381,8 @@ 
 		<input type="hidden" name="pt-force-redirect" id="pt-force-redirect" value="" />
 		<?php
 
-		wp_nonce_field( 'update-post_' . $post_ID, '_wpnonce', false );
-		wp_nonce_field( 'add-category', '_ajax_nonce-add-category', false );
+		wp_nonce_field('update-post_'.$post_ID, '_wpnonce', false);
+		wp_nonce_field('add-category', '_ajax_nonce-add-category', false);
 
 		?>
 
@@ -1391,10 +1391,10 @@ 
 			<div class="alerts" role="alert" aria-live="assertive" aria-relevant="all" aria-atomic="true">
 				<?php
 
-				if ( isset( $data['v'] ) && $this->version > $data['v'] ) {
+				if (isset($data['v']) && $this->version > $data['v']) {
 					?>
 					<p class="alert is-notice">
-						<?php printf( __( 'You should upgrade <a href="%s" target="_blank">your bookmarklet</a> to the latest version!' ), admin_url( 'tools.php' ) ); ?>
+						<?php printf(__('You should upgrade <a href="%s" target="_blank">your bookmarklet</a> to the latest version!'), admin_url('tools.php')); ?>
 					</p>
 					<?php
 				}
@@ -1403,18 +1403,18 @@ 
 			</div>
 
 			<div id="app-container" class="editor">
-				<span id="title-container-label" class="post-title-placeholder" aria-hidden="true"><?php _e( 'Post title' ); ?></span>
-				<h2 id="title-container" class="post-title" contenteditable="true" spellcheck="true" aria-label="<?php esc_attr_e( 'Post title' ); ?>" tabindex="0"><?php echo esc_html( $post_title ); ?></h2>
+				<span id="title-container-label" class="post-title-placeholder" aria-hidden="true"><?php _e('Post title'); ?></span>
+				<h2 id="title-container" class="post-title" contenteditable="true" spellcheck="true" aria-label="<?php esc_attr_e('Post title'); ?>" tabindex="0"><?php echo esc_html($post_title); ?></h2>
 
 				<div class="media-list-container">
 					<div class="media-list-inner-container">
-						<h2 class="screen-reader-text"><?php _e( 'Suggested media' ); ?></h2>
+						<h2 class="screen-reader-text"><?php _e('Suggested media'); ?></h2>
 						<ul class="media-list"></ul>
 					</div>
 				</div>
 
 				<?php
-				wp_editor( $post_content, 'pressthis', array(
+				wp_editor($post_content, 'pressthis', array(
 					'drag_drop_upload' => true,
 					'editor_height'    => 600,
 					'media_buttons'    => false,
@@ -1434,7 +1434,7 @@ 
 					'quicktags' => array(
 						'buttons' => 'strong,em,link,block,del,ins,img,ul,ol,li,code,more',
 					),
-				) );
+				));
 
 				?>
 			</div>
@@ -1444,55 +1444,55 @@ 
 		<div class="options-panel is-off-screen is-hidden" tabindex="-1">
 			<div class="post-options">
 
-				<?php if ( $supports_formats ) : ?>
+				<?php if ($supports_formats) : ?>
 					<button type="button" class="button-link post-option">
 						<span class="dashicons dashicons-admin-post"></span>
-						<span class="post-option-title"><?php _ex( 'Format', 'post format' ); ?></span>
-						<span class="post-option-contents" id="post-option-post-format"><?php echo esc_html( get_post_format_string( $post_format ) ); ?></span>
+						<span class="post-option-title"><?php _ex('Format', 'post format'); ?></span>
+						<span class="post-option-contents" id="post-option-post-format"><?php echo esc_html(get_post_format_string($post_format)); ?></span>
 						<span class="dashicons post-option-forward"></span>
 					</button>
 				<?php endif; ?>
 
 				<button type="button" class="button-link post-option">
 					<span class="dashicons dashicons-category"></span>
-					<span class="post-option-title"><?php _e( 'Categories' ); ?></span>
+					<span class="post-option-title"><?php _e('Categories'); ?></span>
 					<span class="dashicons post-option-forward"></span>
 				</button>
 
 				<button type="button" class="button-link post-option">
 					<span class="dashicons dashicons-tag"></span>
-					<span class="post-option-title"><?php _e( 'Tags' ); ?></span>
+					<span class="post-option-title"><?php _e('Tags'); ?></span>
 					<span class="dashicons post-option-forward"></span>
 				</button>
 			</div>
 
-			<?php if ( $supports_formats ) : ?>
+			<?php if ($supports_formats) : ?>
 				<div class="setting-modal is-off-screen is-hidden">
 					<button type="button" class="button-link modal-close">
 						<span class="dashicons post-option-back"></span>
-						<span class="setting-title" aria-hidden="true"><?php _ex( 'Format', 'post format' ); ?></span>
-						<span class="screen-reader-text"><?php _e( 'Back to post options' ) ?></span>
+						<span class="setting-title" aria-hidden="true"><?php _ex('Format', 'post format'); ?></span>
+						<span class="screen-reader-text"><?php _e('Back to post options') ?></span>
 					</button>
-					<?php $this->post_formats_html( $post ); ?>
+					<?php $this->post_formats_html($post); ?>
 				</div>
 			<?php endif; ?>
 
 			<div class="setting-modal is-off-screen is-hidden">
 				<button type="button" class="button-link modal-close">
 					<span class="dashicons post-option-back"></span>
-					<span class="setting-title" aria-hidden="true"><?php _e( 'Categories' ); ?></span>
-					<span class="screen-reader-text"><?php _e( 'Back to post options' ) ?></span>
+					<span class="setting-title" aria-hidden="true"><?php _e('Categories'); ?></span>
+					<span class="screen-reader-text"><?php _e('Back to post options') ?></span>
 				</button>
-				<?php $this->categories_html( $post ); ?>
+				<?php $this->categories_html($post); ?>
 			</div>
 
 			<div class="setting-modal tags is-off-screen is-hidden">
 				<button type="button" class="button-link modal-close">
 					<span class="dashicons post-option-back"></span>
-					<span class="setting-title" aria-hidden="true"><?php _e( 'Tags' ); ?></span>
-					<span class="screen-reader-text"><?php _e( 'Back to post options' ) ?></span>
+					<span class="setting-title" aria-hidden="true"><?php _e('Tags'); ?></span>
+					<span class="screen-reader-text"><?php _e('Back to post options') ?></span>
 				</button>
-				<?php $this->tags_html( $post ); ?>
+				<?php $this->tags_html($post); ?>
 			</div>
 		</div><!-- .options-panel -->
 	</div><!-- .wrapper -->
@@ -1501,7 +1501,7 @@ 
 		<div class="pressthis-media-buttons">
 			<button type="button" class="insert-media button-link" data-editor="pressthis">
 				<span class="dashicons dashicons-admin-media"></span>
-				<span class="screen-reader-text"><?php _e( 'Add Media' ); ?></span>
+				<span class="screen-reader-text"><?php _e('Add Media'); ?></span>
 			</button>
 		</div>
 		<div class="post-actions">
@@ -1509,17 +1509,17 @@ 
 			<div class="split-button">
 				<div class="split-button-head">
 					<button type="button" class="publish-button split-button-primary" aria-live="polite">
-						<span class="publish"><?php echo ( current_user_can( 'publish_posts' ) ) ? __( 'Publish' ) : __( 'Submit for Review' ); ?></span>
-						<span class="saving-draft"><?php _e( 'Saving&hellip;' ); ?></span>
+						<span class="publish"><?php echo (current_user_can('publish_posts')) ? __('Publish') : __('Submit for Review'); ?></span>
+						<span class="saving-draft"><?php _e('Saving&hellip;'); ?></span>
 					</button><button type="button" class="split-button-toggle" aria-haspopup="true" aria-expanded="false">
 						<i class="dashicons dashicons-arrow-down-alt2"></i>
 						<span class="screen-reader-text"><?php _e('More actions'); ?></span>
 					</button>
 				</div>
 				<ul class="split-button-body">
-					<li><button type="button" class="button-link draft-button split-button-option"><?php _e( 'Save Draft' ); ?></button></li>
-					<li><button type="button" class="button-link standard-editor-button split-button-option"><?php _e( 'Standard Editor' ); ?></button></li>
-					<li><button type="button" class="button-link preview-button split-button-option"><?php _e( 'Preview' ); ?></button></li>
+					<li><button type="button" class="button-link draft-button split-button-option"><?php _e('Save Draft'); ?></button></li>
+					<li><button type="button" class="button-link standard-editor-button split-button-option"><?php _e('Standard Editor'); ?></button></li>
+					<li><button type="button" class="button-link preview-button split-button-option"><?php _e('Preview'); ?></button></li>
 				</ul>
 			</div>
 		</div>
@@ -1528,13 +1528,13 @@ 
 
 	<?php
 	/** This action is documented in wp-admin/admin-footer.php */
-	do_action( 'admin_footer' );
+	do_action('admin_footer');
 
 	/** This action is documented in wp-admin/admin-footer.php */
-	do_action( 'admin_print_footer_scripts' );
+	do_action('admin_print_footer_scripts');
 
 	/** This action is documented in wp-admin/admin-footer.php */
-	do_action( 'admin_footer-press-this.php' );
+	do_action('admin_footer-press-this.php');
 	?>
 </body>
 </html>