ntwb / wordpress

src/wp-admin/includes/bookmark.php

Doc Comments +1 added lines, -1 removed lines

@@ -82,7 +82,7 @@
  * @global wpdb $wpdb WordPress database abstraction object.
  *
  * @param int $link_id ID of the link to delete
- * @return true Always true.
+ * @return boolean Always true.
  */
 function wp_delete_link( $link_id ) {
 	global $wpdb;

Braces +24 added lines, -18 removed lines

@@ -39,8 +39,9 @@ 
 	$_POST['link_name'] = esc_html( $_POST['link_name'] );
 	$_POST['link_image'] = esc_html( $_POST['link_image'] );
 	$_POST['link_rss'] = esc_url($_POST['link_rss']);
-	if ( !isset($_POST['link_visible']) || 'N' != $_POST['link_visible'] )
-		$_POST['link_visible'] = 'Y';
+	if ( !isset($_POST['link_visible']) || 'N' != $_POST['link_visible'] ) {
+			$_POST['link_visible'] = 'Y';
+	}
 
 	if ( !empty( $link_id ) ) {
 		$_POST['link_id'] = $link_id;
@@ -59,15 +60,17 @@ 
  */
 function get_default_link_to_edit() {
 	$link = new stdClass;
-	if ( isset( $_GET['linkurl'] ) )
-		$link->link_url = esc_url( wp_unslash( $_GET['linkurl'] ) );
-	else
-		$link->link_url = '';
+	if ( isset( $_GET['linkurl'] ) ) {
+			$link->link_url = esc_url( wp_unslash( $_GET['linkurl'] ) );
+	} else {
+			$link->link_url = '';
+	}
 
-	if ( isset( $_GET['name'] ) )
-		$link->link_name = esc_attr( wp_unslash( $_GET['name'] ) );
-	else
-		$link->link_name = '';
+	if ( isset( $_GET['name'] ) ) {
+			$link->link_name = esc_attr( wp_unslash( $_GET['name'] ) );
+	} else {
+			$link->link_name = '';
+	}
 
 	$link->link_visible = 'Y';
 
@@ -249,8 +252,9 @@ 
  */
 function wp_set_link_cats( $link_id = 0, $link_categories = array() ) {
 	// If $link_categories isn't already an array, make it one:
-	if ( !is_array( $link_categories ) || 0 == count( $link_categories ) )
-		$link_categories = array( get_option( 'default_link_category' ) );
+	if ( !is_array( $link_categories ) || 0 == count( $link_categories ) ) {
+			$link_categories = array( get_option( 'default_link_category' ) );
+	}
 
 	$link_categories = array_map( 'intval', $link_categories );
 	$link_categories = array_unique( $link_categories );
@@ -278,10 +282,11 @@ 
 
 	// Passed link category list overwrites existing category list if not empty.
 	if ( isset( $linkdata['link_category'] ) && is_array( $linkdata['link_category'] )
-			 && 0 != count( $linkdata['link_category'] ) )
-		$link_cats = $linkdata['link_category'];
-	else
-		$link_cats = $link['link_category'];
+			 && 0 != count( $linkdata['link_category'] ) ) {
+			$link_cats = $linkdata['link_category'];
+	} else {
+			$link_cats = $link['link_category'];
+	}
 
 	// Merge old and new fields with new fields overwriting old ones.
 	$linkdata = array_merge( $link, $linkdata );
@@ -300,8 +305,9 @@ 
  */
 function wp_link_manager_disabled_message() {
 	global $pagenow;
-	if ( 'link-manager.php' != $pagenow && 'link-add.php' != $pagenow && 'link.php' != $pagenow )
-		return;
+	if ( 'link-manager.php' != $pagenow && 'link-add.php' != $pagenow && 'link.php' != $pagenow ) {
+			return;
+	}
 
 	add_filter( 'pre_option_link_manager_enabled', '__return_true', 100 );
 	$really_can_manage_links = current_user_can( 'manage_links' );

Spacing +80 added lines, -80 removed lines

@@ -25,28 +25,28 @@ 
  * @param int $link_id Optional. ID of the link to edit. Default 0.
  * @return int|WP_Error Value 0 or WP_Error on failure. The link ID on success.
  */
-function edit_link( $link_id = 0 ) {
-	if ( ! current_user_can( 'manage_links' ) ) {
+function edit_link($link_id = 0) {
+	if ( ! current_user_can('manage_links')) {
 		wp_die(
-			'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-			'<p>' . __( 'Sorry, you are not allowed to edit the links for this site.' ) . '</p>',
+			'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+			'<p>'.__('Sorry, you are not allowed to edit the links for this site.').'</p>',
 			403
 		);
 	}
 
-	$_POST['link_url'] = esc_html( $_POST['link_url'] );
+	$_POST['link_url'] = esc_html($_POST['link_url']);
 	$_POST['link_url'] = esc_url($_POST['link_url']);
-	$_POST['link_name'] = esc_html( $_POST['link_name'] );
-	$_POST['link_image'] = esc_html( $_POST['link_image'] );
+	$_POST['link_name'] = esc_html($_POST['link_name']);
+	$_POST['link_image'] = esc_html($_POST['link_image']);
 	$_POST['link_rss'] = esc_url($_POST['link_rss']);
-	if ( !isset($_POST['link_visible']) || 'N' != $_POST['link_visible'] )
+	if ( ! isset($_POST['link_visible']) || 'N' != $_POST['link_visible'])
 		$_POST['link_visible'] = 'Y';
 
-	if ( !empty( $link_id ) ) {
+	if ( ! empty($link_id)) {
 		$_POST['link_id'] = $link_id;
-		return wp_update_link( $_POST );
+		return wp_update_link($_POST);
 	} else {
-		return wp_insert_link( $_POST );
+		return wp_insert_link($_POST);
 	}
 }
 
@@ -59,13 +59,13 @@ 
  */
 function get_default_link_to_edit() {
 	$link = new stdClass;
-	if ( isset( $_GET['linkurl'] ) )
-		$link->link_url = esc_url( wp_unslash( $_GET['linkurl'] ) );
+	if (isset($_GET['linkurl']))
+		$link->link_url = esc_url(wp_unslash($_GET['linkurl']));
 	else
 		$link->link_url = '';
 
-	if ( isset( $_GET['name'] ) )
-		$link->link_name = esc_attr( wp_unslash( $_GET['name'] ) );
+	if (isset($_GET['name']))
+		$link->link_name = esc_attr(wp_unslash($_GET['name']));
 	else
 		$link->link_name = '';
 
@@ -84,7 +84,7 @@ 
  * @param int $link_id ID of the link to delete
  * @return true Always true.
  */
-function wp_delete_link( $link_id ) {
+function wp_delete_link($link_id) {
 	global $wpdb;
 	/**
 	 * Fires before a link is deleted.
@@ -93,11 +93,11 @@ 
 	 *
 	 * @param int $link_id ID of the link to delete.
 	 */
-	do_action( 'delete_link', $link_id );
+	do_action('delete_link', $link_id);
 
-	wp_delete_object_term_relationships( $link_id, 'link_category' );
+	wp_delete_object_term_relationships($link_id, 'link_category');
 
-	$wpdb->delete( $wpdb->links, array( 'link_id' => $link_id ) );
+	$wpdb->delete($wpdb->links, array('link_id' => $link_id));
 
 	/**
 	 * Fires after a link has been deleted.
@@ -106,9 +106,9 @@ 
 	 *
 	 * @param int $link_id ID of the deleted link.
 	 */
-	do_action( 'deleted_link', $link_id );
+	do_action('deleted_link', $link_id);
 
-	clean_bookmark_cache( $link_id );
+	clean_bookmark_cache($link_id);
 
 	return true;
 }
@@ -121,9 +121,9 @@ 
  * @param int $link_id Link ID to look up
  * @return array The requested link's categories
  */
-function wp_get_link_cats( $link_id = 0 ) {
-	$cats = wp_get_object_terms( $link_id, 'link_category', array('fields' => 'ids') );
-	return array_unique( $cats );
+function wp_get_link_cats($link_id = 0) {
+	$cats = wp_get_object_terms($link_id, 'link_category', array('fields' => 'ids'));
+	return array_unique($cats);
 }
 
 /**
@@ -134,8 +134,8 @@ 
  * @param int|stdClass $link Link ID or object to retrieve.
  * @return object Link object for editing.
  */
-function get_link_to_edit( $link ) {
-	return get_bookmark( $link, OBJECT, 'edit' );
+function get_link_to_edit($link) {
+	return get_bookmark($link, OBJECT, 'edit');
 }
 
 /**
@@ -149,63 +149,63 @@ 
  * @param bool  $wp_error Optional. Whether to return a WP_Error object on failure. Default false.
  * @return int|WP_Error Value 0 or WP_Error on failure. The link ID on success.
  */
-function wp_insert_link( $linkdata, $wp_error = false ) {
+function wp_insert_link($linkdata, $wp_error = false) {
 	global $wpdb;
 
-	$defaults = array( 'link_id' => 0, 'link_name' => '', 'link_url' => '', 'link_rating' => 0 );
+	$defaults = array('link_id' => 0, 'link_name' => '', 'link_url' => '', 'link_rating' => 0);
 
-	$args = wp_parse_args( $linkdata, $defaults );
-	$r = wp_unslash( sanitize_bookmark( $args, 'db' ) );
+	$args = wp_parse_args($linkdata, $defaults);
+	$r = wp_unslash(sanitize_bookmark($args, 'db'));
 
 	$link_id   = $r['link_id'];
 	$link_name = $r['link_name'];
 	$link_url  = $r['link_url'];
 
 	$update = false;
-	if ( ! empty( $link_id ) ) {
+	if ( ! empty($link_id)) {
 		$update = true;
 	}
 
-	if ( trim( $link_name ) == '' ) {
-		if ( trim( $link_url ) != '' ) {
+	if (trim($link_name) == '') {
+		if (trim($link_url) != '') {
 			$link_name = $link_url;
 		} else {
 			return 0;
 		}
 	}
 
-	if ( trim( $link_url ) == '' ) {
+	if (trim($link_url) == '') {
 		return 0;
 	}
 
-	$link_rating      = ( ! empty( $r['link_rating'] ) ) ? $r['link_rating'] : 0;
-	$link_image       = ( ! empty( $r['link_image'] ) ) ? $r['link_image'] : '';
-	$link_target      = ( ! empty( $r['link_target'] ) ) ? $r['link_target'] : '';
-	$link_visible     = ( ! empty( $r['link_visible'] ) ) ? $r['link_visible'] : 'Y';
-	$link_owner       = ( ! empty( $r['link_owner'] ) ) ? $r['link_owner'] : get_current_user_id();
-	$link_notes       = ( ! empty( $r['link_notes'] ) ) ? $r['link_notes'] : '';
-	$link_description = ( ! empty( $r['link_description'] ) ) ? $r['link_description'] : '';
-	$link_rss         = ( ! empty( $r['link_rss'] ) ) ? $r['link_rss'] : '';
-	$link_rel         = ( ! empty( $r['link_rel'] ) ) ? $r['link_rel'] : '';
-	$link_category    = ( ! empty( $r['link_category'] ) ) ? $r['link_category'] : array();
+	$link_rating      = ( ! empty($r['link_rating'])) ? $r['link_rating'] : 0;
+	$link_image       = ( ! empty($r['link_image'])) ? $r['link_image'] : '';
+	$link_target      = ( ! empty($r['link_target'])) ? $r['link_target'] : '';
+	$link_visible     = ( ! empty($r['link_visible'])) ? $r['link_visible'] : 'Y';
+	$link_owner       = ( ! empty($r['link_owner'])) ? $r['link_owner'] : get_current_user_id();
+	$link_notes       = ( ! empty($r['link_notes'])) ? $r['link_notes'] : '';
+	$link_description = ( ! empty($r['link_description'])) ? $r['link_description'] : '';
+	$link_rss         = ( ! empty($r['link_rss'])) ? $r['link_rss'] : '';
+	$link_rel         = ( ! empty($r['link_rel'])) ? $r['link_rel'] : '';
+	$link_category    = ( ! empty($r['link_category'])) ? $r['link_category'] : array();
 
 	// Make sure we set a valid category.
-	if ( ! is_array( $link_category ) || 0 == count( $link_category ) ) {
-		$link_category = array( get_option( 'default_link_category' ) );
+	if ( ! is_array($link_category) || 0 == count($link_category)) {
+		$link_category = array(get_option('default_link_category'));
 	}
 
-	if ( $update ) {
-		if ( false === $wpdb->update( $wpdb->links, compact( 'link_url', 'link_name', 'link_image', 'link_target', 'link_description', 'link_visible', 'link_rating', 'link_rel', 'link_notes', 'link_rss' ), compact( 'link_id' ) ) ) {
-			if ( $wp_error ) {
-				return new WP_Error( 'db_update_error', __( 'Could not update link in the database' ), $wpdb->last_error );
+	if ($update) {
+		if (false === $wpdb->update($wpdb->links, compact('link_url', 'link_name', 'link_image', 'link_target', 'link_description', 'link_visible', 'link_rating', 'link_rel', 'link_notes', 'link_rss'), compact('link_id'))) {
+			if ($wp_error) {
+				return new WP_Error('db_update_error', __('Could not update link in the database'), $wpdb->last_error);
 			} else {
 				return 0;
 			}
 		}
 	} else {
-		if ( false === $wpdb->insert( $wpdb->links, compact( 'link_url', 'link_name', 'link_image', 'link_target', 'link_description', 'link_visible', 'link_owner', 'link_rating', 'link_rel', 'link_notes', 'link_rss' ) ) ) {
-			if ( $wp_error ) {
-				return new WP_Error( 'db_insert_error', __( 'Could not insert link into the database' ), $wpdb->last_error );
+		if (false === $wpdb->insert($wpdb->links, compact('link_url', 'link_name', 'link_image', 'link_target', 'link_description', 'link_visible', 'link_owner', 'link_rating', 'link_rel', 'link_notes', 'link_rss'))) {
+			if ($wp_error) {
+				return new WP_Error('db_insert_error', __('Could not insert link into the database'), $wpdb->last_error);
 			} else {
 				return 0;
 			}
@@ -213,9 +213,9 @@ 
 		$link_id = (int) $wpdb->insert_id;
 	}
 
-	wp_set_link_cats( $link_id, $link_category );
+	wp_set_link_cats($link_id, $link_category);
 
-	if ( $update ) {
+	if ($update) {
 		/**
 		 * Fires after a link was updated in the database.
 		 *
@@ -223,7 +223,7 @@ 
 		 *
 		 * @param int $link_id ID of the link that was updated.
 		 */
-		do_action( 'edit_link', $link_id );
+		do_action('edit_link', $link_id);
 	} else {
 		/**
 		 * Fires after a link was added to the database.
@@ -232,9 +232,9 @@ 
 		 *
 		 * @param int $link_id ID of the link that was added.
 		 */
-		do_action( 'add_link', $link_id );
+		do_action('add_link', $link_id);
 	}
-	clean_bookmark_cache( $link_id );
+	clean_bookmark_cache($link_id);
 
 	return $link_id;
 }
@@ -247,17 +247,17 @@ 
  * @param int   $link_id         ID of the link to update.
  * @param array $link_categories Array of link categories to add the link to.
  */
-function wp_set_link_cats( $link_id = 0, $link_categories = array() ) {
+function wp_set_link_cats($link_id = 0, $link_categories = array()) {
 	// If $link_categories isn't already an array, make it one:
-	if ( !is_array( $link_categories ) || 0 == count( $link_categories ) )
-		$link_categories = array( get_option( 'default_link_category' ) );
+	if ( ! is_array($link_categories) || 0 == count($link_categories))
+		$link_categories = array(get_option('default_link_category'));
 
-	$link_categories = array_map( 'intval', $link_categories );
-	$link_categories = array_unique( $link_categories );
+	$link_categories = array_map('intval', $link_categories);
+	$link_categories = array_unique($link_categories);
 
-	wp_set_object_terms( $link_id, $link_categories, 'link_category' );
+	wp_set_object_terms($link_id, $link_categories, 'link_category');
 
-	clean_bookmark_cache( $link_id );
+	clean_bookmark_cache($link_id);
 }
 
 /**
@@ -268,26 +268,26 @@ 
  * @param array $linkdata Link data to update.
  * @return int|WP_Error Value 0 or WP_Error on failure. The updated link ID on success.
  */
-function wp_update_link( $linkdata ) {
+function wp_update_link($linkdata) {
 	$link_id = (int) $linkdata['link_id'];
 
-	$link = get_bookmark( $link_id, ARRAY_A );
+	$link = get_bookmark($link_id, ARRAY_A);
 
 	// Escape data pulled from DB.
-	$link = wp_slash( $link );
+	$link = wp_slash($link);
 
 	// Passed link category list overwrites existing category list if not empty.
-	if ( isset( $linkdata['link_category'] ) && is_array( $linkdata['link_category'] )
-			 && 0 != count( $linkdata['link_category'] ) )
+	if (isset($linkdata['link_category']) && is_array($linkdata['link_category'])
+			 && 0 != count($linkdata['link_category']))
 		$link_cats = $linkdata['link_category'];
 	else
 		$link_cats = $link['link_category'];
 
 	// Merge old and new fields with new fields overwriting old ones.
-	$linkdata = array_merge( $link, $linkdata );
+	$linkdata = array_merge($link, $linkdata);
 	$linkdata['link_category'] = $link_cats;
 
-	return wp_insert_link( $linkdata );
+	return wp_insert_link($linkdata);
 }
 
 /**
@@ -300,17 +300,17 @@ 
  */
 function wp_link_manager_disabled_message() {
 	global $pagenow;
-	if ( 'link-manager.php' != $pagenow && 'link-add.php' != $pagenow && 'link.php' != $pagenow )
+	if ('link-manager.php' != $pagenow && 'link-add.php' != $pagenow && 'link.php' != $pagenow)
 		return;
 
-	add_filter( 'pre_option_link_manager_enabled', '__return_true', 100 );
-	$really_can_manage_links = current_user_can( 'manage_links' );
-	remove_filter( 'pre_option_link_manager_enabled', '__return_true', 100 );
+	add_filter('pre_option_link_manager_enabled', '__return_true', 100);
+	$really_can_manage_links = current_user_can('manage_links');
+	remove_filter('pre_option_link_manager_enabled', '__return_true', 100);
 
-	if ( $really_can_manage_links && current_user_can( 'install_plugins' ) ) {
-		$link = network_admin_url( 'plugin-install.php?tab=search&amp;s=Link+Manager' );
-		wp_die( sprintf( __( 'If you are looking to use the link manager, please install the <a href="%s">Link Manager</a> plugin.' ), $link ) );
+	if ($really_can_manage_links && current_user_can('install_plugins')) {
+		$link = network_admin_url('plugin-install.php?tab=search&amp;s=Link+Manager');
+		wp_die(sprintf(__('If you are looking to use the link manager, please install the <a href="%s">Link Manager</a> plugin.'), $link));
 	}
 
-	wp_die( __( 'Sorry, you are not allowed to edit the links for this site.' ) );
+	wp_die(__('Sorry, you are not allowed to edit the links for this site.'));
 }

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

Doc Comments +2 added lines, -2 removed lines

@@ -484,7 +484,7 @@ 
 
 	/**
 	 *
-	 * @return array
+	 * @return string[]
 	 */
 	protected function get_table_classes() {
 		return array( 'widefat', 'fixed', 'striped', is_post_type_hierarchical( $this->screen->post_type ) ? 'pages' : 'posts' );
@@ -1162,7 +1162,7 @@ 
 	 * @since 4.3.0
 	 * @access protected
 	 *
-	 * @param object $post        Post being acted upon.
+	 * @param WP_Post $post        Post being acted upon.
 	 * @param string $column_name Current column name.
 	 * @param string $primary     Primary column name.
 	 * @return string Row actions output for posts.

Braces +91 added lines, -59 removed lines

@@ -199,10 +199,11 @@ 
 	 * @access public
 	 */
 	public function no_items() {
-		if ( isset( $_REQUEST['post_status'] ) && 'trash' === $_REQUEST['post_status'] )
-			echo get_post_type_object( $this->screen->post_type )->labels->not_found_in_trash;
-		else
-			echo get_post_type_object( $this->screen->post_type )->labels->not_found;
+		if ( isset( $_REQUEST['post_status'] ) && 'trash' === $_REQUEST['post_status'] ) {
+					echo get_post_type_object( $this->screen->post_type )->labels->not_found_in_trash;
+		} else {
+					echo get_post_type_object( $this->screen->post_type )->labels->not_found;
+		}
 	}
 
 	/**
@@ -266,8 +267,9 @@ 
 
 		$post_type = $this->screen->post_type;
 
-		if ( !empty($locked_post_status) )
-			return array();
+		if ( !empty($locked_post_status) ) {
+					return array();
+		}
 
 		$status_links = array();
 		$num_posts = wp_count_posts( $post_type, 'readable' );
@@ -476,8 +478,9 @@ 
 	 * @return string
 	 */
 	public function current_action() {
-		if ( isset( $_REQUEST['delete_all'] ) || isset( $_REQUEST['delete_all2'] ) )
-			return 'delete_all';
+		if ( isset( $_REQUEST['delete_all'] ) || isset( $_REQUEST['delete_all2'] ) ) {
+					return 'delete_all';
+		}
 
 		return parent::current_action();
 	}
@@ -526,19 +529,21 @@ 
 		$taxonomies = array_filter( $taxonomies, 'taxonomy_exists' );
 
 		foreach ( $taxonomies as $taxonomy ) {
-			if ( 'category' === $taxonomy )
-				$column_key = 'categories';
-			elseif ( 'post_tag' === $taxonomy )
-				$column_key = 'tags';
-			else
-				$column_key = 'taxonomy-' . $taxonomy;
+			if ( 'category' === $taxonomy ) {
+							$column_key = 'categories';
+			} elseif ( 'post_tag' === $taxonomy ) {
+							$column_key = 'tags';
+			} else {
+							$column_key = 'taxonomy-' . $taxonomy;
+			}
 
 			$posts_columns[ $column_key ] = get_taxonomy( $taxonomy )->labels->name;
 		}
 
 		$post_status = !empty( $_REQUEST['post_status'] ) ? $_REQUEST['post_status'] : 'all';
-		if ( post_type_supports( $post_type, 'comments' ) && !in_array( $post_status, array( 'pending', 'draft', 'future' ) ) )
-			$posts_columns['comments'] = '<span class="vers comment-grey-bubble" title="' . esc_attr__( 'Comments' ) . '"><span class="screen-reader-text">' . __( 'Comments' ) . '</span></span>';
+		if ( post_type_supports( $post_type, 'comments' ) && !in_array( $post_status, array( 'pending', 'draft', 'future' ) ) ) {
+					$posts_columns['comments'] = '<span class="vers comment-grey-bubble" title="' . esc_attr__( 'Comments' ) . '"><span class="screen-reader-text">' . __( 'Comments' ) . '</span></span>';
+		}
 
 		$posts_columns['date'] = __( 'Date' );
 
@@ -599,8 +604,9 @@ 
 	public function display_rows( $posts = array(), $level = 0 ) {
 		global $wp_query, $per_page;
 
-		if ( empty( $posts ) )
-			$posts = $wp_query->posts;
+		if ( empty( $posts ) ) {
+					$posts = $wp_query->posts;
+		}
 
 		add_filter( 'the_title', 'esc_html' );
 
@@ -619,13 +625,15 @@ 
 		// Create array of post IDs.
 		$post_ids = array();
 
-		foreach ( $posts as $a_post )
-			$post_ids[] = $a_post->ID;
+		foreach ( $posts as $a_post ) {
+					$post_ids[] = $a_post->ID;
+		}
 
 		$this->comment_pending_count = get_pending_comments_num( $post_ids );
 
-		foreach ( $posts as $post )
-			$this->single_row( $post, $level );
+		foreach ( $posts as $post ) {
+					$this->single_row( $post, $level );
+		}
 	}
 
 	/**
@@ -643,8 +651,9 @@ 
 		if ( ! $pages ) {
 			$pages = get_pages( array( 'sort_column' => 'menu_order' ) );
 
-			if ( ! $pages )
-				return;
+			if ( ! $pages ) {
+							return;
+			}
 		}
 
 		/*
@@ -668,10 +677,11 @@ 
 					clean_post_cache( $page );
 				}
 
-				if ( 0 == $page->post_parent )
-					$top_level_pages[] = $page;
-				else
-					$children_pages[ $page->post_parent ][] = $page;
+				if ( 0 == $page->post_parent ) {
+									$top_level_pages[] = $page;
+				} else {
+									$children_pages[ $page->post_parent ][] = $page;
+				}
 			}
 
 			$pages = &$top_level_pages;
@@ -683,8 +693,9 @@ 
 		$to_display = array();
 
 		foreach ( $pages as $page ) {
-			if ( $count >= $end )
-				break;
+			if ( $count >= $end ) {
+							break;
+			}
 
 			if ( $count >= $start ) {
 				$to_display[$page->ID] = $level;
@@ -692,16 +703,18 @@ 
 
 			$count++;
 
-			if ( isset( $children_pages ) )
-				$this->_page_rows( $children_pages, $count, $page->ID, $level + 1, $pagenum, $per_page, $to_display );
+			if ( isset( $children_pages ) ) {
+							$this->_page_rows( $children_pages, $count, $page->ID, $level + 1, $pagenum, $per_page, $to_display );
+			}
 		}
 
 		// If it is the last pagenum and there are orphaned pages, display them with paging as well.
 		if ( isset( $children_pages ) && $count < $end ){
 			foreach ( $children_pages as $orphans ){
 				foreach ( $orphans as $op ) {
-					if ( $count >= $end )
-						break;
+					if ( $count >= $end ) {
+											break;
+					}
 
 					if ( $count >= $start ) {
 						$to_display[$op->ID] = 0;
@@ -741,15 +754,17 @@ 
 	 * @param array $to_display List of pages to be displayed. Passed by reference.
 	 */
 	private function _page_rows( &$children_pages, &$count, $parent, $level, $pagenum, $per_page, &$to_display ) {
-		if ( ! isset( $children_pages[$parent] ) )
-			return;
+		if ( ! isset( $children_pages[$parent] ) ) {
+					return;
+		}
 
 		$start = ( $pagenum - 1 ) * $per_page;
 		$end = $start + $per_page;
 
 		foreach ( $children_pages[$parent] as $page ) {
-			if ( $count >= $end )
-				break;
+			if ( $count >= $end ) {
+							break;
+			}
 
 			// If the page starts in a subtree, print the parents.
 			if ( $count == $start && $page->post_parent > 0 ) {
@@ -764,8 +779,9 @@ 
 
 					$my_parent = get_post( $parent_id );
 					$my_parents[] = $my_parent;
-					if ( !$my_parent->post_parent )
-						break;
+					if ( !$my_parent->post_parent ) {
+											break;
+					}
 					$my_parent = $my_parent->post_parent;
 				}
 				$num_parents = count( $my_parents );
@@ -1317,10 +1333,11 @@ 
 				continue;
 			}
 
-			if ( $taxonomy->hierarchical )
-				$hierarchical_taxonomies[] = $taxonomy;
-			else
-				$flat_taxonomies[] = $taxonomy;
+			if ( $taxonomy->hierarchical ) {
+							$hierarchical_taxonomies[] = $taxonomy;
+			} else {
+							$flat_taxonomies[] = $taxonomy;
+			}
 		}
 
 		$m = ( isset( $mode ) && 'excerpt' === $mode ) ? 'excerpt' : 'list';
@@ -1350,10 +1367,13 @@ 
 				<div id="bulk-titles"></div>
 			</div>
 
-	<?php else : // $bulk ?>
+	<?php else {
+	: // $bulk ?>
 
 			<label>
-				<span class="title"><?php _e( 'Title' ); ?></span>
+				<span class="title"><?php _e( 'Title' );
+}
+?></span>
 				<span class="input-text-wrap"><input type="text" name="post_title" class="ptitle" value="" /></span>
 			</label>
 
@@ -1386,8 +1406,9 @@ 
 					'echo' => 0,
 					'show' => 'display_name_with_login',
 				);
-				if ( $bulk )
-					$users_opt['show_option_none'] = __( '&mdash; No Change &mdash;' );
+				if ( $bulk ) {
+									$users_opt['show_option_none'] = __( '&mdash; No Change &mdash;' );
+				}
 
 				if ( $authors = wp_dropdown_users( $users_opt ) ) :
 					$authors_dropdown  = '<label class="inline-edit-author">';
@@ -1398,7 +1419,9 @@ 
 			endif; // authors
 	?>
 
-	<?php if ( !$bulk ) echo $authors_dropdown;
+	<?php if ( !$bulk ) {
+	echo $authors_dropdown;
+}
 	endif; // post_type_supports author
 
 	if ( !$bulk && $can_publish ) :
@@ -1447,8 +1470,9 @@ 
 		<fieldset class="inline-edit-col-right"><div class="inline-edit-col">
 
 	<?php
-		if ( post_type_supports( $screen->post_type, 'author' ) && $bulk )
-			echo $authors_dropdown;
+		if ( post_type_supports( $screen->post_type, 'author' ) && $bulk ) {
+					echo $authors_dropdown;
+		}
 
 		if ( post_type_supports( $screen->post_type, 'page-attributes' ) ) :
 
@@ -1466,8 +1490,9 @@ 
 			'sort_column'       => 'menu_order, post_title',
 		);
 
-		if ( $bulk )
-			$dropdown_args['show_option_no_change'] =  __( '&mdash; No Change &mdash;' );
+		if ( $bulk ) {
+					$dropdown_args['show_option_no_change'] =  __( '&mdash; No Change &mdash;' );
+		}
 
 		/**
 		 * Filter the arguments used to generate the Quick Edit page-parent drop-down.
@@ -1558,13 +1583,16 @@ 
 		<?php endif; ?>
 			</div>
 
-	<?php else : // $bulk ?>
+	<?php else {
+	: // $bulk ?>
 
 			<div class="inline-edit-group wp-clearfix">
 			<?php if ( post_type_supports( $screen->post_type, 'comments' ) ) : ?>
 				<label class="alignleft">
 					<input type="checkbox" name="comment_status" value="open" />
-					<span class="checkbox-title"><?php _e( 'Allow Comments' ); ?></span>
+					<span class="checkbox-title"><?php _e( 'Allow Comments' );
+}
+?></span>
 				</label>
 			<?php endif; if ( post_type_supports( $screen->post_type, 'trackbacks' ) ) : ?>
 				<label class="alignleft">
@@ -1609,11 +1637,14 @@ 
 					</select>
 				</label>
 
-	<?php	else : // $bulk ?>
+	<?php	else {
+	: // $bulk ?>
 
 				<label class="alignleft">
 					<input type="checkbox" name="sticky" value="sticky" />
-					<span class="checkbox-title"><?php _e( 'Make this post sticky' ); ?></span>
+					<span class="checkbox-title"><?php _e( 'Make this post sticky' );
+}
+?></span>
 				</label>
 
 	<?php	endif; // $bulk ?>
@@ -1655,8 +1686,9 @@ 
 		list( $columns ) = $this->get_column_info();
 
 		foreach ( $columns as $column_name => $column_display_name ) {
-			if ( isset( $core_columns[$column_name] ) )
-				continue;
+			if ( isset( $core_columns[$column_name] ) ) {
+							continue;
+			}
 
 			if ( $bulk ) {
 

Indentation +4 added lines, -4 removed lines

@@ -1175,10 +1175,10 @@ 
 		}
 
 		if ( $post->post_parent ) {
-		    $count = count( get_post_ancestors( $post->ID ) );
-		    $classes .= ' level-'. $count;
+			$count = count( get_post_ancestors( $post->ID ) );
+			$classes .= ' level-'. $count;
 		} else {
-		    $classes .= ' level-0';
+			$classes .= ' level-0';
 		}
 	?>
 		<tr id="post-<?php echo $post->ID; ?>" class="<?php echo implode( ' ', get_post_class( $classes, $post->ID ) ); ?>">
@@ -1553,7 +1553,7 @@ 
                 <?php
 				/** This filter is documented in wp-admin/includes/meta-boxes.php */
 				$default_title = apply_filters( 'default_page_template_title',  __( 'Default Template' ), 'quick-edit' );
-                ?>
+				?>
 				<option value="default"><?php echo esc_html( $default_title ); ?></option>
 				<?php page_template_dropdown( '', $screen->post_type ) ?>
 			</select>

Spacing +425 added lines, -425 removed lines

@@ -77,35 +77,35 @@ 
 	 *
 	 * @param array $args An associative array of arguments.
 	 */
-	public function __construct( $args = array() ) {
+	public function __construct($args = array()) {
 		global $post_type_object, $wpdb;
 
-		parent::__construct( array(
+		parent::__construct(array(
 			'plural' => 'posts',
-			'screen' => isset( $args['screen'] ) ? $args['screen'] : null,
-		) );
+			'screen' => isset($args['screen']) ? $args['screen'] : null,
+		));
 
 		$post_type        = $this->screen->post_type;
-		$post_type_object = get_post_type_object( $post_type );
+		$post_type_object = get_post_type_object($post_type);
 
-		$exclude_states   = get_post_stati( array(
+		$exclude_states   = get_post_stati(array(
 			'show_in_admin_all_list' => false,
-		) );
-		$this->user_posts_count = intval( $wpdb->get_var( $wpdb->prepare( "
+		));
+		$this->user_posts_count = intval($wpdb->get_var($wpdb->prepare("
 			SELECT COUNT( 1 )
 			FROM $wpdb->posts
 			WHERE post_type = %s
-			AND post_status NOT IN ( '" . implode( "','", $exclude_states ) . "' )
+			AND post_status NOT IN ( '".implode("','", $exclude_states)."' )
 			AND post_author = %d
-		", $post_type, get_current_user_id() ) ) );
+		", $post_type, get_current_user_id())));
 
-		if ( $this->user_posts_count && ! current_user_can( $post_type_object->cap->edit_others_posts ) && empty( $_REQUEST['post_status'] ) && empty( $_REQUEST['all_posts'] ) && empty( $_REQUEST['author'] ) && empty( $_REQUEST['show_sticky'] ) ) {
+		if ($this->user_posts_count && ! current_user_can($post_type_object->cap->edit_others_posts) && empty($_REQUEST['post_status']) && empty($_REQUEST['all_posts']) && empty($_REQUEST['author']) && empty($_REQUEST['show_sticky'])) {
 			$_GET['author'] = get_current_user_id();
 		}
 
-		if ( 'post' === $post_type && $sticky_posts = get_option( 'sticky_posts' ) ) {
-			$sticky_posts = implode( ', ', array_map( 'absint', (array) $sticky_posts ) );
-			$this->sticky_posts_count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT( 1 ) FROM $wpdb->posts WHERE post_type = %s AND post_status NOT IN ('trash', 'auto-draft') AND ID IN ($sticky_posts)", $post_type ) );
+		if ('post' === $post_type && $sticky_posts = get_option('sticky_posts')) {
+			$sticky_posts = implode(', ', array_map('absint', (array) $sticky_posts));
+			$this->sticky_posts_count = $wpdb->get_var($wpdb->prepare("SELECT COUNT( 1 ) FROM $wpdb->posts WHERE post_type = %s AND post_status NOT IN ('trash', 'auto-draft') AND ID IN ($sticky_posts)", $post_type));
 		}
 	}
 
@@ -116,7 +116,7 @@ 
 	 *
 	 * @param bool $display Whether the table layout should be hierarchical.
 	 */
-	public function set_hierarchical_display( $display ) {
+	public function set_hierarchical_display($display) {
 		$this->hierarchical_display = $display;
 	}
 
@@ -125,7 +125,7 @@ 
 	 * @return bool
 	 */
 	public function ajax_user_can() {
-		return current_user_can( get_post_type_object( $this->screen->post_type )->cap->edit_posts );
+		return current_user_can(get_post_type_object($this->screen->post_type)->cap->edit_posts);
 	}
 
 	/**
@@ -141,50 +141,50 @@ 
 		// is going to call wp()
 		$avail_post_stati = wp_edit_posts_query();
 
-		$this->set_hierarchical_display( is_post_type_hierarchical( $this->screen->post_type ) && 'menu_order title' === $wp_query->query['orderby'] );
+		$this->set_hierarchical_display(is_post_type_hierarchical($this->screen->post_type) && 'menu_order title' === $wp_query->query['orderby']);
 
 		$post_type = $this->screen->post_type;
-		$per_page = $this->get_items_per_page( 'edit_' . $post_type . '_per_page' );
+		$per_page = $this->get_items_per_page('edit_'.$post_type.'_per_page');
 
 		/** This filter is documented in wp-admin/includes/post.php */
- 		$per_page = apply_filters( 'edit_posts_per_page', $per_page, $post_type );
+ 		$per_page = apply_filters('edit_posts_per_page', $per_page, $post_type);
 
-		if ( $this->hierarchical_display ) {
+		if ($this->hierarchical_display) {
 			$total_items = $wp_query->post_count;
-		} elseif ( $wp_query->found_posts || $this->get_pagenum() === 1 ) {
+		} elseif ($wp_query->found_posts || $this->get_pagenum() === 1) {
 			$total_items = $wp_query->found_posts;
 		} else {
-			$post_counts = (array) wp_count_posts( $post_type, 'readable' );
+			$post_counts = (array) wp_count_posts($post_type, 'readable');
 
-			if ( isset( $_REQUEST['post_status'] ) && in_array( $_REQUEST['post_status'] , $avail_post_stati ) ) {
-				$total_items = $post_counts[ $_REQUEST['post_status'] ];
-			} elseif ( isset( $_REQUEST['show_sticky'] ) && $_REQUEST['show_sticky'] ) {
+			if (isset($_REQUEST['post_status']) && in_array($_REQUEST['post_status'], $avail_post_stati)) {
+				$total_items = $post_counts[$_REQUEST['post_status']];
+			} elseif (isset($_REQUEST['show_sticky']) && $_REQUEST['show_sticky']) {
 				$total_items = $this->sticky_posts_count;
-			} elseif ( isset( $_GET['author'] ) && $_GET['author'] == get_current_user_id() ) {
+			} elseif (isset($_GET['author']) && $_GET['author'] == get_current_user_id()) {
 				$total_items = $this->user_posts_count;
 			} else {
-				$total_items = array_sum( $post_counts );
+				$total_items = array_sum($post_counts);
 
 				// Subtract post types that are not included in the admin all list.
-				foreach ( get_post_stati( array( 'show_in_admin_all_list' => false ) ) as $state ) {
-					$total_items -= $post_counts[ $state ];
+				foreach (get_post_stati(array('show_in_admin_all_list' => false)) as $state) {
+					$total_items -= $post_counts[$state];
 				}
 			}
 		}
 
-		if ( ! empty( $_REQUEST['mode'] ) ) {
+		if ( ! empty($_REQUEST['mode'])) {
 			$mode = $_REQUEST['mode'] === 'excerpt' ? 'excerpt' : 'list';
-			set_user_setting( 'posts_list_mode', $mode );
+			set_user_setting('posts_list_mode', $mode);
 		} else {
-			$mode = get_user_setting( 'posts_list_mode', 'list' );
+			$mode = get_user_setting('posts_list_mode', 'list');
 		}
 
-		$this->is_trash = isset( $_REQUEST['post_status'] ) && $_REQUEST['post_status'] === 'trash';
+		$this->is_trash = isset($_REQUEST['post_status']) && $_REQUEST['post_status'] === 'trash';
 
-		$this->set_pagination_args( array(
+		$this->set_pagination_args(array(
 			'total_items' => $total_items,
 			'per_page' => $per_page
-		) );
+		));
 	}
 
 	/**
@@ -199,10 +199,10 @@ 
 	 * @access public
 	 */
 	public function no_items() {
-		if ( isset( $_REQUEST['post_status'] ) && 'trash' === $_REQUEST['post_status'] )
-			echo get_post_type_object( $this->screen->post_type )->labels->not_found_in_trash;
+		if (isset($_REQUEST['post_status']) && 'trash' === $_REQUEST['post_status'])
+			echo get_post_type_object($this->screen->post_type)->labels->not_found_in_trash;
 		else
-			echo get_post_type_object( $this->screen->post_type )->labels->not_found;
+			echo get_post_type_object($this->screen->post_type)->labels->not_found;
 	}
 
 	/**
@@ -214,15 +214,15 @@ 
 	 */
 	protected function is_base_request() {
 		$vars = $_GET;
-		unset( $vars['paged'] );
+		unset($vars['paged']);
 
-		if ( empty( $vars ) ) {
+		if (empty($vars)) {
 			return true;
-		} elseif ( 1 === count( $vars ) && ! empty( $vars['post_type'] ) ) {
+		} elseif (1 === count($vars) && ! empty($vars['post_type'])) {
 			return $this->screen->post_type === $vars['post_type'];
 		}
 
-		return 1 === count( $vars ) && ! empty( $vars['mode'] );
+		return 1 === count($vars) && ! empty($vars['mode']);
 	}
 
 	/**
@@ -236,20 +236,20 @@ 
 	 * @param string $class Optional. Class attribute. Default empty string.
 	 * @return string The formatted link string.
 	 */
-	protected function get_edit_link( $args, $label, $class = '' ) {
-		$url = add_query_arg( $args, 'edit.php' );
+	protected function get_edit_link($args, $label, $class = '') {
+		$url = add_query_arg($args, 'edit.php');
 
 		$class_html = '';
-		if ( ! empty( $class ) ) {
+		if ( ! empty($class)) {
 			 $class_html = sprintf(
 				' class="%s"',
-				esc_attr( $class )
+				esc_attr($class)
 			);
 		}
 
 		return sprintf(
 			'<a href="%s"%s>%s</a>',
-			esc_url( $url ),
+			esc_url($url),
 			$class_html,
 			$label
 		);
@@ -266,25 +266,25 @@ 
 
 		$post_type = $this->screen->post_type;
 
-		if ( !empty($locked_post_status) )
+		if ( ! empty($locked_post_status))
 			return array();
 
 		$status_links = array();
-		$num_posts = wp_count_posts( $post_type, 'readable' );
-		$total_posts = array_sum( (array) $num_posts );
+		$num_posts = wp_count_posts($post_type, 'readable');
+		$total_posts = array_sum((array) $num_posts);
 		$class = '';
 
 		$current_user_id = get_current_user_id();
-		$all_args = array( 'post_type' => $post_type );
+		$all_args = array('post_type' => $post_type);
 		$mine = '';
 
 		// Subtract post types that are not included in the admin all list.
-		foreach ( get_post_stati( array( 'show_in_admin_all_list' => false ) ) as $state ) {
+		foreach (get_post_stati(array('show_in_admin_all_list' => false)) as $state) {
 			$total_posts -= $num_posts->$state;
 		}
 
-		if ( $this->user_posts_count && $this->user_posts_count !== $total_posts ) {
-			if ( isset( $_GET['author'] ) && ( $_GET['author'] == $current_user_id ) ) {
+		if ($this->user_posts_count && $this->user_posts_count !== $total_posts) {
+			if (isset($_GET['author']) && ($_GET['author'] == $current_user_id)) {
 				$class = 'current';
 			}
 
@@ -300,16 +300,16 @@ 
 					$this->user_posts_count,
 					'posts'
 				),
-				number_format_i18n( $this->user_posts_count )
+				number_format_i18n($this->user_posts_count)
 			);
 
-			$mine = $this->get_edit_link( $mine_args, $mine_inner_html, $class );
+			$mine = $this->get_edit_link($mine_args, $mine_inner_html, $class);
 
 			$all_args['all_posts'] = 1;
 			$class = '';
 		}
 
-		if ( empty( $class ) && ( $this->is_base_request() || isset( $_REQUEST['all_posts'] ) ) ) {
+		if (empty($class) && ($this->is_base_request() || isset($_REQUEST['all_posts']))) {
 			$class = 'current';
 		}
 
@@ -320,24 +320,24 @@ 
 				$total_posts,
 				'posts'
 			),
-			number_format_i18n( $total_posts )
+			number_format_i18n($total_posts)
 		);
 
-		$status_links['all'] = $this->get_edit_link( $all_args, $all_inner_html, $class );
-		if ( $mine ) {
+		$status_links['all'] = $this->get_edit_link($all_args, $all_inner_html, $class);
+		if ($mine) {
 			$status_links['mine'] = $mine;
 		}
 
-		foreach ( get_post_stati(array('show_in_admin_status_list' => true), 'objects') as $status ) {
+		foreach (get_post_stati(array('show_in_admin_status_list' => true), 'objects') as $status) {
 			$class = '';
 
 			$status_name = $status->name;
 
-			if ( ! in_array( $status_name, $avail_post_stati ) || empty( $num_posts->$status_name ) ) {
+			if ( ! in_array($status_name, $avail_post_stati) || empty($num_posts->$status_name)) {
 				continue;
 			}
 
-			if ( isset($_REQUEST['post_status']) && $status_name === $_REQUEST['post_status'] ) {
+			if (isset($_REQUEST['post_status']) && $status_name === $_REQUEST['post_status']) {
 				$class = 'current';
 			}
 
@@ -347,15 +347,15 @@ 
 			);
 
 			$status_label = sprintf(
-				translate_nooped_plural( $status->label_count, $num_posts->$status_name ),
-				number_format_i18n( $num_posts->$status_name )
+				translate_nooped_plural($status->label_count, $num_posts->$status_name),
+				number_format_i18n($num_posts->$status_name)
 			);
 
-			$status_links[ $status_name ] = $this->get_edit_link( $status_args, $status_label, $class );
+			$status_links[$status_name] = $this->get_edit_link($status_args, $status_label, $class);
 		}
 
-		if ( ! empty( $this->sticky_posts_count ) ) {
-			$class = ! empty( $_REQUEST['show_sticky'] ) ? 'current' : '';
+		if ( ! empty($this->sticky_posts_count)) {
+			$class = ! empty($_REQUEST['show_sticky']) ? 'current' : '';
 
 			$sticky_args = array(
 				'post_type'	=> $post_type,
@@ -369,16 +369,16 @@ 
 					$this->sticky_posts_count,
 					'posts'
 				),
-				number_format_i18n( $this->sticky_posts_count )
+				number_format_i18n($this->sticky_posts_count)
 			);
 
 			$sticky_link = array(
-				'sticky' => $this->get_edit_link( $sticky_args, $sticky_inner_html, $class )
+				'sticky' => $this->get_edit_link($sticky_args, $sticky_inner_html, $class)
 			);
 
 			// Sticky comes after Publish, or if not listed, after All.
-			$split = 1 + array_search( ( isset( $status_links['publish'] ) ? 'publish' : 'all' ), array_keys( $status_links ) );
-			$status_links = array_merge( array_slice( $status_links, 0, $split ), $sticky_link, array_slice( $status_links, $split ) );
+			$split = 1 + array_search((isset($status_links['publish']) ? 'publish' : 'all'), array_keys($status_links));
+			$status_links = array_merge(array_slice($status_links, 0, $split), $sticky_link, array_slice($status_links, $split));
 		}
 
 		return $status_links;
@@ -390,21 +390,21 @@ 
 	 */
 	protected function get_bulk_actions() {
 		$actions = array();
-		$post_type_obj = get_post_type_object( $this->screen->post_type );
+		$post_type_obj = get_post_type_object($this->screen->post_type);
 
-		if ( current_user_can( $post_type_obj->cap->edit_posts ) ) {
-			if ( $this->is_trash ) {
-				$actions['untrash'] = __( 'Restore' );
+		if (current_user_can($post_type_obj->cap->edit_posts)) {
+			if ($this->is_trash) {
+				$actions['untrash'] = __('Restore');
 			} else {
-				$actions['edit'] = __( 'Edit' );
+				$actions['edit'] = __('Edit');
 			}
 		}
 
-		if ( current_user_can( $post_type_obj->cap->delete_posts ) ) {
-			if ( $this->is_trash || ! EMPTY_TRASH_DAYS ) {
-				$actions['delete'] = __( 'Delete Permanently' );
+		if (current_user_can($post_type_obj->cap->delete_posts)) {
+			if ($this->is_trash || ! EMPTY_TRASH_DAYS) {
+				$actions['delete'] = __('Delete Permanently');
 			} else {
-				$actions['trash'] = __( 'Move to Trash' );
+				$actions['trash'] = __('Move to Trash');
 			}
 		}
 
@@ -421,7 +421,7 @@ 
 	 *
 	 * @param string $post_type Post type slug.
 	 */
-	protected function categories_dropdown( $post_type ) {
+	protected function categories_dropdown($post_type) {
 		global $cat;
 
 		/**
@@ -432,13 +432,13 @@ 
 		 * @param bool   $disable   Whether to disable the categories drop-down. Default false.
 		 * @param string $post_type Post type slug.
 		 */
-		if ( false !== apply_filters( 'disable_categories_dropdown', false, $post_type ) ) {
+		if (false !== apply_filters('disable_categories_dropdown', false, $post_type)) {
 			return;
 		}
 
-		if ( is_object_in_taxonomy( $post_type, 'category' ) ) {
+		if (is_object_in_taxonomy($post_type, 'category')) {
 			$dropdown_options = array(
-				'show_option_all' => get_taxonomy( 'category' )->labels->all_items,
+				'show_option_all' => get_taxonomy('category')->labels->all_items,
 				'hide_empty' => 0,
 				'hierarchical' => 1,
 				'show_count' => 0,
@@ -446,23 +446,23 @@ 
 				'selected' => $cat
 			);
 
-			echo '<label class="screen-reader-text" for="cat">' . __( 'Filter by category' ) . '</label>';
-			wp_dropdown_categories( $dropdown_options );
+			echo '<label class="screen-reader-text" for="cat">'.__('Filter by category').'</label>';
+			wp_dropdown_categories($dropdown_options);
 		}
 	}
 
 	/**
 	 * @param string $which
 	 */
-	protected function extra_tablenav( $which ) {
+	protected function extra_tablenav($which) {
 ?>
 		<div class="alignleft actions">
 <?php
-		if ( 'top' === $which && !is_singular() ) {
+		if ('top' === $which && ! is_singular()) {
 			ob_start();
 
-			$this->months_dropdown( $this->screen->post_type );
-			$this->categories_dropdown( $this->screen->post_type );
+			$this->months_dropdown($this->screen->post_type);
+			$this->categories_dropdown($this->screen->post_type);
 
 			/**
 			 * Fires before the Filter button on the Posts and Pages list tables.
@@ -478,18 +478,18 @@ 
 			 * @param string $which     The location of the extra table nav markup:
 			 *                          'top' or 'bottom'.
 			 */
-			do_action( 'restrict_manage_posts', $this->screen->post_type, $which );
+			do_action('restrict_manage_posts', $this->screen->post_type, $which);
 
 			$output = ob_get_clean();
 
-			if ( ! empty( $output ) ) {
+			if ( ! empty($output)) {
 				echo $output;
-				submit_button( __( 'Filter' ), '', 'filter_action', false, array( 'id' => 'post-query-submit' ) );
+				submit_button(__('Filter'), '', 'filter_action', false, array('id' => 'post-query-submit'));
 			}
 		}
 
-		if ( $this->is_trash && current_user_can( get_post_type_object( $this->screen->post_type )->cap->edit_others_posts ) ) {
-			submit_button( __( 'Empty Trash' ), 'apply', 'delete_all', false );
+		if ($this->is_trash && current_user_can(get_post_type_object($this->screen->post_type)->cap->edit_others_posts)) {
+			submit_button(__('Empty Trash'), 'apply', 'delete_all', false);
 		}
 ?>
 		</div>
@@ -502,7 +502,7 @@ 
 		 *
 		 * @param string $which The location of the extra table nav markup: 'top' or 'bottom'.
 		 */
-		do_action( 'manage_posts_extra_tablenav', $which );
+		do_action('manage_posts_extra_tablenav', $which);
 	}
 
 	/**
@@ -510,7 +510,7 @@ 
 	 * @return string
 	 */
 	public function current_action() {
-		if ( isset( $_REQUEST['delete_all'] ) || isset( $_REQUEST['delete_all2'] ) )
+		if (isset($_REQUEST['delete_all']) || isset($_REQUEST['delete_all2']))
 			return 'delete_all';
 
 		return parent::current_action();
@@ -521,7 +521,7 @@ 
 	 * @return array
 	 */
 	protected function get_table_classes() {
-		return array( 'widefat', 'fixed', 'striped', is_post_type_hierarchical( $this->screen->post_type ) ? 'pages' : 'posts' );
+		return array('widefat', 'fixed', 'striped', is_post_type_hierarchical($this->screen->post_type) ? 'pages' : 'posts');
 	}
 
 	/**
@@ -536,14 +536,14 @@ 
 		$posts_columns['cb'] = '<input type="checkbox" />';
 
 		/* translators: manage posts column name */
-		$posts_columns['title'] = _x( 'Title', 'column name' );
+		$posts_columns['title'] = _x('Title', 'column name');
 
-		if ( post_type_supports( $post_type, 'author' ) ) {
-			$posts_columns['author'] = __( 'Author' );
+		if (post_type_supports($post_type, 'author')) {
+			$posts_columns['author'] = __('Author');
 		}
 
-		$taxonomies = get_object_taxonomies( $post_type, 'objects' );
-		$taxonomies = wp_filter_object_list( $taxonomies, array( 'show_admin_column' => true ), 'and', 'name' );
+		$taxonomies = get_object_taxonomies($post_type, 'objects');
+		$taxonomies = wp_filter_object_list($taxonomies, array('show_admin_column' => true), 'and', 'name');
 
 		/**
 		 * Filters the taxonomy columns in the Posts list table.
@@ -556,27 +556,27 @@ 
 		 * @param array  $taxonomies Array of taxonomies to show columns for.
 		 * @param string $post_type  The post type.
 		 */
-		$taxonomies = apply_filters( "manage_taxonomies_for_{$post_type}_columns", $taxonomies, $post_type );
-		$taxonomies = array_filter( $taxonomies, 'taxonomy_exists' );
+		$taxonomies = apply_filters("manage_taxonomies_for_{$post_type}_columns", $taxonomies, $post_type);
+		$taxonomies = array_filter($taxonomies, 'taxonomy_exists');
 
-		foreach ( $taxonomies as $taxonomy ) {
-			if ( 'category' === $taxonomy )
+		foreach ($taxonomies as $taxonomy) {
+			if ('category' === $taxonomy)
 				$column_key = 'categories';
-			elseif ( 'post_tag' === $taxonomy )
+			elseif ('post_tag' === $taxonomy)
 				$column_key = 'tags';
 			else
-				$column_key = 'taxonomy-' . $taxonomy;
+				$column_key = 'taxonomy-'.$taxonomy;
 
-			$posts_columns[ $column_key ] = get_taxonomy( $taxonomy )->labels->name;
+			$posts_columns[$column_key] = get_taxonomy($taxonomy)->labels->name;
 		}
 
-		$post_status = !empty( $_REQUEST['post_status'] ) ? $_REQUEST['post_status'] : 'all';
-		if ( post_type_supports( $post_type, 'comments' ) && !in_array( $post_status, array( 'pending', 'draft', 'future' ) ) )
-			$posts_columns['comments'] = '<span class="vers comment-grey-bubble" title="' . esc_attr__( 'Comments' ) . '"><span class="screen-reader-text">' . __( 'Comments' ) . '</span></span>';
+		$post_status = ! empty($_REQUEST['post_status']) ? $_REQUEST['post_status'] : 'all';
+		if (post_type_supports($post_type, 'comments') && ! in_array($post_status, array('pending', 'draft', 'future')))
+			$posts_columns['comments'] = '<span class="vers comment-grey-bubble" title="'.esc_attr__('Comments').'"><span class="screen-reader-text">'.__('Comments').'</span></span>';
 
-		$posts_columns['date'] = __( 'Date' );
+		$posts_columns['date'] = __('Date');
 
-		if ( 'page' === $post_type ) {
+		if ('page' === $post_type) {
 
 			/**
 			 * Filters the columns displayed in the Pages list table.
@@ -585,7 +585,7 @@ 
 			 *
 			 * @param array $post_columns An array of column names.
 			 */
-			$posts_columns = apply_filters( 'manage_pages_columns', $posts_columns );
+			$posts_columns = apply_filters('manage_pages_columns', $posts_columns);
 		} else {
 
 			/**
@@ -596,7 +596,7 @@ 
 			 * @param array  $posts_columns An array of column names.
 			 * @param string $post_type     The post type slug.
 			 */
-			$posts_columns = apply_filters( 'manage_posts_columns', $posts_columns, $post_type );
+			$posts_columns = apply_filters('manage_posts_columns', $posts_columns, $post_type);
 		}
 
 		/**
@@ -608,7 +608,7 @@ 
 		 *
 		 * @param array $post_columns An array of column names.
 		 */
-		return apply_filters( "manage_{$post_type}_posts_columns", $posts_columns );
+		return apply_filters("manage_{$post_type}_posts_columns", $posts_columns);
 	}
 
 	/**
@@ -620,7 +620,7 @@ 
 			'title'    => 'title',
 			'parent'   => 'parent',
 			'comments' => 'comment_count',
-			'date'     => array( 'date', true )
+			'date'     => array('date', true)
 		);
 	}
 
@@ -630,18 +630,18 @@ 
 	 * @param array $posts
 	 * @param int $level
 	 */
-	public function display_rows( $posts = array(), $level = 0 ) {
+	public function display_rows($posts = array(), $level = 0) {
 		global $wp_query, $per_page;
 
-		if ( empty( $posts ) )
+		if (empty($posts))
 			$posts = $wp_query->posts;
 
-		add_filter( 'the_title', 'esc_html' );
+		add_filter('the_title', 'esc_html');
 
-		if ( $this->hierarchical_display ) {
-			$this->_display_rows_hierarchical( $posts, $this->get_pagenum(), $per_page );
+		if ($this->hierarchical_display) {
+			$this->_display_rows_hierarchical($posts, $this->get_pagenum(), $per_page);
 		} else {
-			$this->_display_rows( $posts, $level );
+			$this->_display_rows($posts, $level);
 		}
 	}
 
@@ -649,17 +649,17 @@ 
 	 * @param array $posts
 	 * @param int $level
 	 */
-	private function _display_rows( $posts, $level = 0 ) {
+	private function _display_rows($posts, $level = 0) {
 		// Create array of post IDs.
 		$post_ids = array();
 
-		foreach ( $posts as $a_post )
+		foreach ($posts as $a_post)
 			$post_ids[] = $a_post->ID;
 
-		$this->comment_pending_count = get_pending_comments_num( $post_ids );
+		$this->comment_pending_count = get_pending_comments_num($post_ids);
 
-		foreach ( $posts as $post )
-			$this->single_row( $post, $level );
+		foreach ($posts as $post)
+			$this->single_row($post, $level);
 	}
 
 	/**
@@ -669,15 +669,15 @@ 
 	 * @param int $pagenum
 	 * @param int $per_page
 	 */
-	private function _display_rows_hierarchical( $pages, $pagenum = 1, $per_page = 20 ) {
+	private function _display_rows_hierarchical($pages, $pagenum = 1, $per_page = 20) {
 		global $wpdb;
 
 		$level = 0;
 
-		if ( ! $pages ) {
-			$pages = get_pages( array( 'sort_column' => 'menu_order' ) );
+		if ( ! $pages) {
+			$pages = get_pages(array('sort_column' => 'menu_order'));
 
-			if ( ! $pages )
+			if ( ! $pages)
 				return;
 		}
 
@@ -688,56 +688,56 @@ 
 		 * It only takes O( N ) to arrange this and it takes O( 1 ) for subsequent lookup operations
 		 * If searching, ignore hierarchy and treat everything as top level
 		 */
-		if ( empty( $_REQUEST['s'] ) ) {
+		if (empty($_REQUEST['s'])) {
 
 			$top_level_pages = array();
 			$children_pages = array();
 
-			foreach ( $pages as $page ) {
+			foreach ($pages as $page) {
 
 				// Catch and repair bad pages.
-				if ( $page->post_parent == $page->ID ) {
+				if ($page->post_parent == $page->ID) {
 					$page->post_parent = 0;
-					$wpdb->update( $wpdb->posts, array( 'post_parent' => 0 ), array( 'ID' => $page->ID ) );
-					clean_post_cache( $page );
+					$wpdb->update($wpdb->posts, array('post_parent' => 0), array('ID' => $page->ID));
+					clean_post_cache($page);
 				}
 
-				if ( 0 == $page->post_parent )
+				if (0 == $page->post_parent)
 					$top_level_pages[] = $page;
 				else
-					$children_pages[ $page->post_parent ][] = $page;
+					$children_pages[$page->post_parent][] = $page;
 			}
 
 			$pages = &$top_level_pages;
 		}
 
 		$count = 0;
-		$start = ( $pagenum - 1 ) * $per_page;
+		$start = ($pagenum - 1) * $per_page;
 		$end = $start + $per_page;
 		$to_display = array();
 
-		foreach ( $pages as $page ) {
-			if ( $count >= $end )
+		foreach ($pages as $page) {
+			if ($count >= $end)
 				break;
 
-			if ( $count >= $start ) {
+			if ($count >= $start) {
 				$to_display[$page->ID] = $level;
 			}
 
 			$count++;
 
-			if ( isset( $children_pages ) )
-				$this->_page_rows( $children_pages, $count, $page->ID, $level + 1, $pagenum, $per_page, $to_display );
+			if (isset($children_pages))
+				$this->_page_rows($children_pages, $count, $page->ID, $level + 1, $pagenum, $per_page, $to_display);
 		}
 
 		// If it is the last pagenum and there are orphaned pages, display them with paging as well.
-		if ( isset( $children_pages ) && $count < $end ){
-			foreach ( $children_pages as $orphans ){
-				foreach ( $orphans as $op ) {
-					if ( $count >= $end )
+		if (isset($children_pages) && $count < $end) {
+			foreach ($children_pages as $orphans) {
+				foreach ($orphans as $op) {
+					if ($count >= $end)
 						break;
 
-					if ( $count >= $start ) {
+					if ($count >= $start) {
 						$to_display[$op->ID] = 0;
 					}
 
@@ -746,16 +746,16 @@ 
 			}
 		}
 
-		$ids = array_keys( $to_display );
-		_prime_post_caches( $ids );
+		$ids = array_keys($to_display);
+		_prime_post_caches($ids);
 
-		if ( ! isset( $GLOBALS['post'] ) ) {
-			$GLOBALS['post'] = reset( $ids );
+		if ( ! isset($GLOBALS['post'])) {
+			$GLOBALS['post'] = reset($ids);
 		}
 
-		foreach ( $to_display as $page_id => $level ) {
+		foreach ($to_display as $page_id => $level) {
 			echo "\t";
-			$this->single_row( $page_id, $level );
+			$this->single_row($page_id, $level);
 		}
 	}
 
@@ -774,51 +774,51 @@ 
 	 * @param int $per_page
 	 * @param array $to_display List of pages to be displayed. Passed by reference.
 	 */
-	private function _page_rows( &$children_pages, &$count, $parent, $level, $pagenum, $per_page, &$to_display ) {
-		if ( ! isset( $children_pages[$parent] ) )
+	private function _page_rows(&$children_pages, &$count, $parent, $level, $pagenum, $per_page, &$to_display) {
+		if ( ! isset($children_pages[$parent]))
 			return;
 
-		$start = ( $pagenum - 1 ) * $per_page;
+		$start = ($pagenum - 1) * $per_page;
 		$end = $start + $per_page;
 
-		foreach ( $children_pages[$parent] as $page ) {
-			if ( $count >= $end )
+		foreach ($children_pages[$parent] as $page) {
+			if ($count >= $end)
 				break;
 
 			// If the page starts in a subtree, print the parents.
-			if ( $count == $start && $page->post_parent > 0 ) {
+			if ($count == $start && $page->post_parent > 0) {
 				$my_parents = array();
 				$my_parent = $page->post_parent;
-				while ( $my_parent ) {
+				while ($my_parent) {
 					// Get the ID from the list or the attribute if my_parent is an object
 					$parent_id = $my_parent;
-					if ( is_object( $my_parent ) ) {
+					if (is_object($my_parent)) {
 						$parent_id = $my_parent->ID;
 					}
 
-					$my_parent = get_post( $parent_id );
+					$my_parent = get_post($parent_id);
 					$my_parents[] = $my_parent;
-					if ( !$my_parent->post_parent )
+					if ( ! $my_parent->post_parent)
 						break;
 					$my_parent = $my_parent->post_parent;
 				}
-				$num_parents = count( $my_parents );
-				while ( $my_parent = array_pop( $my_parents ) ) {
+				$num_parents = count($my_parents);
+				while ($my_parent = array_pop($my_parents)) {
 					$to_display[$my_parent->ID] = $level - $num_parents;
 					$num_parents--;
 				}
 			}
 
-			if ( $count >= $start ) {
+			if ($count >= $start) {
 				$to_display[$page->ID] = $level;
 			}
 
 			$count++;
 
-			$this->_page_rows( $children_pages, $count, $page->ID, $level + 1, $pagenum, $per_page, $to_display );
+			$this->_page_rows($children_pages, $count, $page->ID, $level + 1, $pagenum, $per_page, $to_display);
 		}
 
-		unset( $children_pages[$parent] ); //required in order to keep track of orphans
+		unset($children_pages[$parent]); //required in order to keep track of orphans
 	}
 
 	/**
@@ -829,10 +829,10 @@ 
 	 *
 	 * @param WP_Post $post The current WP_Post object.
 	 */
-	public function column_cb( $post ) {
-		if ( current_user_can( 'edit_post', $post->ID ) ): ?>
+	public function column_cb($post) {
+		if (current_user_can('edit_post', $post->ID)): ?>
 			<label class="screen-reader-text" for="cb-select-<?php the_ID(); ?>"><?php
-				printf( __( 'Select %s' ), _draft_or_post_title() );
+				printf(__('Select %s'), _draft_or_post_title());
 			?></label>
 			<input id="cb-select-<?php the_ID(); ?>" type="checkbox" name="post[]" value="<?php the_ID(); ?>" />
 			<div class="locked-indicator">
@@ -840,7 +840,7 @@ 
 				<span class="screen-reader-text"><?php
 				printf(
 					/* translators: %s: post title */
-					__( '&#8220;%s&#8221; is locked' ),
+					__('&#8220;%s&#8221; is locked'),
 					_draft_or_post_title()
 				);
 				?></span>
@@ -857,10 +857,10 @@ 
 	 * @param string  $data
 	 * @param string  $primary
 	 */
-	protected function _column_title( $post, $classes, $data, $primary ) {
-		echo '<td class="' . $classes . ' page-title" ', $data, '>';
-		echo $this->column_title( $post );
-		echo $this->handle_row_actions( $post, 'title', $primary );
+	protected function _column_title($post, $classes, $data, $primary) {
+		echo '<td class="'.$classes.' page-title" ', $data, '>';
+		echo $this->column_title($post);
+		echo $this->handle_row_actions($post, 'title', $primary);
 		echo '</td>';
 	}
 
@@ -874,91 +874,91 @@ 
 	 *
 	 * @param WP_Post $post The current WP_Post object.
 	 */
-	public function column_title( $post ) {
+	public function column_title($post) {
 		global $mode;
 
-		if ( $this->hierarchical_display ) {
-			if ( 0 === $this->current_level && (int) $post->post_parent > 0 ) {
+		if ($this->hierarchical_display) {
+			if (0 === $this->current_level && (int) $post->post_parent > 0) {
 				// Sent level 0 by accident, by default, or because we don't know the actual level.
 				$find_main_page = (int) $post->post_parent;
-				while ( $find_main_page > 0 ) {
-					$parent = get_post( $find_main_page );
+				while ($find_main_page > 0) {
+					$parent = get_post($find_main_page);
 
-					if ( is_null( $parent ) ) {
+					if (is_null($parent)) {
 						break;
 					}
 
 					$this->current_level++;
 					$find_main_page = (int) $parent->post_parent;
 
-					if ( ! isset( $parent_name ) ) {
+					if ( ! isset($parent_name)) {
 						/** This filter is documented in wp-includes/post-template.php */
-						$parent_name = apply_filters( 'the_title', $parent->post_title, $parent->ID );
+						$parent_name = apply_filters('the_title', $parent->post_title, $parent->ID);
 					}
 				}
 			}
 		}
 
-		$can_edit_post = current_user_can( 'edit_post', $post->ID );
+		$can_edit_post = current_user_can('edit_post', $post->ID);
 
-		if ( $can_edit_post && $post->post_status != 'trash' ) {
-			$lock_holder = wp_check_post_lock( $post->ID );
+		if ($can_edit_post && $post->post_status != 'trash') {
+			$lock_holder = wp_check_post_lock($post->ID);
 
-			if ( $lock_holder ) {
-				$lock_holder = get_userdata( $lock_holder );
-				$locked_avatar = get_avatar( $lock_holder->ID, 18 );
-				$locked_text = esc_html( sprintf( __( '%s is currently editing' ), $lock_holder->display_name ) );
+			if ($lock_holder) {
+				$lock_holder = get_userdata($lock_holder);
+				$locked_avatar = get_avatar($lock_holder->ID, 18);
+				$locked_text = esc_html(sprintf(__('%s is currently editing'), $lock_holder->display_name));
 			} else {
 				$locked_avatar = $locked_text = '';
 			}
 
-			echo '<div class="locked-info"><span class="locked-avatar">' . $locked_avatar . '</span> <span class="locked-text">' . $locked_text . "</span></div>\n";
+			echo '<div class="locked-info"><span class="locked-avatar">'.$locked_avatar.'</span> <span class="locked-text">'.$locked_text."</span></div>\n";
 		}
 
-		$pad = str_repeat( '&#8212; ', $this->current_level );
+		$pad = str_repeat('&#8212; ', $this->current_level);
 		echo "<strong>";
 
-		$format = get_post_format( $post->ID );
-		if ( $format ) {
-			$label = get_post_format_string( $format );
+		$format = get_post_format($post->ID);
+		if ($format) {
+			$label = get_post_format_string($format);
 
-			$format_class = 'post-state-format post-format-icon post-format-' . $format;
+			$format_class = 'post-state-format post-format-icon post-format-'.$format;
 
 			$format_args = array(
 				'post_format' => $format,
 				'post_type' => $post->post_type
 			);
 
-			echo $this->get_edit_link( $format_args, $label . ':', $format_class );
+			echo $this->get_edit_link($format_args, $label.':', $format_class);
 		}
 
 		$title = _draft_or_post_title();
 
-		if ( $can_edit_post && $post->post_status != 'trash' ) {
+		if ($can_edit_post && $post->post_status != 'trash') {
 			printf(
 				'<a class="row-title" href="%s" aria-label="%s">%s%s</a>',
-				get_edit_post_link( $post->ID ),
+				get_edit_post_link($post->ID),
 				/* translators: %s: post title */
-				esc_attr( sprintf( __( '&#8220;%s&#8221; (Edit)' ), $title ) ),
+				esc_attr(sprintf(__('&#8220;%s&#8221; (Edit)'), $title)),
 				$pad,
 				$title
 			);
 		} else {
-			echo $pad . $title;
+			echo $pad.$title;
 		}
-		_post_states( $post );
+		_post_states($post);
 
-		if ( isset( $parent_name ) ) {
-			$post_type_object = get_post_type_object( $post->post_type );
-			echo ' | ' . $post_type_object->labels->parent_item_colon . ' ' . esc_html( $parent_name );
+		if (isset($parent_name)) {
+			$post_type_object = get_post_type_object($post->post_type);
+			echo ' | '.$post_type_object->labels->parent_item_colon.' '.esc_html($parent_name);
 		}
 		echo "</strong>\n";
 
-		if ( ! is_post_type_hierarchical( $this->screen->post_type ) && 'excerpt' === $mode && current_user_can( 'read_post', $post->ID ) ) {
+		if ( ! is_post_type_hierarchical($this->screen->post_type) && 'excerpt' === $mode && current_user_can('read_post', $post->ID)) {
 			the_excerpt();
 		}
 
-		get_inline_data( $post );
+		get_inline_data($post);
 	}
 
 	/**
@@ -971,39 +971,39 @@ 
 	 *
 	 * @param WP_Post $post The current WP_Post object.
 	 */
-	public function column_date( $post ) {
+	public function column_date($post) {
 		global $mode;
 
-		if ( '0000-00-00 00:00:00' === $post->post_date ) {
-			$t_time = $h_time = __( 'Unpublished' );
+		if ('0000-00-00 00:00:00' === $post->post_date) {
+			$t_time = $h_time = __('Unpublished');
 			$time_diff = 0;
 		} else {
-			$t_time = get_the_time( __( 'Y/m/d g:i:s a' ) );
+			$t_time = get_the_time(__('Y/m/d g:i:s a'));
 			$m_time = $post->post_date;
-			$time = get_post_time( 'G', true, $post );
+			$time = get_post_time('G', true, $post);
 
 			$time_diff = time() - $time;
 
-			if ( $time_diff > 0 && $time_diff < DAY_IN_SECONDS ) {
-				$h_time = sprintf( __( '%s ago' ), human_time_diff( $time ) );
+			if ($time_diff > 0 && $time_diff < DAY_IN_SECONDS) {
+				$h_time = sprintf(__('%s ago'), human_time_diff($time));
 			} else {
-				$h_time = mysql2date( __( 'Y/m/d' ), $m_time );
+				$h_time = mysql2date(__('Y/m/d'), $m_time);
 			}
 		}
 
-		if ( 'publish' === $post->post_status ) {
-			_e( 'Published' );
-		} elseif ( 'future' === $post->post_status ) {
-			if ( $time_diff > 0 ) {
-				echo '<strong class="error-message">' . __( 'Missed schedule' ) . '</strong>';
+		if ('publish' === $post->post_status) {
+			_e('Published');
+		} elseif ('future' === $post->post_status) {
+			if ($time_diff > 0) {
+				echo '<strong class="error-message">'.__('Missed schedule').'</strong>';
 			} else {
-				_e( 'Scheduled' );
+				_e('Scheduled');
 			}
 		} else {
-			_e( 'Last Modified' );
+			_e('Last Modified');
 		}
 		echo '<br />';
-		if ( 'excerpt' === $mode ) {
+		if ('excerpt' === $mode) {
 			/**
 			 * Filters the published time of the post.
 			 *
@@ -1018,11 +1018,11 @@ 
 			 * @param string  $column_name The column name.
 			 * @param string  $mode        The list display mode ('excerpt' or 'list').
 			 */
-			echo apply_filters( 'post_date_column_time', $t_time, $post, 'date', $mode );
+			echo apply_filters('post_date_column_time', $t_time, $post, 'date', $mode);
 		} else {
 
 			/** This filter is documented in wp-admin/includes/class-wp-posts-list-table.php */
-			echo '<abbr title="' . $t_time . '">' . apply_filters( 'post_date_column_time', $h_time, $post, 'date', $mode ) . '</abbr>';
+			echo '<abbr title="'.$t_time.'">'.apply_filters('post_date_column_time', $h_time, $post, 'date', $mode).'</abbr>';
 		}
 	}
 
@@ -1034,13 +1034,13 @@ 
 	 *
 	 * @param WP_Post $post The current WP_Post object.
 	 */
-	public function column_comments( $post ) {
+	public function column_comments($post) {
 		?>
 		<div class="post-com-count-wrapper">
 		<?php
-			$pending_comments = isset( $this->comment_pending_count[$post->ID] ) ? $this->comment_pending_count[$post->ID] : 0;
+			$pending_comments = isset($this->comment_pending_count[$post->ID]) ? $this->comment_pending_count[$post->ID] : 0;
 
-			$this->comments_bubble( $post->ID, $pending_comments );
+			$this->comments_bubble($post->ID, $pending_comments);
 		?>
 		</div>
 		<?php
@@ -1054,12 +1054,12 @@ 
 	 *
 	 * @param WP_Post $post The current WP_Post object.
 	 */
-	public function column_author( $post ) {
+	public function column_author($post) {
 		$args = array(
 			'post_type' => $post->post_type,
-			'author' => get_the_author_meta( 'ID' )
+			'author' => get_the_author_meta('ID')
 		);
-		echo $this->get_edit_link( $args, get_the_author() );
+		echo $this->get_edit_link($args, get_the_author());
 	}
 
 	/**
@@ -1071,45 +1071,45 @@ 
 	 * @param WP_Post $post        The current WP_Post object.
 	 * @param string  $column_name The current column name.
 	 */
-	public function column_default( $post, $column_name ) {
-		if ( 'categories' === $column_name ) {
+	public function column_default($post, $column_name) {
+		if ('categories' === $column_name) {
 			$taxonomy = 'category';
-		} elseif ( 'tags' === $column_name ) {
+		} elseif ('tags' === $column_name) {
 			$taxonomy = 'post_tag';
-		} elseif ( 0 === strpos( $column_name, 'taxonomy-' ) ) {
-			$taxonomy = substr( $column_name, 9 );
+		} elseif (0 === strpos($column_name, 'taxonomy-')) {
+			$taxonomy = substr($column_name, 9);
 		} else {
 			$taxonomy = false;
 		}
-		if ( $taxonomy ) {
-			$taxonomy_object = get_taxonomy( $taxonomy );
-			$terms = get_the_terms( $post->ID, $taxonomy );
-			if ( is_array( $terms ) ) {
+		if ($taxonomy) {
+			$taxonomy_object = get_taxonomy($taxonomy);
+			$terms = get_the_terms($post->ID, $taxonomy);
+			if (is_array($terms)) {
 				$out = array();
-				foreach ( $terms as $t ) {
+				foreach ($terms as $t) {
 					$posts_in_term_qv = array();
-					if ( 'post' != $post->post_type ) {
+					if ('post' != $post->post_type) {
 						$posts_in_term_qv['post_type'] = $post->post_type;
 					}
-					if ( $taxonomy_object->query_var ) {
-						$posts_in_term_qv[ $taxonomy_object->query_var ] = $t->slug;
+					if ($taxonomy_object->query_var) {
+						$posts_in_term_qv[$taxonomy_object->query_var] = $t->slug;
 					} else {
 						$posts_in_term_qv['taxonomy'] = $taxonomy;
 						$posts_in_term_qv['term'] = $t->slug;
 					}
 
-					$label = esc_html( sanitize_term_field( 'name', $t->name, $t->term_id, $taxonomy, 'display' ) );
-					$out[] = $this->get_edit_link( $posts_in_term_qv, $label );
+					$label = esc_html(sanitize_term_field('name', $t->name, $t->term_id, $taxonomy, 'display'));
+					$out[] = $this->get_edit_link($posts_in_term_qv, $label);
 				}
 				/* translators: used between list items, there is a space after the comma */
-				echo join( __( ', ' ), $out );
+				echo join(__(', '), $out);
 			} else {
-				echo '<span aria-hidden="true">&#8212;</span><span class="screen-reader-text">' . $taxonomy_object->labels->no_terms . '</span>';
+				echo '<span aria-hidden="true">&#8212;</span><span class="screen-reader-text">'.$taxonomy_object->labels->no_terms.'</span>';
 			}
 			return;
 		}
 
-		if ( is_post_type_hierarchical( $post->post_type ) ) {
+		if (is_post_type_hierarchical($post->post_type)) {
 
 			/**
 			 * Fires in each custom column on the Posts list table.
@@ -1122,7 +1122,7 @@ 
 			 * @param string $column_name The name of the column to display.
 			 * @param int    $post_id     The current post ID.
 			 */
-			do_action( 'manage_pages_custom_column', $column_name, $post->ID );
+			do_action('manage_pages_custom_column', $column_name, $post->ID);
 		} else {
 
 			/**
@@ -1136,7 +1136,7 @@ 
 			 * @param string $column_name The name of the column to display.
 			 * @param int    $post_id     The current post ID.
 			 */
-			do_action( 'manage_posts_custom_column', $column_name, $post->ID );
+			do_action('manage_posts_custom_column', $column_name, $post->ID);
 		}
 
 		/**
@@ -1149,7 +1149,7 @@ 
 		 * @param string $column_name The name of the column to display.
 		 * @param int    $post_id     The current post ID.
 		 */
-		do_action( "manage_{$post->post_type}_posts_custom_column", $column_name, $post->ID );
+		do_action("manage_{$post->post_type}_posts_custom_column", $column_name, $post->ID);
 	}
 
 	/**
@@ -1158,31 +1158,31 @@ 
 	 * @param int|WP_Post $post
 	 * @param int         $level
 	 */
-	public function single_row( $post, $level = 0 ) {
+	public function single_row($post, $level = 0) {
 		$global_post = get_post();
 
-		$post = get_post( $post );
+		$post = get_post($post);
 		$this->current_level = $level;
 
 		$GLOBALS['post'] = $post;
-		setup_postdata( $post );
+		setup_postdata($post);
 
-		$classes = 'iedit author-' . ( get_current_user_id() == $post->post_author ? 'self' : 'other' );
+		$classes = 'iedit author-'.(get_current_user_id() == $post->post_author ? 'self' : 'other');
 
-		$lock_holder = wp_check_post_lock( $post->ID );
-		if ( $lock_holder ) {
+		$lock_holder = wp_check_post_lock($post->ID);
+		if ($lock_holder) {
 			$classes .= ' wp-locked';
 		}
 
-		if ( $post->post_parent ) {
-		    $count = count( get_post_ancestors( $post->ID ) );
-		    $classes .= ' level-'. $count;
+		if ($post->post_parent) {
+		    $count = count(get_post_ancestors($post->ID));
+		    $classes .= ' level-'.$count;
 		} else {
 		    $classes .= ' level-0';
 		}
 	?>
-		<tr id="post-<?php echo $post->ID; ?>" class="<?php echo implode( ' ', get_post_class( $classes, $post->ID ) ); ?>">
-			<?php $this->single_row_columns( $post ); ?>
+		<tr id="post-<?php echo $post->ID; ?>" class="<?php echo implode(' ', get_post_class($classes, $post->ID)); ?>">
+			<?php $this->single_row_columns($post); ?>
 		</tr>
 	<?php
 		$GLOBALS['post'] = $global_post;
@@ -1211,85 +1211,85 @@ 
 	 * @param string $primary     Primary column name.
 	 * @return string Row actions output for posts.
 	 */
-	protected function handle_row_actions( $post, $column_name, $primary ) {
-		if ( $primary !== $column_name ) {
+	protected function handle_row_actions($post, $column_name, $primary) {
+		if ($primary !== $column_name) {
 			return '';
 		}
 
-		$post_type_object = get_post_type_object( $post->post_type );
-		$can_edit_post = current_user_can( 'edit_post', $post->ID );
+		$post_type_object = get_post_type_object($post->post_type);
+		$can_edit_post = current_user_can('edit_post', $post->ID);
 		$actions = array();
 		$title = _draft_or_post_title();
 
-		if ( $can_edit_post && 'trash' != $post->post_status ) {
+		if ($can_edit_post && 'trash' != $post->post_status) {
 			$actions['edit'] = sprintf(
 				'<a href="%s" aria-label="%s">%s</a>',
-				get_edit_post_link( $post->ID ),
+				get_edit_post_link($post->ID),
 				/* translators: %s: post title */
-				esc_attr( sprintf( __( 'Edit &#8220;%s&#8221;' ), $title ) ),
-				__( 'Edit' )
+				esc_attr(sprintf(__('Edit &#8220;%s&#8221;'), $title)),
+				__('Edit')
 			);
 			$actions['inline hide-if-no-js'] = sprintf(
 				'<a href="#" class="editinline" aria-label="%s">%s</a>',
 				/* translators: %s: post title */
-				esc_attr( sprintf( __( 'Quick edit &#8220;%s&#8221; inline' ), $title ) ),
-				__( 'Quick&nbsp;Edit' )
+				esc_attr(sprintf(__('Quick edit &#8220;%s&#8221; inline'), $title)),
+				__('Quick&nbsp;Edit')
 			);
 		}
 
-		if ( current_user_can( 'delete_post', $post->ID ) ) {
-			if ( 'trash' === $post->post_status ) {
+		if (current_user_can('delete_post', $post->ID)) {
+			if ('trash' === $post->post_status) {
 				$actions['untrash'] = sprintf(
 					'<a href="%s" aria-label="%s">%s</a>',
-					wp_nonce_url( admin_url( sprintf( $post_type_object->_edit_link . '&amp;action=untrash', $post->ID ) ), 'untrash-post_' . $post->ID ),
+					wp_nonce_url(admin_url(sprintf($post_type_object->_edit_link.'&amp;action=untrash', $post->ID)), 'untrash-post_'.$post->ID),
 					/* translators: %s: post title */
-					esc_attr( sprintf( __( 'Restore &#8220;%s&#8221; from the Trash' ), $title ) ),
-					__( 'Restore' )
+					esc_attr(sprintf(__('Restore &#8220;%s&#8221; from the Trash'), $title)),
+					__('Restore')
 				);
-			} elseif ( EMPTY_TRASH_DAYS ) {
+			} elseif (EMPTY_TRASH_DAYS) {
 				$actions['trash'] = sprintf(
 					'<a href="%s" class="submitdelete" aria-label="%s">%s</a>',
-					get_delete_post_link( $post->ID ),
+					get_delete_post_link($post->ID),
 					/* translators: %s: post title */
-					esc_attr( sprintf( __( 'Move &#8220;%s&#8221; to the Trash' ), $title ) ),
-					_x( 'Trash', 'verb' )
+					esc_attr(sprintf(__('Move &#8220;%s&#8221; to the Trash'), $title)),
+					_x('Trash', 'verb')
 				);
 			}
-			if ( 'trash' === $post->post_status || ! EMPTY_TRASH_DAYS ) {
+			if ('trash' === $post->post_status || ! EMPTY_TRASH_DAYS) {
 				$actions['delete'] = sprintf(
 					'<a href="%s" class="submitdelete" aria-label="%s">%s</a>',
-					get_delete_post_link( $post->ID, '', true ),
+					get_delete_post_link($post->ID, '', true),
 					/* translators: %s: post title */
-					esc_attr( sprintf( __( 'Delete &#8220;%s&#8221; permanently' ), $title ) ),
-					__( 'Delete Permanently' )
+					esc_attr(sprintf(__('Delete &#8220;%s&#8221; permanently'), $title)),
+					__('Delete Permanently')
 				);
 			}
 		}
 
-		if ( is_post_type_viewable( $post_type_object ) ) {
-			if ( in_array( $post->post_status, array( 'pending', 'draft', 'future' ) ) ) {
-				if ( $can_edit_post ) {
-					$preview_link = get_preview_post_link( $post );
+		if (is_post_type_viewable($post_type_object)) {
+			if (in_array($post->post_status, array('pending', 'draft', 'future'))) {
+				if ($can_edit_post) {
+					$preview_link = get_preview_post_link($post);
 					$actions['view'] = sprintf(
 						'<a href="%s" rel="permalink" aria-label="%s">%s</a>',
-						esc_url( $preview_link ),
+						esc_url($preview_link),
 						/* translators: %s: post title */
-						esc_attr( sprintf( __( 'Preview &#8220;%s&#8221;' ), $title ) ),
-						__( 'Preview' )
+						esc_attr(sprintf(__('Preview &#8220;%s&#8221;'), $title)),
+						__('Preview')
 					);
 				}
-			} elseif ( 'trash' != $post->post_status ) {
+			} elseif ('trash' != $post->post_status) {
 				$actions['view'] = sprintf(
 					'<a href="%s" rel="permalink" aria-label="%s">%s</a>',
-					get_permalink( $post->ID ),
+					get_permalink($post->ID),
 					/* translators: %s: post title */
-					esc_attr( sprintf( __( 'View &#8220;%s&#8221;' ), $title ) ),
-					__( 'View' )
+					esc_attr(sprintf(__('View &#8220;%s&#8221;'), $title)),
+					__('View')
 				);
 			}
 		}
 
-		if ( is_post_type_hierarchical( $post->post_type ) ) {
+		if (is_post_type_hierarchical($post->post_type)) {
 
 			/**
 			 * Filters the array of row action links on the Pages list table.
@@ -1303,7 +1303,7 @@ 
 			 *                         'Delete Permanently', 'Preview', and 'View'.
 			 * @param WP_Post $post The post object.
 			 */
-			$actions = apply_filters( 'page_row_actions', $actions, $post );
+			$actions = apply_filters('page_row_actions', $actions, $post);
 		} else {
 
 			/**
@@ -1318,10 +1318,10 @@ 
 			 *                         'Delete Permanently', 'Preview', and 'View'.
 			 * @param WP_Post $post The post object.
 			 */
-			$actions = apply_filters( 'post_row_actions', $actions, $post );
+			$actions = apply_filters('post_row_actions', $actions, $post);
 		}
 
-		return $this->row_actions( $actions );
+		return $this->row_actions($actions);
 	}
 
 	/**
@@ -1336,15 +1336,15 @@ 
 
 		$screen = $this->screen;
 
-		$post = get_default_post_to_edit( $screen->post_type );
-		$post_type_object = get_post_type_object( $screen->post_type );
+		$post = get_default_post_to_edit($screen->post_type);
+		$post_type_object = get_post_type_object($screen->post_type);
 
-		$taxonomy_names = get_object_taxonomies( $screen->post_type );
+		$taxonomy_names = get_object_taxonomies($screen->post_type);
 		$hierarchical_taxonomies = array();
 		$flat_taxonomies = array();
-		foreach ( $taxonomy_names as $taxonomy_name ) {
+		foreach ($taxonomy_names as $taxonomy_name) {
 
-			$taxonomy = get_taxonomy( $taxonomy_name );
+			$taxonomy = get_taxonomy($taxonomy_name);
 
 			$show_in_quick_edit = $taxonomy->show_in_quick_edit;
 
@@ -1357,39 +1357,39 @@ 
 			 * @param string $taxonomy_name      Taxonomy name.
 			 * @param string $post_type          Post type of current Quick Edit post.
 			 */
-			if ( ! apply_filters( 'quick_edit_show_taxonomy', $show_in_quick_edit, $taxonomy_name, $screen->post_type ) ) {
+			if ( ! apply_filters('quick_edit_show_taxonomy', $show_in_quick_edit, $taxonomy_name, $screen->post_type)) {
 				continue;
 			}
 
-			if ( $taxonomy->hierarchical )
+			if ($taxonomy->hierarchical)
 				$hierarchical_taxonomies[] = $taxonomy;
 			else
 				$flat_taxonomies[] = $taxonomy;
 		}
 
-		$m = ( isset( $mode ) && 'excerpt' === $mode ) ? 'excerpt' : 'list';
-		$can_publish = current_user_can( $post_type_object->cap->publish_posts );
-		$core_columns = array( 'cb' => true, 'date' => true, 'title' => true, 'categories' => true, 'tags' => true, 'comments' => true, 'author' => true );
+		$m = (isset($mode) && 'excerpt' === $mode) ? 'excerpt' : 'list';
+		$can_publish = current_user_can($post_type_object->cap->publish_posts);
+		$core_columns = array('cb' => true, 'date' => true, 'title' => true, 'categories' => true, 'tags' => true, 'comments' => true, 'author' => true);
 
 	?>
 
 	<form method="get"><table style="display: none"><tbody id="inlineedit">
 		<?php
-		$hclass = count( $hierarchical_taxonomies ) ? 'post' : 'page';
+		$hclass = count($hierarchical_taxonomies) ? 'post' : 'page';
 		$bulk = 0;
-		while ( $bulk < 2 ) { ?>
+		while ($bulk < 2) { ?>
 
-		<tr id="<?php echo $bulk ? 'bulk-edit' : 'inline-edit'; ?>" class="inline-edit-row inline-edit-row-<?php echo "$hclass inline-edit-" . $screen->post_type;
+		<tr id="<?php echo $bulk ? 'bulk-edit' : 'inline-edit'; ?>" class="inline-edit-row inline-edit-row-<?php echo "$hclass inline-edit-".$screen->post_type;
 			echo $bulk ? " bulk-edit-row bulk-edit-row-$hclass bulk-edit-{$screen->post_type}" : " quick-edit-row quick-edit-row-$hclass inline-edit-{$screen->post_type}";
 		?>" style="display: none"><td colspan="<?php echo $this->get_column_count(); ?>" class="colspanchange">
 
 		<fieldset class="inline-edit-col-left">
-			<legend class="inline-edit-legend"><?php echo $bulk ? __( 'Bulk Edit' ) : __( 'Quick Edit' ); ?></legend>
+			<legend class="inline-edit-legend"><?php echo $bulk ? __('Bulk Edit') : __('Quick Edit'); ?></legend>
 			<div class="inline-edit-col">
 	<?php
 
-	if ( post_type_supports( $screen->post_type, 'title' ) ) :
-		if ( $bulk ) : ?>
+	if (post_type_supports($screen->post_type, 'title')) :
+		if ($bulk) : ?>
 			<div id="bulk-title-div">
 				<div id="bulk-titles"></div>
 			</div>
@@ -1397,30 +1397,30 @@ 
 	<?php else : // $bulk ?>
 
 			<label>
-				<span class="title"><?php _e( 'Title' ); ?></span>
+				<span class="title"><?php _e('Title'); ?></span>
 				<span class="input-text-wrap"><input type="text" name="post_title" class="ptitle" value="" /></span>
 			</label>
 
 			<label>
-				<span class="title"><?php _e( 'Slug' ); ?></span>
+				<span class="title"><?php _e('Slug'); ?></span>
 				<span class="input-text-wrap"><input type="text" name="post_name" value="" /></span>
 			</label>
 
 	<?php endif; // $bulk
 	endif; // post_type_supports title ?>
 
-	<?php if ( !$bulk ) : ?>
+	<?php if ( ! $bulk) : ?>
 			<fieldset class="inline-edit-date">
-			<legend><span class="title"><?php _e( 'Date' ); ?></span></legend>
-				<?php touch_time( 1, 1, 0, 1 ); ?>
+			<legend><span class="title"><?php _e('Date'); ?></span></legend>
+				<?php touch_time(1, 1, 0, 1); ?>
 			</fieldset>
 			<br class="clear" />
 	<?php endif; // $bulk
 
-		if ( post_type_supports( $screen->post_type, 'author' ) ) :
+		if (post_type_supports($screen->post_type, 'author')) :
 			$authors_dropdown = '';
 
-			if ( current_user_can( $post_type_object->cap->edit_others_posts ) ) :
+			if (current_user_can($post_type_object->cap->edit_others_posts)) :
 				$users_opt = array(
 					'hide_if_only_one_author' => false,
 					'who' => 'authors',
@@ -1430,39 +1430,39 @@ 
 					'echo' => 0,
 					'show' => 'display_name_with_login',
 				);
-				if ( $bulk )
-					$users_opt['show_option_none'] = __( '&mdash; No Change &mdash;' );
+				if ($bulk)
+					$users_opt['show_option_none'] = __('&mdash; No Change &mdash;');
 
-				if ( $authors = wp_dropdown_users( $users_opt ) ) :
+				if ($authors = wp_dropdown_users($users_opt)) :
 					$authors_dropdown  = '<label class="inline-edit-author">';
-					$authors_dropdown .= '<span class="title">' . __( 'Author' ) . '</span>';
+					$authors_dropdown .= '<span class="title">'.__('Author').'</span>';
 					$authors_dropdown .= $authors;
 					$authors_dropdown .= '</label>';
 				endif;
 			endif; // authors
 	?>
 
-	<?php if ( !$bulk ) echo $authors_dropdown;
+	<?php if ( ! $bulk) echo $authors_dropdown;
 	endif; // post_type_supports author
 
-	if ( !$bulk && $can_publish ) :
+	if ( ! $bulk && $can_publish) :
 	?>
 
 			<div class="inline-edit-group wp-clearfix">
 				<label class="alignleft">
-					<span class="title"><?php _e( 'Password' ); ?></span>
+					<span class="title"><?php _e('Password'); ?></span>
 					<span class="input-text-wrap"><input type="text" name="post_password" class="inline-edit-password-input" value="" /></span>
 				</label>
 
 				<em class="alignleft inline-edit-or">
 					<?php
 					/* translators: Between password field and private checkbox on post quick edit interface */
-					_e( '&ndash;OR&ndash;' );
+					_e('&ndash;OR&ndash;');
 					?>
 				</em>
 				<label class="alignleft inline-edit-private">
 					<input type="checkbox" name="keep_private" value="private" />
-					<span class="checkbox-title"><?php _e( 'Private' ); ?></span>
+					<span class="checkbox-title"><?php _e('Private'); ?></span>
 				</label>
 			</div>
 
@@ -1470,16 +1470,16 @@ 
 
 		</div></fieldset>
 
-	<?php if ( count( $hierarchical_taxonomies ) && !$bulk ) : ?>
+	<?php if (count($hierarchical_taxonomies) && ! $bulk) : ?>
 
 		<fieldset class="inline-edit-col-center inline-edit-categories"><div class="inline-edit-col">
 
-	<?php foreach ( $hierarchical_taxonomies as $taxonomy ) : ?>
+	<?php foreach ($hierarchical_taxonomies as $taxonomy) : ?>
 
-			<span class="title inline-edit-categories-label"><?php echo esc_html( $taxonomy->labels->name ) ?></span>
-			<input type="hidden" name="<?php echo ( $taxonomy->name === 'category' ) ? 'post_category[]' : 'tax_input[' . esc_attr( $taxonomy->name ) . '][]'; ?>" value="0" />
-			<ul class="cat-checklist <?php echo esc_attr( $taxonomy->name )?>-checklist">
-				<?php wp_terms_checklist( null, array( 'taxonomy' => $taxonomy->name ) ) ?>
+			<span class="title inline-edit-categories-label"><?php echo esc_html($taxonomy->labels->name) ?></span>
+			<input type="hidden" name="<?php echo ($taxonomy->name === 'category') ? 'post_category[]' : 'tax_input['.esc_attr($taxonomy->name).'][]'; ?>" value="0" />
+			<ul class="cat-checklist <?php echo esc_attr($taxonomy->name)?>-checklist">
+				<?php wp_terms_checklist(null, array('taxonomy' => $taxonomy->name)) ?>
 			</ul>
 
 	<?php endforeach; //$hierarchical_taxonomies as $taxonomy ?>
@@ -1491,27 +1491,27 @@ 
 		<fieldset class="inline-edit-col-right"><div class="inline-edit-col">
 
 	<?php
-		if ( post_type_supports( $screen->post_type, 'author' ) && $bulk )
+		if (post_type_supports($screen->post_type, 'author') && $bulk)
 			echo $authors_dropdown;
 
-		if ( post_type_supports( $screen->post_type, 'page-attributes' ) ) :
+		if (post_type_supports($screen->post_type, 'page-attributes')) :
 
-			if ( $post_type_object->hierarchical ) :
+			if ($post_type_object->hierarchical) :
 		?>
 			<label>
-				<span class="title"><?php _e( 'Parent' ); ?></span>
+				<span class="title"><?php _e('Parent'); ?></span>
 	<?php
 		$dropdown_args = array(
 			'post_type'         => $post_type_object->name,
 			'selected'          => $post->post_parent,
 			'name'              => 'post_parent',
-			'show_option_none'  => __( 'Main Page (no parent)' ),
+			'show_option_none'  => __('Main Page (no parent)'),
 			'option_none_value' => 0,
 			'sort_column'       => 'menu_order, post_title',
 		);
 
-		if ( $bulk )
-			$dropdown_args['show_option_no_change'] =  __( '&mdash; No Change &mdash;' );
+		if ($bulk)
+			$dropdown_args['show_option_no_change'] = __('&mdash; No Change &mdash;');
 
 		/**
 		 * Filters the arguments used to generate the Quick Edit page-parent drop-down.
@@ -1522,19 +1522,19 @@ 
 		 *
 		 * @param array $dropdown_args An array of arguments.
 		 */
-		$dropdown_args = apply_filters( 'quick_edit_dropdown_pages_args', $dropdown_args );
+		$dropdown_args = apply_filters('quick_edit_dropdown_pages_args', $dropdown_args);
 
-		wp_dropdown_pages( $dropdown_args );
+		wp_dropdown_pages($dropdown_args);
 	?>
 			</label>
 
 	<?php
 			endif; // hierarchical
 
-			if ( !$bulk ) : ?>
+			if ( ! $bulk) : ?>
 
 			<label>
-				<span class="title"><?php _e( 'Order' ); ?></span>
+				<span class="title"><?php _e('Order'); ?></span>
 				<span class="input-text-wrap"><input type="text" name="menu_order" class="inline-edit-menu-order-input" value="<?php echo $post->menu_order ?>" /></span>
 			</label>
 
@@ -1543,32 +1543,32 @@ 
 		endif; // page-attributes
 	?>
 
-	<?php if ( 0 < count( get_page_templates( null, $screen->post_type ) ) ) : ?>
+	<?php if (0 < count(get_page_templates(null, $screen->post_type))) : ?>
 		<label>
-			<span class="title"><?php _e( 'Template' ); ?></span>
+			<span class="title"><?php _e('Template'); ?></span>
 			<select name="page_template">
-<?php	if ( $bulk ) : ?>
-				<option value="-1"><?php _e( '&mdash; No Change &mdash;' ); ?></option>
+<?php	if ($bulk) : ?>
+				<option value="-1"><?php _e('&mdash; No Change &mdash;'); ?></option>
 <?php	endif; // $bulk ?>
                 <?php
 				/** This filter is documented in wp-admin/includes/meta-boxes.php */
-				$default_title = apply_filters( 'default_page_template_title',  __( 'Default Template' ), 'quick-edit' );
+				$default_title = apply_filters('default_page_template_title', __('Default Template'), 'quick-edit');
                 ?>
-				<option value="default"><?php echo esc_html( $default_title ); ?></option>
-				<?php page_template_dropdown( '', $screen->post_type ) ?>
+				<option value="default"><?php echo esc_html($default_title); ?></option>
+				<?php page_template_dropdown('', $screen->post_type) ?>
 			</select>
 		</label>
 	<?php endif; ?>
 
-	<?php if ( count( $flat_taxonomies ) && !$bulk ) : ?>
+	<?php if (count($flat_taxonomies) && ! $bulk) : ?>
 
-	<?php foreach ( $flat_taxonomies as $taxonomy ) : ?>
-		<?php if ( current_user_can( $taxonomy->cap->assign_terms ) ) :
-			$taxonomy_name = esc_attr( $taxonomy->name );
+	<?php foreach ($flat_taxonomies as $taxonomy) : ?>
+		<?php if (current_user_can($taxonomy->cap->assign_terms)) :
+			$taxonomy_name = esc_attr($taxonomy->name);
 
 			?>
 			<label class="inline-edit-tags">
-				<span class="title"><?php echo esc_html( $taxonomy->labels->name ) ?></span>
+				<span class="title"><?php echo esc_html($taxonomy->labels->name) ?></span>
 				<textarea data-wp-taxonomy="<?php echo $taxonomy_name; ?>" cols="22" rows="1" name="tax_input[<?php echo $taxonomy_name; ?>]" class="tax_input_<?php echo $taxonomy_name; ?>"></textarea>
 			</label>
 		<?php endif; ?>
@@ -1577,26 +1577,26 @@ 
 
 	<?php endif; // count( $flat_taxonomies ) && !$bulk  ?>
 
-	<?php if ( post_type_supports( $screen->post_type, 'comments' ) || post_type_supports( $screen->post_type, 'trackbacks' ) ) :
-		if ( $bulk ) : ?>
+	<?php if (post_type_supports($screen->post_type, 'comments') || post_type_supports($screen->post_type, 'trackbacks')) :
+		if ($bulk) : ?>
 
 			<div class="inline-edit-group wp-clearfix">
-		<?php if ( post_type_supports( $screen->post_type, 'comments' ) ) : ?>
+		<?php if (post_type_supports($screen->post_type, 'comments')) : ?>
 			<label class="alignleft">
-				<span class="title"><?php _e( 'Comments' ); ?></span>
+				<span class="title"><?php _e('Comments'); ?></span>
 				<select name="comment_status">
-					<option value=""><?php _e( '&mdash; No Change &mdash;' ); ?></option>
-					<option value="open"><?php _e( 'Allow' ); ?></option>
-					<option value="closed"><?php _e( 'Do not allow' ); ?></option>
+					<option value=""><?php _e('&mdash; No Change &mdash;'); ?></option>
+					<option value="open"><?php _e('Allow'); ?></option>
+					<option value="closed"><?php _e('Do not allow'); ?></option>
 				</select>
 			</label>
-		<?php endif; if ( post_type_supports( $screen->post_type, 'trackbacks' ) ) : ?>
+		<?php endif; if (post_type_supports($screen->post_type, 'trackbacks')) : ?>
 			<label class="alignright">
-				<span class="title"><?php _e( 'Pings' ); ?></span>
+				<span class="title"><?php _e('Pings'); ?></span>
 				<select name="ping_status">
-					<option value=""><?php _e( '&mdash; No Change &mdash;' ); ?></option>
-					<option value="open"><?php _e( 'Allow' ); ?></option>
-					<option value="closed"><?php _e( 'Do not allow' ); ?></option>
+					<option value=""><?php _e('&mdash; No Change &mdash;'); ?></option>
+					<option value="open"><?php _e('Allow'); ?></option>
+					<option value="closed"><?php _e('Do not allow'); ?></option>
 				</select>
 			</label>
 		<?php endif; ?>
@@ -1605,15 +1605,15 @@ 
 	<?php else : // $bulk ?>
 
 			<div class="inline-edit-group wp-clearfix">
-			<?php if ( post_type_supports( $screen->post_type, 'comments' ) ) : ?>
+			<?php if (post_type_supports($screen->post_type, 'comments')) : ?>
 				<label class="alignleft">
 					<input type="checkbox" name="comment_status" value="open" />
-					<span class="checkbox-title"><?php _e( 'Allow Comments' ); ?></span>
+					<span class="checkbox-title"><?php _e('Allow Comments'); ?></span>
 				</label>
-			<?php endif; if ( post_type_supports( $screen->post_type, 'trackbacks' ) ) : ?>
+			<?php endif; if (post_type_supports($screen->post_type, 'trackbacks')) : ?>
 				<label class="alignleft">
 					<input type="checkbox" name="ping_status" value="open" />
-					<span class="checkbox-title"><?php _e( 'Allow Pings' ); ?></span>
+					<span class="checkbox-title"><?php _e('Allow Pings'); ?></span>
 				</label>
 			<?php endif; ?>
 			</div>
@@ -1623,33 +1623,33 @@ 
 
 			<div class="inline-edit-group wp-clearfix">
 				<label class="inline-edit-status alignleft">
-					<span class="title"><?php _e( 'Status' ); ?></span>
+					<span class="title"><?php _e('Status'); ?></span>
 					<select name="_status">
-	<?php if ( $bulk ) : ?>
-						<option value="-1"><?php _e( '&mdash; No Change &mdash;' ); ?></option>
+	<?php if ($bulk) : ?>
+						<option value="-1"><?php _e('&mdash; No Change &mdash;'); ?></option>
 	<?php endif; // $bulk ?>
-					<?php if ( $can_publish ) : // Contributors only get "Unpublished" and "Pending Review" ?>
-						<option value="publish"><?php _e( 'Published' ); ?></option>
-						<option value="future"><?php _e( 'Scheduled' ); ?></option>
-	<?php if ( $bulk ) : ?>
-						<option value="private"><?php _e( 'Private' ) ?></option>
+					<?php if ($can_publish) : // Contributors only get "Unpublished" and "Pending Review" ?>
+						<option value="publish"><?php _e('Published'); ?></option>
+						<option value="future"><?php _e('Scheduled'); ?></option>
+	<?php if ($bulk) : ?>
+						<option value="private"><?php _e('Private') ?></option>
 	<?php endif; // $bulk ?>
 					<?php endif; ?>
-						<option value="pending"><?php _e( 'Pending Review' ); ?></option>
-						<option value="draft"><?php _e( 'Draft' ); ?></option>
+						<option value="pending"><?php _e('Pending Review'); ?></option>
+						<option value="draft"><?php _e('Draft'); ?></option>
 					</select>
 				</label>
 
-	<?php if ( 'post' === $screen->post_type && $can_publish && current_user_can( $post_type_object->cap->edit_others_posts ) ) : ?>
+	<?php if ('post' === $screen->post_type && $can_publish && current_user_can($post_type_object->cap->edit_others_posts)) : ?>
 
-	<?php	if ( $bulk ) : ?>
+	<?php	if ($bulk) : ?>
 
 				<label class="alignright">
-					<span class="title"><?php _e( 'Sticky' ); ?></span>
+					<span class="title"><?php _e('Sticky'); ?></span>
 					<select name="sticky">
-						<option value="-1"><?php _e( '&mdash; No Change &mdash;' ); ?></option>
-						<option value="sticky"><?php _e( 'Sticky' ); ?></option>
-						<option value="unsticky"><?php _e( 'Not Sticky' ); ?></option>
+						<option value="-1"><?php _e('&mdash; No Change &mdash;'); ?></option>
+						<option value="sticky"><?php _e('Sticky'); ?></option>
+						<option value="unsticky"><?php _e('Not Sticky'); ?></option>
 					</select>
 				</label>
 
@@ -1657,7 +1657,7 @@ 
 
 				<label class="alignleft">
 					<input type="checkbox" name="sticky" value="sticky" />
-					<span class="checkbox-title"><?php _e( 'Make this post sticky' ); ?></span>
+					<span class="checkbox-title"><?php _e('Make this post sticky'); ?></span>
 				</label>
 
 	<?php	endif; // $bulk ?>
@@ -1668,20 +1668,20 @@ 
 
 	<?php
 
-	if ( $bulk && current_theme_supports( 'post-formats' ) && post_type_supports( $screen->post_type, 'post-formats' ) ) {
-		$post_formats = get_theme_support( 'post-formats' );
+	if ($bulk && current_theme_supports('post-formats') && post_type_supports($screen->post_type, 'post-formats')) {
+		$post_formats = get_theme_support('post-formats');
 
 		?>
 		<label class="alignleft">
-		<span class="title"><?php _ex( 'Format', 'post format' ); ?></span>
+		<span class="title"><?php _ex('Format', 'post format'); ?></span>
 		<select name="post_format">
-			<option value="-1"><?php _e( '&mdash; No Change &mdash;' ); ?></option>
-			<option value="0"><?php echo get_post_format_string( 'standard' ); ?></option>
+			<option value="-1"><?php _e('&mdash; No Change &mdash;'); ?></option>
+			<option value="0"><?php echo get_post_format_string('standard'); ?></option>
 			<?php
-			if ( is_array( $post_formats[0] ) ) {
-				foreach ( $post_formats[0] as $format ) {
+			if (is_array($post_formats[0])) {
+				foreach ($post_formats[0] as $format) {
 					?>
-					<option value="<?php echo esc_attr( $format ); ?>"><?php echo esc_html( get_post_format_string( $format ) ); ?></option>
+					<option value="<?php echo esc_attr($format); ?>"><?php echo esc_html(get_post_format_string($format)); ?></option>
 					<?php
 				}
 			}
@@ -1696,13 +1696,13 @@ 
 		</div></fieldset>
 
 	<?php
-		list( $columns ) = $this->get_column_info();
+		list($columns) = $this->get_column_info();
 
-		foreach ( $columns as $column_name => $column_display_name ) {
-			if ( isset( $core_columns[$column_name] ) )
+		foreach ($columns as $column_name => $column_display_name) {
+			if (isset($core_columns[$column_name]))
 				continue;
 
-			if ( $bulk ) {
+			if ($bulk) {
 
 				/**
 				 * Fires once for each column in Bulk Edit mode.
@@ -1712,7 +1712,7 @@ 
 				 * @param string  $column_name Name of the column to edit.
 				 * @param WP_Post $post_type   The post type slug.
 				 */
-				do_action( 'bulk_edit_custom_box', $column_name, $screen->post_type );
+				do_action('bulk_edit_custom_box', $column_name, $screen->post_type);
 			} else {
 
 				/**
@@ -1723,25 +1723,25 @@ 
 				 * @param string $column_name Name of the column to edit.
 				 * @param string $post_type   The post type slug.
 				 */
-				do_action( 'quick_edit_custom_box', $column_name, $screen->post_type );
+				do_action('quick_edit_custom_box', $column_name, $screen->post_type);
 			}
 
 		}
 	?>
 		<p class="submit inline-edit-save">
-			<button type="button" class="button cancel alignleft"><?php _e( 'Cancel' ); ?></button>
-			<?php if ( ! $bulk ) {
-				wp_nonce_field( 'inlineeditnonce', '_inline_edit', false );
+			<button type="button" class="button cancel alignleft"><?php _e('Cancel'); ?></button>
+			<?php if ( ! $bulk) {
+				wp_nonce_field('inlineeditnonce', '_inline_edit', false);
 				?>
-				<button type="button" class="button button-primary save alignright"><?php _e( 'Update' ); ?></button>
+				<button type="button" class="button button-primary save alignright"><?php _e('Update'); ?></button>
 				<span class="spinner"></span>
 			<?php } else {
-				submit_button( __( 'Update' ), 'primary alignright', 'bulk_edit', false );
+				submit_button(__('Update'), 'primary alignright', 'bulk_edit', false);
 			} ?>
-			<input type="hidden" name="post_view" value="<?php echo esc_attr( $m ); ?>" />
-			<input type="hidden" name="screen" value="<?php echo esc_attr( $screen->id ); ?>" />
-			<?php if ( ! $bulk && ! post_type_supports( $screen->post_type, 'author' ) ) { ?>
-				<input type="hidden" name="post_author" value="<?php echo esc_attr( $post->post_author ); ?>" />
+			<input type="hidden" name="post_view" value="<?php echo esc_attr($m); ?>" />
+			<input type="hidden" name="screen" value="<?php echo esc_attr($screen->id); ?>" />
+			<?php if ( ! $bulk && ! post_type_supports($screen->post_type, 'author')) { ?>
+				<input type="hidden" name="post_author" value="<?php echo esc_attr($post->post_author); ?>" />
 			<?php } ?>
 			<span class="error" style="display:none"></span>
 			<br class="clear" />

src/wp-admin/includes/deprecated.php

Doc Comments +2 added lines, -2 removed lines

@@ -127,8 +127,8 @@
  * @param int $currentparent Optional. Current parent category ID. Default 0.
  * @param int $parent        Optional. Parent ID to retrieve categories for. Default 0.
  * @param int $level         Optional. Number of levels deep to display. Default 0.
- * @param array $categories  Optional. Categories to include in the control. Default 0.
- * @return bool|null False if no categories were found.
+ * @param integer $categories  Optional. Categories to include in the control. Default 0.
+ * @return null|false False if no categories were found.
  */
 function wp_dropdown_cats( $currentcat = 0, $currentparent = 0, $parent = 0, $level = 0, $categories = 0 ) {
 	_deprecated_function( __FUNCTION__, '3.0', 'wp_dropdown_categories()' );

Braces +83 added lines, -56 removed lines

@@ -132,8 +132,9 @@ 
  */
 function wp_dropdown_cats( $currentcat = 0, $currentparent = 0, $parent = 0, $level = 0, $categories = 0 ) {
 	_deprecated_function( __FUNCTION__, '3.0', 'wp_dropdown_categories()' );
-	if (!$categories )
-		$categories = get_categories( array('hide_empty' => 0) );
+	if (!$categories ) {
+			$categories = get_categories( array('hide_empty' => 0) );
+	}
 
 	if ( $categories ) {
 		foreach ( $categories as $category ) {
@@ -141,8 +142,9 @@ 
 				$pad = str_repeat( '– ', $level );
 				$category->name = esc_html( $category->name );
 				echo "\n\t<option value='$category->term_id'";
-				if ( $currentparent == $category->term_id )
-					echo " selected='selected'";
+				if ( $currentparent == $category->term_id ) {
+									echo " selected='selected'";
+				}
 				echo ">$pad$category->name</option>";
 				wp_dropdown_cats( $currentcat, $currentparent, $category->term_id, $level +1, $categories );
 			}
@@ -228,10 +230,12 @@ 
 	_deprecated_function( __FUNCTION__, '3.1', 'get_users()' );
 
 	global $wpdb;
-	if ( !is_multisite() )
-		$level_key = $wpdb->get_blog_prefix() . 'user_level';
-	else
-		$level_key = $wpdb->get_blog_prefix() . 'capabilities'; // wpmu site admins don't have user_levels
+	if ( !is_multisite() ) {
+			$level_key = $wpdb->get_blog_prefix() . 'user_level';
+	} else {
+			$level_key = $wpdb->get_blog_prefix() . 'capabilities';
+	}
+	// wpmu site admins don't have user_levels
 
 	return $wpdb->get_col( $wpdb->prepare("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = %s AND meta_value != '0'", $level_key) );
 }
@@ -275,25 +279,30 @@ 
 
 	global $wpdb;
 
-	if ( ! $user = get_userdata( $user_id ) )
-		return array();
+	if ( ! $user = get_userdata( $user_id ) ) {
+			return array();
+	}
 	$post_type_obj = get_post_type_object($post_type);
 
 	if ( ! $user->has_cap($post_type_obj->cap->edit_others_posts) ) {
-		if ( $user->has_cap($post_type_obj->cap->edit_posts) || ! $exclude_zeros )
-			return array($user->ID);
-		else
-			return array();
+		if ( $user->has_cap($post_type_obj->cap->edit_posts) || ! $exclude_zeros ) {
+					return array($user->ID);
+		} else {
+					return array();
+		}
 	}
 
-	if ( !is_multisite() )
-		$level_key = $wpdb->get_blog_prefix() . 'user_level';
-	else
-		$level_key = $wpdb->get_blog_prefix() . 'capabilities'; // wpmu site admins don't have user_levels
+	if ( !is_multisite() ) {
+			$level_key = $wpdb->get_blog_prefix() . 'user_level';
+	} else {
+			$level_key = $wpdb->get_blog_prefix() . 'capabilities';
+	}
+	// wpmu site admins don't have user_levels
 
 	$query = $wpdb->prepare("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = %s", $level_key);
-	if ( $exclude_zeros )
-		$query .= " AND meta_value != '0'";
+	if ( $exclude_zeros ) {
+			$query .= " AND meta_value != '0'";
+	}
 
 	return $wpdb->get_col( $query );
 }
@@ -308,10 +317,12 @@ 
 
 	global $wpdb;
 
-	if ( !is_multisite() )
-		$level_key = $wpdb->get_blog_prefix() . 'user_level';
-	else
-		$level_key = $wpdb->get_blog_prefix() . 'capabilities'; // wpmu site admins don't have user_levels
+	if ( !is_multisite() ) {
+			$level_key = $wpdb->get_blog_prefix() . 'user_level';
+	} else {
+			$level_key = $wpdb->get_blog_prefix() . 'capabilities';
+	}
+	// wpmu site admins don't have user_levels
 
 	return $wpdb->get_col( $wpdb->prepare("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = %s AND meta_value = '0'", $level_key) );
 }
@@ -523,8 +534,9 @@ 
 		if ( $this->search_term ) {
 			$searches = array();
 			$search_sql = 'AND (';
-			foreach ( array('user_login', 'user_nicename', 'user_email', 'user_url', 'display_name') as $col )
-				$searches[] = $wpdb->prepare( $col . ' LIKE %s', '%' . like_escape($this->search_term) . '%' );
+			foreach ( array('user_login', 'user_nicename', 'user_email', 'user_url', 'display_name') as $col ) {
+							$searches[] = $wpdb->prepare( $col . ' LIKE %s', '%' . like_escape($this->search_term) . '%' );
+			}
 			$search_sql .= implode(' OR ', $searches);
 			$search_sql .= ')';
 		}
@@ -555,10 +567,13 @@ 
 
 		$this->results = $wpdb->get_col("SELECT DISTINCT($wpdb->users.ID)" . $this->query_from . $this->query_where . $this->query_orderby . $this->query_limit);
 
-		if ( $this->results )
-			$this->total_users_for_query = $wpdb->get_var("SELECT COUNT(DISTINCT($wpdb->users.ID))" . $this->query_from . $this->query_where); // no limit
-		else
-			$this->search_errors = new WP_Error('no_matching_users_found', __('No users found.'));
+		if ( $this->results ) {
+					$this->total_users_for_query = $wpdb->get_var("SELECT COUNT(DISTINCT($wpdb->users.ID))" . $this->query_from . $this->query_where);
+		}
+		// no limit
+		else {
+					$this->search_errors = new WP_Error('no_matching_users_found', __('No users found.'));
+		}
 	}
 
 	/**
@@ -578,10 +593,12 @@ 
 	public function do_paging() {
 		if ( $this->total_users_for_query > $this->users_per_page ) { // have to page the results
 			$args = array();
-			if ( ! empty($this->search_term) )
-				$args['usersearch'] = urlencode($this->search_term);
-			if ( ! empty($this->role) )
-				$args['role'] = urlencode($this->role);
+			if ( ! empty($this->search_term) ) {
+							$args['usersearch'] = urlencode($this->search_term);
+			}
+			if ( ! empty($this->role) ) {
+							$args['role'] = urlencode($this->role);
+			}
 
 			$this->paging_text = paginate_links( array(
 				'total' => ceil($this->total_users_for_query / $this->users_per_page),
@@ -636,8 +653,9 @@ 
 	 * @return bool
 	 */
 	function results_are_paged() {
-		if ( $this->paging_text )
-			return true;
+		if ( $this->paging_text ) {
+					return true;
+		}
 		return false;
 	}
 
@@ -650,8 +668,9 @@ 
 	 * @return bool
 	 */
 	function is_search() {
-		if ( $this->search_term )
-			return true;
+		if ( $this->search_term ) {
+					return true;
+		}
 		return false;
 	}
 }
@@ -676,10 +695,11 @@ 
 
 	$editable = get_editable_user_ids( $user_id );
 
-	if ( in_array($type, array('draft', 'pending')) )
-		$type_sql = " post_status = '$type' ";
-	else
-		$type_sql = " ( post_status = 'draft' OR post_status = 'pending' ) ";
+	if ( in_array($type, array('draft', 'pending')) ) {
+			$type_sql = " post_status = '$type' ";
+	} else {
+			$type_sql = " ( post_status = 'draft' OR post_status = 'pending' ) ";
+	}
 
 	$dir = ( 'pending' == $type ) ? 'ASC' : 'DESC';
 
@@ -749,8 +769,9 @@ 
 
 	static $num = 1;
 
-	if ( ! class_exists( '_WP_Editors', false ) )
-		require_once( ABSPATH . WPINC . '/class-wp-editor.php' );
+	if ( ! class_exists( '_WP_Editors', false ) ) {
+			require_once( ABSPATH . WPINC . '/class-wp-editor.php' );
+	}
 
 	$editor_id = 'content' . $num++;
 
@@ -806,8 +827,9 @@ 
 
 	$current_screen = get_current_screen();
 
-	if ( ! $current_screen )
-		return '';
+	if ( ! $current_screen ) {
+			return '';
+	}
 
 	ob_start();
 	$current_screen->render_screen_layout();
@@ -826,8 +848,9 @@ 
 
 	$current_screen = get_current_screen();
 
-	if ( ! $current_screen )
-		return '';
+	if ( ! $current_screen ) {
+			return '';
+	}
 
 	ob_start();
 	$current_screen->render_per_page_options();
@@ -976,8 +999,9 @@ 
 function add_contextual_help( $screen, $help ) {
 	_deprecated_function( __FUNCTION__, '3.3', 'get_current_screen()->add_help_tab()' );
 
-	if ( is_string( $screen ) )
-		$screen = convert_to_screen( $screen );
+	if ( is_string( $screen ) ) {
+			$screen = convert_to_screen( $screen );
+	}
 
 	WP_Screen::add_old_compat_help( $screen, $help );
 }
@@ -1141,8 +1165,9 @@ 
 function wp_update_core($current, $feedback = '') {
 	_deprecated_function( __FUNCTION__, '3.7', 'new Core_Upgrader();' );
 
-	if ( !empty($feedback) )
-		add_filter('update_feedback', $feedback);
+	if ( !empty($feedback) ) {
+			add_filter('update_feedback', $feedback);
+	}
 
 	include( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
 	$upgrader = new Core_Upgrader();
@@ -1164,8 +1189,9 @@ 
 function wp_update_plugin($plugin, $feedback = '') {
 	_deprecated_function( __FUNCTION__, '3.7', 'new Plugin_Upgrader();' );
 
-	if ( !empty($feedback) )
-		add_filter('update_feedback', $feedback);
+	if ( !empty($feedback) ) {
+			add_filter('update_feedback', $feedback);
+	}
 
 	include( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
 	$upgrader = new Plugin_Upgrader();
@@ -1186,8 +1212,9 @@ 
 function wp_update_theme($theme, $feedback = '') {
 	_deprecated_function( __FUNCTION__, '3.7', 'new Theme_Upgrader();' );
 
-	if ( !empty($feedback) )
-		add_filter('update_feedback', $feedback);
+	if ( !empty($feedback) ) {
+			add_filter('update_feedback', $feedback);
+	}
 
 	include( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
 	$upgrader = new Theme_Upgrader();

Spacing +176 added lines, -176 removed lines

@@ -18,7 +18,7 @@ 
  * @see wp_editor()
  */
 function tinymce_include() {
-	_deprecated_function( __FUNCTION__, '2.1.0', 'wp_editor()' );
+	_deprecated_function(__FUNCTION__, '2.1.0', 'wp_editor()');
 
 	wp_tiny_mce();
 }
@@ -31,7 +31,7 @@ 
  *
  */
 function documentation_link() {
-	_deprecated_function( __FUNCTION__, '2.5.0' );
+	_deprecated_function(__FUNCTION__, '2.5.0');
 }
 
 /**
@@ -47,9 +47,9 @@ 
  * @param int $hmax Maximum wanted height
  * @return array Shrunk dimensions (width, height).
  */
-function wp_shrink_dimensions( $width, $height, $wmax = 128, $hmax = 96 ) {
-	_deprecated_function( __FUNCTION__, '3.0.0', 'wp_constrain_dimensions()' );
-	return wp_constrain_dimensions( $width, $height, $wmax, $hmax );
+function wp_shrink_dimensions($width, $height, $wmax = 128, $hmax = 96) {
+	_deprecated_function(__FUNCTION__, '3.0.0', 'wp_constrain_dimensions()');
+	return wp_constrain_dimensions($width, $height, $wmax, $hmax);
 }
 
 /**
@@ -63,9 +63,9 @@ 
  * @param int $height Current height of the image
  * @return array Shrunk dimensions (width, height).
  */
-function get_udims( $width, $height ) {
-	_deprecated_function( __FUNCTION__, '3.5.0', 'wp_constrain_dimensions()' );
-	return wp_constrain_dimensions( $width, $height, 128, 96 );
+function get_udims($width, $height) {
+	_deprecated_function(__FUNCTION__, '3.5.0', 'wp_constrain_dimensions()');
+	return wp_constrain_dimensions($width, $height, 128, 96);
 }
 
 /**
@@ -79,10 +79,10 @@ 
  * @param int $parent        Unused.
  * @param array $popular_ids Unused.
  */
-function dropdown_categories( $default = 0, $parent = 0, $popular_ids = array() ) {
-	_deprecated_function( __FUNCTION__, '2.6.0', 'wp_category_checklist()' );
+function dropdown_categories($default = 0, $parent = 0, $popular_ids = array()) {
+	_deprecated_function(__FUNCTION__, '2.6.0', 'wp_category_checklist()');
 	global $post_ID;
-	wp_category_checklist( $post_ID );
+	wp_category_checklist($post_ID);
 }
 
 /**
@@ -94,10 +94,10 @@ 
  *
  * @param int $default Unused.
  */
-function dropdown_link_categories( $default = 0 ) {
-	_deprecated_function( __FUNCTION__, '2.6.0', 'wp_link_category_checklist()' );
+function dropdown_link_categories($default = 0) {
+	_deprecated_function(__FUNCTION__, '2.6.0', 'wp_link_category_checklist()');
 	global $link_id;
-	wp_link_category_checklist( $link_id );
+	wp_link_category_checklist($link_id);
 }
 
 /**
@@ -110,10 +110,10 @@ 
  * @param string $file Filesystem path relative to the wp-content directory.
  * @return string Full filesystem path to edit.
  */
-function get_real_file_to_edit( $file ) {
-	_deprecated_function( __FUNCTION__, '2.9.0' );
+function get_real_file_to_edit($file) {
+	_deprecated_function(__FUNCTION__, '2.9.0');
 
-	return WP_CONTENT_DIR . $file;
+	return WP_CONTENT_DIR.$file;
 }
 
 /**
@@ -130,21 +130,21 @@ 
  * @param array $categories  Optional. Categories to include in the control. Default 0.
  * @return bool|null False if no categories were found.
  */
-function wp_dropdown_cats( $currentcat = 0, $currentparent = 0, $parent = 0, $level = 0, $categories = 0 ) {
-	_deprecated_function( __FUNCTION__, '3.0.0', 'wp_dropdown_categories()' );
-	if (!$categories )
-		$categories = get_categories( array('hide_empty' => 0) );
+function wp_dropdown_cats($currentcat = 0, $currentparent = 0, $parent = 0, $level = 0, $categories = 0) {
+	_deprecated_function(__FUNCTION__, '3.0.0', 'wp_dropdown_categories()');
+	if ( ! $categories)
+		$categories = get_categories(array('hide_empty' => 0));
 
-	if ( $categories ) {
-		foreach ( $categories as $category ) {
-			if ( $currentcat != $category->term_id && $parent == $category->parent) {
-				$pad = str_repeat( '– ', $level );
-				$category->name = esc_html( $category->name );
+	if ($categories) {
+		foreach ($categories as $category) {
+			if ($currentcat != $category->term_id && $parent == $category->parent) {
+				$pad = str_repeat('– ', $level);
+				$category->name = esc_html($category->name);
 				echo "\n\t<option value='$category->term_id'";
-				if ( $currentparent == $category->term_id )
+				if ($currentparent == $category->term_id)
 					echo " selected='selected'";
 				echo ">$pad$category->name</option>";
-				wp_dropdown_cats( $currentcat, $currentparent, $category->term_id, $level +1, $categories );
+				wp_dropdown_cats($currentcat, $currentparent, $category->term_id, $level + 1, $categories);
 			}
 		}
 	} else {
@@ -164,9 +164,9 @@ 
  * @param string $option_name The name of an option to sanitize and save.
  * @param callable $sanitize_callback A callback function that sanitizes the option's value.
  */
-function add_option_update_handler( $option_group, $option_name, $sanitize_callback = '' ) {
-	_deprecated_function( __FUNCTION__, '3.0.0', 'register_setting()' );
-	register_setting( $option_group, $option_name, $sanitize_callback );
+function add_option_update_handler($option_group, $option_name, $sanitize_callback = '') {
+	_deprecated_function(__FUNCTION__, '3.0.0', 'register_setting()');
+	register_setting($option_group, $option_name, $sanitize_callback);
 }
 
 /**
@@ -180,9 +180,9 @@ 
  * @param string $option_name
  * @param callable $sanitize_callback
  */
-function remove_option_update_handler( $option_group, $option_name, $sanitize_callback = '' ) {
-	_deprecated_function( __FUNCTION__, '3.0.0', 'unregister_setting()' );
-	unregister_setting( $option_group, $option_name, $sanitize_callback );
+function remove_option_update_handler($option_group, $option_name, $sanitize_callback = '') {
+	_deprecated_function(__FUNCTION__, '3.0.0', 'unregister_setting()');
+	unregister_setting($option_group, $option_name, $sanitize_callback);
 }
 
 /**
@@ -193,8 +193,8 @@ 
  *
  * @param string $filename
 **/
-function codepress_get_lang( $filename ) {
-	_deprecated_function( __FUNCTION__, '3.0.0' );
+function codepress_get_lang($filename) {
+	_deprecated_function(__FUNCTION__, '3.0.0');
 }
 
 /**
@@ -204,7 +204,7 @@ 
  * @deprecated 3.0.0
 **/
 function codepress_footer_js() {
-	_deprecated_function( __FUNCTION__, '3.0.0' );
+	_deprecated_function(__FUNCTION__, '3.0.0');
 }
 
 /**
@@ -214,7 +214,7 @@ 
  * @deprecated 3.0.0
 **/
 function use_codepress() {
-	_deprecated_function( __FUNCTION__, '3.0.0' );
+	_deprecated_function(__FUNCTION__, '3.0.0');
 }
 
 /**
@@ -225,15 +225,15 @@ 
  * @return array List of user IDs.
  */
 function get_author_user_ids() {
-	_deprecated_function( __FUNCTION__, '3.1.0', 'get_users()' );
+	_deprecated_function(__FUNCTION__, '3.1.0', 'get_users()');
 
 	global $wpdb;
-	if ( !is_multisite() )
-		$level_key = $wpdb->get_blog_prefix() . 'user_level';
+	if ( ! is_multisite())
+		$level_key = $wpdb->get_blog_prefix().'user_level';
 	else
-		$level_key = $wpdb->get_blog_prefix() . 'capabilities'; // wpmu site admins don't have user_levels
+		$level_key = $wpdb->get_blog_prefix().'capabilities'; // wpmu site admins don't have user_levels
 
-	return $wpdb->get_col( $wpdb->prepare("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = %s AND meta_value != '0'", $level_key) );
+	return $wpdb->get_col($wpdb->prepare("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = %s AND meta_value != '0'", $level_key));
 }
 
 /**
@@ -244,18 +244,18 @@ 
  * @param int $user_id User ID.
  * @return array|bool List of editable authors. False if no editable users.
  */
-function get_editable_authors( $user_id ) {
-	_deprecated_function( __FUNCTION__, '3.1.0', 'get_users()' );
+function get_editable_authors($user_id) {
+	_deprecated_function(__FUNCTION__, '3.1.0', 'get_users()');
 
 	global $wpdb;
 
-	$editable = get_editable_user_ids( $user_id );
+	$editable = get_editable_user_ids($user_id);
 
-	if ( !$editable ) {
+	if ( ! $editable) {
 		return false;
 	} else {
 		$editable = join(',', $editable);
-		$authors = $wpdb->get_results( "SELECT * FROM $wpdb->users WHERE ID IN ($editable) ORDER BY display_name" );
+		$authors = $wpdb->get_results("SELECT * FROM $wpdb->users WHERE ID IN ($editable) ORDER BY display_name");
 	}
 
 	return apply_filters('get_editable_authors', $authors);
@@ -270,32 +270,32 @@ 
  * @param bool $exclude_zeros Optional. Whether to exclude zeroes. Default true.
  * @return array Array of editable user IDs, empty array otherwise.
  */
-function get_editable_user_ids( $user_id, $exclude_zeros = true, $post_type = 'post' ) {
-	_deprecated_function( __FUNCTION__, '3.1.0', 'get_users()' );
+function get_editable_user_ids($user_id, $exclude_zeros = true, $post_type = 'post') {
+	_deprecated_function(__FUNCTION__, '3.1.0', 'get_users()');
 
 	global $wpdb;
 
-	if ( ! $user = get_userdata( $user_id ) )
+	if ( ! $user = get_userdata($user_id))
 		return array();
 	$post_type_obj = get_post_type_object($post_type);
 
-	if ( ! $user->has_cap($post_type_obj->cap->edit_others_posts) ) {
-		if ( $user->has_cap($post_type_obj->cap->edit_posts) || ! $exclude_zeros )
+	if ( ! $user->has_cap($post_type_obj->cap->edit_others_posts)) {
+		if ($user->has_cap($post_type_obj->cap->edit_posts) || ! $exclude_zeros)
 			return array($user->ID);
 		else
 			return array();
 	}
 
-	if ( !is_multisite() )
-		$level_key = $wpdb->get_blog_prefix() . 'user_level';
+	if ( ! is_multisite())
+		$level_key = $wpdb->get_blog_prefix().'user_level';
 	else
-		$level_key = $wpdb->get_blog_prefix() . 'capabilities'; // wpmu site admins don't have user_levels
+		$level_key = $wpdb->get_blog_prefix().'capabilities'; // wpmu site admins don't have user_levels
 
 	$query = $wpdb->prepare("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = %s", $level_key);
-	if ( $exclude_zeros )
+	if ($exclude_zeros)
 		$query .= " AND meta_value != '0'";
 
-	return $wpdb->get_col( $query );
+	return $wpdb->get_col($query);
 }
 
 /**
@@ -304,19 +304,19 @@ 
  * @deprecated 3.1.0 Use get_users()
  */
 function get_nonauthor_user_ids() {
-	_deprecated_function( __FUNCTION__, '3.1.0', 'get_users()' );
+	_deprecated_function(__FUNCTION__, '3.1.0', 'get_users()');
 
 	global $wpdb;
 
-	if ( !is_multisite() )
-		$level_key = $wpdb->get_blog_prefix() . 'user_level';
+	if ( ! is_multisite())
+		$level_key = $wpdb->get_blog_prefix().'user_level';
 	else
-		$level_key = $wpdb->get_blog_prefix() . 'capabilities'; // wpmu site admins don't have user_levels
+		$level_key = $wpdb->get_blog_prefix().'capabilities'; // wpmu site admins don't have user_levels
 
-	return $wpdb->get_col( $wpdb->prepare("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = %s AND meta_value = '0'", $level_key) );
+	return $wpdb->get_col($wpdb->prepare("SELECT user_id FROM $wpdb->usermeta WHERE meta_key = %s AND meta_value = '0'", $level_key));
 }
 
-if ( ! class_exists( 'WP_User_Search', false ) ) :
+if ( ! class_exists('WP_User_Search', false)) :
 /**
  * WordPress User Search class.
  *
@@ -479,12 +479,12 @@ 
 	 * @param string $role Role name.
 	 * @return WP_User_Search
 	 */
-	function __construct( $search_term = '', $page = '', $role = '' ) {
-		_deprecated_function( __FUNCTION__, '3.1.0', 'WP_User_Query' );
+	function __construct($search_term = '', $page = '', $role = '') {
+		_deprecated_function(__FUNCTION__, '3.1.0', 'WP_User_Query');
 
-		$this->search_term = wp_unslash( $search_term );
-		$this->raw_page = ( '' == $page ) ? false : (int) $page;
-		$this->page = (int) ( '' == $page ) ? 1 : $page;
+		$this->search_term = wp_unslash($search_term);
+		$this->raw_page = ('' == $page) ? false : (int) $page;
+		$this->page = (int) ('' == $page) ? 1 : $page;
 		$this->role = $role;
 
 		$this->prepare_query();
@@ -502,8 +502,8 @@ 
 	 * @param string $role Role name.
 	 * @return WP_User_Search
 	 */
-	public function WP_User_Search( $search_term = '', $page = '', $role = '' ) {
-		self::__construct( $search_term, $page, $role );
+	public function WP_User_Search($search_term = '', $page = '', $role = '') {
+		self::__construct($search_term, $page, $role);
 	}
 
 	/**
@@ -520,11 +520,11 @@ 
 		$this->query_orderby = ' ORDER BY user_login';
 
 		$search_sql = '';
-		if ( $this->search_term ) {
+		if ($this->search_term) {
 			$searches = array();
 			$search_sql = 'AND (';
-			foreach ( array('user_login', 'user_nicename', 'user_email', 'user_url', 'display_name') as $col )
-				$searches[] = $wpdb->prepare( $col . ' LIKE %s', '%' . like_escape($this->search_term) . '%' );
+			foreach (array('user_login', 'user_nicename', 'user_email', 'user_url', 'display_name') as $col)
+				$searches[] = $wpdb->prepare($col.' LIKE %s', '%'.like_escape($this->search_term).'%');
 			$search_sql .= implode(' OR ', $searches);
 			$search_sql .= ')';
 		}
@@ -532,16 +532,16 @@ 
 		$this->query_from = " FROM $wpdb->users";
 		$this->query_where = " WHERE 1=1 $search_sql";
 
-		if ( $this->role ) {
+		if ($this->role) {
 			$this->query_from .= " INNER JOIN $wpdb->usermeta ON $wpdb->users.ID = $wpdb->usermeta.user_id";
-			$this->query_where .= $wpdb->prepare(" AND $wpdb->usermeta.meta_key = '{$wpdb->prefix}capabilities' AND $wpdb->usermeta.meta_value LIKE %s", '%' . $this->role . '%');
-		} elseif ( is_multisite() ) {
-			$level_key = $wpdb->prefix . 'capabilities'; // wpmu site admins don't have user_levels
+			$this->query_where .= $wpdb->prepare(" AND $wpdb->usermeta.meta_key = '{$wpdb->prefix}capabilities' AND $wpdb->usermeta.meta_value LIKE %s", '%'.$this->role.'%');
+		} elseif (is_multisite()) {
+			$level_key = $wpdb->prefix.'capabilities'; // wpmu site admins don't have user_levels
 			$this->query_from .= ", $wpdb->usermeta";
 			$this->query_where .= " AND $wpdb->users.ID = $wpdb->usermeta.user_id AND meta_key = '{$level_key}'";
 		}
 
-		do_action_ref_array( 'pre_user_search', array( &$this ) );
+		do_action_ref_array('pre_user_search', array(&$this));
 	}
 
 	/**
@@ -553,10 +553,10 @@ 
 	public function query() {
 		global $wpdb;
 
-		$this->results = $wpdb->get_col("SELECT DISTINCT($wpdb->users.ID)" . $this->query_from . $this->query_where . $this->query_orderby . $this->query_limit);
+		$this->results = $wpdb->get_col("SELECT DISTINCT($wpdb->users.ID)".$this->query_from.$this->query_where.$this->query_orderby.$this->query_limit);
 
-		if ( $this->results )
-			$this->total_users_for_query = $wpdb->get_var("SELECT COUNT(DISTINCT($wpdb->users.ID))" . $this->query_from . $this->query_where); // no limit
+		if ($this->results)
+			$this->total_users_for_query = $wpdb->get_var("SELECT COUNT(DISTINCT($wpdb->users.ID))".$this->query_from.$this->query_where); // no limit
 		else
 			$this->search_errors = new WP_Error('no_matching_users_found', __('No users found.'));
 	}
@@ -576,25 +576,25 @@ 
 	 * @access public
 	 */
 	public function do_paging() {
-		if ( $this->total_users_for_query > $this->users_per_page ) { // have to page the results
+		if ($this->total_users_for_query > $this->users_per_page) { // have to page the results
 			$args = array();
-			if ( ! empty($this->search_term) )
+			if ( ! empty($this->search_term))
 				$args['usersearch'] = urlencode($this->search_term);
-			if ( ! empty($this->role) )
+			if ( ! empty($this->role))
 				$args['role'] = urlencode($this->role);
 
-			$this->paging_text = paginate_links( array(
+			$this->paging_text = paginate_links(array(
 				'total' => ceil($this->total_users_for_query / $this->users_per_page),
 				'current' => $this->page,
 				'base' => 'users.php?%_%',
 				'format' => 'userspage=%#%',
 				'add_args' => $args
-			) );
-			if ( $this->paging_text ) {
-				$this->paging_text = sprintf( '<span class="displaying-num">' . __( 'Displaying %s&#8211;%s of %s' ) . '</span>%s',
-					number_format_i18n( ( $this->page - 1 ) * $this->users_per_page + 1 ),
-					number_format_i18n( min( $this->page * $this->users_per_page, $this->total_users_for_query ) ),
-					number_format_i18n( $this->total_users_for_query ),
+			));
+			if ($this->paging_text) {
+				$this->paging_text = sprintf('<span class="displaying-num">'.__('Displaying %s&#8211;%s of %s').'</span>%s',
+					number_format_i18n(($this->page - 1) * $this->users_per_page + 1),
+					number_format_i18n(min($this->page * $this->users_per_page, $this->total_users_for_query)),
+					number_format_i18n($this->total_users_for_query),
 					$this->paging_text
 				);
 			}
@@ -636,7 +636,7 @@ 
 	 * @return bool
 	 */
 	function results_are_paged() {
-		if ( $this->paging_text )
+		if ($this->paging_text)
 			return true;
 		return false;
 	}
@@ -650,7 +650,7 @@ 
 	 * @return bool
 	 */
 	function is_search() {
-		if ( $this->search_term )
+		if ($this->search_term)
 			return true;
 		return false;
 	}
@@ -669,25 +669,25 @@ 
  *                        Default 'any'.
  * @return array List of posts from others.
  */
-function get_others_unpublished_posts( $user_id, $type = 'any' ) {
-	_deprecated_function( __FUNCTION__, '3.1.0' );
+function get_others_unpublished_posts($user_id, $type = 'any') {
+	_deprecated_function(__FUNCTION__, '3.1.0');
 
 	global $wpdb;
 
-	$editable = get_editable_user_ids( $user_id );
+	$editable = get_editable_user_ids($user_id);
 
-	if ( in_array($type, array('draft', 'pending')) )
+	if (in_array($type, array('draft', 'pending')))
 		$type_sql = " post_status = '$type' ";
 	else
 		$type_sql = " ( post_status = 'draft' OR post_status = 'pending' ) ";
 
-	$dir = ( 'pending' == $type ) ? 'ASC' : 'DESC';
+	$dir = ('pending' == $type) ? 'ASC' : 'DESC';
 
-	if ( !$editable ) {
+	if ( ! $editable) {
 		$other_unpubs = '';
 	} else {
 		$editable = join(',', $editable);
-		$other_unpubs = $wpdb->get_results( $wpdb->prepare("SELECT ID, post_title, post_author FROM $wpdb->posts WHERE post_type = 'post' AND $type_sql AND post_author IN ($editable) AND post_author != %d ORDER BY post_modified $dir", $user_id) );
+		$other_unpubs = $wpdb->get_results($wpdb->prepare("SELECT ID, post_title, post_author FROM $wpdb->posts WHERE post_type = 'post' AND $type_sql AND post_author IN ($editable) AND post_author != %d ORDER BY post_modified $dir", $user_id));
 	}
 
 	return apply_filters('get_others_drafts', $other_unpubs);
@@ -703,7 +703,7 @@ 
  * @return array List of drafts from other users.
  */
 function get_others_drafts($user_id) {
-	_deprecated_function( __FUNCTION__, '3.1.0' );
+	_deprecated_function(__FUNCTION__, '3.1.0');
 
 	return get_others_unpublished_posts($user_id, 'draft');
 }
@@ -718,7 +718,7 @@ 
  * @return array List of posts with pending review post type from other users.
  */
 function get_others_pending($user_id) {
-	_deprecated_function( __FUNCTION__, '3.1.0' );
+	_deprecated_function(__FUNCTION__, '3.1.0');
 
 	return get_others_unpublished_posts($user_id, 'pending');
 }
@@ -731,7 +731,7 @@ 
  * @see wp_dashboard_quick_press()
  */
 function wp_dashboard_quick_press_output() {
-	_deprecated_function( __FUNCTION__, '3.2.0', 'wp_dashboard_quick_press()' );
+	_deprecated_function(__FUNCTION__, '3.2.0', 'wp_dashboard_quick_press()');
 	wp_dashboard_quick_press();
 }
 
@@ -744,15 +744,15 @@ 
  *
  * @staticvar int $num
  */
-function wp_tiny_mce( $teeny = false, $settings = false ) {
-	_deprecated_function( __FUNCTION__, '3.3.0', 'wp_editor()' );
+function wp_tiny_mce($teeny = false, $settings = false) {
+	_deprecated_function(__FUNCTION__, '3.3.0', 'wp_editor()');
 
 	static $num = 1;
 
-	if ( ! class_exists( '_WP_Editors', false ) )
-		require_once( ABSPATH . WPINC . '/class-wp-editor.php' );
+	if ( ! class_exists('_WP_Editors', false))
+		require_once(ABSPATH.WPINC.'/class-wp-editor.php');
 
-	$editor_id = 'content' . $num++;
+	$editor_id = 'content'.$num++;
 
 	$set = array(
 		'teeny' => $teeny,
@@ -771,7 +771,7 @@ 
  * @see wp_editor()
  */
 function wp_preload_dialogs() {
-	_deprecated_function( __FUNCTION__, '3.3.0', 'wp_editor()' );
+	_deprecated_function(__FUNCTION__, '3.3.0', 'wp_editor()');
 }
 
 /**
@@ -781,7 +781,7 @@ 
  * @see wp_editor()
  */
 function wp_print_editor_js() {
-	_deprecated_function( __FUNCTION__, '3.3.0', 'wp_editor()' );
+	_deprecated_function(__FUNCTION__, '3.3.0', 'wp_editor()');
 }
 
 /**
@@ -791,7 +791,7 @@ 
  * @see wp_editor()
  */
 function wp_quicktags() {
-	_deprecated_function( __FUNCTION__, '3.3.0', 'wp_editor()' );
+	_deprecated_function(__FUNCTION__, '3.3.0', 'wp_editor()');
 }
 
 /**
@@ -801,12 +801,12 @@ 
  * @deprecated 3.3.0 WP_Screen::render_screen_layout()
  * @see WP_Screen::render_screen_layout()
  */
-function screen_layout( $screen ) {
-	_deprecated_function( __FUNCTION__, '3.3.0', '$current_screen->render_screen_layout()' );
+function screen_layout($screen) {
+	_deprecated_function(__FUNCTION__, '3.3.0', '$current_screen->render_screen_layout()');
 
 	$current_screen = get_current_screen();
 
-	if ( ! $current_screen )
+	if ( ! $current_screen)
 		return '';
 
 	ob_start();
@@ -821,12 +821,12 @@ 
  * @deprecated 3.3.0 Use WP_Screen::render_per_page_options()
  * @see WP_Screen::render_per_page_options()
  */
-function screen_options( $screen ) {
-	_deprecated_function( __FUNCTION__, '3.3.0', '$current_screen->render_per_page_options()' );
+function screen_options($screen) {
+	_deprecated_function(__FUNCTION__, '3.3.0', '$current_screen->render_per_page_options()');
 
 	$current_screen = get_current_screen();
 
-	if ( ! $current_screen )
+	if ( ! $current_screen)
 		return '';
 
 	ob_start();
@@ -841,7 +841,7 @@ 
  * @deprecated 3.3.0 Use WP_Screen::render_screen_meta()
  * @see WP_Screen::render_screen_meta()
  */
-function screen_meta( $screen ) {
+function screen_meta($screen) {
 	$current_screen = get_current_screen();
 	$current_screen->render_screen_meta();
 }
@@ -854,7 +854,7 @@ 
  * @see WP_Admin_Bar
  */
 function favorite_actions() {
-	_deprecated_function( __FUNCTION__, '3.2.0', 'WP_Admin_Bar' );
+	_deprecated_function(__FUNCTION__, '3.2.0', 'WP_Admin_Bar');
 }
 
 /**
@@ -866,7 +866,7 @@ 
  * @return null|string
  */
 function media_upload_image() {
-	_deprecated_function( __FUNCTION__, '3.3.0', 'wp_media_upload_handler()' );
+	_deprecated_function(__FUNCTION__, '3.3.0', 'wp_media_upload_handler()');
 	return wp_media_upload_handler();
 }
 
@@ -879,7 +879,7 @@ 
  * @return null|string
  */
 function media_upload_audio() {
-	_deprecated_function( __FUNCTION__, '3.3.0', 'wp_media_upload_handler()' );
+	_deprecated_function(__FUNCTION__, '3.3.0', 'wp_media_upload_handler()');
 	return wp_media_upload_handler();
 }
 
@@ -892,7 +892,7 @@ 
  * @return null|string
  */
 function media_upload_video() {
-	_deprecated_function( __FUNCTION__, '3.3.0', 'wp_media_upload_handler()' );
+	_deprecated_function(__FUNCTION__, '3.3.0', 'wp_media_upload_handler()');
 	return wp_media_upload_handler();
 }
 
@@ -905,7 +905,7 @@ 
  * @return null|string
  */
 function media_upload_file() {
-	_deprecated_function( __FUNCTION__, '3.3.0', 'wp_media_upload_handler()' );
+	_deprecated_function(__FUNCTION__, '3.3.0', 'wp_media_upload_handler()');
 	return wp_media_upload_handler();
 }
 
@@ -918,8 +918,8 @@ 
  * @return string
  */
 function type_url_form_image() {
-	_deprecated_function( __FUNCTION__, '3.3.0', "wp_media_insert_url_form('image')" );
-	return wp_media_insert_url_form( 'image' );
+	_deprecated_function(__FUNCTION__, '3.3.0', "wp_media_insert_url_form('image')");
+	return wp_media_insert_url_form('image');
 }
 
 /**
@@ -931,8 +931,8 @@ 
  * @return string
  */
 function type_url_form_audio() {
-	_deprecated_function( __FUNCTION__, '3.3.0', "wp_media_insert_url_form('audio')" );
-	return wp_media_insert_url_form( 'audio' );
+	_deprecated_function(__FUNCTION__, '3.3.0', "wp_media_insert_url_form('audio')");
+	return wp_media_insert_url_form('audio');
 }
 
 /**
@@ -944,8 +944,8 @@ 
  * @return string
  */
 function type_url_form_video() {
-	_deprecated_function( __FUNCTION__, '3.3.0', "wp_media_insert_url_form('video')" );
-	return wp_media_insert_url_form( 'video' );
+	_deprecated_function(__FUNCTION__, '3.3.0', "wp_media_insert_url_form('video')");
+	return wp_media_insert_url_form('video');
 }
 
 /**
@@ -957,8 +957,8 @@ 
  * @return string
  */
 function type_url_form_file() {
-	_deprecated_function( __FUNCTION__, '3.3.0', "wp_media_insert_url_form('file')" );
-	return wp_media_insert_url_form( 'file' );
+	_deprecated_function(__FUNCTION__, '3.3.0', "wp_media_insert_url_form('file')");
+	return wp_media_insert_url_form('file');
 }
 
 /**
@@ -973,13 +973,13 @@ 
  * @param string    $screen The handle for the screen to add help to. This is usually the hook name returned by the add_*_page() functions.
  * @param string    $help   The content of an 'Overview' help tab.
  */
-function add_contextual_help( $screen, $help ) {
-	_deprecated_function( __FUNCTION__, '3.3.0', 'get_current_screen()->add_help_tab()' );
+function add_contextual_help($screen, $help) {
+	_deprecated_function(__FUNCTION__, '3.3.0', 'get_current_screen()->add_help_tab()');
 
-	if ( is_string( $screen ) )
-		$screen = convert_to_screen( $screen );
+	if (is_string($screen))
+		$screen = convert_to_screen($screen);
 
-	WP_Screen::add_old_compat_help( $screen, $help );
+	WP_Screen::add_old_compat_help($screen, $help);
 }
 
 /**
@@ -992,13 +992,13 @@ 
  * @return array $themes Array of allowed themes.
  */
 function get_allowed_themes() {
-	_deprecated_function( __FUNCTION__, '3.4.0', "wp_get_themes( array( 'allowed' => true ) )" );
+	_deprecated_function(__FUNCTION__, '3.4.0', "wp_get_themes( array( 'allowed' => true ) )");
 
-	$themes = wp_get_themes( array( 'allowed' => true ) );
+	$themes = wp_get_themes(array('allowed' => true));
 
 	$wp_themes = array();
-	foreach ( $themes as $theme ) {
-		$wp_themes[ $theme->get('Name') ] = $theme;
+	foreach ($themes as $theme) {
+		$wp_themes[$theme->get('Name')] = $theme;
 	}
 
 	return $wp_themes;
@@ -1014,13 +1014,13 @@ 
  * @return array
  */
 function get_broken_themes() {
-	_deprecated_function( __FUNCTION__, '3.4.0', "wp_get_themes( array( 'errors' => true )" );
+	_deprecated_function(__FUNCTION__, '3.4.0', "wp_get_themes( array( 'errors' => true )");
 
-	$themes = wp_get_themes( array( 'errors' => true ) );
+	$themes = wp_get_themes(array('errors' => true));
 	$broken = array();
-	foreach ( $themes as $theme ) {
+	foreach ($themes as $theme) {
 		$name = $theme->get('Name');
-		$broken[ $name ] = array(
+		$broken[$name] = array(
 			'Name' => $name,
 			'Title' => $name,
 			'Description' => $theme->errors()->get_error_message(),
@@ -1039,7 +1039,7 @@ 
  * @return WP_Theme
  */
 function current_theme_info() {
-	_deprecated_function( __FUNCTION__, '3.4.0', 'wp_get_theme()' );
+	_deprecated_function(__FUNCTION__, '3.4.0', 'wp_get_theme()');
 
 	return wp_get_theme();
 }
@@ -1051,8 +1051,8 @@ 
  *
  * @deprecated 3.5.0
  */
-function _insert_into_post_button( $type ) {
-	_deprecated_function( __FUNCTION__, '3.5.0' );
+function _insert_into_post_button($type) {
+	_deprecated_function(__FUNCTION__, '3.5.0');
 }
 
 /**
@@ -1063,7 +1063,7 @@ 
  * @deprecated 3.5.0
  */
 function _media_button($title, $icon, $type, $id) {
-	_deprecated_function( __FUNCTION__, '3.5.0' );
+	_deprecated_function(__FUNCTION__, '3.5.0');
 }
 
 /**
@@ -1076,10 +1076,10 @@ 
  * @param int $id
  * @return object
  */
-function get_post_to_edit( $id ) {
-	_deprecated_function( __FUNCTION__, '3.5.0', 'get_post()' );
+function get_post_to_edit($id) {
+	_deprecated_function(__FUNCTION__, '3.5.0', 'get_post()');
 
-	return get_post( $id, OBJECT, 'edit' );
+	return get_post($id, OBJECT, 'edit');
 }
 
 /**
@@ -1092,7 +1092,7 @@ 
  * @return WP_Post Post object containing all the default post data as attributes
  */
 function get_default_page_to_edit() {
-	_deprecated_function( __FUNCTION__, '3.5.0', "get_default_post_to_edit( 'page' )" );
+	_deprecated_function(__FUNCTION__, '3.5.0', "get_default_post_to_edit( 'page' )");
 
 	$page = get_default_post_to_edit();
 	$page->post_type = 'page';
@@ -1111,9 +1111,9 @@ 
  * @param mixed $deprecated Never used.
  * @return string Thumbnail path on success, Error string on failure.
  */
-function wp_create_thumbnail( $file, $max_side, $deprecated = '' ) {
-	_deprecated_function( __FUNCTION__, '3.5.0', 'image_resize()' );
-	return apply_filters( 'wp_create_thumbnail', image_resize( $file, $max_side, $max_side ) );
+function wp_create_thumbnail($file, $max_side, $deprecated = '') {
+	_deprecated_function(__FUNCTION__, '3.5.0', 'image_resize()');
+	return apply_filters('wp_create_thumbnail', image_resize($file, $max_side, $max_side));
 }
 
 /**
@@ -1125,7 +1125,7 @@ 
  * @deprecated 3.6.0
  */
 function wp_nav_menu_locations_meta_box() {
-	_deprecated_function( __FUNCTION__, '3.6.0' );
+	_deprecated_function(__FUNCTION__, '3.6.0');
 }
 
 /**
@@ -1139,12 +1139,12 @@ 
  * @see Core_Upgrader
  */
 function wp_update_core($current, $feedback = '') {
-	_deprecated_function( __FUNCTION__, '3.7.0', 'new Core_Upgrader();' );
+	_deprecated_function(__FUNCTION__, '3.7.0', 'new Core_Upgrader();');
 
-	if ( !empty($feedback) )
+	if ( ! empty($feedback))
 		add_filter('update_feedback', $feedback);
 
-	include( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
+	include(ABSPATH.'wp-admin/includes/class-wp-upgrader.php');
 	$upgrader = new Core_Upgrader();
 	return $upgrader->upgrade($current);
 
@@ -1162,12 +1162,12 @@ 
  * @see Plugin_Upgrader
  */
 function wp_update_plugin($plugin, $feedback = '') {
-	_deprecated_function( __FUNCTION__, '3.7.0', 'new Plugin_Upgrader();' );
+	_deprecated_function(__FUNCTION__, '3.7.0', 'new Plugin_Upgrader();');
 
-	if ( !empty($feedback) )
+	if ( ! empty($feedback))
 		add_filter('update_feedback', $feedback);
 
-	include( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
+	include(ABSPATH.'wp-admin/includes/class-wp-upgrader.php');
 	$upgrader = new Plugin_Upgrader();
 	return $upgrader->upgrade($plugin);
 }
@@ -1184,12 +1184,12 @@ 
  * @see Theme_Upgrader
  */
 function wp_update_theme($theme, $feedback = '') {
-	_deprecated_function( __FUNCTION__, '3.7.0', 'new Theme_Upgrader();' );
+	_deprecated_function(__FUNCTION__, '3.7.0', 'new Theme_Upgrader();');
 
-	if ( !empty($feedback) )
+	if ( ! empty($feedback))
 		add_filter('update_feedback', $feedback);
 
-	include( ABSPATH . 'wp-admin/includes/class-wp-upgrader.php' );
+	include(ABSPATH.'wp-admin/includes/class-wp-upgrader.php');
 	$upgrader = new Theme_Upgrader();
 	return $upgrader->upgrade($theme);
 }
@@ -1202,8 +1202,8 @@ 
  *
  * @param int|bool $id
  */
-function the_attachment_links( $id = false ) {
-	_deprecated_function( __FUNCTION__, '3.7.0' );
+function the_attachment_links($id = false) {
+	_deprecated_function(__FUNCTION__, '3.7.0');
 }
 
 /**
@@ -1304,8 +1304,8 @@ 
  * @param int $old_ID
  * @param int $new_ID
  */
-function _relocate_children( $old_ID, $new_ID ) {
-	_deprecated_function( __FUNCTION__, '3.9.0' );
+function _relocate_children($old_ID, $new_ID) {
+	_deprecated_function(__FUNCTION__, '3.9.0');
 }
 
 /**
@@ -1331,8 +1331,8 @@ 
  * @param string   $icon_url   The url to the icon to be used for this menu.
  * @return string The resulting page's hook_suffix.
  */
-function add_object_page( $page_title, $menu_title, $capability, $menu_slug, $function = '', $icon_url = '') {
-	_deprecated_function( __FUNCTION__, '4.5.0', 'add_menu_page()' );
+function add_object_page($page_title, $menu_title, $capability, $menu_slug, $function = '', $icon_url = '') {
+	_deprecated_function(__FUNCTION__, '4.5.0', 'add_menu_page()');
 
 	global $_wp_last_object_menu;
 
@@ -1364,8 +1364,8 @@ 
  * @param string   $icon_url   The url to the icon to be used for this menu.
  * @return string The resulting page's hook_suffix.
  */
-function add_utility_page( $page_title, $menu_title, $capability, $menu_slug, $function = '', $icon_url = '') {
-	_deprecated_function( __FUNCTION__, '4.5.0', 'add_menu_page()' );
+function add_utility_page($page_title, $menu_title, $capability, $menu_slug, $function = '', $icon_url = '') {
+	_deprecated_function(__FUNCTION__, '4.5.0', 'add_menu_page()');
 
 	global $_wp_last_utility_menu;
 
@@ -1390,9 +1390,9 @@ 
 function post_form_autocomplete_off() {
 	global $is_safari, $is_chrome;
 
-	_deprecated_function( __FUNCTION__, '4.6.0' );
+	_deprecated_function(__FUNCTION__, '4.6.0');
 
-	if ( $is_safari || $is_chrome ) {
+	if ($is_safari || $is_chrome) {
 		echo ' autocomplete="off"';
 	}
 }

src/wp-admin/includes/post.php

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 +513 added lines, -513 removed lines

@@ -18,157 +18,157 @@ 
  * @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', __( 'Sorry, 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', __('Sorry, you are not allowed to edit pages as this user.'));
 		else
-			return new WP_Error( 'edit_others_posts', __( 'Sorry, 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', __( 'Sorry, you are not allowed to create pages as this user.' ) );
+			return new WP_Error('edit_others_posts', __('Sorry, 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', __('Sorry, you are not allowed to create pages as this user.'));
 		else
-			return new WP_Error( 'edit_others_posts', __( 'Sorry, you are not allowed to create posts as this user.' ) );
+			return new WP_Error('edit_others_posts', __('Sorry, 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', __( 'Sorry, 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', __('Sorry, you are not allowed to edit pages as this user.'));
 			else
-				return new WP_Error( 'edit_others_posts', __( 'Sorry, you are not allowed to edit posts as this user.' ) );
+				return new WP_Error('edit_others_posts', __('Sorry, you are not allowed to edit posts as this user.'));
 		} else {
-			if ( 'page' == $post_data['post_type'] )
-				return new WP_Error( 'edit_others_pages', __( 'Sorry, you are not allowed to create pages as this user.' ) );
+			if ('page' == $post_data['post_type'])
+				return new WP_Error('edit_others_pages', __('Sorry, you are not allowed to create pages as this user.'));
 			else
-				return new WP_Error( 'edit_others_posts', __( 'Sorry, you are not allowed to create posts as this user.' ) );
+				return new WP_Error('edit_others_posts', __('Sorry, 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', __( 'Invalid date.' ) );
+		$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', __('Invalid date.'));
 		}
-		$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']);
 	}
 
-	if ( isset( $post_data['post_category'] ) ) {
-		$category_object = get_taxonomy( 'category' );
-		if ( ! current_user_can( $category_object->cap->assign_terms ) ) {
-			unset( $post_data['post_category'] );
+	if (isset($post_data['post_category'])) {
+		$category_object = get_taxonomy('category');
+		if ( ! current_user_can($category_object->cap->assign_terms)) {
+			unset($post_data['post_category']);
 		}
 	}
 
@@ -185,151 +185,151 @@ 
  * @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( __('Sorry, you are not allowed to edit this page.' ));
+	if ( ! current_user_can('edit_post', $post_ID)) {
+		if ('page' == $post_data['post_type'])
+			wp_die(__('Sorry, you are not allowed to edit this page.'));
 		else
-			wp_die( __('Sorry, you are not allowed to edit this post.' ));
+			wp_die(__('Sorry, 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( $meta->meta_key, 'post' ) || ! current_user_can( 'edit_post_meta', $post_ID, $meta->meta_key ) )
+			if (is_protected_meta($meta->meta_key, 'post') || ! current_user_can('edit_post_meta', $post_ID, $meta->meta_key))
 				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;
 			}
 
@@ -338,67 +338,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;
@@ -417,22 +417,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( __('Sorry, you are not allowed to edit pages.'));
+	if ( ! current_user_can($ptype->cap->edit_posts)) {
+		if ('page' == $ptype->name)
+			wp_die(__('Sorry, you are not allowed to edit pages.'));
 		else
-			wp_die( __('Sorry, you are not allowed to edit posts.'));
+			wp_die(__('Sorry, you are not allowed to edit posts.'));
 	}
 
 	if ( -1 == $post_data['_status'] ) {
@@ -443,15 +443,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',
@@ -460,43 +460,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;
 				}
@@ -507,78 +507,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);
 }
 
 /**
@@ -590,24 +590,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;
@@ -620,14 +620,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);
 	}
 
 	/**
@@ -638,7 +638,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);
 
 	/**
 	 * Filters the default post title initially used in the "Write Post" form.
@@ -648,7 +648,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);
 
 	/**
 	 * Filters the default post excerpt initially used in the "Write Post" form.
@@ -658,7 +658,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;
 }
@@ -678,30 +678,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;
 }
@@ -716,63 +716,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', __( 'Sorry, 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', __('Sorry, you are not allowed to create pages on this site.'));
 		else
-			return new WP_Error( 'edit_posts', __( 'Sorry, you are not allowed to create posts or drafts on this site.' ) );
+			return new WP_Error('edit_posts', __('Sorry, 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;
 }
@@ -786,8 +786,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;
 }
@@ -804,32 +804,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;
@@ -843,8 +843,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);
 }
 
 /**
@@ -859,11 +859,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;
 }
@@ -876,8 +876,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);
 }
 
 /**
@@ -890,12 +890,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);
 }
 
 /**
@@ -908,11 +908,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);
 }
 
 //
@@ -928,42 +928,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);
@@ -994,40 +994,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;
 
 	/**
@@ -1043,7 +1043,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);
 
 	/**
 	 * Filters the number of posts displayed per page when specifically listing "posts".
@@ -1053,12 +1053,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;
@@ -1066,10 +1066,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;
 }
@@ -1100,24 +1100,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;
 	}
 
@@ -1128,27 +1128,27 @@ 
 	 *
 	 * @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;
 	}
 
 	// Filter query clauses to include filenames.
-	if ( isset( $q['s'] ) ) {
-		add_filter( 'posts_clauses', '_filter_query_attachment_filenames' );
+	if (isset($q['s'])) {
+		add_filter('posts_clauses', '_filter_query_attachment_filenames');
 	}
 
 	return $q;
@@ -1163,13 +1163,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);
 }
 
 /**
@@ -1181,17 +1181,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('');
 	}
 
 	/**
@@ -1204,8 +1204,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);
 }
 
 /**
@@ -1219,9 +1219,9 @@ 
  * @return array Array containing the sample permalink with placeholder for the post name, and the post name.
  */
 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);
 
@@ -1230,14 +1230,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);
@@ -1250,23 +1250,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;
@@ -1283,7 +1283,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);
 }
 
 /**
@@ -1296,9 +1296,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);
@@ -1306,50 +1306,50 @@ 
 	$view_link = false;
 	$preview_target = '';
 
-	if ( current_user_can( 'read_post', $post->ID ) ) {
-		if ( 'draft' === $post->post_status || empty( $post->post_name ) ) {
-			$view_link = get_preview_post_link( $post );
+	if (current_user_can('read_post', $post->ID)) {
+		if ('draft' === $post->post_status || empty($post->post_name)) {
+			$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, in case $post->post_name is set
-				$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 . '>' . esc_html( $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.'>'.esc_html($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 ( mb_strlen( $post_name ) > 34 ) {
-			$post_name_abridged = mb_substr( $post_name, 0, 16 ) . '&hellip;' . mb_substr( $post_name, -16 );
+		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;
 		}
 
-		$post_name_html = '<span id="editable-post-name">' . esc_html( $post_name_abridged ) . '</span>';
-		$display_link = str_replace( array( '%pagename%', '%postname%' ), $post_name_html, esc_html( urldecode( $permalink ) ) );
+		$post_name_html = '<span id="editable-post-name">'.esc_html($post_name_abridged).'</span>';
+		$display_link = str_replace(array('%pagename%', '%postname%'), $post_name_html, esc_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">' . esc_html( $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">'.esc_html($post_name)."</span>\n";
 	}
 
 	/**
@@ -1364,7 +1364,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;
 }
@@ -1378,22 +1378,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) {
 	$_wp_additional_image_sizes = wp_get_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);
 
 		/**
 		 * Filters the size used to display the post thumbnail image in the 'Featured Image' meta box.
@@ -1412,22 +1412,22 @@ 
 		 * @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 ) ) {
-			$content = sprintf( $set_thumbnail_link,
-				esc_url( $upload_iframe_src ),
+		if ( ! empty($thumbnail_html)) {
+			$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">' . 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">'.esc_html($post_type_object->labels->remove_featured_image).'</a></p>';
 		}
 	}
 
-	$content .= '<input type="hidden" id="_thumbnail_id" name="_thumbnail_id" value="' . esc_attr( $thumbnail_id ? $thumbnail_id : '-1' ) . '" />';
+	$content .= '<input type="hidden" id="_thumbnail_id" name="_thumbnail_id" value="'.esc_attr($thumbnail_id ? $thumbnail_id : '-1').'" />';
 
 	/**
 	 * Filters the admin post thumbnail HTML markup to return.
@@ -1440,7 +1440,7 @@ 
 	 * @param int    $post_id      Post ID.
 	 * @param int    $thumbnail_id Thumbnail ID.
 	 */
-	return apply_filters( 'admin_post_thumbnail_html', $content, $post->ID, $thumbnail_id );
+	return apply_filters('admin_post_thumbnail_html', $content, $post->ID, $thumbnail_id);
 }
 
 /**
@@ -1451,21 +1451,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;
 }
@@ -1479,17 +1479,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);
 }
 
 /**
@@ -1499,14 +1499,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) {
 
 		/**
 		 * Filters whether to show the post locked dialog.
@@ -1519,7 +1519,7 @@ 
 		 * @param WP_Post      $post    Post object.
 		 * @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;
@@ -1527,17 +1527,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';
@@ -1548,18 +1548,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);
 
 		/**
 		 * Filters whether to allow the post lock to be overridden.
@@ -1573,17 +1573,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
@@ -1594,19 +1594,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
 		}
 
@@ -1620,7 +1620,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
@@ -1631,9 +1631,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
 	}
@@ -1654,38 +1654,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;
 		}
 
@@ -1696,16 +1696,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);
 }
 
 /**
@@ -1721,46 +1721,46 @@ 
 	$post_ID = (int) $_POST['post_ID'];
 	$_POST['ID'] = $post_ID;
 
-	if ( ! $post = get_post( $post_ID ) ) {
-		wp_die( __( 'Sorry, you are not allowed to edit this post.' ) );
+	if ( ! $post = get_post($post_ID)) {
+		wp_die(__('Sorry, you are not allowed to edit this post.'));
 	}
 
-	if ( ! current_user_can( 'edit_post', $post->ID ) ) {
-		wp_die( __( 'Sorry, you are not allowed to edit this post.' ) );
+	if ( ! current_user_can('edit_post', $post->ID)) {
+		wp_die(__('Sorry, 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']);
 		}
 
-		if ( isset( $_POST['_thumbnail_id'] ) ) {
-			$query_args['_thumbnail_id'] = ( intval( $_POST['_thumbnail_id'] ) <= 0 ) ? '-1' : intval( $_POST['_thumbnail_id'] );
+		if (isset($_POST['_thumbnail_id'])) {
+			$query_args['_thumbnail_id'] = (intval($_POST['_thumbnail_id']) <= 0) ? '-1' : intval($_POST['_thumbnail_id']);
 		}
 	}
 
-	return get_preview_post_link( $post, $query_args );
+	return get_preview_post_link($post, $query_args);
 }
 
 /**
@@ -1774,36 +1774,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', __( 'Sorry, you are not allowed to edit this item.' ) );
+	if ( ! current_user_can('edit_post', $post->ID)) {
+		return new WP_Error('edit_posts', __('Sorry, 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));
 	}
 }
 
@@ -1813,11 +1813,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;
@@ -1831,17 +1831,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'));
 	}
 
 	/**
@@ -1852,6 +1852,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', __( 'Sorry, you are not allowed to edit pages as this user.' ) );
-		else
-			return new WP_Error( 'edit_others_posts', __( 'Sorry, you are not allowed to edit posts as this user.' ) );
+		if ( 'page' == $post_data['post_type'] ) {
+					return new WP_Error( 'edit_others_pages', __( 'Sorry, you are not allowed to edit pages as this user.' ) );
+		} else {
+					return new WP_Error( 'edit_others_posts', __( 'Sorry, 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', __( 'Sorry, you are not allowed to create pages as this user.' ) );
-		else
-			return new WP_Error( 'edit_others_posts', __( 'Sorry, you are not allowed to create posts as this user.' ) );
+		if ( 'page' == $post_data['post_type'] ) {
+					return new WP_Error( 'edit_others_pages', __( 'Sorry, you are not allowed to create pages as this user.' ) );
+		} else {
+					return new WP_Error( 'edit_others_posts', __( 'Sorry, 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', __( 'Sorry, you are not allowed to edit pages as this user.' ) );
-			else
-				return new WP_Error( 'edit_others_posts', __( 'Sorry, you are not allowed to edit posts as this user.' ) );
+			if ( 'page' == $post_data['post_type'] ) {
+							return new WP_Error( 'edit_others_pages', __( 'Sorry, you are not allowed to edit pages as this user.' ) );
+			} else {
+							return new WP_Error( 'edit_others_posts', __( 'Sorry, you are not allowed to edit posts as this user.' ) );
+			}
 		} else {
-			if ( 'page' == $post_data['post_type'] )
-				return new WP_Error( 'edit_others_pages', __( 'Sorry, you are not allowed to create pages as this user.' ) );
-			else
-				return new WP_Error( 'edit_others_posts', __( 'Sorry, you are not allowed to create posts as this user.' ) );
+			if ( 'page' == $post_data['post_type'] ) {
+							return new WP_Error( 'edit_others_pages', __( 'Sorry, you are not allowed to create pages as this user.' ) );
+			} else {
+							return new WP_Error( 'edit_others_posts', __( 'Sorry, 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] ) {
@@ -188,8 +207,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'] );
@@ -209,10 +229,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( __('Sorry, you are not allowed to edit this page.' ));
-		else
-			wp_die( __('Sorry, you are not allowed to edit this post.' ));
+		if ( 'page' == $post_data['post_type'] ) {
+					wp_die( __('Sorry, you are not allowed to edit this page.' ));
+		} else {
+					wp_die( __('Sorry, you are not allowed to edit this post.' ));
+		}
 	}
 
 	if ( post_type_supports( $ptype->name, 'revisions' ) ) {
@@ -220,8 +241,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']) ) {
@@ -241,18 +263,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' );
@@ -260,10 +285,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 ] ) );
+			}
 		}
 	}
 
@@ -284,26 +310,33 @@ 
 	// 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( $meta->meta_key, 'post' ) || ! current_user_can( 'edit_post_meta', $post_ID, $meta->meta_key ) )
-				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( $meta->meta_key, 'post' ) || ! current_user_can( 'edit_post_meta', $post_ID, $meta->meta_key ) ) {
+							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 );
 		}
 	}
@@ -395,10 +428,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;
@@ -420,19 +454,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( __('Sorry, you are not allowed to edit pages.'));
-		else
-			wp_die( __('Sorry, you are not allowed to edit posts.'));
+		if ( 'page' == $ptype->name ) {
+					wp_die( __('Sorry, you are not allowed to edit pages.'));
+		} else {
+					wp_die( __('Sorry, you are not allowed to edit posts.'));
+		}
 	}
 
 	if ( -1 == $post_data['_status'] ) {
@@ -461,28 +498,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," ) );
 			}
 		}
@@ -527,15 +568,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 );
 		}
@@ -568,14 +611,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 );
@@ -592,22 +637,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;
@@ -700,8 +749,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;
 }
@@ -716,16 +766,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', __( 'Sorry, you are not allowed to create pages on this site.' ) );
-		else
-			return new WP_Error( 'edit_posts', __( 'Sorry, you are not allowed to create posts or drafts on this site.' ) );
+		if ( 'page' == $ptype->name ) {
+					return new WP_Error( 'edit_pages', __( 'Sorry, you are not allowed to create pages on this site.' ) );
+		} else {
+					return new WP_Error( 'edit_posts', __( 'Sorry, you are not allowed to create posts or drafts on this site.' ) );
+		}
 	}
 
 	$_POST['post_mime_type'] = '';
@@ -734,8 +786,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'] ) {
@@ -754,16 +807,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 );
 
@@ -786,11 +842,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
@@ -810,22 +867,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 );
 
@@ -933,12 +995,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)
@@ -947,15 +1011,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 );
@@ -995,16 +1061,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);
 
@@ -1027,8 +1095,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;
+	}
 
 	/**
 	 * Filters the number of items per page to show for a specific 'per_page' type.
@@ -1066,8 +1135,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 );
 
@@ -1220,8 +1290,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);
 
@@ -1237,8 +1308,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);
 
@@ -1260,8 +1332,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);
 	}
 
@@ -1298,8 +1371,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);
 
@@ -1452,11 +1526,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];
@@ -1465,8 +1541,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;
 }
 
@@ -1480,10 +1557,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";
@@ -1499,12 +1578,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 ) {
 
@@ -1519,8 +1600,9 @@ 
 		 * @param WP_Post      $post    Post object.
 		 * @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 {
@@ -1534,8 +1616,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;
 	}
@@ -1582,8 +1665,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
@@ -1663,8 +1747,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();
 
@@ -1736,14 +1821,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();
 
@@ -1776,8 +1863,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;
@@ -1792,11 +1880,13 @@ 
 		return new WP_Error( 'edit_posts', __( 'Sorry, 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-includes/capabilities.php

Doc Comments -9 removed lines

@@ -20,10 +20,6 @@ 
  *
  * @param string $cap       Capability name.
  * @param int    $user_id   User ID.
- * @param int    $object_id Optional. ID of the specific object to check against if `$cap` is a "meta" cap.
- *                          "Meta" capabilities, e.g. 'edit_post', 'edit_user', etc., are capabilities used
- *                          by map_meta_cap() to map to other "primitive" capabilities, e.g. 'edit_posts',
- *                          'edit_others_posts', etc. The parameter is accessed via func_get_args().
  * @return array Actual capabilities for meta capability.
  */
 function map_meta_cap( $cap, $user_id ) {
@@ -416,11 +412,6 @@ 
  * @see map_meta_cap()
  *
  * @param string $capability Capability name.
- * @param int    $object_id  Optional. ID of the specific object to check against if `$capability` is a "meta" cap.
- *                           "Meta" capabilities, e.g. 'edit_post', 'edit_user', etc., are capabilities used
- *                           by map_meta_cap() to map to other "primitive" capabilities, e.g. 'edit_posts',
- *                           'edit_others_posts', etc. Accessed via func_get_args() and passed to WP_User::has_cap(),
- *                           then map_meta_cap().
  * @return bool Whether the current user has the given capability. If `$capability` is a meta cap and `$object_id` is
  *              passed, whether the current user has the given meta capability for the given object.
  */

Switch Indentation +343 added lines, -343 removed lines

@@ -31,235 +31,235 @@ 
 	$caps = array();
 
 	switch ( $cap ) {
-	case 'remove_user':
-		// In multisite the user must be a super admin to remove themselves.
-		if ( isset( $args[0] ) && $user_id == $args[0] && ! is_super_admin( $user_id ) ) {
-			$caps[] = 'do_not_allow';
-		} else {
-			$caps[] = 'remove_users';
-		}
-		break;
-	case 'promote_user':
-	case 'add_users':
-		$caps[] = 'promote_users';
-		break;
-	case 'edit_user':
-	case 'edit_users':
-		// Allow user to edit itself
-		if ( 'edit_user' == $cap && isset( $args[0] ) && $user_id == $args[0] )
+		case 'remove_user':
+			// In multisite the user must be a super admin to remove themselves.
+			if ( isset( $args[0] ) && $user_id == $args[0] && ! is_super_admin( $user_id ) ) {
+				$caps[] = 'do_not_allow';
+			} else {
+				$caps[] = 'remove_users';
+			}
 			break;
-
-		// In multisite the user must have manage_network_users caps. If editing a super admin, the user must be a super admin.
-		if ( is_multisite() && ( ( ! is_super_admin( $user_id ) && 'edit_user' === $cap && is_super_admin( $args[0] ) ) || ! user_can( $user_id, 'manage_network_users' ) ) ) {
-			$caps[] = 'do_not_allow';
-		} else {
-			$caps[] = 'edit_users'; // edit_user maps to edit_users.
-		}
-		break;
-	case 'delete_post':
-	case 'delete_page':
-		$post = get_post( $args[0] );
-		if ( ! $post ) {
-			$caps[] = 'do_not_allow';
+		case 'promote_user':
+		case 'add_users':
+			$caps[] = 'promote_users';
 			break;
-		}
+		case 'edit_user':
+		case 'edit_users':
+			// Allow user to edit itself
+			if ( 'edit_user' == $cap && isset( $args[0] ) && $user_id == $args[0] )
+				break;
 
-		if ( 'revision' == $post->post_type ) {
-			$post = get_post( $post->post_parent );
+			// In multisite the user must have manage_network_users caps. If editing a super admin, the user must be a super admin.
+			if ( is_multisite() && ( ( ! is_super_admin( $user_id ) && 'edit_user' === $cap && is_super_admin( $args[0] ) ) || ! user_can( $user_id, 'manage_network_users' ) ) ) {
+				$caps[] = 'do_not_allow';
+			} else {
+				$caps[] = 'edit_users'; // edit_user maps to edit_users.
+			}
+			break;
+		case 'delete_post':
+		case 'delete_page':
+			$post = get_post( $args[0] );
 			if ( ! $post ) {
 				$caps[] = 'do_not_allow';
 				break;
 			}
-		}
 
-		if ( ( get_option( 'page_for_posts' ) == $post->ID ) || ( get_option( 'page_on_front' ) == $post->ID ) ) {
-			$caps[] = 'manage_options';
-			break;
-		}
+			if ( 'revision' == $post->post_type ) {
+				$post = get_post( $post->post_parent );
+				if ( ! $post ) {
+					$caps[] = 'do_not_allow';
+					break;
+				}
+			}
 
-		$post_type = get_post_type_object( $post->post_type );
-		if ( ! $post_type ) {
-			/* translators: 1: post type, 2: capability name */
-			_doing_it_wrong( __FUNCTION__, sprintf( __( 'The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.' ), $post->post_type, $cap ), '4.4.0' );
-			$caps[] = 'edit_others_posts';
-			break;
-		}
+			if ( ( get_option( 'page_for_posts' ) == $post->ID ) || ( get_option( 'page_on_front' ) == $post->ID ) ) {
+				$caps[] = 'manage_options';
+				break;
+			}
 
-		if ( ! $post_type->map_meta_cap ) {
-			$caps[] = $post_type->cap->$cap;
-			// Prior to 3.1 we would re-call map_meta_cap here.
-			if ( 'delete_post' == $cap )
-				$cap = $post_type->cap->$cap;
-			break;
-		}
+			$post_type = get_post_type_object( $post->post_type );
+			if ( ! $post_type ) {
+				/* translators: 1: post type, 2: capability name */
+				_doing_it_wrong( __FUNCTION__, sprintf( __( 'The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.' ), $post->post_type, $cap ), '4.4.0' );
+				$caps[] = 'edit_others_posts';
+				break;
+			}
 
-		// If the post author is set and the user is the author...
-		if ( $post->post_author && $user_id == $post->post_author ) {
-			// If the post is published or scheduled...
-			if ( in_array( $post->post_status, array( 'publish', 'future' ), true ) ) {
-				$caps[] = $post_type->cap->delete_published_posts;
-			} elseif ( 'trash' == $post->post_status ) {
-				$status = get_post_meta( $post->ID, '_wp_trash_meta_status', true );
-				if ( in_array( $status, array( 'publish', 'future' ), true ) ) {
+			if ( ! $post_type->map_meta_cap ) {
+				$caps[] = $post_type->cap->$cap;
+				// Prior to 3.1 we would re-call map_meta_cap here.
+				if ( 'delete_post' == $cap )
+					$cap = $post_type->cap->$cap;
+				break;
+			}
+
+			// If the post author is set and the user is the author...
+			if ( $post->post_author && $user_id == $post->post_author ) {
+				// If the post is published or scheduled...
+				if ( in_array( $post->post_status, array( 'publish', 'future' ), true ) ) {
 					$caps[] = $post_type->cap->delete_published_posts;
+				} elseif ( 'trash' == $post->post_status ) {
+					$status = get_post_meta( $post->ID, '_wp_trash_meta_status', true );
+					if ( in_array( $status, array( 'publish', 'future' ), true ) ) {
+						$caps[] = $post_type->cap->delete_published_posts;
+					} else {
+						$caps[] = $post_type->cap->delete_posts;
+					}
 				} else {
+					// If the post is draft...
 					$caps[] = $post_type->cap->delete_posts;
 				}
 			} else {
-				// If the post is draft...
-				$caps[] = $post_type->cap->delete_posts;
-			}
-		} else {
-			// The user is trying to edit someone else's post.
-			$caps[] = $post_type->cap->delete_others_posts;
-			// The post is published or scheduled, extra cap required.
-			if ( in_array( $post->post_status, array( 'publish', 'future' ), true ) ) {
-				$caps[] = $post_type->cap->delete_published_posts;
-			} elseif ( 'private' == $post->post_status ) {
-				$caps[] = $post_type->cap->delete_private_posts;
+				// The user is trying to edit someone else's post.
+				$caps[] = $post_type->cap->delete_others_posts;
+				// The post is published or scheduled, extra cap required.
+				if ( in_array( $post->post_status, array( 'publish', 'future' ), true ) ) {
+					$caps[] = $post_type->cap->delete_published_posts;
+				} elseif ( 'private' == $post->post_status ) {
+					$caps[] = $post_type->cap->delete_private_posts;
+				}
 			}
-		}
-		break;
-		// edit_post breaks down to edit_posts, edit_published_posts, or
-		// edit_others_posts
-	case 'edit_post':
-	case 'edit_page':
-		$post = get_post( $args[0] );
-		if ( ! $post ) {
-			$caps[] = 'do_not_allow';
 			break;
-		}
-
-		if ( 'revision' == $post->post_type ) {
-			$post = get_post( $post->post_parent );
+			// edit_post breaks down to edit_posts, edit_published_posts, or
+			// edit_others_posts
+		case 'edit_post':
+		case 'edit_page':
+			$post = get_post( $args[0] );
 			if ( ! $post ) {
 				$caps[] = 'do_not_allow';
 				break;
 			}
-		}
 
-		$post_type = get_post_type_object( $post->post_type );
-		if ( ! $post_type ) {
-			/* translators: 1: post type, 2: capability name */
-			_doing_it_wrong( __FUNCTION__, sprintf( __( 'The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.' ), $post->post_type, $cap ), '4.4.0' );
-			$caps[] = 'edit_others_posts';
-			break;
-		}
+			if ( 'revision' == $post->post_type ) {
+				$post = get_post( $post->post_parent );
+				if ( ! $post ) {
+					$caps[] = 'do_not_allow';
+					break;
+				}
+			}
 
-		if ( ! $post_type->map_meta_cap ) {
-			$caps[] = $post_type->cap->$cap;
-			// Prior to 3.1 we would re-call map_meta_cap here.
-			if ( 'edit_post' == $cap )
-				$cap = $post_type->cap->$cap;
-			break;
-		}
+			$post_type = get_post_type_object( $post->post_type );
+			if ( ! $post_type ) {
+				/* translators: 1: post type, 2: capability name */
+				_doing_it_wrong( __FUNCTION__, sprintf( __( 'The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.' ), $post->post_type, $cap ), '4.4.0' );
+				$caps[] = 'edit_others_posts';
+				break;
+			}
 
-		// If the post author is set and the user is the author...
-		if ( $post->post_author && $user_id == $post->post_author ) {
-			// If the post is published or scheduled...
-			if ( in_array( $post->post_status, array( 'publish', 'future' ), true ) ) {
-				$caps[] = $post_type->cap->edit_published_posts;
-			} elseif ( 'trash' == $post->post_status ) {
-				$status = get_post_meta( $post->ID, '_wp_trash_meta_status', true );
-				if ( in_array( $status, array( 'publish', 'future' ), true ) ) {
+			if ( ! $post_type->map_meta_cap ) {
+				$caps[] = $post_type->cap->$cap;
+				// Prior to 3.1 we would re-call map_meta_cap here.
+				if ( 'edit_post' == $cap )
+					$cap = $post_type->cap->$cap;
+				break;
+			}
+
+			// If the post author is set and the user is the author...
+			if ( $post->post_author && $user_id == $post->post_author ) {
+				// If the post is published or scheduled...
+				if ( in_array( $post->post_status, array( 'publish', 'future' ), true ) ) {
 					$caps[] = $post_type->cap->edit_published_posts;
+				} elseif ( 'trash' == $post->post_status ) {
+					$status = get_post_meta( $post->ID, '_wp_trash_meta_status', true );
+					if ( in_array( $status, array( 'publish', 'future' ), true ) ) {
+						$caps[] = $post_type->cap->edit_published_posts;
+					} else {
+						$caps[] = $post_type->cap->edit_posts;
+					}
 				} else {
+					// If the post is draft...
 					$caps[] = $post_type->cap->edit_posts;
 				}
 			} else {
-				// If the post is draft...
-				$caps[] = $post_type->cap->edit_posts;
-			}
-		} else {
-			// The user is trying to edit someone else's post.
-			$caps[] = $post_type->cap->edit_others_posts;
-			// The post is published or scheduled, extra cap required.
-			if ( in_array( $post->post_status, array( 'publish', 'future' ), true ) ) {
-				$caps[] = $post_type->cap->edit_published_posts;
-			} elseif ( 'private' == $post->post_status ) {
-				$caps[] = $post_type->cap->edit_private_posts;
+				// The user is trying to edit someone else's post.
+				$caps[] = $post_type->cap->edit_others_posts;
+				// The post is published or scheduled, extra cap required.
+				if ( in_array( $post->post_status, array( 'publish', 'future' ), true ) ) {
+					$caps[] = $post_type->cap->edit_published_posts;
+				} elseif ( 'private' == $post->post_status ) {
+					$caps[] = $post_type->cap->edit_private_posts;
+				}
 			}
-		}
-		break;
-	case 'read_post':
-	case 'read_page':
-		$post = get_post( $args[0] );
-		if ( ! $post ) {
-			$caps[] = 'do_not_allow';
 			break;
-		}
-
-		if ( 'revision' == $post->post_type ) {
-			$post = get_post( $post->post_parent );
+		case 'read_post':
+		case 'read_page':
+			$post = get_post( $args[0] );
 			if ( ! $post ) {
 				$caps[] = 'do_not_allow';
 				break;
 			}
-		}
 
-		$post_type = get_post_type_object( $post->post_type );
-		if ( ! $post_type ) {
-			/* translators: 1: post type, 2: capability name */
-			_doing_it_wrong( __FUNCTION__, sprintf( __( 'The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.' ), $post->post_type, $cap ), '4.4.0' );
-			$caps[] = 'edit_others_posts';
-			break;
-		}
+			if ( 'revision' == $post->post_type ) {
+				$post = get_post( $post->post_parent );
+				if ( ! $post ) {
+					$caps[] = 'do_not_allow';
+					break;
+				}
+			}
 
-		if ( ! $post_type->map_meta_cap ) {
-			$caps[] = $post_type->cap->$cap;
-			// Prior to 3.1 we would re-call map_meta_cap here.
-			if ( 'read_post' == $cap )
-				$cap = $post_type->cap->$cap;
-			break;
-		}
+			$post_type = get_post_type_object( $post->post_type );
+			if ( ! $post_type ) {
+				/* translators: 1: post type, 2: capability name */
+				_doing_it_wrong( __FUNCTION__, sprintf( __( 'The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.' ), $post->post_type, $cap ), '4.4.0' );
+				$caps[] = 'edit_others_posts';
+				break;
+			}
 
-		$status_obj = get_post_status_object( $post->post_status );
-		if ( $status_obj->public ) {
-			$caps[] = $post_type->cap->read;
-			break;
-		}
+			if ( ! $post_type->map_meta_cap ) {
+				$caps[] = $post_type->cap->$cap;
+				// Prior to 3.1 we would re-call map_meta_cap here.
+				if ( 'read_post' == $cap )
+					$cap = $post_type->cap->$cap;
+				break;
+			}
 
-		if ( $post->post_author && $user_id == $post->post_author ) {
-			$caps[] = $post_type->cap->read;
-		} elseif ( $status_obj->private ) {
-			$caps[] = $post_type->cap->read_private_posts;
-		} else {
-			$caps = map_meta_cap( 'edit_post', $user_id, $post->ID );
-		}
-		break;
-	case 'publish_post':
-		$post = get_post( $args[0] );
-		if ( ! $post ) {
-			$caps[] = 'do_not_allow';
-			break;
-		}
+			$status_obj = get_post_status_object( $post->post_status );
+			if ( $status_obj->public ) {
+				$caps[] = $post_type->cap->read;
+				break;
+			}
 
-		$post_type = get_post_type_object( $post->post_type );
-		if ( ! $post_type ) {
-			/* translators: 1: post type, 2: capability name */
-			_doing_it_wrong( __FUNCTION__, sprintf( __( 'The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.' ), $post->post_type, $cap ), '4.4.0' );
-			$caps[] = 'edit_others_posts';
+			if ( $post->post_author && $user_id == $post->post_author ) {
+				$caps[] = $post_type->cap->read;
+			} elseif ( $status_obj->private ) {
+				$caps[] = $post_type->cap->read_private_posts;
+			} else {
+				$caps = map_meta_cap( 'edit_post', $user_id, $post->ID );
+			}
 			break;
-		}
+		case 'publish_post':
+			$post = get_post( $args[0] );
+			if ( ! $post ) {
+				$caps[] = 'do_not_allow';
+				break;
+			}
 
-		$caps[] = $post_type->cap->publish_posts;
-		break;
-	case 'edit_post_meta':
-	case 'delete_post_meta':
-	case 'add_post_meta':
-	case 'edit_comment_meta':
-	case 'delete_comment_meta':
-	case 'add_comment_meta':
-	case 'edit_term_meta':
-	case 'delete_term_meta':
-	case 'add_term_meta':
-	case 'edit_user_meta':
-	case 'delete_user_meta':
-	case 'add_user_meta':
-		list( $_, $object_type, $_ ) = explode( '_', $cap );
-		$object_id = (int) $args[0];
-
-		switch ( $object_type ) {
+			$post_type = get_post_type_object( $post->post_type );
+			if ( ! $post_type ) {
+				/* translators: 1: post type, 2: capability name */
+				_doing_it_wrong( __FUNCTION__, sprintf( __( 'The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.' ), $post->post_type, $cap ), '4.4.0' );
+				$caps[] = 'edit_others_posts';
+				break;
+			}
+
+			$caps[] = $post_type->cap->publish_posts;
+			break;
+		case 'edit_post_meta':
+		case 'delete_post_meta':
+		case 'add_post_meta':
+		case 'edit_comment_meta':
+		case 'delete_comment_meta':
+		case 'add_comment_meta':
+		case 'edit_term_meta':
+		case 'delete_term_meta':
+		case 'add_term_meta':
+		case 'edit_user_meta':
+		case 'delete_user_meta':
+		case 'add_user_meta':
+			list( $_, $object_type, $_ ) = explode( '_', $cap );
+			$object_id = (int) $args[0];
+
+			switch ( $object_type ) {
 			case 'post':
 				$post = get_post( $object_id );
 				if ( ! $post ) {
@@ -295,7 +295,7 @@ 
 
 				$sub_type = 'user';
 				break;
-		}
+			}
 
 		if ( empty( $sub_type ) ) {
 			$caps[] = 'do_not_allow';
@@ -321,175 +321,175 @@ 
 			$caps[] = $cap;
 		}
 		break;
-	case 'edit_comment':
-		$comment = get_comment( $args[0] );
-		if ( ! $comment ) {
-			$caps[] = 'do_not_allow';
-			break;
-		}
+		case 'edit_comment':
+			$comment = get_comment( $args[0] );
+			if ( ! $comment ) {
+				$caps[] = 'do_not_allow';
+				break;
+			}
 
-		$post = get_post( $comment->comment_post_ID );
+			$post = get_post( $comment->comment_post_ID );
 
-		/*
+			/*
 		 * If the post doesn't exist, we have an orphaned comment.
 		 * Fall back to the edit_posts capability, instead.
 		 */
-		if ( $post ) {
-			$caps = map_meta_cap( 'edit_post', $user_id, $post->ID );
-		} else {
-			$caps = map_meta_cap( 'edit_posts', $user_id );
-		}
-		break;
-	case 'unfiltered_upload':
-		if ( defined('ALLOW_UNFILTERED_UPLOADS') && ALLOW_UNFILTERED_UPLOADS && ( !is_multisite() || is_super_admin( $user_id ) )  )
-			$caps[] = $cap;
-		else
-			$caps[] = 'do_not_allow';
-		break;
-	case 'edit_css' :
-	case 'unfiltered_html' :
-		// Disallow unfiltered_html for all users, even admins and super admins.
-		if ( defined( 'DISALLOW_UNFILTERED_HTML' ) && DISALLOW_UNFILTERED_HTML )
-			$caps[] = 'do_not_allow';
-		elseif ( is_multisite() && ! is_super_admin( $user_id ) )
-			$caps[] = 'do_not_allow';
-		else
-			$caps[] = 'unfiltered_html';
-		break;
-	case 'edit_files':
-	case 'edit_plugins':
-	case 'edit_themes':
-		// Disallow the file editors.
-		if ( defined( 'DISALLOW_FILE_EDIT' ) && DISALLOW_FILE_EDIT )
-			$caps[] = 'do_not_allow';
-		elseif ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS )
-			$caps[] = 'do_not_allow';
-		elseif ( is_multisite() && ! is_super_admin( $user_id ) )
-			$caps[] = 'do_not_allow';
-		else
-			$caps[] = $cap;
-		break;
-	case 'update_plugins':
-	case 'delete_plugins':
-	case 'install_plugins':
-	case 'upload_plugins':
-	case 'update_themes':
-	case 'delete_themes':
-	case 'install_themes':
-	case 'upload_themes':
-	case 'update_core':
-		// Disallow anything that creates, deletes, or updates core, plugin, or theme files.
-		// Files in uploads are excepted.
-		if ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS ) {
-			$caps[] = 'do_not_allow';
-		} elseif ( is_multisite() && ! is_super_admin( $user_id ) ) {
-			$caps[] = 'do_not_allow';
-		} elseif ( 'upload_themes' === $cap ) {
-			$caps[] = 'install_themes';
-		} elseif ( 'upload_plugins' === $cap ) {
-			$caps[] = 'install_plugins';
-		} else {
-			$caps[] = $cap;
-		}
-		break;
-	case 'activate_plugins':
-		$caps[] = $cap;
-		if ( is_multisite() ) {
-			// update_, install_, and delete_ are handled above with is_super_admin().
-			$menu_perms = get_site_option( 'menu_items', array() );
-			if ( empty( $menu_perms['plugins'] ) )
-				$caps[] = 'manage_network_plugins';
-		}
-		break;
-	case 'delete_user':
-	case 'delete_users':
-		// If multisite only super admins can delete users.
-		if ( is_multisite() && ! is_super_admin( $user_id ) )
-			$caps[] = 'do_not_allow';
-		else
-			$caps[] = 'delete_users'; // delete_user maps to delete_users.
-		break;
-	case 'create_users':
-		if ( !is_multisite() )
-			$caps[] = $cap;
-		elseif ( is_super_admin( $user_id ) || get_site_option( 'add_new_users' ) )
-			$caps[] = $cap;
-		else
-			$caps[] = 'do_not_allow';
-		break;
-	case 'manage_links' :
-		if ( get_option( 'link_manager_enabled' ) )
+			if ( $post ) {
+				$caps = map_meta_cap( 'edit_post', $user_id, $post->ID );
+			} else {
+				$caps = map_meta_cap( 'edit_posts', $user_id );
+			}
+			break;
+		case 'unfiltered_upload':
+			if ( defined('ALLOW_UNFILTERED_UPLOADS') && ALLOW_UNFILTERED_UPLOADS && ( !is_multisite() || is_super_admin( $user_id ) )  )
+				$caps[] = $cap;
+			else
+				$caps[] = 'do_not_allow';
+			break;
+		case 'edit_css' :
+		case 'unfiltered_html' :
+			// Disallow unfiltered_html for all users, even admins and super admins.
+			if ( defined( 'DISALLOW_UNFILTERED_HTML' ) && DISALLOW_UNFILTERED_HTML )
+				$caps[] = 'do_not_allow';
+			elseif ( is_multisite() && ! is_super_admin( $user_id ) )
+				$caps[] = 'do_not_allow';
+			else
+				$caps[] = 'unfiltered_html';
+			break;
+		case 'edit_files':
+		case 'edit_plugins':
+		case 'edit_themes':
+			// Disallow the file editors.
+			if ( defined( 'DISALLOW_FILE_EDIT' ) && DISALLOW_FILE_EDIT )
+				$caps[] = 'do_not_allow';
+			elseif ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS )
+				$caps[] = 'do_not_allow';
+			elseif ( is_multisite() && ! is_super_admin( $user_id ) )
+				$caps[] = 'do_not_allow';
+			else
+				$caps[] = $cap;
+			break;
+		case 'update_plugins':
+		case 'delete_plugins':
+		case 'install_plugins':
+		case 'upload_plugins':
+		case 'update_themes':
+		case 'delete_themes':
+		case 'install_themes':
+		case 'upload_themes':
+		case 'update_core':
+			// Disallow anything that creates, deletes, or updates core, plugin, or theme files.
+			// Files in uploads are excepted.
+			if ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS ) {
+				$caps[] = 'do_not_allow';
+			} elseif ( is_multisite() && ! is_super_admin( $user_id ) ) {
+				$caps[] = 'do_not_allow';
+			} elseif ( 'upload_themes' === $cap ) {
+				$caps[] = 'install_themes';
+			} elseif ( 'upload_plugins' === $cap ) {
+				$caps[] = 'install_plugins';
+			} else {
+				$caps[] = $cap;
+			}
+			break;
+		case 'activate_plugins':
 			$caps[] = $cap;
-		else
-			$caps[] = 'do_not_allow';
-		break;
-	case 'customize' :
-		$caps[] = 'edit_theme_options';
-		break;
-	case 'delete_site':
-		if ( is_multisite() ) {
-			$caps[] = 'manage_options';
-		} else {
-			$caps[] = 'do_not_allow';
-		}
-		break;
-	case 'edit_term':
-	case 'delete_term':
-	case 'assign_term':
-		$term_id = (int) $args[0];
-		$term = get_term( $term_id );
-		if ( ! $term || is_wp_error( $term ) ) {
-			$caps[] = 'do_not_allow';
+			if ( is_multisite() ) {
+				// update_, install_, and delete_ are handled above with is_super_admin().
+				$menu_perms = get_site_option( 'menu_items', array() );
+				if ( empty( $menu_perms['plugins'] ) )
+					$caps[] = 'manage_network_plugins';
+			}
 			break;
-		}
-
-		$tax = get_taxonomy( $term->taxonomy );
-		if ( ! $tax ) {
-			$caps[] = 'do_not_allow';
+		case 'delete_user':
+		case 'delete_users':
+			// If multisite only super admins can delete users.
+			if ( is_multisite() && ! is_super_admin( $user_id ) )
+				$caps[] = 'do_not_allow';
+			else
+				$caps[] = 'delete_users'; // delete_user maps to delete_users.
 			break;
-		}
-
-		if ( 'delete_term' === $cap && ( $term->term_id == get_option( 'default_' . $term->taxonomy ) ) ) {
-			$caps[] = 'do_not_allow';
+		case 'create_users':
+			if ( !is_multisite() )
+				$caps[] = $cap;
+			elseif ( is_super_admin( $user_id ) || get_site_option( 'add_new_users' ) )
+				$caps[] = $cap;
+			else
+				$caps[] = 'do_not_allow';
 			break;
-		}
+		case 'manage_links' :
+			if ( get_option( 'link_manager_enabled' ) )
+				$caps[] = $cap;
+			else
+				$caps[] = 'do_not_allow';
+			break;
+		case 'customize' :
+			$caps[] = 'edit_theme_options';
+			break;
+		case 'delete_site':
+			if ( is_multisite() ) {
+				$caps[] = 'manage_options';
+			} else {
+				$caps[] = 'do_not_allow';
+			}
+			break;
+		case 'edit_term':
+		case 'delete_term':
+		case 'assign_term':
+			$term_id = (int) $args[0];
+			$term = get_term( $term_id );
+			if ( ! $term || is_wp_error( $term ) ) {
+				$caps[] = 'do_not_allow';
+				break;
+			}
 
-		$taxo_cap = $cap . 's';
+			$tax = get_taxonomy( $term->taxonomy );
+			if ( ! $tax ) {
+				$caps[] = 'do_not_allow';
+				break;
+			}
 
-		$caps = map_meta_cap( $tax->cap->$taxo_cap, $user_id, $term_id );
+			if ( 'delete_term' === $cap && ( $term->term_id == get_option( 'default_' . $term->taxonomy ) ) ) {
+				$caps[] = 'do_not_allow';
+				break;
+			}
 
-		break;
-	case 'manage_post_tags':
-	case 'edit_categories':
-	case 'edit_post_tags':
-	case 'delete_categories':
-	case 'delete_post_tags':
-		$caps[] = 'manage_categories';
-		break;
-	case 'assign_categories':
-	case 'assign_post_tags':
-		$caps[] = 'edit_posts';
-		break;
-	case 'create_sites':
-	case 'delete_sites':
-	case 'manage_network':
-	case 'manage_sites':
-	case 'manage_network_users':
-	case 'manage_network_plugins':
-	case 'manage_network_themes':
-	case 'manage_network_options':
-		$caps[] = $cap;
-		break;
-	default:
-		// Handle meta capabilities for custom post types.
-		global $post_type_meta_caps;
-		if ( isset( $post_type_meta_caps[ $cap ] ) ) {
-			$args = array_merge( array( $post_type_meta_caps[ $cap ], $user_id ), $args );
-			return call_user_func_array( 'map_meta_cap', $args );
-		}
+			$taxo_cap = $cap . 's';
+
+			$caps = map_meta_cap( $tax->cap->$taxo_cap, $user_id, $term_id );
+
+			break;
+		case 'manage_post_tags':
+		case 'edit_categories':
+		case 'edit_post_tags':
+		case 'delete_categories':
+		case 'delete_post_tags':
+			$caps[] = 'manage_categories';
+			break;
+		case 'assign_categories':
+		case 'assign_post_tags':
+			$caps[] = 'edit_posts';
+			break;
+		case 'create_sites':
+		case 'delete_sites':
+		case 'manage_network':
+		case 'manage_sites':
+		case 'manage_network_users':
+		case 'manage_network_plugins':
+		case 'manage_network_themes':
+		case 'manage_network_options':
+			$caps[] = $cap;
+			break;
+		default:
+			// Handle meta capabilities for custom post types.
+			global $post_type_meta_caps;
+			if ( isset( $post_type_meta_caps[ $cap ] ) ) {
+				$args = array_merge( array( $post_type_meta_caps[ $cap ], $user_id ), $args );
+				return call_user_func_array( 'map_meta_cap', $args );
+			}
 
-		// If no meta caps match, return the original cap.
-		$caps[] = $cap;
+			// If no meta caps match, return the original cap.
+			$caps[] = $cap;
 	}
 
 	/**

Spacing +179 added lines, -179 removed lines

@@ -26,14 +26,14 @@ 
  *                          'edit_others_posts', etc. The parameter is accessed via func_get_args().
  * @return array Actual capabilities for meta capability.
  */
-function map_meta_cap( $cap, $user_id ) {
-	$args = array_slice( func_get_args(), 2 );
+function map_meta_cap($cap, $user_id) {
+	$args = array_slice(func_get_args(), 2);
 	$caps = array();
 
-	switch ( $cap ) {
+	switch ($cap) {
 	case 'remove_user':
 		// In multisite the user must be a super admin to remove themselves.
-		if ( isset( $args[0] ) && $user_id == $args[0] && ! is_super_admin( $user_id ) ) {
+		if (isset($args[0]) && $user_id == $args[0] && ! is_super_admin($user_id)) {
 			$caps[] = 'do_not_allow';
 		} else {
 			$caps[] = 'remove_users';
@@ -46,11 +46,11 @@ 
 	case 'edit_user':
 	case 'edit_users':
 		// Allow user to edit itself
-		if ( 'edit_user' == $cap && isset( $args[0] ) && $user_id == $args[0] )
+		if ('edit_user' == $cap && isset($args[0]) && $user_id == $args[0])
 			break;
 
 		// In multisite the user must have manage_network_users caps. If editing a super admin, the user must be a super admin.
-		if ( is_multisite() && ( ( ! is_super_admin( $user_id ) && 'edit_user' === $cap && is_super_admin( $args[0] ) ) || ! user_can( $user_id, 'manage_network_users' ) ) ) {
+		if (is_multisite() && (( ! is_super_admin($user_id) && 'edit_user' === $cap && is_super_admin($args[0])) || ! user_can($user_id, 'manage_network_users'))) {
 			$caps[] = 'do_not_allow';
 		} else {
 			$caps[] = 'edit_users'; // edit_user maps to edit_users.
@@ -58,49 +58,49 @@ 
 		break;
 	case 'delete_post':
 	case 'delete_page':
-		$post = get_post( $args[0] );
-		if ( ! $post ) {
+		$post = get_post($args[0]);
+		if ( ! $post) {
 			$caps[] = 'do_not_allow';
 			break;
 		}
 
-		if ( 'revision' == $post->post_type ) {
-			$post = get_post( $post->post_parent );
-			if ( ! $post ) {
+		if ('revision' == $post->post_type) {
+			$post = get_post($post->post_parent);
+			if ( ! $post) {
 				$caps[] = 'do_not_allow';
 				break;
 			}
 		}
 
-		if ( ( get_option( 'page_for_posts' ) == $post->ID ) || ( get_option( 'page_on_front' ) == $post->ID ) ) {
+		if ((get_option('page_for_posts') == $post->ID) || (get_option('page_on_front') == $post->ID)) {
 			$caps[] = 'manage_options';
 			break;
 		}
 
-		$post_type = get_post_type_object( $post->post_type );
-		if ( ! $post_type ) {
+		$post_type = get_post_type_object($post->post_type);
+		if ( ! $post_type) {
 			/* translators: 1: post type, 2: capability name */
-			_doing_it_wrong( __FUNCTION__, sprintf( __( 'The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.' ), $post->post_type, $cap ), '4.4.0' );
+			_doing_it_wrong(__FUNCTION__, sprintf(__('The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.'), $post->post_type, $cap), '4.4.0');
 			$caps[] = 'edit_others_posts';
 			break;
 		}
 
-		if ( ! $post_type->map_meta_cap ) {
+		if ( ! $post_type->map_meta_cap) {
 			$caps[] = $post_type->cap->$cap;
 			// Prior to 3.1 we would re-call map_meta_cap here.
-			if ( 'delete_post' == $cap )
+			if ('delete_post' == $cap)
 				$cap = $post_type->cap->$cap;
 			break;
 		}
 
 		// If the post author is set and the user is the author...
-		if ( $post->post_author && $user_id == $post->post_author ) {
+		if ($post->post_author && $user_id == $post->post_author) {
 			// If the post is published or scheduled...
-			if ( in_array( $post->post_status, array( 'publish', 'future' ), true ) ) {
+			if (in_array($post->post_status, array('publish', 'future'), true)) {
 				$caps[] = $post_type->cap->delete_published_posts;
-			} elseif ( 'trash' == $post->post_status ) {
-				$status = get_post_meta( $post->ID, '_wp_trash_meta_status', true );
-				if ( in_array( $status, array( 'publish', 'future' ), true ) ) {
+			} elseif ('trash' == $post->post_status) {
+				$status = get_post_meta($post->ID, '_wp_trash_meta_status', true);
+				if (in_array($status, array('publish', 'future'), true)) {
 					$caps[] = $post_type->cap->delete_published_posts;
 				} else {
 					$caps[] = $post_type->cap->delete_posts;
@@ -113,9 +113,9 @@ 
 			// The user is trying to edit someone else's post.
 			$caps[] = $post_type->cap->delete_others_posts;
 			// The post is published or scheduled, extra cap required.
-			if ( in_array( $post->post_status, array( 'publish', 'future' ), true ) ) {
+			if (in_array($post->post_status, array('publish', 'future'), true)) {
 				$caps[] = $post_type->cap->delete_published_posts;
-			} elseif ( 'private' == $post->post_status ) {
+			} elseif ('private' == $post->post_status) {
 				$caps[] = $post_type->cap->delete_private_posts;
 			}
 		}
@@ -124,44 +124,44 @@ 
 		// edit_others_posts
 	case 'edit_post':
 	case 'edit_page':
-		$post = get_post( $args[0] );
-		if ( ! $post ) {
+		$post = get_post($args[0]);
+		if ( ! $post) {
 			$caps[] = 'do_not_allow';
 			break;
 		}
 
-		if ( 'revision' == $post->post_type ) {
-			$post = get_post( $post->post_parent );
-			if ( ! $post ) {
+		if ('revision' == $post->post_type) {
+			$post = get_post($post->post_parent);
+			if ( ! $post) {
 				$caps[] = 'do_not_allow';
 				break;
 			}
 		}
 
-		$post_type = get_post_type_object( $post->post_type );
-		if ( ! $post_type ) {
+		$post_type = get_post_type_object($post->post_type);
+		if ( ! $post_type) {
 			/* translators: 1: post type, 2: capability name */
-			_doing_it_wrong( __FUNCTION__, sprintf( __( 'The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.' ), $post->post_type, $cap ), '4.4.0' );
+			_doing_it_wrong(__FUNCTION__, sprintf(__('The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.'), $post->post_type, $cap), '4.4.0');
 			$caps[] = 'edit_others_posts';
 			break;
 		}
 
-		if ( ! $post_type->map_meta_cap ) {
+		if ( ! $post_type->map_meta_cap) {
 			$caps[] = $post_type->cap->$cap;
 			// Prior to 3.1 we would re-call map_meta_cap here.
-			if ( 'edit_post' == $cap )
+			if ('edit_post' == $cap)
 				$cap = $post_type->cap->$cap;
 			break;
 		}
 
 		// If the post author is set and the user is the author...
-		if ( $post->post_author && $user_id == $post->post_author ) {
+		if ($post->post_author && $user_id == $post->post_author) {
 			// If the post is published or scheduled...
-			if ( in_array( $post->post_status, array( 'publish', 'future' ), true ) ) {
+			if (in_array($post->post_status, array('publish', 'future'), true)) {
 				$caps[] = $post_type->cap->edit_published_posts;
-			} elseif ( 'trash' == $post->post_status ) {
-				$status = get_post_meta( $post->ID, '_wp_trash_meta_status', true );
-				if ( in_array( $status, array( 'publish', 'future' ), true ) ) {
+			} elseif ('trash' == $post->post_status) {
+				$status = get_post_meta($post->ID, '_wp_trash_meta_status', true);
+				if (in_array($status, array('publish', 'future'), true)) {
 					$caps[] = $post_type->cap->edit_published_posts;
 				} else {
 					$caps[] = $post_type->cap->edit_posts;
@@ -174,70 +174,70 @@ 
 			// The user is trying to edit someone else's post.
 			$caps[] = $post_type->cap->edit_others_posts;
 			// The post is published or scheduled, extra cap required.
-			if ( in_array( $post->post_status, array( 'publish', 'future' ), true ) ) {
+			if (in_array($post->post_status, array('publish', 'future'), true)) {
 				$caps[] = $post_type->cap->edit_published_posts;
-			} elseif ( 'private' == $post->post_status ) {
+			} elseif ('private' == $post->post_status) {
 				$caps[] = $post_type->cap->edit_private_posts;
 			}
 		}
 		break;
 	case 'read_post':
 	case 'read_page':
-		$post = get_post( $args[0] );
-		if ( ! $post ) {
+		$post = get_post($args[0]);
+		if ( ! $post) {
 			$caps[] = 'do_not_allow';
 			break;
 		}
 
-		if ( 'revision' == $post->post_type ) {
-			$post = get_post( $post->post_parent );
-			if ( ! $post ) {
+		if ('revision' == $post->post_type) {
+			$post = get_post($post->post_parent);
+			if ( ! $post) {
 				$caps[] = 'do_not_allow';
 				break;
 			}
 		}
 
-		$post_type = get_post_type_object( $post->post_type );
-		if ( ! $post_type ) {
+		$post_type = get_post_type_object($post->post_type);
+		if ( ! $post_type) {
 			/* translators: 1: post type, 2: capability name */
-			_doing_it_wrong( __FUNCTION__, sprintf( __( 'The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.' ), $post->post_type, $cap ), '4.4.0' );
+			_doing_it_wrong(__FUNCTION__, sprintf(__('The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.'), $post->post_type, $cap), '4.4.0');
 			$caps[] = 'edit_others_posts';
 			break;
 		}
 
-		if ( ! $post_type->map_meta_cap ) {
+		if ( ! $post_type->map_meta_cap) {
 			$caps[] = $post_type->cap->$cap;
 			// Prior to 3.1 we would re-call map_meta_cap here.
-			if ( 'read_post' == $cap )
+			if ('read_post' == $cap)
 				$cap = $post_type->cap->$cap;
 			break;
 		}
 
-		$status_obj = get_post_status_object( $post->post_status );
-		if ( $status_obj->public ) {
+		$status_obj = get_post_status_object($post->post_status);
+		if ($status_obj->public) {
 			$caps[] = $post_type->cap->read;
 			break;
 		}
 
-		if ( $post->post_author && $user_id == $post->post_author ) {
+		if ($post->post_author && $user_id == $post->post_author) {
 			$caps[] = $post_type->cap->read;
-		} elseif ( $status_obj->private ) {
+		} elseif ($status_obj->private) {
 			$caps[] = $post_type->cap->read_private_posts;
 		} else {
-			$caps = map_meta_cap( 'edit_post', $user_id, $post->ID );
+			$caps = map_meta_cap('edit_post', $user_id, $post->ID);
 		}
 		break;
 	case 'publish_post':
-		$post = get_post( $args[0] );
-		if ( ! $post ) {
+		$post = get_post($args[0]);
+		if ( ! $post) {
 			$caps[] = 'do_not_allow';
 			break;
 		}
 
-		$post_type = get_post_type_object( $post->post_type );
-		if ( ! $post_type ) {
+		$post_type = get_post_type_object($post->post_type);
+		if ( ! $post_type) {
 			/* translators: 1: post type, 2: capability name */
-			_doing_it_wrong( __FUNCTION__, sprintf( __( 'The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.' ), $post->post_type, $cap ), '4.4.0' );
+			_doing_it_wrong(__FUNCTION__, sprintf(__('The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.'), $post->post_type, $cap), '4.4.0');
 			$caps[] = 'edit_others_posts';
 			break;
 		}
@@ -256,31 +256,31 @@ 
 	case 'edit_user_meta':
 	case 'delete_user_meta':
 	case 'add_user_meta':
-		list( $_, $object_type, $_ ) = explode( '_', $cap );
+		list($_, $object_type, $_) = explode('_', $cap);
 		$object_id = (int) $args[0];
 
-		switch ( $object_type ) {
+		switch ($object_type) {
 			case 'post':
-				$post = get_post( $object_id );
-				if ( ! $post ) {
+				$post = get_post($object_id);
+				if ( ! $post) {
 					break;
 				}
 
-				$sub_type = get_post_type( $post );
+				$sub_type = get_post_type($post);
 				break;
 
 			case 'comment':
-				$comment = get_comment( $object_id );
-				if ( ! $comment ) {
+				$comment = get_comment($object_id);
+				if ( ! $comment) {
 					break;
 				}
 
-				$sub_type = empty( $comment->comment_type ) ? 'comment' : $comment->comment_type;
+				$sub_type = empty($comment->comment_type) ? 'comment' : $comment->comment_type;
 				break;
 
 			case 'term':
-				$term = get_term( $object_id );
-				if ( ! $term ) {
+				$term = get_term($object_id);
+				if ( ! $term) {
 					break;
 				}
 
@@ -288,8 +288,8 @@ 
 				break;
 
 			case 'user':
-				$user = get_user_by( 'id', $object_id );
-				if ( ! $user ) {
+				$user = get_user_by('id', $object_id);
+				if ( ! $user) {
 					break;
 				}
 
@@ -297,51 +297,51 @@ 
 				break;
 		}
 
-		if ( empty( $sub_type ) ) {
+		if (empty($sub_type)) {
 			$caps[] = 'do_not_allow';
 			break;
 		}
 
-		$caps = map_meta_cap( "edit_{$object_type}", $user_id, $object_id );
+		$caps = map_meta_cap("edit_{$object_type}", $user_id, $object_id);
 
-		$meta_key = isset( $args[1] ) ? $args[1] : false;
+		$meta_key = isset($args[1]) ? $args[1] : false;
 
-		$has_filter = has_filter( "auth_{$object_type}_meta_{$meta_key}" ) || has_filter( "auth_{$object_type}_{$sub_type}_meta_{$meta_key}" );
-		if ( $meta_key && $has_filter ) {
+		$has_filter = has_filter("auth_{$object_type}_meta_{$meta_key}") || has_filter("auth_{$object_type}_{$sub_type}_meta_{$meta_key}");
+		if ($meta_key && $has_filter) {
 			/** This filter is documented in wp-includes/meta.php */
-			$allowed = apply_filters( "auth_{$object_type}_meta_{$meta_key}", false, $meta_key, $object_id, $user_id, $cap, $caps );
+			$allowed = apply_filters("auth_{$object_type}_meta_{$meta_key}", false, $meta_key, $object_id, $user_id, $cap, $caps);
 
 			/** This filter is documented in wp-includes/meta.php */
-			$allowed = apply_filters( "auth_{$object_type}_{$sub_type}_meta_{$meta_key}", $allowed, $meta_key, $object_id, $user_id, $cap, $caps );
+			$allowed = apply_filters("auth_{$object_type}_{$sub_type}_meta_{$meta_key}", $allowed, $meta_key, $object_id, $user_id, $cap, $caps);
 
-			if ( ! $allowed ) {
+			if ( ! $allowed) {
 				$caps[] = $cap;
 			}
-		} elseif ( $meta_key && is_protected_meta( $meta_key, $object_type ) ) {
+		} elseif ($meta_key && is_protected_meta($meta_key, $object_type)) {
 			$caps[] = $cap;
 		}
 		break;
 	case 'edit_comment':
-		$comment = get_comment( $args[0] );
-		if ( ! $comment ) {
+		$comment = get_comment($args[0]);
+		if ( ! $comment) {
 			$caps[] = 'do_not_allow';
 			break;
 		}
 
-		$post = get_post( $comment->comment_post_ID );
+		$post = get_post($comment->comment_post_ID);
 
 		/*
 		 * If the post doesn't exist, we have an orphaned comment.
 		 * Fall back to the edit_posts capability, instead.
 		 */
-		if ( $post ) {
-			$caps = map_meta_cap( 'edit_post', $user_id, $post->ID );
+		if ($post) {
+			$caps = map_meta_cap('edit_post', $user_id, $post->ID);
 		} else {
-			$caps = map_meta_cap( 'edit_posts', $user_id );
+			$caps = map_meta_cap('edit_posts', $user_id);
 		}
 		break;
 	case 'unfiltered_upload':
-		if ( defined('ALLOW_UNFILTERED_UPLOADS') && ALLOW_UNFILTERED_UPLOADS && ( !is_multisite() || is_super_admin( $user_id ) )  )
+		if (defined('ALLOW_UNFILTERED_UPLOADS') && ALLOW_UNFILTERED_UPLOADS && ( ! is_multisite() || is_super_admin($user_id)))
 			$caps[] = $cap;
 		else
 			$caps[] = 'do_not_allow';
@@ -349,9 +349,9 @@ 
 	case 'edit_css' :
 	case 'unfiltered_html' :
 		// Disallow unfiltered_html for all users, even admins and super admins.
-		if ( defined( 'DISALLOW_UNFILTERED_HTML' ) && DISALLOW_UNFILTERED_HTML )
+		if (defined('DISALLOW_UNFILTERED_HTML') && DISALLOW_UNFILTERED_HTML)
 			$caps[] = 'do_not_allow';
-		elseif ( is_multisite() && ! is_super_admin( $user_id ) )
+		elseif (is_multisite() && ! is_super_admin($user_id))
 			$caps[] = 'do_not_allow';
 		else
 			$caps[] = 'unfiltered_html';
@@ -360,11 +360,11 @@ 
 	case 'edit_plugins':
 	case 'edit_themes':
 		// Disallow the file editors.
-		if ( defined( 'DISALLOW_FILE_EDIT' ) && DISALLOW_FILE_EDIT )
+		if (defined('DISALLOW_FILE_EDIT') && DISALLOW_FILE_EDIT)
 			$caps[] = 'do_not_allow';
-		elseif ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS )
+		elseif (defined('DISALLOW_FILE_MODS') && DISALLOW_FILE_MODS)
 			$caps[] = 'do_not_allow';
-		elseif ( is_multisite() && ! is_super_admin( $user_id ) )
+		elseif (is_multisite() && ! is_super_admin($user_id))
 			$caps[] = 'do_not_allow';
 		else
 			$caps[] = $cap;
@@ -380,13 +380,13 @@ 
 	case 'update_core':
 		// Disallow anything that creates, deletes, or updates core, plugin, or theme files.
 		// Files in uploads are excepted.
-		if ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS ) {
+		if (defined('DISALLOW_FILE_MODS') && DISALLOW_FILE_MODS) {
 			$caps[] = 'do_not_allow';
-		} elseif ( is_multisite() && ! is_super_admin( $user_id ) ) {
+		} elseif (is_multisite() && ! is_super_admin($user_id)) {
 			$caps[] = 'do_not_allow';
-		} elseif ( 'upload_themes' === $cap ) {
+		} elseif ('upload_themes' === $cap) {
 			$caps[] = 'install_themes';
-		} elseif ( 'upload_plugins' === $cap ) {
+		} elseif ('upload_plugins' === $cap) {
 			$caps[] = 'install_plugins';
 		} else {
 			$caps[] = $cap;
@@ -394,31 +394,31 @@ 
 		break;
 	case 'activate_plugins':
 		$caps[] = $cap;
-		if ( is_multisite() ) {
+		if (is_multisite()) {
 			// update_, install_, and delete_ are handled above with is_super_admin().
-			$menu_perms = get_site_option( 'menu_items', array() );
-			if ( empty( $menu_perms['plugins'] ) )
+			$menu_perms = get_site_option('menu_items', array());
+			if (empty($menu_perms['plugins']))
 				$caps[] = 'manage_network_plugins';
 		}
 		break;
 	case 'delete_user':
 	case 'delete_users':
 		// If multisite only super admins can delete users.
-		if ( is_multisite() && ! is_super_admin( $user_id ) )
+		if (is_multisite() && ! is_super_admin($user_id))
 			$caps[] = 'do_not_allow';
 		else
 			$caps[] = 'delete_users'; // delete_user maps to delete_users.
 		break;
 	case 'create_users':
-		if ( !is_multisite() )
+		if ( ! is_multisite())
 			$caps[] = $cap;
-		elseif ( is_super_admin( $user_id ) || get_site_option( 'add_new_users' ) )
+		elseif (is_super_admin($user_id) || get_site_option('add_new_users'))
 			$caps[] = $cap;
 		else
 			$caps[] = 'do_not_allow';
 		break;
 	case 'manage_links' :
-		if ( get_option( 'link_manager_enabled' ) )
+		if (get_option('link_manager_enabled'))
 			$caps[] = $cap;
 		else
 			$caps[] = 'do_not_allow';
@@ -427,7 +427,7 @@ 
 		$caps[] = 'edit_theme_options';
 		break;
 	case 'delete_site':
-		if ( is_multisite() ) {
+		if (is_multisite()) {
 			$caps[] = 'manage_options';
 		} else {
 			$caps[] = 'do_not_allow';
@@ -437,26 +437,26 @@ 
 	case 'delete_term':
 	case 'assign_term':
 		$term_id = (int) $args[0];
-		$term = get_term( $term_id );
-		if ( ! $term || is_wp_error( $term ) ) {
+		$term = get_term($term_id);
+		if ( ! $term || is_wp_error($term)) {
 			$caps[] = 'do_not_allow';
 			break;
 		}
 
-		$tax = get_taxonomy( $term->taxonomy );
-		if ( ! $tax ) {
+		$tax = get_taxonomy($term->taxonomy);
+		if ( ! $tax) {
 			$caps[] = 'do_not_allow';
 			break;
 		}
 
-		if ( 'delete_term' === $cap && ( $term->term_id == get_option( 'default_' . $term->taxonomy ) ) ) {
+		if ('delete_term' === $cap && ($term->term_id == get_option('default_'.$term->taxonomy))) {
 			$caps[] = 'do_not_allow';
 			break;
 		}
 
-		$taxo_cap = $cap . 's';
+		$taxo_cap = $cap.'s';
 
-		$caps = map_meta_cap( $tax->cap->$taxo_cap, $user_id, $term_id );
+		$caps = map_meta_cap($tax->cap->$taxo_cap, $user_id, $term_id);
 
 		break;
 	case 'manage_post_tags':
@@ -483,9 +483,9 @@ 
 	default:
 		// Handle meta capabilities for custom post types.
 		global $post_type_meta_caps;
-		if ( isset( $post_type_meta_caps[ $cap ] ) ) {
-			$args = array_merge( array( $post_type_meta_caps[ $cap ], $user_id ), $args );
-			return call_user_func_array( 'map_meta_cap', $args );
+		if (isset($post_type_meta_caps[$cap])) {
+			$args = array_merge(array($post_type_meta_caps[$cap], $user_id), $args);
+			return call_user_func_array('map_meta_cap', $args);
 		}
 
 		// If no meta caps match, return the original cap.
@@ -502,7 +502,7 @@ 
 	 * @param int    $user_id The user ID.
 	 * @param array  $args    Adds the context to the cap. Typically the object ID.
 	 */
-	return apply_filters( 'map_meta_cap', $caps, $cap, $user_id, $args );
+	return apply_filters('map_meta_cap', $caps, $cap, $user_id, $args);
 }
 
 /**
@@ -527,16 +527,16 @@ 
  * @return bool Whether the current user has the given capability. If `$capability` is a meta cap and `$object_id` is
  *              passed, whether the current user has the given meta capability for the given object.
  */
-function current_user_can( $capability ) {
+function current_user_can($capability) {
 	$current_user = wp_get_current_user();
 
-	if ( empty( $current_user ) )
+	if (empty($current_user))
 		return false;
 
-	$args = array_slice( func_get_args(), 1 );
-	$args = array_merge( array( $capability ), $args );
+	$args = array_slice(func_get_args(), 1);
+	$args = array_merge(array($capability), $args);
 
-	return call_user_func_array( array( $current_user, 'has_cap' ), $args );
+	return call_user_func_array(array($current_user, 'has_cap'), $args);
 }
 
 /**
@@ -548,24 +548,24 @@ 
  * @param string $capability Capability or role name.
  * @return bool
  */
-function current_user_can_for_blog( $blog_id, $capability ) {
-	$switched = is_multisite() ? switch_to_blog( $blog_id ) : false;
+function current_user_can_for_blog($blog_id, $capability) {
+	$switched = is_multisite() ? switch_to_blog($blog_id) : false;
 
 	$current_user = wp_get_current_user();
 
-	if ( empty( $current_user ) ) {
-		if ( $switched ) {
+	if (empty($current_user)) {
+		if ($switched) {
 			restore_current_blog();
 		}
 		return false;
 	}
 
-	$args = array_slice( func_get_args(), 2 );
-	$args = array_merge( array( $capability ), $args );
+	$args = array_slice(func_get_args(), 2);
+	$args = array_merge(array($capability), $args);
 
-	$can = call_user_func_array( array( $current_user, 'has_cap' ), $args );
+	$can = call_user_func_array(array($current_user, 'has_cap'), $args);
 
-	if ( $switched ) {
+	if ($switched) {
 		restore_current_blog();
 	}
 
@@ -581,19 +581,19 @@ 
  * @param string $capability Capability or role name.
  * @return bool
  */
-function author_can( $post, $capability ) {
-	if ( !$post = get_post($post) )
+function author_can($post, $capability) {
+	if ( ! $post = get_post($post))
 		return false;
 
-	$author = get_userdata( $post->post_author );
+	$author = get_userdata($post->post_author);
 
-	if ( ! $author )
+	if ( ! $author)
 		return false;
 
-	$args = array_slice( func_get_args(), 2 );
-	$args = array_merge( array( $capability ), $args );
+	$args = array_slice(func_get_args(), 2);
+	$args = array_merge(array($capability), $args);
 
-	return call_user_func_array( array( $author, 'has_cap' ), $args );
+	return call_user_func_array(array($author, 'has_cap'), $args);
 }
 
 /**
@@ -605,17 +605,17 @@ 
  * @param string $capability Capability or role name.
  * @return bool
  */
-function user_can( $user, $capability ) {
-	if ( ! is_object( $user ) )
-		$user = get_userdata( $user );
+function user_can($user, $capability) {
+	if ( ! is_object($user))
+		$user = get_userdata($user);
 
-	if ( ! $user || ! $user->exists() )
+	if ( ! $user || ! $user->exists())
 		return false;
 
-	$args = array_slice( func_get_args(), 2 );
-	$args = array_merge( array( $capability ), $args );
+	$args = array_slice(func_get_args(), 2);
+	$args = array_merge(array($capability), $args);
 
-	return call_user_func_array( array( $user, 'has_cap' ), $args );
+	return call_user_func_array(array($user, 'has_cap'), $args);
 }
 
 /**
@@ -630,7 +630,7 @@ 
 function wp_roles() {
 	global $wp_roles;
 
-	if ( ! isset( $wp_roles ) ) {
+	if ( ! isset($wp_roles)) {
 		$wp_roles = new WP_Roles();
 	}
 	return $wp_roles;
@@ -644,8 +644,8 @@ 
  * @param string $role Role name.
  * @return WP_Role|null WP_Role object if found, null if the role does not exist.
  */
-function get_role( $role ) {
-	return wp_roles()->get_role( $role );
+function get_role($role) {
+	return wp_roles()->get_role($role);
 }
 
 /**
@@ -658,11 +658,11 @@ 
  * @param array $capabilities List of capabilities, e.g. array( 'edit_posts' => true, 'delete_posts' => false );
  * @return WP_Role|null WP_Role object if role is added, null if already exists.
  */
-function add_role( $role, $display_name, $capabilities = array() ) {
-	if ( empty( $role ) ) {
+function add_role($role, $display_name, $capabilities = array()) {
+	if (empty($role)) {
 		return;
 	}
-	return wp_roles()->add_role( $role, $display_name, $capabilities );
+	return wp_roles()->add_role($role, $display_name, $capabilities);
 }
 
 /**
@@ -672,8 +672,8 @@ 
  *
  * @param string $role Role name.
  */
-function remove_role( $role ) {
-	wp_roles()->remove_role( $role );
+function remove_role($role) {
+	wp_roles()->remove_role($role);
 }
 
 /**
@@ -688,10 +688,10 @@ 
 function get_super_admins() {
 	global $super_admins;
 
-	if ( isset($super_admins) )
+	if (isset($super_admins))
 		return $super_admins;
 	else
-		return get_site_option( 'site_admins', array('admin') );
+		return get_site_option('site_admins', array('admin'));
 }
 
 /**
@@ -702,21 +702,21 @@ 
  * @param int $user_id (Optional) The ID of a user. Defaults to the current user.
  * @return bool True if the user is a site admin.
  */
-function is_super_admin( $user_id = false ) {
-	if ( ! $user_id || $user_id == get_current_user_id() )
+function is_super_admin($user_id = false) {
+	if ( ! $user_id || $user_id == get_current_user_id())
 		$user = wp_get_current_user();
 	else
-		$user = get_userdata( $user_id );
+		$user = get_userdata($user_id);
 
-	if ( ! $user || ! $user->exists() )
+	if ( ! $user || ! $user->exists())
 		return false;
 
-	if ( is_multisite() ) {
+	if (is_multisite()) {
 		$super_admins = get_super_admins();
-		if ( is_array( $super_admins ) && in_array( $user->user_login, $super_admins ) )
+		if (is_array($super_admins) && in_array($user->user_login, $super_admins))
 			return true;
 	} else {
-		if ( $user->has_cap('delete_users') )
+		if ($user->has_cap('delete_users'))
 			return true;
 	}
 
@@ -734,9 +734,9 @@ 
  * @return bool True on success, false on failure. This can fail when the user is
  *              already a super admin or when the `$super_admins` global is defined.
  */
-function grant_super_admin( $user_id ) {
+function grant_super_admin($user_id) {
 	// If global super_admins override is defined, there is nothing to do here.
-	if ( isset( $GLOBALS['super_admins'] ) || ! is_multisite() ) {
+	if (isset($GLOBALS['super_admins']) || ! is_multisite()) {
 		return false;
 	}
 
@@ -747,15 +747,15 @@ 
 	 *
 	 * @param int $user_id ID of the user that is about to be granted Super Admin privileges.
 	 */
-	do_action( 'grant_super_admin', $user_id );
+	do_action('grant_super_admin', $user_id);
 
 	// Directly fetch site_admins instead of using get_super_admins()
-	$super_admins = get_site_option( 'site_admins', array( 'admin' ) );
+	$super_admins = get_site_option('site_admins', array('admin'));
 
-	$user = get_userdata( $user_id );
-	if ( $user && ! in_array( $user->user_login, $super_admins ) ) {
+	$user = get_userdata($user_id);
+	if ($user && ! in_array($user->user_login, $super_admins)) {
 		$super_admins[] = $user->user_login;
-		update_site_option( 'site_admins' , $super_admins );
+		update_site_option('site_admins', $super_admins);
 
 		/**
 		 * Fires after the user is granted Super Admin privileges.
@@ -764,7 +764,7 @@ 
 		 *
 		 * @param int $user_id ID of the user that was granted Super Admin privileges.
 		 */
-		do_action( 'granted_super_admin', $user_id );
+		do_action('granted_super_admin', $user_id);
 		return true;
 	}
 	return false;
@@ -781,9 +781,9 @@ 
  * @return bool True on success, false on failure. This can fail when the user's email
  *              is the network admin email or when the `$super_admins` global is defined.
  */
-function revoke_super_admin( $user_id ) {
+function revoke_super_admin($user_id) {
 	// If global super_admins override is defined, there is nothing to do here.
-	if ( isset( $GLOBALS['super_admins'] ) || ! is_multisite() ) {
+	if (isset($GLOBALS['super_admins']) || ! is_multisite()) {
 		return false;
 	}
 
@@ -794,16 +794,16 @@ 
 	 *
 	 * @param int $user_id ID of the user Super Admin privileges are being revoked from.
 	 */
-	do_action( 'revoke_super_admin', $user_id );
+	do_action('revoke_super_admin', $user_id);
 
 	// Directly fetch site_admins instead of using get_super_admins()
-	$super_admins = get_site_option( 'site_admins', array( 'admin' ) );
+	$super_admins = get_site_option('site_admins', array('admin'));
 
-	$user = get_userdata( $user_id );
-	if ( $user && 0 !== strcasecmp( $user->user_email, get_site_option( 'admin_email' ) ) ) {
-		if ( false !== ( $key = array_search( $user->user_login, $super_admins ) ) ) {
-			unset( $super_admins[$key] );
-			update_site_option( 'site_admins', $super_admins );
+	$user = get_userdata($user_id);
+	if ($user && 0 !== strcasecmp($user->user_email, get_site_option('admin_email'))) {
+		if (false !== ($key = array_search($user->user_login, $super_admins))) {
+			unset($super_admins[$key]);
+			update_site_option('site_admins', $super_admins);
 
 			/**
 			 * Fires after the user's Super Admin privileges are revoked.
@@ -812,7 +812,7 @@ 
 			 *
 			 * @param int $user_id ID of the user Super Admin privileges were revoked from.
 			 */
-			do_action( 'revoked_super_admin', $user_id );
+			do_action('revoked_super_admin', $user_id);
 			return true;
 		}
 	}

Braces +89 added lines, -67 removed lines

@@ -46,8 +46,9 @@ 
 	case 'edit_user':
 	case 'edit_users':
 		// Allow user to edit itself
-		if ( 'edit_user' == $cap && isset( $args[0] ) && $user_id == $args[0] )
-			break;
+		if ( 'edit_user' == $cap && isset( $args[0] ) && $user_id == $args[0] ) {
+					break;
+		}
 
 		// In multisite the user must have manage_network_users caps. If editing a super admin, the user must be a super admin.
 		if ( is_multisite() && ( ( ! is_super_admin( $user_id ) && 'edit_user' === $cap && is_super_admin( $args[0] ) ) || ! user_can( $user_id, 'manage_network_users' ) ) ) {
@@ -88,8 +89,9 @@ 
 		if ( ! $post_type->map_meta_cap ) {
 			$caps[] = $post_type->cap->$cap;
 			// Prior to 3.1 we would re-call map_meta_cap here.
-			if ( 'delete_post' == $cap )
-				$cap = $post_type->cap->$cap;
+			if ( 'delete_post' == $cap ) {
+							$cap = $post_type->cap->$cap;
+			}
 			break;
 		}
 
@@ -149,8 +151,9 @@ 
 		if ( ! $post_type->map_meta_cap ) {
 			$caps[] = $post_type->cap->$cap;
 			// Prior to 3.1 we would re-call map_meta_cap here.
-			if ( 'edit_post' == $cap )
-				$cap = $post_type->cap->$cap;
+			if ( 'edit_post' == $cap ) {
+							$cap = $post_type->cap->$cap;
+			}
 			break;
 		}
 
@@ -208,8 +211,9 @@ 
 		if ( ! $post_type->map_meta_cap ) {
 			$caps[] = $post_type->cap->$cap;
 			// Prior to 3.1 we would re-call map_meta_cap here.
-			if ( 'read_post' == $cap )
-				$cap = $post_type->cap->$cap;
+			if ( 'read_post' == $cap ) {
+							$cap = $post_type->cap->$cap;
+			}
 			break;
 		}
 
@@ -341,33 +345,36 @@ 
 		}
 		break;
 	case 'unfiltered_upload':
-		if ( defined('ALLOW_UNFILTERED_UPLOADS') && ALLOW_UNFILTERED_UPLOADS && ( !is_multisite() || is_super_admin( $user_id ) )  )
-			$caps[] = $cap;
-		else
-			$caps[] = 'do_not_allow';
+		if ( defined('ALLOW_UNFILTERED_UPLOADS') && ALLOW_UNFILTERED_UPLOADS && ( !is_multisite() || is_super_admin( $user_id ) )  ) {
+					$caps[] = $cap;
+		} else {
+					$caps[] = 'do_not_allow';
+		}
 		break;
 	case 'edit_css' :
 	case 'unfiltered_html' :
 		// Disallow unfiltered_html for all users, even admins and super admins.
-		if ( defined( 'DISALLOW_UNFILTERED_HTML' ) && DISALLOW_UNFILTERED_HTML )
-			$caps[] = 'do_not_allow';
-		elseif ( is_multisite() && ! is_super_admin( $user_id ) )
-			$caps[] = 'do_not_allow';
-		else
-			$caps[] = 'unfiltered_html';
+		if ( defined( 'DISALLOW_UNFILTERED_HTML' ) && DISALLOW_UNFILTERED_HTML ) {
+					$caps[] = 'do_not_allow';
+		} elseif ( is_multisite() && ! is_super_admin( $user_id ) ) {
+					$caps[] = 'do_not_allow';
+		} else {
+					$caps[] = 'unfiltered_html';
+		}
 		break;
 	case 'edit_files':
 	case 'edit_plugins':
 	case 'edit_themes':
 		// Disallow the file editors.
-		if ( defined( 'DISALLOW_FILE_EDIT' ) && DISALLOW_FILE_EDIT )
-			$caps[] = 'do_not_allow';
-		elseif ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS )
-			$caps[] = 'do_not_allow';
-		elseif ( is_multisite() && ! is_super_admin( $user_id ) )
-			$caps[] = 'do_not_allow';
-		else
-			$caps[] = $cap;
+		if ( defined( 'DISALLOW_FILE_EDIT' ) && DISALLOW_FILE_EDIT ) {
+					$caps[] = 'do_not_allow';
+		} elseif ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS ) {
+					$caps[] = 'do_not_allow';
+		} elseif ( is_multisite() && ! is_super_admin( $user_id ) ) {
+					$caps[] = 'do_not_allow';
+		} else {
+					$caps[] = $cap;
+		}
 		break;
 	case 'update_plugins':
 	case 'delete_plugins':
@@ -397,31 +404,36 @@ 
 		if ( is_multisite() ) {
 			// update_, install_, and delete_ are handled above with is_super_admin().
 			$menu_perms = get_site_option( 'menu_items', array() );
-			if ( empty( $menu_perms['plugins'] ) )
-				$caps[] = 'manage_network_plugins';
+			if ( empty( $menu_perms['plugins'] ) ) {
+							$caps[] = 'manage_network_plugins';
+			}
 		}
 		break;
 	case 'delete_user':
 	case 'delete_users':
 		// If multisite only super admins can delete users.
-		if ( is_multisite() && ! is_super_admin( $user_id ) )
-			$caps[] = 'do_not_allow';
-		else
-			$caps[] = 'delete_users'; // delete_user maps to delete_users.
+		if ( is_multisite() && ! is_super_admin( $user_id ) ) {
+					$caps[] = 'do_not_allow';
+		} else {
+					$caps[] = 'delete_users';
+		}
+		// delete_user maps to delete_users.
 		break;
 	case 'create_users':
-		if ( !is_multisite() )
-			$caps[] = $cap;
-		elseif ( is_super_admin( $user_id ) || get_site_option( 'add_new_users' ) )
-			$caps[] = $cap;
-		else
-			$caps[] = 'do_not_allow';
+		if ( !is_multisite() ) {
+					$caps[] = $cap;
+		} elseif ( is_super_admin( $user_id ) || get_site_option( 'add_new_users' ) ) {
+					$caps[] = $cap;
+		} else {
+					$caps[] = 'do_not_allow';
+		}
 		break;
 	case 'manage_links' :
-		if ( get_option( 'link_manager_enabled' ) )
-			$caps[] = $cap;
-		else
-			$caps[] = 'do_not_allow';
+		if ( get_option( 'link_manager_enabled' ) ) {
+					$caps[] = $cap;
+		} else {
+					$caps[] = 'do_not_allow';
+		}
 		break;
 	case 'customize' :
 		$caps[] = 'edit_theme_options';
@@ -530,8 +542,9 @@ 
 function current_user_can( $capability ) {
 	$current_user = wp_get_current_user();
 
-	if ( empty( $current_user ) )
-		return false;
+	if ( empty( $current_user ) ) {
+			return false;
+	}
 
 	$args = array_slice( func_get_args(), 1 );
 	$args = array_merge( array( $capability ), $args );
@@ -582,13 +595,15 @@ 
  * @return bool
  */
 function author_can( $post, $capability ) {
-	if ( !$post = get_post($post) )
-		return false;
+	if ( !$post = get_post($post) ) {
+			return false;
+	}
 
 	$author = get_userdata( $post->post_author );
 
-	if ( ! $author )
-		return false;
+	if ( ! $author ) {
+			return false;
+	}
 
 	$args = array_slice( func_get_args(), 2 );
 	$args = array_merge( array( $capability ), $args );
@@ -606,11 +621,13 @@ 
  * @return bool
  */
 function user_can( $user, $capability ) {
-	if ( ! is_object( $user ) )
-		$user = get_userdata( $user );
+	if ( ! is_object( $user ) ) {
+			$user = get_userdata( $user );
+	}
 
-	if ( ! $user || ! $user->exists() )
-		return false;
+	if ( ! $user || ! $user->exists() ) {
+			return false;
+	}
 
 	$args = array_slice( func_get_args(), 2 );
 	$args = array_merge( array( $capability ), $args );
@@ -688,11 +705,12 @@ 
 function get_super_admins() {
 	global $super_admins;
 
-	if ( isset($super_admins) )
-		return $super_admins;
-	else
-		return get_site_option( 'site_admins', array('admin') );
-}
+	if ( isset($super_admins) ) {
+			return $super_admins;
+	} else {
+			return get_site_option( 'site_admins', array('admin') );
+	}
+	}
 
 /**
  * Determine if user is a site admin.
@@ -703,21 +721,25 @@ 
  * @return bool True if the user is a site admin.
  */
 function is_super_admin( $user_id = false ) {
-	if ( ! $user_id || $user_id == get_current_user_id() )
-		$user = wp_get_current_user();
-	else
-		$user = get_userdata( $user_id );
+	if ( ! $user_id || $user_id == get_current_user_id() ) {
+			$user = wp_get_current_user();
+	} else {
+			$user = get_userdata( $user_id );
+	}
 
-	if ( ! $user || ! $user->exists() )
-		return false;
+	if ( ! $user || ! $user->exists() ) {
+			return false;
+	}
 
 	if ( is_multisite() ) {
 		$super_admins = get_super_admins();
-		if ( is_array( $super_admins ) && in_array( $user->user_login, $super_admins ) )
-			return true;
+		if ( is_array( $super_admins ) && in_array( $user->user_login, $super_admins ) ) {
+					return true;
+		}
 	} else {
-		if ( $user->has_cap('delete_users') )
-			return true;
+		if ( $user->has_cap('delete_users') ) {
+					return true;
+		}
 	}
 
 	return false;

src/wp-includes/class-http.php

Doc Comments +2 added lines, -2 removed lines

@@ -522,7 +522,7 @@ 
 	 * @since 2.7.0
 	 *
 	 * @param string $strResponse The full response string
-	 * @return array Array with 'headers' and 'body' keys.
+	 * @return string Array with 'headers' and 'body' keys.
 	 */
 	public static function processResponse($strResponse) {
 		$res = explode("\r\n\r\n", $strResponse, 2);
@@ -542,7 +542,7 @@ 
 	 *
 	 * @param string|array $headers
 	 * @param string $url The URL that was requested
-	 * @return array Processed string headers. If duplicate headers are encountered,
+	 * @return string Processed string headers. If duplicate headers are encountered,
 	 * 					Then a numbered array is returned as the value of that header-key.
 	 */
 	public static function processHeaders( $headers, $url = '' ) {

Braces +97 added lines, -66 removed lines

@@ -212,8 +212,9 @@ 
 		$args = wp_parse_args( $args );
 
 		// By default, Head requests do not cause redirections.
-		if ( isset($args['method']) && 'HEAD' == $args['method'] )
-			$defaults['redirection'] = 0;
+		if ( isset($args['method']) && 'HEAD' == $args['method'] ) {
+					$defaults['redirection'] = 0;
+		}
 
 		$r = wp_parse_args( $args, $defaults );
 		/**
@@ -227,8 +228,9 @@ 
 		$r = apply_filters( 'http_request_args', $r, $url );
 
 		// The transports decrement this, store a copy of the original value for loop purposes.
-		if ( ! isset( $r['_redirection'] ) )
-			$r['_redirection'] = $r['redirection'];
+		if ( ! isset( $r['_redirection'] ) ) {
+					$r['_redirection'] = $r['redirection'];
+		}
 
 		/**
 		 * Filters whether to preempt an HTTP request's return value.
@@ -250,8 +252,9 @@ 
 		 */
 		$pre = apply_filters( 'pre_http_request', false, $r, $url );
 
-		if ( false !== $pre )
-			return $pre;
+		if ( false !== $pre ) {
+					return $pre;
+		}
 
 		if ( function_exists( 'wp_kses_bad_protocol' ) ) {
 			if ( $r['reject_unsafe_urls'] ) {
@@ -371,8 +374,7 @@ 
 
 			// Add the original object to the array.
 			$response['http_response'] = $http_response;
-		}
-		catch ( Requests_Exception $e ) {
+		} catch ( Requests_Exception $e ) {
 			$response = new WP_Error( 'http_request_failed', $e->getMessage() );
 		}
 
@@ -498,8 +500,9 @@ 
 			$class = 'WP_Http_' . $transport;
 
 			// Check to see if this transport is a possibility, calls the transport statically.
-			if ( !call_user_func( array( $class, 'test' ), $args, $url ) )
-				continue;
+			if ( !call_user_func( array( $class, 'test' ), $args, $url ) ) {
+							continue;
+			}
 
 			return $class;
 		}
@@ -528,20 +531,23 @@ 
 		static $transports = array();
 
 		$class = $this->_get_first_available_transport( $args, $url );
-		if ( !$class )
-			return new WP_Error( 'http_failure', __( 'There are no HTTP transports available which can complete the requested request.' ) );
+		if ( !$class ) {
+					return new WP_Error( 'http_failure', __( 'There are no HTTP transports available which can complete the requested request.' ) );
+		}
 
 		// Transport claims to support request, instantiate it and give it a whirl.
-		if ( empty( $transports[$class] ) )
-			$transports[$class] = new $class;
+		if ( empty( $transports[$class] ) ) {
+					$transports[$class] = new $class;
+		}
 
 		$response = $transports[$class]->request( $url, $args );
 
 		/** This action is documented in wp-includes/class-http.php */
 		do_action( 'http_api_debug', $response, 'response', $class, $args, $url );
 
-		if ( is_wp_error( $response ) )
-			return $response;
+		if ( is_wp_error( $response ) ) {
+					return $response;
+		}
 
 		/**
 		 * Filters the HTTP API response immediately before the response is returned.
@@ -670,8 +676,9 @@ 
 		$cookies = array();
 		$newheaders = array();
 		foreach ( (array) $headers as $tempheader ) {
-			if ( empty($tempheader) )
-				continue;
+			if ( empty($tempheader) ) {
+							continue;
+			}
 
 			if ( false === strpos($tempheader, ':') ) {
 				$stack = explode(' ', $tempheader, 3);
@@ -686,14 +693,16 @@ 
 			$value = trim( $value );
 
 			if ( isset( $newheaders[ $key ] ) ) {
-				if ( ! is_array( $newheaders[ $key ] ) )
-					$newheaders[$key] = array( $newheaders[ $key ] );
+				if ( ! is_array( $newheaders[ $key ] ) ) {
+									$newheaders[$key] = array( $newheaders[ $key ] );
+				}
 				$newheaders[ $key ][] = $value;
 			} else {
 				$newheaders[ $key ] = $value;
 			}
-			if ( 'set-cookie' == $key )
-				$cookies[] = new WP_Http_Cookie( $value, $url );
+			if ( 'set-cookie' == $key ) {
+							$cookies[] = new WP_Http_Cookie( $value, $url );
+			}
 		}
 
 		// Cast the Response Code to an int
@@ -719,8 +728,9 @@ 
 		if ( ! empty($r['cookies']) ) {
 			// Upgrade any name => value cookie pairs to WP_HTTP_Cookie instances.
 			foreach ( $r['cookies'] as $name => $value ) {
-				if ( ! is_object( $value ) )
-					$r['cookies'][ $name ] = new WP_Http_Cookie( array( 'name' => $name, 'value' => $value ) );
+				if ( ! is_object( $value ) ) {
+									$r['cookies'][ $name ] = new WP_Http_Cookie( array( 'name' => $name, 'value' => $value ) );
+				}
 			}
 
 			$cookies_header = '';
@@ -749,8 +759,9 @@ 
 	 */
 	public static function chunkTransferDecode( $body ) {
 		// The body is not chunked encoded or is malformed.
-		if ( ! preg_match( '/^([0-9a-f]+)[^\r\n]*\r\n/i', trim( $body ) ) )
-			return $body;
+		if ( ! preg_match( '/^([0-9a-f]+)[^\r\n]*\r\n/i', trim( $body ) ) ) {
+					return $body;
+		}
 
 		$parsed_body = '';
 
@@ -759,8 +770,9 @@ 
 
 		while ( true ) {
 			$has_chunk = (bool) preg_match( '/^([0-9a-f]+)[^\r\n]*\r\n/i', $body, $match );
-			if ( ! $has_chunk || empty( $match[1] ) )
-				return $body_original;
+			if ( ! $has_chunk || empty( $match[1] ) ) {
+							return $body_original;
+			}
 
 			$length = hexdec( $match[1] );
 			$chunk_length = strlen( $match[0] );
@@ -772,8 +784,9 @@ 
 			$body = substr( $body, $length + $chunk_length );
 
 			// End of the document.
-			if ( '0' === trim( $body ) )
-				return $parsed_body;
+			if ( '0' === trim( $body ) ) {
+							return $parsed_body;
+			}
 		}
 	}
 
@@ -801,12 +814,14 @@ 
 	 */
 	public function block_request($uri) {
 		// We don't need to block requests, because nothing is blocked.
-		if ( ! defined( 'WP_HTTP_BLOCK_EXTERNAL' ) || ! WP_HTTP_BLOCK_EXTERNAL )
-			return false;
+		if ( ! defined( 'WP_HTTP_BLOCK_EXTERNAL' ) || ! WP_HTTP_BLOCK_EXTERNAL ) {
+					return false;
+		}
 
 		$check = parse_url($uri);
-		if ( ! $check )
-			return true;
+		if ( ! $check ) {
+					return true;
+		}
 
 		$home = parse_url( get_option('siteurl') );
 
@@ -823,8 +838,9 @@ 
 			return apply_filters( 'block_local_requests', false );
 		}
 
-		if ( !defined('WP_ACCESSIBLE_HOSTS') )
-			return true;
+		if ( !defined('WP_ACCESSIBLE_HOSTS') ) {
+					return true;
+		}
 
 		static $accessible_hosts = null;
 		static $wildcard_regex = array();
@@ -833,16 +849,19 @@ 
 
 			if ( false !== strpos(WP_ACCESSIBLE_HOSTS, '*') ) {
 				$wildcard_regex = array();
-				foreach ( $accessible_hosts as $host )
-					$wildcard_regex[] = str_replace( '\*', '.+', preg_quote( $host, '/' ) );
+				foreach ( $accessible_hosts as $host ) {
+									$wildcard_regex[] = str_replace( '\*', '.+', preg_quote( $host, '/' ) );
+				}
 				$wildcard_regex = '/^(' . implode('|', $wildcard_regex) . ')$/i';
 			}
 		}
 
-		if ( !empty($wildcard_regex) )
-			return !preg_match($wildcard_regex, $check['host']);
-		else
-			return !in_array( $check['host'], $accessible_hosts ); //Inverse logic, If it's in the array, then we can't access it.
+		if ( !empty($wildcard_regex) ) {
+					return !preg_match($wildcard_regex, $check['host']);
+		} else {
+					return !in_array( $check['host'], $accessible_hosts );
+		}
+		//Inverse logic, If it's in the array, then we can't access it.
 
 	}
 
@@ -877,8 +896,9 @@ 
 	 * @return string An Absolute URL, in a failure condition where the URL cannot be parsed, the relative URL will be returned.
 	 */
 	public static function make_absolute_url( $maybe_relative_path, $url ) {
-		if ( empty( $url ) )
-			return $maybe_relative_path;
+		if ( empty( $url ) ) {
+					return $maybe_relative_path;
+		}
 
 		if ( ! $url_parts = wp_parse_url( $url ) ) {
 			return $maybe_relative_path;
@@ -898,12 +918,14 @@ 
 		// Schemeless URL's will make it this far, so we check for a host in the relative url and convert it to a protocol-url
 		if ( isset( $relative_url_parts['host'] ) ) {
 			$absolute_path .= $relative_url_parts['host'];
-			if ( isset( $relative_url_parts['port'] ) )
-				$absolute_path .= ':' . $relative_url_parts['port'];
+			if ( isset( $relative_url_parts['port'] ) ) {
+							$absolute_path .= ':' . $relative_url_parts['port'];
+			}
 		} else {
 			$absolute_path .= $url_parts['host'];
-			if ( isset( $url_parts['port'] ) )
-				$absolute_path .= ':' . $url_parts['port'];
+			if ( isset( $url_parts['port'] ) ) {
+							$absolute_path .= ':' . $url_parts['port'];
+			}
 		}
 
 		// Start off with the Absolute URL path.
@@ -931,8 +953,9 @@ 
 		}
 
 		// Add the Query string.
-		if ( ! empty( $relative_url_parts['query'] ) )
-			$path .= '?' . $relative_url_parts['query'];
+		if ( ! empty( $relative_url_parts['query'] ) ) {
+					$path .= '?' . $relative_url_parts['query'];
+		}
 
 		return $absolute_path . '/' . ltrim( $path, '/' );
 	}
@@ -951,36 +974,42 @@ 
 	 */
 	public static function handle_redirects( $url, $args, $response ) {
 		// If no redirects are present, or, redirects were not requested, perform no action.
-		if ( ! isset( $response['headers']['location'] ) || 0 === $args['_redirection'] )
-			return false;
+		if ( ! isset( $response['headers']['location'] ) || 0 === $args['_redirection'] ) {
+					return false;
+		}
 
 		// Only perform redirections on redirection http codes.
-		if ( $response['response']['code'] > 399 || $response['response']['code'] < 300 )
-			return false;
+		if ( $response['response']['code'] > 399 || $response['response']['code'] < 300 ) {
+					return false;
+		}
 
 		// Don't redirect if we've run out of redirects.
-		if ( $args['redirection']-- <= 0 )
-			return new WP_Error( 'http_request_failed', __('Too many redirects.') );
+		if ( $args['redirection']-- <= 0 ) {
+					return new WP_Error( 'http_request_failed', __('Too many redirects.') );
+		}
 
 		$redirect_location = $response['headers']['location'];
 
 		// If there were multiple Location headers, use the last header specified.
-		if ( is_array( $redirect_location ) )
-			$redirect_location = array_pop( $redirect_location );
+		if ( is_array( $redirect_location ) ) {
+					$redirect_location = array_pop( $redirect_location );
+		}
 
 		$redirect_location = WP_Http::make_absolute_url( $redirect_location, $url );
 
 		// POST requests should not POST to a redirected location.
 		if ( 'POST' == $args['method'] ) {
-			if ( in_array( $response['response']['code'], array( 302, 303 ) ) )
-				$args['method'] = 'GET';
+			if ( in_array( $response['response']['code'], array( 302, 303 ) ) ) {
+							$args['method'] = 'GET';
+			}
 		}
 
 		// Include valid cookies in the redirect process.
 		if ( ! empty( $response['cookies'] ) ) {
 			foreach ( $response['cookies'] as $cookie ) {
-				if ( $cookie->test( $redirect_location ) )
-					$args['cookies'][] = $cookie;
+				if ( $cookie->test( $redirect_location ) ) {
+									$args['cookies'][] = $cookie;
+				}
 			}
 		}
 
@@ -1004,11 +1033,13 @@ 
 	 * @return integer|bool Upon success, '4' or '6' to represent a IPv4 or IPv6 address, false upon failure
 	 */
 	public static function is_ip_address( $maybe_ip ) {
-		if ( preg_match( '/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/', $maybe_ip ) )
-			return 4;
+		if ( preg_match( '/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/', $maybe_ip ) ) {
+					return 4;
+		}
 
-		if ( false !== strpos( $maybe_ip, ':' ) && preg_match( '/^(((?=.*(::))(?!.*\3.+\3))\3?|([\dA-F]{1,4}(\3|:\b|$)|\2))(?4){5}((?4){2}|(((2[0-4]|1\d|[1-9])?\d|25[0-5])\.?\b){4})$/i', trim( $maybe_ip, ' []' ) ) )
-			return 6;
+		if ( false !== strpos( $maybe_ip, ':' ) && preg_match( '/^(((?=.*(::))(?!.*\3.+\3))\3?|([\dA-F]{1,4}(\3|:\b|$)|\2))(?4){5}((?4){2}|(((2[0-4]|1\d|[1-9])?\d|25[0-5])\.?\b){4})$/i', trim( $maybe_ip, ' []' ) ) ) {
+					return 6;
+		}
 
 		return false;
 	}

Spacing +174 added lines, -174 removed lines

@@ -7,11 +7,11 @@ 
  * @since 2.7.0
  */
 
-if ( ! class_exists( 'Requests' ) ) {
-	require( ABSPATH . WPINC . '/class-requests.php' );
+if ( ! class_exists('Requests')) {
+	require(ABSPATH.WPINC.'/class-requests.php');
 
 	Requests::register_autoloader();
-	Requests::set_certificate_path( ABSPATH . WPINC . '/certificates/ca-bundle.crt' );
+	Requests::set_certificate_path(ABSPATH.WPINC.'/certificates/ca-bundle.crt');
 }
 
 /**
@@ -145,7 +145,7 @@ 
 	 * @return array|WP_Error Array containing 'headers', 'body', 'response', 'cookies', 'filename'.
 	 *                        A WP_Error instance upon error.
 	 */
-	public function request( $url, $args = array() ) {
+	public function request($url, $args = array()) {
 		$defaults = array(
 			'method' => 'GET',
 			/**
@@ -156,7 +156,7 @@ 
 			 * @param int $timeout_value Time in seconds until a request times out.
 			 *                           Default 5.
 			 */
-			'timeout' => apply_filters( 'http_request_timeout', 5 ),
+			'timeout' => apply_filters('http_request_timeout', 5),
 			/**
 			 * Filters the number of redirects allowed during an HTTP request.
 			 *
@@ -164,7 +164,7 @@ 
 			 *
 			 * @param int $redirect_count Number of redirects allowed. Default 5.
 			 */
-			'redirection' => apply_filters( 'http_request_redirection_count', 5 ),
+			'redirection' => apply_filters('http_request_redirection_count', 5),
 			/**
 			 * Filters the version of the HTTP protocol used in a request.
 			 *
@@ -173,7 +173,7 @@ 
 			 * @param string $version Version of HTTP used. Accepts '1.0' and '1.1'.
 			 *                        Default '1.0'.
 			 */
-			'httpversion' => apply_filters( 'http_request_version', '1.0' ),
+			'httpversion' => apply_filters('http_request_version', '1.0'),
 			/**
 			 * Filters the user agent value sent with an HTTP request.
 			 *
@@ -181,7 +181,7 @@ 
 			 *
 			 * @param string $user_agent WordPress user agent string.
 			 */
-			'user-agent' => apply_filters( 'http_headers_useragent', 'WordPress/' . get_bloginfo( 'version' ) . '; ' . get_bloginfo( 'url' ) ),
+			'user-agent' => apply_filters('http_headers_useragent', 'WordPress/'.get_bloginfo('version').'; '.get_bloginfo('url')),
 			/**
 			 * Filters whether to pass URLs through wp_http_validate_url() in an HTTP request.
 			 *
@@ -190,7 +190,7 @@ 
 			 * @param bool $pass_url Whether to pass URLs through wp_http_validate_url().
 			 *                       Default false.
 			 */
-			'reject_unsafe_urls' => apply_filters( 'http_request_reject_unsafe_urls', false ),
+			'reject_unsafe_urls' => apply_filters('http_request_reject_unsafe_urls', false),
 			'blocking' => true,
 			'headers' => array(),
 			'cookies' => array(),
@@ -198,20 +198,20 @@ 
 			'compress' => false,
 			'decompress' => true,
 			'sslverify' => true,
-			'sslcertificates' => ABSPATH . WPINC . '/certificates/ca-bundle.crt',
+			'sslcertificates' => ABSPATH.WPINC.'/certificates/ca-bundle.crt',
 			'stream' => false,
 			'filename' => null,
 			'limit_response_size' => null,
 		);
 
 		// Pre-parse for the HEAD checks.
-		$args = wp_parse_args( $args );
+		$args = wp_parse_args($args);
 
 		// By default, Head requests do not cause redirections.
-		if ( isset($args['method']) && 'HEAD' == $args['method'] )
+		if (isset($args['method']) && 'HEAD' == $args['method'])
 			$defaults['redirection'] = 0;
 
-		$r = wp_parse_args( $args, $defaults );
+		$r = wp_parse_args($args, $defaults);
 		/**
 		 * Filters the arguments used in an HTTP request.
 		 *
@@ -220,10 +220,10 @@ 
 		 * @param array  $r   An array of HTTP request arguments.
 		 * @param string $url The request URL.
 		 */
-		$r = apply_filters( 'http_request_args', $r, $url );
+		$r = apply_filters('http_request_args', $r, $url);
 
 		// The transports decrement this, store a copy of the original value for loop purposes.
-		if ( ! isset( $r['_redirection'] ) )
+		if ( ! isset($r['_redirection']))
 			$r['_redirection'] = $r['redirection'];
 
 		/**
@@ -244,51 +244,51 @@ 
 		 * @param array               $r        HTTP request arguments.
 		 * @param string              $url      The request URL.
 		 */
-		$pre = apply_filters( 'pre_http_request', false, $r, $url );
+		$pre = apply_filters('pre_http_request', false, $r, $url);
 
-		if ( false !== $pre )
+		if (false !== $pre)
 			return $pre;
 
-		if ( function_exists( 'wp_kses_bad_protocol' ) ) {
-			if ( $r['reject_unsafe_urls'] ) {
-				$url = wp_http_validate_url( $url );
+		if (function_exists('wp_kses_bad_protocol')) {
+			if ($r['reject_unsafe_urls']) {
+				$url = wp_http_validate_url($url);
 			}
-			if ( $url ) {
-				$url = wp_kses_bad_protocol( $url, array( 'http', 'https', 'ssl' ) );
+			if ($url) {
+				$url = wp_kses_bad_protocol($url, array('http', 'https', 'ssl'));
 			}
 		}
 
-		$arrURL = @parse_url( $url );
+		$arrURL = @parse_url($url);
 
-		if ( empty( $url ) || empty( $arrURL['scheme'] ) ) {
+		if (empty($url) || empty($arrURL['scheme'])) {
 			return new WP_Error('http_request_failed', __('A valid URL was not provided.'));
 		}
 
-		if ( $this->block_request( $url ) ) {
-			return new WP_Error( 'http_request_failed', __( 'User has blocked requests through HTTP.' ) );
+		if ($this->block_request($url)) {
+			return new WP_Error('http_request_failed', __('User has blocked requests through HTTP.'));
 		}
 
 		// If we are streaming to a file but no filename was given drop it in the WP temp dir
 		// and pick its name using the basename of the $url
-		if ( $r['stream'] ) {
-			if ( empty( $r['filename'] ) ) {
-				$r['filename'] = get_temp_dir() . basename( $url );
+		if ($r['stream']) {
+			if (empty($r['filename'])) {
+				$r['filename'] = get_temp_dir().basename($url);
 			}
 
 			// Force some settings if we are streaming to a file and check for existence and perms of destination directory
 			$r['blocking'] = true;
-			if ( ! wp_is_writable( dirname( $r['filename'] ) ) ) {
-				return new WP_Error( 'http_request_failed', __( 'Destination directory for file streaming does not exist or is not writable.' ) );
+			if ( ! wp_is_writable(dirname($r['filename']))) {
+				return new WP_Error('http_request_failed', __('Destination directory for file streaming does not exist or is not writable.'));
 			}
 		}
 
-		if ( is_null( $r['headers'] ) ) {
+		if (is_null($r['headers'])) {
 			$r['headers'] = array();
 		}
 
 		// WP allows passing in headers as a string, weirdly.
-		if ( ! is_array( $r['headers'] ) ) {
-			$processedHeaders = WP_Http::processHeaders( $r['headers'] );
+		if ( ! is_array($r['headers'])) {
+			$processedHeaders = WP_Http::processHeaders($r['headers']);
 			$r['headers'] = $processedHeaders['headers'];
 		}
 
@@ -300,33 +300,33 @@ 
 			'timeout' => $r['timeout'],
 			'useragent' => $r['user-agent'],
 			'blocking' => $r['blocking'],
-			'hooks' => new WP_HTTP_Requests_Hooks( $url, $r ),
+			'hooks' => new WP_HTTP_Requests_Hooks($url, $r),
 		);
 
 		// Ensure redirects follow browser behaviour.
-		$options['hooks']->register( 'requests.before_redirect', array( get_class(), 'browser_redirect_compatibility' ) );
+		$options['hooks']->register('requests.before_redirect', array(get_class(), 'browser_redirect_compatibility'));
 
-		if ( $r['stream'] ) {
+		if ($r['stream']) {
 			$options['filename'] = $r['filename'];
 		}
-		if ( empty( $r['redirection'] ) ) {
+		if (empty($r['redirection'])) {
 			$options['follow_redirects'] = false;
 		} else {
 			$options['redirects'] = $r['redirection'];
 		}
 
 		// Use byte limit, if we can
-		if ( isset( $r['limit_response_size'] ) ) {
+		if (isset($r['limit_response_size'])) {
 			$options['max_bytes'] = $r['limit_response_size'];
 		}
 
 		// If we've got cookies, use and convert them to Requests_Cookie.
-		if ( ! empty( $r['cookies'] ) ) {
-			$options['cookies'] = WP_Http::normalize_cookies( $r['cookies'] );
+		if ( ! empty($r['cookies'])) {
+			$options['cookies'] = WP_Http::normalize_cookies($r['cookies']);
 		}
 
 		// SSL certificate handling
-		if ( ! $r['sslverify'] ) {
+		if ( ! $r['sslverify']) {
 			$options['verify'] = false;
 			$options['verifyname'] = false;
 		} else {
@@ -334,7 +334,7 @@ 
 		}
 
 		// All non-GET/HEAD requests should put the arguments in the form body.
-		if ( 'HEAD' !== $type && 'GET' !== $type ) {
+		if ('HEAD' !== $type && 'GET' !== $type) {
 			$options['data_format'] = 'body';
 		}
 
@@ -345,14 +345,14 @@ 
 		 *
 		 * @param bool $ssl_verify Whether to verify the SSL connection. Default true.
 		 */
-		$options['verify'] = apply_filters( 'https_ssl_verify', $options['verify'] );
+		$options['verify'] = apply_filters('https_ssl_verify', $options['verify']);
 
 		// Check for proxies.
 		$proxy = new WP_HTTP_Proxy();
-		if ( $proxy->is_enabled() && $proxy->send_through_proxy( $url ) ) {
-			$options['proxy'] = new Requests_Proxy_HTTP( $proxy->host() . ':' . $proxy->port() );
+		if ($proxy->is_enabled() && $proxy->send_through_proxy($url)) {
+			$options['proxy'] = new Requests_Proxy_HTTP($proxy->host().':'.$proxy->port());
 
-			if ( $proxy->use_authentication() ) {
+			if ($proxy->use_authentication()) {
 				$options['proxy']->use_authentication = true;
 				$options['proxy']->user = $proxy->username();
 				$options['proxy']->pass = $proxy->password();
@@ -363,17 +363,17 @@ 
 		mbstring_binary_safe_encoding();
 
 		try {
-			$requests_response = Requests::request( $url, $headers, $data, $type, $options );
+			$requests_response = Requests::request($url, $headers, $data, $type, $options);
 
 			// Convert the response into an array
-			$http_response = new WP_HTTP_Requests_Response( $requests_response, $r['filename'] );
+			$http_response = new WP_HTTP_Requests_Response($requests_response, $r['filename']);
 			$response = $http_response->to_array();
 
 			// Add the original object to the array.
 			$response['http_response'] = $http_response;
 		}
-		catch ( Requests_Exception $e ) {
-			$response = new WP_Error( 'http_request_failed', $e->getMessage() );
+		catch (Requests_Exception $e) {
+			$response = new WP_Error('http_request_failed', $e->getMessage());
 		}
 
 		reset_mbstring_encoding();
@@ -389,12 +389,12 @@ 
 		 * @param array          $args     HTTP request arguments.
 		 * @param string         $url      The request URL.
 		 */
-		do_action( 'http_api_debug', $response, 'response', 'Requests', $r, $url );
-		if ( is_wp_error( $response ) ) {
+		do_action('http_api_debug', $response, 'response', 'Requests', $r, $url);
+		if (is_wp_error($response)) {
 			return $response;
 		}
 
-		if ( ! $r['blocking'] ) {
+		if ( ! $r['blocking']) {
 			return array(
 				'headers' => array(),
 				'body' => '',
@@ -416,7 +416,7 @@ 
 		 * @param array  $r        HTTP request arguments.
 		 * @param string $url      The request URL.
 		 */
-		return apply_filters( 'http_response', $response, $r, $url );
+		return apply_filters('http_response', $response, $r, $url);
 	}
 
 	/**
@@ -429,14 +429,14 @@ 
 	 * @param array $cookies List of cookies to send with the request.
 	 * @return Requests_Cookie_Jar Cookie holder object.
 	 */
-	public static function normalize_cookies( $cookies ) {
+	public static function normalize_cookies($cookies) {
 		$cookie_jar = new Requests_Cookie_Jar();
 
-		foreach ( $cookies as $name => $value ) {
-			if ( $value instanceof WP_Http_Cookie ) {
-				$cookie_jar[ $value->name ] = new Requests_Cookie( $value->name, $value->value, $value->get_attributes() );
-			} elseif ( is_scalar( $value ) ) {
-				$cookie_jar[ $name ] = new Requests_Cookie( $name, $value );
+		foreach ($cookies as $name => $value) {
+			if ($value instanceof WP_Http_Cookie) {
+				$cookie_jar[$value->name] = new Requests_Cookie($value->name, $value->value, $value->get_attributes());
+			} elseif (is_scalar($value)) {
+				$cookie_jar[$name] = new Requests_Cookie($name, $value);
 			}
 		}
 
@@ -459,9 +459,9 @@ 
 	 * @param array             $options  Redirect request options.
 	 * @param Requests_Response $original Response object.
 	 */
-	public static function browser_redirect_compatibility( $location, $headers, $data, &$options, $original ) {
+	public static function browser_redirect_compatibility($location, $headers, $data, &$options, $original) {
 		// Browser compat
-		if ( $original->status_code === 302 ) {
+		if ($original->status_code === 302) {
 			$options['type'] = Requests::GET;
 		}
 	}
@@ -477,8 +477,8 @@ 
 	 *
 	 * @return string|false Class name for the first transport that claims to support the request. False if no transport claims to support the request.
 	 */
-	public function _get_first_available_transport( $args, $url = null ) {
-		$transports = array( 'curl', 'streams' );
+	public function _get_first_available_transport($args, $url = null) {
+		$transports = array('curl', 'streams');
 
 		/**
 		 * Filters which HTTP transports are available and in what order.
@@ -490,17 +490,17 @@ 
 		 * @param array  $args       HTTP request arguments.
 		 * @param string $url        The URL to request.
 		 */
-		$request_order = apply_filters( 'http_api_transports', $transports, $args, $url );
+		$request_order = apply_filters('http_api_transports', $transports, $args, $url);
 
 		// Loop over each transport on each HTTP request looking for one which will serve this request's needs.
-		foreach ( $request_order as $transport ) {
-			if ( in_array( $transport, $transports ) ) {
-				$transport = ucfirst( $transport );
+		foreach ($request_order as $transport) {
+			if (in_array($transport, $transports)) {
+				$transport = ucfirst($transport);
 			}
-			$class = 'WP_Http_' . $transport;
+			$class = 'WP_Http_'.$transport;
 
 			// Check to see if this transport is a possibility, calls the transport statically.
-			if ( !call_user_func( array( $class, 'test' ), $args, $url ) )
+			if ( ! call_user_func(array($class, 'test'), $args, $url))
 				continue;
 
 			return $class;
@@ -526,23 +526,23 @@ 
 	 * @param array $args Request arguments
 	 * @return array|WP_Error Array containing 'headers', 'body', 'response', 'cookies', 'filename'. A WP_Error instance upon error
 	 */
-	private function _dispatch_request( $url, $args ) {
+	private function _dispatch_request($url, $args) {
 		static $transports = array();
 
-		$class = $this->_get_first_available_transport( $args, $url );
-		if ( !$class )
-			return new WP_Error( 'http_failure', __( 'There are no HTTP transports available which can complete the requested request.' ) );
+		$class = $this->_get_first_available_transport($args, $url);
+		if ( ! $class)
+			return new WP_Error('http_failure', __('There are no HTTP transports available which can complete the requested request.'));
 
 		// Transport claims to support request, instantiate it and give it a whirl.
-		if ( empty( $transports[$class] ) )
+		if (empty($transports[$class]))
 			$transports[$class] = new $class;
 
-		$response = $transports[$class]->request( $url, $args );
+		$response = $transports[$class]->request($url, $args);
 
 		/** This action is documented in wp-includes/class-http.php */
-		do_action( 'http_api_debug', $response, 'response', $class, $args, $url );
+		do_action('http_api_debug', $response, 'response', $class, $args, $url);
 
-		if ( is_wp_error( $response ) )
+		if (is_wp_error($response))
 			return $response;
 
 		/**
@@ -554,7 +554,7 @@ 
 		 * @param array  $args     HTTP request arguments.
 		 * @param string $url      The request URL.
 		 */
-		return apply_filters( 'http_response', $response, $args, $url );
+		return apply_filters('http_response', $response, $args, $url);
 	}
 
 	/**
@@ -571,7 +571,7 @@ 
 	 */
 	public function post($url, $args = array()) {
 		$defaults = array('method' => 'POST');
-		$r = wp_parse_args( $args, $defaults );
+		$r = wp_parse_args($args, $defaults);
 		return $this->request($url, $r);
 	}
 
@@ -589,7 +589,7 @@ 
 	 */
 	public function get($url, $args = array()) {
 		$defaults = array('method' => 'GET');
-		$r = wp_parse_args( $args, $defaults );
+		$r = wp_parse_args($args, $defaults);
 		return $this->request($url, $r);
 	}
 
@@ -607,7 +607,7 @@ 
 	 */
 	public function head($url, $args = array()) {
 		$defaults = array('method' => 'HEAD');
-		$r = wp_parse_args( $args, $defaults );
+		$r = wp_parse_args($args, $defaults);
 		return $this->request($url, $r);
 	}
 
@@ -642,9 +642,9 @@ 
 	 * @return array Processed string headers. If duplicate headers are encountered,
 	 * 					Then a numbered array is returned as the value of that header-key.
 	 */
-	public static function processHeaders( $headers, $url = '' ) {
+	public static function processHeaders($headers, $url = '') {
 		// Split headers, one per array element.
-		if ( is_string($headers) ) {
+		if (is_string($headers)) {
 			// Tolerate line terminator: CRLF = LF (RFC 2616 19.3).
 			$headers = str_replace("\r\n", "\n", $headers);
 			/*
@@ -662,8 +662,8 @@ 
 		 * If a redirection has taken place, The headers for each page request may have been passed.
 		 * In this case, determine the final HTTP header and parse from there.
 		 */
-		for ( $i = count($headers)-1; $i >= 0; $i-- ) {
-			if ( !empty($headers[$i]) && false === strpos($headers[$i], ':') ) {
+		for ($i = count($headers) - 1; $i >= 0; $i--) {
+			if ( ! empty($headers[$i]) && false === strpos($headers[$i], ':')) {
 				$headers = array_splice($headers, $i);
 				break;
 			}
@@ -671,35 +671,35 @@ 
 
 		$cookies = array();
 		$newheaders = array();
-		foreach ( (array) $headers as $tempheader ) {
-			if ( empty($tempheader) )
+		foreach ((array) $headers as $tempheader) {
+			if (empty($tempheader))
 				continue;
 
-			if ( false === strpos($tempheader, ':') ) {
+			if (false === strpos($tempheader, ':')) {
 				$stack = explode(' ', $tempheader, 3);
 				$stack[] = '';
-				list( , $response['code'], $response['message']) = $stack;
+				list(, $response['code'], $response['message']) = $stack;
 				continue;
 			}
 
 			list($key, $value) = explode(':', $tempheader, 2);
 
-			$key = strtolower( $key );
-			$value = trim( $value );
+			$key = strtolower($key);
+			$value = trim($value);
 
-			if ( isset( $newheaders[ $key ] ) ) {
-				if ( ! is_array( $newheaders[ $key ] ) )
-					$newheaders[$key] = array( $newheaders[ $key ] );
-				$newheaders[ $key ][] = $value;
+			if (isset($newheaders[$key])) {
+				if ( ! is_array($newheaders[$key]))
+					$newheaders[$key] = array($newheaders[$key]);
+				$newheaders[$key][] = $value;
 			} else {
-				$newheaders[ $key ] = $value;
+				$newheaders[$key] = $value;
 			}
-			if ( 'set-cookie' == $key )
-				$cookies[] = new WP_Http_Cookie( $value, $url );
+			if ('set-cookie' == $key)
+				$cookies[] = new WP_Http_Cookie($value, $url);
 		}
 
 		// Cast the Response Code to an int
-		$response['code'] = intval( $response['code'] );
+		$response['code'] = intval($response['code']);
 
 		return array('response' => $response, 'headers' => $newheaders, 'cookies' => $cookies);
 	}
@@ -717,20 +717,20 @@ 
 	 *
 	 * @param array $r Full array of args passed into ::request()
 	 */
-	public static function buildCookieHeader( &$r ) {
-		if ( ! empty($r['cookies']) ) {
+	public static function buildCookieHeader(&$r) {
+		if ( ! empty($r['cookies'])) {
 			// Upgrade any name => value cookie pairs to WP_HTTP_Cookie instances.
-			foreach ( $r['cookies'] as $name => $value ) {
-				if ( ! is_object( $value ) )
-					$r['cookies'][ $name ] = new WP_Http_Cookie( array( 'name' => $name, 'value' => $value ) );
+			foreach ($r['cookies'] as $name => $value) {
+				if ( ! is_object($value))
+					$r['cookies'][$name] = new WP_Http_Cookie(array('name' => $name, 'value' => $value));
 			}
 
 			$cookies_header = '';
-			foreach ( (array) $r['cookies'] as $cookie ) {
-				$cookies_header .= $cookie->getHeaderValue() . '; ';
+			foreach ((array) $r['cookies'] as $cookie) {
+				$cookies_header .= $cookie->getHeaderValue().'; ';
 			}
 
-			$cookies_header = substr( $cookies_header, 0, -2 );
+			$cookies_header = substr($cookies_header, 0, -2);
 			$r['headers']['cookie'] = $cookies_header;
 		}
 	}
@@ -749,9 +749,9 @@ 
 	 * @param string $body Body content
 	 * @return string Chunked decoded body on success or raw body on failure.
 	 */
-	public static function chunkTransferDecode( $body ) {
+	public static function chunkTransferDecode($body) {
 		// The body is not chunked encoded or is malformed.
-		if ( ! preg_match( '/^([0-9a-f]+)[^\r\n]*\r\n/i', trim( $body ) ) )
+		if ( ! preg_match('/^([0-9a-f]+)[^\r\n]*\r\n/i', trim($body)))
 			return $body;
 
 		$parsed_body = '';
@@ -759,22 +759,22 @@ 
 		// We'll be altering $body, so need a backup in case of error.
 		$body_original = $body;
 
-		while ( true ) {
-			$has_chunk = (bool) preg_match( '/^([0-9a-f]+)[^\r\n]*\r\n/i', $body, $match );
-			if ( ! $has_chunk || empty( $match[1] ) )
+		while (true) {
+			$has_chunk = (bool) preg_match('/^([0-9a-f]+)[^\r\n]*\r\n/i', $body, $match);
+			if ( ! $has_chunk || empty($match[1]))
 				return $body_original;
 
-			$length = hexdec( $match[1] );
-			$chunk_length = strlen( $match[0] );
+			$length = hexdec($match[1]);
+			$chunk_length = strlen($match[0]);
 
 			// Parse out the chunk of data.
-			$parsed_body .= substr( $body, $chunk_length, $length );
+			$parsed_body .= substr($body, $chunk_length, $length);
 
 			// Remove the chunk from the raw data.
-			$body = substr( $body, $length + $chunk_length );
+			$body = substr($body, $length + $chunk_length);
 
 			// End of the document.
-			if ( '0' === trim( $body ) )
+			if ('0' === trim($body))
 				return $parsed_body;
 		}
 	}
@@ -803,17 +803,17 @@ 
 	 */
 	public function block_request($uri) {
 		// We don't need to block requests, because nothing is blocked.
-		if ( ! defined( 'WP_HTTP_BLOCK_EXTERNAL' ) || ! WP_HTTP_BLOCK_EXTERNAL )
+		if ( ! defined('WP_HTTP_BLOCK_EXTERNAL') || ! WP_HTTP_BLOCK_EXTERNAL)
 			return false;
 
 		$check = parse_url($uri);
-		if ( ! $check )
+		if ( ! $check)
 			return true;
 
-		$home = parse_url( get_option('siteurl') );
+		$home = parse_url(get_option('siteurl'));
 
 		// Don't block requests back to ourselves by default.
-		if ( 'localhost' == $check['host'] || ( isset( $home['host'] ) && $home['host'] == $check['host'] ) ) {
+		if ('localhost' == $check['host'] || (isset($home['host']) && $home['host'] == $check['host'])) {
 			/**
 			 * Filters whether to block local requests through the proxy.
 			 *
@@ -822,29 +822,29 @@ 
 			 * @param bool $block Whether to block local requests through proxy.
 			 *                    Default false.
 			 */
-			return apply_filters( 'block_local_requests', false );
+			return apply_filters('block_local_requests', false);
 		}
 
-		if ( !defined('WP_ACCESSIBLE_HOSTS') )
+		if ( ! defined('WP_ACCESSIBLE_HOSTS'))
 			return true;
 
 		static $accessible_hosts = null;
 		static $wildcard_regex = array();
-		if ( null === $accessible_hosts ) {
+		if (null === $accessible_hosts) {
 			$accessible_hosts = preg_split('|,\s*|', WP_ACCESSIBLE_HOSTS);
 
-			if ( false !== strpos(WP_ACCESSIBLE_HOSTS, '*') ) {
+			if (false !== strpos(WP_ACCESSIBLE_HOSTS, '*')) {
 				$wildcard_regex = array();
-				foreach ( $accessible_hosts as $host )
-					$wildcard_regex[] = str_replace( '\*', '.+', preg_quote( $host, '/' ) );
-				$wildcard_regex = '/^(' . implode('|', $wildcard_regex) . ')$/i';
+				foreach ($accessible_hosts as $host)
+					$wildcard_regex[] = str_replace('\*', '.+', preg_quote($host, '/'));
+				$wildcard_regex = '/^('.implode('|', $wildcard_regex).')$/i';
 			}
 		}
 
-		if ( !empty($wildcard_regex) )
-			return !preg_match($wildcard_regex, $check['host']);
+		if ( ! empty($wildcard_regex))
+			return ! preg_match($wildcard_regex, $check['host']);
 		else
-			return !in_array( $check['host'], $accessible_hosts ); //Inverse logic, If it's in the array, then we can't access it.
+			return ! in_array($check['host'], $accessible_hosts); //Inverse logic, If it's in the array, then we can't access it.
 
 	}
 
@@ -859,9 +859,9 @@ 
 	 * @return bool|array False on failure; Array of URL components on success;
 	 *                    See parse_url()'s return values.
 	 */
-	protected static function parse_url( $url ) {
-		_deprecated_function( __METHOD__, '4.4.0', 'wp_parse_url()' );
-		return wp_parse_url( $url );
+	protected static function parse_url($url) {
+		_deprecated_function(__METHOD__, '4.4.0', 'wp_parse_url()');
+		return wp_parse_url($url);
 	}
 
 	/**
@@ -878,65 +878,65 @@ 
 	 * @param string $url                 The URL which $maybe_relative_path is relative to
 	 * @return string An Absolute URL, in a failure condition where the URL cannot be parsed, the relative URL will be returned.
 	 */
-	public static function make_absolute_url( $maybe_relative_path, $url ) {
-		if ( empty( $url ) )
+	public static function make_absolute_url($maybe_relative_path, $url) {
+		if (empty($url))
 			return $maybe_relative_path;
 
-		if ( ! $url_parts = wp_parse_url( $url ) ) {
+		if ( ! $url_parts = wp_parse_url($url)) {
 			return $maybe_relative_path;
 		}
 
-		if ( ! $relative_url_parts = wp_parse_url( $maybe_relative_path ) ) {
+		if ( ! $relative_url_parts = wp_parse_url($maybe_relative_path)) {
 			return $maybe_relative_path;
 		}
 
 		// Check for a scheme on the 'relative' url
-		if ( ! empty( $relative_url_parts['scheme'] ) ) {
+		if ( ! empty($relative_url_parts['scheme'])) {
 			return $maybe_relative_path;
 		}
 
-		$absolute_path = $url_parts['scheme'] . '://';
+		$absolute_path = $url_parts['scheme'].'://';
 
 		// Schemeless URL's will make it this far, so we check for a host in the relative url and convert it to a protocol-url
-		if ( isset( $relative_url_parts['host'] ) ) {
+		if (isset($relative_url_parts['host'])) {
 			$absolute_path .= $relative_url_parts['host'];
-			if ( isset( $relative_url_parts['port'] ) )
-				$absolute_path .= ':' . $relative_url_parts['port'];
+			if (isset($relative_url_parts['port']))
+				$absolute_path .= ':'.$relative_url_parts['port'];
 		} else {
 			$absolute_path .= $url_parts['host'];
-			if ( isset( $url_parts['port'] ) )
-				$absolute_path .= ':' . $url_parts['port'];
+			if (isset($url_parts['port']))
+				$absolute_path .= ':'.$url_parts['port'];
 		}
 
 		// Start off with the Absolute URL path.
-		$path = ! empty( $url_parts['path'] ) ? $url_parts['path'] : '/';
+		$path = ! empty($url_parts['path']) ? $url_parts['path'] : '/';
 
 		// If it's a root-relative path, then great.
-		if ( ! empty( $relative_url_parts['path'] ) && '/' == $relative_url_parts['path'][0] ) {
+		if ( ! empty($relative_url_parts['path']) && '/' == $relative_url_parts['path'][0]) {
 			$path = $relative_url_parts['path'];
 
 		// Else it's a relative path.
-		} elseif ( ! empty( $relative_url_parts['path'] ) ) {
+		} elseif ( ! empty($relative_url_parts['path'])) {
 			// Strip off any file components from the absolute path.
-			$path = substr( $path, 0, strrpos( $path, '/' ) + 1 );
+			$path = substr($path, 0, strrpos($path, '/') + 1);
 
 			// Build the new path.
 			$path .= $relative_url_parts['path'];
 
 			// Strip all /path/../ out of the path.
-			while ( strpos( $path, '../' ) > 1 ) {
-				$path = preg_replace( '![^/]+/\.\./!', '', $path );
+			while (strpos($path, '../') > 1) {
+				$path = preg_replace('![^/]+/\.\./!', '', $path);
 			}
 
 			// Strip any final leading ../ from the path.
-			$path = preg_replace( '!^/(\.\./)+!', '', $path );
+			$path = preg_replace('!^/(\.\./)+!', '', $path);
 		}
 
 		// Add the Query string.
-		if ( ! empty( $relative_url_parts['query'] ) )
-			$path .= '?' . $relative_url_parts['query'];
+		if ( ! empty($relative_url_parts['query']))
+			$path .= '?'.$relative_url_parts['query'];
 
-		return $absolute_path . '/' . ltrim( $path, '/' );
+		return $absolute_path.'/'.ltrim($path, '/');
 	}
 
 	/**
@@ -951,42 +951,42 @@ 
 	 * @param array $response The Response of the HTTP request.
 	 * @return false|object False if no redirect is present, a WP_HTTP or WP_Error result otherwise.
 	 */
-	public static function handle_redirects( $url, $args, $response ) {
+	public static function handle_redirects($url, $args, $response) {
 		// If no redirects are present, or, redirects were not requested, perform no action.
-		if ( ! isset( $response['headers']['location'] ) || 0 === $args['_redirection'] )
+		if ( ! isset($response['headers']['location']) || 0 === $args['_redirection'])
 			return false;
 
 		// Only perform redirections on redirection http codes.
-		if ( $response['response']['code'] > 399 || $response['response']['code'] < 300 )
+		if ($response['response']['code'] > 399 || $response['response']['code'] < 300)
 			return false;
 
 		// Don't redirect if we've run out of redirects.
-		if ( $args['redirection']-- <= 0 )
-			return new WP_Error( 'http_request_failed', __('Too many redirects.') );
+		if ($args['redirection']-- <= 0)
+			return new WP_Error('http_request_failed', __('Too many redirects.'));
 
 		$redirect_location = $response['headers']['location'];
 
 		// If there were multiple Location headers, use the last header specified.
-		if ( is_array( $redirect_location ) )
-			$redirect_location = array_pop( $redirect_location );
+		if (is_array($redirect_location))
+			$redirect_location = array_pop($redirect_location);
 
-		$redirect_location = WP_Http::make_absolute_url( $redirect_location, $url );
+		$redirect_location = WP_Http::make_absolute_url($redirect_location, $url);
 
 		// POST requests should not POST to a redirected location.
-		if ( 'POST' == $args['method'] ) {
-			if ( in_array( $response['response']['code'], array( 302, 303 ) ) )
+		if ('POST' == $args['method']) {
+			if (in_array($response['response']['code'], array(302, 303)))
 				$args['method'] = 'GET';
 		}
 
 		// Include valid cookies in the redirect process.
-		if ( ! empty( $response['cookies'] ) ) {
-			foreach ( $response['cookies'] as $cookie ) {
-				if ( $cookie->test( $redirect_location ) )
+		if ( ! empty($response['cookies'])) {
+			foreach ($response['cookies'] as $cookie) {
+				if ($cookie->test($redirect_location))
 					$args['cookies'][] = $cookie;
 			}
 		}
 
-		return wp_remote_request( $redirect_location, $args );
+		return wp_remote_request($redirect_location, $args);
 	}
 
 	/**
@@ -1005,11 +1005,11 @@ 
 	 * @param string $maybe_ip A suspected IP address
 	 * @return integer|bool Upon success, '4' or '6' to represent a IPv4 or IPv6 address, false upon failure
 	 */
-	public static function is_ip_address( $maybe_ip ) {
-		if ( preg_match( '/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/', $maybe_ip ) )
+	public static function is_ip_address($maybe_ip) {
+		if (preg_match('/^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$/', $maybe_ip))
 			return 4;
 
-		if ( false !== strpos( $maybe_ip, ':' ) && preg_match( '/^(((?=.*(::))(?!.*\3.+\3))\3?|([\dA-F]{1,4}(\3|:\b|$)|\2))(?4){5}((?4){2}|(((2[0-4]|1\d|[1-9])?\d|25[0-5])\.?\b){4})$/i', trim( $maybe_ip, ' []' ) ) )
+		if (false !== strpos($maybe_ip, ':') && preg_match('/^(((?=.*(::))(?!.*\3.+\3))\3?|([\dA-F]{1,4}(\3|:\b|$)|\2))(?4){5}((?4){2}|(((2[0-4]|1\d|[1-9])?\d|25[0-5])\.?\b){4})$/i', trim($maybe_ip, ' []')))
 			return 6;
 
 		return false;

src/wp-includes/class-wp-comment-query.php

Doc Comments +1 added lines, -1 removed lines

@@ -1004,7 +1004,7 @@
 	 * @global wpdb $wpdb WordPress database abstraction object.
 	 *
 	 * @param string $string
-	 * @param array $cols
+	 * @param string[] $cols
 	 * @return string
 	 */
 	protected function get_search_sql( $string, $cols ) {

Indentation +1 added lines, -1 removed lines

@@ -251,7 +251,7 @@
 	 *                                                   The parameter is ignored (forced to `false`) when
 	 *                                                   `$fields` is 'ids' or 'counts'. Accepts 'threaded',
 	 *                                                   'flat', or false. Default: false.
- 	 *     @type string       $cache_domain              Unique cache key to be produced when this query is stored in
+	 *     @type string       $cache_domain              Unique cache key to be produced when this query is stored in
 	 *                                                   an object cache. Default is 'core'.
 	 *     @type bool         $update_comment_meta_cache Whether to prime the metadata cache for found comments.
 	 *                                                   Default true.

Spacing +236 added lines, -237 removed lines

@@ -134,9 +134,9 @@ 
 	 * @param array    $arguments Arguments to pass when calling.
 	 * @return mixed|false Return value of the callback, false otherwise.
 	 */
-	public function __call( $name, $arguments ) {
-		if ( 'get_search_sql' === $name ) {
-			return call_user_func_array( array( $this, $name ), $arguments );
+	public function __call($name, $arguments) {
+		if ('get_search_sql' === $name) {
+			return call_user_func_array(array($this, $name), $arguments);
 		}
 		return false;
 	}
@@ -259,7 +259,7 @@ 
 	 *                                                   Default false.
 	 * }
 	 */
-	public function __construct( $query = '' ) {
+	public function __construct($query = '') {
 		$this->query_var_defaults = array(
 			'author_email' => '',
 			'author_url' => '',
@@ -307,8 +307,8 @@ 
 			'update_comment_post_cache' => false,
 		);
 
-		if ( ! empty( $query ) ) {
-			$this->query( $query );
+		if ( ! empty($query)) {
+			$this->query($query);
 		}
 	}
 
@@ -321,12 +321,12 @@ 
 	 *
 	 * @param string|array $query WP_Comment_Query arguments. See WP_Comment_Query::__construct()
 	 */
-	public function parse_query( $query = '' ) {
-		if ( empty( $query ) ) {
+	public function parse_query($query = '') {
+		if (empty($query)) {
 			$query = $this->query_vars;
 		}
 
-		$this->query_vars = wp_parse_args( $query, $this->query_var_defaults );
+		$this->query_vars = wp_parse_args($query, $this->query_var_defaults);
 
 		/**
 		 * Fires after the comment query vars have been parsed.
@@ -335,7 +335,7 @@ 
 		 *
 		 * @param WP_Comment_Query &$this The WP_Comment_Query instance (passed by reference).
 		 */
-		do_action_ref_array( 'parse_comment_query', array( &$this ) );
+		do_action_ref_array('parse_comment_query', array(&$this));
 	}
 
 	/**
@@ -352,8 +352,8 @@ 
 	 * @param string|array $query Array or URL query string of parameters.
 	 * @return array|int List of comments, or number of comments when 'count' is passed as a query var.
 	 */
-	public function query( $query ) {
-		$this->query_vars = wp_parse_args( $query );
+	public function query($query) {
+		$this->query_vars = wp_parse_args($query);
 		return $this->get_comments();
 	}
 
@@ -374,7 +374,7 @@ 
 
 		// Parse meta query
 		$this->meta_query = new WP_Meta_Query();
-		$this->meta_query->parse_query_vars( $this->query_vars );
+		$this->meta_query->parse_query_vars($this->query_vars);
 
 		/**
 		 * Fires before comments are retrieved.
@@ -383,24 +383,24 @@ 
 		 *
 		 * @param WP_Comment_Query &$this Current instance of WP_Comment_Query, passed by reference.
 		 */
-		do_action_ref_array( 'pre_get_comments', array( &$this ) );
+		do_action_ref_array('pre_get_comments', array(&$this));
 
 		// Reparse query vars, in case they were modified in a 'pre_get_comments' callback.
-		$this->meta_query->parse_query_vars( $this->query_vars );
-		if ( ! empty( $this->meta_query->queries ) ) {
-			$this->meta_query_clauses = $this->meta_query->get_sql( 'comment', $wpdb->comments, 'comment_ID', $this );
+		$this->meta_query->parse_query_vars($this->query_vars);
+		if ( ! empty($this->meta_query->queries)) {
+			$this->meta_query_clauses = $this->meta_query->get_sql('comment', $wpdb->comments, 'comment_ID', $this);
 		}
 
 		// $args can include anything. Only use the args defined in the query_var_defaults to compute the key.
-		$key = md5( serialize( wp_array_slice_assoc( $this->query_vars, array_keys( $this->query_var_defaults ) ) ) );
-		$last_changed = wp_cache_get_last_changed( 'comment' );
+		$key = md5(serialize(wp_array_slice_assoc($this->query_vars, array_keys($this->query_var_defaults))));
+		$last_changed = wp_cache_get_last_changed('comment');
 
 
 		$cache_key   = "get_comments:$key:$last_changed";
-		$cache_value = wp_cache_get( $cache_key, 'comment' );
-		if ( false === $cache_value ) {
+		$cache_value = wp_cache_get($cache_key, 'comment');
+		if (false === $cache_value) {
 			$comment_ids = $this->get_comment_ids();
-			if ( $comment_ids ) {
+			if ($comment_ids) {
 				$this->set_found_comments();
 			}
 
@@ -408,47 +408,47 @@ 
 				'comment_ids'    => $comment_ids,
 				'found_comments' => $this->found_comments,
 			);
-			wp_cache_add( $cache_key, $cache_value, 'comment' );
+			wp_cache_add($cache_key, $cache_value, 'comment');
 		} else {
 			$comment_ids          = $cache_value['comment_ids'];
 			$this->found_comments = $cache_value['found_comments'];
 		}
 
-		if ( $this->found_comments && $this->query_vars['number'] ) {
-			$this->max_num_pages = ceil( $this->found_comments / $this->query_vars['number'] );
+		if ($this->found_comments && $this->query_vars['number']) {
+			$this->max_num_pages = ceil($this->found_comments / $this->query_vars['number']);
 		}
 
 		// If querying for a count only, there's nothing more to do.
-		if ( $this->query_vars['count'] ) {
+		if ($this->query_vars['count']) {
 			// $comment_ids is actually a count in this case.
-			return intval( $comment_ids );
+			return intval($comment_ids);
 		}
 
-		$comment_ids = array_map( 'intval', $comment_ids );
+		$comment_ids = array_map('intval', $comment_ids);
 
-		if ( 'ids' == $this->query_vars['fields'] ) {
+		if ('ids' == $this->query_vars['fields']) {
 			$this->comments = $comment_ids;
 			return $this->comments;
 		}
 
-		_prime_comment_caches( $comment_ids, $this->query_vars['update_comment_meta_cache'] );
+		_prime_comment_caches($comment_ids, $this->query_vars['update_comment_meta_cache']);
 
 		// Fetch full comment objects from the primed cache.
 		$_comments = array();
-		foreach ( $comment_ids as $comment_id ) {
-			if ( $_comment = get_comment( $comment_id ) ) {
+		foreach ($comment_ids as $comment_id) {
+			if ($_comment = get_comment($comment_id)) {
 				$_comments[] = $_comment;
 			}
 		}
 
 		// Prime comment post caches.
-		if ( $this->query_vars['update_comment_post_cache'] ) {
+		if ($this->query_vars['update_comment_post_cache']) {
 			$comment_post_ids = array();
-			foreach ( $_comments as $_comment ) {
+			foreach ($_comments as $_comment) {
 				$comment_post_ids[] = $_comment->comment_post_ID;
 			}
 
-			_prime_post_caches( $comment_post_ids, false, false );
+			_prime_post_caches($comment_post_ids, false, false);
 		}
 
 		/**
@@ -459,13 +459,13 @@ 
 		 * @param array            $results  An array of comments.
 		 * @param WP_Comment_Query &$this    Current instance of WP_Comment_Query, passed by reference.
 		 */
-		$_comments = apply_filters_ref_array( 'the_comments', array( $_comments, &$this ) );
+		$_comments = apply_filters_ref_array('the_comments', array($_comments, &$this));
 
 		// Convert to WP_Comment instances
-		$comments = array_map( 'get_comment', $_comments );
+		$comments = array_map('get_comment', $_comments);
 
-		if ( $this->query_vars['hierarchical'] ) {
-			$comments = $this->fill_descendants( $comments );
+		if ($this->query_vars['hierarchical']) {
+			$comments = $this->fill_descendants($comments);
 		}
 
 		$this->comments = $comments;
@@ -489,14 +489,14 @@ 
 		// 'status' accepts an array or a comma-separated string.
 		$status_clauses = array();
 		$statuses = $this->query_vars['status'];
-		if ( ! is_array( $statuses ) ) {
-			$statuses = preg_split( '/[\s,]+/', $statuses );
+		if ( ! is_array($statuses)) {
+			$statuses = preg_split('/[\s,]+/', $statuses);
 		}
 
 		// 'any' overrides other statuses.
-		if ( ! in_array( 'any', $statuses ) ) {
-			foreach ( $statuses as $status ) {
-				switch ( $status ) {
+		if ( ! in_array('any', $statuses)) {
+			foreach ($statuses as $status) {
+				switch ($status) {
 					case 'hold' :
 						$status_clauses[] = "comment_approved = '0'";
 						break;
@@ -511,65 +511,64 @@ 
 						break;
 
 					default :
-						$status_clauses[] = $wpdb->prepare( "comment_approved = %s", $status );
+						$status_clauses[] = $wpdb->prepare("comment_approved = %s", $status);
 						break;
 				}
 			}
 
-			if ( ! empty( $status_clauses ) ) {
-				$approved_clauses[] = '( ' . implode( ' OR ', $status_clauses ) . ' )';
+			if ( ! empty($status_clauses)) {
+				$approved_clauses[] = '( '.implode(' OR ', $status_clauses).' )';
 			}
 		}
 
 		// User IDs or emails whose unapproved comments are included, regardless of $status.
-		if ( ! empty( $this->query_vars['include_unapproved'] ) ) {
+		if ( ! empty($this->query_vars['include_unapproved'])) {
 			$include_unapproved = $this->query_vars['include_unapproved'];
 
 			// Accepts arrays or comma-separated strings.
-			if ( ! is_array( $include_unapproved ) ) {
-				$include_unapproved = preg_split( '/[\s,]+/', $include_unapproved );
+			if ( ! is_array($include_unapproved)) {
+				$include_unapproved = preg_split('/[\s,]+/', $include_unapproved);
 			}
 
 			$unapproved_ids = $unapproved_emails = array();
-			foreach ( $include_unapproved as $unapproved_identifier ) {
+			foreach ($include_unapproved as $unapproved_identifier) {
 				// Numeric values are assumed to be user ids.
-				if ( is_numeric( $unapproved_identifier ) ) {
-					$approved_clauses[] = $wpdb->prepare( "( user_id = %d AND comment_approved = '0' )", $unapproved_identifier );
+				if (is_numeric($unapproved_identifier)) {
+					$approved_clauses[] = $wpdb->prepare("( user_id = %d AND comment_approved = '0' )", $unapproved_identifier);
 
 				// Otherwise we match against email addresses.
 				} else {
-					$approved_clauses[] = $wpdb->prepare( "( comment_author_email = %s AND comment_approved = '0' )", $unapproved_identifier );
+					$approved_clauses[] = $wpdb->prepare("( comment_author_email = %s AND comment_approved = '0' )", $unapproved_identifier);
 				}
 			}
 		}
 
 		// Collapse comment_approved clauses into a single OR-separated clause.
-		if ( ! empty( $approved_clauses ) ) {
-			if ( 1 === count( $approved_clauses ) ) {
+		if ( ! empty($approved_clauses)) {
+			if (1 === count($approved_clauses)) {
 				$this->sql_clauses['where']['approved'] = $approved_clauses[0];
 			} else {
-				$this->sql_clauses['where']['approved'] = '( ' . implode( ' OR ', $approved_clauses ) . ' )';
+				$this->sql_clauses['where']['approved'] = '( '.implode(' OR ', $approved_clauses).' )';
 			}
 		}
 
-		$order = ( 'ASC' == strtoupper( $this->query_vars['order'] ) ) ? 'ASC' : 'DESC';
+		$order = ('ASC' == strtoupper($this->query_vars['order'])) ? 'ASC' : 'DESC';
 
 		// Disable ORDER BY with 'none', an empty array, or boolean false.
-		if ( in_array( $this->query_vars['orderby'], array( 'none', array(), false ), true ) ) {
+		if (in_array($this->query_vars['orderby'], array('none', array(), false), true)) {
 			$orderby = '';
-		} elseif ( ! empty( $this->query_vars['orderby'] ) ) {
-			$ordersby = is_array( $this->query_vars['orderby'] ) ?
-				$this->query_vars['orderby'] :
-				preg_split( '/[,\s]/', $this->query_vars['orderby'] );
+		} elseif ( ! empty($this->query_vars['orderby'])) {
+			$ordersby = is_array($this->query_vars['orderby']) ?
+				$this->query_vars['orderby'] : preg_split('/[,\s]/', $this->query_vars['orderby']);
 
 			$orderby_array = array();
 			$found_orderby_comment_ID = false;
-			foreach ( $ordersby as $_key => $_value ) {
-				if ( ! $_value ) {
+			foreach ($ordersby as $_key => $_value) {
+				if ( ! $_value) {
 					continue;
 				}
 
-				if ( is_int( $_key ) ) {
+				if (is_int($_key)) {
 					$_orderby = $_value;
 					$_order = $order;
 				} else {
@@ -577,45 +576,45 @@ 
 					$_order = $_value;
 				}
 
-				if ( ! $found_orderby_comment_ID && in_array( $_orderby, array( 'comment_ID', 'comment__in' ) ) ) {
+				if ( ! $found_orderby_comment_ID && in_array($_orderby, array('comment_ID', 'comment__in'))) {
 					$found_orderby_comment_ID = true;
 				}
 
-				$parsed = $this->parse_orderby( $_orderby );
+				$parsed = $this->parse_orderby($_orderby);
 
-				if ( ! $parsed ) {
+				if ( ! $parsed) {
 					continue;
 				}
 
-				if ( 'comment__in' === $_orderby ) {
+				if ('comment__in' === $_orderby) {
 					$orderby_array[] = $parsed;
 					continue;
 				}
 
-				$orderby_array[] = $parsed . ' ' . $this->parse_order( $_order );
+				$orderby_array[] = $parsed.' '.$this->parse_order($_order);
 			}
 
 			// If no valid clauses were found, order by comment_date_gmt.
-			if ( empty( $orderby_array ) ) {
+			if (empty($orderby_array)) {
 				$orderby_array[] = "$wpdb->comments.comment_date_gmt $order";
 			}
 
 			// To ensure determinate sorting, always include a comment_ID clause.
-			if ( ! $found_orderby_comment_ID ) {
+			if ( ! $found_orderby_comment_ID) {
 				$comment_ID_order = '';
 
 				// Inherit order from comment_date or comment_date_gmt, if available.
-				foreach ( $orderby_array as $orderby_clause ) {
-					if ( preg_match( '/comment_date(?:_gmt)*\ (ASC|DESC)/', $orderby_clause, $match ) ) {
+				foreach ($orderby_array as $orderby_clause) {
+					if (preg_match('/comment_date(?:_gmt)*\ (ASC|DESC)/', $orderby_clause, $match)) {
 						$comment_ID_order = $match[1];
 						break;
 					}
 				}
 
 				// If no date-related order is available, use the date from the first available clause.
-				if ( ! $comment_ID_order ) {
-					foreach ( $orderby_array as $orderby_clause ) {
-						if ( false !== strpos( 'ASC', $orderby_clause ) ) {
+				if ( ! $comment_ID_order) {
+					foreach ($orderby_array as $orderby_clause) {
+						if (false !== strpos('ASC', $orderby_clause)) {
 							$comment_ID_order = 'ASC';
 						} else {
 							$comment_ID_order = 'DESC';
@@ -626,94 +625,94 @@ 
 				}
 
 				// Default to DESC.
-				if ( ! $comment_ID_order ) {
+				if ( ! $comment_ID_order) {
 					$comment_ID_order = 'DESC';
 				}
 
 				$orderby_array[] = "$wpdb->comments.comment_ID $comment_ID_order";
 			}
 
-			$orderby = implode( ', ', $orderby_array );
+			$orderby = implode(', ', $orderby_array);
 		} else {
 			$orderby = "$wpdb->comments.comment_date_gmt $order";
 		}
 
-		$number = absint( $this->query_vars['number'] );
-		$offset = absint( $this->query_vars['offset'] );
+		$number = absint($this->query_vars['number']);
+		$offset = absint($this->query_vars['offset']);
 
-		if ( ! empty( $number ) ) {
-			if ( $offset ) {
-				$limits = 'LIMIT ' . $offset . ',' . $number;
+		if ( ! empty($number)) {
+			if ($offset) {
+				$limits = 'LIMIT '.$offset.','.$number;
 			} else {
-				$limits = 'LIMIT ' . $number;
+				$limits = 'LIMIT '.$number;
 			}
 		}
 
-		if ( $this->query_vars['count'] ) {
+		if ($this->query_vars['count']) {
 			$fields = 'COUNT(*)';
 		} else {
 			$fields = "$wpdb->comments.comment_ID";
 		}
 
-		$post_id = absint( $this->query_vars['post_id'] );
-		if ( ! empty( $post_id ) ) {
-			$this->sql_clauses['where']['post_id'] = $wpdb->prepare( 'comment_post_ID = %d', $post_id );
+		$post_id = absint($this->query_vars['post_id']);
+		if ( ! empty($post_id)) {
+			$this->sql_clauses['where']['post_id'] = $wpdb->prepare('comment_post_ID = %d', $post_id);
 		}
 
 		// Parse comment IDs for an IN clause.
-		if ( ! empty( $this->query_vars['comment__in'] ) ) {
-			$this->sql_clauses['where']['comment__in'] = "$wpdb->comments.comment_ID IN ( " . implode( ',', wp_parse_id_list( $this->query_vars['comment__in'] ) ) . ' )';
+		if ( ! empty($this->query_vars['comment__in'])) {
+			$this->sql_clauses['where']['comment__in'] = "$wpdb->comments.comment_ID IN ( ".implode(',', wp_parse_id_list($this->query_vars['comment__in'])).' )';
 		}
 
 		// Parse comment IDs for a NOT IN clause.
-		if ( ! empty( $this->query_vars['comment__not_in'] ) ) {
-			$this->sql_clauses['where']['comment__not_in'] = "$wpdb->comments.comment_ID NOT IN ( " . implode( ',', wp_parse_id_list( $this->query_vars['comment__not_in'] ) ) . ' )';
+		if ( ! empty($this->query_vars['comment__not_in'])) {
+			$this->sql_clauses['where']['comment__not_in'] = "$wpdb->comments.comment_ID NOT IN ( ".implode(',', wp_parse_id_list($this->query_vars['comment__not_in'])).' )';
 		}
 
 		// Parse comment parent IDs for an IN clause.
-		if ( ! empty( $this->query_vars['parent__in'] ) ) {
-			$this->sql_clauses['where']['parent__in'] = 'comment_parent IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['parent__in'] ) ) . ' )';
+		if ( ! empty($this->query_vars['parent__in'])) {
+			$this->sql_clauses['where']['parent__in'] = 'comment_parent IN ( '.implode(',', wp_parse_id_list($this->query_vars['parent__in'])).' )';
 		}
 
 		// Parse comment parent IDs for a NOT IN clause.
-		if ( ! empty( $this->query_vars['parent__not_in'] ) ) {
-			$this->sql_clauses['where']['parent__not_in'] = 'comment_parent NOT IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['parent__not_in'] ) ) . ' )';
+		if ( ! empty($this->query_vars['parent__not_in'])) {
+			$this->sql_clauses['where']['parent__not_in'] = 'comment_parent NOT IN ( '.implode(',', wp_parse_id_list($this->query_vars['parent__not_in'])).' )';
 		}
 
 		// Parse comment post IDs for an IN clause.
-		if ( ! empty( $this->query_vars['post__in'] ) ) {
-			$this->sql_clauses['where']['post__in'] = 'comment_post_ID IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['post__in'] ) ) . ' )';
+		if ( ! empty($this->query_vars['post__in'])) {
+			$this->sql_clauses['where']['post__in'] = 'comment_post_ID IN ( '.implode(',', wp_parse_id_list($this->query_vars['post__in'])).' )';
 		}
 
 		// Parse comment post IDs for a NOT IN clause.
-		if ( ! empty( $this->query_vars['post__not_in'] ) ) {
-			$this->sql_clauses['where']['post__not_in'] = 'comment_post_ID NOT IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['post__not_in'] ) ) . ' )';
+		if ( ! empty($this->query_vars['post__not_in'])) {
+			$this->sql_clauses['where']['post__not_in'] = 'comment_post_ID NOT IN ( '.implode(',', wp_parse_id_list($this->query_vars['post__not_in'])).' )';
 		}
 
-		if ( '' !== $this->query_vars['author_email'] ) {
-			$this->sql_clauses['where']['author_email'] = $wpdb->prepare( 'comment_author_email = %s', $this->query_vars['author_email'] );
+		if ('' !== $this->query_vars['author_email']) {
+			$this->sql_clauses['where']['author_email'] = $wpdb->prepare('comment_author_email = %s', $this->query_vars['author_email']);
 		}
 
-		if ( '' !== $this->query_vars['author_url'] ) {
-			$this->sql_clauses['where']['author_url'] = $wpdb->prepare( 'comment_author_url = %s', $this->query_vars['author_url'] );
+		if ('' !== $this->query_vars['author_url']) {
+			$this->sql_clauses['where']['author_url'] = $wpdb->prepare('comment_author_url = %s', $this->query_vars['author_url']);
 		}
 
-		if ( '' !== $this->query_vars['karma'] ) {
-			$this->sql_clauses['where']['karma'] = $wpdb->prepare( 'comment_karma = %d', $this->query_vars['karma'] );
+		if ('' !== $this->query_vars['karma']) {
+			$this->sql_clauses['where']['karma'] = $wpdb->prepare('comment_karma = %d', $this->query_vars['karma']);
 		}
 
 		// Filtering by comment_type: 'type', 'type__in', 'type__not_in'.
 		$raw_types = array(
-			'IN' => array_merge( (array) $this->query_vars['type'], (array) $this->query_vars['type__in'] ),
+			'IN' => array_merge((array) $this->query_vars['type'], (array) $this->query_vars['type__in']),
 			'NOT IN' => (array) $this->query_vars['type__not_in'],
 		);
 
 		$comment_types = array();
-		foreach ( $raw_types as $operator => $_raw_types ) {
-			$_raw_types = array_unique( $_raw_types );
+		foreach ($raw_types as $operator => $_raw_types) {
+			$_raw_types = array_unique($_raw_types);
 
-			foreach ( $_raw_types as $type ) {
-				switch ( $type ) {
+			foreach ($_raw_types as $type) {
+				switch ($type) {
 					// An empty translates to 'all', for backward compatibility
 					case '':
 					case 'all' :
@@ -721,134 +720,134 @@ 
 
 					case 'comment':
 					case 'comments':
-						$comment_types[ $operator ][] = "''";
+						$comment_types[$operator][] = "''";
 						break;
 
 					case 'pings':
-						$comment_types[ $operator ][] = "'pingback'";
-						$comment_types[ $operator ][] = "'trackback'";
+						$comment_types[$operator][] = "'pingback'";
+						$comment_types[$operator][] = "'trackback'";
 						break;
 
 					default:
-						$comment_types[ $operator ][] = $wpdb->prepare( '%s', $type );
+						$comment_types[$operator][] = $wpdb->prepare('%s', $type);
 						break;
 				}
 			}
 
-			if ( ! empty( $comment_types[ $operator ] ) ) {
-				$types_sql = implode( ', ', $comment_types[ $operator ] );
-				$this->sql_clauses['where']['comment_type__' . strtolower( str_replace( ' ', '_', $operator ) ) ] = "comment_type $operator ($types_sql)";
+			if ( ! empty($comment_types[$operator])) {
+				$types_sql = implode(', ', $comment_types[$operator]);
+				$this->sql_clauses['where']['comment_type__'.strtolower(str_replace(' ', '_', $operator))] = "comment_type $operator ($types_sql)";
 			}
 		}
 
 		$parent = $this->query_vars['parent'];
-		if ( $this->query_vars['hierarchical'] && ! $parent ) {
+		if ($this->query_vars['hierarchical'] && ! $parent) {
 			$parent = 0;
 		}
 
-		if ( '' !== $parent ) {
-			$this->sql_clauses['where']['parent'] = $wpdb->prepare( 'comment_parent = %d', $parent );
+		if ('' !== $parent) {
+			$this->sql_clauses['where']['parent'] = $wpdb->prepare('comment_parent = %d', $parent);
 		}
 
-		if ( is_array( $this->query_vars['user_id'] ) ) {
-			$this->sql_clauses['where']['user_id'] = 'user_id IN (' . implode( ',', array_map( 'absint', $this->query_vars['user_id'] ) ) . ')';
-		} elseif ( '' !== $this->query_vars['user_id'] ) {
-			$this->sql_clauses['where']['user_id'] = $wpdb->prepare( 'user_id = %d', $this->query_vars['user_id'] );
+		if (is_array($this->query_vars['user_id'])) {
+			$this->sql_clauses['where']['user_id'] = 'user_id IN ('.implode(',', array_map('absint', $this->query_vars['user_id'])).')';
+		} elseif ('' !== $this->query_vars['user_id']) {
+			$this->sql_clauses['where']['user_id'] = $wpdb->prepare('user_id = %d', $this->query_vars['user_id']);
 		}
 
 		// Falsy search strings are ignored.
-		if ( strlen( $this->query_vars['search'] ) ) {
+		if (strlen($this->query_vars['search'])) {
 			$search_sql = $this->get_search_sql(
 				$this->query_vars['search'],
-				array( 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_author_IP', 'comment_content' )
+				array('comment_author', 'comment_author_email', 'comment_author_url', 'comment_author_IP', 'comment_content')
 			);
 
 			// Strip leading 'AND'.
-			$this->sql_clauses['where']['search'] = preg_replace( '/^\s*AND\s*/', '', $search_sql );
+			$this->sql_clauses['where']['search'] = preg_replace('/^\s*AND\s*/', '', $search_sql);
 		}
 
 		// If any post-related query vars are passed, join the posts table.
 		$join_posts_table = false;
-		$plucked = wp_array_slice_assoc( $this->query_vars, array( 'post_author', 'post_name', 'post_parent' ) );
-		$post_fields = array_filter( $plucked );
+		$plucked = wp_array_slice_assoc($this->query_vars, array('post_author', 'post_name', 'post_parent'));
+		$post_fields = array_filter($plucked);
 
-		if ( ! empty( $post_fields ) ) {
+		if ( ! empty($post_fields)) {
 			$join_posts_table = true;
-			foreach ( $post_fields as $field_name => $field_value ) {
+			foreach ($post_fields as $field_name => $field_value) {
 				// $field_value may be an array.
-				$esses = array_fill( 0, count( (array) $field_value ), '%s' );
-				$this->sql_clauses['where'][ $field_name ] = $wpdb->prepare( " {$wpdb->posts}.{$field_name} IN (" . implode( ',', $esses ) . ')', $field_value );
+				$esses = array_fill(0, count((array) $field_value), '%s');
+				$this->sql_clauses['where'][$field_name] = $wpdb->prepare(" {$wpdb->posts}.{$field_name} IN (".implode(',', $esses).')', $field_value);
 			}
 		}
 
 		// 'post_status' and 'post_type' are handled separately, due to the specialized behavior of 'any'.
-		foreach ( array( 'post_status', 'post_type' ) as $field_name ) {
+		foreach (array('post_status', 'post_type') as $field_name) {
 			$q_values = array();
-			if ( ! empty( $this->query_vars[ $field_name ] ) ) {
-				$q_values = $this->query_vars[ $field_name ];
-				if ( ! is_array( $q_values ) ) {
-					$q_values = explode( ',', $q_values );
+			if ( ! empty($this->query_vars[$field_name])) {
+				$q_values = $this->query_vars[$field_name];
+				if ( ! is_array($q_values)) {
+					$q_values = explode(',', $q_values);
 				}
 
 				// 'any' will cause the query var to be ignored.
-				if ( in_array( 'any', $q_values, true ) || empty( $q_values ) ) {
+				if (in_array('any', $q_values, true) || empty($q_values)) {
 					continue;
 				}
 
 				$join_posts_table = true;
 
-				$esses = array_fill( 0, count( $q_values ), '%s' );
-				$this->sql_clauses['where'][ $field_name ] = $wpdb->prepare( " {$wpdb->posts}.{$field_name} IN (" . implode( ',', $esses ) . ")", $q_values );
+				$esses = array_fill(0, count($q_values), '%s');
+				$this->sql_clauses['where'][$field_name] = $wpdb->prepare(" {$wpdb->posts}.{$field_name} IN (".implode(',', $esses).")", $q_values);
 			}
 		}
 
 		// Comment author IDs for an IN clause.
-		if ( ! empty( $this->query_vars['author__in'] ) ) {
-			$this->sql_clauses['where']['author__in'] = 'user_id IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['author__in'] ) ) . ' )';
+		if ( ! empty($this->query_vars['author__in'])) {
+			$this->sql_clauses['where']['author__in'] = 'user_id IN ( '.implode(',', wp_parse_id_list($this->query_vars['author__in'])).' )';
 		}
 
 		// Comment author IDs for a NOT IN clause.
-		if ( ! empty( $this->query_vars['author__not_in'] ) ) {
-			$this->sql_clauses['where']['author__not_in'] = 'user_id NOT IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['author__not_in'] ) ) . ' )';
+		if ( ! empty($this->query_vars['author__not_in'])) {
+			$this->sql_clauses['where']['author__not_in'] = 'user_id NOT IN ( '.implode(',', wp_parse_id_list($this->query_vars['author__not_in'])).' )';
 		}
 
 		// Post author IDs for an IN clause.
-		if ( ! empty( $this->query_vars['post_author__in'] ) ) {
+		if ( ! empty($this->query_vars['post_author__in'])) {
 			$join_posts_table = true;
-			$this->sql_clauses['where']['post_author__in'] = 'post_author IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['post_author__in'] ) ) . ' )';
+			$this->sql_clauses['where']['post_author__in'] = 'post_author IN ( '.implode(',', wp_parse_id_list($this->query_vars['post_author__in'])).' )';
 		}
 
 		// Post author IDs for a NOT IN clause.
-		if ( ! empty( $this->query_vars['post_author__not_in'] ) ) {
+		if ( ! empty($this->query_vars['post_author__not_in'])) {
 			$join_posts_table = true;
-			$this->sql_clauses['where']['post_author__not_in'] = 'post_author NOT IN ( ' . implode( ',', wp_parse_id_list( $this->query_vars['post_author__not_in'] ) ) . ' )';
+			$this->sql_clauses['where']['post_author__not_in'] = 'post_author NOT IN ( '.implode(',', wp_parse_id_list($this->query_vars['post_author__not_in'])).' )';
 		}
 
 		$join = '';
 
-		if ( $join_posts_table ) {
+		if ($join_posts_table) {
 			$join .= "JOIN $wpdb->posts ON $wpdb->posts.ID = $wpdb->comments.comment_post_ID";
 		}
 
-		if ( ! empty( $this->meta_query_clauses ) ) {
+		if ( ! empty($this->meta_query_clauses)) {
 			$join .= $this->meta_query_clauses['join'];
 
 			// Strip leading 'AND'.
-			$this->sql_clauses['where']['meta_query'] = preg_replace( '/^\s*AND\s*/', '', $this->meta_query_clauses['where'] );
+			$this->sql_clauses['where']['meta_query'] = preg_replace('/^\s*AND\s*/', '', $this->meta_query_clauses['where']);
 
-			if ( ! $this->query_vars['count'] ) {
+			if ( ! $this->query_vars['count']) {
 				$groupby = "{$wpdb->comments}.comment_ID";
 			}
 		}
 
-		if ( ! empty( $this->query_vars['date_query'] ) && is_array( $this->query_vars['date_query'] ) ) {
-			$this->date_query = new WP_Date_Query( $this->query_vars['date_query'], 'comment_date' );
-			$this->sql_clauses['where']['date_query'] = preg_replace( '/^\s*AND\s*/', '', $this->date_query->get_sql() );
+		if ( ! empty($this->query_vars['date_query']) && is_array($this->query_vars['date_query'])) {
+			$this->date_query = new WP_Date_Query($this->query_vars['date_query'], 'comment_date');
+			$this->sql_clauses['where']['date_query'] = preg_replace('/^\s*AND\s*/', '', $this->date_query->get_sql());
 		}
 
-		$where = implode( ' AND ', $this->sql_clauses['where'] );
+		$where = implode(' AND ', $this->sql_clauses['where']);
 
-		$pieces = array( 'fields', 'join', 'where', 'orderby', 'limits', 'groupby' );
+		$pieces = array('fields', 'join', 'where', 'orderby', 'limits', 'groupby');
 		/**
 		 * Filters the comment query clauses.
 		 *
@@ -857,31 +856,31 @@ 
 		 * @param array            $pieces A compacted array of comment query clauses.
 		 * @param WP_Comment_Query &$this  Current instance of WP_Comment_Query, passed by reference.
 		 */
-		$clauses = apply_filters_ref_array( 'comments_clauses', array( compact( $pieces ), &$this ) );
+		$clauses = apply_filters_ref_array('comments_clauses', array(compact($pieces), &$this));
 
-		$fields = isset( $clauses[ 'fields' ] ) ? $clauses[ 'fields' ] : '';
-		$join = isset( $clauses[ 'join' ] ) ? $clauses[ 'join' ] : '';
-		$where = isset( $clauses[ 'where' ] ) ? $clauses[ 'where' ] : '';
-		$orderby = isset( $clauses[ 'orderby' ] ) ? $clauses[ 'orderby' ] : '';
-		$limits = isset( $clauses[ 'limits' ] ) ? $clauses[ 'limits' ] : '';
-		$groupby = isset( $clauses[ 'groupby' ] ) ? $clauses[ 'groupby' ] : '';
+		$fields = isset($clauses['fields']) ? $clauses['fields'] : '';
+		$join = isset($clauses['join']) ? $clauses['join'] : '';
+		$where = isset($clauses['where']) ? $clauses['where'] : '';
+		$orderby = isset($clauses['orderby']) ? $clauses['orderby'] : '';
+		$limits = isset($clauses['limits']) ? $clauses['limits'] : '';
+		$groupby = isset($clauses['groupby']) ? $clauses['groupby'] : '';
 
 		$this->filtered_where_clause = $where;
 
-		if ( $where ) {
-			$where = 'WHERE ' . $where;
+		if ($where) {
+			$where = 'WHERE '.$where;
 		}
 
-		if ( $groupby ) {
-			$groupby = 'GROUP BY ' . $groupby;
+		if ($groupby) {
+			$groupby = 'GROUP BY '.$groupby;
 		}
 
-		if ( $orderby ) {
+		if ($orderby) {
 			$orderby = "ORDER BY $orderby";
 		}
 
 		$found_rows = '';
-		if ( ! $this->query_vars['no_found_rows'] ) {
+		if ( ! $this->query_vars['no_found_rows']) {
 			$found_rows = 'SQL_CALC_FOUND_ROWS';
 		}
 
@@ -893,11 +892,11 @@ 
 
 		$this->request = "{$this->sql_clauses['select']} {$this->sql_clauses['from']} {$where} {$this->sql_clauses['groupby']} {$this->sql_clauses['orderby']} {$this->sql_clauses['limits']}";
 
-		if ( $this->query_vars['count'] ) {
-			return intval( $wpdb->get_var( $this->request ) );
+		if ($this->query_vars['count']) {
+			return intval($wpdb->get_var($this->request));
 		} else {
-			$comment_ids = $wpdb->get_col( $this->request );
-			return array_map( 'intval', $comment_ids );
+			$comment_ids = $wpdb->get_col($this->request);
+			return array_map('intval', $comment_ids);
 		}
 	}
 
@@ -913,7 +912,7 @@ 
 	private function set_found_comments() {
 		global $wpdb;
 
-		if ( $this->query_vars['number'] && ! $this->query_vars['no_found_rows'] ) {
+		if ($this->query_vars['number'] && ! $this->query_vars['no_found_rows']) {
 			/**
 			 * Filters the query used to retrieve found comment count.
 			 *
@@ -922,9 +921,9 @@ 
 			 * @param string           $found_comments_query SQL query. Default 'SELECT FOUND_ROWS()'.
 			 * @param WP_Comment_Query $comment_query        The `WP_Comment_Query` instance.
 			 */
-			$found_comments_query = apply_filters( 'found_comments_query', 'SELECT FOUND_ROWS()', $this );
+			$found_comments_query = apply_filters('found_comments_query', 'SELECT FOUND_ROWS()', $this);
 
-			$this->found_comments = (int) $wpdb->get_var( $found_comments_query );
+			$this->found_comments = (int) $wpdb->get_var($found_comments_query);
 		}
 	}
 
@@ -939,38 +938,38 @@ 
 	 * @param array $comments Array of top-level comments whose descendants should be filled in.
 	 * @return array
 	 */
-	protected function fill_descendants( $comments ) {
+	protected function fill_descendants($comments) {
 		global $wpdb;
 
 		$levels = array(
-			0 => wp_list_pluck( $comments, 'comment_ID' ),
+			0 => wp_list_pluck($comments, 'comment_ID'),
 		);
 
-		$key = md5( serialize( wp_array_slice_assoc( $this->query_vars, array_keys( $this->query_var_defaults ) ) ) );
-		$last_changed = wp_cache_get_last_changed( 'comment' );
+		$key = md5(serialize(wp_array_slice_assoc($this->query_vars, array_keys($this->query_var_defaults))));
+		$last_changed = wp_cache_get_last_changed('comment');
 
 		// Fetch an entire level of the descendant tree at a time.
 		$level = 0;
-		$exclude_keys = array( 'parent', 'parent__in', 'parent__not_in' );
+		$exclude_keys = array('parent', 'parent__in', 'parent__not_in');
 		do {
 			// Parent-child relationships may be cached. Only query for those that are not.
 			$child_ids = $uncached_parent_ids = array();
-			$_parent_ids = $levels[ $level ];
-			foreach ( $_parent_ids as $parent_id ) {
+			$_parent_ids = $levels[$level];
+			foreach ($_parent_ids as $parent_id) {
 				$cache_key = "get_comment_child_ids:$parent_id:$key:$last_changed";
-				$parent_child_ids = wp_cache_get( $cache_key, 'comment' );
-				if ( false !== $parent_child_ids ) {
-					$child_ids = array_merge( $child_ids, $parent_child_ids );
+				$parent_child_ids = wp_cache_get($cache_key, 'comment');
+				if (false !== $parent_child_ids) {
+					$child_ids = array_merge($child_ids, $parent_child_ids);
 				} else {
 					$uncached_parent_ids[] = $parent_id;
 				}
 			}
 
-			if ( $uncached_parent_ids ) {
+			if ($uncached_parent_ids) {
 				// Fetch this level of comments.
 				$parent_query_args = $this->query_vars;
-				foreach ( $exclude_keys as $exclude_key ) {
-					$parent_query_args[ $exclude_key ] = '';
+				foreach ($exclude_keys as $exclude_key) {
+					$parent_query_args[$exclude_key] = '';
 				}
 				$parent_query_args['parent__in']    = $uncached_parent_ids;
 				$parent_query_args['no_found_rows'] = true;
@@ -978,61 +977,61 @@ 
 				$parent_query_args['offset']        = 0;
 				$parent_query_args['number']        = 0;
 
-				$level_comments = get_comments( $parent_query_args );
+				$level_comments = get_comments($parent_query_args);
 
 				// Cache parent-child relationships.
-				$parent_map = array_fill_keys( $uncached_parent_ids, array() );
-				foreach ( $level_comments as $level_comment ) {
-					$parent_map[ $level_comment->comment_parent ][] = $level_comment->comment_ID;
+				$parent_map = array_fill_keys($uncached_parent_ids, array());
+				foreach ($level_comments as $level_comment) {
+					$parent_map[$level_comment->comment_parent][] = $level_comment->comment_ID;
 					$child_ids[] = $level_comment->comment_ID;
 				}
 
-				foreach ( $parent_map as $parent_id => $children ) {
+				foreach ($parent_map as $parent_id => $children) {
 					$cache_key = "get_comment_child_ids:$parent_id:$key:$last_changed";
-					wp_cache_set( $cache_key, $children, 'comment' );
+					wp_cache_set($cache_key, $children, 'comment');
 				}
 			}
 
 			$level++;
-			$levels[ $level ] = $child_ids;
-		} while ( $child_ids );
+			$levels[$level] = $child_ids;
+		} while ($child_ids);
 
 		// Prime comment caches for non-top-level comments.
 		$descendant_ids = array();
-		for ( $i = 1, $c = count( $levels ); $i < $c; $i++ ) {
-			$descendant_ids = array_merge( $descendant_ids, $levels[ $i ] );
+		for ($i = 1, $c = count($levels); $i < $c; $i++) {
+			$descendant_ids = array_merge($descendant_ids, $levels[$i]);
 		}
 
-		_prime_comment_caches( $descendant_ids, $this->query_vars['update_comment_meta_cache'] );
+		_prime_comment_caches($descendant_ids, $this->query_vars['update_comment_meta_cache']);
 
 		// Assemble a flat array of all comments + descendants.
 		$all_comments = $comments;
-		foreach ( $descendant_ids as $descendant_id ) {
-			$all_comments[] = get_comment( $descendant_id );
+		foreach ($descendant_ids as $descendant_id) {
+			$all_comments[] = get_comment($descendant_id);
 		}
 
 		// If a threaded representation was requested, build the tree.
-		if ( 'threaded' === $this->query_vars['hierarchical'] ) {
+		if ('threaded' === $this->query_vars['hierarchical']) {
 			$threaded_comments = $ref = array();
-			foreach ( $all_comments as $k => $c ) {
-				$_c = get_comment( $c->comment_ID );
+			foreach ($all_comments as $k => $c) {
+				$_c = get_comment($c->comment_ID);
 
 				// If the comment isn't in the reference array, it goes in the top level of the thread.
-				if ( ! isset( $ref[ $c->comment_parent ] ) ) {
-					$threaded_comments[ $_c->comment_ID ] = $_c;
-					$ref[ $_c->comment_ID ] = $threaded_comments[ $_c->comment_ID ];
+				if ( ! isset($ref[$c->comment_parent])) {
+					$threaded_comments[$_c->comment_ID] = $_c;
+					$ref[$_c->comment_ID] = $threaded_comments[$_c->comment_ID];
 
 				// Otherwise, set it as a child of its parent.
 				} else {
 
-					$ref[ $_c->comment_parent ]->add_child( $_c );
-					$ref[ $_c->comment_ID ] = $ref[ $_c->comment_parent ]->get_child( $_c->comment_ID );
+					$ref[$_c->comment_parent]->add_child($_c);
+					$ref[$_c->comment_ID] = $ref[$_c->comment_parent]->get_child($_c->comment_ID);
 				}
 			}
 
 			// Set the 'populated_children' flag, to ensure additional database queries aren't run.
-			foreach ( $ref as $_ref ) {
-				$_ref->populated_children( true );
+			foreach ($ref as $_ref) {
+				$_ref->populated_children(true);
 			}
 
 			$comments = $threaded_comments;
@@ -1055,17 +1054,17 @@ 
 	 * @param array $cols
 	 * @return string
 	 */
-	protected function get_search_sql( $string, $cols ) {
+	protected function get_search_sql($string, $cols) {
 		global $wpdb;
 
-		$like = '%' . $wpdb->esc_like( $string ) . '%';
+		$like = '%'.$wpdb->esc_like($string).'%';
 
 		$searches = array();
-		foreach ( $cols as $col ) {
-			$searches[] = $wpdb->prepare( "$col LIKE %s", $like );
+		foreach ($cols as $col) {
+			$searches[] = $wpdb->prepare("$col LIKE %s", $like);
 		}
 
-		return ' AND (' . implode(' OR ', $searches) . ')';
+		return ' AND ('.implode(' OR ', $searches).')';
 	}
 
 	/**
@@ -1079,7 +1078,7 @@ 
 	 * @param string $orderby Alias for the field to order by.
 	 * @return string|false Value to used in the ORDER clause. False otherwise.
 	 */
-	protected function parse_orderby( $orderby ) {
+	protected function parse_orderby($orderby) {
 		global $wpdb;
 
 		$allowed_keys = array(
@@ -1100,30 +1099,30 @@ 
 			'user_id',
 		);
 
-		if ( ! empty( $this->query_vars['meta_key'] ) ) {
+		if ( ! empty($this->query_vars['meta_key'])) {
 			$allowed_keys[] = $this->query_vars['meta_key'];
 			$allowed_keys[] = 'meta_value';
 			$allowed_keys[] = 'meta_value_num';
 		}
 
 		$meta_query_clauses = $this->meta_query->get_clauses();
-		if ( $meta_query_clauses ) {
-			$allowed_keys = array_merge( $allowed_keys, array_keys( $meta_query_clauses ) );
+		if ($meta_query_clauses) {
+			$allowed_keys = array_merge($allowed_keys, array_keys($meta_query_clauses));
 		}
 
 		$parsed = false;
-		if ( $orderby == $this->query_vars['meta_key'] || $orderby == 'meta_value' ) {
+		if ($orderby == $this->query_vars['meta_key'] || $orderby == 'meta_value') {
 			$parsed = "$wpdb->commentmeta.meta_value";
-		} elseif ( $orderby == 'meta_value_num' ) {
+		} elseif ($orderby == 'meta_value_num') {
 			$parsed = "$wpdb->commentmeta.meta_value+0";
-		} elseif ( $orderby == 'comment__in' ) {
-			$comment__in = implode( ',', array_map( 'absint', $this->query_vars['comment__in'] ) );
+		} elseif ($orderby == 'comment__in') {
+			$comment__in = implode(',', array_map('absint', $this->query_vars['comment__in']));
 			$parsed = "FIELD( {$wpdb->comments}.comment_ID, $comment__in )";
-		} elseif ( in_array( $orderby, $allowed_keys ) ) {
+		} elseif (in_array($orderby, $allowed_keys)) {
 
-			if ( isset( $meta_query_clauses[ $orderby ] ) ) {
-				$meta_clause = $meta_query_clauses[ $orderby ];
-				$parsed = sprintf( "CAST(%s.meta_value AS %s)", esc_sql( $meta_clause['alias'] ), esc_sql( $meta_clause['cast'] ) );
+			if (isset($meta_query_clauses[$orderby])) {
+				$meta_clause = $meta_query_clauses[$orderby];
+				$parsed = sprintf("CAST(%s.meta_value AS %s)", esc_sql($meta_clause['alias']), esc_sql($meta_clause['cast']));
 			} else {
 				$parsed = "$wpdb->comments.$orderby";
 			}
@@ -1141,12 +1140,12 @@ 
 	 * @param string $order The 'order' query variable.
 	 * @return string The sanitized 'order' query variable.
 	 */
-	protected function parse_order( $order ) {
-		if ( ! is_string( $order ) || empty( $order ) ) {
+	protected function parse_order($order) {
+		if ( ! is_string($order) || empty($order)) {
 			return 'DESC';
 		}
 
-		if ( 'ASC' === strtoupper( $order ) ) {
+		if ('ASC' === strtoupper($order)) {
 			return 'ASC';
 		} else {
 			return 'DESC';

src/wp-includes/class-wp-comment.php

Doc Comments +1 added lines, -1 removed lines

@@ -366,7 +366,7 @@
 	 * @access public
 	 *
 	 * @param string $name Property name.
-	 * @return bool
+	 * @return boolean|null
 	 */
 	public function __isset( $name ) {
 		if ( in_array( $name, $this->post_fields ) && 0 !== (int) $this->comment_post_ID ) {

Spacing +34 added lines, -34 removed lines

@@ -174,7 +174,7 @@ 
 	 * @access protected
 	 * @var array
 	 */
-	protected $post_fields = array( 'post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_title', 'post_excerpt', 'post_status', 'comment_status', 'ping_status', 'post_name', 'to_ping', 'pinged', 'post_modified', 'post_modified_gmt', 'post_content_filtered', 'post_parent', 'guid', 'menu_order', 'post_type', 'post_mime_type', 'comment_count' );
+	protected $post_fields = array('post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_title', 'post_excerpt', 'post_status', 'comment_status', 'ping_status', 'post_name', 'to_ping', 'pinged', 'post_modified', 'post_modified_gmt', 'post_content_filtered', 'post_parent', 'guid', 'menu_order', 'post_type', 'post_mime_type', 'comment_count');
 
 	/**
 	 * Retrieves a WP_Comment instance.
@@ -188,28 +188,28 @@ 
 	 * @param int $id Comment ID.
 	 * @return WP_Comment|false Comment object, otherwise false.
 	 */
-	public static function get_instance( $id ) {
+	public static function get_instance($id) {
 		global $wpdb;
 
-		if ( ! is_numeric( $id ) || $id != floor( $id ) || ! $id ) {
+		if ( ! is_numeric($id) || $id != floor($id) || ! $id) {
 			return false;
 		}
 
 		$comment_id = (int) $id;
 
-		$_comment = wp_cache_get( $comment_id, 'comment' );
+		$_comment = wp_cache_get($comment_id, 'comment');
 
-		if ( ! $_comment ) {
-			$_comment = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->comments WHERE comment_ID = %d LIMIT 1", $comment_id ) );
+		if ( ! $_comment) {
+			$_comment = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->comments WHERE comment_ID = %d LIMIT 1", $comment_id));
 
-			if ( ! $_comment ) {
+			if ( ! $_comment) {
 				return false;
 			}
 
-			wp_cache_add( $_comment->comment_ID, $_comment, 'comment' );
+			wp_cache_add($_comment->comment_ID, $_comment, 'comment');
 		}
 
-		return new WP_Comment( $_comment );
+		return new WP_Comment($_comment);
 	}
 
 	/**
@@ -222,8 +222,8 @@ 
 	 *
 	 * @param WP_Comment $comment Comment object.
 	 */
-	public function __construct( $comment ) {
-		foreach ( get_object_vars( $comment ) as $key => $value ) {
+	public function __construct($comment) {
+		foreach (get_object_vars($comment) as $key => $value) {
 			$this->$key = $value;
 		}
 	}
@@ -237,7 +237,7 @@ 
 	 * @return array Object as array.
 	 */
 	public function to_array() {
-		return get_object_vars( $this );
+		return get_object_vars($this);
 	}
 
 	/**
@@ -277,7 +277,7 @@ 
 	 * }
 	 * @return array Array of `WP_Comment` objects.
 	 */
-	public function get_children( $args = array() ) {
+	public function get_children($args = array()) {
 		$defaults = array(
 			'format' => 'tree',
 			'status' => 'all',
@@ -285,26 +285,26 @@ 
 			'orderby' => '',
 		);
 
-		$_args = wp_parse_args( $args, $defaults );
+		$_args = wp_parse_args($args, $defaults);
 		$_args['parent'] = $this->comment_ID;
 
-		if ( is_null( $this->children ) ) {
-			if ( $this->populated_children ) {
+		if (is_null($this->children)) {
+			if ($this->populated_children) {
 				$this->children = array();
 			} else {
-				$this->children = get_comments( $_args );
+				$this->children = get_comments($_args);
 			}
 		}
 
-		if ( 'flat' === $_args['format'] ) {
+		if ('flat' === $_args['format']) {
 			$children = array();
-			foreach ( $this->children as $child ) {
+			foreach ($this->children as $child) {
 				$child_args = $_args;
 				$child_args['format'] = 'flat';
 				// get_children() resets this value automatically.
-				unset( $child_args['parent'] );
+				unset($child_args['parent']);
 
-				$children = array_merge( $children, array( $child ), $child->get_children( $child_args ) );
+				$children = array_merge($children, array($child), $child->get_children($child_args));
 			}
 		} else {
 			$children = $this->children;
@@ -323,8 +323,8 @@ 
 	 *
 	 * @param WP_Comment $child Child comment.
 	 */
-	public function add_child( WP_Comment $child ) {
-		$this->children[ $child->comment_ID ] = $child;
+	public function add_child(WP_Comment $child) {
+		$this->children[$child->comment_ID] = $child;
 	}
 
 	/**
@@ -336,9 +336,9 @@ 
 	 * @param int $child_id ID of the child.
 	 * @return WP_Comment|bool Returns the comment object if found, otherwise false.
 	 */
-	public function get_child( $child_id ) {
-		if ( isset( $this->children[ $child_id ] ) ) {
-			return $this->children[ $child_id ];
+	public function get_child($child_id) {
+		if (isset($this->children[$child_id])) {
+			return $this->children[$child_id];
 		}
 
 		return false;
@@ -354,7 +354,7 @@ 
 	 *
 	 * @param bool $set Whether the comment's children have already been populated.
 	 */
-	public function populated_children( $set ) {
+	public function populated_children($set) {
 		$this->populated_children = (bool) $set;
 	}
 
@@ -369,10 +369,10 @@ 
 	 * @param string $name Property name.
 	 * @return bool
 	 */
-	public function __isset( $name ) {
-		if ( in_array( $name, $this->post_fields ) && 0 !== (int) $this->comment_post_ID ) {
-			$post = get_post( $this->comment_post_ID );
-			return property_exists( $post, $name );
+	public function __isset($name) {
+		if (in_array($name, $this->post_fields) && 0 !== (int) $this->comment_post_ID) {
+			$post = get_post($this->comment_post_ID);
+			return property_exists($post, $name);
 		}
 	}
 
@@ -387,9 +387,9 @@ 
 	 * @param string $name
 	 * @return mixed
 	 */
-	public function __get( $name ) {
-		if ( in_array( $name, $this->post_fields ) ) {
-			$post = get_post( $this->comment_post_ID );
+	public function __get($name) {
+		if (in_array($name, $this->post_fields)) {
+			$post = get_post($this->comment_post_ID);
 			return $post->$name;
 		}
 	}

src/wp-includes/class-wp-customize-control.php

Doc Comments +1 added lines, -1 removed lines

@@ -209,7 +209,7 @@
 	 * @since 4.1.0
 	 * @access public
 	 *
-	 * @return true Always true.
+	 * @return boolean Always true.
 	 */
 	public function active_callback() {
 		return true;

Braces +15 added lines, -10 removed lines

@@ -361,8 +361,9 @@ 
 	 * @uses WP_Customize_Control::render()
 	 */
 	final public function maybe_render() {
-		if ( ! $this->check_capabilities() )
-			return;
+		if ( ! $this->check_capabilities() ) {
+					return;
+		}
 
 		/**
 		 * Fires just before the current Customizer control is rendered.
@@ -411,8 +412,9 @@ 
 	 * @return string Data link parameter, if $setting_key is a valid setting, empty string otherwise.
 	 */
 	public function get_link( $setting_key = 'default' ) {
-		if ( ! isset( $this->settings[ $setting_key ] ) )
-			return '';
+		if ( ! isset( $this->settings[ $setting_key ] ) ) {
+					return '';
+		}
 
 		return 'data-customize-setting-link="' . esc_attr( $this->settings[ $setting_key ]->id ) . '"';
 	}
@@ -467,8 +469,9 @@ 
 				<?php
 				break;
 			case 'radio':
-				if ( empty( $this->choices ) )
-					return;
+				if ( empty( $this->choices ) ) {
+									return;
+				}
 
 				$name = '_customize-radio-' . $this->id;
 
@@ -489,8 +492,9 @@ 
 				endforeach;
 				break;
 			case 'select':
-				if ( empty( $this->choices ) )
-					return;
+				if ( empty( $this->choices ) ) {
+									return;
+				}
 
 				?>
 				<label>
@@ -503,8 +507,9 @@ 
 
 					<select <?php $this->link(); ?>>
 						<?php
-						foreach ( $this->choices as $value => $label )
-							echo '<option value="' . esc_attr( $value ) . '"' . selected( $this->value(), $value, false ) . '>' . $label . '</option>';
+						foreach ( $this->choices as $value => $label ) {
+													echo '<option value="' . esc_attr( $value ) . '"' . selected( $this->value(), $value, false ) . '>' . $label . '</option>';
+						}
 						?>
 					</select>
 				</label>

Spacing +107 added lines, -107 removed lines

@@ -191,34 +191,34 @@ 
 	 *                                                 'date' are supported implicitly. Default 'text'.
 	 * }
 	 */
-	public function __construct( $manager, $id, $args = array() ) {
-		$keys = array_keys( get_object_vars( $this ) );
-		foreach ( $keys as $key ) {
-			if ( isset( $args[ $key ] ) ) {
-				$this->$key = $args[ $key ];
+	public function __construct($manager, $id, $args = array()) {
+		$keys = array_keys(get_object_vars($this));
+		foreach ($keys as $key) {
+			if (isset($args[$key])) {
+				$this->$key = $args[$key];
 			}
 		}
 
 		$this->manager = $manager;
 		$this->id = $id;
-		if ( empty( $this->active_callback ) ) {
-			$this->active_callback = array( $this, 'active_callback' );
+		if (empty($this->active_callback)) {
+			$this->active_callback = array($this, 'active_callback');
 		}
 		self::$instance_count += 1;
 		$this->instance_number = self::$instance_count;
 
 		// Process settings.
-		if ( ! isset( $this->settings ) ) {
+		if ( ! isset($this->settings)) {
 			$this->settings = $id;
 		}
 
 		$settings = array();
-		if ( is_array( $this->settings ) ) {
-			foreach ( $this->settings as $key => $setting ) {
-				$settings[ $key ] = $this->manager->get_setting( $setting );
+		if (is_array($this->settings)) {
+			foreach ($this->settings as $key => $setting) {
+				$settings[$key] = $this->manager->get_setting($setting);
 			}
-		} else if ( is_string( $this->settings ) ) {
-			$this->setting = $this->manager->get_setting( $this->settings );
+		} else if (is_string($this->settings)) {
+			$this->setting = $this->manager->get_setting($this->settings);
 			$settings['default'] = $this->setting;
 		}
 		$this->settings = $settings;
@@ -241,7 +241,7 @@ 
 	 */
 	final public function active() {
 		$control = $this;
-		$active = call_user_func( $this->active_callback, $this );
+		$active = call_user_func($this->active_callback, $this);
 
 		/**
 		 * Filters response of WP_Customize_Control::active().
@@ -251,7 +251,7 @@ 
 		 * @param bool                 $active  Whether the Customizer control is active.
 		 * @param WP_Customize_Control $control WP_Customize_Control instance.
 		 */
-		$active = apply_filters( 'customize_control_active', $active, $control );
+		$active = apply_filters('customize_control_active', $active, $control);
 
 		return $active;
 	}
@@ -280,9 +280,9 @@ 
 	 * @param string $setting_key
 	 * @return mixed The requested setting's value, if the setting exists.
 	 */
-	final public function value( $setting_key = 'default' ) {
-		if ( isset( $this->settings[ $setting_key ] ) ) {
-			return $this->settings[ $setting_key ]->value();
+	final public function value($setting_key = 'default') {
+		if (isset($this->settings[$setting_key])) {
+			return $this->settings[$setting_key]->value();
 		}
 	}
 
@@ -293,8 +293,8 @@ 
 	 */
 	public function to_json() {
 		$this->json['settings'] = array();
-		foreach ( $this->settings as $key => $setting ) {
-			$this->json['settings'][ $key ] = $setting->id;
+		foreach ($this->settings as $key => $setting) {
+			$this->json['settings'][$key] = $setting->id;
 		}
 
 		$this->json['type'] = $this->type;
@@ -306,7 +306,7 @@ 
 		$this->json['description'] = $this->description;
 		$this->json['instanceNumber'] = $this->instance_number;
 
-		if ( 'dropdown-pages' === $this->type ) {
+		if ('dropdown-pages' === $this->type) {
 			$this->json['allow_addition'] = $this->allow_addition;
 		}
 	}
@@ -336,18 +336,18 @@ 
 	 * @return bool False if theme doesn't support the control or user doesn't have the required permissions, otherwise true.
 	 */
 	final public function check_capabilities() {
-		if ( ! empty( $this->capability ) && ! current_user_can( $this->capability ) ) {
+		if ( ! empty($this->capability) && ! current_user_can($this->capability)) {
 			return false;
 		}
 
-		foreach ( $this->settings as $setting ) {
-			if ( ! $setting || ! $setting->check_capabilities() ) {
+		foreach ($this->settings as $setting) {
+			if ( ! $setting || ! $setting->check_capabilities()) {
 				return false;
 			}
 		}
 
-		$section = $this->manager->get_section( $this->section );
-		if ( isset( $section ) && ! $section->check_capabilities() ) {
+		$section = $this->manager->get_section($this->section);
+		if (isset($section) && ! $section->check_capabilities()) {
 			return false;
 		}
 
@@ -364,7 +364,7 @@ 
 	final public function get_content() {
 		ob_start();
 		$this->maybe_render();
-		return trim( ob_get_clean() );
+		return trim(ob_get_clean());
 	}
 
 	/**
@@ -374,7 +374,7 @@ 
 	 * @uses WP_Customize_Control::render()
 	 */
 	final public function maybe_render() {
-		if ( ! $this->check_capabilities() )
+		if ( ! $this->check_capabilities())
 			return;
 
 		/**
@@ -384,7 +384,7 @@ 
 		 *
 		 * @param WP_Customize_Control $this WP_Customize_Control instance.
 		 */
-		do_action( 'customize_render_control', $this );
+		do_action('customize_render_control', $this);
 
 		/**
 		 * Fires just before a specific Customizer control is rendered.
@@ -396,7 +396,7 @@ 
 		 *
 		 * @param WP_Customize_Control $this WP_Customize_Control instance.
 		 */
-		do_action( "customize_render_control_{$this->id}", $this );
+		do_action("customize_render_control_{$this->id}", $this);
 
 		$this->render();
 	}
@@ -407,10 +407,10 @@ 
 	 * @since 3.4.0
 	 */
 	protected function render() {
-		$id    = 'customize-control-' . str_replace( array( '[', ']' ), array( '-', '' ), $this->id );
-		$class = 'customize-control customize-control-' . $this->type;
+		$id    = 'customize-control-'.str_replace(array('[', ']'), array('-', ''), $this->id);
+		$class = 'customize-control customize-control-'.$this->type;
 
-		?><li id="<?php echo esc_attr( $id ); ?>" class="<?php echo esc_attr( $class ); ?>">
+		?><li id="<?php echo esc_attr($id); ?>" class="<?php echo esc_attr($class); ?>">
 			<?php $this->render_content(); ?>
 		</li><?php
 	}
@@ -423,11 +423,11 @@ 
 	 * @param string $setting_key
 	 * @return string Data link parameter, if $setting_key is a valid setting, empty string otherwise.
 	 */
-	public function get_link( $setting_key = 'default' ) {
-		if ( ! isset( $this->settings[ $setting_key ] ) )
+	public function get_link($setting_key = 'default') {
+		if ( ! isset($this->settings[$setting_key]))
 			return '';
 
-		return 'data-customize-setting-link="' . esc_attr( $this->settings[ $setting_key ]->id ) . '"';
+		return 'data-customize-setting-link="'.esc_attr($this->settings[$setting_key]->id).'"';
 	}
 
 	/**
@@ -438,8 +438,8 @@ 
 	 *
 	 * @param string $setting_key
 	 */
-	public function link( $setting_key = 'default' ) {
-		echo $this->get_link( $setting_key );
+	public function link($setting_key = 'default') {
+		echo $this->get_link($setting_key);
 	}
 
 	/**
@@ -449,8 +449,8 @@ 
 	 * @access public
 	 */
 	public function input_attrs() {
-		foreach ( $this->input_attrs as $attr => $value ) {
-			echo $attr . '="' . esc_attr( $value ) . '" ';
+		foreach ($this->input_attrs as $attr => $value) {
+			echo $attr.'="'.esc_attr($value).'" ';
 		}
 	}
 
@@ -467,57 +467,57 @@ 
 	 * @since 3.4.0
 	 */
 	protected function render_content() {
-		switch( $this->type ) {
+		switch ($this->type) {
 			case 'checkbox':
 				?>
 				<label>
-					<input type="checkbox" value="<?php echo esc_attr( $this->value() ); ?>" <?php $this->link(); checked( $this->value() ); ?> />
-					<?php echo esc_html( $this->label ); ?>
-					<?php if ( ! empty( $this->description ) ) : ?>
+					<input type="checkbox" value="<?php echo esc_attr($this->value()); ?>" <?php $this->link(); checked($this->value()); ?> />
+					<?php echo esc_html($this->label); ?>
+					<?php if ( ! empty($this->description)) : ?>
 						<span class="description customize-control-description"><?php echo $this->description; ?></span>
 					<?php endif; ?>
 				</label>
 				<?php
 				break;
 			case 'radio':
-				if ( empty( $this->choices ) )
+				if (empty($this->choices))
 					return;
 
-				$name = '_customize-radio-' . $this->id;
+				$name = '_customize-radio-'.$this->id;
 
-				if ( ! empty( $this->label ) ) : ?>
-					<span class="customize-control-title"><?php echo esc_html( $this->label ); ?></span>
+				if ( ! empty($this->label)) : ?>
+					<span class="customize-control-title"><?php echo esc_html($this->label); ?></span>
 				<?php endif;
-				if ( ! empty( $this->description ) ) : ?>
-					<span class="description customize-control-description"><?php echo $this->description ; ?></span>
+				if ( ! empty($this->description)) : ?>
+					<span class="description customize-control-description"><?php echo $this->description; ?></span>
 				<?php endif;
 
-				foreach ( $this->choices as $value => $label ) :
+				foreach ($this->choices as $value => $label) :
 					?>
 					<label>
-						<input type="radio" value="<?php echo esc_attr( $value ); ?>" name="<?php echo esc_attr( $name ); ?>" <?php $this->link(); checked( $this->value(), $value ); ?> />
-						<?php echo esc_html( $label ); ?><br/>
+						<input type="radio" value="<?php echo esc_attr($value); ?>" name="<?php echo esc_attr($name); ?>" <?php $this->link(); checked($this->value(), $value); ?> />
+						<?php echo esc_html($label); ?><br/>
 					</label>
 					<?php
 				endforeach;
 				break;
 			case 'select':
-				if ( empty( $this->choices ) )
+				if (empty($this->choices))
 					return;
 
 				?>
 				<label>
-					<?php if ( ! empty( $this->label ) ) : ?>
-						<span class="customize-control-title"><?php echo esc_html( $this->label ); ?></span>
+					<?php if ( ! empty($this->label)) : ?>
+						<span class="customize-control-title"><?php echo esc_html($this->label); ?></span>
 					<?php endif;
-					if ( ! empty( $this->description ) ) : ?>
+					if ( ! empty($this->description)) : ?>
 						<span class="description customize-control-description"><?php echo $this->description; ?></span>
 					<?php endif; ?>
 
 					<select <?php $this->link(); ?>>
 						<?php
-						foreach ( $this->choices as $value => $label )
-							echo '<option value="' . esc_attr( $value ) . '"' . selected( $this->value(), $value, false ) . '>' . $label . '</option>';
+						foreach ($this->choices as $value => $label)
+							echo '<option value="'.esc_attr($value).'"'.selected($this->value(), $value, false).'>'.$label.'</option>';
 						?>
 					</select>
 				</label>
@@ -526,29 +526,29 @@ 
 			case 'textarea':
 				?>
 				<label>
-					<?php if ( ! empty( $this->label ) ) : ?>
-						<span class="customize-control-title"><?php echo esc_html( $this->label ); ?></span>
+					<?php if ( ! empty($this->label)) : ?>
+						<span class="customize-control-title"><?php echo esc_html($this->label); ?></span>
 					<?php endif;
-					if ( ! empty( $this->description ) ) : ?>
+					if ( ! empty($this->description)) : ?>
 						<span class="description customize-control-description"><?php echo $this->description; ?></span>
 					<?php endif; ?>
-					<textarea rows="5" <?php $this->input_attrs(); ?> <?php $this->link(); ?>><?php echo esc_textarea( $this->value() ); ?></textarea>
+					<textarea rows="5" <?php $this->input_attrs(); ?> <?php $this->link(); ?>><?php echo esc_textarea($this->value()); ?></textarea>
 				</label>
 				<?php
 				break;
 			case 'dropdown-pages':
 				?>
 				<label>
-				<?php if ( ! empty( $this->label ) ) : ?>
-					<span class="customize-control-title"><?php echo esc_html( $this->label ); ?></span>
+				<?php if ( ! empty($this->label)) : ?>
+					<span class="customize-control-title"><?php echo esc_html($this->label); ?></span>
 				<?php endif;
-				if ( ! empty( $this->description ) ) : ?>
+				if ( ! empty($this->description)) : ?>
 					<span class="description customize-control-description"><?php echo $this->description; ?></span>
 				<?php endif; ?>
 
 				<?php
-				$dropdown_name = '_customize-dropdown-pages-' . $this->id;
-				$show_option_none = __( '&mdash; Select &mdash;' );
+				$dropdown_name = '_customize-dropdown-pages-'.$this->id;
+				$show_option_none = __('&mdash; Select &mdash;');
 				$option_none_value = '0';
 				$dropdown = wp_dropdown_pages(
 					array(
@@ -559,56 +559,56 @@ 
 						'selected'          => $this->value(),
 					)
 				);
-				if ( empty( $dropdown ) ) {
-					$dropdown = sprintf( '<select id="%1$s" name="%1$s">', esc_attr( $dropdown_name ) );
-					$dropdown .= sprintf( '<option value="%1$s">%2$s</option>', esc_attr( $option_none_value ), esc_html( $show_option_none ) );
+				if (empty($dropdown)) {
+					$dropdown = sprintf('<select id="%1$s" name="%1$s">', esc_attr($dropdown_name));
+					$dropdown .= sprintf('<option value="%1$s">%2$s</option>', esc_attr($option_none_value), esc_html($show_option_none));
 					$dropdown .= '</select>';
 				}
 
 				// Hackily add in the data link parameter.
-				$dropdown = str_replace( '<select', '<select ' . $this->get_link(), $dropdown );
+				$dropdown = str_replace('<select', '<select '.$this->get_link(), $dropdown);
 
 				// Even more hacikly add auto-draft page stubs.
 				// @todo Eventually this should be removed in favor of the pages being injected into the underlying get_pages() call. See <https://github.com/xwp/wp-customize-posts/pull/250>.
-				$nav_menus_created_posts_setting = $this->manager->get_setting( 'nav_menus_created_posts' );
-				if ( $nav_menus_created_posts_setting && current_user_can( 'publish_pages' ) ) {
+				$nav_menus_created_posts_setting = $this->manager->get_setting('nav_menus_created_posts');
+				if ($nav_menus_created_posts_setting && current_user_can('publish_pages')) {
 					$auto_draft_page_options = '';
-					foreach ( $nav_menus_created_posts_setting->value() as $auto_draft_page_id ) {
-						$post = get_post( $auto_draft_page_id );
-						if ( $post && 'page' === $post->post_type ) {
-							$auto_draft_page_options .= sprintf( '<option value="%1$s">%2$s</option>', esc_attr( $post->ID ), esc_html( $post->post_title ) );
+					foreach ($nav_menus_created_posts_setting->value() as $auto_draft_page_id) {
+						$post = get_post($auto_draft_page_id);
+						if ($post && 'page' === $post->post_type) {
+							$auto_draft_page_options .= sprintf('<option value="%1$s">%2$s</option>', esc_attr($post->ID), esc_html($post->post_title));
 						}
 					}
-					if ( $auto_draft_page_options ) {
-						$dropdown = str_replace( '</select>', $auto_draft_page_options . '</select>', $dropdown );
+					if ($auto_draft_page_options) {
+						$dropdown = str_replace('</select>', $auto_draft_page_options.'</select>', $dropdown);
 					}
 				}
 
 				echo $dropdown;
 				?>
 				</label>
-				<?php if ( $this->allow_addition && current_user_can( 'publish_pages' ) && current_user_can( 'edit_theme_options' ) ) : // Currently tied to menus functionality. ?>
+				<?php if ($this->allow_addition && current_user_can('publish_pages') && current_user_can('edit_theme_options')) : // Currently tied to menus functionality. ?>
 					<button type="button" class="button-link add-new-toggle"><?php
 						/* translators: %s: add new page label */
-						printf( __( '+ %s' ), get_post_type_object( 'page' )->labels->add_new_item );
+						printf(__('+ %s'), get_post_type_object('page')->labels->add_new_item);
 					?></button>
 					<div class="new-content-item">
-						<label for="create-input-<?php echo $this->id; ?>"><span class="screen-reader-text"><?php _e( 'New page title' ); ?></span></label>
-						<input type="text" id="create-input-<?php echo $this->id; ?>" class="create-item-input" placeholder="<?php esc_attr_e( 'New page title&hellip;' ); ?>">
-						<button type="button" class="button add-content"><?php _e( 'Add' ); ?></button>
+						<label for="create-input-<?php echo $this->id; ?>"><span class="screen-reader-text"><?php _e('New page title'); ?></span></label>
+						<input type="text" id="create-input-<?php echo $this->id; ?>" class="create-item-input" placeholder="<?php esc_attr_e('New page title&hellip;'); ?>">
+						<button type="button" class="button add-content"><?php _e('Add'); ?></button>
 					</div>
 				<?php endif;
 				break;
 			default:
 				?>
 				<label>
-					<?php if ( ! empty( $this->label ) ) : ?>
-						<span class="customize-control-title"><?php echo esc_html( $this->label ); ?></span>
+					<?php if ( ! empty($this->label)) : ?>
+						<span class="customize-control-title"><?php echo esc_html($this->label); ?></span>
 					<?php endif;
-					if ( ! empty( $this->description ) ) : ?>
+					if ( ! empty($this->description)) : ?>
 						<span class="description customize-control-description"><?php echo $this->description; ?></span>
 					<?php endif; ?>
-					<input type="<?php echo esc_attr( $this->type ); ?>" <?php $this->input_attrs(); ?> value="<?php echo esc_attr( $this->value() ); ?>" <?php $this->link(); ?> />
+					<input type="<?php echo esc_attr($this->type); ?>" <?php $this->input_attrs(); ?> value="<?php echo esc_attr($this->value()); ?>" <?php $this->link(); ?> />
 				</label>
 				<?php
 				break;
@@ -649,55 +649,55 @@ 
 }
 
 /** WP_Customize_Color_Control class */
-require_once( ABSPATH . WPINC . '/customize/class-wp-customize-color-control.php' );
+require_once(ABSPATH.WPINC.'/customize/class-wp-customize-color-control.php');
 
 /** WP_Customize_Media_Control class */
-require_once( ABSPATH . WPINC . '/customize/class-wp-customize-media-control.php' );
+require_once(ABSPATH.WPINC.'/customize/class-wp-customize-media-control.php');
 
 /** WP_Customize_Upload_Control class */
-require_once( ABSPATH . WPINC . '/customize/class-wp-customize-upload-control.php' );
+require_once(ABSPATH.WPINC.'/customize/class-wp-customize-upload-control.php');
 
 /** WP_Customize_Image_Control class */
-require_once( ABSPATH . WPINC . '/customize/class-wp-customize-image-control.php' );
+require_once(ABSPATH.WPINC.'/customize/class-wp-customize-image-control.php');
 
 /** WP_Customize_Background_Image_Control class */
-require_once( ABSPATH . WPINC . '/customize/class-wp-customize-background-image-control.php' );
+require_once(ABSPATH.WPINC.'/customize/class-wp-customize-background-image-control.php');
 
 /** WP_Customize_Background_Position_Control class */
-require_once( ABSPATH . WPINC . '/customize/class-wp-customize-background-position-control.php' );
+require_once(ABSPATH.WPINC.'/customize/class-wp-customize-background-position-control.php');
 
 /** WP_Customize_Cropped_Image_Control class */
-require_once( ABSPATH . WPINC . '/customize/class-wp-customize-cropped-image-control.php' );
+require_once(ABSPATH.WPINC.'/customize/class-wp-customize-cropped-image-control.php');
 
 /** WP_Customize_Site_Icon_Control class */
-require_once( ABSPATH . WPINC . '/customize/class-wp-customize-site-icon-control.php' );
+require_once(ABSPATH.WPINC.'/customize/class-wp-customize-site-icon-control.php');
 
 /** WP_Customize_Header_Image_Control class */
-require_once( ABSPATH . WPINC . '/customize/class-wp-customize-header-image-control.php' );
+require_once(ABSPATH.WPINC.'/customize/class-wp-customize-header-image-control.php');
 
 /** WP_Customize_Theme_Control class */
-require_once( ABSPATH . WPINC . '/customize/class-wp-customize-theme-control.php' );
+require_once(ABSPATH.WPINC.'/customize/class-wp-customize-theme-control.php');
 
 /** WP_Widget_Area_Customize_Control class */
-require_once( ABSPATH . WPINC . '/customize/class-wp-widget-area-customize-control.php' );
+require_once(ABSPATH.WPINC.'/customize/class-wp-widget-area-customize-control.php');
 
 /** WP_Widget_Form_Customize_Control class */
-require_once( ABSPATH . WPINC . '/customize/class-wp-widget-form-customize-control.php' );
+require_once(ABSPATH.WPINC.'/customize/class-wp-widget-form-customize-control.php');
 
 /** WP_Customize_Nav_Menu_Control class */
-require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-control.php' );
+require_once(ABSPATH.WPINC.'/customize/class-wp-customize-nav-menu-control.php');
 
 /** WP_Customize_Nav_Menu_Item_Control class */
-require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-item-control.php' );
+require_once(ABSPATH.WPINC.'/customize/class-wp-customize-nav-menu-item-control.php');
 
 /** WP_Customize_Nav_Menu_Location_Control class */
-require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-location-control.php' );
+require_once(ABSPATH.WPINC.'/customize/class-wp-customize-nav-menu-location-control.php');
 
 /** WP_Customize_Nav_Menu_Name_Control class */
-require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-name-control.php' );
+require_once(ABSPATH.WPINC.'/customize/class-wp-customize-nav-menu-name-control.php');
 
 /** WP_Customize_Nav_Menu_Auto_Add_Control class */
-require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-auto-add-control.php' );
+require_once(ABSPATH.WPINC.'/customize/class-wp-customize-nav-menu-auto-add-control.php');
 
 /** WP_Customize_New_Menu_Control class */
-require_once( ABSPATH . WPINC . '/customize/class-wp-customize-new-menu-control.php' );
+require_once(ABSPATH.WPINC.'/customize/class-wp-customize-new-menu-control.php');