ntwb / wordpress

src/wp-includes/post.php

Doc Comments +10 added lines, -10 removed lines

@@ -388,7 +388,7 @@ 
  * @since 1.0.0
  *
  * @param string $post Post content.
- * @return array Post before ('main'), after ('extended'), and custom read more ('more_text').
+ * @return integer Post before ('main'), after ('extended'), and custom read more ('more_text').
  */
 function get_extended( $post ) {
 	//Match the new style more links.
@@ -1801,7 +1801,7 @@ 
  *
  * @param int    $post_id    Post ID.
  * @param string $meta_key   Metadata name.
- * @param mixed  $meta_value Optional. Metadata value. Must be serializable if
+ * @param string  $meta_value Optional. Metadata value. Must be serializable if
  *                           non-scalar. Default empty.
  * @return bool True on success, false on failure.
  */
@@ -2729,7 +2729,7 @@ 
  *
  * @global wpdb $wpdb WordPress database abstraction object.
  *
- * @param int|WP_Post|null $post Optional. Post ID or post object. Defaults to global $post.
+ * @param integer $post Optional. Post ID or post object. Defaults to global $post.
  * @return mixed|void False on failure.
  */
 function wp_trash_post_comments( $post = null ) {
@@ -2785,8 +2785,8 @@ 
  *
  * @global wpdb $wpdb WordPress database abstraction object.
  *
- * @param int|WP_Post|null $post Optional. Post ID or post object. Defaults to global $post.
- * @return true|void
+ * @param integer $post Optional. Post ID or post object. Defaults to global $post.
+ * @return null|boolean
  */
 function wp_untrash_post_comments( $post = null ) {
 	global $wpdb;
@@ -5130,7 +5130,7 @@ 
  * @since 4.2.0
  *
  * @param string      $type    Attachment type. Accepts 'image', 'audio', or 'video'.
- * @param int|WP_Post $post_id Optional. Attachment ID. Default 0.
+ * @param integer $post_id Optional. Attachment ID. Default 0.
  * @return bool True if one of the accepted types, false otherwise.
  */
 function wp_attachment_is( $type, $post_id = 0 ) {
@@ -5180,7 +5180,7 @@ 
  * @since 4.2.0 Modified into wrapper for wp_attachment_is() and
  *              allowed WP_Post object to be passed.
  *
- * @param int|WP_Post $post Optional. Attachment ID. Default 0.
+ * @param integer $post Optional. Attachment ID. Default 0.
  * @return bool Whether the attachment is an image.
  */
 function wp_attachment_is_image( $post = 0 ) {
@@ -5192,7 +5192,7 @@ 
  *
  * @since 2.1.0
  *
- * @param string|int $mime MIME type or attachment ID.
+ * @param integer $mime MIME type or attachment ID.
  * @return string|false Icon, false otherwise.
  */
 function wp_mime_type_icon( $mime = 0 ) {
@@ -5967,7 +5967,7 @@ 
  *
  * @since 3.3.0
  *
- * @param int|WP_Post $post Post ID or post object where thumbnail should be removed from.
+ * @param integer $post Post ID or post object where thumbnail should be removed from.
  * @return bool True on success, false on failure.
  */
 function delete_post_thumbnail( $post ) {
@@ -6090,7 +6090,7 @@ 
  * @access private
  *
  * @param string $post_name Slug.
- * @param string $post_ID   Optional. Post ID that should be ignored. Default 0.
+ * @param integer $post_ID   Optional. Post ID that should be ignored. Default 0.
  */
 function wp_add_trashed_suffix_to_post_name_for_trashed_posts( $post_name, $post_ID = 0 ) {
 	$trashed_posts_with_desired_slug = get_posts( array(

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * Core Post API
- *
- * @package WordPress
- * @subpackage Post
- */
+	 * Core Post API
+	 *
+	 * @package WordPress
+	 * @subpackage Post
+	 */
 
 //
 // Post Type Registration

Spacing +1269 added lines, -1269 removed lines

@@ -16,9 +16,9 @@ 
  * @since 2.9.0
  */
 function create_initial_post_types() {
-	register_post_type( 'post', array(
+	register_post_type('post', array(
 		'labels' => array(
-			'name_admin_bar' => _x( 'Post', 'add new on admin bar' ),
+			'name_admin_bar' => _x('Post', 'add new on admin bar'),
 		),
 		'public'  => true,
 		'_builtin' => true, /* internal use only. don't use this when registering your own post type. */
@@ -30,12 +30,12 @@ 
 		'rewrite' => false,
 		'query_var' => false,
 		'delete_with_user' => true,
-		'supports' => array( 'title', 'editor', 'author', 'thumbnail', 'excerpt', 'trackbacks', 'custom-fields', 'comments', 'revisions', 'post-formats' ),
-	) );
+		'supports' => array('title', 'editor', 'author', 'thumbnail', 'excerpt', 'trackbacks', 'custom-fields', 'comments', 'revisions', 'post-formats'),
+	));
 
-	register_post_type( 'page', array(
+	register_post_type('page', array(
 		'labels' => array(
-			'name_admin_bar' => _x( 'Page', 'add new on admin bar' ),
+			'name_admin_bar' => _x('Page', 'add new on admin bar'),
 		),
 		'public' => true,
 		'publicly_queryable' => false,
@@ -48,16 +48,16 @@ 
 		'rewrite' => false,
 		'query_var' => false,
 		'delete_with_user' => true,
-		'supports' => array( 'title', 'editor', 'author', 'thumbnail', 'page-attributes', 'custom-fields', 'comments', 'revisions' ),
-	) );
+		'supports' => array('title', 'editor', 'author', 'thumbnail', 'page-attributes', 'custom-fields', 'comments', 'revisions'),
+	));
 
-	register_post_type( 'attachment', array(
+	register_post_type('attachment', array(
 		'labels' => array(
 			'name' => _x('Media', 'post type general name'),
-			'name_admin_bar' => _x( 'Media', 'add new from admin bar' ),
-			'add_new' => _x( 'Add New', 'add new media' ),
- 			'edit_item' => __( 'Edit Media' ),
- 			'view_item' => __( 'View Attachment Page' ),
+			'name_admin_bar' => _x('Media', 'add new from admin bar'),
+			'add_new' => _x('Add New', 'add new media'),
+ 			'edit_item' => __('Edit Media'),
+ 			'view_item' => __('View Attachment Page'),
 		),
 		'public' => true,
 		'show_ui' => true,
@@ -73,15 +73,15 @@ 
 		'query_var' => false,
 		'show_in_nav_menus' => false,
 		'delete_with_user' => true,
-		'supports' => array( 'title', 'author', 'comments' ),
-	) );
-	add_post_type_support( 'attachment:audio', 'thumbnail' );
-	add_post_type_support( 'attachment:video', 'thumbnail' );
+		'supports' => array('title', 'author', 'comments'),
+	));
+	add_post_type_support('attachment:audio', 'thumbnail');
+	add_post_type_support('attachment:video', 'thumbnail');
 
-	register_post_type( 'revision', array(
+	register_post_type('revision', array(
 		'labels' => array(
-			'name' => __( 'Revisions' ),
-			'singular_name' => __( 'Revision' ),
+			'name' => __('Revisions'),
+			'singular_name' => __('Revision'),
 		),
 		'public' => false,
 		'_builtin' => true, /* internal use only. don't use this when registering your own post type. */
@@ -93,13 +93,13 @@ 
 		'query_var' => false,
 		'can_export' => false,
 		'delete_with_user' => true,
-		'supports' => array( 'author' ),
-	) );
+		'supports' => array('author'),
+	));
 
-	register_post_type( 'nav_menu_item', array(
+	register_post_type('nav_menu_item', array(
 		'labels' => array(
-			'name' => __( 'Navigation Menu Items' ),
-			'singular_name' => __( 'Navigation Menu Item' ),
+			'name' => __('Navigation Menu Items'),
+			'singular_name' => __('Navigation Menu Item'),
 		),
 		'public' => false,
 		'_builtin' => true, /* internal use only. don't use this when registering your own post type. */
@@ -107,63 +107,63 @@ 
 		'rewrite' => false,
 		'delete_with_user' => false,
 		'query_var' => false,
-	) );
+	));
 
-	register_post_status( 'publish', array(
-		'label'       => _x( 'Published', 'post status' ),
+	register_post_status('publish', array(
+		'label'       => _x('Published', 'post status'),
 		'public'      => true,
 		'_builtin'    => true, /* internal use only. */
-		'label_count' => _n_noop( 'Published <span class="count">(%s)</span>', 'Published <span class="count">(%s)</span>' ),
-	) );
+		'label_count' => _n_noop('Published <span class="count">(%s)</span>', 'Published <span class="count">(%s)</span>'),
+	));
 
-	register_post_status( 'future', array(
-		'label'       => _x( 'Scheduled', 'post status' ),
+	register_post_status('future', array(
+		'label'       => _x('Scheduled', 'post status'),
 		'protected'   => true,
 		'_builtin'    => true, /* internal use only. */
-		'label_count' => _n_noop('Scheduled <span class="count">(%s)</span>', 'Scheduled <span class="count">(%s)</span>' ),
-	) );
+		'label_count' => _n_noop('Scheduled <span class="count">(%s)</span>', 'Scheduled <span class="count">(%s)</span>'),
+	));
 
-	register_post_status( 'draft', array(
-		'label'       => _x( 'Draft', 'post status' ),
+	register_post_status('draft', array(
+		'label'       => _x('Draft', 'post status'),
 		'protected'   => true,
 		'_builtin'    => true, /* internal use only. */
-		'label_count' => _n_noop( 'Draft <span class="count">(%s)</span>', 'Drafts <span class="count">(%s)</span>' ),
-	) );
+		'label_count' => _n_noop('Draft <span class="count">(%s)</span>', 'Drafts <span class="count">(%s)</span>'),
+	));
 
-	register_post_status( 'pending', array(
-		'label'       => _x( 'Pending', 'post status' ),
+	register_post_status('pending', array(
+		'label'       => _x('Pending', 'post status'),
 		'protected'   => true,
 		'_builtin'    => true, /* internal use only. */
-		'label_count' => _n_noop( 'Pending <span class="count">(%s)</span>', 'Pending <span class="count">(%s)</span>' ),
-	) );
+		'label_count' => _n_noop('Pending <span class="count">(%s)</span>', 'Pending <span class="count">(%s)</span>'),
+	));
 
-	register_post_status( 'private', array(
-		'label'       => _x( 'Private', 'post status' ),
+	register_post_status('private', array(
+		'label'       => _x('Private', 'post status'),
 		'private'     => true,
 		'_builtin'    => true, /* internal use only. */
-		'label_count' => _n_noop( 'Private <span class="count">(%s)</span>', 'Private <span class="count">(%s)</span>' ),
-	) );
+		'label_count' => _n_noop('Private <span class="count">(%s)</span>', 'Private <span class="count">(%s)</span>'),
+	));
 
-	register_post_status( 'trash', array(
-		'label'       => _x( 'Trash', 'post status' ),
+	register_post_status('trash', array(
+		'label'       => _x('Trash', 'post status'),
 		'internal'    => true,
 		'_builtin'    => true, /* internal use only. */
-		'label_count' => _n_noop( 'Trash <span class="count">(%s)</span>', 'Trash <span class="count">(%s)</span>' ),
+		'label_count' => _n_noop('Trash <span class="count">(%s)</span>', 'Trash <span class="count">(%s)</span>'),
 		'show_in_admin_status_list' => true,
-	) );
+	));
 
-	register_post_status( 'auto-draft', array(
+	register_post_status('auto-draft', array(
 		'label'    => 'auto-draft',
 		'internal' => true,
 		'_builtin' => true, /* internal use only. */
-	) );
+	));
 
-	register_post_status( 'inherit', array(
+	register_post_status('inherit', array(
 		'label'    => 'inherit',
 		'internal' => true,
 		'_builtin' => true, /* internal use only. */
 		'exclude_from_search' => false,
-	) );
+	));
 }
 
 /**
@@ -184,15 +184,15 @@ 
  * @param bool $unfiltered    Optional. Whether to apply filters. Default false.
  * @return string|false The file path to where the attached file should be, false otherwise.
  */
-function get_attached_file( $attachment_id, $unfiltered = false ) {
-	$file = get_post_meta( $attachment_id, '_wp_attached_file', true );
+function get_attached_file($attachment_id, $unfiltered = false) {
+	$file = get_post_meta($attachment_id, '_wp_attached_file', true);
 
 	// If the file is relative, prepend upload dir.
-	if ( $file && 0 !== strpos( $file, '/' ) && ! preg_match( '|^.:\\\|', $file ) && ( ( $uploads = wp_get_upload_dir() ) && false === $uploads['error'] ) ) {
-		$file = $uploads['basedir'] . "/$file";
+	if ($file && 0 !== strpos($file, '/') && ! preg_match('|^.:\\\|', $file) && (($uploads = wp_get_upload_dir()) && false === $uploads['error'])) {
+		$file = $uploads['basedir']."/$file";
 	}
 
-	if ( $unfiltered ) {
+	if ($unfiltered) {
 		return $file;
 	}
 
@@ -204,7 +204,7 @@ 
 	 * @param string $file          Path to attached file.
 	 * @param int    $attachment_id Attachment ID.
 	 */
-	return apply_filters( 'get_attached_file', $file, $attachment_id );
+	return apply_filters('get_attached_file', $file, $attachment_id);
 }
 
 /**
@@ -219,8 +219,8 @@ 
  * @param string $file          File path for the attachment.
  * @return bool True on success, false on failure.
  */
-function update_attached_file( $attachment_id, $file ) {
-	if ( !get_post( $attachment_id ) )
+function update_attached_file($attachment_id, $file) {
+	if ( ! get_post($attachment_id))
 		return false;
 
 	/**
@@ -231,12 +231,12 @@ 
 	 * @param string $file          Path to the attached file to update.
 	 * @param int    $attachment_id Attachment ID.
 	 */
-	$file = apply_filters( 'update_attached_file', $file, $attachment_id );
+	$file = apply_filters('update_attached_file', $file, $attachment_id);
 
-	if ( $file = _wp_relative_upload_path( $file ) )
-		return update_post_meta( $attachment_id, '_wp_attached_file', $file );
+	if ($file = _wp_relative_upload_path($file))
+		return update_post_meta($attachment_id, '_wp_attached_file', $file);
 	else
-		return delete_post_meta( $attachment_id, '_wp_attached_file' );
+		return delete_post_meta($attachment_id, '_wp_attached_file');
 }
 
 /**
@@ -249,13 +249,13 @@ 
  * @param string $path Full path to the file.
  * @return string Relative path on success, unchanged path on failure.
  */
-function _wp_relative_upload_path( $path ) {
+function _wp_relative_upload_path($path) {
 	$new_path = $path;
 
 	$uploads = wp_get_upload_dir();
-	if ( 0 === strpos( $new_path, $uploads['basedir'] ) ) {
-			$new_path = str_replace( $uploads['basedir'], '', $new_path );
-			$new_path = ltrim( $new_path, '/' );
+	if (0 === strpos($new_path, $uploads['basedir'])) {
+			$new_path = str_replace($uploads['basedir'], '', $new_path);
+			$new_path = ltrim($new_path, '/');
 	}
 
 	/**
@@ -266,7 +266,7 @@ 
 	 * @param string $new_path Relative path to the file.
 	 * @param string $path     Full path to the file.
 	 */
-	return apply_filters( '_wp_relative_upload_path', $new_path, $path );
+	return apply_filters('_wp_relative_upload_path', $new_path, $path);
 }
 
 /**
@@ -321,17 +321,17 @@ 
  * @return array Array of children, where the type of each element is determined by $output parameter.
  *               Empty array on failure.
  */
-function get_children( $args = '', $output = OBJECT ) {
+function get_children($args = '', $output = OBJECT) {
 	$kids = array();
-	if ( empty( $args ) ) {
-		if ( isset( $GLOBALS['post'] ) ) {
-			$args = array('post_parent' => (int) $GLOBALS['post']->post_parent );
+	if (empty($args)) {
+		if (isset($GLOBALS['post'])) {
+			$args = array('post_parent' => (int) $GLOBALS['post']->post_parent);
 		} else {
 			return $kids;
 		}
-	} elseif ( is_object( $args ) ) {
-		$args = array('post_parent' => (int) $args->post_parent );
-	} elseif ( is_numeric( $args ) ) {
+	} elseif (is_object($args)) {
+		$args = array('post_parent' => (int) $args->post_parent);
+	} elseif (is_numeric($args)) {
 		$args = array('post_parent' => (int) $args);
 	}
 
@@ -340,32 +340,32 @@ 
 		'post_status' => 'any', 'post_parent' => 0,
 	);
 
-	$r = wp_parse_args( $args, $defaults );
+	$r = wp_parse_args($args, $defaults);
 
-	$children = get_posts( $r );
+	$children = get_posts($r);
 
-	if ( ! $children )
+	if ( ! $children)
 		return $kids;
 
-	if ( ! empty( $r['fields'] ) )
+	if ( ! empty($r['fields']))
 		return $children;
 
 	update_post_cache($children);
 
-	foreach ( $children as $key => $child )
+	foreach ($children as $key => $child)
 		$kids[$child->ID] = $children[$key];
 
-	if ( $output == OBJECT ) {
+	if ($output == OBJECT) {
 		return $kids;
-	} elseif ( $output == ARRAY_A ) {
+	} elseif ($output == ARRAY_A) {
 		$weeuns = array();
-		foreach ( (array) $kids as $kid ) {
+		foreach ((array) $kids as $kid) {
 			$weeuns[$kid->ID] = get_object_vars($kids[$kid->ID]);
 		}
 		return $weeuns;
-	} elseif ( $output == ARRAY_N ) {
+	} elseif ($output == ARRAY_N) {
 		$babes = array();
-		foreach ( (array) $kids as $kid ) {
+		foreach ((array) $kids as $kid) {
 			$babes[$kid->ID] = array_values(get_object_vars($kids[$kid->ID]));
 		}
 		return $babes;
@@ -390,9 +390,9 @@ 
  * @param string $post Post content.
  * @return array Post before ('main'), after ('extended'), and custom read more ('more_text').
  */
-function get_extended( $post ) {
+function get_extended($post) {
 	//Match the new style more links.
-	if ( preg_match('/<!--more(.*?)?-->/', $post, $matches) ) {
+	if (preg_match('/<!--more(.*?)?-->/', $post, $matches)) {
 		list($main, $extended) = explode($matches[0], $post, 2);
 		$more_text = $matches[1];
 	} else {
@@ -406,7 +406,7 @@ 
 	$extended = preg_replace('/^[\s]*(.*)[\s]*$/', '\\1', $extended);
 	$more_text = preg_replace('/^[\s]*(.*)[\s]*$/', '\\1', $more_text);
 
-	return array( 'main' => $main, 'extended' => $extended, 'more_text' => $more_text );
+	return array('main' => $main, 'extended' => $extended, 'more_text' => $more_text);
 }
 
 /**
@@ -427,34 +427,34 @@ 
  * @return WP_Post|array|null Type corresponding to $output on success or null on failure.
  *                            When $output is OBJECT, a `WP_Post` instance is returned.
  */
-function get_post( $post = null, $output = OBJECT, $filter = 'raw' ) {
-	if ( empty( $post ) && isset( $GLOBALS['post'] ) )
+function get_post($post = null, $output = OBJECT, $filter = 'raw') {
+	if (empty($post) && isset($GLOBALS['post']))
 		$post = $GLOBALS['post'];
 
-	if ( $post instanceof WP_Post ) {
+	if ($post instanceof WP_Post) {
 		$_post = $post;
-	} elseif ( is_object( $post ) ) {
-		if ( empty( $post->filter ) ) {
-			$_post = sanitize_post( $post, 'raw' );
-			$_post = new WP_Post( $_post );
-		} elseif ( 'raw' == $post->filter ) {
-			$_post = new WP_Post( $post );
+	} elseif (is_object($post)) {
+		if (empty($post->filter)) {
+			$_post = sanitize_post($post, 'raw');
+			$_post = new WP_Post($_post);
+		} elseif ('raw' == $post->filter) {
+			$_post = new WP_Post($post);
 		} else {
-			$_post = WP_Post::get_instance( $post->ID );
+			$_post = WP_Post::get_instance($post->ID);
 		}
 	} else {
-		$_post = WP_Post::get_instance( $post );
+		$_post = WP_Post::get_instance($post);
 	}
 
-	if ( ! $_post )
+	if ( ! $_post)
 		return null;
 
-	$_post = $_post->filter( $filter );
+	$_post = $_post->filter($filter);
 
-	if ( $output == ARRAY_A )
+	if ($output == ARRAY_A)
 		return $_post->to_array();
-	elseif ( $output == ARRAY_N )
-		return array_values( $_post->to_array() );
+	elseif ($output == ARRAY_N)
+		return array_values($_post->to_array());
 
 	return $_post;
 }
@@ -467,19 +467,19 @@ 
  * @param int|WP_Post $post Post ID or post object.
  * @return array Ancestor IDs or empty array if none are found.
  */
-function get_post_ancestors( $post ) {
-	$post = get_post( $post );
+function get_post_ancestors($post) {
+	$post = get_post($post);
 
-	if ( ! $post || empty( $post->post_parent ) || $post->post_parent == $post->ID )
+	if ( ! $post || empty($post->post_parent) || $post->post_parent == $post->ID)
 		return array();
 
 	$ancestors = array();
 
 	$id = $ancestors[] = $post->post_parent;
 
-	while ( $ancestor = get_post( $id ) ) {
+	while ($ancestor = get_post($id)) {
 		// Loop detection: If the ancestor has been seen before, break.
-		if ( empty( $ancestor->post_parent ) || ( $ancestor->post_parent == $post->ID ) || in_array( $ancestor->post_parent, $ancestors ) )
+		if (empty($ancestor->post_parent) || ($ancestor->post_parent == $post->ID) || in_array($ancestor->post_parent, $ancestors))
 			break;
 
 		$id = $ancestors[] = $ancestor->post_parent;
@@ -508,13 +508,13 @@ 
  *                             or 'display'. Default 'display'.
  * @return string The value of the post field on success, empty string on failure.
  */
-function get_post_field( $field, $post = null, $context = 'display' ) {
-	$post = get_post( $post );
+function get_post_field($field, $post = null, $context = 'display') {
+	$post = get_post($post);
 
-	if ( !$post )
+	if ( ! $post)
 		return '';
 
-	if ( !isset($post->$field) )
+	if ( ! isset($post->$field))
 		return '';
 
 	return sanitize_post_field($field, $post->$field, $post->ID, $context);
@@ -531,10 +531,10 @@ 
  * @param int|WP_Post $ID Optional. Post ID or post object. Default empty.
  * @return string|false The mime type on success, false on failure.
  */
-function get_post_mime_type( $ID = '' ) {
+function get_post_mime_type($ID = '') {
 	$post = get_post($ID);
 
-	if ( is_object($post) )
+	if (is_object($post))
 		return $post->post_mime_type;
 
 	return false;
@@ -551,25 +551,25 @@ 
  * @param int|WP_Post $ID Optional. Post ID or post object. Default empty.
  * @return string|false Post status on success, false on failure.
  */
-function get_post_status( $ID = '' ) {
+function get_post_status($ID = '') {
 	$post = get_post($ID);
 
-	if ( !is_object($post) )
+	if ( ! is_object($post))
 		return false;
 
-	if ( 'attachment' == $post->post_type ) {
-		if ( 'private' == $post->post_status )
+	if ('attachment' == $post->post_type) {
+		if ('private' == $post->post_status)
 			return 'private';
 
 		// Unattached attachments are assumed to be published.
-		if ( ( 'inherit' == $post->post_status ) && ( 0 == $post->post_parent) )
+		if (('inherit' == $post->post_status) && (0 == $post->post_parent))
 			return 'publish';
 
 		// Inherit status from the parent.
-		if ( $post->post_parent && ( $post->ID != $post->post_parent ) ) {
-			$parent_post_status = get_post_status( $post->post_parent );
-			if ( 'trash' == $parent_post_status ) {
-				return get_post_meta( $post->post_parent, '_wp_trash_meta_status', true );
+		if ($post->post_parent && ($post->ID != $post->post_parent)) {
+			$parent_post_status = get_post_status($post->post_parent);
+			if ('trash' == $parent_post_status) {
+				return get_post_meta($post->post_parent, '_wp_trash_meta_status', true);
 			} else {
 				return $parent_post_status;
 			}
@@ -585,7 +585,7 @@ 
 	 * @param string  $post_status The post status.
 	 * @param WP_Post $post        The post object.
 	 */
-	return apply_filters( 'get_post_status', $post->post_status, $post );
+	return apply_filters('get_post_status', $post->post_status, $post);
 }
 
 /**
@@ -600,10 +600,10 @@ 
  */
 function get_post_statuses() {
 	$status = array(
-		'draft'   => __( 'Draft' ),
-		'pending' => __( 'Pending Review' ),
-		'private' => __( 'Private' ),
-		'publish' => __( 'Published' )
+		'draft'   => __('Draft'),
+		'pending' => __('Pending Review'),
+		'private' => __('Private'),
+		'publish' => __('Published')
 	);
 
 	return $status;
@@ -621,9 +621,9 @@ 
  */
 function get_page_statuses() {
 	$status = array(
-		'draft'   => __( 'Draft' ),
-		'private' => __( 'Private' ),
-		'publish' => __( 'Published' )
+		'draft'   => __('Draft'),
+		'private' => __('Private'),
+		'publish' => __('Published')
 	);
 
 	return $status;
@@ -672,10 +672,10 @@ 
  * }
  * @return object
  */
-function register_post_status( $post_status, $args = array() ) {
+function register_post_status($post_status, $args = array()) {
 	global $wp_post_statuses;
 
-	if (!is_array($wp_post_statuses))
+	if ( ! is_array($wp_post_statuses))
 		$wp_post_statuses = array();
 
 	// Args prefixed with an underscore are reserved for internal use.
@@ -699,38 +699,38 @@ 
 	$args->name = $post_status;
 
 	// Set various defaults.
-	if ( null === $args->public && null === $args->internal && null === $args->protected && null === $args->private )
+	if (null === $args->public && null === $args->internal && null === $args->protected && null === $args->private)
 		$args->internal = true;
 
-	if ( null === $args->public  )
+	if (null === $args->public)
 		$args->public = false;
 
-	if ( null === $args->private  )
+	if (null === $args->private)
 		$args->private = false;
 
-	if ( null === $args->protected  )
+	if (null === $args->protected)
 		$args->protected = false;
 
-	if ( null === $args->internal  )
+	if (null === $args->internal)
 		$args->internal = false;
 
-	if ( null === $args->publicly_queryable )
+	if (null === $args->publicly_queryable)
 		$args->publicly_queryable = $args->public;
 
-	if ( null === $args->exclude_from_search )
+	if (null === $args->exclude_from_search)
 		$args->exclude_from_search = $args->internal;
 
-	if ( null === $args->show_in_admin_all_list )
-		$args->show_in_admin_all_list = !$args->internal;
+	if (null === $args->show_in_admin_all_list)
+		$args->show_in_admin_all_list = ! $args->internal;
 
-	if ( null === $args->show_in_admin_status_list )
-		$args->show_in_admin_status_list = !$args->internal;
+	if (null === $args->show_in_admin_status_list)
+		$args->show_in_admin_status_list = ! $args->internal;
 
-	if ( false === $args->label )
+	if (false === $args->label)
 		$args->label = $post_status;
 
-	if ( false === $args->label_count )
-		$args->label_count = array( $args->label, $args->label );
+	if (false === $args->label_count)
+		$args->label_count = array($args->label, $args->label);
 
 	$wp_post_statuses[$post_status] = $args;
 
@@ -749,10 +749,10 @@ 
  * @param string $post_status The name of a registered post status.
  * @return object|null A post status object.
  */
-function get_post_status_object( $post_status ) {
+function get_post_status_object($post_status) {
 	global $wp_post_statuses;
 
-	if ( empty($wp_post_statuses[$post_status]) )
+	if (empty($wp_post_statuses[$post_status]))
 		return null;
 
 	return $wp_post_statuses[$post_status];
@@ -775,7 +775,7 @@ 
  *                               Default 'and'.
  * @return array A list of post status names or objects.
  */
-function get_post_stati( $args = array(), $output = 'names', $operator = 'and' ) {
+function get_post_stati($args = array(), $output = 'names', $operator = 'and') {
 	global $wp_post_statuses;
 
 	$field = ('names' == $output) ? 'name' : false;
@@ -795,11 +795,11 @@ 
  * @param string $post_type Post type name
  * @return bool Whether post type is hierarchical.
  */
-function is_post_type_hierarchical( $post_type ) {
-	if ( ! post_type_exists( $post_type ) )
+function is_post_type_hierarchical($post_type) {
+	if ( ! post_type_exists($post_type))
 		return false;
 
-	$post_type = get_post_type_object( $post_type );
+	$post_type = get_post_type_object($post_type);
 	return $post_type->hierarchical;
 }
 
@@ -813,8 +813,8 @@ 
  * @param string $post_type Post type name.
  * @return bool Whether post type is registered.
  */
-function post_type_exists( $post_type ) {
-	return (bool) get_post_type_object( $post_type );
+function post_type_exists($post_type) {
+	return (bool) get_post_type_object($post_type);
 }
 
 /**
@@ -825,8 +825,8 @@ 
  * @param int|WP_Post|null $post Optional. Post ID or post object. Default is global $post.
  * @return string|false          Post type on success, false on failure.
  */
-function get_post_type( $post = null ) {
-	if ( $post = get_post( $post ) )
+function get_post_type($post = null) {
+	if ($post = get_post($post))
 		return $post->post_type;
 
 	return false;
@@ -844,14 +844,14 @@ 
  * @param string $post_type The name of a registered post type.
  * @return object|null A post type object.
  */
-function get_post_type_object( $post_type ) {
+function get_post_type_object($post_type) {
 	global $wp_post_types;
 
-	if ( ! is_scalar( $post_type ) || empty( $wp_post_types[ $post_type ] ) ) {
+	if ( ! is_scalar($post_type) || empty($wp_post_types[$post_type])) {
 		return null;
 	}
 
-	return $wp_post_types[ $post_type ];
+	return $wp_post_types[$post_type];
 }
 
 /**
@@ -872,7 +872,7 @@ 
  *                               must match; 'not' means no elements may match. Default 'and'.
  * @return array A list of post type names or objects.
  */
-function get_post_types( $args = array(), $output = 'names', $operator = 'and' ) {
+function get_post_types($args = array(), $output = 'names', $operator = 'and') {
 	global $wp_post_types;
 
 	$field = ('names' == $output) ? 'name' : false;
@@ -995,16 +995,16 @@ 
  * }
  * @return object|WP_Error The registered post type object, or an error object.
  */
-function register_post_type( $post_type, $args = array() ) {
+function register_post_type($post_type, $args = array()) {
 	global $wp_post_types, $wp_rewrite, $wp;
 
-	if ( ! is_array( $wp_post_types ) ) {
+	if ( ! is_array($wp_post_types)) {
 		$wp_post_types = array();
 	}
 
 	// Sanitize post type name
-	$post_type = sanitize_key( $post_type );
-	$args      = wp_parse_args( $args );
+	$post_type = sanitize_key($post_type);
+	$args      = wp_parse_args($args);
 
 	/**
 	 * Filter the arguments for registering a post type.
@@ -1014,9 +1014,9 @@ 
 	 * @param array  $args      Array of arguments for registering a post type.
 	 * @param string $post_type Post type key.
 	 */
-	$args = apply_filters( 'register_post_type_args', $args, $post_type );
+	$args = apply_filters('register_post_type_args', $args, $post_type);
 
-	$has_edit_link = ! empty( $args['_edit_link'] );
+	$has_edit_link = ! empty($args['_edit_link']);
 
 	// Args prefixed with an underscore are reserved for internal use.
 	$defaults = array(
@@ -1046,136 +1046,136 @@ 
 		'_builtin'             => false,
 		'_edit_link'           => 'post.php?post=%d',
 	);
-	$args = array_merge( $defaults, $args );
+	$args = array_merge($defaults, $args);
 	$args = (object) $args;
 
 	$args->name = $post_type;
 
-	if ( empty( $post_type ) || strlen( $post_type ) > 20 ) {
-		_doing_it_wrong( __FUNCTION__, __( 'Post type names must be between 1 and 20 characters in length.' ), '4.2' );
-		return new WP_Error( 'post_type_length_invalid', __( 'Post type names must be between 1 and 20 characters in length.' ) );
+	if (empty($post_type) || strlen($post_type) > 20) {
+		_doing_it_wrong(__FUNCTION__, __('Post type names must be between 1 and 20 characters in length.'), '4.2');
+		return new WP_Error('post_type_length_invalid', __('Post type names must be between 1 and 20 characters in length.'));
 	}
 
 	// If not set, default to the setting for public.
-	if ( null === $args->publicly_queryable )
+	if (null === $args->publicly_queryable)
 		$args->publicly_queryable = $args->public;
 
 	// If not set, default to the setting for public.
-	if ( null === $args->show_ui )
+	if (null === $args->show_ui)
 		$args->show_ui = $args->public;
 
 	// If not set, default to the setting for show_ui.
-	if ( null === $args->show_in_menu || ! $args->show_ui )
+	if (null === $args->show_in_menu || ! $args->show_ui)
 		$args->show_in_menu = $args->show_ui;
 
 	// If not set, default to the whether the full UI is shown.
-	if ( null === $args->show_in_admin_bar )
+	if (null === $args->show_in_admin_bar)
 		$args->show_in_admin_bar = (bool) $args->show_in_menu;
 
 	// If not set, default to the setting for public.
-	if ( null === $args->show_in_nav_menus )
+	if (null === $args->show_in_nav_menus)
 		$args->show_in_nav_menus = $args->public;
 
 	// If not set, default to true if not public, false if public.
-	if ( null === $args->exclude_from_search )
-		$args->exclude_from_search = !$args->public;
+	if (null === $args->exclude_from_search)
+		$args->exclude_from_search = ! $args->public;
 
 	// Back compat with quirky handling in version 3.0. #14122.
-	if ( empty( $args->capabilities ) && null === $args->map_meta_cap && in_array( $args->capability_type, array( 'post', 'page' ) ) )
+	if (empty($args->capabilities) && null === $args->map_meta_cap && in_array($args->capability_type, array('post', 'page')))
 		$args->map_meta_cap = true;
 
 	// If not set, default to false.
-	if ( null === $args->map_meta_cap )
+	if (null === $args->map_meta_cap)
 		$args->map_meta_cap = false;
 
 	// If there's no specified edit link and no UI, remove the edit link.
-	if ( ! $args->show_ui && ! $has_edit_link ) {
+	if ( ! $args->show_ui && ! $has_edit_link) {
 		$args->_edit_link = '';
 	}
 
-	$args->cap = get_post_type_capabilities( $args );
-	unset( $args->capabilities );
+	$args->cap = get_post_type_capabilities($args);
+	unset($args->capabilities);
 
-	if ( is_array( $args->capability_type ) )
+	if (is_array($args->capability_type))
 		$args->capability_type = $args->capability_type[0];
 
-	if ( ! empty( $args->supports ) ) {
-		add_post_type_support( $post_type, $args->supports );
-		unset( $args->supports );
-	} elseif ( false !== $args->supports ) {
+	if ( ! empty($args->supports)) {
+		add_post_type_support($post_type, $args->supports);
+		unset($args->supports);
+	} elseif (false !== $args->supports) {
 		// Add default features
-		add_post_type_support( $post_type, array( 'title', 'editor' ) );
+		add_post_type_support($post_type, array('title', 'editor'));
 	}
 
-	if ( false !== $args->query_var ) {
-		if ( true === $args->query_var )
+	if (false !== $args->query_var) {
+		if (true === $args->query_var)
 			$args->query_var = $post_type;
 		else
-			$args->query_var = sanitize_title_with_dashes( $args->query_var );
+			$args->query_var = sanitize_title_with_dashes($args->query_var);
 
-		if ( $wp && is_post_type_viewable( $args ) ) {
-			$wp->add_query_var( $args->query_var );
+		if ($wp && is_post_type_viewable($args)) {
+			$wp->add_query_var($args->query_var);
 		}
 	}
 
-	if ( false !== $args->rewrite && ( is_admin() || '' != get_option( 'permalink_structure' ) ) ) {
-		if ( ! is_array( $args->rewrite ) )
+	if (false !== $args->rewrite && (is_admin() || '' != get_option('permalink_structure'))) {
+		if ( ! is_array($args->rewrite))
 			$args->rewrite = array();
-		if ( empty( $args->rewrite['slug'] ) )
+		if (empty($args->rewrite['slug']))
 			$args->rewrite['slug'] = $post_type;
-		if ( ! isset( $args->rewrite['with_front'] ) )
+		if ( ! isset($args->rewrite['with_front']))
 			$args->rewrite['with_front'] = true;
-		if ( ! isset( $args->rewrite['pages'] ) )
+		if ( ! isset($args->rewrite['pages']))
 			$args->rewrite['pages'] = true;
-		if ( ! isset( $args->rewrite['feeds'] ) || ! $args->has_archive )
+		if ( ! isset($args->rewrite['feeds']) || ! $args->has_archive)
 			$args->rewrite['feeds'] = (bool) $args->has_archive;
-		if ( ! isset( $args->rewrite['ep_mask'] ) ) {
-			if ( isset( $args->permalink_epmask ) )
+		if ( ! isset($args->rewrite['ep_mask'])) {
+			if (isset($args->permalink_epmask))
 				$args->rewrite['ep_mask'] = $args->permalink_epmask;
 			else
 				$args->rewrite['ep_mask'] = EP_PERMALINK;
 		}
 
-		if ( $args->hierarchical )
-			add_rewrite_tag( "%$post_type%", '(.+?)', $args->query_var ? "{$args->query_var}=" : "post_type=$post_type&pagename=" );
+		if ($args->hierarchical)
+			add_rewrite_tag("%$post_type%", '(.+?)', $args->query_var ? "{$args->query_var}=" : "post_type=$post_type&pagename=");
 		else
-			add_rewrite_tag( "%$post_type%", '([^/]+)', $args->query_var ? "{$args->query_var}=" : "post_type=$post_type&name=" );
+			add_rewrite_tag("%$post_type%", '([^/]+)', $args->query_var ? "{$args->query_var}=" : "post_type=$post_type&name=");
 
-		if ( $args->has_archive ) {
+		if ($args->has_archive) {
 			$archive_slug = $args->has_archive === true ? $args->rewrite['slug'] : $args->has_archive;
-			if ( $args->rewrite['with_front'] )
-				$archive_slug = substr( $wp_rewrite->front, 1 ) . $archive_slug;
+			if ($args->rewrite['with_front'])
+				$archive_slug = substr($wp_rewrite->front, 1).$archive_slug;
 			else
-				$archive_slug = $wp_rewrite->root . $archive_slug;
+				$archive_slug = $wp_rewrite->root.$archive_slug;
 
-			add_rewrite_rule( "{$archive_slug}/?$", "index.php?post_type=$post_type", 'top' );
-			if ( $args->rewrite['feeds'] && $wp_rewrite->feeds ) {
-				$feeds = '(' . trim( implode( '|', $wp_rewrite->feeds ) ) . ')';
-				add_rewrite_rule( "{$archive_slug}/feed/$feeds/?$", "index.php?post_type=$post_type" . '&feed=$matches[1]', 'top' );
-				add_rewrite_rule( "{$archive_slug}/$feeds/?$", "index.php?post_type=$post_type" . '&feed=$matches[1]', 'top' );
+			add_rewrite_rule("{$archive_slug}/?$", "index.php?post_type=$post_type", 'top');
+			if ($args->rewrite['feeds'] && $wp_rewrite->feeds) {
+				$feeds = '('.trim(implode('|', $wp_rewrite->feeds)).')';
+				add_rewrite_rule("{$archive_slug}/feed/$feeds/?$", "index.php?post_type=$post_type".'&feed=$matches[1]', 'top');
+				add_rewrite_rule("{$archive_slug}/$feeds/?$", "index.php?post_type=$post_type".'&feed=$matches[1]', 'top');
 			}
-			if ( $args->rewrite['pages'] )
-				add_rewrite_rule( "{$archive_slug}/{$wp_rewrite->pagination_base}/([0-9]{1,})/?$", "index.php?post_type=$post_type" . '&paged=$matches[1]', 'top' );
+			if ($args->rewrite['pages'])
+				add_rewrite_rule("{$archive_slug}/{$wp_rewrite->pagination_base}/([0-9]{1,})/?$", "index.php?post_type=$post_type".'&paged=$matches[1]', 'top');
 		}
 
 		$permastruct_args = $args->rewrite;
 		$permastruct_args['feed'] = $permastruct_args['feeds'];
-		add_permastruct( $post_type, "{$args->rewrite['slug']}/%$post_type%", $permastruct_args );
+		add_permastruct($post_type, "{$args->rewrite['slug']}/%$post_type%", $permastruct_args);
 	}
 
 	// Register the post type meta box if a custom callback was specified.
-	if ( $args->register_meta_box_cb )
-		add_action( 'add_meta_boxes_' . $post_type, $args->register_meta_box_cb, 10, 1 );
+	if ($args->register_meta_box_cb)
+		add_action('add_meta_boxes_'.$post_type, $args->register_meta_box_cb, 10, 1);
 
-	$args->labels = get_post_type_labels( $args );
+	$args->labels = get_post_type_labels($args);
 	$args->label = $args->labels->name;
 
-	$wp_post_types[ $post_type ] = $args;
+	$wp_post_types[$post_type] = $args;
 
-	add_action( 'future_' . $post_type, '_future_post_hook', 5, 2 );
+	add_action('future_'.$post_type, '_future_post_hook', 5, 2);
 
-	foreach ( $args->taxonomies as $taxonomy ) {
-		register_taxonomy_for_object_type( $taxonomy, $post_type );
+	foreach ($args->taxonomies as $taxonomy) {
+		register_taxonomy_for_object_type($taxonomy, $post_type);
 	}
 
 	/**
@@ -1186,7 +1186,7 @@ 
 	 * @param string $post_type Post type.
 	 * @param object $args      Arguments used to register the post type.
 	 */
-	do_action( 'registered_post_type', $post_type, $args );
+	do_action('registered_post_type', $post_type, $args);
 
 	return $args;
 }
@@ -1207,59 +1207,59 @@ 
  * @param string $post_type Post type to unregister.
  * @return bool|WP_Error True on success, WP_Error on failure or if the post type doesn't exist.
  */
-function unregister_post_type( $post_type ) {
-	if ( ! post_type_exists( $post_type ) ) {
-		return new WP_Error( 'invalid_post_type', __( 'Invalid post type' ) );
+function unregister_post_type($post_type) {
+	if ( ! post_type_exists($post_type)) {
+		return new WP_Error('invalid_post_type', __('Invalid post type'));
 	}
 
-	$post_type_args = get_post_type_object( $post_type );
+	$post_type_args = get_post_type_object($post_type);
 
 	// Do not allow unregistering internal post types.
-	if ( $post_type_args->_builtin ) {
-		return new WP_Error( 'invalid_post_type', __( 'Unregistering a built-in post type is not allowed' ) );
+	if ($post_type_args->_builtin) {
+		return new WP_Error('invalid_post_type', __('Unregistering a built-in post type is not allowed'));
 	}
 
 	global $wp, $wp_rewrite, $_wp_post_type_features, $post_type_meta_caps, $wp_post_types;
 
 	// Remove query var.
-	if ( false !== $post_type_args->query_var ) {
-		$wp->remove_query_var( $post_type_args->query_var );
+	if (false !== $post_type_args->query_var) {
+		$wp->remove_query_var($post_type_args->query_var);
 	}
 
 	// Remove any rewrite rules, permastructs, and rules.
-	if ( false !== $post_type_args->rewrite ) {
-		remove_rewrite_tag( "%$post_type%" );
-		remove_permastruct( $post_type );
-		foreach ( $wp_rewrite->extra_rules_top as $regex => $query ) {
-			if ( false !== strpos( $query, "index.php?post_type=$post_type" ) ) {
-				unset( $wp_rewrite->extra_rules_top[ $regex ] );
+	if (false !== $post_type_args->rewrite) {
+		remove_rewrite_tag("%$post_type%");
+		remove_permastruct($post_type);
+		foreach ($wp_rewrite->extra_rules_top as $regex => $query) {
+			if (false !== strpos($query, "index.php?post_type=$post_type")) {
+				unset($wp_rewrite->extra_rules_top[$regex]);
 			}
 		}
 	}
 
 	// Remove registered custom meta capabilities.
-	foreach ( $post_type_args->cap as $cap ) {
-		unset( $post_type_meta_caps[ $cap ] );
+	foreach ($post_type_args->cap as $cap) {
+		unset($post_type_meta_caps[$cap]);
 	}
 
 	// Remove all post type support.
-	unset( $_wp_post_type_features[ $post_type ] );
+	unset($_wp_post_type_features[$post_type]);
 
 	// Unregister the post type meta box if a custom callback was specified.
-	if ( $post_type_args->register_meta_box_cb ) {
-		remove_action( 'add_meta_boxes_' . $post_type, $post_type_args->register_meta_box_cb );
+	if ($post_type_args->register_meta_box_cb) {
+		remove_action('add_meta_boxes_'.$post_type, $post_type_args->register_meta_box_cb);
 	}
 
 	// Remove the post type from all taxonomies.
-	foreach ( get_object_taxonomies( $post_type ) as $taxonomy ) {
-		unregister_taxonomy_for_object_type( $taxonomy, $post_type );
+	foreach (get_object_taxonomies($post_type) as $taxonomy) {
+		unregister_taxonomy_for_object_type($taxonomy, $post_type);
 	}
 
 	// Remove the future post hook action.
-	remove_action( 'future_' . $post_type, '_future_post_hook', 5 );
+	remove_action('future_'.$post_type, '_future_post_hook', 5);
 
 	// Remove the post type.
-	unset( $wp_post_types[ $post_type ] );
+	unset($wp_post_types[$post_type]);
 
 	/**
 	 * Fires after a post type was unregistered.
@@ -1268,7 +1268,7 @@ 
 	 *
 	 * @param string $post_type Post type key.
 	 */
-	do_action( 'unregistered_post_type', $post_type );
+	do_action('unregistered_post_type', $post_type);
 
 	return true;
 }
@@ -1328,48 +1328,48 @@ 
  * @param object $args Post type registration arguments.
  * @return object object with all the capabilities as member variables.
  */
-function get_post_type_capabilities( $args ) {
-	if ( ! is_array( $args->capability_type ) )
-		$args->capability_type = array( $args->capability_type, $args->capability_type . 's' );
+function get_post_type_capabilities($args) {
+	if ( ! is_array($args->capability_type))
+		$args->capability_type = array($args->capability_type, $args->capability_type.'s');
 
 	// Singular base for meta capabilities, plural base for primitive capabilities.
-	list( $singular_base, $plural_base ) = $args->capability_type;
+	list($singular_base, $plural_base) = $args->capability_type;
 
 	$default_capabilities = array(
 		// Meta capabilities
-		'edit_post'          => 'edit_'         . $singular_base,
-		'read_post'          => 'read_'         . $singular_base,
-		'delete_post'        => 'delete_'       . $singular_base,
+		'edit_post'          => 'edit_'.$singular_base,
+		'read_post'          => 'read_'.$singular_base,
+		'delete_post'        => 'delete_'.$singular_base,
 		// Primitive capabilities used outside of map_meta_cap():
-		'edit_posts'         => 'edit_'         . $plural_base,
-		'edit_others_posts'  => 'edit_others_'  . $plural_base,
-		'publish_posts'      => 'publish_'      . $plural_base,
-		'read_private_posts' => 'read_private_' . $plural_base,
+		'edit_posts'         => 'edit_'.$plural_base,
+		'edit_others_posts'  => 'edit_others_'.$plural_base,
+		'publish_posts'      => 'publish_'.$plural_base,
+		'read_private_posts' => 'read_private_'.$plural_base,
 	);
 
 	// Primitive capabilities used within map_meta_cap():
-	if ( $args->map_meta_cap ) {
+	if ($args->map_meta_cap) {
 		$default_capabilities_for_mapping = array(
 			'read'                   => 'read',
-			'delete_posts'           => 'delete_'           . $plural_base,
-			'delete_private_posts'   => 'delete_private_'   . $plural_base,
-			'delete_published_posts' => 'delete_published_' . $plural_base,
-			'delete_others_posts'    => 'delete_others_'    . $plural_base,
-			'edit_private_posts'     => 'edit_private_'     . $plural_base,
-			'edit_published_posts'   => 'edit_published_'   . $plural_base,
+			'delete_posts'           => 'delete_'.$plural_base,
+			'delete_private_posts'   => 'delete_private_'.$plural_base,
+			'delete_published_posts' => 'delete_published_'.$plural_base,
+			'delete_others_posts'    => 'delete_others_'.$plural_base,
+			'edit_private_posts'     => 'edit_private_'.$plural_base,
+			'edit_published_posts'   => 'edit_published_'.$plural_base,
 		);
-		$default_capabilities = array_merge( $default_capabilities, $default_capabilities_for_mapping );
+		$default_capabilities = array_merge($default_capabilities, $default_capabilities_for_mapping);
 	}
 
-	$capabilities = array_merge( $default_capabilities, $args->capabilities );
+	$capabilities = array_merge($default_capabilities, $args->capabilities);
 
 	// Post creation capability simply maps to edit_posts by default:
-	if ( ! isset( $capabilities['create_posts'] ) )
+	if ( ! isset($capabilities['create_posts']))
 		$capabilities['create_posts'] = $capabilities['edit_posts'];
 
 	// Remember meta capabilities for future reference.
-	if ( $args->map_meta_cap )
-		_post_type_meta_capabilities( $capabilities );
+	if ($args->map_meta_cap)
+		_post_type_meta_capabilities($capabilities);
 
 	return (object) $capabilities;
 }
@@ -1384,12 +1384,12 @@ 
  *
  * @param array $capabilities Post type meta capabilities.
  */
-function _post_type_meta_capabilities( $capabilities = null ) {
+function _post_type_meta_capabilities($capabilities = null) {
 	global $post_type_meta_caps;
 
-	foreach ( $capabilities as $core => $custom ) {
-		if ( in_array( $core, array( 'read_post', 'delete_post', 'edit_post' ) ) ) {
-			$post_type_meta_caps[ $custom ] = $core;
+	foreach ($capabilities as $core => $custom) {
+		if (in_array($core, array('read_post', 'delete_post', 'edit_post'))) {
+			$post_type_meta_caps[$custom] = $core;
 		}
 	}
 }
@@ -1442,34 +1442,34 @@ 
  * @param object $post_type_object Post type object.
  * @return object object with all the labels as member variables.
  */
-function get_post_type_labels( $post_type_object ) {
+function get_post_type_labels($post_type_object) {
 	$nohier_vs_hier_defaults = array(
-		'name' => array( _x('Posts', 'post type general name'), _x('Pages', 'post type general name') ),
-		'singular_name' => array( _x('Post', 'post type singular name'), _x('Page', 'post type singular name') ),
-		'add_new' => array( _x('Add New', 'post'), _x('Add New', 'page') ),
-		'add_new_item' => array( __('Add New Post'), __('Add New Page') ),
-		'edit_item' => array( __('Edit Post'), __('Edit Page') ),
-		'new_item' => array( __('New Post'), __('New Page') ),
-		'view_item' => array( __('View Post'), __('View Page') ),
-		'search_items' => array( __('Search Posts'), __('Search Pages') ),
-		'not_found' => array( __('No posts found.'), __('No pages found.') ),
-		'not_found_in_trash' => array( __('No posts found in Trash.'), __('No pages found in Trash.') ),
-		'parent_item_colon' => array( null, __('Parent Page:') ),
-		'all_items' => array( __( 'All Posts' ), __( 'All Pages' ) ),
-		'archives' => array( __( 'Post Archives' ), __( 'Page Archives' ) ),
-		'insert_into_item' => array( __( 'Insert into post' ), __( 'Insert into page' ) ),
-		'uploaded_to_this_item' => array( __( 'Uploaded to this post' ), __( 'Uploaded to this page' ) ),
-		'featured_image' => array( __( 'Featured Image' ), __( 'Featured Image' ) ),
-		'set_featured_image' => array( __( 'Set featured image' ), __( 'Set featured image' ) ),
-		'remove_featured_image' => array( __( 'Remove featured image' ), __( 'Remove featured image' ) ),
-		'use_featured_image' => array( __( 'Use as featured image' ), __( 'Use as featured image' ) ),
-		'filter_items_list' => array( __( 'Filter posts list' ), __( 'Filter pages list' ) ),
-		'items_list_navigation' => array( __( 'Posts list navigation' ), __( 'Pages list navigation' ) ),
-		'items_list' => array( __( 'Posts list' ), __( 'Pages list' ) ),
+		'name' => array(_x('Posts', 'post type general name'), _x('Pages', 'post type general name')),
+		'singular_name' => array(_x('Post', 'post type singular name'), _x('Page', 'post type singular name')),
+		'add_new' => array(_x('Add New', 'post'), _x('Add New', 'page')),
+		'add_new_item' => array(__('Add New Post'), __('Add New Page')),
+		'edit_item' => array(__('Edit Post'), __('Edit Page')),
+		'new_item' => array(__('New Post'), __('New Page')),
+		'view_item' => array(__('View Post'), __('View Page')),
+		'search_items' => array(__('Search Posts'), __('Search Pages')),
+		'not_found' => array(__('No posts found.'), __('No pages found.')),
+		'not_found_in_trash' => array(__('No posts found in Trash.'), __('No pages found in Trash.')),
+		'parent_item_colon' => array(null, __('Parent Page:')),
+		'all_items' => array(__('All Posts'), __('All Pages')),
+		'archives' => array(__('Post Archives'), __('Page Archives')),
+		'insert_into_item' => array(__('Insert into post'), __('Insert into page')),
+		'uploaded_to_this_item' => array(__('Uploaded to this post'), __('Uploaded to this page')),
+		'featured_image' => array(__('Featured Image'), __('Featured Image')),
+		'set_featured_image' => array(__('Set featured image'), __('Set featured image')),
+		'remove_featured_image' => array(__('Remove featured image'), __('Remove featured image')),
+		'use_featured_image' => array(__('Use as featured image'), __('Use as featured image')),
+		'filter_items_list' => array(__('Filter posts list'), __('Filter pages list')),
+		'items_list_navigation' => array(__('Posts list navigation'), __('Pages list navigation')),
+		'items_list' => array(__('Posts list'), __('Pages list')),
 	);
 	$nohier_vs_hier_defaults['menu_name'] = $nohier_vs_hier_defaults['name'];
 
-	$labels = _get_custom_object_labels( $post_type_object, $nohier_vs_hier_defaults );
+	$labels = _get_custom_object_labels($post_type_object, $nohier_vs_hier_defaults);
 
 	$post_type = $post_type_object->name;
 
@@ -1487,10 +1487,10 @@ 
 	 *
 	 * @param object $labels Object with labels for the post type as member variables.
 	 */
-	$labels = apply_filters( "post_type_labels_{$post_type}", $labels );
+	$labels = apply_filters("post_type_labels_{$post_type}", $labels);
 
 	// Ensure that the filtered labels contain all required default values.
-	$labels = (object) array_merge( (array) $default_labels, (array) $labels );
+	$labels = (object) array_merge((array) $default_labels, (array) $labels);
 
 	return $labels;
 }
@@ -1506,33 +1506,33 @@ 
  * @param array  $nohier_vs_hier_defaults Hierarchical vs non-hierarchical default labels.
  * @return object Object containing labels for the given custom-something object.
  */
-function _get_custom_object_labels( $object, $nohier_vs_hier_defaults ) {
+function _get_custom_object_labels($object, $nohier_vs_hier_defaults) {
 	$object->labels = (array) $object->labels;
 
-	if ( isset( $object->label ) && empty( $object->labels['name'] ) )
+	if (isset($object->label) && empty($object->labels['name']))
 		$object->labels['name'] = $object->label;
 
-	if ( !isset( $object->labels['singular_name'] ) && isset( $object->labels['name'] ) )
+	if ( ! isset($object->labels['singular_name']) && isset($object->labels['name']))
 		$object->labels['singular_name'] = $object->labels['name'];
 
-	if ( ! isset( $object->labels['name_admin_bar'] ) )
-		$object->labels['name_admin_bar'] = isset( $object->labels['singular_name'] ) ? $object->labels['singular_name'] : $object->name;
+	if ( ! isset($object->labels['name_admin_bar']))
+		$object->labels['name_admin_bar'] = isset($object->labels['singular_name']) ? $object->labels['singular_name'] : $object->name;
 
-	if ( !isset( $object->labels['menu_name'] ) && isset( $object->labels['name'] ) )
+	if ( ! isset($object->labels['menu_name']) && isset($object->labels['name']))
 		$object->labels['menu_name'] = $object->labels['name'];
 
-	if ( !isset( $object->labels['all_items'] ) && isset( $object->labels['menu_name'] ) )
+	if ( ! isset($object->labels['all_items']) && isset($object->labels['menu_name']))
 		$object->labels['all_items'] = $object->labels['menu_name'];
 
-	if ( !isset( $object->labels['archives'] ) && isset( $object->labels['all_items'] ) ) {
+	if ( ! isset($object->labels['archives']) && isset($object->labels['all_items'])) {
 		$object->labels['archives'] = $object->labels['all_items'];
 	}
 
 	$defaults = array();
-	foreach ( $nohier_vs_hier_defaults as $key => $value ) {
+	foreach ($nohier_vs_hier_defaults as $key => $value) {
 		$defaults[$key] = $object->hierarchical ? $value[1] : $value[0];
 	}
-	$labels = array_merge( $defaults, $object->labels );
+	$labels = array_merge($defaults, $object->labels);
 	$object->labels = (object) $object->labels;
 
 	return (object) $labels;
@@ -1545,12 +1545,12 @@ 
  * @since 3.1.0
  */
 function _add_post_type_submenus() {
-	foreach ( get_post_types( array( 'show_ui' => true ) ) as $ptype ) {
-		$ptype_obj = get_post_type_object( $ptype );
+	foreach (get_post_types(array('show_ui' => true)) as $ptype) {
+		$ptype_obj = get_post_type_object($ptype);
 		// Sub-menus only.
-		if ( ! $ptype_obj->show_in_menu || $ptype_obj->show_in_menu === true )
+		if ( ! $ptype_obj->show_in_menu || $ptype_obj->show_in_menu === true)
 			continue;
-		add_submenu_page( $ptype_obj->show_in_menu, $ptype_obj->labels->name, $ptype_obj->labels->all_items, $ptype_obj->cap->edit_posts, "edit.php?post_type=$ptype" );
+		add_submenu_page($ptype_obj->show_in_menu, $ptype_obj->labels->name, $ptype_obj->labels->all_items, $ptype_obj->cap->edit_posts, "edit.php?post_type=$ptype");
 	}
 }
 
@@ -1574,15 +1574,15 @@ 
  * @param string|array $feature   The feature being added, accepts an array of
  *                                feature strings or a single string.
  */
-function add_post_type_support( $post_type, $feature ) {
+function add_post_type_support($post_type, $feature) {
 	global $_wp_post_type_features;
 
 	$features = (array) $feature;
 	foreach ($features as $feature) {
-		if ( func_num_args() == 2 )
+		if (func_num_args() == 2)
 			$_wp_post_type_features[$post_type][$feature] = true;
 		else
-			$_wp_post_type_features[$post_type][$feature] = array_slice( func_get_args(), 2 );
+			$_wp_post_type_features[$post_type][$feature] = array_slice(func_get_args(), 2);
 	}
 }
 
@@ -1596,10 +1596,10 @@ 
  * @param string $post_type The post type for which to remove the feature.
  * @param string $feature   The feature being removed.
  */
-function remove_post_type_support( $post_type, $feature ) {
+function remove_post_type_support($post_type, $feature) {
 	global $_wp_post_type_features;
 
-	unset( $_wp_post_type_features[ $post_type ][ $feature ] );
+	unset($_wp_post_type_features[$post_type][$feature]);
 }
 
 /**
@@ -1612,10 +1612,10 @@ 
  * @param string $post_type The post type.
  * @return array Post type supports list.
  */
-function get_all_post_type_supports( $post_type ) {
+function get_all_post_type_supports($post_type) {
 	global $_wp_post_type_features;
 
-	if ( isset( $_wp_post_type_features[$post_type] ) )
+	if (isset($_wp_post_type_features[$post_type]))
 		return $_wp_post_type_features[$post_type];
 
 	return array();
@@ -1632,10 +1632,10 @@ 
  * @param string $feature   The feature being checked.
  * @return bool Whether the post type supports the given feature.
  */
-function post_type_supports( $post_type, $feature ) {
+function post_type_supports($post_type, $feature) {
 	global $_wp_post_type_features;
 
-	return ( isset( $_wp_post_type_features[$post_type][$feature] ) );
+	return (isset($_wp_post_type_features[$post_type][$feature]));
 }
 
 /**
@@ -1652,12 +1652,12 @@ 
  *                               match. Default 'and'.
  * @return array A list of post type names.
  */
-function get_post_types_by_support( $feature, $operator = 'and' ) {
+function get_post_types_by_support($feature, $operator = 'and') {
 	global $_wp_post_type_features;
 
-	$features = array_fill_keys( (array) $feature, true );
+	$features = array_fill_keys((array) $feature, true);
 
-	return array_keys( wp_filter_object_list( $_wp_post_type_features, $features, $operator ) );
+	return array_keys(wp_filter_object_list($_wp_post_type_features, $features, $operator));
 }
 
 /**
@@ -1674,13 +1674,13 @@ 
  *                          name a few. Default 'post'.
  * @return int|false Amount of rows changed. Should be 1 for success and 0 for failure.
  */
-function set_post_type( $post_id = 0, $post_type = 'post' ) {
+function set_post_type($post_id = 0, $post_type = 'post') {
 	global $wpdb;
 
 	$post_type = sanitize_post_field('post_type', $post_type, $post_id, 'db');
-	$return = $wpdb->update( $wpdb->posts, array('post_type' => $post_type), array('ID' => $post_id) );
+	$return = $wpdb->update($wpdb->posts, array('post_type' => $post_type), array('ID' => $post_id));
 
-	clean_post_cache( $post_id );
+	clean_post_cache($post_id);
 
 	return $return;
 }
@@ -1697,15 +1697,15 @@ 
  * @param object $post_type Post type name or object.
  * @return bool Whether the post type should be considered viewable.
  */
-function is_post_type_viewable( $post_type ) {
-	if ( is_scalar( $post_type ) ) {
-		$post_type = get_post_type_object( $post_type );
-		if ( ! $post_type ) {
+function is_post_type_viewable($post_type) {
+	if (is_scalar($post_type)) {
+		$post_type = get_post_type_object($post_type);
+		if ( ! $post_type) {
 			return false;
 		}
 	}
 
-	return $post_type->publicly_queryable || ( $post_type->_builtin && $post_type->public );
+	return $post_type->publicly_queryable || ($post_type->_builtin && $post_type->public);
 }
 
 /**
@@ -1732,7 +1732,7 @@ 
  * }
  * @return array List of posts.
  */
-function get_posts( $args = null ) {
+function get_posts($args = null) {
 	$defaults = array(
 		'numberposts' => 5,
 		'category' => 0, 'orderby' => 'date',
@@ -1742,19 +1742,19 @@ 
 		'suppress_filters' => true
 	);
 
-	$r = wp_parse_args( $args, $defaults );
-	if ( empty( $r['post_status'] ) )
-		$r['post_status'] = ( 'attachment' == $r['post_type'] ) ? 'inherit' : 'publish';
-	if ( ! empty($r['numberposts']) && empty($r['posts_per_page']) )
+	$r = wp_parse_args($args, $defaults);
+	if (empty($r['post_status']))
+		$r['post_status'] = ('attachment' == $r['post_type']) ? 'inherit' : 'publish';
+	if ( ! empty($r['numberposts']) && empty($r['posts_per_page']))
 		$r['posts_per_page'] = $r['numberposts'];
-	if ( ! empty($r['category']) )
+	if ( ! empty($r['category']))
 		$r['cat'] = $r['category'];
-	if ( ! empty($r['include']) ) {
-		$incposts = wp_parse_id_list( $r['include'] );
-		$r['posts_per_page'] = count($incposts);  // only the number of posts included
+	if ( ! empty($r['include'])) {
+		$incposts = wp_parse_id_list($r['include']);
+		$r['posts_per_page'] = count($incposts); // only the number of posts included
 		$r['post__in'] = $incposts;
-	} elseif ( ! empty($r['exclude']) )
-		$r['post__not_in'] = wp_parse_id_list( $r['exclude'] );
+	} elseif ( ! empty($r['exclude']))
+		$r['post__not_in'] = wp_parse_id_list($r['exclude']);
 
 	$r['ignore_sticky_posts'] = true;
 	$r['no_found_rows'] = true;
@@ -1782,9 +1782,9 @@ 
  *                           Default false.
  * @return int|false Meta ID on success, false on failure.
  */
-function add_post_meta( $post_id, $meta_key, $meta_value, $unique = false ) {
+function add_post_meta($post_id, $meta_key, $meta_value, $unique = false) {
 	// Make sure meta is added to the post, not a revision.
-	if ( $the_post = wp_is_post_revision($post_id) )
+	if ($the_post = wp_is_post_revision($post_id))
 		$post_id = $the_post;
 
 	return add_metadata('post', $post_id, $meta_key, $meta_value, $unique);
@@ -1805,9 +1805,9 @@ 
  *                           non-scalar. Default empty.
  * @return bool True on success, false on failure.
  */
-function delete_post_meta( $post_id, $meta_key, $meta_value = '' ) {
+function delete_post_meta($post_id, $meta_key, $meta_value = '') {
 	// Make sure meta is added to the post, not a revision.
-	if ( $the_post = wp_is_post_revision($post_id) )
+	if ($the_post = wp_is_post_revision($post_id))
 		$post_id = $the_post;
 
 	return delete_metadata('post', $post_id, $meta_key, $meta_value);
@@ -1825,7 +1825,7 @@ 
  * @return mixed Will be an array if $single is false. Will be value of meta data
  *               field if $single is true.
  */
-function get_post_meta( $post_id, $key = '', $single = false ) {
+function get_post_meta($post_id, $key = '', $single = false) {
 	return get_metadata('post', $post_id, $key, $single);
 }
 
@@ -1847,9 +1847,9 @@ 
  * @return int|bool Meta ID if the key didn't exist, true on successful update,
  *                  false on failure.
  */
-function update_post_meta( $post_id, $meta_key, $meta_value, $prev_value = '' ) {
+function update_post_meta($post_id, $meta_key, $meta_value, $prev_value = '') {
 	// Make sure meta is added to the post, not a revision.
-	if ( $the_post = wp_is_post_revision($post_id) )
+	if ($the_post = wp_is_post_revision($post_id))
 		$post_id = $the_post;
 
 	return update_metadata('post', $post_id, $meta_key, $meta_value, $prev_value);
@@ -1863,8 +1863,8 @@ 
  * @param string $post_meta_key Key to search for when deleting.
  * @return bool Whether the post meta key was deleted from the database.
  */
-function delete_post_meta_by_key( $post_meta_key ) {
-	return delete_metadata( 'post', null, $post_meta_key, '', true );
+function delete_post_meta_by_key($post_meta_key) {
+	return delete_metadata('post', null, $post_meta_key, '', true);
 }
 
 /**
@@ -1878,12 +1878,12 @@ 
  * @param int $post_id Optional. Post ID. Default is ID of the global $post.
  * @return array Post meta for the given post.
  */
-function get_post_custom( $post_id = 0 ) {
-	$post_id = absint( $post_id );
-	if ( ! $post_id )
+function get_post_custom($post_id = 0) {
+	$post_id = absint($post_id);
+	if ( ! $post_id)
 		$post_id = get_the_ID();
 
-	return get_post_meta( $post_id );
+	return get_post_meta($post_id);
 }
 
 /**
@@ -1896,13 +1896,13 @@ 
  * @param int $post_id Optional. Post ID. Default is ID of the global $post.
  * @return array|void Array of the keys, if retrieved.
  */
-function get_post_custom_keys( $post_id = 0 ) {
-	$custom = get_post_custom( $post_id );
+function get_post_custom_keys($post_id = 0) {
+	$custom = get_post_custom($post_id);
 
-	if ( !is_array($custom) )
+	if ( ! is_array($custom))
 		return;
 
-	if ( $keys = array_keys($custom) )
+	if ($keys = array_keys($custom))
 		return $keys;
 }
 
@@ -1918,8 +1918,8 @@ 
  * @param int    $post_id Optional. Post ID. Default is ID of the global $post.
  * @return array|null Meta field values.
  */
-function get_post_custom_values( $key = '', $post_id = 0 ) {
-	if ( !$key )
+function get_post_custom_values($key = '', $post_id = 0) {
+	if ( ! $key)
 		return null;
 
 	$custom = get_post_custom($post_id);
@@ -1938,18 +1938,18 @@ 
  * @param int $post_id Optional. Post ID. Default is ID of the global $post.
  * @return bool Whether post is sticky.
  */
-function is_sticky( $post_id = 0 ) {
-	$post_id = absint( $post_id );
+function is_sticky($post_id = 0) {
+	$post_id = absint($post_id);
 
-	if ( ! $post_id )
+	if ( ! $post_id)
 		$post_id = get_the_ID();
 
-	$stickies = get_option( 'sticky_posts' );
+	$stickies = get_option('sticky_posts');
 
-	if ( ! is_array( $stickies ) )
+	if ( ! is_array($stickies))
 		return false;
 
-	if ( in_array( $post_id, $stickies ) )
+	if (in_array($post_id, $stickies))
 		return true;
 
 	return false;
@@ -1972,23 +1972,23 @@ 
  * @return object|WP_Post|array The now sanitized Post Object or Array (will be the
  *                              same type as $post).
  */
-function sanitize_post( $post, $context = 'display' ) {
-	if ( is_object($post) ) {
+function sanitize_post($post, $context = 'display') {
+	if (is_object($post)) {
 		// Check if post already filtered for this context.
-		if ( isset($post->filter) && $context == $post->filter )
+		if (isset($post->filter) && $context == $post->filter)
 			return $post;
-		if ( !isset($post->ID) )
+		if ( ! isset($post->ID))
 			$post->ID = 0;
-		foreach ( array_keys(get_object_vars($post)) as $field )
+		foreach (array_keys(get_object_vars($post)) as $field)
 			$post->$field = sanitize_post_field($field, $post->$field, $post->ID, $context);
 		$post->filter = $context;
-	} elseif ( is_array( $post ) ) {
+	} elseif (is_array($post)) {
 		// Check if post already filtered for this context.
-		if ( isset($post['filter']) && $context == $post['filter'] )
+		if (isset($post['filter']) && $context == $post['filter'])
 			return $post;
-		if ( !isset($post['ID']) )
+		if ( ! isset($post['ID']))
 			$post['ID'] = 0;
-		foreach ( array_keys($post) as $field )
+		foreach (array_keys($post) as $field)
 			$post[$field] = sanitize_post_field($field, $post[$field], $post['ID'], $context);
 		$post['filter'] = $context;
 	}
@@ -2012,31 +2012,31 @@ 
  *                        'db', 'display', 'attribute' and 'js'. Default 'display'.
  * @return mixed Sanitized value.
  */
-function sanitize_post_field( $field, $value, $post_id, $context = 'display' ) {
+function sanitize_post_field($field, $value, $post_id, $context = 'display') {
 	$int_fields = array('ID', 'post_parent', 'menu_order');
-	if ( in_array($field, $int_fields) )
+	if (in_array($field, $int_fields))
 		$value = (int) $value;
 
 	// Fields which contain arrays of integers.
-	$array_int_fields = array( 'ancestors' );
-	if ( in_array($field, $array_int_fields) ) {
-		$value = array_map( 'absint', $value);
+	$array_int_fields = array('ancestors');
+	if (in_array($field, $array_int_fields)) {
+		$value = array_map('absint', $value);
 		return $value;
 	}
 
-	if ( 'raw' == $context )
+	if ('raw' == $context)
 		return $value;
 
 	$prefixed = false;
-	if ( false !== strpos($field, 'post_') ) {
+	if (false !== strpos($field, 'post_')) {
 		$prefixed = true;
 		$field_no_prefix = str_replace('post_', '', $field);
 	}
 
-	if ( 'edit' == $context ) {
+	if ('edit' == $context) {
 		$format_to_edit = array('post_content', 'post_excerpt', 'post_title', 'post_password');
 
-		if ( $prefixed ) {
+		if ($prefixed) {
 
 			/**
 			 * Filter the value of a specific post field to edit.
@@ -2049,7 +2049,7 @@ 
 			 * @param mixed $value   Value of the post field.
 			 * @param int   $post_id Post ID.
 			 */
-			$value = apply_filters( "edit_{$field}", $value, $post_id );
+			$value = apply_filters("edit_{$field}", $value, $post_id);
 
 			/**
 			 * Filter the value of a specific post field to edit.
@@ -2062,21 +2062,21 @@ 
 			 * @param mixed $value   Value of the post field.
 			 * @param int   $post_id Post ID.
 			 */
-			$value = apply_filters( "{$field_no_prefix}_edit_pre", $value, $post_id );
+			$value = apply_filters("{$field_no_prefix}_edit_pre", $value, $post_id);
 		} else {
-			$value = apply_filters( "edit_post_{$field}", $value, $post_id );
+			$value = apply_filters("edit_post_{$field}", $value, $post_id);
 		}
 
-		if ( in_array($field, $format_to_edit) ) {
-			if ( 'post_content' == $field )
+		if (in_array($field, $format_to_edit)) {
+			if ('post_content' == $field)
 				$value = format_to_edit($value, user_can_richedit());
 			else
 				$value = format_to_edit($value);
 		} else {
 			$value = esc_attr($value);
 		}
-	} elseif ( 'db' == $context ) {
-		if ( $prefixed ) {
+	} elseif ('db' == $context) {
+		if ($prefixed) {
 
 			/**
 			 * Filter the value of a specific post field before saving.
@@ -2088,7 +2088,7 @@ 
 			 *
 			 * @param mixed $value Value of the post field.
 			 */
-			$value = apply_filters( "pre_{$field}", $value );
+			$value = apply_filters("pre_{$field}", $value);
 
 			/**
 			 * Filter the value of a specific field before saving.
@@ -2100,9 +2100,9 @@ 
 			 *
 			 * @param mixed $value Value of the post field.
 			 */
-			$value = apply_filters( "{$field_no_prefix}_save_pre", $value );
+			$value = apply_filters("{$field_no_prefix}_save_pre", $value);
 		} else {
-			$value = apply_filters( "pre_post_{$field}", $value );
+			$value = apply_filters("pre_post_{$field}", $value);
 
 			/**
 			 * Filter the value of a specific post field before saving.
@@ -2114,12 +2114,12 @@ 
 			 *
 			 * @param mixed $value Value of the post field.
 			 */
-			$value = apply_filters( "{$field}_pre", $value );
+			$value = apply_filters("{$field}_pre", $value);
 		}
 	} else {
 
 		// Use display filters by default.
-		if ( $prefixed ) {
+		if ($prefixed) {
 
 			/**
 			 * Filter the value of a specific post field for display.
@@ -2135,15 +2135,15 @@ 
 			 *                        values include 'raw', 'edit', 'db', 'display',
 			 *                        'attribute' and 'js'.
 			 */
-			$value = apply_filters( $field, $value, $post_id, $context );
+			$value = apply_filters($field, $value, $post_id, $context);
 		} else {
-			$value = apply_filters( "post_{$field}", $value, $post_id, $context );
+			$value = apply_filters("post_{$field}", $value, $post_id, $context);
 		}
 	}
 
-	if ( 'attribute' == $context )
+	if ('attribute' == $context)
 		$value = esc_attr($value);
-	elseif ( 'js' == $context )
+	elseif ('js' == $context)
 		$value = esc_js($value);
 
 	return $value;
@@ -2158,13 +2158,13 @@ 
  *
  * @param int $post_id Post ID.
  */
-function stick_post( $post_id ) {
+function stick_post($post_id) {
 	$stickies = get_option('sticky_posts');
 
-	if ( !is_array($stickies) )
+	if ( ! is_array($stickies))
 		$stickies = array($post_id);
 
-	if ( ! in_array($post_id, $stickies) )
+	if ( ! in_array($post_id, $stickies))
 		$stickies[] = $post_id;
 
 	update_option('sticky_posts', $stickies);
@@ -2179,17 +2179,17 @@ 
  *
  * @param int $post_id Post ID.
  */
-function unstick_post( $post_id ) {
+function unstick_post($post_id) {
 	$stickies = get_option('sticky_posts');
 
-	if ( !is_array($stickies) )
+	if ( ! is_array($stickies))
 		return;
 
-	if ( ! in_array($post_id, $stickies) )
+	if ( ! in_array($post_id, $stickies))
 		return;
 
 	$offset = array_search($post_id, $stickies);
-	if ( false === $offset )
+	if (false === $offset)
 		return;
 
 	array_splice($stickies, $offset, 1);
@@ -2206,12 +2206,12 @@ 
  * @param string $perm Optional. 'readable' or empty. Default empty.
  * @return string The cache key.
  */
-function _count_posts_cache_key( $type = 'post', $perm = '' ) {
-	$cache_key = 'posts-' . $type;
-	if ( 'readable' == $perm && is_user_logged_in() ) {
-		$post_type_object = get_post_type_object( $type );
-		if ( $post_type_object && ! current_user_can( $post_type_object->cap->read_private_posts ) ) {
-			$cache_key .= '_' . $perm . '_' . get_current_user_id();
+function _count_posts_cache_key($type = 'post', $perm = '') {
+	$cache_key = 'posts-'.$type;
+	if ('readable' == $perm && is_user_logged_in()) {
+		$post_type_object = get_post_type_object($type);
+		if ($post_type_object && ! current_user_can($post_type_object->cap->read_private_posts)) {
+			$cache_key .= '_'.$perm.'_'.get_current_user_id();
 		}
 	}
 	return $cache_key;
@@ -2236,40 +2236,40 @@ 
  * @param string $perm Optional. 'readable' or empty. Default empty.
  * @return object Number of posts for each status.
  */
-function wp_count_posts( $type = 'post', $perm = '' ) {
+function wp_count_posts($type = 'post', $perm = '') {
 	global $wpdb;
 
-	if ( ! post_type_exists( $type ) )
+	if ( ! post_type_exists($type))
 		return new stdClass;
 
-	$cache_key = _count_posts_cache_key( $type, $perm );
+	$cache_key = _count_posts_cache_key($type, $perm);
 
-	$counts = wp_cache_get( $cache_key, 'counts' );
-	if ( false !== $counts ) {
+	$counts = wp_cache_get($cache_key, 'counts');
+	if (false !== $counts) {
 		/** This filter is documented in wp-includes/post.php */
-		return apply_filters( 'wp_count_posts', $counts, $type, $perm );
+		return apply_filters('wp_count_posts', $counts, $type, $perm);
 	}
 
 	$query = "SELECT post_status, COUNT( * ) AS num_posts FROM {$wpdb->posts} WHERE post_type = %s";
-	if ( 'readable' == $perm && is_user_logged_in() ) {
+	if ('readable' == $perm && is_user_logged_in()) {
 		$post_type_object = get_post_type_object($type);
-		if ( ! current_user_can( $post_type_object->cap->read_private_posts ) ) {
-			$query .= $wpdb->prepare( " AND (post_status != 'private' OR ( post_author = %d AND post_status = 'private' ))",
+		if ( ! current_user_can($post_type_object->cap->read_private_posts)) {
+			$query .= $wpdb->prepare(" AND (post_status != 'private' OR ( post_author = %d AND post_status = 'private' ))",
 				get_current_user_id()
 			);
 		}
 	}
 	$query .= ' GROUP BY post_status';
 
-	$results = (array) $wpdb->get_results( $wpdb->prepare( $query, $type ), ARRAY_A );
-	$counts = array_fill_keys( get_post_stati(), 0 );
+	$results = (array) $wpdb->get_results($wpdb->prepare($query, $type), ARRAY_A);
+	$counts = array_fill_keys(get_post_stati(), 0);
 
-	foreach ( $results as $row ) {
-		$counts[ $row['post_status'] ] = $row['num_posts'];
+	foreach ($results as $row) {
+		$counts[$row['post_status']] = $row['num_posts'];
 	}
 
 	$counts = (object) $counts;
-	wp_cache_set( $cache_key, $counts, 'counts' );
+	wp_cache_set($cache_key, $counts, 'counts');
 
 	/**
 	 * Modify returned post counts by status for the current post type.
@@ -2282,7 +2282,7 @@ 
 	 * @param string $perm   The permission to determine if the posts are 'readable'
 	 *                       by the current user.
 	 */
-	return apply_filters( 'wp_count_posts', $counts, $type, $perm );
+	return apply_filters('wp_count_posts', $counts, $type, $perm);
 }
 
 /**
@@ -2301,17 +2301,17 @@ 
  *                                MIME patterns. Default empty.
  * @return object An object containing the attachment counts by mime type.
  */
-function wp_count_attachments( $mime_type = '' ) {
+function wp_count_attachments($mime_type = '') {
 	global $wpdb;
 
-	$and = wp_post_mime_type_where( $mime_type );
-	$count = $wpdb->get_results( "SELECT post_mime_type, COUNT( * ) AS num_posts FROM $wpdb->posts WHERE post_type = 'attachment' AND post_status != 'trash' $and GROUP BY post_mime_type", ARRAY_A );
+	$and = wp_post_mime_type_where($mime_type);
+	$count = $wpdb->get_results("SELECT post_mime_type, COUNT( * ) AS num_posts FROM $wpdb->posts WHERE post_type = 'attachment' AND post_status != 'trash' $and GROUP BY post_mime_type", ARRAY_A);
 
 	$counts = array();
-	foreach ( (array) $count as $row ) {
-		$counts[ $row['post_mime_type'] ] = $row['num_posts'];
+	foreach ((array) $count as $row) {
+		$counts[$row['post_mime_type']] = $row['num_posts'];
 	}
-	$counts['trash'] = $wpdb->get_var( "SELECT COUNT( * ) FROM $wpdb->posts WHERE post_type = 'attachment' AND post_status = 'trash' $and");
+	$counts['trash'] = $wpdb->get_var("SELECT COUNT( * ) FROM $wpdb->posts WHERE post_type = 'attachment' AND post_status = 'trash' $and");
 
 	/**
 	 * Modify returned attachment counts by mime type.
@@ -2323,7 +2323,7 @@ 
 	 * @param string $mime_type The mime type pattern used to filter the attachments
 	 *                          counted.
 	 */
-	return apply_filters( 'wp_count_attachments', (object) $counts, $mime_type );
+	return apply_filters('wp_count_attachments', (object) $counts, $mime_type);
 }
 
 /**
@@ -2347,7 +2347,7 @@ 
 	 *
 	 * @param array $post_mime_types Default list of post mime types.
 	 */
-	return apply_filters( 'post_mime_types', $post_mime_types );
+	return apply_filters('post_mime_types', $post_mime_types);
 }
 
 /**
@@ -2364,35 +2364,35 @@ 
  * @param string|array $real_mime_types     Real post mime type values.
  * @return array array(wildcard=>array(real types)).
  */
-function wp_match_mime_types( $wildcard_mime_types, $real_mime_types ) {
+function wp_match_mime_types($wildcard_mime_types, $real_mime_types) {
 	$matches = array();
-	if ( is_string( $wildcard_mime_types ) ) {
-		$wildcard_mime_types = array_map( 'trim', explode( ',', $wildcard_mime_types ) );
+	if (is_string($wildcard_mime_types)) {
+		$wildcard_mime_types = array_map('trim', explode(',', $wildcard_mime_types));
 	}
-	if ( is_string( $real_mime_types ) ) {
-		$real_mime_types = array_map( 'trim', explode( ',', $real_mime_types ) );
+	if (is_string($real_mime_types)) {
+		$real_mime_types = array_map('trim', explode(',', $real_mime_types));
 	}
 
 	$patternses = array();
 	$wild = '[-._a-z0-9]*';
 
-	foreach ( (array) $wildcard_mime_types as $type ) {
-		$mimes = array_map( 'trim', explode( ',', $type ) );
-		foreach ( $mimes as $mime ) {
-			$regex = str_replace( '__wildcard__', $wild, preg_quote( str_replace( '*', '__wildcard__', $mime ) ) );
+	foreach ((array) $wildcard_mime_types as $type) {
+		$mimes = array_map('trim', explode(',', $type));
+		foreach ($mimes as $mime) {
+			$regex = str_replace('__wildcard__', $wild, preg_quote(str_replace('*', '__wildcard__', $mime)));
 			$patternses[][$type] = "^$regex$";
-			if ( false === strpos( $mime, '/' ) ) {
+			if (false === strpos($mime, '/')) {
 				$patternses[][$type] = "^$regex/";
 				$patternses[][$type] = $regex;
 			}
 		}
 	}
-	asort( $patternses );
+	asort($patternses);
 
-	foreach ( $patternses as $patterns ) {
-		foreach ( $patterns as $type => $pattern ) {
-			foreach ( (array) $real_mime_types as $real ) {
-				if ( preg_match( "#$pattern#", $real ) && ( empty( $matches[$type] ) || false === array_search( $real, $matches[$type] ) ) ) {
+	foreach ($patternses as $patterns) {
+		foreach ($patterns as $type => $pattern) {
+			foreach ((array) $real_mime_types as $real) {
+				if (preg_match("#$pattern#", $real) && (empty($matches[$type]) || false === array_search($real, $matches[$type]))) {
 					$matches[$type][] = $real;
 				}
 			}
@@ -2412,43 +2412,43 @@ 
  *                                      Default empty.
  * @return string The SQL AND clause for mime searching.
  */
-function wp_post_mime_type_where( $post_mime_types, $table_alias = '' ) {
+function wp_post_mime_type_where($post_mime_types, $table_alias = '') {
 	$where = '';
 	$wildcards = array('', '%', '%/%');
-	if ( is_string($post_mime_types) )
+	if (is_string($post_mime_types))
 		$post_mime_types = array_map('trim', explode(',', $post_mime_types));
 
 	$wheres = array();
 
-	foreach ( (array) $post_mime_types as $mime_type ) {
+	foreach ((array) $post_mime_types as $mime_type) {
 		$mime_type = preg_replace('/\s/', '', $mime_type);
 		$slashpos = strpos($mime_type, '/');
-		if ( false !== $slashpos ) {
+		if (false !== $slashpos) {
 			$mime_group = preg_replace('/[^-*.a-zA-Z0-9]/', '', substr($mime_type, 0, $slashpos));
 			$mime_subgroup = preg_replace('/[^-*.+a-zA-Z0-9]/', '', substr($mime_type, $slashpos + 1));
-			if ( empty($mime_subgroup) )
+			if (empty($mime_subgroup))
 				$mime_subgroup = '*';
 			else
 				$mime_subgroup = str_replace('/', '', $mime_subgroup);
 			$mime_pattern = "$mime_group/$mime_subgroup";
 		} else {
 			$mime_pattern = preg_replace('/[^-*.a-zA-Z0-9]/', '', $mime_type);
-			if ( false === strpos($mime_pattern, '*') )
+			if (false === strpos($mime_pattern, '*'))
 				$mime_pattern .= '/*';
 		}
 
 		$mime_pattern = preg_replace('/\*+/', '%', $mime_pattern);
 
-		if ( in_array( $mime_type, $wildcards ) )
+		if (in_array($mime_type, $wildcards))
 			return '';
 
-		if ( false !== strpos($mime_pattern, '%') )
+		if (false !== strpos($mime_pattern, '%'))
 			$wheres[] = empty($table_alias) ? "post_mime_type LIKE '$mime_pattern'" : "$table_alias.post_mime_type LIKE '$mime_pattern'";
 		else
 			$wheres[] = empty($table_alias) ? "post_mime_type = '$mime_pattern'" : "$table_alias.post_mime_type = '$mime_pattern'";
 	}
-	if ( !empty($wheres) )
-		$where = ' AND (' . join(' OR ', $wheres) . ') ';
+	if ( ! empty($wheres))
+		$where = ' AND ('.join(' OR ', $wheres).') ';
 	return $where;
 }
 
@@ -2473,17 +2473,17 @@ 
  *                           Default false.
  * @return array|false|WP_Post False on failure.
  */
-function wp_delete_post( $postid = 0, $force_delete = false ) {
+function wp_delete_post($postid = 0, $force_delete = false) {
 	global $wpdb;
 
-	if ( !$post = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->posts WHERE ID = %d", $postid)) )
+	if ( ! $post = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->posts WHERE ID = %d", $postid)))
 		return $post;
 
-	if ( !$force_delete && ( $post->post_type == 'post' || $post->post_type == 'page') && get_post_status( $postid ) != 'trash' && EMPTY_TRASH_DAYS )
-		return wp_trash_post( $postid );
+	if ( ! $force_delete && ($post->post_type == 'post' || $post->post_type == 'page') && get_post_status($postid) != 'trash' && EMPTY_TRASH_DAYS)
+		return wp_trash_post($postid);
 
-	if ( $post->post_type == 'attachment' )
-		return wp_delete_attachment( $postid, $force_delete );
+	if ($post->post_type == 'attachment')
+		return wp_delete_attachment($postid, $force_delete);
 
 	/**
 	 * Filter whether a post deletion should take place.
@@ -2494,8 +2494,8 @@ 
 	 * @param WP_Post $post         Post object.
 	 * @param bool    $force_delete Whether to bypass the trash.
 	 */
-	$check = apply_filters( 'pre_delete_post', null, $post, $force_delete );
-	if ( null !== $check ) {
+	$check = apply_filters('pre_delete_post', null, $post, $force_delete);
+	if (null !== $check) {
 		return $check;
 	}
 
@@ -2508,46 +2508,46 @@ 
 	 *
 	 * @param int $postid Post ID.
 	 */
-	do_action( 'before_delete_post', $postid );
+	do_action('before_delete_post', $postid);
 
-	delete_post_meta($postid,'_wp_trash_meta_status');
-	delete_post_meta($postid,'_wp_trash_meta_time');
+	delete_post_meta($postid, '_wp_trash_meta_status');
+	delete_post_meta($postid, '_wp_trash_meta_time');
 
 	wp_delete_object_term_relationships($postid, get_object_taxonomies($post->post_type));
 
-	$parent_data = array( 'post_parent' => $post->post_parent );
-	$parent_where = array( 'post_parent' => $postid );
+	$parent_data = array('post_parent' => $post->post_parent);
+	$parent_where = array('post_parent' => $postid);
 
-	if ( is_post_type_hierarchical( $post->post_type ) ) {
+	if (is_post_type_hierarchical($post->post_type)) {
 		// Point children of this page to its parent, also clean the cache of affected children.
-		$children_query = $wpdb->prepare( "SELECT * FROM $wpdb->posts WHERE post_parent = %d AND post_type = %s", $postid, $post->post_type );
-		$children = $wpdb->get_results( $children_query );
-		if ( $children ) {
-			$wpdb->update( $wpdb->posts, $parent_data, $parent_where + array( 'post_type' => $post->post_type ) );
+		$children_query = $wpdb->prepare("SELECT * FROM $wpdb->posts WHERE post_parent = %d AND post_type = %s", $postid, $post->post_type);
+		$children = $wpdb->get_results($children_query);
+		if ($children) {
+			$wpdb->update($wpdb->posts, $parent_data, $parent_where + array('post_type' => $post->post_type));
 		}
 	}
 
 	// Do raw query. wp_get_post_revisions() is filtered.
-	$revision_ids = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_parent = %d AND post_type = 'revision'", $postid ) );
+	$revision_ids = $wpdb->get_col($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_parent = %d AND post_type = 'revision'", $postid));
 	// Use wp_delete_post (via wp_delete_post_revision) again. Ensures any meta/misplaced data gets cleaned up.
-	foreach ( $revision_ids as $revision_id )
-		wp_delete_post_revision( $revision_id );
+	foreach ($revision_ids as $revision_id)
+		wp_delete_post_revision($revision_id);
 
 	// Point all attachments to this post up one level.
-	$wpdb->update( $wpdb->posts, $parent_data, $parent_where + array( 'post_type' => 'attachment' ) );
+	$wpdb->update($wpdb->posts, $parent_data, $parent_where + array('post_type' => 'attachment'));
 
-	wp_defer_comment_counting( true );
+	wp_defer_comment_counting(true);
 
-	$comment_ids = $wpdb->get_col( $wpdb->prepare( "SELECT comment_ID FROM $wpdb->comments WHERE comment_post_ID = %d", $postid ));
-	foreach ( $comment_ids as $comment_id ) {
-		wp_delete_comment( $comment_id, true );
+	$comment_ids = $wpdb->get_col($wpdb->prepare("SELECT comment_ID FROM $wpdb->comments WHERE comment_post_ID = %d", $postid));
+	foreach ($comment_ids as $comment_id) {
+		wp_delete_comment($comment_id, true);
 	}
 
-	wp_defer_comment_counting( false );
+	wp_defer_comment_counting(false);
 
-	$post_meta_ids = $wpdb->get_col( $wpdb->prepare( "SELECT meta_id FROM $wpdb->postmeta WHERE post_id = %d ", $postid ));
-	foreach ( $post_meta_ids as $mid )
-		delete_metadata_by_mid( 'post', $mid );
+	$post_meta_ids = $wpdb->get_col($wpdb->prepare("SELECT meta_id FROM $wpdb->postmeta WHERE post_id = %d ", $postid));
+	foreach ($post_meta_ids as $mid)
+		delete_metadata_by_mid('post', $mid);
 
 	/**
 	 * Fires immediately before a post is deleted from the database.
@@ -2556,9 +2556,9 @@ 
 	 *
 	 * @param int $postid Post ID.
 	 */
-	do_action( 'delete_post', $postid );
-	$result = $wpdb->delete( $wpdb->posts, array( 'ID' => $postid ) );
-	if ( ! $result ) {
+	do_action('delete_post', $postid);
+	$result = $wpdb->delete($wpdb->posts, array('ID' => $postid));
+	if ( ! $result) {
 		return false;
 	}
 
@@ -2569,16 +2569,16 @@ 
 	 *
 	 * @param int $postid Post ID.
 	 */
-	do_action( 'deleted_post', $postid );
+	do_action('deleted_post', $postid);
 
-	clean_post_cache( $post );
+	clean_post_cache($post);
 
-	if ( is_post_type_hierarchical( $post->post_type ) && $children ) {
-		foreach ( $children as $child )
-			clean_post_cache( $child );
+	if (is_post_type_hierarchical($post->post_type) && $children) {
+		foreach ($children as $child)
+			clean_post_cache($child);
 	}
 
-	wp_clear_scheduled_hook('publish_future_post', array( $postid ) );
+	wp_clear_scheduled_hook('publish_future_post', array($postid));
 
 	/**
 	 * Fires after a post is deleted, at the conclusion of wp_delete_post().
@@ -2589,7 +2589,7 @@ 
 	 *
 	 * @param int $postid Post ID.
 	 */
-	do_action( 'after_delete_post', $postid );
+	do_action('after_delete_post', $postid);
 
 	return $post;
 }
@@ -2605,22 +2605,22 @@ 
  *
  * @param int $post_id Post ID.
  */
-function _reset_front_page_settings_for_post( $post_id ) {
-	$post = get_post( $post_id );
-	if ( 'page' == $post->post_type ) {
+function _reset_front_page_settings_for_post($post_id) {
+	$post = get_post($post_id);
+	if ('page' == $post->post_type) {
 	 	/*
 	 	 * If the page is defined in option page_on_front or post_for_posts,
 	 	 * adjust the corresponding options.
 	 	 */
-		if ( get_option( 'page_on_front' ) == $post->ID ) {
-			update_option( 'show_on_front', 'posts' );
-			update_option( 'page_on_front', 0 );
+		if (get_option('page_on_front') == $post->ID) {
+			update_option('show_on_front', 'posts');
+			update_option('page_on_front', 0);
 		}
-		if ( get_option( 'page_for_posts' ) == $post->ID ) {
-			delete_option( 'page_for_posts', 0 );
+		if (get_option('page_for_posts') == $post->ID) {
+			delete_option('page_for_posts', 0);
 		}
 	}
-	unstick_post( $post->ID );
+	unstick_post($post->ID);
 }
 
 /**
@@ -2636,14 +2636,14 @@ 
  *                     if EMPTY_TRASH_DAYS equals true.
  * @return false|array|WP_Post|null Post data array, otherwise false.
  */
-function wp_trash_post( $post_id = 0 ) {
-	if ( !EMPTY_TRASH_DAYS )
+function wp_trash_post($post_id = 0) {
+	if ( ! EMPTY_TRASH_DAYS)
 		return wp_delete_post($post_id, true);
 
-	if ( !$post = get_post($post_id, ARRAY_A) )
+	if ( ! $post = get_post($post_id, ARRAY_A))
 		return $post;
 
-	if ( $post['post_status'] == 'trash' )
+	if ($post['post_status'] == 'trash')
 		return false;
 
 	/**
@@ -2653,13 +2653,13 @@ 
 	 *
 	 * @param int $post_id Post ID.
 	 */
-	do_action( 'wp_trash_post', $post_id );
+	do_action('wp_trash_post', $post_id);
 
-	add_post_meta($post_id,'_wp_trash_meta_status', $post['post_status']);
-	add_post_meta($post_id,'_wp_trash_meta_time', time());
+	add_post_meta($post_id, '_wp_trash_meta_status', $post['post_status']);
+	add_post_meta($post_id, '_wp_trash_meta_time', time());
 
 	$post['post_status'] = 'trash';
-	wp_insert_post( wp_slash( $post ) );
+	wp_insert_post(wp_slash($post));
 
 	wp_trash_post_comments($post_id);
 
@@ -2670,7 +2670,7 @@ 
 	 *
 	 * @param int $post_id Post ID.
 	 */
-	do_action( 'trashed_post', $post_id );
+	do_action('trashed_post', $post_id);
 
 	return $post;
 }
@@ -2683,11 +2683,11 @@ 
  * @param int $post_id Optional. Post ID. Default is ID of the global $post.
  * @return WP_Post|false WP_Post object. False on failure.
  */
-function wp_untrash_post( $post_id = 0 ) {
-	if ( !$post = get_post($post_id, ARRAY_A) )
+function wp_untrash_post($post_id = 0) {
+	if ( ! $post = get_post($post_id, ARRAY_A))
 		return $post;
 
-	if ( $post['post_status'] != 'trash' )
+	if ($post['post_status'] != 'trash')
 		return false;
 
 	/**
@@ -2697,7 +2697,7 @@ 
 	 *
 	 * @param int $post_id Post ID.
 	 */
-	do_action( 'untrash_post', $post_id );
+	do_action('untrash_post', $post_id);
 
 	$post_status = get_post_meta($post_id, '_wp_trash_meta_status', true);
 
@@ -2706,7 +2706,7 @@ 
 	delete_post_meta($post_id, '_wp_trash_meta_status');
 	delete_post_meta($post_id, '_wp_trash_meta_time');
 
-	wp_insert_post( wp_slash( $post ) );
+	wp_insert_post(wp_slash($post));
 
 	wp_untrash_post_comments($post_id);
 
@@ -2717,7 +2717,7 @@ 
 	 *
 	 * @param int $post_id Post ID.
 	 */
-	do_action( 'untrashed_post', $post_id );
+	do_action('untrashed_post', $post_id);
 
 	return $post;
 }
@@ -2732,11 +2732,11 @@ 
  * @param int|WP_Post|null $post Optional. Post ID or post object. Defaults to global $post.
  * @return mixed|void False on failure.
  */
-function wp_trash_post_comments( $post = null ) {
+function wp_trash_post_comments($post = null) {
 	global $wpdb;
 
 	$post = get_post($post);
-	if ( empty($post) )
+	if (empty($post))
 		return;
 
 	$post_id = $post->ID;
@@ -2748,22 +2748,22 @@ 
 	 *
 	 * @param int $post_id Post ID.
 	 */
-	do_action( 'trash_post_comments', $post_id );
+	do_action('trash_post_comments', $post_id);
 
-	$comments = $wpdb->get_results( $wpdb->prepare("SELECT comment_ID, comment_approved FROM $wpdb->comments WHERE comment_post_ID = %d", $post_id) );
-	if ( empty($comments) )
+	$comments = $wpdb->get_results($wpdb->prepare("SELECT comment_ID, comment_approved FROM $wpdb->comments WHERE comment_post_ID = %d", $post_id));
+	if (empty($comments))
 		return;
 
 	// Cache current status for each comment.
 	$statuses = array();
-	foreach ( $comments as $comment )
+	foreach ($comments as $comment)
 		$statuses[$comment->comment_ID] = $comment->comment_approved;
 	add_post_meta($post_id, '_wp_trash_meta_comments_status', $statuses);
 
 	// Set status for all comments to post-trashed.
 	$result = $wpdb->update($wpdb->comments, array('comment_approved' => 'post-trashed'), array('comment_post_ID' => $post_id));
 
-	clean_comment_cache( array_keys($statuses) );
+	clean_comment_cache(array_keys($statuses));
 
 	/**
 	 * Fires after comments are sent to the trash.
@@ -2773,7 +2773,7 @@ 
 	 * @param int   $post_id  Post ID.
 	 * @param array $statuses Array of comment statuses.
 	 */
-	do_action( 'trashed_post_comments', $post_id, $statuses );
+	do_action('trashed_post_comments', $post_id, $statuses);
 
 	return $result;
 }
@@ -2788,18 +2788,18 @@ 
  * @param int|WP_Post|null $post Optional. Post ID or post object. Defaults to global $post.
  * @return true|void
  */
-function wp_untrash_post_comments( $post = null ) {
+function wp_untrash_post_comments($post = null) {
 	global $wpdb;
 
 	$post = get_post($post);
-	if ( empty($post) )
+	if (empty($post))
 		return;
 
 	$post_id = $post->ID;
 
 	$statuses = get_post_meta($post_id, '_wp_trash_meta_comments_status', true);
 
-	if ( empty($statuses) )
+	if (empty($statuses))
 		return true;
 
 	/**
@@ -2809,23 +2809,23 @@ 
 	 *
 	 * @param int $post_id Post ID.
 	 */
-	do_action( 'untrash_post_comments', $post_id );
+	do_action('untrash_post_comments', $post_id);
 
 	// Restore each comment to its original status.
 	$group_by_status = array();
-	foreach ( $statuses as $comment_id => $comment_status )
+	foreach ($statuses as $comment_id => $comment_status)
 		$group_by_status[$comment_status][] = $comment_id;
 
-	foreach ( $group_by_status as $status => $comments ) {
+	foreach ($group_by_status as $status => $comments) {
 		// Sanity check. This shouldn't happen.
-		if ( 'post-trashed' == $status ) {
+		if ('post-trashed' == $status) {
 			$status = '0';
 		}
-		$comments_in = implode( ', ', array_map( 'intval', $comments ) );
-		$wpdb->query( $wpdb->prepare( "UPDATE $wpdb->comments SET comment_approved = %s WHERE comment_ID IN ($comments_in)", $status ) );
+		$comments_in = implode(', ', array_map('intval', $comments));
+		$wpdb->query($wpdb->prepare("UPDATE $wpdb->comments SET comment_approved = %s WHERE comment_ID IN ($comments_in)", $status));
 	}
 
-	clean_comment_cache( array_keys($statuses) );
+	clean_comment_cache(array_keys($statuses));
 
 	delete_post_meta($post_id, '_wp_trash_meta_comments_status');
 
@@ -2836,7 +2836,7 @@ 
 	 *
 	 * @param int $post_id Post ID.
 	 */
-	do_action( 'untrashed_post_comments', $post_id );
+	do_action('untrashed_post_comments', $post_id);
 }
 
 /**
@@ -2854,11 +2854,11 @@ 
  * @param array $args    Optional. Category arguments. Default empty.
  * @return array List of categories.
  */
-function wp_get_post_categories( $post_id = 0, $args = array() ) {
+function wp_get_post_categories($post_id = 0, $args = array()) {
 	$post_id = (int) $post_id;
 
 	$defaults = array('fields' => 'ids');
-	$args = wp_parse_args( $args, $defaults );
+	$args = wp_parse_args($args, $defaults);
 
 	$cats = wp_get_object_terms($post_id, 'category', $args);
 	return $cats;
@@ -2878,8 +2878,8 @@ 
  * @param array $args Optional. Overwrite the defaults
  * @return array List of post tags.
  */
-function wp_get_post_tags( $post_id = 0, $args = array() ) {
-	return wp_get_post_terms( $post_id, 'post_tag', $args);
+function wp_get_post_tags($post_id = 0, $args = array()) {
+	return wp_get_post_terms($post_id, 'post_tag', $args);
 }
 
 /**
@@ -2898,11 +2898,11 @@ 
  * @return array|WP_Error  List of post terms or empty array if no terms were found. WP_Error object
  *                         if `$taxonomy` doesn't exist.
  */
-function wp_get_post_terms( $post_id = 0, $taxonomy = 'post_tag', $args = array() ) {
+function wp_get_post_terms($post_id = 0, $taxonomy = 'post_tag', $args = array()) {
 	$post_id = (int) $post_id;
 
 	$defaults = array('fields' => 'all');
-	$args = wp_parse_args( $args, $defaults );
+	$args = wp_parse_args($args, $defaults);
 
 	$tags = wp_get_object_terms($post_id, $taxonomy, $args);
 
@@ -2920,11 +2920,11 @@ 
  * @param string $output     Optional. Type of output. Accepts ARRAY_A or ''. Default ARRAY_A.
  * @return array|false Associative array if $output equals ARRAY_A, array or false if no results.
  */
-function wp_get_recent_posts( $args = array(), $output = ARRAY_A ) {
+function wp_get_recent_posts($args = array(), $output = ARRAY_A) {
 
-	if ( is_numeric( $args ) ) {
-		_deprecated_argument( __FUNCTION__, '3.1', __( 'Passing an integer number of posts is deprecated. Pass an array of arguments instead.' ) );
-		$args = array( 'numberposts' => absint( $args ) );
+	if (is_numeric($args)) {
+		_deprecated_argument(__FUNCTION__, '3.1', __('Passing an integer number of posts is deprecated. Pass an array of arguments instead.'));
+		$args = array('numberposts' => absint($args));
 	}
 
 	// Set default arguments.
@@ -2937,14 +2937,14 @@ 
 		'suppress_filters' => true
 	);
 
-	$r = wp_parse_args( $args, $defaults );
+	$r = wp_parse_args($args, $defaults);
 
-	$results = get_posts( $r );
+	$results = get_posts($r);
 
 	// Backward compatibility. Prior to 3.1 expected posts to be returned in array.
-	if ( ARRAY_A == $output ){
-		foreach ( $results as $key => $result ) {
-			$results[$key] = get_object_vars( $result );
+	if (ARRAY_A == $output) {
+		foreach ($results as $key => $result) {
+			$results[$key] = get_object_vars($result);
 		}
 		return $results ? $results : array();
 	}
@@ -3010,7 +3010,7 @@ 
  * @param bool  $wp_error Optional. Whether to allow return of WP_Error on failure. Default false.
  * @return int|WP_Error The post ID on success. The value 0 or WP_Error on failure.
  */
-function wp_insert_post( $postarr, $wp_error = false ) {
+function wp_insert_post($postarr, $wp_error = false) {
 	global $wpdb;
 
 	$user_id = get_current_user_id();
@@ -3037,7 +3037,7 @@ 
 
 	$postarr = wp_parse_args($postarr, $defaults);
 
-	unset( $postarr[ 'filter' ] );
+	unset($postarr['filter']);
 
 	$postarr = sanitize_post($postarr, 'db');
 
@@ -3046,42 +3046,42 @@ 
 	$update = false;
 	$guid = $postarr['guid'];
 
-	if ( ! empty( $postarr['ID'] ) ) {
+	if ( ! empty($postarr['ID'])) {
 		$update = true;
 
 		// Get the post ID and GUID.
 		$post_ID = $postarr['ID'];
-		$post_before = get_post( $post_ID );
-		if ( is_null( $post_before ) ) {
-			if ( $wp_error ) {
-				return new WP_Error( 'invalid_post', __( 'Invalid post ID.' ) );
+		$post_before = get_post($post_ID);
+		if (is_null($post_before)) {
+			if ($wp_error) {
+				return new WP_Error('invalid_post', __('Invalid post ID.'));
 			}
 			return 0;
 		}
 
-		$guid = get_post_field( 'guid', $post_ID );
-		$previous_status = get_post_field('post_status', $post_ID );
+		$guid = get_post_field('guid', $post_ID);
+		$previous_status = get_post_field('post_status', $post_ID);
 	} else {
 		$previous_status = 'new';
 	}
 
-	$post_type = empty( $postarr['post_type'] ) ? 'post' : $postarr['post_type'];
+	$post_type = empty($postarr['post_type']) ? 'post' : $postarr['post_type'];
 
 	$post_title = $postarr['post_title'];
 	$post_content = $postarr['post_content'];
 	$post_excerpt = $postarr['post_excerpt'];
-	if ( isset( $postarr['post_name'] ) ) {
+	if (isset($postarr['post_name'])) {
 		$post_name = $postarr['post_name'];
-	} elseif ( $update ) {
+	} elseif ($update) {
 		// For an update, don't modify the post_name if it wasn't supplied as an argument.
 		$post_name = $post_before->post_name;
 	}
 
 	$maybe_empty = 'attachment' !== $post_type
 		&& ! $post_content && ! $post_title && ! $post_excerpt
-		&& post_type_supports( $post_type, 'editor' )
-		&& post_type_supports( $post_type, 'title' )
-		&& post_type_supports( $post_type, 'excerpt' );
+		&& post_type_supports($post_type, 'editor')
+		&& post_type_supports($post_type, 'title')
+		&& post_type_supports($post_type, 'excerpt');
 
 	/**
 	 * Filter whether the post should be considered "empty".
@@ -3099,36 +3099,36 @@ 
 	 * @param bool  $maybe_empty Whether the post should be considered "empty".
 	 * @param array $postarr     Array of post data.
 	 */
-	if ( apply_filters( 'wp_insert_post_empty_content', $maybe_empty, $postarr ) ) {
-		if ( $wp_error ) {
-			return new WP_Error( 'empty_content', __( 'Content, title, and excerpt are empty.' ) );
+	if (apply_filters('wp_insert_post_empty_content', $maybe_empty, $postarr)) {
+		if ($wp_error) {
+			return new WP_Error('empty_content', __('Content, title, and excerpt are empty.'));
 		} else {
 			return 0;
 		}
 	}
 
-	$post_status = empty( $postarr['post_status'] ) ? 'draft' : $postarr['post_status'];
-	if ( 'attachment' === $post_type && ! in_array( $post_status, array( 'inherit', 'private', 'trash' ) ) ) {
+	$post_status = empty($postarr['post_status']) ? 'draft' : $postarr['post_status'];
+	if ('attachment' === $post_type && ! in_array($post_status, array('inherit', 'private', 'trash'))) {
 		$post_status = 'inherit';
 	}
 
-	if ( ! empty( $postarr['post_category'] ) ) {
+	if ( ! empty($postarr['post_category'])) {
 		// Filter out empty terms.
-		$post_category = array_filter( $postarr['post_category'] );
+		$post_category = array_filter($postarr['post_category']);
 	}
 
 	// Make sure we set a valid category.
-	if ( empty( $post_category ) || 0 == count( $post_category ) || ! is_array( $post_category ) ) {
+	if (empty($post_category) || 0 == count($post_category) || ! is_array($post_category)) {
 		// 'post' requires at least one category.
-		if ( 'post' == $post_type && 'auto-draft' != $post_status ) {
-			$post_category = array( get_option('default_category') );
+		if ('post' == $post_type && 'auto-draft' != $post_status) {
+			$post_category = array(get_option('default_category'));
 		} else {
 			$post_category = array();
 		}
 	}
 
 	// Don't allow contributors to set the post slug for pending review posts.
-	if ( 'pending' == $post_status && !current_user_can( 'publish_posts' ) ) {
+	if ('pending' == $post_status && ! current_user_can('publish_posts')) {
 		$post_name = '';
 	}
 
@@ -3136,16 +3136,16 @@ 
 	 * Create a valid post name. Drafts and pending posts are allowed to have
 	 * an empty post name.
 	 */
-	if ( empty($post_name) ) {
-		if ( !in_array( $post_status, array( 'draft', 'pending', 'auto-draft' ) ) ) {
+	if (empty($post_name)) {
+		if ( ! in_array($post_status, array('draft', 'pending', 'auto-draft'))) {
 			$post_name = sanitize_title($post_title);
 		} else {
 			$post_name = '';
 		}
 	} else {
 		// On updates, we need to check to see if it's using the old, fixed sanitization context.
-		$check_name = sanitize_title( $post_name, '', 'old-save' );
-		if ( $update && strtolower( urlencode( $post_name ) ) == $check_name && get_post_field( 'post_name', $post_ID ) == $check_name ) {
+		$check_name = sanitize_title($post_name, '', 'old-save');
+		if ($update && strtolower(urlencode($post_name)) == $check_name && get_post_field('post_name', $post_ID) == $check_name) {
 			$post_name = $check_name;
 		} else { // new post, or slug has changed.
 			$post_name = sanitize_title($post_name);
@@ -3156,32 +3156,32 @@ 
 	 * If the post date is empty (due to having been new or a draft) and status
 	 * is not 'draft' or 'pending', set date to now.
 	 */
-	if ( empty( $postarr['post_date'] ) || '0000-00-00 00:00:00' == $postarr['post_date'] ) {
-		if ( empty( $postarr['post_date_gmt'] ) || '0000-00-00 00:00:00' == $postarr['post_date_gmt'] ) {
-			$post_date = current_time( 'mysql' );
+	if (empty($postarr['post_date']) || '0000-00-00 00:00:00' == $postarr['post_date']) {
+		if (empty($postarr['post_date_gmt']) || '0000-00-00 00:00:00' == $postarr['post_date_gmt']) {
+			$post_date = current_time('mysql');
 		} else {
-			$post_date = get_date_from_gmt( $postarr['post_date_gmt'] );
+			$post_date = get_date_from_gmt($postarr['post_date_gmt']);
 		}
 	} else {
 		$post_date = $postarr['post_date'];
 	}
 
 	// Validate the date.
-	$mm = substr( $post_date, 5, 2 );
-	$jj = substr( $post_date, 8, 2 );
-	$aa = substr( $post_date, 0, 4 );
-	$valid_date = wp_checkdate( $mm, $jj, $aa, $post_date );
-	if ( ! $valid_date ) {
-		if ( $wp_error ) {
-			return new WP_Error( 'invalid_date', __( 'Whoops, the provided date is invalid.' ) );
+	$mm = substr($post_date, 5, 2);
+	$jj = substr($post_date, 8, 2);
+	$aa = substr($post_date, 0, 4);
+	$valid_date = wp_checkdate($mm, $jj, $aa, $post_date);
+	if ( ! $valid_date) {
+		if ($wp_error) {
+			return new WP_Error('invalid_date', __('Whoops, the provided date is invalid.'));
 		} else {
 			return 0;
 		}
 	}
 
-	if ( empty( $postarr['post_date_gmt'] ) || '0000-00-00 00:00:00' == $postarr['post_date_gmt'] ) {
-		if ( ! in_array( $post_status, array( 'draft', 'pending', 'auto-draft' ) ) ) {
-			$post_date_gmt = get_gmt_from_date( $post_date );
+	if (empty($postarr['post_date_gmt']) || '0000-00-00 00:00:00' == $postarr['post_date_gmt']) {
+		if ( ! in_array($post_status, array('draft', 'pending', 'auto-draft'))) {
+			$post_date_gmt = get_gmt_from_date($post_date);
 		} else {
 			$post_date_gmt = '0000-00-00 00:00:00';
 		}
@@ -3189,34 +3189,34 @@ 
 		$post_date_gmt = $postarr['post_date_gmt'];
 	}
 
-	if ( $update || '0000-00-00 00:00:00' == $post_date ) {
-		$post_modified     = current_time( 'mysql' );
-		$post_modified_gmt = current_time( 'mysql', 1 );
+	if ($update || '0000-00-00 00:00:00' == $post_date) {
+		$post_modified     = current_time('mysql');
+		$post_modified_gmt = current_time('mysql', 1);
 	} else {
 		$post_modified     = $post_date;
 		$post_modified_gmt = $post_date_gmt;
 	}
 
-	if ( 'attachment' !== $post_type ) {
-		if ( 'publish' == $post_status ) {
+	if ('attachment' !== $post_type) {
+		if ('publish' == $post_status) {
 			$now = gmdate('Y-m-d H:i:59');
-			if ( mysql2date('U', $post_date_gmt, false) > mysql2date('U', $now, false) ) {
+			if (mysql2date('U', $post_date_gmt, false) > mysql2date('U', $now, false)) {
 				$post_status = 'future';
 			}
-		} elseif ( 'future' == $post_status ) {
+		} elseif ('future' == $post_status) {
 			$now = gmdate('Y-m-d H:i:59');
-			if ( mysql2date('U', $post_date_gmt, false) <= mysql2date('U', $now, false) ) {
+			if (mysql2date('U', $post_date_gmt, false) <= mysql2date('U', $now, false)) {
 				$post_status = 'publish';
 			}
 		}
 	}
 
 	// Comment status.
-	if ( empty( $postarr['comment_status'] ) ) {
-		if ( $update ) {
+	if (empty($postarr['comment_status'])) {
+		if ($update) {
 			$comment_status = 'closed';
 		} else {
-			$comment_status = get_default_comment_status( $post_type );
+			$comment_status = get_default_comment_status($post_type);
 		}
 	} else {
 		$comment_status = $postarr['comment_status'];
@@ -3224,28 +3224,28 @@ 
 
 	// These variables are needed by compact() later.
 	$post_content_filtered = $postarr['post_content_filtered'];
-	$post_author = isset( $postarr['post_author'] ) ? $postarr['post_author'] : $user_id;
-	$ping_status = empty( $postarr['ping_status'] ) ? get_default_comment_status( $post_type, 'pingback' ) : $postarr['ping_status'];
-	$to_ping = isset( $postarr['to_ping'] ) ? sanitize_trackback_urls( $postarr['to_ping'] ) : '';
-	$pinged = isset( $postarr['pinged'] ) ? $postarr['pinged'] : '';
-	$import_id = isset( $postarr['import_id'] ) ? $postarr['import_id'] : 0;
+	$post_author = isset($postarr['post_author']) ? $postarr['post_author'] : $user_id;
+	$ping_status = empty($postarr['ping_status']) ? get_default_comment_status($post_type, 'pingback') : $postarr['ping_status'];
+	$to_ping = isset($postarr['to_ping']) ? sanitize_trackback_urls($postarr['to_ping']) : '';
+	$pinged = isset($postarr['pinged']) ? $postarr['pinged'] : '';
+	$import_id = isset($postarr['import_id']) ? $postarr['import_id'] : 0;
 
 	/*
 	 * The 'wp_insert_post_parent' filter expects all variables to be present.
 	 * Previously, these variables would have already been extracted
 	 */
-	if ( isset( $postarr['menu_order'] ) ) {
+	if (isset($postarr['menu_order'])) {
 		$menu_order = (int) $postarr['menu_order'];
 	} else {
 		$menu_order = 0;
 	}
 
-	$post_password = isset( $postarr['post_password'] ) ? $postarr['post_password'] : '';
-	if ( 'private' == $post_status ) {
+	$post_password = isset($postarr['post_password']) ? $postarr['post_password'] : '';
+	if ('private' == $post_status) {
 		$post_password = '';
 	}
 
-	if ( isset( $postarr['post_parent'] ) ) {
+	if (isset($postarr['post_parent'])) {
 		$post_parent = (int) $postarr['post_parent'];
 	} else {
 		$post_parent = 0;
@@ -3261,50 +3261,50 @@ 
 	 * @param array $new_postarr Array of parsed post data.
 	 * @param array $postarr     Array of sanitized, but otherwise unmodified post data.
 	 */
-	$post_parent = apply_filters( 'wp_insert_post_parent', $post_parent, $post_ID, compact( array_keys( $postarr ) ), $postarr );
+	$post_parent = apply_filters('wp_insert_post_parent', $post_parent, $post_ID, compact(array_keys($postarr)), $postarr);
 
 	/*
 	 * If the post is being untrashed and it has a desired slug stored in post meta,
 	 * reassign it.
 	 */
-	if ( 'trash' === $previous_status && 'trash' !== $post_status ) {
-		$desired_post_slug = get_post_meta( $post_ID, '_wp_desired_post_slug', true );
-		if ( $desired_post_slug ) {
-			delete_post_meta( $post_ID, '_wp_desired_post_slug' );
+	if ('trash' === $previous_status && 'trash' !== $post_status) {
+		$desired_post_slug = get_post_meta($post_ID, '_wp_desired_post_slug', true);
+		if ($desired_post_slug) {
+			delete_post_meta($post_ID, '_wp_desired_post_slug');
 			$post_name = $desired_post_slug;
 		}
 	}
 
 	// If a trashed post has the desired slug, change it and let this post have it.
-	if ( 'trash' !== $post_status && $post_name ) {
-		wp_add_trashed_suffix_to_post_name_for_trashed_posts( $post_name, $post_ID );
+	if ('trash' !== $post_status && $post_name) {
+		wp_add_trashed_suffix_to_post_name_for_trashed_posts($post_name, $post_ID);
 	}
 
 	// When trashing an existing post, change its slug to allow non-trashed posts to use it.
-	if ( 'trash' === $post_status && 'trash' !== $previous_status && 'new' !== $previous_status ) {
-		$post_name = wp_add_trashed_suffix_to_post_name_for_post( $post_ID );
+	if ('trash' === $post_status && 'trash' !== $previous_status && 'new' !== $previous_status) {
+		$post_name = wp_add_trashed_suffix_to_post_name_for_post($post_ID);
 	}
 
-	$post_name = wp_unique_post_slug( $post_name, $post_ID, $post_status, $post_type, $post_parent );
+	$post_name = wp_unique_post_slug($post_name, $post_ID, $post_status, $post_type, $post_parent);
 
 	// Don't unslash.
-	$post_mime_type = isset( $postarr['post_mime_type'] ) ? $postarr['post_mime_type'] : '';
+	$post_mime_type = isset($postarr['post_mime_type']) ? $postarr['post_mime_type'] : '';
 
 	// Expected_slashed (everything!).
-	$data = compact( 'post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_content_filtered', 'post_title', 'post_excerpt', 'post_status', 'post_type', 'comment_status', 'ping_status', 'post_password', 'post_name', 'to_ping', 'pinged', 'post_modified', 'post_modified_gmt', 'post_parent', 'menu_order', 'post_mime_type', 'guid' );
+	$data = compact('post_author', 'post_date', 'post_date_gmt', 'post_content', 'post_content_filtered', 'post_title', 'post_excerpt', 'post_status', 'post_type', 'comment_status', 'ping_status', 'post_password', 'post_name', 'to_ping', 'pinged', 'post_modified', 'post_modified_gmt', 'post_parent', 'menu_order', 'post_mime_type', 'guid');
 
-	$emoji_fields = array( 'post_title', 'post_content', 'post_excerpt' );
+	$emoji_fields = array('post_title', 'post_content', 'post_excerpt');
 
-	foreach ( $emoji_fields as $emoji_field ) {
-		if ( isset( $data[ $emoji_field ] ) ) {
-			$charset = $wpdb->get_col_charset( $wpdb->posts, $emoji_field );
-			if ( 'utf8' === $charset ) {
-				$data[ $emoji_field ] = wp_encode_emoji( $data[ $emoji_field ] );
+	foreach ($emoji_fields as $emoji_field) {
+		if (isset($data[$emoji_field])) {
+			$charset = $wpdb->get_col_charset($wpdb->posts, $emoji_field);
+			if ('utf8' === $charset) {
+				$data[$emoji_field] = wp_encode_emoji($data[$emoji_field]);
 			}
 		}
 	}
 
-	if ( 'attachment' === $post_type ) {
+	if ('attachment' === $post_type) {
 		/**
 		 * Filter attachment post data before it is updated in or added to the database.
 		 *
@@ -3313,7 +3313,7 @@ 
 		 * @param array $data    An array of sanitized attachment post data.
 		 * @param array $postarr An array of unsanitized attachment post data.
 		 */
-		$data = apply_filters( 'wp_insert_attachment_data', $data, $postarr );
+		$data = apply_filters('wp_insert_attachment_data', $data, $postarr);
 	} else {
 		/**
 		 * Filter slashed post data just before it is inserted into the database.
@@ -3323,12 +3323,12 @@ 
 		 * @param array $data    An array of slashed post data.
 		 * @param array $postarr An array of sanitized, but otherwise unmodified post data.
 		 */
-		$data = apply_filters( 'wp_insert_post_data', $data, $postarr );
+		$data = apply_filters('wp_insert_post_data', $data, $postarr);
 	}
-	$data = wp_unslash( $data );
-	$where = array( 'ID' => $post_ID );
+	$data = wp_unslash($data);
+	$where = array('ID' => $post_ID);
 
-	if ( $update ) {
+	if ($update) {
 		/**
 		 * Fires immediately before an existing post is updated in the database.
 		 *
@@ -3337,9 +3337,9 @@ 
 		 * @param int   $post_ID Post ID.
 		 * @param array $data    Array of unslashed post data.
 		 */
-		do_action( 'pre_post_update', $post_ID, $data );
-		if ( false === $wpdb->update( $wpdb->posts, $data, $where ) ) {
-			if ( $wp_error ) {
+		do_action('pre_post_update', $post_ID, $data);
+		if (false === $wpdb->update($wpdb->posts, $data, $where)) {
+			if ($wp_error) {
 				return new WP_Error('db_update_error', __('Could not update post in the database'), $wpdb->last_error);
 			} else {
 				return 0;
@@ -3347,14 +3347,14 @@ 
 		}
 	} else {
 		// If there is a suggested ID, use it if not already present.
-		if ( ! empty( $import_id ) ) {
+		if ( ! empty($import_id)) {
 			$import_id = (int) $import_id;
-			if ( ! $wpdb->get_var( $wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE ID = %d", $import_id) ) ) {
+			if ( ! $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE ID = %d", $import_id))) {
 				$data['ID'] = $import_id;
 			}
 		}
-		if ( false === $wpdb->insert( $wpdb->posts, $data ) ) {
-			if ( $wp_error ) {
+		if (false === $wpdb->insert($wpdb->posts, $data)) {
+			if ($wp_error) {
 				return new WP_Error('db_insert_error', __('Could not insert post into the database'), $wpdb->last_error);
 			} else {
 				return 0;
@@ -3363,87 +3363,87 @@ 
 		$post_ID = (int) $wpdb->insert_id;
 
 		// Use the newly generated $post_ID.
-		$where = array( 'ID' => $post_ID );
+		$where = array('ID' => $post_ID);
 	}
 
-	if ( empty( $data['post_name'] ) && ! in_array( $data['post_status'], array( 'draft', 'pending', 'auto-draft' ) ) ) {
-		$data['post_name'] = wp_unique_post_slug( sanitize_title( $data['post_title'], $post_ID ), $post_ID, $data['post_status'], $post_type, $post_parent );
-		$wpdb->update( $wpdb->posts, array( 'post_name' => $data['post_name'] ), $where );
-		clean_post_cache( $post_ID );
+	if (empty($data['post_name']) && ! in_array($data['post_status'], array('draft', 'pending', 'auto-draft'))) {
+		$data['post_name'] = wp_unique_post_slug(sanitize_title($data['post_title'], $post_ID), $post_ID, $data['post_status'], $post_type, $post_parent);
+		$wpdb->update($wpdb->posts, array('post_name' => $data['post_name']), $where);
+		clean_post_cache($post_ID);
 	}
 
-	if ( is_object_in_taxonomy( $post_type, 'category' ) ) {
-		wp_set_post_categories( $post_ID, $post_category );
+	if (is_object_in_taxonomy($post_type, 'category')) {
+		wp_set_post_categories($post_ID, $post_category);
 	}
 
-	if ( isset( $postarr['tags_input'] ) && is_object_in_taxonomy( $post_type, 'post_tag' ) ) {
-		wp_set_post_tags( $post_ID, $postarr['tags_input'] );
+	if (isset($postarr['tags_input']) && is_object_in_taxonomy($post_type, 'post_tag')) {
+		wp_set_post_tags($post_ID, $postarr['tags_input']);
 	}
 
 	// New-style support for all custom taxonomies.
-	if ( ! empty( $postarr['tax_input'] ) ) {
-		foreach ( $postarr['tax_input'] as $taxonomy => $tags ) {
+	if ( ! empty($postarr['tax_input'])) {
+		foreach ($postarr['tax_input'] as $taxonomy => $tags) {
 			$taxonomy_obj = get_taxonomy($taxonomy);
-			if ( ! $taxonomy_obj ) {
+			if ( ! $taxonomy_obj) {
 				/* translators: %s: taxonomy name */
-				_doing_it_wrong( __FUNCTION__, sprintf( __( 'Invalid taxonomy: %s.' ), $taxonomy ), '4.4.0' );
+				_doing_it_wrong(__FUNCTION__, sprintf(__('Invalid taxonomy: %s.'), $taxonomy), '4.4.0');
 				continue;
 			}
 
 			// array = hierarchical, string = non-hierarchical.
-			if ( is_array( $tags ) ) {
+			if (is_array($tags)) {
 				$tags = array_filter($tags);
 			}
-			if ( current_user_can( $taxonomy_obj->cap->assign_terms ) ) {
-				wp_set_post_terms( $post_ID, $tags, $taxonomy );
+			if (current_user_can($taxonomy_obj->cap->assign_terms)) {
+				wp_set_post_terms($post_ID, $tags, $taxonomy);
 			}
 		}
 	}
 
-	if ( ! empty( $postarr['meta_input'] ) ) {
-		foreach ( $postarr['meta_input'] as $field => $value ) {
-			update_post_meta( $post_ID, $field, $value );
+	if ( ! empty($postarr['meta_input'])) {
+		foreach ($postarr['meta_input'] as $field => $value) {
+			update_post_meta($post_ID, $field, $value);
 		}
 	}
 
-	$current_guid = get_post_field( 'guid', $post_ID );
+	$current_guid = get_post_field('guid', $post_ID);
 
 	// Set GUID.
-	if ( ! $update && '' == $current_guid ) {
-		$wpdb->update( $wpdb->posts, array( 'guid' => get_permalink( $post_ID ) ), $where );
+	if ( ! $update && '' == $current_guid) {
+		$wpdb->update($wpdb->posts, array('guid' => get_permalink($post_ID)), $where);
 	}
 
-	if ( 'attachment' === $postarr['post_type'] ) {
-		if ( ! empty( $postarr['file'] ) ) {
-			update_attached_file( $post_ID, $postarr['file'] );
+	if ('attachment' === $postarr['post_type']) {
+		if ( ! empty($postarr['file'])) {
+			update_attached_file($post_ID, $postarr['file']);
 		}
 
-		if ( ! empty( $postarr['context'] ) ) {
-			add_post_meta( $post_ID, '_wp_attachment_context', $postarr['context'], true );
+		if ( ! empty($postarr['context'])) {
+			add_post_meta($post_ID, '_wp_attachment_context', $postarr['context'], true);
 		}
 	}
 
-	clean_post_cache( $post_ID );
+	clean_post_cache($post_ID);
 
-	$post = get_post( $post_ID );
+	$post = get_post($post_ID);
 
-	if ( ! empty( $postarr['page_template'] ) && 'page' == $data['post_type'] ) {
+	if ( ! empty($postarr['page_template']) && 'page' == $data['post_type']) {
 		$post->page_template = $postarr['page_template'];
-		$page_templates = wp_get_theme()->get_page_templates( $post );
-		if ( 'default' != $postarr['page_template'] && ! isset( $page_templates[ $postarr['page_template'] ] ) ) {
-			if ( $wp_error ) {
+		$page_templates = wp_get_theme()->get_page_templates($post);
+		if ('default' != $postarr['page_template'] && ! isset($page_templates[$postarr['page_template']])) {
+			if ($wp_error) {
 				return new WP_Error('invalid_page_template', __('The page template is invalid.'));
 			}
-			update_post_meta( $post_ID, '_wp_page_template', 'default' );
+			update_post_meta($post_ID, '_wp_page_template', 'default');
 		} else {
-			update_post_meta( $post_ID, '_wp_page_template', $postarr['page_template'] );
+			update_post_meta($post_ID, '_wp_page_template', $postarr['page_template']);
 		}
 	}
 
-	if ( 'attachment' !== $postarr['post_type'] ) {
-		wp_transition_post_status( $data['post_status'], $previous_status, $post );
+	if ('attachment' !== $postarr['post_type']) {
+		wp_transition_post_status($data['post_status'], $previous_status, $post);
 	} else {
-		if ( $update ) {
+		if ($update) {
 			/**
 			 * Fires once an existing attachment has been updated.
 			 *
@@ -3451,8 +3451,8 @@ 
 			 *
 			 * @param int $post_ID Attachment ID.
 			 */
-			do_action( 'edit_attachment', $post_ID );
-			$post_after = get_post( $post_ID );
+			do_action('edit_attachment', $post_ID);
+			$post_after = get_post($post_ID);
 
 			/**
 			 * Fires once an existing attachment has been updated.
@@ -3463,7 +3463,7 @@ 
 			 * @param WP_Post $post_after   Post object following the update.
 			 * @param WP_Post $post_before  Post object before the update.
 			 */
-			do_action( 'attachment_updated', $post_ID, $post_after, $post_before );
+			do_action('attachment_updated', $post_ID, $post_after, $post_before);
 		} else {
 
 			/**
@@ -3473,13 +3473,13 @@ 
 			 *
 			 * @param int $post_ID Attachment ID.
 			 */
-			do_action( 'add_attachment', $post_ID );
+			do_action('add_attachment', $post_ID);
 		}
 
 		return $post_ID;
 	}
 
-	if ( $update ) {
+	if ($update) {
 		/**
 		 * Fires once an existing post has been updated.
 		 *
@@ -3488,7 +3488,7 @@ 
 		 * @param int     $post_ID Post ID.
 		 * @param WP_Post $post    Post object.
 		 */
-		do_action( 'edit_post', $post_ID, $post );
+		do_action('edit_post', $post_ID, $post);
 		$post_after = get_post($post_ID);
 
 		/**
@@ -3500,7 +3500,7 @@ 
 		 * @param WP_Post $post_after   Post object following the update.
 		 * @param WP_Post $post_before  Post object before the update.
 		 */
-		do_action( 'post_updated', $post_ID, $post_after, $post_before);
+		do_action('post_updated', $post_ID, $post_after, $post_before);
 	}
 
 	/**
@@ -3515,7 +3515,7 @@ 
 	 * @param WP_Post $post    Post object.
 	 * @param bool    $update  Whether this is an existing post being updated or not.
 	 */
-	do_action( "save_post_{$post->post_type}", $post_ID, $post, $update );
+	do_action("save_post_{$post->post_type}", $post_ID, $post, $update);
 
 	/**
 	 * Fires once a post has been saved.
@@ -3526,7 +3526,7 @@ 
 	 * @param WP_Post $post    Post object.
 	 * @param bool    $update  Whether this is an existing post being updated or not.
 	 */
-	do_action( 'save_post', $post_ID, $post, $update );
+	do_action('save_post', $post_ID, $post, $update);
 
 	/**
 	 * Fires once a post has been saved.
@@ -3537,7 +3537,7 @@ 
 	 * @param WP_Post $post    Post object.
 	 * @param bool    $update  Whether this is an existing post being updated or not.
 	 */
-	do_action( 'wp_insert_post', $post_ID, $post, $update );
+	do_action('wp_insert_post', $post_ID, $post, $update);
 
 	return $post_ID;
 }
@@ -3555,8 +3555,8 @@ 
  * @param bool         $wp_error Optional. Allow return of WP_Error on failure. Default false.
  * @return int|WP_Error The value 0 or WP_Error on failure. The post ID on success.
  */
-function wp_update_post( $postarr = array(), $wp_error = false ) {
-	if ( is_object($postarr) ) {
+function wp_update_post($postarr = array(), $wp_error = false) {
+	if (is_object($postarr)) {
 		// Non-escaped post was passed.
 		$postarr = get_object_vars($postarr);
 		$postarr = wp_slash($postarr);
@@ -3565,9 +3565,9 @@ 
 	// First, get all of the original fields.
 	$post = get_post($postarr['ID'], ARRAY_A);
 
-	if ( is_null( $post ) ) {
-		if ( $wp_error )
-			return new WP_Error( 'invalid_post', __( 'Invalid post ID.' ) );
+	if (is_null($post)) {
+		if ($wp_error)
+			return new WP_Error('invalid_post', __('Invalid post ID.'));
 		return 0;
 	}
 
@@ -3575,15 +3575,15 @@ 
 	$post = wp_slash($post);
 
 	// Passed post category list overwrites existing category list if not empty.
-	if ( isset($postarr['post_category']) && is_array($postarr['post_category'])
-			 && 0 != count($postarr['post_category']) )
+	if (isset($postarr['post_category']) && is_array($postarr['post_category'])
+			 && 0 != count($postarr['post_category']))
 		$post_cats = $postarr['post_category'];
 	else
 		$post_cats = $post['post_category'];
 
 	// Drafts shouldn't be assigned a date unless explicitly done so by the user.
-	if ( isset( $post['post_status'] ) && in_array($post['post_status'], array('draft', 'pending', 'auto-draft')) && empty($postarr['edit_date']) &&
-			 ('0000-00-00 00:00:00' == $post['post_date_gmt']) )
+	if (isset($post['post_status']) && in_array($post['post_status'], array('draft', 'pending', 'auto-draft')) && empty($postarr['edit_date']) &&
+			 ('0000-00-00 00:00:00' == $post['post_date_gmt']))
 		$clear_date = true;
 	else
 		$clear_date = false;
@@ -3591,7 +3591,7 @@ 
 	// Merge old and new fields with new fields overwriting old ones.
 	$postarr = array_merge($post, $postarr);
 	$postarr['post_category'] = $post_cats;
-	if ( $clear_date ) {
+	if ($clear_date) {
 		$postarr['post_date'] = current_time('mysql');
 		$postarr['post_date_gmt'] = '';
 	}
@@ -3599,7 +3599,7 @@ 
 	if ($postarr['post_type'] == 'attachment')
 		return wp_insert_attachment($postarr);
 
-	return wp_insert_post( $postarr, $wp_error );
+	return wp_insert_post($postarr, $wp_error);
 }
 
 /**
@@ -3611,34 +3611,34 @@ 
  *
  * @param int|WP_Post $post Post ID or post object.
  */
-function wp_publish_post( $post ) {
+function wp_publish_post($post) {
 	global $wpdb;
 
-	if ( ! $post = get_post( $post ) )
+	if ( ! $post = get_post($post))
 		return;
 
-	if ( 'publish' == $post->post_status )
+	if ('publish' == $post->post_status)
 		return;
 
-	$wpdb->update( $wpdb->posts, array( 'post_status' => 'publish' ), array( 'ID' => $post->ID ) );
+	$wpdb->update($wpdb->posts, array('post_status' => 'publish'), array('ID' => $post->ID));
 
-	clean_post_cache( $post->ID );
+	clean_post_cache($post->ID);
 
 	$old_status = $post->post_status;
 	$post->post_status = 'publish';
-	wp_transition_post_status( 'publish', $old_status, $post );
+	wp_transition_post_status('publish', $old_status, $post);
 
 	/** This action is documented in wp-includes/post.php */
-	do_action( 'edit_post', $post->ID, $post );
+	do_action('edit_post', $post->ID, $post);
 
 	/** This action is documented in wp-includes/post.php */
-	do_action( "save_post_{$post->post_type}", $post->ID, $post, true );
+	do_action("save_post_{$post->post_type}", $post->ID, $post, true);
 
 	/** This action is documented in wp-includes/post.php */
-	do_action( 'save_post', $post->ID, $post, true );
+	do_action('save_post', $post->ID, $post, true);
 
 	/** This action is documented in wp-includes/post.php */
-	do_action( 'wp_insert_post', $post->ID, $post, true );
+	do_action('wp_insert_post', $post->ID, $post, true);
 }
 
 /**
@@ -3651,26 +3651,26 @@ 
  *
  * @param int|WP_Post $post_id Post ID or post object.
  */
-function check_and_publish_future_post( $post_id ) {
+function check_and_publish_future_post($post_id) {
 	$post = get_post($post_id);
 
-	if ( empty($post) )
+	if (empty($post))
 		return;
 
-	if ( 'future' != $post->post_status )
+	if ('future' != $post->post_status)
 		return;
 
-	$time = strtotime( $post->post_date_gmt . ' GMT' );
+	$time = strtotime($post->post_date_gmt.' GMT');
 
 	// Uh oh, someone jumped the gun!
-	if ( $time > time() ) {
-		wp_clear_scheduled_hook( 'publish_future_post', array( $post_id ) ); // clear anything else in the system
-		wp_schedule_single_event( $time, 'publish_future_post', array( $post_id ) );
+	if ($time > time()) {
+		wp_clear_scheduled_hook('publish_future_post', array($post_id)); // clear anything else in the system
+		wp_schedule_single_event($time, 'publish_future_post', array($post_id));
 		return;
 	}
 
 	// wp_publish_post(_ returns no meaningful value.
-	wp_publish_post( $post_id );
+	wp_publish_post($post_id);
 }
 
 /**
@@ -3688,8 +3688,8 @@ 
  * @param int    $post_parent Post parent ID.
  * @return string Unique slug for the post, based on $post_name (with a -1, -2, etc. suffix)
  */
-function wp_unique_post_slug( $slug, $post_ID, $post_status, $post_type, $post_parent ) {
-	if ( in_array( $post_status, array( 'draft', 'pending', 'auto-draft' ) ) || ( 'inherit' == $post_status && 'revision' == $post_type ) )
+function wp_unique_post_slug($slug, $post_ID, $post_status, $post_type, $post_parent) {
+	if (in_array($post_status, array('draft', 'pending', 'auto-draft')) || ('inherit' == $post_status && 'revision' == $post_type))
 		return $slug;
 
 	global $wpdb, $wp_rewrite;
@@ -3697,13 +3697,13 @@ 
 	$original_slug = $slug;
 
 	$feeds = $wp_rewrite->feeds;
-	if ( ! is_array( $feeds ) )
+	if ( ! is_array($feeds))
 		$feeds = array();
 
-	if ( 'attachment' == $post_type ) {
+	if ('attachment' == $post_type) {
 		// Attachment slugs must be unique across all types.
 		$check_sql = "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND ID != %d LIMIT 1";
-		$post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $slug, $post_ID ) );
+		$post_name_check = $wpdb->get_var($wpdb->prepare($check_sql, $slug, $post_ID));
 
 		/**
 		 * Filter whether the post slug would make a bad attachment slug.
@@ -3713,17 +3713,17 @@ 
 		 * @param bool   $bad_slug Whether the slug would be bad as an attachment slug.
 		 * @param string $slug     The post slug.
 		 */
-		if ( $post_name_check || in_array( $slug, $feeds ) || 'embed' === $slug || apply_filters( 'wp_unique_post_slug_is_bad_attachment_slug', false, $slug ) ) {
+		if ($post_name_check || in_array($slug, $feeds) || 'embed' === $slug || apply_filters('wp_unique_post_slug_is_bad_attachment_slug', false, $slug)) {
 			$suffix = 2;
 			do {
-				$alt_post_name = _truncate_post_slug( $slug, 200 - ( strlen( $suffix ) + 1 ) ) . "-$suffix";
-				$post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $alt_post_name, $post_ID ) );
+				$alt_post_name = _truncate_post_slug($slug, 200 - (strlen($suffix) + 1))."-$suffix";
+				$post_name_check = $wpdb->get_var($wpdb->prepare($check_sql, $alt_post_name, $post_ID));
 				$suffix++;
-			} while ( $post_name_check );
+			} while ($post_name_check);
 			$slug = $alt_post_name;
 		}
-	} elseif ( is_post_type_hierarchical( $post_type ) ) {
-		if ( 'nav_menu_item' == $post_type )
+	} elseif (is_post_type_hierarchical($post_type)) {
+		if ('nav_menu_item' == $post_type)
 			return $slug;
 
 		/*
@@ -3731,7 +3731,7 @@ 
 		 * namespace than posts so page slugs are allowed to overlap post slugs.
 		 */
 		$check_sql = "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND post_type IN ( %s, 'attachment' ) AND ID != %d AND post_parent = %d LIMIT 1";
-		$post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $slug, $post_type, $post_ID, $post_parent ) );
+		$post_name_check = $wpdb->get_var($wpdb->prepare($check_sql, $slug, $post_type, $post_ID, $post_parent));
 
 		/**
 		 * Filter whether the post slug would make a bad hierarchical post slug.
@@ -3743,26 +3743,26 @@ 
 		 * @param string $post_type   Post type.
 		 * @param int    $post_parent Post parent ID.
 		 */
-		if ( $post_name_check || in_array( $slug, $feeds ) || 'embed' === $slug || preg_match( "@^($wp_rewrite->pagination_base)?\d+$@", $slug )  || apply_filters( 'wp_unique_post_slug_is_bad_hierarchical_slug', false, $slug, $post_type, $post_parent ) ) {
+		if ($post_name_check || in_array($slug, $feeds) || 'embed' === $slug || preg_match("@^($wp_rewrite->pagination_base)?\d+$@", $slug) || apply_filters('wp_unique_post_slug_is_bad_hierarchical_slug', false, $slug, $post_type, $post_parent)) {
 			$suffix = 2;
 			do {
-				$alt_post_name = _truncate_post_slug( $slug, 200 - ( strlen( $suffix ) + 1 ) ) . "-$suffix";
-				$post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $alt_post_name, $post_type, $post_ID, $post_parent ) );
+				$alt_post_name = _truncate_post_slug($slug, 200 - (strlen($suffix) + 1))."-$suffix";
+				$post_name_check = $wpdb->get_var($wpdb->prepare($check_sql, $alt_post_name, $post_type, $post_ID, $post_parent));
 				$suffix++;
-			} while ( $post_name_check );
+			} while ($post_name_check);
 			$slug = $alt_post_name;
 		}
 	} else {
 		// Post slugs must be unique across all posts.
 		$check_sql = "SELECT post_name FROM $wpdb->posts WHERE post_name = %s AND post_type = %s AND ID != %d LIMIT 1";
-		$post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $slug, $post_type, $post_ID ) );
+		$post_name_check = $wpdb->get_var($wpdb->prepare($check_sql, $slug, $post_type, $post_ID));
 
 		// Prevent new post slugs that could result in URLs that conflict with date archives.
-		$post = get_post( $post_ID );
+		$post = get_post($post_ID);
 		$conflicts_with_date_archive = false;
-		if ( 'post' === $post_type && ( ! $post || $post->post_name !== $slug ) && preg_match( '/^[0-9]+$/', $slug ) && $slug_num = intval( $slug ) ) {
-			$permastructs   = array_values( array_filter( explode( '/', get_option( 'permalink_structure' ) ) ) );
-			$postname_index = array_search( '%postname%', $permastructs );
+		if ('post' === $post_type && ( ! $post || $post->post_name !== $slug) && preg_match('/^[0-9]+$/', $slug) && $slug_num = intval($slug)) {
+			$permastructs   = array_values(array_filter(explode('/', get_option('permalink_structure'))));
+			$postname_index = array_search('%postname%', $permastructs);
 
 			/*
 			 * Potential date clashes are as follows:
@@ -3771,9 +3771,9 @@ 
 			 * - An integer between 1 and 12 that follows 'year' conflicts with 'monthnum'.
 			 * - An integer between 1 and 31 that follows 'monthnum' conflicts with 'day'.
 			 */
-			if ( 0 === $postname_index ||
-				( $postname_index && '%year%' === $permastructs[ $postname_index - 1 ] && 13 > $slug_num ) ||
-				( $postname_index && '%monthnum%' === $permastructs[ $postname_index - 1 ] && 32 > $slug_num )
+			if (0 === $postname_index ||
+				($postname_index && '%year%' === $permastructs[$postname_index - 1] && 13 > $slug_num) ||
+				($postname_index && '%monthnum%' === $permastructs[$postname_index - 1] && 32 > $slug_num)
 			) {
 				$conflicts_with_date_archive = true;
 			}
@@ -3788,13 +3788,13 @@ 
 		 * @param string $slug      The post slug.
 		 * @param string $post_type Post type.
 		 */
-		if ( $post_name_check || in_array( $slug, $feeds ) || 'embed' === $slug || $conflicts_with_date_archive || apply_filters( 'wp_unique_post_slug_is_bad_flat_slug', false, $slug, $post_type ) ) {
+		if ($post_name_check || in_array($slug, $feeds) || 'embed' === $slug || $conflicts_with_date_archive || apply_filters('wp_unique_post_slug_is_bad_flat_slug', false, $slug, $post_type)) {
 			$suffix = 2;
 			do {
-				$alt_post_name = _truncate_post_slug( $slug, 200 - ( strlen( $suffix ) + 1 ) ) . "-$suffix";
-				$post_name_check = $wpdb->get_var( $wpdb->prepare( $check_sql, $alt_post_name, $post_type, $post_ID ) );
+				$alt_post_name = _truncate_post_slug($slug, 200 - (strlen($suffix) + 1))."-$suffix";
+				$post_name_check = $wpdb->get_var($wpdb->prepare($check_sql, $alt_post_name, $post_type, $post_ID));
 				$suffix++;
-			} while ( $post_name_check );
+			} while ($post_name_check);
 			$slug = $alt_post_name;
 		}
 	}
@@ -3811,7 +3811,7 @@ 
 	 * @param int    $post_parent   Post parent ID
 	 * @param string $original_slug The original post slug.
 	 */
-	return apply_filters( 'wp_unique_post_slug', $slug, $post_ID, $post_status, $post_type, $post_parent, $original_slug );
+	return apply_filters('wp_unique_post_slug', $slug, $post_ID, $post_status, $post_type, $post_parent, $original_slug);
 }
 
 /**
@@ -3826,16 +3826,16 @@ 
  * @param int    $length Optional. Max length of the slug. Default 200 (characters).
  * @return string The truncated slug.
  */
-function _truncate_post_slug( $slug, $length = 200 ) {
-	if ( strlen( $slug ) > $length ) {
-		$decoded_slug = urldecode( $slug );
-		if ( $decoded_slug === $slug )
-			$slug = substr( $slug, 0, $length );
+function _truncate_post_slug($slug, $length = 200) {
+	if (strlen($slug) > $length) {
+		$decoded_slug = urldecode($slug);
+		if ($decoded_slug === $slug)
+			$slug = substr($slug, 0, $length);
 		else
-			$slug = utf8_uri_encode( $decoded_slug, $length );
+			$slug = utf8_uri_encode($decoded_slug, $length);
 	}
 
-	return rtrim( $slug, '-' );
+	return rtrim($slug, '-');
 }
 
 /**
@@ -3850,7 +3850,7 @@ 
  *                              separated by commas. Default empty.
  * @return array|false|WP_Error Array of affected term IDs. WP_Error or false on failure.
  */
-function wp_add_post_tags( $post_id = 0, $tags = '' ) {
+function wp_add_post_tags($post_id = 0, $tags = '') {
 	return wp_set_post_tags($post_id, $tags, true);
 }
 
@@ -3868,8 +3868,8 @@ 
  *                              replace the tags with the new tags. Default false.
  * @return array|false|WP_Error Array of term taxonomy IDs of affected terms. WP_Error or false on failure.
  */
-function wp_set_post_tags( $post_id = 0, $tags = '', $append = false ) {
-	return wp_set_post_terms( $post_id, $tags, 'post_tag', $append);
+function wp_set_post_tags($post_id = 0, $tags = '', $append = false) {
+	return wp_set_post_terms($post_id, $tags, 'post_tag', $append);
 }
 
 /**
@@ -3887,31 +3887,31 @@ 
  *                               replace the terms with the new terms. Default false.
  * @return array|false|WP_Error Array of term taxonomy IDs of affected terms. WP_Error or false on failure.
  */
-function wp_set_post_terms( $post_id = 0, $tags = '', $taxonomy = 'post_tag', $append = false ) {
+function wp_set_post_terms($post_id = 0, $tags = '', $taxonomy = 'post_tag', $append = false) {
 	$post_id = (int) $post_id;
 
-	if ( !$post_id )
+	if ( ! $post_id)
 		return false;
 
-	if ( empty($tags) )
+	if (empty($tags))
 		$tags = array();
 
-	if ( ! is_array( $tags ) ) {
-		$comma = _x( ',', 'tag delimiter' );
-		if ( ',' !== $comma )
-			$tags = str_replace( $comma, ',', $tags );
-		$tags = explode( ',', trim( $tags, " \n\t\r\0\x0B," ) );
+	if ( ! is_array($tags)) {
+		$comma = _x(',', 'tag delimiter');
+		if (',' !== $comma)
+			$tags = str_replace($comma, ',', $tags);
+		$tags = explode(',', trim($tags, " \n\t\r\0\x0B,"));
 	}
 
 	/*
 	 * Hierarchical taxonomies must always pass IDs rather than names so that
 	 * children with the same names but different parents aren't confused.
 	 */
-	if ( is_taxonomy_hierarchical( $taxonomy ) ) {
-		$tags = array_unique( array_map( 'intval', $tags ) );
+	if (is_taxonomy_hierarchical($taxonomy)) {
+		$tags = array_unique(array_map('intval', $tags));
 	}
 
-	return wp_set_object_terms( $post_id, $tags, $taxonomy, $append );
+	return wp_set_object_terms($post_id, $tags, $taxonomy, $append);
 }
 
 /**
@@ -3930,24 +3930,24 @@ 
  *                                  If false, replace the categories with the new categories.
  * @return array|false|WP_Error Array of term taxonomy IDs of affected categories. WP_Error or false on failure.
  */
-function wp_set_post_categories( $post_ID = 0, $post_categories = array(), $append = false ) {
+function wp_set_post_categories($post_ID = 0, $post_categories = array(), $append = false) {
 	$post_ID = (int) $post_ID;
-	$post_type = get_post_type( $post_ID );
-	$post_status = get_post_status( $post_ID );
+	$post_type = get_post_type($post_ID);
+	$post_status = get_post_status($post_ID);
 	// If $post_categories isn't already an array, make it one:
 	$post_categories = (array) $post_categories;
-	if ( empty( $post_categories ) ) {
-		if ( 'post' == $post_type && 'auto-draft' != $post_status ) {
-			$post_categories = array( get_option('default_category') );
+	if (empty($post_categories)) {
+		if ('post' == $post_type && 'auto-draft' != $post_status) {
+			$post_categories = array(get_option('default_category'));
 			$append = false;
 		} else {
 			$post_categories = array();
 		}
-	} elseif ( 1 == count( $post_categories ) && '' == reset( $post_categories ) ) {
+	} elseif (1 == count($post_categories) && '' == reset($post_categories)) {
 		return true;
 	}
 
-	return wp_set_post_terms( $post_ID, $post_categories, 'category', $append );
+	return wp_set_post_terms($post_ID, $post_categories, 'category', $append);
 }
 
 /**
@@ -3971,7 +3971,7 @@ 
  * @param string  $old_status Previous post status.
  * @param WP_Post $post Post data.
  */
-function wp_transition_post_status( $new_status, $old_status, $post ) {
+function wp_transition_post_status($new_status, $old_status, $post) {
 	/**
 	 * Fires when a post is transitioned from one status to another.
 	 *
@@ -3981,7 +3981,7 @@ 
 	 * @param string  $old_status Old post status.
 	 * @param WP_Post $post       Post object.
 	 */
-	do_action( 'transition_post_status', $new_status, $old_status, $post );
+	do_action('transition_post_status', $new_status, $old_status, $post);
 
 	/**
 	 * Fires when a post is transitioned from one status to another.
@@ -3993,7 +3993,7 @@ 
 	 *
 	 * @param WP_Post $post Post object.
 	 */
-	do_action( "{$old_status}_to_{$new_status}", $post );
+	do_action("{$old_status}_to_{$new_status}", $post);
 
 	/**
 	 * Fires when a post is transitioned from one status to another.
@@ -4014,7 +4014,7 @@ 
 	 * @param int     $post_id Post ID.
 	 * @param WP_Post $post    Post object.
 	 */
-	do_action( "{$new_status}_{$post->post_type}", $post->ID, $post );
+	do_action("{$new_status}_{$post->post_type}", $post->ID, $post);
 }
 
 //
@@ -4032,9 +4032,9 @@ 
  * @param string $uri     Ping URI.
  * @return int|false How many rows were updated.
  */
-function add_ping( $post_id, $uri ) {
+function add_ping($post_id, $uri) {
 	global $wpdb;
-	$pung = $wpdb->get_var( $wpdb->prepare( "SELECT pinged FROM $wpdb->posts WHERE ID = %d", $post_id ));
+	$pung = $wpdb->get_var($wpdb->prepare("SELECT pinged FROM $wpdb->posts WHERE ID = %d", $post_id));
 	$pung = trim($pung);
 	$pung = preg_split('/\s/', $pung);
 	$pung[] = $uri;
@@ -4047,11 +4047,11 @@ 
 	 *
 	 * @param string $new New ping URL to add.
 	 */
-	$new = apply_filters( 'add_ping', $new );
+	$new = apply_filters('add_ping', $new);
 
 	// expected_slashed ($new).
 	$new = wp_unslash($new);
-	return $wpdb->update( $wpdb->posts, array( 'pinged' => $new ), array( 'ID' => $post_id ) );
+	return $wpdb->update($wpdb->posts, array('pinged' => $new), array('ID' => $post_id));
 }
 
 /**
@@ -4062,18 +4062,18 @@ 
  * @param int $post_id Post ID.
  * @return array List of enclosures.
  */
-function get_enclosed( $post_id ) {
-	$custom_fields = get_post_custom( $post_id );
+function get_enclosed($post_id) {
+	$custom_fields = get_post_custom($post_id);
 	$pung = array();
-	if ( !is_array( $custom_fields ) )
+	if ( ! is_array($custom_fields))
 		return $pung;
 
-	foreach ( $custom_fields as $key => $val ) {
-		if ( 'enclosure' != $key || !is_array( $val ) )
+	foreach ($custom_fields as $key => $val) {
+		if ('enclosure' != $key || ! is_array($val))
 			continue;
-		foreach ( $val as $enc ) {
-			$enclosure = explode( "\n", $enc );
-			$pung[] = trim( $enclosure[ 0 ] );
+		foreach ($val as $enc) {
+			$enclosure = explode("\n", $enc);
+			$pung[] = trim($enclosure[0]);
 		}
 	}
 
@@ -4085,7 +4085,7 @@ 
 	 * @param array $pung    Array of enclosures for the given post.
 	 * @param int   $post_id Post ID.
 	 */
-	return apply_filters( 'get_enclosed', $pung, $post_id );
+	return apply_filters('get_enclosed', $pung, $post_id);
 }
 
 /**
@@ -4098,9 +4098,9 @@ 
  * @param int $post_id Post ID.
  * @return array
  */
-function get_pung( $post_id ) {
+function get_pung($post_id) {
 	global $wpdb;
-	$pung = $wpdb->get_var( $wpdb->prepare( "SELECT pinged FROM $wpdb->posts WHERE ID = %d", $post_id ));
+	$pung = $wpdb->get_var($wpdb->prepare("SELECT pinged FROM $wpdb->posts WHERE ID = %d", $post_id));
 	$pung = trim($pung);
 	$pung = preg_split('/\s/', $pung);
 
@@ -4111,7 +4111,7 @@ 
 	 *
 	 * @param array $pung Array of URLs already pinged for the given post.
 	 */
-	return apply_filters( 'get_pung', $pung );
+	return apply_filters('get_pung', $pung);
 }
 
 /**
@@ -4124,10 +4124,10 @@ 
  * @param int $post_id Post ID
  * @return array
  */
-function get_to_ping( $post_id ) {
+function get_to_ping($post_id) {
 	global $wpdb;
-	$to_ping = $wpdb->get_var( $wpdb->prepare( "SELECT to_ping FROM $wpdb->posts WHERE ID = %d", $post_id ));
-	$to_ping = sanitize_trackback_urls( $to_ping );
+	$to_ping = $wpdb->get_var($wpdb->prepare("SELECT to_ping FROM $wpdb->posts WHERE ID = %d", $post_id));
+	$to_ping = sanitize_trackback_urls($to_ping);
 	$to_ping = preg_split('/\s/', $to_ping, -1, PREG_SPLIT_NO_EMPTY);
 
 	/**
@@ -4137,7 +4137,7 @@ 
 	 *
 	 * @param array $to_ping List of URLs yet to ping.
 	 */
-	return apply_filters( 'get_to_ping', $to_ping );
+	return apply_filters('get_to_ping', $to_ping);
 }
 
 /**
@@ -4148,22 +4148,22 @@ 
  * @param string $tb_list Comma separated list of URLs.
  * @param int    $post_id Post ID.
  */
-function trackback_url_list( $tb_list, $post_id ) {
-	if ( ! empty( $tb_list ) ) {
+function trackback_url_list($tb_list, $post_id) {
+	if ( ! empty($tb_list)) {
 		// Get post data.
-		$postdata = get_post( $post_id, ARRAY_A );
+		$postdata = get_post($post_id, ARRAY_A);
 
 		// Form an excerpt.
-		$excerpt = strip_tags( $postdata['post_excerpt'] ? $postdata['post_excerpt'] : $postdata['post_content'] );
+		$excerpt = strip_tags($postdata['post_excerpt'] ? $postdata['post_excerpt'] : $postdata['post_content']);
 
-		if ( strlen( $excerpt ) > 255 ) {
-			$excerpt = substr( $excerpt, 0, 252 ) . '&hellip;';
+		if (strlen($excerpt) > 255) {
+			$excerpt = substr($excerpt, 0, 252).'&hellip;';
 		}
 
-		$trackback_urls = explode( ',', $tb_list );
-		foreach ( (array) $trackback_urls as $tb_url ) {
-			$tb_url = trim( $tb_url );
-			trackback( $tb_url, wp_unslash( $postdata['post_title'] ), $excerpt, $post_id );
+		$trackback_urls = explode(',', $tb_list);
+		foreach ((array) $trackback_urls as $tb_url) {
+			$tb_url = trim($tb_url);
+			trackback($tb_url, wp_unslash($postdata['post_title']), $excerpt, $post_id);
 		}
 	}
 }
@@ -4185,7 +4185,7 @@ 
 	global $wpdb;
 
 	$page_ids = wp_cache_get('all_page_ids', 'posts');
-	if ( ! is_array( $page_ids ) ) {
+	if ( ! is_array($page_ids)) {
 		$page_ids = $wpdb->get_col("SELECT ID FROM $wpdb->posts WHERE post_type = 'page'");
 		wp_cache_add('all_page_ids', $page_ids, 'posts');
 	}
@@ -4208,8 +4208,8 @@ 
  *                       'edit', 'db', 'display'. Default 'raw'.
  * @return WP_Post|array|null WP_Post on success or null on failure.
  */
-function get_page( $page, $output = OBJECT, $filter = 'raw') {
-	return get_post( $page, $output, $filter );
+function get_page($page, $output = OBJECT, $filter = 'raw') {
+	return get_post($page, $output, $filter);
 }
 
 /**
@@ -4225,26 +4225,26 @@ 
  * @param string|array $post_type Optional. Post type or array of post types. Default 'page'.
  * @return WP_Post|array|void WP_Post on success.
  */
-function get_page_by_path( $page_path, $output = OBJECT, $post_type = 'page' ) {
+function get_page_by_path($page_path, $output = OBJECT, $post_type = 'page') {
 	global $wpdb;
 
 	$page_path = rawurlencode(urldecode($page_path));
 	$page_path = str_replace('%2F', '/', $page_path);
 	$page_path = str_replace('%20', ' ', $page_path);
-	$parts = explode( '/', trim( $page_path, '/' ) );
-	$parts = esc_sql( $parts );
-	$parts = array_map( 'sanitize_title_for_query', $parts );
+	$parts = explode('/', trim($page_path, '/'));
+	$parts = esc_sql($parts);
+	$parts = array_map('sanitize_title_for_query', $parts);
 
-	$in_string = "'" . implode( "','", $parts ) . "'";
+	$in_string = "'".implode("','", $parts)."'";
 
-	if ( is_array( $post_type ) ) {
+	if (is_array($post_type)) {
 		$post_types = $post_type;
 	} else {
-		$post_types = array( $post_type, 'attachment' );
+		$post_types = array($post_type, 'attachment');
 	}
 
-	$post_types = esc_sql( $post_types );
-	$post_type_in_string = "'" . implode( "','", $post_types ) . "'";
+	$post_types = esc_sql($post_types);
+	$post_type_in_string = "'".implode("','", $post_types)."'";
 	$sql = "
 		SELECT ID, post_name, post_parent, post_type
 		FROM $wpdb->posts
@@ -4252,13 +4252,13 @@ 
 		AND post_type IN ($post_type_in_string)
 	";
 
-	$pages = $wpdb->get_results( $sql, OBJECT_K );
+	$pages = $wpdb->get_results($sql, OBJECT_K);
 
-	$revparts = array_reverse( $parts );
+	$revparts = array_reverse($parts);
 
 	$foundid = 0;
-	foreach ( (array) $pages as $page ) {
-		if ( $page->post_name == $revparts[0] ) {
+	foreach ((array) $pages as $page) {
+		if ($page->post_name == $revparts[0]) {
 			$count = 0;
 			$p = $page;
 
@@ -4266,24 +4266,24 @@ 
 			 * Loop through the given path parts from right to left,
 			 * ensuring each matches the post ancestry.
 			 */
-			while ( $p->post_parent != 0 && isset( $pages[ $p->post_parent ] ) ) {
+			while ($p->post_parent != 0 && isset($pages[$p->post_parent])) {
 				$count++;
-				$parent = $pages[ $p->post_parent ];
-				if ( ! isset( $revparts[ $count ] ) || $parent->post_name != $revparts[ $count ] )
+				$parent = $pages[$p->post_parent];
+				if ( ! isset($revparts[$count]) || $parent->post_name != $revparts[$count])
 					break;
 				$p = $parent;
 			}
 
-			if ( $p->post_parent == 0 && $count+1 == count( $revparts ) && $p->post_name == $revparts[ $count ] ) {
+			if ($p->post_parent == 0 && $count + 1 == count($revparts) && $p->post_name == $revparts[$count]) {
 				$foundid = $page->ID;
-				if ( $page->post_type == $post_type )
+				if ($page->post_type == $post_type)
 					break;
 			}
 		}
 	}
 
-	if ( $foundid ) {
-		return get_post( $foundid, $output );
+	if ($foundid) {
+		return get_post($foundid, $output);
 	}
 }
 
@@ -4300,31 +4300,31 @@ 
  * @param string|array $post_type  Optional. Post type or array of post types. Default 'page'.
  * @return WP_Post|array|void WP_Post on success or null on failure
  */
-function get_page_by_title( $page_title, $output = OBJECT, $post_type = 'page' ) {
+function get_page_by_title($page_title, $output = OBJECT, $post_type = 'page') {
 	global $wpdb;
 
-	if ( is_array( $post_type ) ) {
-		$post_type = esc_sql( $post_type );
-		$post_type_in_string = "'" . implode( "','", $post_type ) . "'";
-		$sql = $wpdb->prepare( "
+	if (is_array($post_type)) {
+		$post_type = esc_sql($post_type);
+		$post_type_in_string = "'".implode("','", $post_type)."'";
+		$sql = $wpdb->prepare("
 			SELECT ID
 			FROM $wpdb->posts
 			WHERE post_title = %s
 			AND post_type IN ($post_type_in_string)
-		", $page_title );
+		", $page_title);
 	} else {
-		$sql = $wpdb->prepare( "
+		$sql = $wpdb->prepare("
 			SELECT ID
 			FROM $wpdb->posts
 			WHERE post_title = %s
 			AND post_type = %s
-		", $page_title, $post_type );
+		", $page_title, $post_type);
 	}
 
-	$page = $wpdb->get_var( $sql );
+	$page = $wpdb->get_var($sql);
 
-	if ( $page ) {
-		return get_post( $page, $output );
+	if ($page) {
+		return get_post($page, $output);
 	}
 }
 
@@ -4339,25 +4339,25 @@ 
  * @param array $pages   List of page objects from which descendants should be identified.
  * @return array List of page children.
  */
-function get_page_children( $page_id, $pages ) {
+function get_page_children($page_id, $pages) {
 	// Build a hash of ID -> children.
 	$children = array();
-	foreach ( (array) $pages as $page ) {
-		$children[ intval( $page->post_parent ) ][] = $page;
+	foreach ((array) $pages as $page) {
+		$children[intval($page->post_parent)][] = $page;
 	}
 
 	$page_list = array();
 
 	// Start the search by looking at immediate children.
-	if ( isset( $children[ $page_id ] ) ) {
+	if (isset($children[$page_id])) {
 		// Always start at the end of the stack in order to preserve original `$pages` order.
-		$to_look = array_reverse( $children[ $page_id ] );
+		$to_look = array_reverse($children[$page_id]);
 
-		while ( $to_look ) {
-			$p = array_pop( $to_look );
+		while ($to_look) {
+			$p = array_pop($to_look);
 			$page_list[] = $p;
-			if ( isset( $children[ $p->ID ] ) ) {
-				foreach ( array_reverse( $children[ $p->ID ] ) as $child ) {
+			if (isset($children[$p->ID])) {
+				foreach (array_reverse($children[$p->ID]) as $child) {
 					// Append to the `$to_look` stack to descend the tree.
 					$to_look[] = $child;
 				}
@@ -4380,19 +4380,19 @@ 
  * @param int   $page_id Optional. Parent page ID. Default 0.
  * @return array A list arranged by hierarchy. Children immediately follow their parents.
  */
-function get_page_hierarchy( &$pages, $page_id = 0 ) {
-	if ( empty( $pages ) ) {
+function get_page_hierarchy(&$pages, $page_id = 0) {
+	if (empty($pages)) {
 		return array();
 	}
 
 	$children = array();
-	foreach ( (array) $pages as $p ) {
-		$parent_id = intval( $p->post_parent );
-		$children[ $parent_id ][] = $p;
+	foreach ((array) $pages as $p) {
+		$parent_id = intval($p->post_parent);
+		$children[$parent_id][] = $p;
 	}
 
 	$result = array();
-	_page_traverse_name( $page_id, $children, $result );
+	_page_traverse_name($page_id, $children, $result);
 
 	return $result;
 }
@@ -4410,11 +4410,11 @@ 
  * @param array $children  Parent-children relations, passed by reference.
  * @param array $result    Result, passed by reference.
  */
-function _page_traverse_name( $page_id, &$children, &$result ){
-	if ( isset( $children[ $page_id ] ) ){
-		foreach ( (array)$children[ $page_id ] as $child ) {
-			$result[ $child->ID ] = $child->post_name;
-			_page_traverse_name( $child->ID, $children, $result );
+function _page_traverse_name($page_id, &$children, &$result) {
+	if (isset($children[$page_id])) {
+		foreach ((array) $children[$page_id] as $child) {
+			$result[$child->ID] = $child->post_name;
+			_page_traverse_name($child->ID, $children, $result);
 		}
 	}
 }
@@ -4429,20 +4429,20 @@ 
  * @param WP_Post|object|int $page Page object or page ID.
  * @return string|false Page URI, false on error.
  */
-function get_page_uri( $page ) {
-	if ( ! $page instanceof WP_Post ) {
-		$page = get_post( $page );
+function get_page_uri($page) {
+	if ( ! $page instanceof WP_Post) {
+		$page = get_post($page);
 	}
 
-	if ( ! $page )
+	if ( ! $page)
 		return false;
 
 	$uri = $page->post_name;
 
-	foreach ( $page->ancestors as $parent ) {
-		$parent = get_post( $parent );
-		if ( $parent ) {
-			$uri = $parent->post_name . '/' . $uri;
+	foreach ($page->ancestors as $parent) {
+		$parent = get_post($parent);
+		if ($parent) {
+			$uri = $parent->post_name.'/'.$uri;
 		}
 	}
 
@@ -4454,7 +4454,7 @@ 
 	 * @param string  $uri  Page URI.
 	 * @param WP_Post $page Page object.
 	 */
-	return apply_filters( 'get_page_uri', $uri, $page );
+	return apply_filters('get_page_uri', $uri, $page);
 }
 
 /**
@@ -4499,7 +4499,7 @@ 
  * }
  * @return array|false List of pages matching defaults or `$args`.
  */
-function get_pages( $args = array() ) {
+function get_pages($args = array()) {
 	global $wpdb;
 
 	$defaults = array(
@@ -4512,7 +4512,7 @@ 
 		'post_type' => 'page', 'post_status' => 'publish',
 	);
 
-	$r = wp_parse_args( $args, $defaults );
+	$r = wp_parse_args($args, $defaults);
 
 	$number = (int) $r['number'];
 	$offset = (int) $r['offset'];
@@ -4525,87 +4525,87 @@ 
 	$post_status = $r['post_status'];
 
 	// Make sure the post type is hierarchical.
-	$hierarchical_post_types = get_post_types( array( 'hierarchical' => true ) );
-	if ( ! in_array( $r['post_type'], $hierarchical_post_types ) ) {
+	$hierarchical_post_types = get_post_types(array('hierarchical' => true));
+	if ( ! in_array($r['post_type'], $hierarchical_post_types)) {
 		return false;
 	}
 
-	if ( $parent > 0 && ! $child_of ) {
+	if ($parent > 0 && ! $child_of) {
 		$hierarchical = false;
 	}
 
 	// Make sure we have a valid post status.
-	if ( ! is_array( $post_status ) ) {
-		$post_status = explode( ',', $post_status );
+	if ( ! is_array($post_status)) {
+		$post_status = explode(',', $post_status);
 	}
-	if ( array_diff( $post_status, get_post_stati() ) ) {
+	if (array_diff($post_status, get_post_stati())) {
 		return false;
 	}
 
 	// $args can be whatever, only use the args defined in defaults to compute the key.
-	$key = md5( serialize( wp_array_slice_assoc( $r, array_keys( $defaults ) ) ) );
-	$last_changed = wp_cache_get( 'last_changed', 'posts' );
-	if ( ! $last_changed ) {
+	$key = md5(serialize(wp_array_slice_assoc($r, array_keys($defaults))));
+	$last_changed = wp_cache_get('last_changed', 'posts');
+	if ( ! $last_changed) {
 		$last_changed = microtime();
-		wp_cache_set( 'last_changed', $last_changed, 'posts' );
+		wp_cache_set('last_changed', $last_changed, 'posts');
 	}
 
 	$cache_key = "get_pages:$key:$last_changed";
-	if ( $cache = wp_cache_get( $cache_key, 'posts' ) ) {
+	if ($cache = wp_cache_get($cache_key, 'posts')) {
 		// Convert to WP_Post instances.
-		$pages = array_map( 'get_post', $cache );
+		$pages = array_map('get_post', $cache);
 		/** This filter is documented in wp-includes/post.php */
-		$pages = apply_filters( 'get_pages', $pages, $r );
+		$pages = apply_filters('get_pages', $pages, $r);
 		return $pages;
 	}
 
 	$inclusions = '';
-	if ( ! empty( $r['include'] ) ) {
+	if ( ! empty($r['include'])) {
 		$child_of = 0; //ignore child_of, parent, exclude, meta_key, and meta_value params if using include
 		$parent = -1;
 		$exclude = '';
 		$meta_key = '';
 		$meta_value = '';
 		$hierarchical = false;
-		$incpages = wp_parse_id_list( $r['include'] );
-		if ( ! empty( $incpages ) ) {
-			$inclusions = ' AND ID IN (' . implode( ',', $incpages ) .  ')';
+		$incpages = wp_parse_id_list($r['include']);
+		if ( ! empty($incpages)) {
+			$inclusions = ' AND ID IN ('.implode(',', $incpages).')';
 		}
 	}
 
 	$exclusions = '';
-	if ( ! empty( $exclude ) ) {
-		$expages = wp_parse_id_list( $exclude );
-		if ( ! empty( $expages ) ) {
-			$exclusions = ' AND ID NOT IN (' . implode( ',', $expages ) .  ')';
+	if ( ! empty($exclude)) {
+		$expages = wp_parse_id_list($exclude);
+		if ( ! empty($expages)) {
+			$exclusions = ' AND ID NOT IN ('.implode(',', $expages).')';
 		}
 	}
 
 	$author_query = '';
-	if ( ! empty( $r['authors'] ) ) {
-		$post_authors = preg_split( '/[\s,]+/', $r['authors'] );
+	if ( ! empty($r['authors'])) {
+		$post_authors = preg_split('/[\s,]+/', $r['authors']);
 
-		if ( ! empty( $post_authors ) ) {
-			foreach ( $post_authors as $post_author ) {
+		if ( ! empty($post_authors)) {
+			foreach ($post_authors as $post_author) {
 				//Do we have an author id or an author login?
-				if ( 0 == intval($post_author) ) {
+				if (0 == intval($post_author)) {
 					$post_author = get_user_by('login', $post_author);
-					if ( empty( $post_author ) ) {
+					if (empty($post_author)) {
 						continue;
 					}
-					if ( empty( $post_author->ID ) ) {
+					if (empty($post_author->ID)) {
 						continue;
 					}
 					$post_author = $post_author->ID;
 				}
 
-				if ( '' == $author_query ) {
+				if ('' == $author_query) {
 					$author_query = $wpdb->prepare(' post_author = %d ', $post_author);
 				} else {
 					$author_query .= $wpdb->prepare(' OR post_author = %d ', $post_author);
 				}
 			}
-			if ( '' != $author_query ) {
+			if ('' != $author_query) {
 				$author_query = " AND ($author_query)";
 			}
 		}
@@ -4613,49 +4613,49 @@ 
 
 	$join = '';
 	$where = "$exclusions $inclusions ";
-	if ( '' !== $meta_key || '' !== $meta_value ) {
+	if ('' !== $meta_key || '' !== $meta_value) {
 		$join = " LEFT JOIN $wpdb->postmeta ON ( $wpdb->posts.ID = $wpdb->postmeta.post_id )";
 
 		// meta_key and meta_value might be slashed
 		$meta_key = wp_unslash($meta_key);
 		$meta_value = wp_unslash($meta_value);
-		if ( '' !== $meta_key ) {
+		if ('' !== $meta_key) {
 			$where .= $wpdb->prepare(" AND $wpdb->postmeta.meta_key = %s", $meta_key);
 		}
-		if ( '' !== $meta_value ) {
+		if ('' !== $meta_value) {
 			$where .= $wpdb->prepare(" AND $wpdb->postmeta.meta_value = %s", $meta_value);
 		}
 
 	}
 
-	if ( is_array( $parent ) ) {
-		$post_parent__in = implode( ',', array_map( 'absint', (array) $parent ) );
-		if ( ! empty( $post_parent__in ) ) {
+	if (is_array($parent)) {
+		$post_parent__in = implode(',', array_map('absint', (array) $parent));
+		if ( ! empty($post_parent__in)) {
 			$where .= " AND post_parent IN ($post_parent__in)";
 		}
-	} elseif ( $parent >= 0 ) {
+	} elseif ($parent >= 0) {
 		$where .= $wpdb->prepare(' AND post_parent = %d ', $parent);
 	}
 
-	if ( 1 == count( $post_status ) ) {
-		$where_post_type = $wpdb->prepare( "post_type = %s AND post_status = %s", $r['post_type'], reset( $post_status ) );
+	if (1 == count($post_status)) {
+		$where_post_type = $wpdb->prepare("post_type = %s AND post_status = %s", $r['post_type'], reset($post_status));
 	} else {
-		$post_status = implode( "', '", $post_status );
-		$where_post_type = $wpdb->prepare( "post_type = %s AND post_status IN ('$post_status')", $r['post_type'] );
+		$post_status = implode("', '", $post_status);
+		$where_post_type = $wpdb->prepare("post_type = %s AND post_status IN ('$post_status')", $r['post_type']);
 	}
 
 	$orderby_array = array();
-	$allowed_keys = array( 'author', 'post_author', 'date', 'post_date', 'title', 'post_title', 'name', 'post_name', 'modified',
+	$allowed_keys = array('author', 'post_author', 'date', 'post_date', 'title', 'post_title', 'name', 'post_name', 'modified',
 		'post_modified', 'modified_gmt', 'post_modified_gmt', 'menu_order', 'parent', 'post_parent',
-		'ID', 'rand', 'comment_count' );
+		'ID', 'rand', 'comment_count');
 
-	foreach ( explode( ',', $r['sort_column'] ) as $orderby ) {
-		$orderby = trim( $orderby );
-		if ( ! in_array( $orderby, $allowed_keys ) ) {
+	foreach (explode(',', $r['sort_column']) as $orderby) {
+		$orderby = trim($orderby);
+		if ( ! in_array($orderby, $allowed_keys)) {
 			continue;
 		}
 
-		switch ( $orderby ) {
+		switch ($orderby) {
 			case 'menu_order':
 				break;
 			case 'ID':
@@ -4668,36 +4668,36 @@ 
 				$orderby = "$wpdb->posts.comment_count";
 				break;
 			default:
-				if ( 0 === strpos( $orderby, 'post_' ) ) {
-					$orderby = "$wpdb->posts." . $orderby;
+				if (0 === strpos($orderby, 'post_')) {
+					$orderby = "$wpdb->posts.".$orderby;
 				} else {
-					$orderby = "$wpdb->posts.post_" . $orderby;
+					$orderby = "$wpdb->posts.post_".$orderby;
 				}
 		}
 
 		$orderby_array[] = $orderby;
 
 	}
-	$sort_column = ! empty( $orderby_array ) ? implode( ',', $orderby_array ) : "$wpdb->posts.post_title";
+	$sort_column = ! empty($orderby_array) ? implode(',', $orderby_array) : "$wpdb->posts.post_title";
 
-	$sort_order = strtoupper( $r['sort_order'] );
-	if ( '' !== $sort_order && ! in_array( $sort_order, array( 'ASC', 'DESC' ) ) ) {
+	$sort_order = strtoupper($r['sort_order']);
+	if ('' !== $sort_order && ! in_array($sort_order, array('ASC', 'DESC'))) {
 		$sort_order = 'ASC';
 	}
 
 	$query = "SELECT * FROM $wpdb->posts $join WHERE ($where_post_type) $where ";
 	$query .= $author_query;
-	$query .= " ORDER BY " . $sort_column . " " . $sort_order ;
+	$query .= " ORDER BY ".$sort_column." ".$sort_order;
 
-	if ( ! empty( $number ) ) {
-		$query .= ' LIMIT ' . $offset . ',' . $number;
+	if ( ! empty($number)) {
+		$query .= ' LIMIT '.$offset.','.$number;
 	}
 
 	$pages = $wpdb->get_results($query);
 
-	if ( empty($pages) ) {
+	if (empty($pages)) {
 		/** This filter is documented in wp-includes/post.php */
-		$pages = apply_filters( 'get_pages', array(), $r );
+		$pages = apply_filters('get_pages', array(), $r);
 		return $pages;
 	}
 
@@ -4708,38 +4708,38 @@ 
 	}
 
 	// Update cache.
-	update_post_cache( $pages );
+	update_post_cache($pages);
 
-	if ( $child_of || $hierarchical ) {
+	if ($child_of || $hierarchical) {
 		$pages = get_page_children($child_of, $pages);
 	}
 
-	if ( ! empty( $r['exclude_tree'] ) ) {
-		$exclude = wp_parse_id_list( $r['exclude_tree'] );
-		foreach ( $exclude as $id ) {
-			$children = get_page_children( $id, $pages );
-			foreach ( $children as $child ) {
+	if ( ! empty($r['exclude_tree'])) {
+		$exclude = wp_parse_id_list($r['exclude_tree']);
+		foreach ($exclude as $id) {
+			$children = get_page_children($id, $pages);
+			foreach ($children as $child) {
 				$exclude[] = $child->ID;
 			}
 		}
 
-		$num_pages = count( $pages );
-		for ( $i = 0; $i < $num_pages; $i++ ) {
-			if ( in_array( $pages[$i]->ID, $exclude ) ) {
-				unset( $pages[$i] );
+		$num_pages = count($pages);
+		for ($i = 0; $i < $num_pages; $i++) {
+			if (in_array($pages[$i]->ID, $exclude)) {
+				unset($pages[$i]);
 			}
 		}
 	}
 
 	$page_structure = array();
-	foreach ( $pages as $page ) {
+	foreach ($pages as $page) {
 		$page_structure[] = $page->ID;
 	}
 
-	wp_cache_set( $cache_key, $page_structure, 'posts' );
+	wp_cache_set($cache_key, $page_structure, 'posts');
 
 	// Convert to WP_Post instances
-	$pages = array_map( 'get_post', $pages );
+	$pages = array_map('get_post', $pages);
 
 	/**
 	 * Filter the retrieved list of pages.
@@ -4749,7 +4749,7 @@ 
 	 * @param array $pages List of pages to retrieve.
 	 * @param array $r     Array of get_pages() arguments.
 	 */
-	return apply_filters( 'get_pages', $pages, $r );
+	return apply_filters('get_pages', $pages, $r);
 }
 
 //
@@ -4769,9 +4769,9 @@ 
 		return false;
 	if (strpos($url, home_url('/?attachment_id=')) !== false)
 		return true;
-	if ( $id = url_to_postid($url) ) {
+	if ($id = url_to_postid($url)) {
 		$post = get_post($id);
-		if ( 'attachment' == $post->post_type )
+		if ('attachment' == $post->post_type)
 			return true;
 	}
 	return false;
@@ -4800,21 +4800,21 @@ 
  * @param int          $parent Optional. Parent post ID.
  * @return int Attachment ID.
  */
-function wp_insert_attachment( $args, $file = false, $parent = 0 ) {
+function wp_insert_attachment($args, $file = false, $parent = 0) {
 	$defaults = array(
 		'file'        => $file,
 		'post_parent' => 0
 	);
 
-	$data = wp_parse_args( $args, $defaults );
+	$data = wp_parse_args($args, $defaults);
 
-	if ( ! empty( $parent ) ) {
+	if ( ! empty($parent)) {
 		$data['post_parent'] = $parent;
 	}
 
 	$data['post_type'] = 'attachment';
 
-	return wp_insert_post( $data );
+	return wp_insert_post($data);
 }
 
 /**
@@ -4836,27 +4836,27 @@ 
  *                           Default false.
  * @return mixed False on failure. Post data on success.
  */
-function wp_delete_attachment( $post_id, $force_delete = false ) {
+function wp_delete_attachment($post_id, $force_delete = false) {
 	global $wpdb;
 
-	if ( !$post = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->posts WHERE ID = %d", $post_id) ) )
+	if ( ! $post = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->posts WHERE ID = %d", $post_id)))
 		return $post;
 
-	if ( 'attachment' != $post->post_type )
+	if ('attachment' != $post->post_type)
 		return false;
 
-	if ( !$force_delete && EMPTY_TRASH_DAYS && MEDIA_TRASH && 'trash' != $post->post_status )
-		return wp_trash_post( $post_id );
+	if ( ! $force_delete && EMPTY_TRASH_DAYS && MEDIA_TRASH && 'trash' != $post->post_status)
+		return wp_trash_post($post_id);
 
 	delete_post_meta($post_id, '_wp_trash_meta_status');
 	delete_post_meta($post_id, '_wp_trash_meta_time');
 
-	$meta = wp_get_attachment_metadata( $post_id );
-	$backup_sizes = get_post_meta( $post->ID, '_wp_attachment_backup_sizes', true );
-	$file = get_attached_file( $post_id );
+	$meta = wp_get_attachment_metadata($post_id);
+	$backup_sizes = get_post_meta($post->ID, '_wp_attachment_backup_sizes', true);
+	$file = get_attached_file($post_id);
 
-	if ( is_multisite() )
-		delete_transient( 'dirsize_cache' );
+	if (is_multisite())
+		delete_transient('dirsize_cache');
 
 	/**
 	 * Fires before an attachment is deleted, at the start of wp_delete_attachment().
@@ -4865,70 +4865,70 @@ 
 	 *
 	 * @param int $post_id Attachment ID.
 	 */
-	do_action( 'delete_attachment', $post_id );
+	do_action('delete_attachment', $post_id);
 
 	wp_delete_object_term_relationships($post_id, array('category', 'post_tag'));
 	wp_delete_object_term_relationships($post_id, get_object_taxonomies($post->post_type));
 
 	// Delete all for any posts.
-	delete_metadata( 'post', null, '_thumbnail_id', $post_id, true );
+	delete_metadata('post', null, '_thumbnail_id', $post_id, true);
 
-	wp_defer_comment_counting( true );
+	wp_defer_comment_counting(true);
 
-	$comment_ids = $wpdb->get_col( $wpdb->prepare( "SELECT comment_ID FROM $wpdb->comments WHERE comment_post_ID = %d", $post_id ));
-	foreach ( $comment_ids as $comment_id ) {
-		wp_delete_comment( $comment_id, true );
+	$comment_ids = $wpdb->get_col($wpdb->prepare("SELECT comment_ID FROM $wpdb->comments WHERE comment_post_ID = %d", $post_id));
+	foreach ($comment_ids as $comment_id) {
+		wp_delete_comment($comment_id, true);
 	}
 
-	wp_defer_comment_counting( false );
+	wp_defer_comment_counting(false);
 
-	$post_meta_ids = $wpdb->get_col( $wpdb->prepare( "SELECT meta_id FROM $wpdb->postmeta WHERE post_id = %d ", $post_id ));
-	foreach ( $post_meta_ids as $mid )
-		delete_metadata_by_mid( 'post', $mid );
+	$post_meta_ids = $wpdb->get_col($wpdb->prepare("SELECT meta_id FROM $wpdb->postmeta WHERE post_id = %d ", $post_id));
+	foreach ($post_meta_ids as $mid)
+		delete_metadata_by_mid('post', $mid);
 
 	/** This action is documented in wp-includes/post.php */
-	do_action( 'delete_post', $post_id );
-	$result = $wpdb->delete( $wpdb->posts, array( 'ID' => $post_id ) );
-	if ( ! $result ) {
+	do_action('delete_post', $post_id);
+	$result = $wpdb->delete($wpdb->posts, array('ID' => $post_id));
+	if ( ! $result) {
 		return false;
 	}
 	/** This action is documented in wp-includes/post.php */
-	do_action( 'deleted_post', $post_id );
+	do_action('deleted_post', $post_id);
 
 	$uploadpath = wp_get_upload_dir();
 
-	if ( ! empty($meta['thumb']) ) {
+	if ( ! empty($meta['thumb'])) {
 		// Don't delete the thumb if another attachment uses it.
-		if (! $wpdb->get_row( $wpdb->prepare( "SELECT meta_id FROM $wpdb->postmeta WHERE meta_key = '_wp_attachment_metadata' AND meta_value LIKE %s AND post_id <> %d", '%' . $wpdb->esc_like( $meta['thumb'] ) . '%', $post_id)) ) {
+		if ( ! $wpdb->get_row($wpdb->prepare("SELECT meta_id FROM $wpdb->postmeta WHERE meta_key = '_wp_attachment_metadata' AND meta_value LIKE %s AND post_id <> %d", '%'.$wpdb->esc_like($meta['thumb']).'%', $post_id))) {
 			$thumbfile = str_replace(basename($file), $meta['thumb'], $file);
 			/** This filter is documented in wp-includes/functions.php */
-			$thumbfile = apply_filters( 'wp_delete_file', $thumbfile );
-			@ unlink( path_join($uploadpath['basedir'], $thumbfile) );
+			$thumbfile = apply_filters('wp_delete_file', $thumbfile);
+			@ unlink(path_join($uploadpath['basedir'], $thumbfile));
 		}
 	}
 
 	// Remove intermediate and backup images if there are any.
-	if ( isset( $meta['sizes'] ) && is_array( $meta['sizes'] ) ) {
-		foreach ( $meta['sizes'] as $size => $sizeinfo ) {
-			$intermediate_file = str_replace( basename( $file ), $sizeinfo['file'], $file );
+	if (isset($meta['sizes']) && is_array($meta['sizes'])) {
+		foreach ($meta['sizes'] as $size => $sizeinfo) {
+			$intermediate_file = str_replace(basename($file), $sizeinfo['file'], $file);
 			/** This filter is documented in wp-includes/functions.php */
-			$intermediate_file = apply_filters( 'wp_delete_file', $intermediate_file );
-			@ unlink( path_join( $uploadpath['basedir'], $intermediate_file ) );
+			$intermediate_file = apply_filters('wp_delete_file', $intermediate_file);
+			@ unlink(path_join($uploadpath['basedir'], $intermediate_file));
 		}
 	}
 
-	if ( is_array($backup_sizes) ) {
-		foreach ( $backup_sizes as $size ) {
-			$del_file = path_join( dirname($meta['file']), $size['file'] );
+	if (is_array($backup_sizes)) {
+		foreach ($backup_sizes as $size) {
+			$del_file = path_join(dirname($meta['file']), $size['file']);
 			/** This filter is documented in wp-includes/functions.php */
-			$del_file = apply_filters( 'wp_delete_file', $del_file );
-			@ unlink( path_join($uploadpath['basedir'], $del_file) );
+			$del_file = apply_filters('wp_delete_file', $del_file);
+			@ unlink(path_join($uploadpath['basedir'], $del_file));
 		}
 	}
 
-	wp_delete_file( $file );
+	wp_delete_file($file);
 
-	clean_post_cache( $post );
+	clean_post_cache($post);
 
 	return $post;
 }
@@ -4942,14 +4942,14 @@ 
  * @param bool $unfiltered Optional. If true, filters are not run. Default false.
  * @return mixed Attachment meta field. False on failure.
  */
-function wp_get_attachment_metadata( $post_id = 0, $unfiltered = false ) {
+function wp_get_attachment_metadata($post_id = 0, $unfiltered = false) {
 	$post_id = (int) $post_id;
-	if ( !$post = get_post( $post_id ) )
+	if ( ! $post = get_post($post_id))
 		return false;
 
-	$data = get_post_meta( $post->ID, '_wp_attachment_metadata', true );
+	$data = get_post_meta($post->ID, '_wp_attachment_metadata', true);
 
-	if ( $unfiltered )
+	if ($unfiltered)
 		return $data;
 
 	/**
@@ -4961,7 +4961,7 @@ 
 	 *                            if the object does not exist.
 	 * @param int        $post_id Attachment ID.
 	 */
-	return apply_filters( 'wp_get_attachment_metadata', $data, $post->ID );
+	return apply_filters('wp_get_attachment_metadata', $data, $post->ID);
 }
 
 /**
@@ -4973,9 +4973,9 @@ 
  * @param array $data    Attachment data.
  * @return int|bool False if $post is invalid.
  */
-function wp_update_attachment_metadata( $post_id, $data ) {
+function wp_update_attachment_metadata($post_id, $data) {
 	$post_id = (int) $post_id;
-	if ( !$post = get_post( $post_id ) )
+	if ( ! $post = get_post($post_id))
 		return false;
 
 	/**
@@ -4986,10 +4986,10 @@ 
 	 * @param array $data    Array of updated attachment meta data.
 	 * @param int   $post_id Attachment ID.
 	 */
-	if ( $data = apply_filters( 'wp_update_attachment_metadata', $data, $post->ID ) )
-		return update_post_meta( $post->ID, '_wp_attachment_metadata', $data );
+	if ($data = apply_filters('wp_update_attachment_metadata', $data, $post->ID))
+		return update_post_meta($post->ID, '_wp_attachment_metadata', $data);
 	else
-		return delete_post_meta( $post->ID, '_wp_attachment_metadata' );
+		return delete_post_meta($post->ID, '_wp_attachment_metadata');
 }
 
 /**
@@ -5002,29 +5002,29 @@ 
  * @param int $post_id Optional. Attachment ID. Default 0.
  * @return string|false Attachment URL, otherwise false.
  */
-function wp_get_attachment_url( $post_id = 0 ) {
+function wp_get_attachment_url($post_id = 0) {
 	$post_id = (int) $post_id;
-	if ( !$post = get_post( $post_id ) )
+	if ( ! $post = get_post($post_id))
 		return false;
 
-	if ( 'attachment' != $post->post_type )
+	if ('attachment' != $post->post_type)
 		return false;
 
 	$url = '';
 	// Get attached file.
-	if ( $file = get_post_meta( $post->ID, '_wp_attached_file', true ) ) {
+	if ($file = get_post_meta($post->ID, '_wp_attached_file', true)) {
 		// Get upload directory.
-		if ( ( $uploads = wp_get_upload_dir() ) && false === $uploads['error'] ) {
+		if (($uploads = wp_get_upload_dir()) && false === $uploads['error']) {
 			// Check that the upload base exists in the file location.
-			if ( 0 === strpos( $file, $uploads['basedir'] ) ) {
+			if (0 === strpos($file, $uploads['basedir'])) {
 				// Replace file location with url location.
 				$url = str_replace($uploads['basedir'], $uploads['baseurl'], $file);
-			} elseif ( false !== strpos($file, 'wp-content/uploads') ) {
+			} elseif (false !== strpos($file, 'wp-content/uploads')) {
 				// Get the directory name relative to the basedir (back compat for pre-2.7 uploads)
-				$url = trailingslashit( $uploads['baseurl'] . '/' . _wp_get_attachment_relative_path( $file ) ) . basename( $file );
+				$url = trailingslashit($uploads['baseurl'].'/'._wp_get_attachment_relative_path($file)).basename($file);
 			} else {
 				// It's a newly-uploaded file, therefore $file is relative to the basedir.
-				$url = $uploads['baseurl'] . "/$file";
+				$url = $uploads['baseurl']."/$file";
 			}
 		}
 	}
@@ -5033,13 +5033,13 @@ 
 	 * If any of the above options failed, Fallback on the GUID as used pre-2.7,
 	 * not recommended to rely upon this.
 	 */
-	if ( empty($url) ) {
-		$url = get_the_guid( $post->ID );
+	if (empty($url)) {
+		$url = get_the_guid($post->ID);
 	}
 
 	// On SSL front end, URLs should be HTTPS.
-	if ( is_ssl() && ! is_admin() && 'wp-login.php' !== $GLOBALS['pagenow'] ) {
-		$url = set_url_scheme( $url );
+	if (is_ssl() && ! is_admin() && 'wp-login.php' !== $GLOBALS['pagenow']) {
+		$url = set_url_scheme($url);
 	}
 
 	/**
@@ -5050,9 +5050,9 @@ 
 	 * @param string $url     URL for the given attachment.
 	 * @param int    $post_id Attachment ID.
 	 */
-	$url = apply_filters( 'wp_get_attachment_url', $url, $post->ID );
+	$url = apply_filters('wp_get_attachment_url', $url, $post->ID);
 
-	if ( empty( $url ) )
+	if (empty($url))
 		return false;
 
 	return $url;
@@ -5066,16 +5066,16 @@ 
  * @param int $post_id Optional. Attachment ID. Default 0.
  * @return string|false False on failure. Thumbnail file path on success.
  */
-function wp_get_attachment_thumb_file( $post_id = 0 ) {
+function wp_get_attachment_thumb_file($post_id = 0) {
 	$post_id = (int) $post_id;
-	if ( !$post = get_post( $post_id ) )
+	if ( ! $post = get_post($post_id))
 		return false;
-	if ( !is_array( $imagedata = wp_get_attachment_metadata( $post->ID ) ) )
+	if ( ! is_array($imagedata = wp_get_attachment_metadata($post->ID)))
 		return false;
 
-	$file = get_attached_file( $post->ID );
+	$file = get_attached_file($post->ID);
 
-	if ( !empty($imagedata['thumb']) && ($thumbfile = str_replace(basename($file), $imagedata['thumb'], $file)) && file_exists($thumbfile) ) {
+	if ( ! empty($imagedata['thumb']) && ($thumbfile = str_replace(basename($file), $imagedata['thumb'], $file)) && file_exists($thumbfile)) {
 		/**
 		 * Filter the attachment thumbnail file path.
 		 *
@@ -5084,7 +5084,7 @@ 
 		 * @param string $thumbfile File path to the attachment thumbnail.
 		 * @param int    $post_id   Attachment ID.
 		 */
-		return apply_filters( 'wp_get_attachment_thumb_file', $thumbfile, $post->ID );
+		return apply_filters('wp_get_attachment_thumb_file', $thumbfile, $post->ID);
 	}
 	return false;
 }
@@ -5097,18 +5097,18 @@ 
  * @param int $post_id Optional. Attachment ID. Default 0.
  * @return string|false False on failure. Thumbnail URL on success.
  */
-function wp_get_attachment_thumb_url( $post_id = 0 ) {
+function wp_get_attachment_thumb_url($post_id = 0) {
 	$post_id = (int) $post_id;
-	if ( !$post = get_post( $post_id ) )
+	if ( ! $post = get_post($post_id))
 		return false;
-	if ( !$url = wp_get_attachment_url( $post->ID ) )
+	if ( ! $url = wp_get_attachment_url($post->ID))
 		return false;
 
-	$sized = image_downsize( $post_id, 'thumbnail' );
-	if ( $sized )
+	$sized = image_downsize($post_id, 'thumbnail');
+	if ($sized)
 		return $sized[0];
 
-	if ( !$thumb = wp_get_attachment_thumb_file( $post->ID ) )
+	if ( ! $thumb = wp_get_attachment_thumb_file($post->ID))
 		return false;
 
 	$url = str_replace(basename($url), basename($thumb), $url);
@@ -5121,7 +5121,7 @@ 
 	 * @param string $url     URL for the attachment thumbnail.
 	 * @param int    $post_id Attachment ID.
 	 */
-	return apply_filters( 'wp_get_attachment_thumb_url', $url, $post->ID );
+	return apply_filters('wp_get_attachment_thumb_url', $url, $post->ID);
 }
 
 /**
@@ -5133,40 +5133,40 @@ 
  * @param int|WP_Post $post_id Optional. Attachment ID. Default 0.
  * @return bool True if one of the accepted types, false otherwise.
  */
-function wp_attachment_is( $type, $post_id = 0 ) {
-	if ( ! $post = get_post( $post_id ) ) {
+function wp_attachment_is($type, $post_id = 0) {
+	if ( ! $post = get_post($post_id)) {
 		return false;
 	}
 
-	if ( ! $file = get_attached_file( $post->ID ) ) {
+	if ( ! $file = get_attached_file($post->ID)) {
 		return false;
 	}
 
-	if ( 0 === strpos( $post->post_mime_type, $type . '/' ) ) {
+	if (0 === strpos($post->post_mime_type, $type.'/')) {
 		return true;
 	}
 
-	$check = wp_check_filetype( $file );
-	if ( empty( $check['ext'] ) ) {
+	$check = wp_check_filetype($file);
+	if (empty($check['ext'])) {
 		return false;
 	}
 
 	$ext = $check['ext'];
 
-	if ( 'import' !== $post->post_mime_type ) {
+	if ('import' !== $post->post_mime_type) {
 		return $type === $ext;
 	}
 
-	switch ( $type ) {
+	switch ($type) {
 	case 'image':
-		$image_exts = array( 'jpg', 'jpeg', 'jpe', 'gif', 'png' );
-		return in_array( $ext, $image_exts );
+		$image_exts = array('jpg', 'jpeg', 'jpe', 'gif', 'png');
+		return in_array($ext, $image_exts);
 
 	case 'audio':
-		return in_array( $ext, wp_get_audio_extensions() );
+		return in_array($ext, wp_get_audio_extensions());
 
 	case 'video':
-		return in_array( $ext, wp_get_video_extensions() );
+		return in_array($ext, wp_get_video_extensions());
 
 	default:
 		return $type === $ext;
@@ -5183,8 +5183,8 @@ 
  * @param int|WP_Post $post Optional. Attachment ID. Default 0.
  * @return bool Whether the attachment is an image.
  */
-function wp_attachment_is_image( $post = 0 ) {
-	return wp_attachment_is( 'image', $post );
+function wp_attachment_is_image($post = 0) {
+	return wp_attachment_is('image', $post);
 }
 
 /**
@@ -5195,22 +5195,22 @@ 
  * @param string|int $mime MIME type or attachment ID.
  * @return string|false Icon, false otherwise.
  */
-function wp_mime_type_icon( $mime = 0 ) {
-	if ( !is_numeric($mime) )
+function wp_mime_type_icon($mime = 0) {
+	if ( ! is_numeric($mime))
 		$icon = wp_cache_get("mime_type_icon_$mime");
 
 	$post_id = 0;
-	if ( empty($icon) ) {
+	if (empty($icon)) {
 		$post_mimes = array();
-		if ( is_numeric($mime) ) {
+		if (is_numeric($mime)) {
 			$mime = (int) $mime;
-			if ( $post = get_post( $mime ) ) {
+			if ($post = get_post($mime)) {
 				$post_id = (int) $post->ID;
-				$file = get_attached_file( $post_id );
+				$file = get_attached_file($post_id);
 				$ext = preg_replace('/^.+?\.([^.]+)$/', '$1', $file);
-				if ( !empty($ext) ) {
+				if ( ! empty($ext)) {
 					$post_mimes[] = $ext;
-					if ( $ext_type = wp_ext2type( $ext ) )
+					if ($ext_type = wp_ext2type($ext))
 						$post_mimes[] = $ext_type;
 				}
 				$mime = $post->post_mime_type;
@@ -5223,7 +5223,7 @@ 
 
 		$icon_files = wp_cache_get('icon_files');
 
-		if ( !is_array($icon_files) ) {
+		if ( ! is_array($icon_files)) {
 			/**
 			 * Filter the icon directory path.
 			 *
@@ -5231,7 +5231,7 @@ 
 			 *
 			 * @param string $path Icon directory absolute path.
 			 */
-			$icon_dir = apply_filters( 'icon_dir', ABSPATH . WPINC . '/images/media' );
+			$icon_dir = apply_filters('icon_dir', ABSPATH.WPINC.'/images/media');
 
 			/**
 			 * Filter the icon directory URI.
@@ -5240,7 +5240,7 @@ 
 			 *
 			 * @param string $uri Icon directory URI.
 			 */
-			$icon_dir_uri = apply_filters( 'icon_dir_uri', includes_url( 'images/media' ) );
+			$icon_dir_uri = apply_filters('icon_dir_uri', includes_url('images/media'));
 
 			/**
 			 * Filter the list of icon directory URIs.
@@ -5249,19 +5249,19 @@ 
 			 *
 			 * @param array $uris List of icon directory URIs.
 			 */
-			$dirs = apply_filters( 'icon_dirs', array( $icon_dir => $icon_dir_uri ) );
+			$dirs = apply_filters('icon_dirs', array($icon_dir => $icon_dir_uri));
 			$icon_files = array();
-			while ( $dirs ) {
-				$keys = array_keys( $dirs );
-				$dir = array_shift( $keys );
+			while ($dirs) {
+				$keys = array_keys($dirs);
+				$dir = array_shift($keys);
 				$uri = array_shift($dirs);
-				if ( $dh = opendir($dir) ) {
-					while ( false !== $file = readdir($dh) ) {
+				if ($dh = opendir($dir)) {
+					while (false !== $file = readdir($dh)) {
 						$file = basename($file);
-						if ( substr($file, 0, 1) == '.' )
+						if (substr($file, 0, 1) == '.')
 							continue;
-						if ( !in_array(strtolower(substr($file, -4)), array('.png', '.gif', '.jpg') ) ) {
-							if ( is_dir("$dir/$file") )
+						if ( ! in_array(strtolower(substr($file, -4)), array('.png', '.gif', '.jpg'))) {
+							if (is_dir("$dir/$file"))
 								$dirs["$dir/$file"] = "$uri/$file";
 							continue;
 						}
@@ -5270,15 +5270,15 @@ 
 					closedir($dh);
 				}
 			}
-			wp_cache_add( 'icon_files', $icon_files, 'default', 600 );
+			wp_cache_add('icon_files', $icon_files, 'default', 600);
 		}
 
 		$types = array();
 		// Icon basename - extension = MIME wildcard.
-		foreach ( $icon_files as $file => $uri )
-			$types[ preg_replace('/^([^.]*).*$/', '$1', basename($file)) ] =& $icon_files[$file];
+		foreach ($icon_files as $file => $uri)
+			$types[preg_replace('/^([^.]*).*$/', '$1', basename($file))] = & $icon_files[$file];
 
-		if ( ! empty($mime) ) {
+		if ( ! empty($mime)) {
 			$post_mimes[] = substr($mime, 0, strpos($mime, '/'));
 			$post_mimes[] = substr($mime, strpos($mime, '/') + 1);
 			$post_mimes[] = str_replace('/', '_', $mime);
@@ -5287,15 +5287,15 @@ 
 		$matches = wp_match_mime_types(array_keys($types), $post_mimes);
 		$matches['default'] = array('default');
 
-		foreach ( $matches as $match => $wilds ) {
-			foreach ( $wilds as $wild ) {
-				if ( ! isset( $types[ $wild ] ) ) {
+		foreach ($matches as $match => $wilds) {
+			foreach ($wilds as $wild) {
+				if ( ! isset($types[$wild])) {
 					continue;
 				}
 
-				$icon = $types[ $wild ];
-				if ( ! is_numeric( $mime ) ) {
-					wp_cache_add( "mime_type_icon_$mime", $icon );
+				$icon = $types[$wild];
+				if ( ! is_numeric($mime)) {
+					wp_cache_add("mime_type_icon_$mime", $icon);
 				}
 				break 2;
 			}
@@ -5312,7 +5312,7 @@ 
 	 * @param int    $post_id Attachment ID. Will equal 0 if the function passed
 	 *                        the mime type.
 	 */
-	return apply_filters( 'wp_mime_type_icon', $icon, $mime, $post_id );
+	return apply_filters('wp_mime_type_icon', $icon, $mime, $post_id);
 }
 
 /**
@@ -5334,27 +5334,27 @@ 
  * @param WP_Post $post        The Post Object
  * @param WP_Post $post_before The Previous Post Object
  */
-function wp_check_for_changed_slugs( $post_id, $post, $post_before ) {
+function wp_check_for_changed_slugs($post_id, $post, $post_before) {
 	// Don't bother if it hasn't changed.
-	if ( $post->post_name == $post_before->post_name ) {
+	if ($post->post_name == $post_before->post_name) {
 		return;
 	}
 
 	// We're only concerned with published, non-hierarchical objects.
-	if ( ! ( 'publish' === $post->post_status || ( 'attachment' === get_post_type( $post ) && 'inherit' === $post->post_status ) ) || is_post_type_hierarchical( $post->post_type ) ) {
+	if ( ! ('publish' === $post->post_status || ('attachment' === get_post_type($post) && 'inherit' === $post->post_status)) || is_post_type_hierarchical($post->post_type)) {
 		return;
 	}
 
-	$old_slugs = (array) get_post_meta( $post_id, '_wp_old_slug' );
+	$old_slugs = (array) get_post_meta($post_id, '_wp_old_slug');
 
 	// If we haven't added this old slug before, add it now.
-	if ( ! empty( $post_before->post_name ) && ! in_array( $post_before->post_name, $old_slugs ) ) {
-		add_post_meta( $post_id, '_wp_old_slug', $post_before->post_name );
+	if ( ! empty($post_before->post_name) && ! in_array($post_before->post_name, $old_slugs)) {
+		add_post_meta($post_id, '_wp_old_slug', $post_before->post_name);
 	}
 
 	// If the new slug was used previously, delete it from the list.
-	if ( in_array( $post->post_name, $old_slugs ) ) {
-		delete_post_meta( $post_id, '_wp_old_slug', $post->post_name );
+	if (in_array($post->post_name, $old_slugs)) {
+		delete_post_meta($post_id, '_wp_old_slug', $post->post_name);
 	}
 }
 
@@ -5372,8 +5372,8 @@ 
  * @param string|array $post_type Single post type or an array of post types. Currently only supports 'post' or 'page'.
  * @return string SQL code that can be added to a where clause.
  */
-function get_private_posts_cap_sql( $post_type ) {
-	return get_posts_by_author_sql( $post_type, false );
+function get_private_posts_cap_sql($post_type) {
+	return get_posts_by_author_sql($post_type, false);
 }
 
 /**
@@ -5393,19 +5393,19 @@ 
  *                                    $current_user.  Default false.
  * @return string SQL WHERE code that can be added to a query.
  */
-function get_posts_by_author_sql( $post_type, $full = true, $post_author = null, $public_only = false ) {
+function get_posts_by_author_sql($post_type, $full = true, $post_author = null, $public_only = false) {
 	global $wpdb;
 
-	if ( is_array( $post_type ) ) {
+	if (is_array($post_type)) {
 		$post_types = $post_type;
 	} else {
-		$post_types = array( $post_type );
+		$post_types = array($post_type);
 	}
 
 	$post_type_clauses = array();
-	foreach ( $post_types as $post_type ) {
-		$post_type_obj = get_post_type_object( $post_type );
-		if ( ! $post_type_obj ) {
+	foreach ($post_types as $post_type) {
+		$post_type_obj = get_post_type_object($post_type);
+		if ( ! $post_type_obj) {
 			continue;
 		}
 
@@ -5418,42 +5418,42 @@ 
 		 *
 		 * @param string $cap Capability.
 		 */
-		if ( ! $cap = apply_filters( 'pub_priv_sql_capability', '' ) ) {
-			$cap = current_user_can( $post_type_obj->cap->read_private_posts );
+		if ( ! $cap = apply_filters('pub_priv_sql_capability', '')) {
+			$cap = current_user_can($post_type_obj->cap->read_private_posts);
 		}
 
 		// Only need to check the cap if $public_only is false.
 		$post_status_sql = "post_status = 'publish'";
-		if ( false === $public_only ) {
-			if ( $cap ) {
+		if (false === $public_only) {
+			if ($cap) {
 				// Does the user have the capability to view private posts? Guess so.
 				$post_status_sql .= " OR post_status = 'private'";
-			} elseif ( is_user_logged_in() ) {
+			} elseif (is_user_logged_in()) {
 				// Users can view their own private posts.
 				$id = get_current_user_id();
-				if ( null === $post_author || ! $full ) {
+				if (null === $post_author || ! $full) {
 					$post_status_sql .= " OR post_status = 'private' AND post_author = $id";
-				} elseif ( $id == (int) $post_author ) {
+				} elseif ($id == (int) $post_author) {
 					$post_status_sql .= " OR post_status = 'private'";
 				} // else none
 			} // else none
 		}
 
-		$post_type_clauses[] = "( post_type = '" . $post_type . "' AND ( $post_status_sql ) )";
+		$post_type_clauses[] = "( post_type = '".$post_type."' AND ( $post_status_sql ) )";
 	}
 
-	if ( empty( $post_type_clauses ) ) {
+	if (empty($post_type_clauses)) {
 		return $full ? 'WHERE 1 = 0' : '1 = 0';
 	}
 
-	$sql = '( '. implode( ' OR ', $post_type_clauses ) . ' )';
+	$sql = '( '.implode(' OR ', $post_type_clauses).' )';
 
-	if ( null !== $post_author ) {
-		$sql .= $wpdb->prepare( ' AND post_author = %d', $post_author );
+	if (null !== $post_author) {
+		$sql .= $wpdb->prepare(' AND post_author = %d', $post_author);
 	}
 
-	if ( $full ) {
-		$sql = 'WHERE ' . $sql;
+	if ($full) {
+		$sql = 'WHERE '.$sql;
 	}
 
 	return $sql;
@@ -5477,7 +5477,7 @@ 
  * @param string $post_type Optional. The post type to check. Default 'any'.
  * @return string The date of the last post.
  */
-function get_lastpostdate( $timezone = 'server', $post_type = 'any' ) {
+function get_lastpostdate($timezone = 'server', $post_type = 'any') {
 	/**
 	 * Filter the date the last post was published.
 	 *
@@ -5487,7 +5487,7 @@ 
 	 * @param string $timezone Location to use for getting the post published date.
 	 *                         See {@see get_lastpostdate()} for accepted `$timezone` values.
 	 */
-	return apply_filters( 'get_lastpostdate', _get_last_post_time( $timezone, 'date', $post_type ), $timezone );
+	return apply_filters('get_lastpostdate', _get_last_post_time($timezone, 'date', $post_type), $timezone);
 }
 
 /**
@@ -5506,7 +5506,7 @@ 
  * @param string $post_type Optional. The post type to check. Default 'any'.
  * @return string The timestamp.
  */
-function get_lastpostmodified( $timezone = 'server', $post_type = 'any' ) {
+function get_lastpostmodified($timezone = 'server', $post_type = 'any') {
 	/**
 	 * Pre-filter the return value of get_lastpostmodified() before the query is run.
 	 *
@@ -5518,15 +5518,15 @@ 
 	 *                                 See {@see get_lastpostdate()} for accepted `$timezone` values.
 	 * @param string $post_type        The post type to check.
 	 */
-	$lastpostmodified = apply_filters( 'pre_get_lastpostmodified', false, $timezone, $post_type );
-	if ( false !== $lastpostmodified ) {
+	$lastpostmodified = apply_filters('pre_get_lastpostmodified', false, $timezone, $post_type);
+	if (false !== $lastpostmodified) {
 		return $lastpostmodified;
 	}
 
-	$lastpostmodified = _get_last_post_time( $timezone, 'modified', $post_type );
+	$lastpostmodified = _get_last_post_time($timezone, 'modified', $post_type);
 
 	$lastpostdate = get_lastpostdate($timezone);
-	if ( $lastpostdate > $lastpostmodified ) {
+	if ($lastpostdate > $lastpostmodified) {
 		$lastpostmodified = $lastpostdate;
 	}
 
@@ -5539,7 +5539,7 @@ 
 	 * @param string $timezone         Location to use for getting the post modified date.
 	 *                                 See {@see get_lastpostdate()} for accepted `$timezone` values.
 	 */
-	return apply_filters( 'get_lastpostmodified', $lastpostmodified, $timezone );
+	return apply_filters('get_lastpostmodified', $lastpostmodified, $timezone);
 }
 
 /**
@@ -5557,32 +5557,32 @@ 
  * @param string $post_type Optional. The post type to check. Default 'any'.
  * @return string|false The timestamp.
  */
-function _get_last_post_time( $timezone, $field, $post_type = 'any' ) {
+function _get_last_post_time($timezone, $field, $post_type = 'any') {
 	global $wpdb;
 
-	if ( ! in_array( $field, array( 'date', 'modified' ) ) ) {
+	if ( ! in_array($field, array('date', 'modified'))) {
 		return false;
 	}
 
-	$timezone = strtolower( $timezone );
+	$timezone = strtolower($timezone);
 
 	$key = "lastpost{$field}:$timezone";
-	if ( 'any' !== $post_type ) {
-		$key .= ':' . sanitize_key( $post_type );
+	if ('any' !== $post_type) {
+		$key .= ':'.sanitize_key($post_type);
 	}
 
-	$date = wp_cache_get( $key, 'timeinfo' );
+	$date = wp_cache_get($key, 'timeinfo');
 
-	if ( ! $date ) {
-		if ( 'any' === $post_type ) {
-			$post_types = get_post_types( array( 'public' => true ) );
-			array_walk( $post_types, array( $wpdb, 'escape_by_ref' ) );
-			$post_types = "'" . implode( "', '", $post_types ) . "'";
+	if ( ! $date) {
+		if ('any' === $post_type) {
+			$post_types = get_post_types(array('public' => true));
+			array_walk($post_types, array($wpdb, 'escape_by_ref'));
+			$post_types = "'".implode("', '", $post_types)."'";
 		} else {
-			$post_types = "'" . sanitize_key( $post_type ) . "'";
+			$post_types = "'".sanitize_key($post_type)."'";
 		}
 
-		switch ( $timezone ) {
+		switch ($timezone) {
 			case 'gmt':
 				$date = $wpdb->get_var("SELECT post_{$field}_gmt FROM $wpdb->posts WHERE post_status = 'publish' AND post_type IN ({$post_types}) ORDER BY post_{$field}_gmt DESC LIMIT 1");
 				break;
@@ -5590,13 +5590,13 @@ 
 				$date = $wpdb->get_var("SELECT post_{$field} FROM $wpdb->posts WHERE post_status = 'publish' AND post_type IN ({$post_types}) ORDER BY post_{$field}_gmt DESC LIMIT 1");
 				break;
 			case 'server':
-				$add_seconds_server = date( 'Z' );
+				$add_seconds_server = date('Z');
 				$date = $wpdb->get_var("SELECT DATE_ADD(post_{$field}_gmt, INTERVAL '$add_seconds_server' SECOND) FROM $wpdb->posts WHERE post_status = 'publish' AND post_type IN ({$post_types}) ORDER BY post_{$field}_gmt DESC LIMIT 1");
 				break;
 		}
 
-		if ( $date ) {
-			wp_cache_set( $key, $date, 'timeinfo' );
+		if ($date) {
+			wp_cache_set($key, $date, 'timeinfo');
 		}
 	}
 
@@ -5610,12 +5610,12 @@ 
  *
  * @param array $posts Array of post objects, passed by reference.
  */
-function update_post_cache( &$posts ) {
-	if ( ! $posts )
+function update_post_cache(&$posts) {
+	if ( ! $posts)
 		return;
 
-	foreach ( $posts as $post )
-		wp_cache_add( $post->ID, $post, 'posts' );
+	foreach ($posts as $post)
+		wp_cache_add($post->ID, $post, 'posts');
 }
 
 /**
@@ -5633,22 +5633,22 @@ 
  *
  * @param int|WP_Post $post Post ID or post object to remove from the cache.
  */
-function clean_post_cache( $post ) {
+function clean_post_cache($post) {
 	global $_wp_suspend_cache_invalidation;
 
-	if ( ! empty( $_wp_suspend_cache_invalidation ) )
+	if ( ! empty($_wp_suspend_cache_invalidation))
 		return;
 
-	$post = get_post( $post );
-	if ( empty( $post ) )
+	$post = get_post($post);
+	if (empty($post))
 		return;
 
-	wp_cache_delete( $post->ID, 'posts' );
-	wp_cache_delete( $post->ID, 'post_meta' );
+	wp_cache_delete($post->ID, 'posts');
+	wp_cache_delete($post->ID, 'post_meta');
 
-	clean_object_term_cache( $post->ID, $post->post_type );
+	clean_object_term_cache($post->ID, $post->post_type);
 
-	wp_cache_delete( 'wp_get_archives', 'general' );
+	wp_cache_delete('wp_get_archives', 'general');
 
 	/**
 	 * Fires immediately after the given post's cache is cleaned.
@@ -5658,10 +5658,10 @@ 
 	 * @param int     $post_id Post ID.
 	 * @param WP_Post $post    Post object.
 	 */
-	do_action( 'clean_post_cache', $post->ID, $post );
+	do_action('clean_post_cache', $post->ID, $post);
 
-	if ( 'page' == $post->post_type ) {
-		wp_cache_delete( 'all_page_ids', 'posts' );
+	if ('page' == $post->post_type) {
+		wp_cache_delete('all_page_ids', 'posts');
 
 		/**
 		 * Fires immediately after the given page's cache is cleaned.
@@ -5670,10 +5670,10 @@ 
 		 *
 		 * @param int $post_id Post ID.
 		 */
-		do_action( 'clean_page_cache', $post->ID );
+		do_action('clean_page_cache', $post->ID);
 	}
 
-	wp_cache_set( 'last_changed', microtime(), 'posts' );
+	wp_cache_set('last_changed', microtime(), 'posts');
 }
 
 /**
@@ -5686,27 +5686,27 @@ 
  * @param bool   $update_term_cache Optional. Whether to update the term cache. Default true.
  * @param bool   $update_meta_cache Optional. Whether to update the meta cache. Default true.
  */
-function update_post_caches( &$posts, $post_type = 'post', $update_term_cache = true, $update_meta_cache = true ) {
+function update_post_caches(&$posts, $post_type = 'post', $update_term_cache = true, $update_meta_cache = true) {
 	// No point in doing all this work if we didn't match any posts.
-	if ( !$posts )
+	if ( ! $posts)
 		return;
 
 	update_post_cache($posts);
 
 	$post_ids = array();
-	foreach ( $posts as $post )
+	foreach ($posts as $post)
 		$post_ids[] = $post->ID;
 
-	if ( ! $post_type )
+	if ( ! $post_type)
 		$post_type = 'any';
 
-	if ( $update_term_cache ) {
-		if ( is_array($post_type) ) {
+	if ($update_term_cache) {
+		if (is_array($post_type)) {
 			$ptypes = $post_type;
-		} elseif ( 'any' == $post_type ) {
+		} elseif ('any' == $post_type) {
 			$ptypes = array();
 			// Just use the post_types in the supplied posts.
-			foreach ( $posts as $post ) {
+			foreach ($posts as $post) {
 				$ptypes[] = $post->post_type;
 			}
 			$ptypes = array_unique($ptypes);
@@ -5714,11 +5714,11 @@ 
 			$ptypes = array($post_type);
 		}
 
-		if ( ! empty($ptypes) )
+		if ( ! empty($ptypes))
 			update_object_term_cache($post_ids, $ptypes);
 	}
 
-	if ( $update_meta_cache )
+	if ($update_meta_cache)
 		update_postmeta_cache($post_ids);
 }
 
@@ -5735,7 +5735,7 @@ 
  * @return array|false Returns false if there is nothing to update or an array
  *                     of metadata.
  */
-function update_postmeta_cache( $post_ids ) {
+function update_postmeta_cache($post_ids) {
 	return update_meta_cache('post', $post_ids);
 }
 
@@ -5754,10 +5754,10 @@ 
  * @param int  $id          The attachment ID in the cache to clean.
  * @param bool $clean_terms Optional. Whether to clean terms cache. Default false.
  */
-function clean_attachment_cache( $id, $clean_terms = false ) {
+function clean_attachment_cache($id, $clean_terms = false) {
 	global $_wp_suspend_cache_invalidation;
 
-	if ( !empty($_wp_suspend_cache_invalidation) )
+	if ( ! empty($_wp_suspend_cache_invalidation))
 		return;
 
 	$id = (int) $id;
@@ -5765,7 +5765,7 @@ 
 	wp_cache_delete($id, 'posts');
 	wp_cache_delete($id, 'post_meta');
 
-	if ( $clean_terms )
+	if ($clean_terms)
 		clean_object_term_cache($id, 'attachment');
 
 	/**
@@ -5775,7 +5775,7 @@ 
 	 *
 	 * @param int $id Attachment ID.
 	 */
-	do_action( 'clean_attachment_cache', $id );
+	do_action('clean_attachment_cache', $id);
 }
 
 //
@@ -5795,13 +5795,13 @@ 
  * @param string  $old_status Previous post status.
  * @param WP_Post $post       Post object.
  */
-function _transition_post_status( $new_status, $old_status, $post ) {
+function _transition_post_status($new_status, $old_status, $post) {
 	global $wpdb;
 
-	if ( $old_status != 'publish' && $new_status == 'publish' ) {
+	if ($old_status != 'publish' && $new_status == 'publish') {
 		// Reset GUID if transitioning to publish and it is empty.
-		if ( '' == get_the_guid($post->ID) )
-			$wpdb->update( $wpdb->posts, array( 'guid' => get_permalink( $post->ID ) ), array( 'ID' => $post->ID ) );
+		if ('' == get_the_guid($post->ID))
+			$wpdb->update($wpdb->posts, array('guid' => get_permalink($post->ID)), array('ID' => $post->ID));
 
 		/**
 		 * Fires when a post's status is transitioned from private to published.
@@ -5815,21 +5815,21 @@ 
 	}
 
 	// If published posts changed clear the lastpostmodified cache.
-	if ( 'publish' == $new_status || 'publish' == $old_status) {
-		foreach ( array( 'server', 'gmt', 'blog' ) as $timezone ) {
-			wp_cache_delete( "lastpostmodified:$timezone", 'timeinfo' );
-			wp_cache_delete( "lastpostdate:$timezone", 'timeinfo' );
-			wp_cache_delete( "lastpostdate:$timezone:{$post->post_type}", 'timeinfo' );
+	if ('publish' == $new_status || 'publish' == $old_status) {
+		foreach (array('server', 'gmt', 'blog') as $timezone) {
+			wp_cache_delete("lastpostmodified:$timezone", 'timeinfo');
+			wp_cache_delete("lastpostdate:$timezone", 'timeinfo');
+			wp_cache_delete("lastpostdate:$timezone:{$post->post_type}", 'timeinfo');
 		}
 	}
 
-	if ( $new_status !== $old_status ) {
-		wp_cache_delete( _count_posts_cache_key( $post->post_type ), 'counts' );
-		wp_cache_delete( _count_posts_cache_key( $post->post_type, 'readable' ), 'counts' );
+	if ($new_status !== $old_status) {
+		wp_cache_delete(_count_posts_cache_key($post->post_type), 'counts');
+		wp_cache_delete(_count_posts_cache_key($post->post_type, 'readable'), 'counts');
 	}
 
 	// Always clears the hook in case the post status bounced from future to draft.
-	wp_clear_scheduled_hook('publish_future_post', array( $post->ID ) );
+	wp_clear_scheduled_hook('publish_future_post', array($post->ID));
 }
 
 /**
@@ -5846,9 +5846,9 @@ 
  *                            {@see _future_post_hook()}.
  * @param WP_Post $post       Post object.
  */
-function _future_post_hook( $deprecated, $post ) {
-	wp_clear_scheduled_hook( 'publish_future_post', array( $post->ID ) );
-	wp_schedule_single_event( strtotime( get_gmt_from_date( $post->post_date ) . ' GMT') , 'publish_future_post', array( $post->ID ) );
+function _future_post_hook($deprecated, $post) {
+	wp_clear_scheduled_hook('publish_future_post', array($post->ID));
+	wp_schedule_single_event(strtotime(get_gmt_from_date($post->post_date).' GMT'), 'publish_future_post', array($post->ID));
 }
 
 /**
@@ -5861,8 +5861,8 @@ 
  *
  * @param int $post_id The ID in the database table of the post being published.
  */
-function _publish_post_hook( $post_id ) {
-	if ( defined( 'XMLRPC_REQUEST' ) ) {
+function _publish_post_hook($post_id) {
+	if (defined('XMLRPC_REQUEST')) {
 		/**
 		 * Fires when _publish_post_hook() is called during an XML-RPC request.
 		 *
@@ -5870,15 +5870,15 @@ 
 		 *
 		 * @param int $post_id Post ID.
 		 */
-		do_action( 'xmlrpc_publish_post', $post_id );
+		do_action('xmlrpc_publish_post', $post_id);
 	}
 
-	if ( defined('WP_IMPORTING') )
+	if (defined('WP_IMPORTING'))
 		return;
 
-	if ( get_option('default_pingback_flag') )
-		add_post_meta( $post_id, '_pingme', '1' );
-	add_post_meta( $post_id, '_encloseme', '1' );
+	if (get_option('default_pingback_flag'))
+		add_post_meta($post_id, '_pingme', '1');
+	add_post_meta($post_id, '_encloseme', '1');
 
 	wp_schedule_single_event(time(), 'do_pings');
 }
@@ -5892,9 +5892,9 @@ 
  *
  * @return int|false Post parent ID, otherwise false.
  */
-function wp_get_post_parent_id( $post_ID ) {
-	$post = get_post( $post_ID );
-	if ( !$post || is_wp_error( $post ) )
+function wp_get_post_parent_id($post_ID) {
+	$post = get_post($post_ID);
+	if ( ! $post || is_wp_error($post))
 		return false;
 	return (int) $post->post_parent;
 }
@@ -5913,30 +5913,30 @@ 
  * @param int $post_ID     ID of the post we're checking.
  * @return int The new post_parent for the post, 0 otherwise.
  */
-function wp_check_post_hierarchy_for_loops( $post_parent, $post_ID ) {
+function wp_check_post_hierarchy_for_loops($post_parent, $post_ID) {
 	// Nothing fancy here - bail.
-	if ( !$post_parent )
+	if ( ! $post_parent)
 		return 0;
 
 	// New post can't cause a loop.
-	if ( empty( $post_ID ) )
+	if (empty($post_ID))
 		return $post_parent;
 
 	// Can't be its own parent.
-	if ( $post_parent == $post_ID )
+	if ($post_parent == $post_ID)
 		return 0;
 
 	// Now look for larger loops.
-	if ( !$loop = wp_find_hierarchy_loop( 'wp_get_post_parent_id', $post_ID, $post_parent ) )
+	if ( ! $loop = wp_find_hierarchy_loop('wp_get_post_parent_id', $post_ID, $post_parent))
 		return $post_parent; // No loop
 
 	// Setting $post_parent to the given value causes a loop.
-	if ( isset( $loop[$post_ID] ) )
+	if (isset($loop[$post_ID]))
 		return 0;
 
 	// There's a loop, but it doesn't contain $post_ID. Break the loop.
-	foreach ( array_keys( $loop ) as $loop_member )
-		wp_update_post( array( 'ID' => $loop_member, 'post_parent' => 0 ) );
+	foreach (array_keys($loop) as $loop_member)
+		wp_update_post(array('ID' => $loop_member, 'post_parent' => 0));
 
 	return $post_parent;
 }
@@ -5950,14 +5950,14 @@ 
  * @param int         $thumbnail_id Thumbnail to attach.
  * @return int|bool True on success, false on failure.
  */
-function set_post_thumbnail( $post, $thumbnail_id ) {
-	$post = get_post( $post );
-	$thumbnail_id = absint( $thumbnail_id );
-	if ( $post && $thumbnail_id && get_post( $thumbnail_id ) ) {
-		if ( wp_get_attachment_image( $thumbnail_id, 'thumbnail' ) )
-			return update_post_meta( $post->ID, '_thumbnail_id', $thumbnail_id );
+function set_post_thumbnail($post, $thumbnail_id) {
+	$post = get_post($post);
+	$thumbnail_id = absint($thumbnail_id);
+	if ($post && $thumbnail_id && get_post($thumbnail_id)) {
+		if (wp_get_attachment_image($thumbnail_id, 'thumbnail'))
+			return update_post_meta($post->ID, '_thumbnail_id', $thumbnail_id);
 		else
-			return delete_post_meta( $post->ID, '_thumbnail_id' );
+			return delete_post_meta($post->ID, '_thumbnail_id');
 	}
 	return false;
 }
@@ -5970,10 +5970,10 @@ 
  * @param int|WP_Post $post Post ID or post object where thumbnail should be removed from.
  * @return bool True on success, false on failure.
  */
-function delete_post_thumbnail( $post ) {
-	$post = get_post( $post );
-	if ( $post )
-		return delete_post_meta( $post->ID, '_thumbnail_id' );
+function delete_post_thumbnail($post) {
+	$post = get_post($post);
+	if ($post)
+		return delete_post_meta($post->ID, '_thumbnail_id');
 	return false;
 }
 
@@ -5988,10 +5988,10 @@ 
 	global $wpdb;
 
 	// Cleanup old auto-drafts more than 7 days old.
-	$old_posts = $wpdb->get_col( "SELECT ID FROM $wpdb->posts WHERE post_status = 'auto-draft' AND DATE_SUB( NOW(), INTERVAL 7 DAY ) > post_date" );
-	foreach ( (array) $old_posts as $delete ) {
+	$old_posts = $wpdb->get_col("SELECT ID FROM $wpdb->posts WHERE post_status = 'auto-draft' AND DATE_SUB( NOW(), INTERVAL 7 DAY ) > post_date");
+	foreach ((array) $old_posts as $delete) {
 		// Force delete.
-		wp_delete_post( $delete, true );
+		wp_delete_post($delete, true);
 	}
 }
 
@@ -6002,23 +6002,23 @@ 
  *
  * @param array $posts Array of WP_Post objects.
  */
-function wp_queue_posts_for_term_meta_lazyload( $posts ) {
+function wp_queue_posts_for_term_meta_lazyload($posts) {
 	$post_type_taxonomies = $term_ids = array();
-	foreach ( $posts as $post ) {
-		if ( ! ( $post instanceof WP_Post ) ) {
+	foreach ($posts as $post) {
+		if ( ! ($post instanceof WP_Post)) {
 			continue;
 		}
 
-		if ( ! isset( $post_type_taxonomies[ $post->post_type ] ) ) {
-			$post_type_taxonomies[ $post->post_type ] = get_object_taxonomies( $post->post_type );
+		if ( ! isset($post_type_taxonomies[$post->post_type])) {
+			$post_type_taxonomies[$post->post_type] = get_object_taxonomies($post->post_type);
 		}
 
-		foreach ( $post_type_taxonomies[ $post->post_type ] as $taxonomy ) {
+		foreach ($post_type_taxonomies[$post->post_type] as $taxonomy) {
 			// Term cache should already be primed by `update_post_term_cache()`.
-			$terms = get_object_term_cache( $post->ID, $taxonomy );
-			if ( false !== $terms ) {
-				foreach ( $terms as $term ) {
-					if ( ! isset( $term_ids[ $term->term_id ] ) ) {
+			$terms = get_object_term_cache($post->ID, $taxonomy);
+			if (false !== $terms) {
+				foreach ($terms as $term) {
+					if ( ! isset($term_ids[$term->term_id])) {
 						$term_ids[] = $term->term_id;
 					}
 				}
@@ -6026,9 +6026,9 @@ 
 		}
 	}
 
-	if ( $term_ids ) {
+	if ($term_ids) {
 		$lazyloader = wp_metadata_lazyloader();
-		$lazyloader->queue_objects( 'term', $term_ids );
+		$lazyloader->queue_objects('term', $term_ids);
 	}
 }
 
@@ -6045,11 +6045,11 @@ 
  * @param string  $old_status Old post status.
  * @param WP_Post $post       Post object.
  */
-function _update_term_count_on_transition_post_status( $new_status, $old_status, $post ) {
+function _update_term_count_on_transition_post_status($new_status, $old_status, $post) {
 	// Update counts for the post's terms.
-	foreach ( (array) get_object_taxonomies( $post->post_type ) as $taxonomy ) {
-		$tt_ids = wp_get_object_terms( $post->ID, $taxonomy, array( 'fields' => 'tt_ids' ) );
-		wp_update_term_count( $tt_ids, $taxonomy );
+	foreach ((array) get_object_taxonomies($post->post_type) as $taxonomy) {
+		$tt_ids = wp_get_object_terms($post->ID, $taxonomy, array('fields' => 'tt_ids'));
+		wp_update_term_count($tt_ids, $taxonomy);
 	}
 }
 
@@ -6067,14 +6067,14 @@ 
  * @param bool  $update_term_cache Optional. Whether to update the term cache. Default true.
  * @param bool  $update_meta_cache Optional. Whether to update the meta cache. Default true.
  */
-function _prime_post_caches( $ids, $update_term_cache = true, $update_meta_cache = true ) {
+function _prime_post_caches($ids, $update_term_cache = true, $update_meta_cache = true) {
 	global $wpdb;
 
-	$non_cached_ids = _get_non_cached_ids( $ids, 'posts' );
-	if ( !empty( $non_cached_ids ) ) {
-		$fresh_posts = $wpdb->get_results( sprintf( "SELECT $wpdb->posts.* FROM $wpdb->posts WHERE ID IN (%s)", join( ",", $non_cached_ids ) ) );
+	$non_cached_ids = _get_non_cached_ids($ids, 'posts');
+	if ( ! empty($non_cached_ids)) {
+		$fresh_posts = $wpdb->get_results(sprintf("SELECT $wpdb->posts.* FROM $wpdb->posts WHERE ID IN (%s)", join(",", $non_cached_ids)));
 
-		update_post_caches( $fresh_posts, 'any', $update_term_cache, $update_meta_cache );
+		update_post_caches($fresh_posts, 'any', $update_term_cache, $update_meta_cache);
 	}
 }
 
@@ -6092,18 +6092,18 @@ 
  * @param string $post_name Slug.
  * @param string $post_ID   Optional. Post ID that should be ignored. Default 0.
  */
-function wp_add_trashed_suffix_to_post_name_for_trashed_posts( $post_name, $post_ID = 0 ) {
-	$trashed_posts_with_desired_slug = get_posts( array(
+function wp_add_trashed_suffix_to_post_name_for_trashed_posts($post_name, $post_ID = 0) {
+	$trashed_posts_with_desired_slug = get_posts(array(
 		'name' => $post_name,
 		'post_status' => 'trash',
 		'post_type' => 'any',
 		'nopaging' => true,
-		'post__not_in' => array( $post_ID )
-	) );
+		'post__not_in' => array($post_ID)
+	));
 
-	if ( ! empty( $trashed_posts_with_desired_slug ) ) {
-		foreach ( $trashed_posts_with_desired_slug as $_post ) {
-			wp_add_trashed_suffix_to_post_name_for_post( $_post );
+	if ( ! empty($trashed_posts_with_desired_slug)) {
+		foreach ($trashed_posts_with_desired_slug as $_post) {
+			wp_add_trashed_suffix_to_post_name_for_post($_post);
 		}
 	}
 }
@@ -6121,17 +6121,17 @@ 
  *
  * @param WP_Post $post The post.
  */
-function wp_add_trashed_suffix_to_post_name_for_post( $post ) {
+function wp_add_trashed_suffix_to_post_name_for_post($post) {
 	global $wpdb;
 
-	$post = get_post( $post );
+	$post = get_post($post);
 
-	if ( strpos( $post->post_name, '-%trashed%' ) ) {
+	if (strpos($post->post_name, '-%trashed%')) {
 		return $post->post_name;
 	}
-	add_post_meta( $post->ID, '_wp_desired_post_slug', $post->post_name );
-	$post_name = _truncate_post_slug( $post->post_name, 190 ) . '-%trashed%';
-	$wpdb->update( $wpdb->posts, array( 'post_name' => $post_name ), array( 'ID' => $post->ID ) );
-	clean_post_cache( $post->ID );
+	add_post_meta($post->ID, '_wp_desired_post_slug', $post->post_name);
+	$post_name = _truncate_post_slug($post->post_name, 190).'-%trashed%';
+	$wpdb->update($wpdb->posts, array('post_name' => $post_name), array('ID' => $post->ID));
+	clean_post_cache($post->ID);
 	return $post_name;
 }

Braces +590 added lines, -405 removed lines

@@ -220,8 +220,9 @@ 
  * @return bool True on success, false on failure.
  */
 function update_attached_file( $attachment_id, $file ) {
-	if ( !get_post( $attachment_id ) )
-		return false;
+	if ( !get_post( $attachment_id ) ) {
+			return false;
+	}
 
 	/**
 	 * Filter the path to the attached file to update.
@@ -233,11 +234,12 @@ 
 	 */
 	$file = apply_filters( 'update_attached_file', $file, $attachment_id );
 
-	if ( $file = _wp_relative_upload_path( $file ) )
-		return update_post_meta( $attachment_id, '_wp_attached_file', $file );
-	else
-		return delete_post_meta( $attachment_id, '_wp_attached_file' );
-}
+	if ( $file = _wp_relative_upload_path( $file ) ) {
+			return update_post_meta( $attachment_id, '_wp_attached_file', $file );
+	} else {
+			return delete_post_meta( $attachment_id, '_wp_attached_file' );
+	}
+	}
 
 /**
  * Return relative path to an uploaded file.
@@ -344,16 +346,19 @@ 
 
 	$children = get_posts( $r );
 
-	if ( ! $children )
-		return $kids;
+	if ( ! $children ) {
+			return $kids;
+	}
 
-	if ( ! empty( $r['fields'] ) )
-		return $children;
+	if ( ! empty( $r['fields'] ) ) {
+			return $children;
+	}
 
 	update_post_cache($children);
 
-	foreach ( $children as $key => $child )
-		$kids[$child->ID] = $children[$key];
+	foreach ( $children as $key => $child ) {
+			$kids[$child->ID] = $children[$key];
+	}
 
 	if ( $output == OBJECT ) {
 		return $kids;
@@ -428,8 +433,9 @@ 
  *                            When $output is OBJECT, a `WP_Post` instance is returned.
  */
 function get_post( $post = null, $output = OBJECT, $filter = 'raw' ) {
-	if ( empty( $post ) && isset( $GLOBALS['post'] ) )
-		$post = $GLOBALS['post'];
+	if ( empty( $post ) && isset( $GLOBALS['post'] ) ) {
+			$post = $GLOBALS['post'];
+	}
 
 	if ( $post instanceof WP_Post ) {
 		$_post = $post;
@@ -446,15 +452,17 @@ 
 		$_post = WP_Post::get_instance( $post );
 	}
 
-	if ( ! $_post )
-		return null;
+	if ( ! $_post ) {
+			return null;
+	}
 
 	$_post = $_post->filter( $filter );
 
-	if ( $output == ARRAY_A )
-		return $_post->to_array();
-	elseif ( $output == ARRAY_N )
-		return array_values( $_post->to_array() );
+	if ( $output == ARRAY_A ) {
+			return $_post->to_array();
+	} elseif ( $output == ARRAY_N ) {
+			return array_values( $_post->to_array() );
+	}
 
 	return $_post;
 }
@@ -470,8 +478,9 @@ 
 function get_post_ancestors( $post ) {
 	$post = get_post( $post );
 
-	if ( ! $post || empty( $post->post_parent ) || $post->post_parent == $post->ID )
-		return array();
+	if ( ! $post || empty( $post->post_parent ) || $post->post_parent == $post->ID ) {
+			return array();
+	}
 
 	$ancestors = array();
 
@@ -479,8 +488,9 @@ 
 
 	while ( $ancestor = get_post( $id ) ) {
 		// Loop detection: If the ancestor has been seen before, break.
-		if ( empty( $ancestor->post_parent ) || ( $ancestor->post_parent == $post->ID ) || in_array( $ancestor->post_parent, $ancestors ) )
-			break;
+		if ( empty( $ancestor->post_parent ) || ( $ancestor->post_parent == $post->ID ) || in_array( $ancestor->post_parent, $ancestors ) ) {
+					break;
+		}
 
 		$id = $ancestors[] = $ancestor->post_parent;
 	}
@@ -511,11 +521,13 @@ 
 function get_post_field( $field, $post = null, $context = 'display' ) {
 	$post = get_post( $post );
 
-	if ( !$post )
-		return '';
+	if ( !$post ) {
+			return '';
+	}
 
-	if ( !isset($post->$field) )
-		return '';
+	if ( !isset($post->$field) ) {
+			return '';
+	}
 
 	return sanitize_post_field($field, $post->$field, $post->ID, $context);
 }
@@ -534,8 +546,9 @@ 
 function get_post_mime_type( $ID = '' ) {
 	$post = get_post($ID);
 
-	if ( is_object($post) )
-		return $post->post_mime_type;
+	if ( is_object($post) ) {
+			return $post->post_mime_type;
+	}
 
 	return false;
 }
@@ -554,16 +567,19 @@ 
 function get_post_status( $ID = '' ) {
 	$post = get_post($ID);
 
-	if ( !is_object($post) )
-		return false;
+	if ( !is_object($post) ) {
+			return false;
+	}
 
 	if ( 'attachment' == $post->post_type ) {
-		if ( 'private' == $post->post_status )
-			return 'private';
+		if ( 'private' == $post->post_status ) {
+					return 'private';
+		}
 
 		// Unattached attachments are assumed to be published.
-		if ( ( 'inherit' == $post->post_status ) && ( 0 == $post->post_parent) )
-			return 'publish';
+		if ( ( 'inherit' == $post->post_status ) && ( 0 == $post->post_parent) ) {
+					return 'publish';
+		}
 
 		// Inherit status from the parent.
 		if ( $post->post_parent && ( $post->ID != $post->post_parent ) ) {
@@ -675,8 +691,9 @@ 
 function register_post_status( $post_status, $args = array() ) {
 	global $wp_post_statuses;
 
-	if (!is_array($wp_post_statuses))
-		$wp_post_statuses = array();
+	if (!is_array($wp_post_statuses)) {
+			$wp_post_statuses = array();
+	}
 
 	// Args prefixed with an underscore are reserved for internal use.
 	$defaults = array(
@@ -699,38 +716,49 @@ 
 	$args->name = $post_status;
 
 	// Set various defaults.
-	if ( null === $args->public && null === $args->internal && null === $args->protected && null === $args->private )
-		$args->internal = true;
+	if ( null === $args->public && null === $args->internal && null === $args->protected && null === $args->private ) {
+			$args->internal = true;
+	}
 
-	if ( null === $args->public  )
-		$args->public = false;
+	if ( null === $args->public  ) {
+			$args->public = false;
+	}
 
-	if ( null === $args->private  )
-		$args->private = false;
+	if ( null === $args->private  ) {
+			$args->private = false;
+	}
 
-	if ( null === $args->protected  )
-		$args->protected = false;
+	if ( null === $args->protected  ) {
+			$args->protected = false;
+	}
 
-	if ( null === $args->internal  )
-		$args->internal = false;
+	if ( null === $args->internal  ) {
+			$args->internal = false;
+	}
 
-	if ( null === $args->publicly_queryable )
-		$args->publicly_queryable = $args->public;
+	if ( null === $args->publicly_queryable ) {
+			$args->publicly_queryable = $args->public;
+	}
 
-	if ( null === $args->exclude_from_search )
-		$args->exclude_from_search = $args->internal;
+	if ( null === $args->exclude_from_search ) {
+			$args->exclude_from_search = $args->internal;
+	}
 
-	if ( null === $args->show_in_admin_all_list )
-		$args->show_in_admin_all_list = !$args->internal;
+	if ( null === $args->show_in_admin_all_list ) {
+			$args->show_in_admin_all_list = !$args->internal;
+	}
 
-	if ( null === $args->show_in_admin_status_list )
-		$args->show_in_admin_status_list = !$args->internal;
+	if ( null === $args->show_in_admin_status_list ) {
+			$args->show_in_admin_status_list = !$args->internal;
+	}
 
-	if ( false === $args->label )
-		$args->label = $post_status;
+	if ( false === $args->label ) {
+			$args->label = $post_status;
+	}
 
-	if ( false === $args->label_count )
-		$args->label_count = array( $args->label, $args->label );
+	if ( false === $args->label_count ) {
+			$args->label_count = array( $args->label, $args->label );
+	}
 
 	$wp_post_statuses[$post_status] = $args;
 
@@ -752,8 +780,9 @@ 
 function get_post_status_object( $post_status ) {
 	global $wp_post_statuses;
 
-	if ( empty($wp_post_statuses[$post_status]) )
-		return null;
+	if ( empty($wp_post_statuses[$post_status]) ) {
+			return null;
+	}
 
 	return $wp_post_statuses[$post_status];
 }
@@ -796,8 +825,9 @@ 
  * @return bool Whether post type is hierarchical.
  */
 function is_post_type_hierarchical( $post_type ) {
-	if ( ! post_type_exists( $post_type ) )
-		return false;
+	if ( ! post_type_exists( $post_type ) ) {
+			return false;
+	}
 
 	$post_type = get_post_type_object( $post_type );
 	return $post_type->hierarchical;
@@ -826,8 +856,9 @@ 
  * @return string|false          Post type on success, false on failure.
  */
 function get_post_type( $post = null ) {
-	if ( $post = get_post( $post ) )
-		return $post->post_type;
+	if ( $post = get_post( $post ) ) {
+			return $post->post_type;
+	}
 
 	return false;
 }
@@ -1057,36 +1088,44 @@ 
 	}
 
 	// If not set, default to the setting for public.
-	if ( null === $args->publicly_queryable )
-		$args->publicly_queryable = $args->public;
+	if ( null === $args->publicly_queryable ) {
+			$args->publicly_queryable = $args->public;
+	}
 
 	// If not set, default to the setting for public.
-	if ( null === $args->show_ui )
-		$args->show_ui = $args->public;
+	if ( null === $args->show_ui ) {
+			$args->show_ui = $args->public;
+	}
 
 	// If not set, default to the setting for show_ui.
-	if ( null === $args->show_in_menu || ! $args->show_ui )
-		$args->show_in_menu = $args->show_ui;
+	if ( null === $args->show_in_menu || ! $args->show_ui ) {
+			$args->show_in_menu = $args->show_ui;
+	}
 
 	// If not set, default to the whether the full UI is shown.
-	if ( null === $args->show_in_admin_bar )
-		$args->show_in_admin_bar = (bool) $args->show_in_menu;
+	if ( null === $args->show_in_admin_bar ) {
+			$args->show_in_admin_bar = (bool) $args->show_in_menu;
+	}
 
 	// If not set, default to the setting for public.
-	if ( null === $args->show_in_nav_menus )
-		$args->show_in_nav_menus = $args->public;
+	if ( null === $args->show_in_nav_menus ) {
+			$args->show_in_nav_menus = $args->public;
+	}
 
 	// If not set, default to true if not public, false if public.
-	if ( null === $args->exclude_from_search )
-		$args->exclude_from_search = !$args->public;
+	if ( null === $args->exclude_from_search ) {
+			$args->exclude_from_search = !$args->public;
+	}
 
 	// Back compat with quirky handling in version 3.0. #14122.
-	if ( empty( $args->capabilities ) && null === $args->map_meta_cap && in_array( $args->capability_type, array( 'post', 'page' ) ) )
-		$args->map_meta_cap = true;
+	if ( empty( $args->capabilities ) && null === $args->map_meta_cap && in_array( $args->capability_type, array( 'post', 'page' ) ) ) {
+			$args->map_meta_cap = true;
+	}
 
 	// If not set, default to false.
-	if ( null === $args->map_meta_cap )
-		$args->map_meta_cap = false;
+	if ( null === $args->map_meta_cap ) {
+			$args->map_meta_cap = false;
+	}
 
 	// If there's no specified edit link and no UI, remove the edit link.
 	if ( ! $args->show_ui && ! $has_edit_link ) {
@@ -1096,8 +1135,9 @@ 
 	$args->cap = get_post_type_capabilities( $args );
 	unset( $args->capabilities );
 
-	if ( is_array( $args->capability_type ) )
-		$args->capability_type = $args->capability_type[0];
+	if ( is_array( $args->capability_type ) ) {
+			$args->capability_type = $args->capability_type[0];
+	}
 
 	if ( ! empty( $args->supports ) ) {
 		add_post_type_support( $post_type, $args->supports );
@@ -1108,10 +1148,11 @@ 
 	}
 
 	if ( false !== $args->query_var ) {
-		if ( true === $args->query_var )
-			$args->query_var = $post_type;
-		else
-			$args->query_var = sanitize_title_with_dashes( $args->query_var );
+		if ( true === $args->query_var ) {
+					$args->query_var = $post_type;
+		} else {
+					$args->query_var = sanitize_title_with_dashes( $args->query_var );
+		}
 
 		if ( $wp && is_post_type_viewable( $args ) ) {
 			$wp->add_query_var( $args->query_var );
@@ -1119,34 +1160,42 @@ 
 	}
 
 	if ( false !== $args->rewrite && ( is_admin() || '' != get_option( 'permalink_structure' ) ) ) {
-		if ( ! is_array( $args->rewrite ) )
-			$args->rewrite = array();
-		if ( empty( $args->rewrite['slug'] ) )
-			$args->rewrite['slug'] = $post_type;
-		if ( ! isset( $args->rewrite['with_front'] ) )
-			$args->rewrite['with_front'] = true;
-		if ( ! isset( $args->rewrite['pages'] ) )
-			$args->rewrite['pages'] = true;
-		if ( ! isset( $args->rewrite['feeds'] ) || ! $args->has_archive )
-			$args->rewrite['feeds'] = (bool) $args->has_archive;
+		if ( ! is_array( $args->rewrite ) ) {
+					$args->rewrite = array();
+		}
+		if ( empty( $args->rewrite['slug'] ) ) {
+					$args->rewrite['slug'] = $post_type;
+		}
+		if ( ! isset( $args->rewrite['with_front'] ) ) {
+					$args->rewrite['with_front'] = true;
+		}
+		if ( ! isset( $args->rewrite['pages'] ) ) {
+					$args->rewrite['pages'] = true;
+		}
+		if ( ! isset( $args->rewrite['feeds'] ) || ! $args->has_archive ) {
+					$args->rewrite['feeds'] = (bool) $args->has_archive;
+		}
 		if ( ! isset( $args->rewrite['ep_mask'] ) ) {
-			if ( isset( $args->permalink_epmask ) )
-				$args->rewrite['ep_mask'] = $args->permalink_epmask;
-			else
-				$args->rewrite['ep_mask'] = EP_PERMALINK;
+			if ( isset( $args->permalink_epmask ) ) {
+							$args->rewrite['ep_mask'] = $args->permalink_epmask;
+			} else {
+							$args->rewrite['ep_mask'] = EP_PERMALINK;
+			}
 		}
 
-		if ( $args->hierarchical )
-			add_rewrite_tag( "%$post_type%", '(.+?)', $args->query_var ? "{$args->query_var}=" : "post_type=$post_type&pagename=" );
-		else
-			add_rewrite_tag( "%$post_type%", '([^/]+)', $args->query_var ? "{$args->query_var}=" : "post_type=$post_type&name=" );
+		if ( $args->hierarchical ) {
+					add_rewrite_tag( "%$post_type%", '(.+?)', $args->query_var ? "{$args->query_var}=" : "post_type=$post_type&pagename=" );
+		} else {
+					add_rewrite_tag( "%$post_type%", '([^/]+)', $args->query_var ? "{$args->query_var}=" : "post_type=$post_type&name=" );
+		}
 
 		if ( $args->has_archive ) {
 			$archive_slug = $args->has_archive === true ? $args->rewrite['slug'] : $args->has_archive;
-			if ( $args->rewrite['with_front'] )
-				$archive_slug = substr( $wp_rewrite->front, 1 ) . $archive_slug;
-			else
-				$archive_slug = $wp_rewrite->root . $archive_slug;
+			if ( $args->rewrite['with_front'] ) {
+							$archive_slug = substr( $wp_rewrite->front, 1 ) . $archive_slug;
+			} else {
+							$archive_slug = $wp_rewrite->root . $archive_slug;
+			}
 
 			add_rewrite_rule( "{$archive_slug}/?$", "index.php?post_type=$post_type", 'top' );
 			if ( $args->rewrite['feeds'] && $wp_rewrite->feeds ) {
@@ -1154,8 +1203,9 @@ 
 				add_rewrite_rule( "{$archive_slug}/feed/$feeds/?$", "index.php?post_type=$post_type" . '&feed=$matches[1]', 'top' );
 				add_rewrite_rule( "{$archive_slug}/$feeds/?$", "index.php?post_type=$post_type" . '&feed=$matches[1]', 'top' );
 			}
-			if ( $args->rewrite['pages'] )
-				add_rewrite_rule( "{$archive_slug}/{$wp_rewrite->pagination_base}/([0-9]{1,})/?$", "index.php?post_type=$post_type" . '&paged=$matches[1]', 'top' );
+			if ( $args->rewrite['pages'] ) {
+							add_rewrite_rule( "{$archive_slug}/{$wp_rewrite->pagination_base}/([0-9]{1,})/?$", "index.php?post_type=$post_type" . '&paged=$matches[1]', 'top' );
+			}
 		}
 
 		$permastruct_args = $args->rewrite;
@@ -1164,8 +1214,9 @@ 
 	}
 
 	// Register the post type meta box if a custom callback was specified.
-	if ( $args->register_meta_box_cb )
-		add_action( 'add_meta_boxes_' . $post_type, $args->register_meta_box_cb, 10, 1 );
+	if ( $args->register_meta_box_cb ) {
+			add_action( 'add_meta_boxes_' . $post_type, $args->register_meta_box_cb, 10, 1 );
+	}
 
 	$args->labels = get_post_type_labels( $args );
 	$args->label = $args->labels->name;
@@ -1329,8 +1380,9 @@ 
  * @return object object with all the capabilities as member variables.
  */
 function get_post_type_capabilities( $args ) {
-	if ( ! is_array( $args->capability_type ) )
-		$args->capability_type = array( $args->capability_type, $args->capability_type . 's' );
+	if ( ! is_array( $args->capability_type ) ) {
+			$args->capability_type = array( $args->capability_type, $args->capability_type . 's' );
+	}
 
 	// Singular base for meta capabilities, plural base for primitive capabilities.
 	list( $singular_base, $plural_base ) = $args->capability_type;
@@ -1364,12 +1416,14 @@ 
 	$capabilities = array_merge( $default_capabilities, $args->capabilities );
 
 	// Post creation capability simply maps to edit_posts by default:
-	if ( ! isset( $capabilities['create_posts'] ) )
-		$capabilities['create_posts'] = $capabilities['edit_posts'];
+	if ( ! isset( $capabilities['create_posts'] ) ) {
+			$capabilities['create_posts'] = $capabilities['edit_posts'];
+	}
 
 	// Remember meta capabilities for future reference.
-	if ( $args->map_meta_cap )
-		_post_type_meta_capabilities( $capabilities );
+	if ( $args->map_meta_cap ) {
+			_post_type_meta_capabilities( $capabilities );
+	}
 
 	return (object) $capabilities;
 }
@@ -1509,20 +1563,25 @@ 
 function _get_custom_object_labels( $object, $nohier_vs_hier_defaults ) {
 	$object->labels = (array) $object->labels;
 
-	if ( isset( $object->label ) && empty( $object->labels['name'] ) )
-		$object->labels['name'] = $object->label;
+	if ( isset( $object->label ) && empty( $object->labels['name'] ) ) {
+			$object->labels['name'] = $object->label;
+	}
 
-	if ( !isset( $object->labels['singular_name'] ) && isset( $object->labels['name'] ) )
-		$object->labels['singular_name'] = $object->labels['name'];
+	if ( !isset( $object->labels['singular_name'] ) && isset( $object->labels['name'] ) ) {
+			$object->labels['singular_name'] = $object->labels['name'];
+	}
 
-	if ( ! isset( $object->labels['name_admin_bar'] ) )
-		$object->labels['name_admin_bar'] = isset( $object->labels['singular_name'] ) ? $object->labels['singular_name'] : $object->name;
+	if ( ! isset( $object->labels['name_admin_bar'] ) ) {
+			$object->labels['name_admin_bar'] = isset( $object->labels['singular_name'] ) ? $object->labels['singular_name'] : $object->name;
+	}
 
-	if ( !isset( $object->labels['menu_name'] ) && isset( $object->labels['name'] ) )
-		$object->labels['menu_name'] = $object->labels['name'];
+	if ( !isset( $object->labels['menu_name'] ) && isset( $object->labels['name'] ) ) {
+			$object->labels['menu_name'] = $object->labels['name'];
+	}
 
-	if ( !isset( $object->labels['all_items'] ) && isset( $object->labels['menu_name'] ) )
-		$object->labels['all_items'] = $object->labels['menu_name'];
+	if ( !isset( $object->labels['all_items'] ) && isset( $object->labels['menu_name'] ) ) {
+			$object->labels['all_items'] = $object->labels['menu_name'];
+	}
 
 	if ( !isset( $object->labels['archives'] ) && isset( $object->labels['all_items'] ) ) {
 		$object->labels['archives'] = $object->labels['all_items'];
@@ -1548,8 +1607,9 @@ 
 	foreach ( get_post_types( array( 'show_ui' => true ) ) as $ptype ) {
 		$ptype_obj = get_post_type_object( $ptype );
 		// Sub-menus only.
-		if ( ! $ptype_obj->show_in_menu || $ptype_obj->show_in_menu === true )
-			continue;
+		if ( ! $ptype_obj->show_in_menu || $ptype_obj->show_in_menu === true ) {
+					continue;
+		}
 		add_submenu_page( $ptype_obj->show_in_menu, $ptype_obj->labels->name, $ptype_obj->labels->all_items, $ptype_obj->cap->edit_posts, "edit.php?post_type=$ptype" );
 	}
 }
@@ -1579,10 +1639,11 @@ 
 
 	$features = (array) $feature;
 	foreach ($features as $feature) {
-		if ( func_num_args() == 2 )
-			$_wp_post_type_features[$post_type][$feature] = true;
-		else
-			$_wp_post_type_features[$post_type][$feature] = array_slice( func_get_args(), 2 );
+		if ( func_num_args() == 2 ) {
+					$_wp_post_type_features[$post_type][$feature] = true;
+		} else {
+					$_wp_post_type_features[$post_type][$feature] = array_slice( func_get_args(), 2 );
+		}
 	}
 }
 
@@ -1615,8 +1676,9 @@ 
 function get_all_post_type_supports( $post_type ) {
 	global $_wp_post_type_features;
 
-	if ( isset( $_wp_post_type_features[$post_type] ) )
-		return $_wp_post_type_features[$post_type];
+	if ( isset( $_wp_post_type_features[$post_type] ) ) {
+			return $_wp_post_type_features[$post_type];
+	}
 
 	return array();
 }
@@ -1743,18 +1805,22 @@ 
 	);
 
 	$r = wp_parse_args( $args, $defaults );
-	if ( empty( $r['post_status'] ) )
-		$r['post_status'] = ( 'attachment' == $r['post_type'] ) ? 'inherit' : 'publish';
-	if ( ! empty($r['numberposts']) && empty($r['posts_per_page']) )
-		$r['posts_per_page'] = $r['numberposts'];
-	if ( ! empty($r['category']) )
-		$r['cat'] = $r['category'];
+	if ( empty( $r['post_status'] ) ) {
+			$r['post_status'] = ( 'attachment' == $r['post_type'] ) ? 'inherit' : 'publish';
+	}
+	if ( ! empty($r['numberposts']) && empty($r['posts_per_page']) ) {
+			$r['posts_per_page'] = $r['numberposts'];
+	}
+	if ( ! empty($r['category']) ) {
+			$r['cat'] = $r['category'];
+	}
 	if ( ! empty($r['include']) ) {
 		$incposts = wp_parse_id_list( $r['include'] );
 		$r['posts_per_page'] = count($incposts);  // only the number of posts included
 		$r['post__in'] = $incposts;
-	} elseif ( ! empty($r['exclude']) )
-		$r['post__not_in'] = wp_parse_id_list( $r['exclude'] );
+	} elseif ( ! empty($r['exclude']) ) {
+			$r['post__not_in'] = wp_parse_id_list( $r['exclude'] );
+	}
 
 	$r['ignore_sticky_posts'] = true;
 	$r['no_found_rows'] = true;
@@ -1784,8 +1850,9 @@ 
  */
 function add_post_meta( $post_id, $meta_key, $meta_value, $unique = false ) {
 	// Make sure meta is added to the post, not a revision.
-	if ( $the_post = wp_is_post_revision($post_id) )
-		$post_id = $the_post;
+	if ( $the_post = wp_is_post_revision($post_id) ) {
+			$post_id = $the_post;
+	}
 
 	return add_metadata('post', $post_id, $meta_key, $meta_value, $unique);
 }
@@ -1807,8 +1874,9 @@ 
  */
 function delete_post_meta( $post_id, $meta_key, $meta_value = '' ) {
 	// Make sure meta is added to the post, not a revision.
-	if ( $the_post = wp_is_post_revision($post_id) )
-		$post_id = $the_post;
+	if ( $the_post = wp_is_post_revision($post_id) ) {
+			$post_id = $the_post;
+	}
 
 	return delete_metadata('post', $post_id, $meta_key, $meta_value);
 }
@@ -1849,8 +1917,9 @@ 
  */
 function update_post_meta( $post_id, $meta_key, $meta_value, $prev_value = '' ) {
 	// Make sure meta is added to the post, not a revision.
-	if ( $the_post = wp_is_post_revision($post_id) )
-		$post_id = $the_post;
+	if ( $the_post = wp_is_post_revision($post_id) ) {
+			$post_id = $the_post;
+	}
 
 	return update_metadata('post', $post_id, $meta_key, $meta_value, $prev_value);
 }
@@ -1880,8 +1949,9 @@ 
  */
 function get_post_custom( $post_id = 0 ) {
 	$post_id = absint( $post_id );
-	if ( ! $post_id )
-		$post_id = get_the_ID();
+	if ( ! $post_id ) {
+			$post_id = get_the_ID();
+	}
 
 	return get_post_meta( $post_id );
 }
@@ -1899,12 +1969,14 @@ 
 function get_post_custom_keys( $post_id = 0 ) {
 	$custom = get_post_custom( $post_id );
 
-	if ( !is_array($custom) )
-		return;
+	if ( !is_array($custom) ) {
+			return;
+	}
 
-	if ( $keys = array_keys($custom) )
-		return $keys;
-}
+	if ( $keys = array_keys($custom) ) {
+			return $keys;
+	}
+	}
 
 /**
  * Retrieve values for a custom post field.
@@ -1919,8 +1991,9 @@ 
  * @return array|null Meta field values.
  */
 function get_post_custom_values( $key = '', $post_id = 0 ) {
-	if ( !$key )
-		return null;
+	if ( !$key ) {
+			return null;
+	}
 
 	$custom = get_post_custom($post_id);
 
@@ -1941,16 +2014,19 @@ 
 function is_sticky( $post_id = 0 ) {
 	$post_id = absint( $post_id );
 
-	if ( ! $post_id )
-		$post_id = get_the_ID();
+	if ( ! $post_id ) {
+			$post_id = get_the_ID();
+	}
 
 	$stickies = get_option( 'sticky_posts' );
 
-	if ( ! is_array( $stickies ) )
-		return false;
+	if ( ! is_array( $stickies ) ) {
+			return false;
+	}
 
-	if ( in_array( $post_id, $stickies ) )
-		return true;
+	if ( in_array( $post_id, $stickies ) ) {
+			return true;
+	}
 
 	return false;
 }
@@ -1975,21 +2051,27 @@ 
 function sanitize_post( $post, $context = 'display' ) {
 	if ( is_object($post) ) {
 		// Check if post already filtered for this context.
-		if ( isset($post->filter) && $context == $post->filter )
-			return $post;
-		if ( !isset($post->ID) )
-			$post->ID = 0;
-		foreach ( array_keys(get_object_vars($post)) as $field )
-			$post->$field = sanitize_post_field($field, $post->$field, $post->ID, $context);
+		if ( isset($post->filter) && $context == $post->filter ) {
+					return $post;
+		}
+		if ( !isset($post->ID) ) {
+					$post->ID = 0;
+		}
+		foreach ( array_keys(get_object_vars($post)) as $field ) {
+					$post->$field = sanitize_post_field($field, $post->$field, $post->ID, $context);
+		}
 		$post->filter = $context;
 	} elseif ( is_array( $post ) ) {
 		// Check if post already filtered for this context.
-		if ( isset($post['filter']) && $context == $post['filter'] )
-			return $post;
-		if ( !isset($post['ID']) )
-			$post['ID'] = 0;
-		foreach ( array_keys($post) as $field )
-			$post[$field] = sanitize_post_field($field, $post[$field], $post['ID'], $context);
+		if ( isset($post['filter']) && $context == $post['filter'] ) {
+					return $post;
+		}
+		if ( !isset($post['ID']) ) {
+					$post['ID'] = 0;
+		}
+		foreach ( array_keys($post) as $field ) {
+					$post[$field] = sanitize_post_field($field, $post[$field], $post['ID'], $context);
+		}
 		$post['filter'] = $context;
 	}
 	return $post;
@@ -2014,8 +2096,9 @@ 
  */
 function sanitize_post_field( $field, $value, $post_id, $context = 'display' ) {
 	$int_fields = array('ID', 'post_parent', 'menu_order');
-	if ( in_array($field, $int_fields) )
-		$value = (int) $value;
+	if ( in_array($field, $int_fields) ) {
+			$value = (int) $value;
+	}
 
 	// Fields which contain arrays of integers.
 	$array_int_fields = array( 'ancestors' );
@@ -2024,8 +2107,9 @@ 
 		return $value;
 	}
 
-	if ( 'raw' == $context )
-		return $value;
+	if ( 'raw' == $context ) {
+			return $value;
+	}
 
 	$prefixed = false;
 	if ( false !== strpos($field, 'post_') ) {
@@ -2068,10 +2152,11 @@ 
 		}
 
 		if ( in_array($field, $format_to_edit) ) {
-			if ( 'post_content' == $field )
-				$value = format_to_edit($value, user_can_richedit());
-			else
-				$value = format_to_edit($value);
+			if ( 'post_content' == $field ) {
+							$value = format_to_edit($value, user_can_richedit());
+			} else {
+							$value = format_to_edit($value);
+			}
 		} else {
 			$value = esc_attr($value);
 		}
@@ -2141,10 +2226,11 @@ 
 		}
 	}
 
-	if ( 'attribute' == $context )
-		$value = esc_attr($value);
-	elseif ( 'js' == $context )
-		$value = esc_js($value);
+	if ( 'attribute' == $context ) {
+			$value = esc_attr($value);
+	} elseif ( 'js' == $context ) {
+			$value = esc_js($value);
+	}
 
 	return $value;
 }
@@ -2161,11 +2247,13 @@ 
 function stick_post( $post_id ) {
 	$stickies = get_option('sticky_posts');
 
-	if ( !is_array($stickies) )
-		$stickies = array($post_id);
+	if ( !is_array($stickies) ) {
+			$stickies = array($post_id);
+	}
 
-	if ( ! in_array($post_id, $stickies) )
-		$stickies[] = $post_id;
+	if ( ! in_array($post_id, $stickies) ) {
+			$stickies[] = $post_id;
+	}
 
 	update_option('sticky_posts', $stickies);
 }
@@ -2182,15 +2270,18 @@ 
 function unstick_post( $post_id ) {
 	$stickies = get_option('sticky_posts');
 
-	if ( !is_array($stickies) )
-		return;
+	if ( !is_array($stickies) ) {
+			return;
+	}
 
-	if ( ! in_array($post_id, $stickies) )
-		return;
+	if ( ! in_array($post_id, $stickies) ) {
+			return;
+	}
 
 	$offset = array_search($post_id, $stickies);
-	if ( false === $offset )
-		return;
+	if ( false === $offset ) {
+			return;
+	}
 
 	array_splice($stickies, $offset, 1);
 
@@ -2239,8 +2330,9 @@ 
 function wp_count_posts( $type = 'post', $perm = '' ) {
 	global $wpdb;
 
-	if ( ! post_type_exists( $type ) )
-		return new stdClass;
+	if ( ! post_type_exists( $type ) ) {
+			return new stdClass;
+	}
 
 	$cache_key = _count_posts_cache_key( $type, $perm );
 
@@ -2415,8 +2507,9 @@ 
 function wp_post_mime_type_where( $post_mime_types, $table_alias = '' ) {
 	$where = '';
 	$wildcards = array('', '%', '%/%');
-	if ( is_string($post_mime_types) )
-		$post_mime_types = array_map('trim', explode(',', $post_mime_types));
+	if ( is_string($post_mime_types) ) {
+			$post_mime_types = array_map('trim', explode(',', $post_mime_types));
+	}
 
 	$wheres = array();
 
@@ -2426,29 +2519,34 @@ 
 		if ( false !== $slashpos ) {
 			$mime_group = preg_replace('/[^-*.a-zA-Z0-9]/', '', substr($mime_type, 0, $slashpos));
 			$mime_subgroup = preg_replace('/[^-*.+a-zA-Z0-9]/', '', substr($mime_type, $slashpos + 1));
-			if ( empty($mime_subgroup) )
-				$mime_subgroup = '*';
-			else
-				$mime_subgroup = str_replace('/', '', $mime_subgroup);
+			if ( empty($mime_subgroup) ) {
+							$mime_subgroup = '*';
+			} else {
+							$mime_subgroup = str_replace('/', '', $mime_subgroup);
+			}
 			$mime_pattern = "$mime_group/$mime_subgroup";
 		} else {
 			$mime_pattern = preg_replace('/[^-*.a-zA-Z0-9]/', '', $mime_type);
-			if ( false === strpos($mime_pattern, '*') )
-				$mime_pattern .= '/*';
+			if ( false === strpos($mime_pattern, '*') ) {
+							$mime_pattern .= '/*';
+			}
 		}
 
 		$mime_pattern = preg_replace('/\*+/', '%', $mime_pattern);
 
-		if ( in_array( $mime_type, $wildcards ) )
-			return '';
+		if ( in_array( $mime_type, $wildcards ) ) {
+					return '';
+		}
 
-		if ( false !== strpos($mime_pattern, '%') )
-			$wheres[] = empty($table_alias) ? "post_mime_type LIKE '$mime_pattern'" : "$table_alias.post_mime_type LIKE '$mime_pattern'";
-		else
-			$wheres[] = empty($table_alias) ? "post_mime_type = '$mime_pattern'" : "$table_alias.post_mime_type = '$mime_pattern'";
+		if ( false !== strpos($mime_pattern, '%') ) {
+					$wheres[] = empty($table_alias) ? "post_mime_type LIKE '$mime_pattern'" : "$table_alias.post_mime_type LIKE '$mime_pattern'";
+		} else {
+					$wheres[] = empty($table_alias) ? "post_mime_type = '$mime_pattern'" : "$table_alias.post_mime_type = '$mime_pattern'";
+		}
+	}
+	if ( !empty($wheres) ) {
+			$where = ' AND (' . join(' OR ', $wheres) . ') ';
 	}
-	if ( !empty($wheres) )
-		$where = ' AND (' . join(' OR ', $wheres) . ') ';
 	return $where;
 }
 
@@ -2476,14 +2574,17 @@ 
 function wp_delete_post( $postid = 0, $force_delete = false ) {
 	global $wpdb;
 
-	if ( !$post = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->posts WHERE ID = %d", $postid)) )
-		return $post;
+	if ( !$post = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->posts WHERE ID = %d", $postid)) ) {
+			return $post;
+	}
 
-	if ( !$force_delete && ( $post->post_type == 'post' || $post->post_type == 'page') && get_post_status( $postid ) != 'trash' && EMPTY_TRASH_DAYS )
-		return wp_trash_post( $postid );
+	if ( !$force_delete && ( $post->post_type == 'post' || $post->post_type == 'page') && get_post_status( $postid ) != 'trash' && EMPTY_TRASH_DAYS ) {
+			return wp_trash_post( $postid );
+	}
 
-	if ( $post->post_type == 'attachment' )
-		return wp_delete_attachment( $postid, $force_delete );
+	if ( $post->post_type == 'attachment' ) {
+			return wp_delete_attachment( $postid, $force_delete );
+	}
 
 	/**
 	 * Filter whether a post deletion should take place.
@@ -2530,8 +2631,9 @@ 
 	// Do raw query. wp_get_post_revisions() is filtered.
 	$revision_ids = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_parent = %d AND post_type = 'revision'", $postid ) );
 	// Use wp_delete_post (via wp_delete_post_revision) again. Ensures any meta/misplaced data gets cleaned up.
-	foreach ( $revision_ids as $revision_id )
-		wp_delete_post_revision( $revision_id );
+	foreach ( $revision_ids as $revision_id ) {
+			wp_delete_post_revision( $revision_id );
+	}
 
 	// Point all attachments to this post up one level.
 	$wpdb->update( $wpdb->posts, $parent_data, $parent_where + array( 'post_type' => 'attachment' ) );
@@ -2546,8 +2648,9 @@ 
 	wp_defer_comment_counting( false );
 
 	$post_meta_ids = $wpdb->get_col( $wpdb->prepare( "SELECT meta_id FROM $wpdb->postmeta WHERE post_id = %d ", $postid ));
-	foreach ( $post_meta_ids as $mid )
-		delete_metadata_by_mid( 'post', $mid );
+	foreach ( $post_meta_ids as $mid ) {
+			delete_metadata_by_mid( 'post', $mid );
+	}
 
 	/**
 	 * Fires immediately before a post is deleted from the database.
@@ -2574,8 +2677,9 @@ 
 	clean_post_cache( $post );
 
 	if ( is_post_type_hierarchical( $post->post_type ) && $children ) {
-		foreach ( $children as $child )
-			clean_post_cache( $child );
+		foreach ( $children as $child ) {
+					clean_post_cache( $child );
+		}
 	}
 
 	wp_clear_scheduled_hook('publish_future_post', array( $postid ) );
@@ -2637,14 +2741,17 @@ 
  * @return false|array|WP_Post|null Post data array, otherwise false.
  */
 function wp_trash_post( $post_id = 0 ) {
-	if ( !EMPTY_TRASH_DAYS )
-		return wp_delete_post($post_id, true);
+	if ( !EMPTY_TRASH_DAYS ) {
+			return wp_delete_post($post_id, true);
+	}
 
-	if ( !$post = get_post($post_id, ARRAY_A) )
-		return $post;
+	if ( !$post = get_post($post_id, ARRAY_A) ) {
+			return $post;
+	}
 
-	if ( $post['post_status'] == 'trash' )
-		return false;
+	if ( $post['post_status'] == 'trash' ) {
+			return false;
+	}
 
 	/**
 	 * Fires before a post is sent to the trash.
@@ -2684,11 +2791,13 @@ 
  * @return WP_Post|false WP_Post object. False on failure.
  */
 function wp_untrash_post( $post_id = 0 ) {
-	if ( !$post = get_post($post_id, ARRAY_A) )
-		return $post;
+	if ( !$post = get_post($post_id, ARRAY_A) ) {
+			return $post;
+	}
 
-	if ( $post['post_status'] != 'trash' )
-		return false;
+	if ( $post['post_status'] != 'trash' ) {
+			return false;
+	}
 
 	/**
 	 * Fires before a post is restored from the trash.
@@ -2736,8 +2845,9 @@ 
 	global $wpdb;
 
 	$post = get_post($post);
-	if ( empty($post) )
-		return;
+	if ( empty($post) ) {
+			return;
+	}
 
 	$post_id = $post->ID;
 
@@ -2751,13 +2861,15 @@ 
 	do_action( 'trash_post_comments', $post_id );
 
 	$comments = $wpdb->get_results( $wpdb->prepare("SELECT comment_ID, comment_approved FROM $wpdb->comments WHERE comment_post_ID = %d", $post_id) );
-	if ( empty($comments) )
-		return;
+	if ( empty($comments) ) {
+			return;
+	}
 
 	// Cache current status for each comment.
 	$statuses = array();
-	foreach ( $comments as $comment )
-		$statuses[$comment->comment_ID] = $comment->comment_approved;
+	foreach ( $comments as $comment ) {
+			$statuses[$comment->comment_ID] = $comment->comment_approved;
+	}
 	add_post_meta($post_id, '_wp_trash_meta_comments_status', $statuses);
 
 	// Set status for all comments to post-trashed.
@@ -2792,15 +2904,17 @@ 
 	global $wpdb;
 
 	$post = get_post($post);
-	if ( empty($post) )
-		return;
+	if ( empty($post) ) {
+			return;
+	}
 
 	$post_id = $post->ID;
 
 	$statuses = get_post_meta($post_id, '_wp_trash_meta_comments_status', true);
 
-	if ( empty($statuses) )
-		return true;
+	if ( empty($statuses) ) {
+			return true;
+	}
 
 	/**
 	 * Fires before comments are restored for a post from the trash.
@@ -2813,8 +2927,9 @@ 
 
 	// Restore each comment to its original status.
 	$group_by_status = array();
-	foreach ( $statuses as $comment_id => $comment_status )
-		$group_by_status[$comment_status][] = $comment_id;
+	foreach ( $statuses as $comment_id => $comment_status ) {
+			$group_by_status[$comment_status][] = $comment_id;
+	}
 
 	foreach ( $group_by_status as $status => $comments ) {
 		// Sanity check. This shouldn't happen.
@@ -3566,8 +3681,9 @@ 
 	$post = get_post($postarr['ID'], ARRAY_A);
 
 	if ( is_null( $post ) ) {
-		if ( $wp_error )
-			return new WP_Error( 'invalid_post', __( 'Invalid post ID.' ) );
+		if ( $wp_error ) {
+					return new WP_Error( 'invalid_post', __( 'Invalid post ID.' ) );
+		}
 		return 0;
 	}
 
@@ -3576,17 +3692,19 @@ 
 
 	// Passed post category list overwrites existing category list if not empty.
 	if ( isset($postarr['post_category']) && is_array($postarr['post_category'])
-			 && 0 != count($postarr['post_category']) )
-		$post_cats = $postarr['post_category'];
-	else
-		$post_cats = $post['post_category'];
+			 && 0 != count($postarr['post_category']) ) {
+			$post_cats = $postarr['post_category'];
+	} else {
+			$post_cats = $post['post_category'];
+	}
 
 	// Drafts shouldn't be assigned a date unless explicitly done so by the user.
 	if ( isset( $post['post_status'] ) && in_array($post['post_status'], array('draft', 'pending', 'auto-draft')) && empty($postarr['edit_date']) &&
-			 ('0000-00-00 00:00:00' == $post['post_date_gmt']) )
-		$clear_date = true;
-	else
-		$clear_date = false;
+			 ('0000-00-00 00:00:00' == $post['post_date_gmt']) ) {
+			$clear_date = true;
+	} else {
+			$clear_date = false;
+	}
 
 	// Merge old and new fields with new fields overwriting old ones.
 	$postarr = array_merge($post, $postarr);
@@ -3596,8 +3714,9 @@ 
 		$postarr['post_date_gmt'] = '';
 	}
 
-	if ($postarr['post_type'] == 'attachment')
-		return wp_insert_attachment($postarr);
+	if ($postarr['post_type'] == 'attachment') {
+			return wp_insert_attachment($postarr);
+	}
 
 	return wp_insert_post( $postarr, $wp_error );
 }
@@ -3614,11 +3733,13 @@ 
 function wp_publish_post( $post ) {
 	global $wpdb;
 
-	if ( ! $post = get_post( $post ) )
-		return;
+	if ( ! $post = get_post( $post ) ) {
+			return;
+	}
 
-	if ( 'publish' == $post->post_status )
-		return;
+	if ( 'publish' == $post->post_status ) {
+			return;
+	}
 
 	$wpdb->update( $wpdb->posts, array( 'post_status' => 'publish' ), array( 'ID' => $post->ID ) );
 
@@ -3654,11 +3775,13 @@ 
 function check_and_publish_future_post( $post_id ) {
 	$post = get_post($post_id);
 
-	if ( empty($post) )
-		return;
+	if ( empty($post) ) {
+			return;
+	}
 
-	if ( 'future' != $post->post_status )
-		return;
+	if ( 'future' != $post->post_status ) {
+			return;
+	}
 
 	$time = strtotime( $post->post_date_gmt . ' GMT' );
 
@@ -3689,16 +3812,18 @@ 
  * @return string Unique slug for the post, based on $post_name (with a -1, -2, etc. suffix)
  */
 function wp_unique_post_slug( $slug, $post_ID, $post_status, $post_type, $post_parent ) {
-	if ( in_array( $post_status, array( 'draft', 'pending', 'auto-draft' ) ) || ( 'inherit' == $post_status && 'revision' == $post_type ) )
-		return $slug;
+	if ( in_array( $post_status, array( 'draft', 'pending', 'auto-draft' ) ) || ( 'inherit' == $post_status && 'revision' == $post_type ) ) {
+			return $slug;
+	}
 
 	global $wpdb, $wp_rewrite;
 
 	$original_slug = $slug;
 
 	$feeds = $wp_rewrite->feeds;
-	if ( ! is_array( $feeds ) )
-		$feeds = array();
+	if ( ! is_array( $feeds ) ) {
+			$feeds = array();
+	}
 
 	if ( 'attachment' == $post_type ) {
 		// Attachment slugs must be unique across all types.
@@ -3723,8 +3848,9 @@ 
 			$slug = $alt_post_name;
 		}
 	} elseif ( is_post_type_hierarchical( $post_type ) ) {
-		if ( 'nav_menu_item' == $post_type )
-			return $slug;
+		if ( 'nav_menu_item' == $post_type ) {
+					return $slug;
+		}
 
 		/*
 		 * Page slugs must be unique within their own trees. Pages are in a separate
@@ -3829,10 +3955,11 @@ 
 function _truncate_post_slug( $slug, $length = 200 ) {
 	if ( strlen( $slug ) > $length ) {
 		$decoded_slug = urldecode( $slug );
-		if ( $decoded_slug === $slug )
-			$slug = substr( $slug, 0, $length );
-		else
-			$slug = utf8_uri_encode( $decoded_slug, $length );
+		if ( $decoded_slug === $slug ) {
+					$slug = substr( $slug, 0, $length );
+		} else {
+					$slug = utf8_uri_encode( $decoded_slug, $length );
+		}
 	}
 
 	return rtrim( $slug, '-' );
@@ -3890,16 +4017,19 @@ 
 function wp_set_post_terms( $post_id = 0, $tags = '', $taxonomy = 'post_tag', $append = false ) {
 	$post_id = (int) $post_id;
 
-	if ( !$post_id )
-		return false;
+	if ( !$post_id ) {
+			return false;
+	}
 
-	if ( empty($tags) )
-		$tags = array();
+	if ( empty($tags) ) {
+			$tags = array();
+	}
 
 	if ( ! is_array( $tags ) ) {
 		$comma = _x( ',', 'tag delimiter' );
-		if ( ',' !== $comma )
-			$tags = str_replace( $comma, ',', $tags );
+		if ( ',' !== $comma ) {
+					$tags = str_replace( $comma, ',', $tags );
+		}
 		$tags = explode( ',', trim( $tags, " \n\t\r\0\x0B," ) );
 	}
 
@@ -4065,12 +4195,14 @@ 
 function get_enclosed( $post_id ) {
 	$custom_fields = get_post_custom( $post_id );
 	$pung = array();
-	if ( !is_array( $custom_fields ) )
-		return $pung;
+	if ( !is_array( $custom_fields ) ) {
+			return $pung;
+	}
 
 	foreach ( $custom_fields as $key => $val ) {
-		if ( 'enclosure' != $key || !is_array( $val ) )
-			continue;
+		if ( 'enclosure' != $key || !is_array( $val ) ) {
+					continue;
+		}
 		foreach ( $val as $enc ) {
 			$enclosure = explode( "\n", $enc );
 			$pung[] = trim( $enclosure[ 0 ] );
@@ -4269,15 +4401,17 @@ 
 			while ( $p->post_parent != 0 && isset( $pages[ $p->post_parent ] ) ) {
 				$count++;
 				$parent = $pages[ $p->post_parent ];
-				if ( ! isset( $revparts[ $count ] ) || $parent->post_name != $revparts[ $count ] )
-					break;
+				if ( ! isset( $revparts[ $count ] ) || $parent->post_name != $revparts[ $count ] ) {
+									break;
+				}
 				$p = $parent;
 			}
 
 			if ( $p->post_parent == 0 && $count+1 == count( $revparts ) && $p->post_name == $revparts[ $count ] ) {
 				$foundid = $page->ID;
-				if ( $page->post_type == $post_type )
-					break;
+				if ( $page->post_type == $post_type ) {
+									break;
+				}
 			}
 		}
 	}
@@ -4434,8 +4568,9 @@ 
 		$page = get_post( $page );
 	}
 
-	if ( ! $page )
-		return false;
+	if ( ! $page ) {
+			return false;
+	}
 
 	$uri = $page->post_name;
 
@@ -4765,14 +4900,17 @@ 
  * @return bool True on success, false on failure.
  */
 function is_local_attachment($url) {
-	if (strpos($url, home_url()) === false)
-		return false;
-	if (strpos($url, home_url('/?attachment_id=')) !== false)
-		return true;
+	if (strpos($url, home_url()) === false) {
+			return false;
+	}
+	if (strpos($url, home_url('/?attachment_id=')) !== false) {
+			return true;
+	}
 	if ( $id = url_to_postid($url) ) {
 		$post = get_post($id);
-		if ( 'attachment' == $post->post_type )
-			return true;
+		if ( 'attachment' == $post->post_type ) {
+					return true;
+		}
 	}
 	return false;
 }
@@ -4839,14 +4977,17 @@ 
 function wp_delete_attachment( $post_id, $force_delete = false ) {
 	global $wpdb;
 
-	if ( !$post = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->posts WHERE ID = %d", $post_id) ) )
-		return $post;
+	if ( !$post = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->posts WHERE ID = %d", $post_id) ) ) {
+			return $post;
+	}
 
-	if ( 'attachment' != $post->post_type )
-		return false;
+	if ( 'attachment' != $post->post_type ) {
+			return false;
+	}
 
-	if ( !$force_delete && EMPTY_TRASH_DAYS && MEDIA_TRASH && 'trash' != $post->post_status )
-		return wp_trash_post( $post_id );
+	if ( !$force_delete && EMPTY_TRASH_DAYS && MEDIA_TRASH && 'trash' != $post->post_status ) {
+			return wp_trash_post( $post_id );
+	}
 
 	delete_post_meta($post_id, '_wp_trash_meta_status');
 	delete_post_meta($post_id, '_wp_trash_meta_time');
@@ -4855,8 +4996,9 @@ 
 	$backup_sizes = get_post_meta( $post->ID, '_wp_attachment_backup_sizes', true );
 	$file = get_attached_file( $post_id );
 
-	if ( is_multisite() )
-		delete_transient( 'dirsize_cache' );
+	if ( is_multisite() ) {
+			delete_transient( 'dirsize_cache' );
+	}
 
 	/**
 	 * Fires before an attachment is deleted, at the start of wp_delete_attachment().
@@ -4883,8 +5025,9 @@ 
 	wp_defer_comment_counting( false );
 
 	$post_meta_ids = $wpdb->get_col( $wpdb->prepare( "SELECT meta_id FROM $wpdb->postmeta WHERE post_id = %d ", $post_id ));
-	foreach ( $post_meta_ids as $mid )
-		delete_metadata_by_mid( 'post', $mid );
+	foreach ( $post_meta_ids as $mid ) {
+			delete_metadata_by_mid( 'post', $mid );
+	}
 
 	/** This action is documented in wp-includes/post.php */
 	do_action( 'delete_post', $post_id );
@@ -4944,13 +5087,15 @@ 
  */
 function wp_get_attachment_metadata( $post_id = 0, $unfiltered = false ) {
 	$post_id = (int) $post_id;
-	if ( !$post = get_post( $post_id ) )
-		return false;
+	if ( !$post = get_post( $post_id ) ) {
+			return false;
+	}
 
 	$data = get_post_meta( $post->ID, '_wp_attachment_metadata', true );
 
-	if ( $unfiltered )
-		return $data;
+	if ( $unfiltered ) {
+			return $data;
+	}
 
 	/**
 	 * Filter the attachment meta data.
@@ -4975,8 +5120,9 @@ 
  */
 function wp_update_attachment_metadata( $post_id, $data ) {
 	$post_id = (int) $post_id;
-	if ( !$post = get_post( $post_id ) )
-		return false;
+	if ( !$post = get_post( $post_id ) ) {
+			return false;
+	}
 
 	/**
 	 * Filter the updated attachment meta data.
@@ -4986,11 +5132,12 @@ 
 	 * @param array $data    Array of updated attachment meta data.
 	 * @param int   $post_id Attachment ID.
 	 */
-	if ( $data = apply_filters( 'wp_update_attachment_metadata', $data, $post->ID ) )
-		return update_post_meta( $post->ID, '_wp_attachment_metadata', $data );
-	else
-		return delete_post_meta( $post->ID, '_wp_attachment_metadata' );
-}
+	if ( $data = apply_filters( 'wp_update_attachment_metadata', $data, $post->ID ) ) {
+			return update_post_meta( $post->ID, '_wp_attachment_metadata', $data );
+	} else {
+			return delete_post_meta( $post->ID, '_wp_attachment_metadata' );
+	}
+	}
 
 /**
  * Retrieve the URL for an attachment.
@@ -5004,11 +5151,13 @@ 
  */
 function wp_get_attachment_url( $post_id = 0 ) {
 	$post_id = (int) $post_id;
-	if ( !$post = get_post( $post_id ) )
-		return false;
+	if ( !$post = get_post( $post_id ) ) {
+			return false;
+	}
 
-	if ( 'attachment' != $post->post_type )
-		return false;
+	if ( 'attachment' != $post->post_type ) {
+			return false;
+	}
 
 	$url = '';
 	// Get attached file.
@@ -5052,8 +5201,9 @@ 
 	 */
 	$url = apply_filters( 'wp_get_attachment_url', $url, $post->ID );
 
-	if ( empty( $url ) )
-		return false;
+	if ( empty( $url ) ) {
+			return false;
+	}
 
 	return $url;
 }
@@ -5068,10 +5218,12 @@ 
  */
 function wp_get_attachment_thumb_file( $post_id = 0 ) {
 	$post_id = (int) $post_id;
-	if ( !$post = get_post( $post_id ) )
-		return false;
-	if ( !is_array( $imagedata = wp_get_attachment_metadata( $post->ID ) ) )
-		return false;
+	if ( !$post = get_post( $post_id ) ) {
+			return false;
+	}
+	if ( !is_array( $imagedata = wp_get_attachment_metadata( $post->ID ) ) ) {
+			return false;
+	}
 
 	$file = get_attached_file( $post->ID );
 
@@ -5099,17 +5251,21 @@ 
  */
 function wp_get_attachment_thumb_url( $post_id = 0 ) {
 	$post_id = (int) $post_id;
-	if ( !$post = get_post( $post_id ) )
-		return false;
-	if ( !$url = wp_get_attachment_url( $post->ID ) )
-		return false;
+	if ( !$post = get_post( $post_id ) ) {
+			return false;
+	}
+	if ( !$url = wp_get_attachment_url( $post->ID ) ) {
+			return false;
+	}
 
 	$sized = image_downsize( $post_id, 'thumbnail' );
-	if ( $sized )
-		return $sized[0];
+	if ( $sized ) {
+			return $sized[0];
+	}
 
-	if ( !$thumb = wp_get_attachment_thumb_file( $post->ID ) )
-		return false;
+	if ( !$thumb = wp_get_attachment_thumb_file( $post->ID ) ) {
+			return false;
+	}
 
 	$url = str_replace(basename($url), basename($thumb), $url);
 
@@ -5196,8 +5352,9 @@ 
  * @return string|false Icon, false otherwise.
  */
 function wp_mime_type_icon( $mime = 0 ) {
-	if ( !is_numeric($mime) )
-		$icon = wp_cache_get("mime_type_icon_$mime");
+	if ( !is_numeric($mime) ) {
+			$icon = wp_cache_get("mime_type_icon_$mime");
+	}
 
 	$post_id = 0;
 	if ( empty($icon) ) {
@@ -5210,8 +5367,9 @@ 
 				$ext = preg_replace('/^.+?\.([^.]+)$/', '$1', $file);
 				if ( !empty($ext) ) {
 					$post_mimes[] = $ext;
-					if ( $ext_type = wp_ext2type( $ext ) )
-						$post_mimes[] = $ext_type;
+					if ( $ext_type = wp_ext2type( $ext ) ) {
+											$post_mimes[] = $ext_type;
+					}
 				}
 				$mime = $post->post_mime_type;
 			} else {
@@ -5258,11 +5416,13 @@ 
 				if ( $dh = opendir($dir) ) {
 					while ( false !== $file = readdir($dh) ) {
 						$file = basename($file);
-						if ( substr($file, 0, 1) == '.' )
-							continue;
+						if ( substr($file, 0, 1) == '.' ) {
+													continue;
+						}
 						if ( !in_array(strtolower(substr($file, -4)), array('.png', '.gif', '.jpg') ) ) {
-							if ( is_dir("$dir/$file") )
-								$dirs["$dir/$file"] = "$uri/$file";
+							if ( is_dir("$dir/$file") ) {
+															$dirs["$dir/$file"] = "$uri/$file";
+							}
 							continue;
 						}
 						$icon_files["$dir/$file"] = "$uri/$file";
@@ -5275,8 +5435,9 @@ 
 
 		$types = array();
 		// Icon basename - extension = MIME wildcard.
-		foreach ( $icon_files as $file => $uri )
-			$types[ preg_replace('/^([^.]*).*$/', '$1', basename($file)) ] =& $icon_files[$file];
+		foreach ( $icon_files as $file => $uri ) {
+					$types[ preg_replace('/^([^.]*).*$/', '$1', basename($file)) ] =& $icon_files[$file];
+		}
 
 		if ( ! empty($mime) ) {
 			$post_mimes[] = substr($mime, 0, strpos($mime, '/'));
@@ -5611,12 +5772,14 @@ 
  * @param array $posts Array of post objects, passed by reference.
  */
 function update_post_cache( &$posts ) {
-	if ( ! $posts )
-		return;
+	if ( ! $posts ) {
+			return;
+	}
 
-	foreach ( $posts as $post )
-		wp_cache_add( $post->ID, $post, 'posts' );
-}
+	foreach ( $posts as $post ) {
+			wp_cache_add( $post->ID, $post, 'posts' );
+	}
+	}
 
 /**
  * Will clean the post in the cache.
@@ -5636,12 +5799,14 @@ 
 function clean_post_cache( $post ) {
 	global $_wp_suspend_cache_invalidation;
 
-	if ( ! empty( $_wp_suspend_cache_invalidation ) )
-		return;
+	if ( ! empty( $_wp_suspend_cache_invalidation ) ) {
+			return;
+	}
 
 	$post = get_post( $post );
-	if ( empty( $post ) )
-		return;
+	if ( empty( $post ) ) {
+			return;
+	}
 
 	wp_cache_delete( $post->ID, 'posts' );
 	wp_cache_delete( $post->ID, 'post_meta' );
@@ -5688,17 +5853,20 @@ 
  */
 function update_post_caches( &$posts, $post_type = 'post', $update_term_cache = true, $update_meta_cache = true ) {
 	// No point in doing all this work if we didn't match any posts.
-	if ( !$posts )
-		return;
+	if ( !$posts ) {
+			return;
+	}
 
 	update_post_cache($posts);
 
 	$post_ids = array();
-	foreach ( $posts as $post )
-		$post_ids[] = $post->ID;
+	foreach ( $posts as $post ) {
+			$post_ids[] = $post->ID;
+	}
 
-	if ( ! $post_type )
-		$post_type = 'any';
+	if ( ! $post_type ) {
+			$post_type = 'any';
+	}
 
 	if ( $update_term_cache ) {
 		if ( is_array($post_type) ) {
@@ -5714,13 +5882,15 @@ 
 			$ptypes = array($post_type);
 		}
 
-		if ( ! empty($ptypes) )
-			update_object_term_cache($post_ids, $ptypes);
+		if ( ! empty($ptypes) ) {
+					update_object_term_cache($post_ids, $ptypes);
+		}
 	}
 
-	if ( $update_meta_cache )
-		update_postmeta_cache($post_ids);
-}
+	if ( $update_meta_cache ) {
+			update_postmeta_cache($post_ids);
+	}
+	}
 
 /**
  * Updates metadata cache for list of post IDs.
@@ -5757,16 +5927,18 @@ 
 function clean_attachment_cache( $id, $clean_terms = false ) {
 	global $_wp_suspend_cache_invalidation;
 
-	if ( !empty($_wp_suspend_cache_invalidation) )
-		return;
+	if ( !empty($_wp_suspend_cache_invalidation) ) {
+			return;
+	}
 
 	$id = (int) $id;
 
 	wp_cache_delete($id, 'posts');
 	wp_cache_delete($id, 'post_meta');
 
-	if ( $clean_terms )
-		clean_object_term_cache($id, 'attachment');
+	if ( $clean_terms ) {
+			clean_object_term_cache($id, 'attachment');
+	}
 
 	/**
 	 * Fires after the given attachment's cache is cleaned.
@@ -5800,8 +5972,9 @@ 
 
 	if ( $old_status != 'publish' && $new_status == 'publish' ) {
 		// Reset GUID if transitioning to publish and it is empty.
-		if ( '' == get_the_guid($post->ID) )
-			$wpdb->update( $wpdb->posts, array( 'guid' => get_permalink( $post->ID ) ), array( 'ID' => $post->ID ) );
+		if ( '' == get_the_guid($post->ID) ) {
+					$wpdb->update( $wpdb->posts, array( 'guid' => get_permalink( $post->ID ) ), array( 'ID' => $post->ID ) );
+		}
 
 		/**
 		 * Fires when a post's status is transitioned from private to published.
@@ -5873,11 +6046,13 @@ 
 		do_action( 'xmlrpc_publish_post', $post_id );
 	}
 
-	if ( defined('WP_IMPORTING') )
-		return;
+	if ( defined('WP_IMPORTING') ) {
+			return;
+	}
 
-	if ( get_option('default_pingback_flag') )
-		add_post_meta( $post_id, '_pingme', '1' );
+	if ( get_option('default_pingback_flag') ) {
+			add_post_meta( $post_id, '_pingme', '1' );
+	}
 	add_post_meta( $post_id, '_encloseme', '1' );
 
 	wp_schedule_single_event(time(), 'do_pings');
@@ -5894,8 +6069,9 @@ 
  */
 function wp_get_post_parent_id( $post_ID ) {
 	$post = get_post( $post_ID );
-	if ( !$post || is_wp_error( $post ) )
-		return false;
+	if ( !$post || is_wp_error( $post ) ) {
+			return false;
+	}
 	return (int) $post->post_parent;
 }
 
@@ -5915,28 +6091,35 @@ 
  */
 function wp_check_post_hierarchy_for_loops( $post_parent, $post_ID ) {
 	// Nothing fancy here - bail.
-	if ( !$post_parent )
-		return 0;
+	if ( !$post_parent ) {
+			return 0;
+	}
 
 	// New post can't cause a loop.
-	if ( empty( $post_ID ) )
-		return $post_parent;
+	if ( empty( $post_ID ) ) {
+			return $post_parent;
+	}
 
 	// Can't be its own parent.
-	if ( $post_parent == $post_ID )
-		return 0;
+	if ( $post_parent == $post_ID ) {
+			return 0;
+	}
 
 	// Now look for larger loops.
-	if ( !$loop = wp_find_hierarchy_loop( 'wp_get_post_parent_id', $post_ID, $post_parent ) )
-		return $post_parent; // No loop
+	if ( !$loop = wp_find_hierarchy_loop( 'wp_get_post_parent_id', $post_ID, $post_parent ) ) {
+			return $post_parent;
+	}
+	// No loop
 
 	// Setting $post_parent to the given value causes a loop.
-	if ( isset( $loop[$post_ID] ) )
-		return 0;
+	if ( isset( $loop[$post_ID] ) ) {
+			return 0;
+	}
 
 	// There's a loop, but it doesn't contain $post_ID. Break the loop.
-	foreach ( array_keys( $loop ) as $loop_member )
-		wp_update_post( array( 'ID' => $loop_member, 'post_parent' => 0 ) );
+	foreach ( array_keys( $loop ) as $loop_member ) {
+			wp_update_post( array( 'ID' => $loop_member, 'post_parent' => 0 ) );
+	}
 
 	return $post_parent;
 }
@@ -5954,10 +6137,11 @@ 
 	$post = get_post( $post );
 	$thumbnail_id = absint( $thumbnail_id );
 	if ( $post && $thumbnail_id && get_post( $thumbnail_id ) ) {
-		if ( wp_get_attachment_image( $thumbnail_id, 'thumbnail' ) )
-			return update_post_meta( $post->ID, '_thumbnail_id', $thumbnail_id );
-		else
-			return delete_post_meta( $post->ID, '_thumbnail_id' );
+		if ( wp_get_attachment_image( $thumbnail_id, 'thumbnail' ) ) {
+					return update_post_meta( $post->ID, '_thumbnail_id', $thumbnail_id );
+		} else {
+					return delete_post_meta( $post->ID, '_thumbnail_id' );
+		}
 	}
 	return false;
 }
@@ -5972,8 +6156,9 @@ 
  */
 function delete_post_thumbnail( $post ) {
 	$post = get_post( $post );
-	if ( $post )
-		return delete_post_meta( $post->ID, '_thumbnail_id' );
+	if ( $post ) {
+			return delete_post_meta( $post->ID, '_thumbnail_id' );
+	}
 	return false;
 }
 

src/wp-includes/query.php

Doc Comments +7 added lines, -7 removed lines

@@ -20,7 +20,7 @@ 
  * @global WP_Query $wp_query Global WP_Query instance.
  *
  * @param string $var       The variable key to retrieve.
- * @param mixed  $default   Optional. Value to return if the query variable is not set. Default empty.
+ * @param boolean  $default   Optional. Value to return if the query variable is not set. Default empty.
  * @return mixed Contents of the query variable.
  */
 function get_query_var( $var, $default = '' ) {
@@ -281,8 +281,8 @@ 
  *
  * @global WP_Query $wp_query Global WP_Query instance.
  *
- * @param string|array     $taxonomy Optional. Taxonomy slug or slugs.
- * @param int|string|array $term     Optional. Term ID, name, slug or array of Term IDs, names, and slugs.
+ * @param string     $taxonomy Optional. Taxonomy slug or slugs.
+ * @param string $term     Optional. Term ID, name, slug or array of Term IDs, names, and slugs.
  * @return bool
  */
 function is_tax( $taxonomy = '', $term = '' ) {
@@ -2178,7 +2178,7 @@ 
 	 *
 	 * @since 3.7.0
 	 *
-	 * @param array $terms Terms to check.
+	 * @param string[] $terms Terms to check.
 	 * @return array Terms that are not stopwords.
 	 */
 	protected function parse_search_terms( $terms ) {
@@ -4140,7 +4140,7 @@ 
 	 * @access public
 	 *
 	 * @param string $name Property to check if set.
-	 * @return bool Whether the property is set.
+	 * @return boolean|null Whether the property is set.
 	 */
 	public function __isset( $name ) {
 		if ( in_array( $name, $this->compat_fields ) ) {
@@ -4739,8 +4739,8 @@ 
 	 * @global int             $more
 	 * @global int             $numpages
 	 *
-	 * @param WP_Post|object|int $post WP_Post instance or Post ID/object.
-	 * @return true True when finished.
+	 * @param WP_Post $post WP_Post instance or Post ID/object.
+	 * @return null|boolean True when finished.
 	 */
 	public function setup_postdata( $post ) {
 		global $id, $authordata, $currentday, $currentmonth, $page, $pages, $multipage, $more, $numpages;

Indentation +18 added lines, -18 removed lines

@@ -1,15 +1,15 @@ 
 <?php
 /**
- * WordPress Query API
- *
- * The query API attempts to get which part of WordPress the user is on. It
- * also provides functionality for getting URL query information.
- *
- * @link https://codex.wordpress.org/The_Loop More information on The Loop.
- *
- * @package WordPress
- * @subpackage Query
- */
+	 * WordPress Query API
+	 *
+	 * The query API attempts to get which part of WordPress the user is on. It
+	 * also provides functionality for getting URL query information.
+	 *
+	 * @link https://codex.wordpress.org/The_Loop More information on The Loop.
+	 *
+	 * @package WordPress
+	 * @subpackage Query
+	 */
 
 /**
  * Retrieve variable in the WP_Query class.
@@ -4166,14 +4166,14 @@ 
 	}
 
 	/**
- 	 * Is the query for an existing archive page?
- 	 *
- 	 * Month, Year, Category, Author, Post Type archive...
-	 *
- 	 * @since 3.1.0
- 	 *
- 	 * @return bool
- 	 */
+	 * Is the query for an existing archive page?
+	 *
+	 * Month, Year, Category, Author, Post Type archive...
+	 *
+	 * @since 3.1.0
+	 *
+	 * @return bool
+	 */
 	public function is_archive() {
 		return (bool) $this->is_archive;
 	}

Spacing +916 added lines, -916 removed lines

@@ -23,9 +23,9 @@ 
  * @param mixed  $default   Optional. Value to return if the query variable is not set. Default empty.
  * @return mixed Contents of the query variable.
  */
-function get_query_var( $var, $default = '' ) {
+function get_query_var($var, $default = '') {
 	global $wp_query;
-	return $wp_query->get( $var, $default );
+	return $wp_query->get($var, $default);
 }
 
 /**
@@ -71,9 +71,9 @@ 
  * @param string $var   Query variable key.
  * @param mixed  $value Query variable value.
  */
-function set_query_var( $var, $value ) {
+function set_query_var($var, $value) {
 	global $wp_query;
-	$wp_query->set( $var, $value );
+	$wp_query->set($var, $value);
 }
 
 /**
@@ -122,7 +122,7 @@ 
 function wp_reset_postdata() {
 	global $wp_query;
 
-	if ( isset( $wp_query ) ) {
+	if (isset($wp_query)) {
 		$wp_query->reset_postdata();
 	}
 }
@@ -145,8 +145,8 @@ 
 function is_archive() {
 	global $wp_query;
 
-	if ( ! isset( $wp_query ) ) {
-		_doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the query is run. Before then, they always return false.' ), '3.1' );
+	if ( ! isset($wp_query)) {
+		_doing_it_wrong(__FUNCTION__, __('Conditional query tags do not work before the query is run. Before then, they always return false.'), '3.1');
 		return false;
 	}
 
@@ -163,15 +163,15 @@ 
  * @param string|array $post_types Optional. Post type or array of posts types to check against.
  * @return bool
  */
-function is_post_type_archive( $post_types = '' ) {
+function is_post_type_archive($post_types = '') {
 	global $wp_query;
 
-	if ( ! isset( $wp_query ) ) {
-		_doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the query is run. Before then, they always return false.' ), '3.1' );
+	if ( ! isset($wp_query)) {
+		_doing_it_wrong(__FUNCTION__, __('Conditional query tags do not work before the query is run. Before then, they always return false.'), '3.1');
 		return false;
 	}
 
-	return $wp_query->is_post_type_archive( $post_types );
+	return $wp_query->is_post_type_archive($post_types);
 }
 
 /**
@@ -184,15 +184,15 @@ 
  * @param int|string|array|object $attachment Attachment ID, title, slug, or array of such.
  * @return bool
  */
-function is_attachment( $attachment = '' ) {
+function is_attachment($attachment = '') {
 	global $wp_query;
 
-	if ( ! isset( $wp_query ) ) {
-		_doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the query is run. Before then, they always return false.' ), '3.1' );
+	if ( ! isset($wp_query)) {
+		_doing_it_wrong(__FUNCTION__, __('Conditional query tags do not work before the query is run. Before then, they always return false.'), '3.1');
 		return false;
 	}
 
-	return $wp_query->is_attachment( $attachment );
+	return $wp_query->is_attachment($attachment);
 }
 
 /**
@@ -208,15 +208,15 @@ 
  * @param mixed $author Optional. User ID, nickname, nicename, or array of User IDs, nicknames, and nicenames
  * @return bool
  */
-function is_author( $author = '' ) {
+function is_author($author = '') {
 	global $wp_query;
 
-	if ( ! isset( $wp_query ) ) {
-		_doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the query is run. Before then, they always return false.' ), '3.1' );
+	if ( ! isset($wp_query)) {
+		_doing_it_wrong(__FUNCTION__, __('Conditional query tags do not work before the query is run. Before then, they always return false.'), '3.1');
 		return false;
 	}
 
-	return $wp_query->is_author( $author );
+	return $wp_query->is_author($author);
 }
 
 /**
@@ -232,15 +232,15 @@ 
  * @param mixed $category Optional. Category ID, name, slug, or array of Category IDs, names, and slugs.
  * @return bool
  */
-function is_category( $category = '' ) {
+function is_category($category = '') {
 	global $wp_query;
 
-	if ( ! isset( $wp_query ) ) {
-		_doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the query is run. Before then, they always return false.' ), '3.1' );
+	if ( ! isset($wp_query)) {
+		_doing_it_wrong(__FUNCTION__, __('Conditional query tags do not work before the query is run. Before then, they always return false.'), '3.1');
 		return false;
 	}
 
-	return $wp_query->is_category( $category );
+	return $wp_query->is_category($category);
 }
 
 /**
@@ -256,15 +256,15 @@ 
  * @param mixed $tag Optional. Tag ID, name, slug, or array of Tag IDs, names, and slugs.
  * @return bool
  */
-function is_tag( $tag = '' ) {
+function is_tag($tag = '') {
 	global $wp_query;
 
-	if ( ! isset( $wp_query ) ) {
-		_doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the query is run. Before then, they always return false.' ), '3.1' );
+	if ( ! isset($wp_query)) {
+		_doing_it_wrong(__FUNCTION__, __('Conditional query tags do not work before the query is run. Before then, they always return false.'), '3.1');
 		return false;
 	}
 
-	return $wp_query->is_tag( $tag );
+	return $wp_query->is_tag($tag);
 }
 
 /**
@@ -285,15 +285,15 @@ 
  * @param int|string|array $term     Optional. Term ID, name, slug or array of Term IDs, names, and slugs.
  * @return bool
  */
-function is_tax( $taxonomy = '', $term = '' ) {
+function is_tax($taxonomy = '', $term = '') {
 	global $wp_query;
 
-	if ( ! isset( $wp_query ) ) {
-		_doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the query is run. Before then, they always return false.' ), '3.1' );
+	if ( ! isset($wp_query)) {
+		_doing_it_wrong(__FUNCTION__, __('Conditional query tags do not work before the query is run. Before then, they always return false.'), '3.1');
 		return false;
 	}
 
-	return $wp_query->is_tax( $taxonomy, $term );
+	return $wp_query->is_tax($taxonomy, $term);
 }
 
 /**
@@ -308,8 +308,8 @@ 
 function is_date() {
 	global $wp_query;
 
-	if ( ! isset( $wp_query ) ) {
-		_doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the query is run. Before then, they always return false.' ), '3.1' );
+	if ( ! isset($wp_query)) {
+		_doing_it_wrong(__FUNCTION__, __('Conditional query tags do not work before the query is run. Before then, they always return false.'), '3.1');
 		return false;
 	}
 
@@ -328,8 +328,8 @@ 
 function is_day() {
 	global $wp_query;
 
-	if ( ! isset( $wp_query ) ) {
-		_doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the query is run. Before then, they always return false.' ), '3.1' );
+	if ( ! isset($wp_query)) {
+		_doing_it_wrong(__FUNCTION__, __('Conditional query tags do not work before the query is run. Before then, they always return false.'), '3.1');
 		return false;
 	}
 
@@ -346,15 +346,15 @@ 
  * @param string|array $feeds Optional feed types to check.
  * @return bool
  */
-function is_feed( $feeds = '' ) {
+function is_feed($feeds = '') {
 	global $wp_query;
 
-	if ( ! isset( $wp_query ) ) {
-		_doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the query is run. Before then, they always return false.' ), '3.1' );
+	if ( ! isset($wp_query)) {
+		_doing_it_wrong(__FUNCTION__, __('Conditional query tags do not work before the query is run. Before then, they always return false.'), '3.1');
 		return false;
 	}
 
-	return $wp_query->is_feed( $feeds );
+	return $wp_query->is_feed($feeds);
 }
 
 /**
@@ -369,8 +369,8 @@ 
 function is_comment_feed() {
 	global $wp_query;
 
-	if ( ! isset( $wp_query ) ) {
-		_doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the query is run. Before then, they always return false.' ), '3.1' );
+	if ( ! isset($wp_query)) {
+		_doing_it_wrong(__FUNCTION__, __('Conditional query tags do not work before the query is run. Before then, they always return false.'), '3.1');
 		return false;
 	}
 
@@ -398,8 +398,8 @@ 
 function is_front_page() {
 	global $wp_query;
 
-	if ( ! isset( $wp_query ) ) {
-		_doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the query is run. Before then, they always return false.' ), '3.1' );
+	if ( ! isset($wp_query)) {
+		_doing_it_wrong(__FUNCTION__, __('Conditional query tags do not work before the query is run. Before then, they always return false.'), '3.1');
 		return false;
 	}
 
@@ -427,8 +427,8 @@ 
 function is_home() {
 	global $wp_query;
 
-	if ( ! isset( $wp_query ) ) {
-		_doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the query is run. Before then, they always return false.' ), '3.1' );
+	if ( ! isset($wp_query)) {
+		_doing_it_wrong(__FUNCTION__, __('Conditional query tags do not work before the query is run. Before then, they always return false.'), '3.1');
 		return false;
 	}
 
@@ -447,8 +447,8 @@ 
 function is_month() {
 	global $wp_query;
 
-	if ( ! isset( $wp_query ) ) {
-		_doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the query is run. Before then, they always return false.' ), '3.1' );
+	if ( ! isset($wp_query)) {
+		_doing_it_wrong(__FUNCTION__, __('Conditional query tags do not work before the query is run. Before then, they always return false.'), '3.1');
 		return false;
 	}
 
@@ -471,15 +471,15 @@ 
  * @param int|string|array $page Optional. Page ID, title, slug, or array of such. Default empty.
  * @return bool Whether the query is for an existing single page.
  */
-function is_page( $page = '' ) {
+function is_page($page = '') {
 	global $wp_query;
 
-	if ( ! isset( $wp_query ) ) {
-		_doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the query is run. Before then, they always return false.' ), '3.1' );
+	if ( ! isset($wp_query)) {
+		_doing_it_wrong(__FUNCTION__, __('Conditional query tags do not work before the query is run. Before then, they always return false.'), '3.1');
 		return false;
 	}
 
-	return $wp_query->is_page( $page );
+	return $wp_query->is_page($page);
 }
 
 /**
@@ -494,8 +494,8 @@ 
 function is_paged() {
 	global $wp_query;
 
-	if ( ! isset( $wp_query ) ) {
-		_doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the query is run. Before then, they always return false.' ), '3.1' );
+	if ( ! isset($wp_query)) {
+		_doing_it_wrong(__FUNCTION__, __('Conditional query tags do not work before the query is run. Before then, they always return false.'), '3.1');
 		return false;
 	}
 
@@ -514,8 +514,8 @@ 
 function is_preview() {
 	global $wp_query;
 
-	if ( ! isset( $wp_query ) ) {
-		_doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the query is run. Before then, they always return false.' ), '3.1' );
+	if ( ! isset($wp_query)) {
+		_doing_it_wrong(__FUNCTION__, __('Conditional query tags do not work before the query is run. Before then, they always return false.'), '3.1');
 		return false;
 	}
 
@@ -534,8 +534,8 @@ 
 function is_robots() {
 	global $wp_query;
 
-	if ( ! isset( $wp_query ) ) {
-		_doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the query is run. Before then, they always return false.' ), '3.1' );
+	if ( ! isset($wp_query)) {
+		_doing_it_wrong(__FUNCTION__, __('Conditional query tags do not work before the query is run. Before then, they always return false.'), '3.1');
 		return false;
 	}
 
@@ -554,8 +554,8 @@ 
 function is_search() {
 	global $wp_query;
 
-	if ( ! isset( $wp_query ) ) {
-		_doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the query is run. Before then, they always return false.' ), '3.1' );
+	if ( ! isset($wp_query)) {
+		_doing_it_wrong(__FUNCTION__, __('Conditional query tags do not work before the query is run. Before then, they always return false.'), '3.1');
 		return false;
 	}
 
@@ -580,15 +580,15 @@ 
  * @param int|string|array $post Optional. Post ID, title, slug, or array of such. Default empty.
  * @return bool Whether the query is for an existing single post.
  */
-function is_single( $post = '' ) {
+function is_single($post = '') {
 	global $wp_query;
 
-	if ( ! isset( $wp_query ) ) {
-		_doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the query is run. Before then, they always return false.' ), '3.1' );
+	if ( ! isset($wp_query)) {
+		_doing_it_wrong(__FUNCTION__, __('Conditional query tags do not work before the query is run. Before then, they always return false.'), '3.1');
 		return false;
 	}
 
-	return $wp_query->is_single( $post );
+	return $wp_query->is_single($post);
 }
 
 /**
@@ -607,15 +607,15 @@ 
  * @param string|array $post_types Optional. Post type or array of post types. Default empty.
  * @return bool Whether the query is for an existing single post of any of the given post types.
  */
-function is_singular( $post_types = '' ) {
+function is_singular($post_types = '') {
 	global $wp_query;
 
-	if ( ! isset( $wp_query ) ) {
-		_doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the query is run. Before then, they always return false.' ), '3.1' );
+	if ( ! isset($wp_query)) {
+		_doing_it_wrong(__FUNCTION__, __('Conditional query tags do not work before the query is run. Before then, they always return false.'), '3.1');
 		return false;
 	}
 
-	return $wp_query->is_singular( $post_types );
+	return $wp_query->is_singular($post_types);
 }
 
 /**
@@ -630,8 +630,8 @@ 
 function is_time() {
 	global $wp_query;
 
-	if ( ! isset( $wp_query ) ) {
-		_doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the query is run. Before then, they always return false.' ), '3.1' );
+	if ( ! isset($wp_query)) {
+		_doing_it_wrong(__FUNCTION__, __('Conditional query tags do not work before the query is run. Before then, they always return false.'), '3.1');
 		return false;
 	}
 
@@ -650,8 +650,8 @@ 
 function is_trackback() {
 	global $wp_query;
 
-	if ( ! isset( $wp_query ) ) {
-		_doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the query is run. Before then, they always return false.' ), '3.1' );
+	if ( ! isset($wp_query)) {
+		_doing_it_wrong(__FUNCTION__, __('Conditional query tags do not work before the query is run. Before then, they always return false.'), '3.1');
 		return false;
 	}
 
@@ -670,8 +670,8 @@ 
 function is_year() {
 	global $wp_query;
 
-	if ( ! isset( $wp_query ) ) {
-		_doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the query is run. Before then, they always return false.' ), '3.1' );
+	if ( ! isset($wp_query)) {
+		_doing_it_wrong(__FUNCTION__, __('Conditional query tags do not work before the query is run. Before then, they always return false.'), '3.1');
 		return false;
 	}
 
@@ -690,8 +690,8 @@ 
 function is_404() {
 	global $wp_query;
 
-	if ( ! isset( $wp_query ) ) {
-		_doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the query is run. Before then, they always return false.' ), '3.1' );
+	if ( ! isset($wp_query)) {
+		_doing_it_wrong(__FUNCTION__, __('Conditional query tags do not work before the query is run. Before then, they always return false.'), '3.1');
 		return false;
 	}
 
@@ -710,8 +710,8 @@ 
 function is_embed() {
 	global $wp_query;
 
-	if ( ! isset( $wp_query ) ) {
-		_doing_it_wrong( __FUNCTION__, __( 'Conditional query tags do not work before the query is run. Before then, they always return false.' ), '3.1' );
+	if ( ! isset($wp_query)) {
+		_doing_it_wrong(__FUNCTION__, __('Conditional query tags do not work before the query is run. Before then, they always return false.'), '3.1');
 		return false;
 	}
 
@@ -728,16 +728,16 @@ 
  * @return bool
  */
 function is_main_query() {
-	if ( 'pre_get_posts' === current_filter() ) {
+	if ('pre_get_posts' === current_filter()) {
 		$message = sprintf(
 			/* translators: 1: pre_get_posts 2: WP_Query->is_main_query() 3: is_main_query() 4: link to codex is_main_query() page. */
-			__( 'In %1$s, use the %2$s method, not the %3$s function. See %4$s.' ),
+			__('In %1$s, use the %2$s method, not the %3$s function. See %4$s.'),
 			'<code>pre_get_posts</code>',
 			'<code>WP_Query->is_main_query()</code>',
 			'<code>is_main_query()</code>',
-			__( 'https://codex.wordpress.org/Function_Reference/is_main_query' )
+			__('https://codex.wordpress.org/Function_Reference/is_main_query')
 		);
-		_doing_it_wrong( __FUNCTION__, $message, '3.7' );
+		_doing_it_wrong(__FUNCTION__, $message, '3.7');
 	}
 
 	global $wp_query;
@@ -1311,9 +1311,9 @@ 
 	 */
 	private $stopwords;
 
-	private $compat_fields = array( 'query_vars_hash', 'query_vars_changed' );
+	private $compat_fields = array('query_vars_hash', 'query_vars_changed');
 
-	private $compat_methods = array( 'init_query_flags', 'parse_tax_query' );
+	private $compat_methods = array('init_query_flags', 'parse_tax_query');
 
 	/**
 	 * Resets query flags to false.
@@ -1367,10 +1367,10 @@ 
 		$this->post_count = 0;
 		$this->current_post = -1;
 		$this->in_the_loop = false;
-		unset( $this->request );
-		unset( $this->post );
-		unset( $this->comments );
-		unset( $this->comment );
+		unset($this->request);
+		unset($this->post);
+		unset($this->comments);
+		unset($this->comment);
 		$this->comment_count = 0;
 		$this->current_comment = -1;
 		$this->found_posts = 0;
@@ -1441,17 +1441,17 @@ 
 			, 'embed'
 		);
 
-		foreach ( $keys as $key ) {
-			if ( !isset($array[$key]) )
+		foreach ($keys as $key) {
+			if ( ! isset($array[$key]))
 				$array[$key] = '';
 		}
 
-		$array_keys = array( 'category__in', 'category__not_in', 'category__and', 'post__in', 'post__not_in', 'post_name__in',
+		$array_keys = array('category__in', 'category__not_in', 'category__and', 'post__in', 'post__not_in', 'post_name__in',
 			'tag__in', 'tag__not_in', 'tag__and', 'tag_slug__in', 'tag_slug__and', 'post_parent__in', 'post_parent__not_in',
-			'author__in', 'author__not_in' );
+			'author__in', 'author__not_in');
 
-		foreach ( $array_keys as $key ) {
-			if ( !isset($array[$key]) )
+		foreach ($array_keys as $key) {
+			if ( ! isset($array[$key]))
 				$array[$key] = array();
 		}
 		return $array;
@@ -1570,11 +1570,11 @@ 
 	 *     @type int          $year                    The four-digit year. Default empty. Accepts any four-digit year.
 	 * }
 	 */
-	public function parse_query( $query =  '' ) {
-		if ( ! empty( $query ) ) {
+	public function parse_query($query = '') {
+		if ( ! empty($query)) {
 			$this->init();
-			$this->query = $this->query_vars = wp_parse_args( $query );
-		} elseif ( ! isset( $this->query ) ) {
+			$this->query = $this->query_vars = wp_parse_args($query);
+		} elseif ( ! isset($this->query)) {
 			$this->query = $this->query_vars;
 		}
 
@@ -1582,80 +1582,80 @@ 
 		$qv = &$this->query_vars;
 		$this->query_vars_changed = true;
 
-		if ( ! empty($qv['robots']) )
+		if ( ! empty($qv['robots']))
 			$this->is_robots = true;
 
-		$qv['p'] =  absint($qv['p']);
-		$qv['page_id'] =  absint($qv['page_id']);
+		$qv['p'] = absint($qv['p']);
+		$qv['page_id'] = absint($qv['page_id']);
 		$qv['year'] = absint($qv['year']);
 		$qv['monthnum'] = absint($qv['monthnum']);
 		$qv['day'] = absint($qv['day']);
 		$qv['w'] = absint($qv['w']);
-		$qv['m'] = preg_replace( '|[^0-9]|', '', $qv['m'] );
+		$qv['m'] = preg_replace('|[^0-9]|', '', $qv['m']);
 		$qv['paged'] = absint($qv['paged']);
-		$qv['cat'] = preg_replace( '|[^0-9,-]|', '', $qv['cat'] ); // comma separated list of positive or negative integers
-		$qv['author'] = preg_replace( '|[^0-9,-]|', '', $qv['author'] ); // comma separated list of positive or negative integers
-		$qv['pagename'] = trim( $qv['pagename'] );
-		$qv['name'] = trim( $qv['name'] );
-		$qv['title'] = trim( $qv['title'] );
-		if ( '' !== $qv['hour'] ) $qv['hour'] = absint($qv['hour']);
-		if ( '' !== $qv['minute'] ) $qv['minute'] = absint($qv['minute']);
-		if ( '' !== $qv['second'] ) $qv['second'] = absint($qv['second']);
-		if ( '' !== $qv['menu_order'] ) $qv['menu_order'] = absint($qv['menu_order']);
+		$qv['cat'] = preg_replace('|[^0-9,-]|', '', $qv['cat']); // comma separated list of positive or negative integers
+		$qv['author'] = preg_replace('|[^0-9,-]|', '', $qv['author']); // comma separated list of positive or negative integers
+		$qv['pagename'] = trim($qv['pagename']);
+		$qv['name'] = trim($qv['name']);
+		$qv['title'] = trim($qv['title']);
+		if ('' !== $qv['hour']) $qv['hour'] = absint($qv['hour']);
+		if ('' !== $qv['minute']) $qv['minute'] = absint($qv['minute']);
+		if ('' !== $qv['second']) $qv['second'] = absint($qv['second']);
+		if ('' !== $qv['menu_order']) $qv['menu_order'] = absint($qv['menu_order']);
 
 		// Fairly insane upper bound for search string lengths.
-		if ( ! is_scalar( $qv['s'] ) || ( ! empty( $qv['s'] ) && strlen( $qv['s'] ) > 1600 ) ) {
+		if ( ! is_scalar($qv['s']) || ( ! empty($qv['s']) && strlen($qv['s']) > 1600)) {
 			$qv['s'] = '';
 		}
 
 		// Compat. Map subpost to attachment.
-		if ( '' != $qv['subpost'] )
+		if ('' != $qv['subpost'])
 			$qv['attachment'] = $qv['subpost'];
-		if ( '' != $qv['subpost_id'] )
+		if ('' != $qv['subpost_id'])
 			$qv['attachment_id'] = $qv['subpost_id'];
 
 		$qv['attachment_id'] = absint($qv['attachment_id']);
 
-		if ( ('' != $qv['attachment']) || !empty($qv['attachment_id']) ) {
+		if (('' != $qv['attachment']) || ! empty($qv['attachment_id'])) {
 			$this->is_single = true;
 			$this->is_attachment = true;
-		} elseif ( '' != $qv['name'] ) {
+		} elseif ('' != $qv['name']) {
 			$this->is_single = true;
-		} elseif ( $qv['p'] ) {
+		} elseif ($qv['p']) {
 			$this->is_single = true;
-		} elseif ( ('' !== $qv['hour']) && ('' !== $qv['minute']) &&('' !== $qv['second']) && ('' != $qv['year']) && ('' != $qv['monthnum']) && ('' != $qv['day']) ) {
+		} elseif (('' !== $qv['hour']) && ('' !== $qv['minute']) && ('' !== $qv['second']) && ('' != $qv['year']) && ('' != $qv['monthnum']) && ('' != $qv['day'])) {
 			// If year, month, day, hour, minute, and second are set, a single
 			// post is being queried.
 			$this->is_single = true;
-		} elseif ( '' != $qv['static'] || '' != $qv['pagename'] || !empty($qv['page_id']) ) {
+		} elseif ('' != $qv['static'] || '' != $qv['pagename'] || ! empty($qv['page_id'])) {
 			$this->is_page = true;
 			$this->is_single = false;
 		} else {
 			// Look for archive queries. Dates, categories, authors, search, post type archives.
 
-			if ( isset( $this->query['s'] ) ) {
+			if (isset($this->query['s'])) {
 				$this->is_search = true;
 			}
 
-			if ( '' !== $qv['second'] ) {
+			if ('' !== $qv['second']) {
 				$this->is_time = true;
 				$this->is_date = true;
 			}
 
-			if ( '' !== $qv['minute'] ) {
+			if ('' !== $qv['minute']) {
 				$this->is_time = true;
 				$this->is_date = true;
 			}
 
-			if ( '' !== $qv['hour'] ) {
+			if ('' !== $qv['hour']) {
 				$this->is_time = true;
 				$this->is_date = true;
 			}
 
-			if ( $qv['day'] ) {
-				if ( ! $this->is_date ) {
-					$date = sprintf( '%04d-%02d-%02d', $qv['year'], $qv['monthnum'], $qv['day'] );
-					if ( $qv['monthnum'] && $qv['year'] && ! wp_checkdate( $qv['monthnum'], $qv['day'], $qv['year'], $date ) ) {
+			if ($qv['day']) {
+				if ( ! $this->is_date) {
+					$date = sprintf('%04d-%02d-%02d', $qv['year'], $qv['monthnum'], $qv['day']);
+					if ($qv['monthnum'] && $qv['year'] && ! wp_checkdate($qv['monthnum'], $qv['day'], $qv['year'], $date)) {
 						$qv['error'] = '404';
 					} else {
 						$this->is_day = true;
@@ -1664,9 +1664,9 @@ 
 				}
 			}
 
-			if ( $qv['monthnum'] ) {
-				if ( ! $this->is_date ) {
-					if ( 12 < $qv['monthnum'] ) {
+			if ($qv['monthnum']) {
+				if ( ! $this->is_date) {
+					if (12 < $qv['monthnum']) {
 						$qv['error'] = '404';
 					} else {
 						$this->is_month = true;
@@ -1675,40 +1675,40 @@ 
 				}
 			}
 
-			if ( $qv['year'] ) {
-				if ( ! $this->is_date ) {
+			if ($qv['year']) {
+				if ( ! $this->is_date) {
 					$this->is_year = true;
 					$this->is_date = true;
 				}
 			}
 
-			if ( $qv['m'] ) {
+			if ($qv['m']) {
 				$this->is_date = true;
-				if ( strlen($qv['m']) > 9 ) {
+				if (strlen($qv['m']) > 9) {
 					$this->is_time = true;
-				} elseif ( strlen( $qv['m'] ) > 7 ) {
+				} elseif (strlen($qv['m']) > 7) {
 					$this->is_day = true;
-				} elseif ( strlen( $qv['m'] ) > 5 ) {
+				} elseif (strlen($qv['m']) > 5) {
 					$this->is_month = true;
 				} else {
 					$this->is_year = true;
 				}
 			}
 
-			if ( '' != $qv['w'] ) {
+			if ('' != $qv['w']) {
 				$this->is_date = true;
 			}
 
 			$this->query_vars_hash = false;
-			$this->parse_tax_query( $qv );
+			$this->parse_tax_query($qv);
 
-			foreach ( $this->tax_query->queries as $tax_query ) {
-				if ( ! is_array( $tax_query ) ) {
+			foreach ($this->tax_query->queries as $tax_query) {
+				if ( ! is_array($tax_query)) {
 					continue;
 				}
 
-				if ( isset( $tax_query['operator'] ) && 'NOT IN' != $tax_query['operator'] ) {
-					switch ( $tax_query['taxonomy'] ) {
+				if (isset($tax_query['operator']) && 'NOT IN' != $tax_query['operator']) {
+					switch ($tax_query['taxonomy']) {
 						case 'category':
 							$this->is_category = true;
 							break;
@@ -1720,89 +1720,89 @@ 
 					}
 				}
 			}
-			unset( $tax_query );
+			unset($tax_query);
 
-			if ( empty($qv['author']) || ($qv['author'] == '0') ) {
+			if (empty($qv['author']) || ($qv['author'] == '0')) {
 				$this->is_author = false;
 			} else {
 				$this->is_author = true;
 			}
 
-			if ( '' != $qv['author_name'] )
+			if ('' != $qv['author_name'])
 				$this->is_author = true;
 
-			if ( !empty( $qv['post_type'] ) && ! is_array( $qv['post_type'] ) ) {
-				$post_type_obj = get_post_type_object( $qv['post_type'] );
-				if ( ! empty( $post_type_obj->has_archive ) )
+			if ( ! empty($qv['post_type']) && ! is_array($qv['post_type'])) {
+				$post_type_obj = get_post_type_object($qv['post_type']);
+				if ( ! empty($post_type_obj->has_archive))
 					$this->is_post_type_archive = true;
 			}
 
-			if ( $this->is_post_type_archive || $this->is_date || $this->is_author || $this->is_category || $this->is_tag || $this->is_tax )
+			if ($this->is_post_type_archive || $this->is_date || $this->is_author || $this->is_category || $this->is_tag || $this->is_tax)
 				$this->is_archive = true;
 		}
 
-		if ( '' != $qv['feed'] )
+		if ('' != $qv['feed'])
 			$this->is_feed = true;
 
-		if ( '' != $qv['embed'] ) {
+		if ('' != $qv['embed']) {
 			$this->is_embed = true;
 		}
 
-		if ( '' != $qv['tb'] )
+		if ('' != $qv['tb'])
 			$this->is_trackback = true;
 
-		if ( '' != $qv['paged'] && ( intval($qv['paged']) > 1 ) )
+		if ('' != $qv['paged'] && (intval($qv['paged']) > 1))
 			$this->is_paged = true;
 
 		// if we're previewing inside the write screen
-		if ( '' != $qv['preview'] )
+		if ('' != $qv['preview'])
 			$this->is_preview = true;
 
-		if ( is_admin() )
+		if (is_admin())
 			$this->is_admin = true;
 
-		if ( false !== strpos($qv['feed'], 'comments-') ) {
+		if (false !== strpos($qv['feed'], 'comments-')) {
 			$qv['feed'] = str_replace('comments-', '', $qv['feed']);
 			$qv['withcomments'] = 1;
 		}
 
 		$this->is_singular = $this->is_single || $this->is_page || $this->is_attachment;
 
-		if ( $this->is_feed && ( !empty($qv['withcomments']) || ( empty($qv['withoutcomments']) && $this->is_singular ) ) )
+		if ($this->is_feed && ( ! empty($qv['withcomments']) || (empty($qv['withoutcomments']) && $this->is_singular)))
 			$this->is_comment_feed = true;
 
-		if ( !( $this->is_singular || $this->is_archive || $this->is_search || $this->is_feed || ( defined( 'REST_REQUEST' ) && REST_REQUEST ) || $this->is_trackback || $this->is_404 || $this->is_admin || $this->is_robots ) )
+		if ( ! ($this->is_singular || $this->is_archive || $this->is_search || $this->is_feed || (defined('REST_REQUEST') && REST_REQUEST) || $this->is_trackback || $this->is_404 || $this->is_admin || $this->is_robots))
 			$this->is_home = true;
 
 		// Correct is_* for page_on_front and page_for_posts
-		if ( $this->is_home && 'page' == get_option('show_on_front') && get_option('page_on_front') ) {
+		if ($this->is_home && 'page' == get_option('show_on_front') && get_option('page_on_front')) {
 			$_query = wp_parse_args($this->query);
 			// pagename can be set and empty depending on matched rewrite rules. Ignore an empty pagename.
-			if ( isset($_query['pagename']) && '' == $_query['pagename'] )
+			if (isset($_query['pagename']) && '' == $_query['pagename'])
 				unset($_query['pagename']);
 
-			unset( $_query['embed'] );
+			unset($_query['embed']);
 
-			if ( empty($_query) || !array_diff( array_keys($_query), array('preview', 'page', 'paged', 'cpage') ) ) {
+			if (empty($_query) || ! array_diff(array_keys($_query), array('preview', 'page', 'paged', 'cpage'))) {
 				$this->is_page = true;
 				$this->is_home = false;
 				$qv['page_id'] = get_option('page_on_front');
 				// Correct <!--nextpage--> for page_on_front
-				if ( !empty($qv['paged']) ) {
+				if ( ! empty($qv['paged'])) {
 					$qv['page'] = $qv['paged'];
 					unset($qv['paged']);
 				}
 			}
 		}
 
-		if ( '' != $qv['pagename'] ) {
-			$this->queried_object = get_page_by_path( $qv['pagename'] );
+		if ('' != $qv['pagename']) {
+			$this->queried_object = get_page_by_path($qv['pagename']);
 
-			if ( $this->queried_object && 'attachment' == $this->queried_object->post_type ) {
-				if ( preg_match( "/^[^%]*%(?:postname)%/", get_option( 'permalink_structure' ) ) ) {
+			if ($this->queried_object && 'attachment' == $this->queried_object->post_type) {
+				if (preg_match("/^[^%]*%(?:postname)%/", get_option('permalink_structure'))) {
 					// See if we also have a post with the same slug
-					$post = get_page_by_path( $qv['pagename'], OBJECT, 'post' );
-					if ( $post ) {
+					$post = get_page_by_path($qv['pagename'], OBJECT, 'post');
+					if ($post) {
 						$this->queried_object = $post;
 						$this->is_page = false;
 						$this->is_single = true;
@@ -1810,53 +1810,53 @@ 
 				}
 			}
 
-			if ( ! empty( $this->queried_object ) ) {
+			if ( ! empty($this->queried_object)) {
 				$this->queried_object_id = (int) $this->queried_object->ID;
 			} else {
-				unset( $this->queried_object );
+				unset($this->queried_object);
 			}
 
-			if  ( 'page' == get_option('show_on_front') && isset($this->queried_object_id) && $this->queried_object_id == get_option('page_for_posts') ) {
+			if ('page' == get_option('show_on_front') && isset($this->queried_object_id) && $this->queried_object_id == get_option('page_for_posts')) {
 				$this->is_page = false;
 				$this->is_home = true;
 				$this->is_posts_page = true;
 			}
 		}
 
-		if ( $qv['page_id'] ) {
-			if  ( 'page' == get_option('show_on_front') && $qv['page_id'] == get_option('page_for_posts') ) {
+		if ($qv['page_id']) {
+			if ('page' == get_option('show_on_front') && $qv['page_id'] == get_option('page_for_posts')) {
 				$this->is_page = false;
 				$this->is_home = true;
 				$this->is_posts_page = true;
 			}
 		}
 
-		if ( !empty($qv['post_type']) ) {
-			if ( is_array($qv['post_type']) )
+		if ( ! empty($qv['post_type'])) {
+			if (is_array($qv['post_type']))
 				$qv['post_type'] = array_map('sanitize_key', $qv['post_type']);
 			else
 				$qv['post_type'] = sanitize_key($qv['post_type']);
 		}
 
-		if ( ! empty( $qv['post_status'] ) ) {
-			if ( is_array( $qv['post_status'] ) )
+		if ( ! empty($qv['post_status'])) {
+			if (is_array($qv['post_status']))
 				$qv['post_status'] = array_map('sanitize_key', $qv['post_status']);
 			else
 				$qv['post_status'] = preg_replace('|[^a-z0-9_,-]|', '', $qv['post_status']);
 		}
 
-		if ( $this->is_posts_page && ( ! isset($qv['withcomments']) || ! $qv['withcomments'] ) )
+		if ($this->is_posts_page && ( ! isset($qv['withcomments']) || ! $qv['withcomments']))
 			$this->is_comment_feed = false;
 
 		$this->is_singular = $this->is_single || $this->is_page || $this->is_attachment;
 		// Done correcting is_* for page_on_front and page_for_posts
 
-		if ( '404' == $qv['error'] )
+		if ('404' == $qv['error'])
 			$this->set_404();
 
-		$this->is_embed = $this->is_embed && ( $this->is_singular || $this->is_404 );
+		$this->is_embed = $this->is_embed && ($this->is_singular || $this->is_404);
 
-		$this->query_vars_hash = md5( serialize( $this->query_vars ) );
+		$this->query_vars_hash = md5(serialize($this->query_vars));
 		$this->query_vars_changed = false;
 
 		/**
@@ -1866,7 +1866,7 @@ 
 		 *
 		 * @param WP_Query &$this The WP_Query instance (passed by reference).
 		 */
-		do_action_ref_array( 'parse_query', array( &$this ) );
+		do_action_ref_array('parse_query', array(&$this));
 	}
 
 	/**
@@ -1879,77 +1879,77 @@ 
 	 *
 	 * @param array $q The query variables. Passed by reference.
 	 */
-	public function parse_tax_query( &$q ) {
-		if ( ! empty( $q['tax_query'] ) && is_array( $q['tax_query'] ) ) {
+	public function parse_tax_query(&$q) {
+		if ( ! empty($q['tax_query']) && is_array($q['tax_query'])) {
 			$tax_query = $q['tax_query'];
 		} else {
 			$tax_query = array();
 		}
 
-		if ( !empty($q['taxonomy']) && !empty($q['term']) ) {
+		if ( ! empty($q['taxonomy']) && ! empty($q['term'])) {
 			$tax_query[] = array(
 				'taxonomy' => $q['taxonomy'],
-				'terms' => array( $q['term'] ),
+				'terms' => array($q['term']),
 				'field' => 'slug',
 			);
 		}
 
-		foreach ( get_taxonomies( array() , 'objects' ) as $taxonomy => $t ) {
-			if ( 'post_tag' == $taxonomy )
-				continue;	// Handled further down in the $q['tag'] block
+		foreach (get_taxonomies(array(), 'objects') as $taxonomy => $t) {
+			if ('post_tag' == $taxonomy)
+				continue; // Handled further down in the $q['tag'] block
 
-			if ( $t->query_var && !empty( $q[$t->query_var] ) ) {
+			if ($t->query_var && ! empty($q[$t->query_var])) {
 				$tax_query_defaults = array(
 					'taxonomy' => $taxonomy,
 					'field' => 'slug',
 				);
 
- 				if ( isset( $t->rewrite['hierarchical'] ) && $t->rewrite['hierarchical'] ) {
-					$q[$t->query_var] = wp_basename( $q[$t->query_var] );
+ 				if (isset($t->rewrite['hierarchical']) && $t->rewrite['hierarchical']) {
+					$q[$t->query_var] = wp_basename($q[$t->query_var]);
 				}
 
 				$term = $q[$t->query_var];
 
-				if ( is_array( $term ) ) {
-					$term = implode( ',', $term );
+				if (is_array($term)) {
+					$term = implode(',', $term);
 				}
 
-				if ( strpos($term, '+') !== false ) {
-					$terms = preg_split( '/[+]+/', $term );
-					foreach ( $terms as $term ) {
-						$tax_query[] = array_merge( $tax_query_defaults, array(
-							'terms' => array( $term )
-						) );
+				if (strpos($term, '+') !== false) {
+					$terms = preg_split('/[+]+/', $term);
+					foreach ($terms as $term) {
+						$tax_query[] = array_merge($tax_query_defaults, array(
+							'terms' => array($term)
+						));
 					}
 				} else {
-					$tax_query[] = array_merge( $tax_query_defaults, array(
-						'terms' => preg_split( '/[,]+/', $term )
-					) );
+					$tax_query[] = array_merge($tax_query_defaults, array(
+						'terms' => preg_split('/[,]+/', $term)
+					));
 				}
 			}
 		}
 
 		// If querystring 'cat' is an array, implode it.
-		if ( is_array( $q['cat'] ) ) {
-			$q['cat'] = implode( ',', $q['cat'] );
+		if (is_array($q['cat'])) {
+			$q['cat'] = implode(',', $q['cat']);
 		}
 
 		// Category stuff
-		if ( ! empty( $q['cat'] ) && ! $this->is_singular ) {
+		if ( ! empty($q['cat']) && ! $this->is_singular) {
 			$cat_in = $cat_not_in = array();
 
-			$cat_array = preg_split( '/[,\s]+/', urldecode( $q['cat'] ) );
-			$cat_array = array_map( 'intval', $cat_array );
-			$q['cat'] = implode( ',', $cat_array );
+			$cat_array = preg_split('/[,\s]+/', urldecode($q['cat']));
+			$cat_array = array_map('intval', $cat_array);
+			$q['cat'] = implode(',', $cat_array);
 
-			foreach ( $cat_array as $cat ) {
-				if ( $cat > 0 )
+			foreach ($cat_array as $cat) {
+				if ($cat > 0)
 					$cat_in[] = $cat;
-				elseif ( $cat < 0 )
-					$cat_not_in[] = abs( $cat );
+				elseif ($cat < 0)
+					$cat_not_in[] = abs($cat);
 			}
 
-			if ( ! empty( $cat_in ) ) {
+			if ( ! empty($cat_in)) {
 				$tax_query[] = array(
 					'taxonomy' => 'category',
 					'terms' => $cat_in,
@@ -1958,7 +1958,7 @@ 
 				);
 			}
 
-			if ( ! empty( $cat_not_in ) ) {
+			if ( ! empty($cat_not_in)) {
 				$tax_query[] = array(
 					'taxonomy' => 'category',
 					'terms' => $cat_not_in,
@@ -1967,19 +1967,19 @@ 
 					'include_children' => true
 				);
 			}
-			unset( $cat_array, $cat_in, $cat_not_in );
+			unset($cat_array, $cat_in, $cat_not_in);
 		}
 
-		if ( ! empty( $q['category__and'] ) && 1 === count( (array) $q['category__and'] ) ) {
+		if ( ! empty($q['category__and']) && 1 === count((array) $q['category__and'])) {
 			$q['category__and'] = (array) $q['category__and'];
-			if ( ! isset( $q['category__in'] ) )
+			if ( ! isset($q['category__in']))
 				$q['category__in'] = array();
-			$q['category__in'][] = absint( reset( $q['category__and'] ) );
-			unset( $q['category__and'] );
+			$q['category__in'][] = absint(reset($q['category__and']));
+			unset($q['category__and']);
 		}
 
-		if ( ! empty( $q['category__in'] ) ) {
-			$q['category__in'] = array_map( 'absint', array_unique( (array) $q['category__in'] ) );
+		if ( ! empty($q['category__in'])) {
+			$q['category__in'] = array_map('absint', array_unique((array) $q['category__in']));
 			$tax_query[] = array(
 				'taxonomy' => 'category',
 				'terms' => $q['category__in'],
@@ -1988,8 +1988,8 @@ 
 			);
 		}
 
-		if ( ! empty($q['category__not_in']) ) {
-			$q['category__not_in'] = array_map( 'absint', array_unique( (array) $q['category__not_in'] ) );
+		if ( ! empty($q['category__not_in'])) {
+			$q['category__not_in'] = array_map('absint', array_unique((array) $q['category__not_in']));
 			$tax_query[] = array(
 				'taxonomy' => 'category',
 				'terms' => $q['category__not_in'],
@@ -1998,8 +1998,8 @@ 
 			);
 		}
 
-		if ( ! empty($q['category__and']) ) {
-			$q['category__and'] = array_map( 'absint', array_unique( (array) $q['category__and'] ) );
+		if ( ! empty($q['category__and'])) {
+			$q['category__and'] = array_map('absint', array_unique((array) $q['category__and']));
 			$tax_query[] = array(
 				'taxonomy' => 'category',
 				'terms' => $q['category__and'],
@@ -2010,21 +2010,21 @@ 
 		}
 
 		// If querystring 'tag' is array, implode it.
-		if ( is_array( $q['tag'] ) ) {
-			$q['tag'] = implode( ',', $q['tag'] );
+		if (is_array($q['tag'])) {
+			$q['tag'] = implode(',', $q['tag']);
 		}
 
 		// Tag stuff
-		if ( '' != $q['tag'] && !$this->is_singular && $this->query_vars_changed ) {
-			if ( strpos($q['tag'], ',') !== false ) {
+		if ('' != $q['tag'] && ! $this->is_singular && $this->query_vars_changed) {
+			if (strpos($q['tag'], ',') !== false) {
 				$tags = preg_split('/[,\r\n\t ]+/', $q['tag']);
-				foreach ( (array) $tags as $tag ) {
+				foreach ((array) $tags as $tag) {
 					$tag = sanitize_term_field('slug', $tag, 0, 'post_tag', 'db');
 					$q['tag_slug__in'][] = $tag;
 				}
-			} elseif ( preg_match('/[+\r\n\t ]+/', $q['tag'] ) || ! empty( $q['cat'] ) ) {
+			} elseif (preg_match('/[+\r\n\t ]+/', $q['tag']) || ! empty($q['cat'])) {
 				$tags = preg_split('/[+\r\n\t ]+/', $q['tag']);
-				foreach ( (array) $tags as $tag ) {
+				foreach ((array) $tags as $tag) {
 					$tag = sanitize_term_field('slug', $tag, 0, 'post_tag', 'db');
 					$q['tag_slug__and'][] = $tag;
 				}
@@ -2034,24 +2034,24 @@ 
 			}
 		}
 
-		if ( !empty($q['tag_id']) ) {
-			$q['tag_id'] = absint( $q['tag_id'] );
+		if ( ! empty($q['tag_id'])) {
+			$q['tag_id'] = absint($q['tag_id']);
 			$tax_query[] = array(
 				'taxonomy' => 'post_tag',
 				'terms' => $q['tag_id']
 			);
 		}
 
-		if ( !empty($q['tag__in']) ) {
-			$q['tag__in'] = array_map('absint', array_unique( (array) $q['tag__in'] ) );
+		if ( ! empty($q['tag__in'])) {
+			$q['tag__in'] = array_map('absint', array_unique((array) $q['tag__in']));
 			$tax_query[] = array(
 				'taxonomy' => 'post_tag',
 				'terms' => $q['tag__in']
 			);
 		}
 
-		if ( !empty($q['tag__not_in']) ) {
-			$q['tag__not_in'] = array_map('absint', array_unique( (array) $q['tag__not_in'] ) );
+		if ( ! empty($q['tag__not_in'])) {
+			$q['tag__not_in'] = array_map('absint', array_unique((array) $q['tag__not_in']));
 			$tax_query[] = array(
 				'taxonomy' => 'post_tag',
 				'terms' => $q['tag__not_in'],
@@ -2059,8 +2059,8 @@ 
 			);
 		}
 
-		if ( !empty($q['tag__and']) ) {
-			$q['tag__and'] = array_map('absint', array_unique( (array) $q['tag__and'] ) );
+		if ( ! empty($q['tag__and'])) {
+			$q['tag__and'] = array_map('absint', array_unique((array) $q['tag__and']));
 			$tax_query[] = array(
 				'taxonomy' => 'post_tag',
 				'terms' => $q['tag__and'],
@@ -2068,8 +2068,8 @@ 
 			);
 		}
 
-		if ( !empty($q['tag_slug__in']) ) {
-			$q['tag_slug__in'] = array_map('sanitize_title_for_query', array_unique( (array) $q['tag_slug__in'] ) );
+		if ( ! empty($q['tag_slug__in'])) {
+			$q['tag_slug__in'] = array_map('sanitize_title_for_query', array_unique((array) $q['tag_slug__in']));
 			$tax_query[] = array(
 				'taxonomy' => 'post_tag',
 				'terms' => $q['tag_slug__in'],
@@ -2077,8 +2077,8 @@ 
 			);
 		}
 
-		if ( !empty($q['tag_slug__and']) ) {
-			$q['tag_slug__and'] = array_map('sanitize_title_for_query', array_unique( (array) $q['tag_slug__and'] ) );
+		if ( ! empty($q['tag_slug__and'])) {
+			$q['tag_slug__and'] = array_map('sanitize_title_for_query', array_unique((array) $q['tag_slug__and']));
 			$tax_query[] = array(
 				'taxonomy' => 'post_tag',
 				'terms' => $q['tag_slug__and'],
@@ -2087,7 +2087,7 @@ 
 			);
 		}
 
-		$this->tax_query = new WP_Tax_Query( $tax_query );
+		$this->tax_query = new WP_Tax_Query($tax_query);
 
 		/**
 		 * Fires after taxonomy-related query vars have been parsed.
@@ -2096,7 +2096,7 @@ 
 		 *
 		 * @param WP_Query $this The WP_Query instance.
 		 */
-		do_action( 'parse_tax_query', $this );
+		do_action('parse_tax_query', $this);
 	}
 
 	/**
@@ -2109,60 +2109,60 @@ 
 	 * @param array $q Query variables.
 	 * @return string WHERE clause.
 	 */
-	protected function parse_search( &$q ) {
+	protected function parse_search(&$q) {
 		global $wpdb;
 
 		$search = '';
 
 		// added slashes screw with quote grouping when done early, so done later
-		$q['s'] = stripslashes( $q['s'] );
-		if ( empty( $_GET['s'] ) && $this->is_main_query() )
-			$q['s'] = urldecode( $q['s'] );
+		$q['s'] = stripslashes($q['s']);
+		if (empty($_GET['s']) && $this->is_main_query())
+			$q['s'] = urldecode($q['s']);
 		// there are no line breaks in <input /> fields
-		$q['s'] = str_replace( array( "\r", "\n" ), '', $q['s'] );
+		$q['s'] = str_replace(array("\r", "\n"), '', $q['s']);
 		$q['search_terms_count'] = 1;
-		if ( ! empty( $q['sentence'] ) ) {
-			$q['search_terms'] = array( $q['s'] );
+		if ( ! empty($q['sentence'])) {
+			$q['search_terms'] = array($q['s']);
 		} else {
-			if ( preg_match_all( '/".*?("|$)|((?<=[\t ",+])|^)[^\t ",+]+/', $q['s'], $matches ) ) {
-				$q['search_terms_count'] = count( $matches[0] );
-				$q['search_terms'] = $this->parse_search_terms( $matches[0] );
+			if (preg_match_all('/".*?("|$)|((?<=[\t ",+])|^)[^\t ",+]+/', $q['s'], $matches)) {
+				$q['search_terms_count'] = count($matches[0]);
+				$q['search_terms'] = $this->parse_search_terms($matches[0]);
 				// if the search string has only short terms or stopwords, or is 10+ terms long, match it as sentence
-				if ( empty( $q['search_terms'] ) || count( $q['search_terms'] ) > 9 )
-					$q['search_terms'] = array( $q['s'] );
+				if (empty($q['search_terms']) || count($q['search_terms']) > 9)
+					$q['search_terms'] = array($q['s']);
 			} else {
-				$q['search_terms'] = array( $q['s'] );
+				$q['search_terms'] = array($q['s']);
 			}
 		}
 
-		$n = ! empty( $q['exact'] ) ? '' : '%';
+		$n = ! empty($q['exact']) ? '' : '%';
 		$searchand = '';
 		$q['search_orderby_title'] = array();
-		foreach ( $q['search_terms'] as $term ) {
+		foreach ($q['search_terms'] as $term) {
 			// Terms prefixed with '-' should be excluded.
-			$include = '-' !== substr( $term, 0, 1 );
-			if ( $include ) {
+			$include = '-' !== substr($term, 0, 1);
+			if ($include) {
 				$like_op  = 'LIKE';
 				$andor_op = 'OR';
 			} else {
 				$like_op  = 'NOT LIKE';
 				$andor_op = 'AND';
-				$term     = substr( $term, 1 );
+				$term     = substr($term, 1);
 			}
 
-			if ( $n && $include ) {
-				$like = '%' . $wpdb->esc_like( $term ) . '%';
-				$q['search_orderby_title'][] = $wpdb->prepare( "$wpdb->posts.post_title LIKE %s", $like );
+			if ($n && $include) {
+				$like = '%'.$wpdb->esc_like($term).'%';
+				$q['search_orderby_title'][] = $wpdb->prepare("$wpdb->posts.post_title LIKE %s", $like);
 			}
 
-			$like = $n . $wpdb->esc_like( $term ) . $n;
-			$search .= $wpdb->prepare( "{$searchand}(($wpdb->posts.post_title $like_op %s) $andor_op ($wpdb->posts.post_excerpt $like_op %s) $andor_op ($wpdb->posts.post_content $like_op %s))", $like, $like, $like );
+			$like = $n.$wpdb->esc_like($term).$n;
+			$search .= $wpdb->prepare("{$searchand}(($wpdb->posts.post_title $like_op %s) $andor_op ($wpdb->posts.post_excerpt $like_op %s) $andor_op ($wpdb->posts.post_content $like_op %s))", $like, $like, $like);
 			$searchand = ' AND ';
 		}
 
-		if ( ! empty( $search ) ) {
+		if ( ! empty($search)) {
 			$search = " AND ({$search}) ";
-			if ( ! is_user_logged_in() )
+			if ( ! is_user_logged_in())
 				$search .= " AND ($wpdb->posts.post_password = '') ";
 		}
 
@@ -2181,24 +2181,24 @@ 
 	 * @param array $terms Terms to check.
 	 * @return array Terms that are not stopwords.
 	 */
-	protected function parse_search_terms( $terms ) {
-		$strtolower = function_exists( 'mb_strtolower' ) ? 'mb_strtolower' : 'strtolower';
+	protected function parse_search_terms($terms) {
+		$strtolower = function_exists('mb_strtolower') ? 'mb_strtolower' : 'strtolower';
 		$checked = array();
 
 		$stopwords = $this->get_search_stopwords();
 
-		foreach ( $terms as $term ) {
+		foreach ($terms as $term) {
 			// keep before/after spaces when term is for exact match
-			if ( preg_match( '/^".+"$/', $term ) )
-				$term = trim( $term, "\"'" );
+			if (preg_match('/^".+"$/', $term))
+				$term = trim($term, "\"'");
 			else
-				$term = trim( $term, "\"' " );
+				$term = trim($term, "\"' ");
 
 			// Avoid single A-Z and single dashes.
-			if ( ! $term || ( 1 === strlen( $term ) && preg_match( '/^[a-z\-]$/i', $term ) ) )
+			if ( ! $term || (1 === strlen($term) && preg_match('/^[a-z\-]$/i', $term)))
 				continue;
 
-			if ( in_array( call_user_func( $strtolower, $term ), $stopwords, true ) )
+			if (in_array(call_user_func($strtolower, $term), $stopwords, true))
 				continue;
 
 			$checked[] = $term;
@@ -2215,20 +2215,20 @@ 
 	 * @return array Stopwords.
 	 */
 	protected function get_search_stopwords() {
-		if ( isset( $this->stopwords ) )
+		if (isset($this->stopwords))
 			return $this->stopwords;
 
 		/* translators: This is a comma-separated list of very common words that should be excluded from a search,
 		 * like a, an, and the. These are usually called "stopwords". You should not simply translate these individual
 		 * words into your language. Instead, look for and provide commonly accepted stopwords in your language.
 		 */
-		$words = explode( ',', _x( 'about,an,are,as,at,be,by,com,for,from,how,in,is,it,of,on,or,that,the,this,to,was,what,when,where,who,will,with,www',
-			'Comma-separated list of search stopwords in your language' ) );
+		$words = explode(',', _x('about,an,are,as,at,be,by,com,for,from,how,in,is,it,of,on,or,that,the,this,to,was,what,when,where,who,will,with,www',
+			'Comma-separated list of search stopwords in your language'));
 
 		$stopwords = array();
-		foreach ( $words as $word ) {
-			$word = trim( $word, "\r\n\t " );
-			if ( $word )
+		foreach ($words as $word) {
+			$word = trim($word, "\r\n\t ");
+			if ($word)
 				$stopwords[] = $word;
 		}
 
@@ -2239,7 +2239,7 @@ 
 		 *
 		 * @param array $stopwords Stopwords.
 		 */
-		$this->stopwords = apply_filters( 'wp_search_stopwords', $stopwords );
+		$this->stopwords = apply_filters('wp_search_stopwords', $stopwords);
 		return $this->stopwords;
 	}
 
@@ -2251,47 +2251,47 @@ 
 	 * @param array $q Query variables.
 	 * @return string ORDER BY clause.
 	 */
-	protected function parse_search_order( &$q ) {
+	protected function parse_search_order(&$q) {
 		global $wpdb;
 
-		if ( $q['search_terms_count'] > 1 ) {
-			$num_terms = count( $q['search_orderby_title'] );
+		if ($q['search_terms_count'] > 1) {
+			$num_terms = count($q['search_orderby_title']);
 
 			// If the search terms contain negative queries, don't bother ordering by sentence matches.
 			$like = '';
-			if ( ! preg_match( '/(?:\s|^)\-/', $q['s'] ) ) {
-				$like = '%' . $wpdb->esc_like( $q['s'] ) . '%';
+			if ( ! preg_match('/(?:\s|^)\-/', $q['s'])) {
+				$like = '%'.$wpdb->esc_like($q['s']).'%';
 			}
 
 			$search_orderby = '';
 
 			// sentence match in 'post_title'
-			if ( $like ) {
-				$search_orderby .= $wpdb->prepare( "WHEN $wpdb->posts.post_title LIKE %s THEN 1 ", $like );
+			if ($like) {
+				$search_orderby .= $wpdb->prepare("WHEN $wpdb->posts.post_title LIKE %s THEN 1 ", $like);
 			}
 
 			// sanity limit, sort as sentence when more than 6 terms
 			// (few searches are longer than 6 terms and most titles are not)
-			if ( $num_terms < 7 ) {
+			if ($num_terms < 7) {
 				// all words in title
-				$search_orderby .= 'WHEN ' . implode( ' AND ', $q['search_orderby_title'] ) . ' THEN 2 ';
+				$search_orderby .= 'WHEN '.implode(' AND ', $q['search_orderby_title']).' THEN 2 ';
 				// any word in title, not needed when $num_terms == 1
-				if ( $num_terms > 1 )
-					$search_orderby .= 'WHEN ' . implode( ' OR ', $q['search_orderby_title'] ) . ' THEN 3 ';
+				if ($num_terms > 1)
+					$search_orderby .= 'WHEN '.implode(' OR ', $q['search_orderby_title']).' THEN 3 ';
 			}
 
 			// Sentence match in 'post_content' and 'post_excerpt'.
-			if ( $like ) {
-				$search_orderby .= $wpdb->prepare( "WHEN $wpdb->posts.post_excerpt LIKE %s THEN 4 ", $like );
-				$search_orderby .= $wpdb->prepare( "WHEN $wpdb->posts.post_content LIKE %s THEN 5 ", $like );
+			if ($like) {
+				$search_orderby .= $wpdb->prepare("WHEN $wpdb->posts.post_excerpt LIKE %s THEN 4 ", $like);
+				$search_orderby .= $wpdb->prepare("WHEN $wpdb->posts.post_content LIKE %s THEN 5 ", $like);
 			}
 
-			if ( $search_orderby ) {
-				$search_orderby = '(CASE ' . $search_orderby . 'ELSE 6 END)';
+			if ($search_orderby) {
+				$search_orderby = '(CASE '.$search_orderby.'ELSE 6 END)';
 			}
 		} else {
 			// single word or sentence search
-			$search_orderby = reset( $q['search_orderby_title'] ) . ' DESC';
+			$search_orderby = reset($q['search_orderby_title']).' DESC';
 		}
 
 		return $search_orderby;
@@ -2309,7 +2309,7 @@ 
 	 * @param string $orderby Alias for the field to order by.
 	 * @return string|false Table-prefixed value to used in the ORDER clause. False otherwise.
 	 */
-	protected function parse_orderby( $orderby ) {
+	protected function parse_orderby($orderby) {
 		global $wpdb;
 
 		// Used to filter values.
@@ -2322,32 +2322,32 @@ 
 		$primary_meta_key = '';
 		$primary_meta_query = false;
 		$meta_clauses = $this->meta_query->get_clauses();
-		if ( ! empty( $meta_clauses ) ) {
-			$primary_meta_query = reset( $meta_clauses );
+		if ( ! empty($meta_clauses)) {
+			$primary_meta_query = reset($meta_clauses);
 
-			if ( ! empty( $primary_meta_query['key'] ) ) {
+			if ( ! empty($primary_meta_query['key'])) {
 				$primary_meta_key = $primary_meta_query['key'];
 				$allowed_keys[] = $primary_meta_key;
 			}
 
 			$allowed_keys[] = 'meta_value';
 			$allowed_keys[] = 'meta_value_num';
-			$allowed_keys   = array_merge( $allowed_keys, array_keys( $meta_clauses ) );
+			$allowed_keys   = array_merge($allowed_keys, array_keys($meta_clauses));
 		}
 
 		// If RAND() contains a seed value, sanitize and add to allowed keys.
 		$rand_with_seed = false;
-		if ( preg_match( '/RAND\(([0-9]+)\)/i', $orderby, $matches ) ) {
-			$orderby = sprintf( 'RAND(%s)', intval( $matches[1] ) );
+		if (preg_match('/RAND\(([0-9]+)\)/i', $orderby, $matches)) {
+			$orderby = sprintf('RAND(%s)', intval($matches[1]));
 			$allowed_keys[] = $orderby;
 			$rand_with_seed = true;
 		}
 
-		if ( ! in_array( $orderby, $allowed_keys, true ) ) {
+		if ( ! in_array($orderby, $allowed_keys, true)) {
 			return false;
 		}
 
-		switch ( $orderby ) {
+		switch ($orderby) {
 			case 'post_name':
 			case 'post_author':
 			case 'post_date':
@@ -2365,7 +2365,7 @@ 
 				break;
 			case $primary_meta_key:
 			case 'meta_value':
-				if ( ! empty( $primary_meta_query['type'] ) ) {
+				if ( ! empty($primary_meta_query['type'])) {
 					$orderby_clause = "CAST({$primary_meta_query['alias']}.meta_value AS {$primary_meta_query['cast']})";
 				} else {
 					$orderby_clause = "{$primary_meta_query['alias']}.meta_value";
@@ -2375,15 +2375,15 @@ 
 				$orderby_clause = "{$primary_meta_query['alias']}.meta_value+0";
 				break;
 			default:
-				if ( array_key_exists( $orderby, $meta_clauses ) ) {
+				if (array_key_exists($orderby, $meta_clauses)) {
 					// $orderby corresponds to a meta_query clause.
-					$meta_clause = $meta_clauses[ $orderby ];
+					$meta_clause = $meta_clauses[$orderby];
 					$orderby_clause = "CAST({$meta_clause['alias']}.meta_value AS {$meta_clause['cast']})";
-				} elseif ( $rand_with_seed ) {
+				} elseif ($rand_with_seed) {
 					$orderby_clause = $orderby;
 				} else {
 					// Default: order by post field.
-					$orderby_clause = "$wpdb->posts.post_" . sanitize_key( $orderby );
+					$orderby_clause = "$wpdb->posts.post_".sanitize_key($orderby);
 				}
 
 				break;
@@ -2401,12 +2401,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';
@@ -2440,9 +2440,9 @@ 
 	 * @param mixed  $default   Optional. Value to return if the query variable is not set. Default empty.
 	 * @return mixed Contents of the query variable.
 	 */
-	public function get( $query_var, $default = '' ) {
-		if ( isset( $this->query_vars[ $query_var ] ) ) {
-			return $this->query_vars[ $query_var ];
+	public function get($query_var, $default = '') {
+		if (isset($this->query_vars[$query_var])) {
+			return $this->query_vars[$query_var];
 		}
 
 		return $default;
@@ -2490,7 +2490,7 @@ 
 		 *
 		 * @param WP_Query &$this The WP_Query instance (passed by reference).
 		 */
-		do_action_ref_array( 'pre_get_posts', array( &$this ) );
+		do_action_ref_array('pre_get_posts', array(&$this));
 
 		// Shorthand.
 		$q = &$this->query_vars;
@@ -2500,11 +2500,11 @@ 
 
 		// Parse meta query
 		$this->meta_query = new WP_Meta_Query();
-		$this->meta_query->parse_query_vars( $q );
+		$this->meta_query->parse_query_vars($q);
 
 		// Set a flag if a pre_get_posts hook changed the query vars.
-		$hash = md5( serialize( $this->query_vars ) );
-		if ( $hash != $this->query_vars_hash ) {
+		$hash = md5(serialize($this->query_vars));
+		if ($hash != $this->query_vars_hash) {
 			$this->query_vars_changed = true;
 			$this->query_vars_hash = $hash;
 		}
@@ -2522,91 +2522,91 @@ 
 		$post_status_join = false;
 		$page = 1;
 
-		if ( isset( $q['caller_get_posts'] ) ) {
-			_deprecated_argument( 'WP_Query', '3.1', __( '"caller_get_posts" is deprecated. Use "ignore_sticky_posts" instead.' ) );
-			if ( !isset( $q['ignore_sticky_posts'] ) )
+		if (isset($q['caller_get_posts'])) {
+			_deprecated_argument('WP_Query', '3.1', __('"caller_get_posts" is deprecated. Use "ignore_sticky_posts" instead.'));
+			if ( ! isset($q['ignore_sticky_posts']))
 				$q['ignore_sticky_posts'] = $q['caller_get_posts'];
 		}
 
-		if ( !isset( $q['ignore_sticky_posts'] ) )
+		if ( ! isset($q['ignore_sticky_posts']))
 			$q['ignore_sticky_posts'] = false;
 
-		if ( !isset($q['suppress_filters']) )
+		if ( ! isset($q['suppress_filters']))
 			$q['suppress_filters'] = false;
 
-		if ( !isset($q['cache_results']) ) {
-			if ( wp_using_ext_object_cache() )
+		if ( ! isset($q['cache_results'])) {
+			if (wp_using_ext_object_cache())
 				$q['cache_results'] = false;
 			else
 				$q['cache_results'] = true;
 		}
 
-		if ( !isset($q['update_post_term_cache']) )
+		if ( ! isset($q['update_post_term_cache']))
 			$q['update_post_term_cache'] = true;
 
-		if ( !isset($q['update_post_meta_cache']) )
+		if ( ! isset($q['update_post_meta_cache']))
 			$q['update_post_meta_cache'] = true;
 
-		if ( !isset($q['post_type']) ) {
-			if ( $this->is_search )
+		if ( ! isset($q['post_type'])) {
+			if ($this->is_search)
 				$q['post_type'] = 'any';
 			else
 				$q['post_type'] = '';
 		}
 		$post_type = $q['post_type'];
-		if ( empty( $q['posts_per_page'] ) ) {
-			$q['posts_per_page'] = get_option( 'posts_per_page' );
+		if (empty($q['posts_per_page'])) {
+			$q['posts_per_page'] = get_option('posts_per_page');
 		}
-		if ( isset($q['showposts']) && $q['showposts'] ) {
+		if (isset($q['showposts']) && $q['showposts']) {
 			$q['showposts'] = (int) $q['showposts'];
 			$q['posts_per_page'] = $q['showposts'];
 		}
-		if ( (isset($q['posts_per_archive_page']) && $q['posts_per_archive_page'] != 0) && ($this->is_archive || $this->is_search) )
+		if ((isset($q['posts_per_archive_page']) && $q['posts_per_archive_page'] != 0) && ($this->is_archive || $this->is_search))
 			$q['posts_per_page'] = $q['posts_per_archive_page'];
-		if ( !isset($q['nopaging']) ) {
-			if ( $q['posts_per_page'] == -1 ) {
+		if ( ! isset($q['nopaging'])) {
+			if ($q['posts_per_page'] == -1) {
 				$q['nopaging'] = true;
 			} else {
 				$q['nopaging'] = false;
 			}
 		}
 
-		if ( $this->is_feed ) {
+		if ($this->is_feed) {
 			// This overrides posts_per_page.
-			if ( ! empty( $q['posts_per_rss'] ) ) {
+			if ( ! empty($q['posts_per_rss'])) {
 				$q['posts_per_page'] = $q['posts_per_rss'];
 			} else {
-				$q['posts_per_page'] = get_option( 'posts_per_rss' );
+				$q['posts_per_page'] = get_option('posts_per_rss');
 			}
 			$q['nopaging'] = false;
 		}
 		$q['posts_per_page'] = (int) $q['posts_per_page'];
-		if ( $q['posts_per_page'] < -1 )
+		if ($q['posts_per_page'] < -1)
 			$q['posts_per_page'] = abs($q['posts_per_page']);
-		elseif ( $q['posts_per_page'] == 0 )
+		elseif ($q['posts_per_page'] == 0)
 			$q['posts_per_page'] = 1;
 
-		if ( !isset($q['comments_per_page']) || $q['comments_per_page'] == 0 )
+		if ( ! isset($q['comments_per_page']) || $q['comments_per_page'] == 0)
 			$q['comments_per_page'] = get_option('comments_per_page');
 
-		if ( $this->is_home && (empty($this->query) || $q['preview'] == 'true') && ( 'page' == get_option('show_on_front') ) && get_option('page_on_front') ) {
+		if ($this->is_home && (empty($this->query) || $q['preview'] == 'true') && ('page' == get_option('show_on_front')) && get_option('page_on_front')) {
 			$this->is_page = true;
 			$this->is_home = false;
 			$q['page_id'] = get_option('page_on_front');
 		}
 
-		if ( isset($q['page']) ) {
+		if (isset($q['page'])) {
 			$q['page'] = trim($q['page'], '/');
 			$q['page'] = absint($q['page']);
 		}
 
 		// If true, forcibly turns off SQL_CALC_FOUND_ROWS even when limits are present.
-		if ( isset($q['no_found_rows']) )
+		if (isset($q['no_found_rows']))
 			$q['no_found_rows'] = (bool) $q['no_found_rows'];
 		else
 			$q['no_found_rows'] = false;
 
-		switch ( $q['fields'] ) {
+		switch ($q['fields']) {
 			case 'ids':
 				$fields = "$wpdb->posts.ID";
 				break;
@@ -2617,74 +2617,74 @@ 
 				$fields = "$wpdb->posts.*";
 		}
 
-		if ( '' !== $q['menu_order'] )
-			$where .= " AND $wpdb->posts.menu_order = " . $q['menu_order'];
+		if ('' !== $q['menu_order'])
+			$where .= " AND $wpdb->posts.menu_order = ".$q['menu_order'];
 
 		// The "m" parameter is meant for months but accepts datetimes of varying specificity
-		if ( $q['m'] ) {
-			$where .= " AND YEAR($wpdb->posts.post_date)=" . substr($q['m'], 0, 4);
-			if ( strlen($q['m']) > 5 )
-				$where .= " AND MONTH($wpdb->posts.post_date)=" . substr($q['m'], 4, 2);
-			if ( strlen($q['m']) > 7 )
-				$where .= " AND DAYOFMONTH($wpdb->posts.post_date)=" . substr($q['m'], 6, 2);
-			if ( strlen($q['m']) > 9 )
-				$where .= " AND HOUR($wpdb->posts.post_date)=" . substr($q['m'], 8, 2);
-			if ( strlen($q['m']) > 11 )
-				$where .= " AND MINUTE($wpdb->posts.post_date)=" . substr($q['m'], 10, 2);
-			if ( strlen($q['m']) > 13 )
-				$where .= " AND SECOND($wpdb->posts.post_date)=" . substr($q['m'], 12, 2);
+		if ($q['m']) {
+			$where .= " AND YEAR($wpdb->posts.post_date)=".substr($q['m'], 0, 4);
+			if (strlen($q['m']) > 5)
+				$where .= " AND MONTH($wpdb->posts.post_date)=".substr($q['m'], 4, 2);
+			if (strlen($q['m']) > 7)
+				$where .= " AND DAYOFMONTH($wpdb->posts.post_date)=".substr($q['m'], 6, 2);
+			if (strlen($q['m']) > 9)
+				$where .= " AND HOUR($wpdb->posts.post_date)=".substr($q['m'], 8, 2);
+			if (strlen($q['m']) > 11)
+				$where .= " AND MINUTE($wpdb->posts.post_date)=".substr($q['m'], 10, 2);
+			if (strlen($q['m']) > 13)
+				$where .= " AND SECOND($wpdb->posts.post_date)=".substr($q['m'], 12, 2);
 		}
 
 		// Handle the other individual date parameters
 		$date_parameters = array();
 
-		if ( '' !== $q['hour'] )
+		if ('' !== $q['hour'])
 			$date_parameters['hour'] = $q['hour'];
 
-		if ( '' !== $q['minute'] )
+		if ('' !== $q['minute'])
 			$date_parameters['minute'] = $q['minute'];
 
-		if ( '' !== $q['second'] )
+		if ('' !== $q['second'])
 			$date_parameters['second'] = $q['second'];
 
-		if ( $q['year'] )
+		if ($q['year'])
 			$date_parameters['year'] = $q['year'];
 
-		if ( $q['monthnum'] )
+		if ($q['monthnum'])
 			$date_parameters['monthnum'] = $q['monthnum'];
 
-		if ( $q['w'] )
+		if ($q['w'])
 			$date_parameters['week'] = $q['w'];
 
-		if ( $q['day'] )
+		if ($q['day'])
 			$date_parameters['day'] = $q['day'];
 
-		if ( $date_parameters ) {
-			$date_query = new WP_Date_Query( array( $date_parameters ) );
+		if ($date_parameters) {
+			$date_query = new WP_Date_Query(array($date_parameters));
 			$where .= $date_query->get_sql();
 		}
-		unset( $date_parameters, $date_query );
+		unset($date_parameters, $date_query);
 
 		// Handle complex date queries
-		if ( ! empty( $q['date_query'] ) ) {
-			$this->date_query = new WP_Date_Query( $q['date_query'] );
+		if ( ! empty($q['date_query'])) {
+			$this->date_query = new WP_Date_Query($q['date_query']);
 			$where .= $this->date_query->get_sql();
 		}
 
 
 		// If we've got a post_type AND it's not "any" post_type.
-		if ( !empty($q['post_type']) && 'any' != $q['post_type'] ) {
-			foreach ( (array)$q['post_type'] as $_post_type ) {
+		if ( ! empty($q['post_type']) && 'any' != $q['post_type']) {
+			foreach ((array) $q['post_type'] as $_post_type) {
 				$ptype_obj = get_post_type_object($_post_type);
-				if ( !$ptype_obj || !$ptype_obj->query_var || empty($q[ $ptype_obj->query_var ]) )
+				if ( ! $ptype_obj || ! $ptype_obj->query_var || empty($q[$ptype_obj->query_var]))
 					continue;
 
-				if ( ! $ptype_obj->hierarchical ) {
+				if ( ! $ptype_obj->hierarchical) {
 					// Non-hierarchical post types can directly use 'name'.
-					$q['name'] = $q[ $ptype_obj->query_var ];
+					$q['name'] = $q[$ptype_obj->query_var];
 				} else {
 					// Hierarchical post types will operate through 'pagename'.
-					$q['pagename'] = $q[ $ptype_obj->query_var ];
+					$q['pagename'] = $q[$ptype_obj->query_var];
 					$q['name'] = '';
 				}
 
@@ -2694,98 +2694,98 @@ 
 			unset($ptype_obj);
 		}
 
-		if ( '' !== $q['title'] ) {
-			$where .= $wpdb->prepare( " AND $wpdb->posts.post_title = %s", stripslashes( $q['title'] ) );
+		if ('' !== $q['title']) {
+			$where .= $wpdb->prepare(" AND $wpdb->posts.post_title = %s", stripslashes($q['title']));
 		}
 
 		// Parameters related to 'post_name'.
-		if ( '' != $q['name'] ) {
-			$q['name'] = sanitize_title_for_query( $q['name'] );
-			$where .= " AND $wpdb->posts.post_name = '" . $q['name'] . "'";
-		} elseif ( '' != $q['pagename'] ) {
-			if ( isset($this->queried_object_id) ) {
+		if ('' != $q['name']) {
+			$q['name'] = sanitize_title_for_query($q['name']);
+			$where .= " AND $wpdb->posts.post_name = '".$q['name']."'";
+		} elseif ('' != $q['pagename']) {
+			if (isset($this->queried_object_id)) {
 				$reqpage = $this->queried_object_id;
 			} else {
-				if ( 'page' != $q['post_type'] ) {
-					foreach ( (array)$q['post_type'] as $_post_type ) {
+				if ('page' != $q['post_type']) {
+					foreach ((array) $q['post_type'] as $_post_type) {
 						$ptype_obj = get_post_type_object($_post_type);
-						if ( !$ptype_obj || !$ptype_obj->hierarchical )
+						if ( ! $ptype_obj || ! $ptype_obj->hierarchical)
 							continue;
 
 						$reqpage = get_page_by_path($q['pagename'], OBJECT, $_post_type);
-						if ( $reqpage )
+						if ($reqpage)
 							break;
 					}
 					unset($ptype_obj);
 				} else {
 					$reqpage = get_page_by_path($q['pagename']);
 				}
-				if ( !empty($reqpage) )
+				if ( ! empty($reqpage))
 					$reqpage = $reqpage->ID;
 				else
 					$reqpage = 0;
 			}
 
 			$page_for_posts = get_option('page_for_posts');
-			if  ( ('page' != get_option('show_on_front') ) || empty($page_for_posts) || ( $reqpage != $page_for_posts ) ) {
-				$q['pagename'] = sanitize_title_for_query( wp_basename( $q['pagename'] ) );
+			if (('page' != get_option('show_on_front')) || empty($page_for_posts) || ($reqpage != $page_for_posts)) {
+				$q['pagename'] = sanitize_title_for_query(wp_basename($q['pagename']));
 				$q['name'] = $q['pagename'];
 				$where .= " AND ($wpdb->posts.ID = '$reqpage')";
-				$reqpage_obj = get_post( $reqpage );
-				if ( is_object($reqpage_obj) && 'attachment' == $reqpage_obj->post_type ) {
+				$reqpage_obj = get_post($reqpage);
+				if (is_object($reqpage_obj) && 'attachment' == $reqpage_obj->post_type) {
 					$this->is_attachment = true;
 					$post_type = $q['post_type'] = 'attachment';
 					$this->is_page = true;
 					$q['attachment_id'] = $reqpage;
 				}
 			}
-		} elseif ( '' != $q['attachment'] ) {
-			$q['attachment'] = sanitize_title_for_query( wp_basename( $q['attachment'] ) );
+		} elseif ('' != $q['attachment']) {
+			$q['attachment'] = sanitize_title_for_query(wp_basename($q['attachment']));
 			$q['name'] = $q['attachment'];
-			$where .= " AND $wpdb->posts.post_name = '" . $q['attachment'] . "'";
-		} elseif ( is_array( $q['post_name__in'] ) && ! empty( $q['post_name__in'] ) ) {
-			$q['post_name__in'] = array_map( 'sanitize_title_for_query', $q['post_name__in'] );
-			$where .= " AND $wpdb->posts.post_name IN ('" . implode( "' ,'", $q['post_name__in'] ) . "')";
+			$where .= " AND $wpdb->posts.post_name = '".$q['attachment']."'";
+		} elseif (is_array($q['post_name__in']) && ! empty($q['post_name__in'])) {
+			$q['post_name__in'] = array_map('sanitize_title_for_query', $q['post_name__in']);
+			$where .= " AND $wpdb->posts.post_name IN ('".implode("' ,'", $q['post_name__in'])."')";
 		}
 
 		// If an attachment is requested by number, let it supersede any post number.
-		if ( $q['attachment_id'] )
+		if ($q['attachment_id'])
 			$q['p'] = absint($q['attachment_id']);
 
 		// If a post number is specified, load that post
-		if ( $q['p'] ) {
-			$where .= " AND {$wpdb->posts}.ID = " . $q['p'];
-		} elseif ( $q['post__in'] ) {
-			$post__in = implode(',', array_map( 'absint', $q['post__in'] ));
+		if ($q['p']) {
+			$where .= " AND {$wpdb->posts}.ID = ".$q['p'];
+		} elseif ($q['post__in']) {
+			$post__in = implode(',', array_map('absint', $q['post__in']));
 			$where .= " AND {$wpdb->posts}.ID IN ($post__in)";
-		} elseif ( $q['post__not_in'] ) {
-			$post__not_in = implode(',',  array_map( 'absint', $q['post__not_in'] ));
+		} elseif ($q['post__not_in']) {
+			$post__not_in = implode(',', array_map('absint', $q['post__not_in']));
 			$where .= " AND {$wpdb->posts}.ID NOT IN ($post__not_in)";
 		}
 
-		if ( is_numeric( $q['post_parent'] ) ) {
-			$where .= $wpdb->prepare( " AND $wpdb->posts.post_parent = %d ", $q['post_parent'] );
-		} elseif ( $q['post_parent__in'] ) {
-			$post_parent__in = implode( ',', array_map( 'absint', $q['post_parent__in'] ) );
+		if (is_numeric($q['post_parent'])) {
+			$where .= $wpdb->prepare(" AND $wpdb->posts.post_parent = %d ", $q['post_parent']);
+		} elseif ($q['post_parent__in']) {
+			$post_parent__in = implode(',', array_map('absint', $q['post_parent__in']));
 			$where .= " AND {$wpdb->posts}.post_parent IN ($post_parent__in)";
-		} elseif ( $q['post_parent__not_in'] ) {
-			$post_parent__not_in = implode( ',',  array_map( 'absint', $q['post_parent__not_in'] ) );
+		} elseif ($q['post_parent__not_in']) {
+			$post_parent__not_in = implode(',', array_map('absint', $q['post_parent__not_in']));
 			$where .= " AND {$wpdb->posts}.post_parent NOT IN ($post_parent__not_in)";
 		}
 
-		if ( $q['page_id'] ) {
-			if  ( ('page' != get_option('show_on_front') ) || ( $q['page_id'] != get_option('page_for_posts') ) ) {
+		if ($q['page_id']) {
+			if (('page' != get_option('show_on_front')) || ($q['page_id'] != get_option('page_for_posts'))) {
 				$q['p'] = $q['page_id'];
-				$where = " AND {$wpdb->posts}.ID = " . $q['page_id'];
+				$where = " AND {$wpdb->posts}.ID = ".$q['page_id'];
 			}
 		}
 
 		// If a search pattern is specified, load the posts that match.
-		if ( strlen( $q['s'] ) ) {
-			$search = $this->parse_search( $q );
+		if (strlen($q['s'])) {
+			$search = $this->parse_search($q);
 		}
 
-		if ( ! $q['suppress_filters'] ) {
+		if ( ! $q['suppress_filters']) {
 			/**
 			 * Filter the search SQL that is used in the WHERE clause of WP_Query.
 			 *
@@ -2794,36 +2794,36 @@ 
 			 * @param string   $search Search SQL for WHERE clause.
 			 * @param WP_Query $this   The current WP_Query object.
 			 */
-			$search = apply_filters_ref_array( 'posts_search', array( $search, &$this ) );
+			$search = apply_filters_ref_array('posts_search', array($search, &$this));
 		}
 
 		// Taxonomies
-		if ( !$this->is_singular ) {
-			$this->parse_tax_query( $q );
+		if ( ! $this->is_singular) {
+			$this->parse_tax_query($q);
 
-			$clauses = $this->tax_query->get_sql( $wpdb->posts, 'ID' );
+			$clauses = $this->tax_query->get_sql($wpdb->posts, 'ID');
 
 			$join .= $clauses['join'];
 			$where .= $clauses['where'];
 		}
 
-		if ( $this->is_tax ) {
-			if ( empty($post_type) ) {
+		if ($this->is_tax) {
+			if (empty($post_type)) {
 				// Do a fully inclusive search for currently registered post types of queried taxonomies
 				$post_type = array();
-				$taxonomies = array_keys( $this->tax_query->queried_terms );
-				foreach ( get_post_types( array( 'exclude_from_search' => false ) ) as $pt ) {
-					$object_taxonomies = $pt === 'attachment' ? get_taxonomies_for_attachments() : get_object_taxonomies( $pt );
-					if ( array_intersect( $taxonomies, $object_taxonomies ) )
+				$taxonomies = array_keys($this->tax_query->queried_terms);
+				foreach (get_post_types(array('exclude_from_search' => false)) as $pt) {
+					$object_taxonomies = $pt === 'attachment' ? get_taxonomies_for_attachments() : get_object_taxonomies($pt);
+					if (array_intersect($taxonomies, $object_taxonomies))
 						$post_type[] = $pt;
 				}
-				if ( ! $post_type )
+				if ( ! $post_type)
 					$post_type = 'any';
-				elseif ( count( $post_type ) == 1 )
+				elseif (count($post_type) == 1)
 					$post_type = $post_type[0];
 
 				$post_status_join = true;
-			} elseif ( in_array('attachment', (array) $post_type) ) {
+			} elseif (in_array('attachment', (array) $post_type)) {
 				$post_status_join = true;
 			}
 		}
@@ -2832,22 +2832,22 @@ 
 		 * Ensure that 'taxonomy', 'term', 'term_id', 'cat', and
 		 * 'category_name' vars are set for backward compatibility.
 		 */
-		if ( ! empty( $this->tax_query->queried_terms ) ) {
+		if ( ! empty($this->tax_query->queried_terms)) {
 
 			/*
 			 * Set 'taxonomy', 'term', and 'term_id' to the
 			 * first taxonomy other than 'post_tag' or 'category'.
 			 */
-			if ( ! isset( $q['taxonomy'] ) ) {
-				foreach ( $this->tax_query->queried_terms as $queried_taxonomy => $queried_items ) {
-					if ( empty( $queried_items['terms'][0] ) ) {
+			if ( ! isset($q['taxonomy'])) {
+				foreach ($this->tax_query->queried_terms as $queried_taxonomy => $queried_items) {
+					if (empty($queried_items['terms'][0])) {
 						continue;
 					}
 
-					if ( ! in_array( $queried_taxonomy, array( 'category', 'post_tag' ) ) ) {
+					if ( ! in_array($queried_taxonomy, array('category', 'post_tag'))) {
 						$q['taxonomy'] = $queried_taxonomy;
 
-						if ( 'slug' === $queried_items['field'] ) {
+						if ('slug' === $queried_items['field']) {
 							$q['term'] = $queried_items['terms'][0];
 						} else {
 							$q['term_id'] = $queried_items['terms'][0];
@@ -2860,154 +2860,154 @@ 
 			}
 
 			// 'cat', 'category_name', 'tag_id'
-			foreach ( $this->tax_query->queried_terms as $queried_taxonomy => $queried_items ) {
-				if ( empty( $queried_items['terms'][0] ) ) {
+			foreach ($this->tax_query->queried_terms as $queried_taxonomy => $queried_items) {
+				if (empty($queried_items['terms'][0])) {
 					continue;
 				}
 
-				if ( 'category' === $queried_taxonomy ) {
-					$the_cat = get_term_by( $queried_items['field'], $queried_items['terms'][0], 'category' );
-					if ( $the_cat ) {
-						$this->set( 'cat', $the_cat->term_id );
-						$this->set( 'category_name', $the_cat->slug );
+				if ('category' === $queried_taxonomy) {
+					$the_cat = get_term_by($queried_items['field'], $queried_items['terms'][0], 'category');
+					if ($the_cat) {
+						$this->set('cat', $the_cat->term_id);
+						$this->set('category_name', $the_cat->slug);
 					}
-					unset( $the_cat );
+					unset($the_cat);
 				}
 
-				if ( 'post_tag' === $queried_taxonomy ) {
-					$the_tag = get_term_by( $queried_items['field'], $queried_items['terms'][0], 'post_tag' );
-					if ( $the_tag ) {
-						$this->set( 'tag_id', $the_tag->term_id );
+				if ('post_tag' === $queried_taxonomy) {
+					$the_tag = get_term_by($queried_items['field'], $queried_items['terms'][0], 'post_tag');
+					if ($the_tag) {
+						$this->set('tag_id', $the_tag->term_id);
 					}
-					unset( $the_tag );
+					unset($the_tag);
 				}
 			}
 		}
 
-		if ( !empty( $this->tax_query->queries ) || !empty( $this->meta_query->queries ) ) {
+		if ( ! empty($this->tax_query->queries) || ! empty($this->meta_query->queries)) {
 			$groupby = "{$wpdb->posts}.ID";
 		}
 
 		// Author/user stuff
 
-		if ( ! empty( $q['author'] ) && $q['author'] != '0' ) {
-			$q['author'] = addslashes_gpc( '' . urldecode( $q['author'] ) );
-			$authors = array_unique( array_map( 'intval', preg_split( '/[,\s]+/', $q['author'] ) ) );
-			foreach ( $authors as $author ) {
+		if ( ! empty($q['author']) && $q['author'] != '0') {
+			$q['author'] = addslashes_gpc(''.urldecode($q['author']));
+			$authors = array_unique(array_map('intval', preg_split('/[,\s]+/', $q['author'])));
+			foreach ($authors as $author) {
 				$key = $author > 0 ? 'author__in' : 'author__not_in';
-				$q[$key][] = abs( $author );
+				$q[$key][] = abs($author);
 			}
-			$q['author'] = implode( ',', $authors );
+			$q['author'] = implode(',', $authors);
 		}
 
-		if ( ! empty( $q['author__not_in'] ) ) {
-			$author__not_in = implode( ',', array_map( 'absint', array_unique( (array) $q['author__not_in'] ) ) );
+		if ( ! empty($q['author__not_in'])) {
+			$author__not_in = implode(',', array_map('absint', array_unique((array) $q['author__not_in'])));
 			$where .= " AND {$wpdb->posts}.post_author NOT IN ($author__not_in) ";
-		} elseif ( ! empty( $q['author__in'] ) ) {
-			$author__in = implode( ',', array_map( 'absint', array_unique( (array) $q['author__in'] ) ) );
+		} elseif ( ! empty($q['author__in'])) {
+			$author__in = implode(',', array_map('absint', array_unique((array) $q['author__in'])));
 			$where .= " AND {$wpdb->posts}.post_author IN ($author__in) ";
 		}
 
 		// Author stuff for nice URLs
 
-		if ( '' != $q['author_name'] ) {
-			if ( strpos($q['author_name'], '/') !== false ) {
+		if ('' != $q['author_name']) {
+			if (strpos($q['author_name'], '/') !== false) {
 				$q['author_name'] = explode('/', $q['author_name']);
-				if ( $q['author_name'][ count($q['author_name'])-1 ] ) {
-					$q['author_name'] = $q['author_name'][count($q['author_name'])-1]; // no trailing slash
+				if ($q['author_name'][count($q['author_name']) - 1]) {
+					$q['author_name'] = $q['author_name'][count($q['author_name']) - 1]; // no trailing slash
 				} else {
-					$q['author_name'] = $q['author_name'][count($q['author_name'])-2]; // there was a trailing slash
+					$q['author_name'] = $q['author_name'][count($q['author_name']) - 2]; // there was a trailing slash
 				}
 			}
-			$q['author_name'] = sanitize_title_for_query( $q['author_name'] );
+			$q['author_name'] = sanitize_title_for_query($q['author_name']);
 			$q['author'] = get_user_by('slug', $q['author_name']);
-			if ( $q['author'] )
+			if ($q['author'])
 				$q['author'] = $q['author']->ID;
-			$whichauthor .= " AND ($wpdb->posts.post_author = " . absint($q['author']) . ')';
+			$whichauthor .= " AND ($wpdb->posts.post_author = ".absint($q['author']).')';
 		}
 
 		// MIME-Type stuff for attachment browsing
 
-		if ( isset( $q['post_mime_type'] ) && '' != $q['post_mime_type'] )
-			$whichmimetype = wp_post_mime_type_where( $q['post_mime_type'], $wpdb->posts );
+		if (isset($q['post_mime_type']) && '' != $q['post_mime_type'])
+			$whichmimetype = wp_post_mime_type_where($q['post_mime_type'], $wpdb->posts);
 
-		$where .= $search . $whichauthor . $whichmimetype;
+		$where .= $search.$whichauthor.$whichmimetype;
 
-		if ( ! empty( $this->meta_query->queries ) ) {
-			$clauses = $this->meta_query->get_sql( 'post', $wpdb->posts, 'ID', $this );
+		if ( ! empty($this->meta_query->queries)) {
+			$clauses = $this->meta_query->get_sql('post', $wpdb->posts, 'ID', $this);
 			$join   .= $clauses['join'];
 			$where  .= $clauses['where'];
 		}
 
-		$rand = ( isset( $q['orderby'] ) && 'rand' === $q['orderby'] );
-		if ( ! isset( $q['order'] ) ) {
+		$rand = (isset($q['orderby']) && 'rand' === $q['orderby']);
+		if ( ! isset($q['order'])) {
 			$q['order'] = $rand ? '' : 'DESC';
 		} else {
-			$q['order'] = $rand ? '' : $this->parse_order( $q['order'] );
+			$q['order'] = $rand ? '' : $this->parse_order($q['order']);
 		}
 
 		// Order by.
-		if ( empty( $q['orderby'] ) ) {
+		if (empty($q['orderby'])) {
 			/*
 			 * Boolean false or empty array blanks out ORDER BY,
 			 * while leaving the value unset or otherwise empty sets the default.
 			 */
-			if ( isset( $q['orderby'] ) && ( is_array( $q['orderby'] ) || false === $q['orderby'] ) ) {
+			if (isset($q['orderby']) && (is_array($q['orderby']) || false === $q['orderby'])) {
 				$orderby = '';
 			} else {
-				$orderby = "$wpdb->posts.post_date " . $q['order'];
+				$orderby = "$wpdb->posts.post_date ".$q['order'];
 			}
-		} elseif ( 'none' == $q['orderby'] ) {
+		} elseif ('none' == $q['orderby']) {
 			$orderby = '';
-		} elseif ( $q['orderby'] == 'post__in' && ! empty( $post__in ) ) {
+		} elseif ($q['orderby'] == 'post__in' && ! empty($post__in)) {
 			$orderby = "FIELD( {$wpdb->posts}.ID, $post__in )";
-		} elseif ( $q['orderby'] == 'post_parent__in' && ! empty( $post_parent__in ) ) {
+		} elseif ($q['orderby'] == 'post_parent__in' && ! empty($post_parent__in)) {
 			$orderby = "FIELD( {$wpdb->posts}.post_parent, $post_parent__in )";
 		} else {
 			$orderby_array = array();
-			if ( is_array( $q['orderby'] ) ) {
-				foreach ( $q['orderby'] as $_orderby => $order ) {
-					$orderby = addslashes_gpc( urldecode( $_orderby ) );
-					$parsed  = $this->parse_orderby( $orderby );
+			if (is_array($q['orderby'])) {
+				foreach ($q['orderby'] as $_orderby => $order) {
+					$orderby = addslashes_gpc(urldecode($_orderby));
+					$parsed  = $this->parse_orderby($orderby);
 
-					if ( ! $parsed ) {
+					if ( ! $parsed) {
 						continue;
 					}
 
-					$orderby_array[] = $parsed . ' ' . $this->parse_order( $order );
+					$orderby_array[] = $parsed.' '.$this->parse_order($order);
 				}
-				$orderby = implode( ', ', $orderby_array );
+				$orderby = implode(', ', $orderby_array);
 
 			} else {
-				$q['orderby'] = urldecode( $q['orderby'] );
-				$q['orderby'] = addslashes_gpc( $q['orderby'] );
+				$q['orderby'] = urldecode($q['orderby']);
+				$q['orderby'] = addslashes_gpc($q['orderby']);
 
-				foreach ( explode( ' ', $q['orderby'] ) as $i => $orderby ) {
-					$parsed = $this->parse_orderby( $orderby );
+				foreach (explode(' ', $q['orderby']) as $i => $orderby) {
+					$parsed = $this->parse_orderby($orderby);
 					// Only allow certain values for safety.
-					if ( ! $parsed ) {
+					if ( ! $parsed) {
 						continue;
 					}
 
 					$orderby_array[] = $parsed;
 				}
-				$orderby = implode( ' ' . $q['order'] . ', ', $orderby_array );
+				$orderby = implode(' '.$q['order'].', ', $orderby_array);
 
-				if ( empty( $orderby ) ) {
-					$orderby = "$wpdb->posts.post_date " . $q['order'];
-				} elseif ( ! empty( $q['order'] ) ) {
+				if (empty($orderby)) {
+					$orderby = "$wpdb->posts.post_date ".$q['order'];
+				} elseif ( ! empty($q['order'])) {
 					$orderby .= " {$q['order']}";
 				}
 			}
 		}
 
 		// Order search results by relevance only when another "orderby" is not specified in the query.
-		if ( ! empty( $q['s'] ) ) {
+		if ( ! empty($q['s'])) {
 			$search_orderby = '';
-			if ( ! empty( $q['search_orderby_title'] ) && ( empty( $q['orderby'] ) && ! $this->is_feed ) || ( isset( $q['orderby'] ) && 'relevance' === $q['orderby'] ) )
-				$search_orderby = $this->parse_search_order( $q );
+			if ( ! empty($q['search_orderby_title']) && (empty($q['orderby']) && ! $this->is_feed) || (isset($q['orderby']) && 'relevance' === $q['orderby']))
+				$search_orderby = $this->parse_search_order($q);
 
-			if ( ! $q['suppress_filters'] ) {
+			if ( ! $q['suppress_filters']) {
 				/**
 				 * Filter the ORDER BY used when ordering search results.
 				 *
@@ -3016,94 +3016,94 @@ 
 				 * @param string   $search_orderby The ORDER BY clause.
 				 * @param WP_Query $this           The current WP_Query instance.
 				 */
-				$search_orderby = apply_filters( 'posts_search_orderby', $search_orderby, $this );
+				$search_orderby = apply_filters('posts_search_orderby', $search_orderby, $this);
 			}
 
-			if ( $search_orderby )
-				$orderby = $orderby ? $search_orderby . ', ' . $orderby : $search_orderby;
+			if ($search_orderby)
+				$orderby = $orderby ? $search_orderby.', '.$orderby : $search_orderby;
 		}
 
-		if ( is_array( $post_type ) && count( $post_type ) > 1 ) {
+		if (is_array($post_type) && count($post_type) > 1) {
 			$post_type_cap = 'multiple_post_type';
 		} else {
-			if ( is_array( $post_type ) )
-				$post_type = reset( $post_type );
-			$post_type_object = get_post_type_object( $post_type );
-			if ( empty( $post_type_object ) )
+			if (is_array($post_type))
+				$post_type = reset($post_type);
+			$post_type_object = get_post_type_object($post_type);
+			if (empty($post_type_object))
 				$post_type_cap = $post_type;
 		}
 
-		if ( isset( $q['post_password'] ) ) {
-			$where .= $wpdb->prepare( " AND $wpdb->posts.post_password = %s", $q['post_password'] );
-			if ( empty( $q['perm'] ) ) {
+		if (isset($q['post_password'])) {
+			$where .= $wpdb->prepare(" AND $wpdb->posts.post_password = %s", $q['post_password']);
+			if (empty($q['perm'])) {
 				$q['perm'] = 'readable';
 			}
-		} elseif ( isset( $q['has_password'] ) ) {
-			$where .= sprintf( " AND $wpdb->posts.post_password %s ''", $q['has_password'] ? '!=' : '=' );
+		} elseif (isset($q['has_password'])) {
+			$where .= sprintf(" AND $wpdb->posts.post_password %s ''", $q['has_password'] ? '!=' : '=');
 		}
 
-		if ( ! empty( $q['comment_status'] ) ) {
-			$where .= $wpdb->prepare( " AND $wpdb->posts.comment_status = %s ", $q['comment_status'] );
+		if ( ! empty($q['comment_status'])) {
+			$where .= $wpdb->prepare(" AND $wpdb->posts.comment_status = %s ", $q['comment_status']);
 		}
 
-		if ( ! empty( $q['ping_status'] ) )  {
-			$where .= $wpdb->prepare( " AND $wpdb->posts.ping_status = %s ", $q['ping_status'] );
+		if ( ! empty($q['ping_status'])) {
+			$where .= $wpdb->prepare(" AND $wpdb->posts.ping_status = %s ", $q['ping_status']);
 		}
 
-		if ( 'any' == $post_type ) {
-			$in_search_post_types = get_post_types( array('exclude_from_search' => false) );
-			if ( empty( $in_search_post_types ) )
+		if ('any' == $post_type) {
+			$in_search_post_types = get_post_types(array('exclude_from_search' => false));
+			if (empty($in_search_post_types))
 				$where .= ' AND 1=0 ';
 			else
-				$where .= " AND $wpdb->posts.post_type IN ('" . join("', '", $in_search_post_types ) . "')";
-		} elseif ( !empty( $post_type ) && is_array( $post_type ) ) {
-			$where .= " AND $wpdb->posts.post_type IN ('" . join("', '", $post_type) . "')";
-		} elseif ( ! empty( $post_type ) ) {
+				$where .= " AND $wpdb->posts.post_type IN ('".join("', '", $in_search_post_types)."')";
+		} elseif ( ! empty($post_type) && is_array($post_type)) {
+			$where .= " AND $wpdb->posts.post_type IN ('".join("', '", $post_type)."')";
+		} elseif ( ! empty($post_type)) {
 			$where .= " AND $wpdb->posts.post_type = '$post_type'";
-			$post_type_object = get_post_type_object ( $post_type );
-		} elseif ( $this->is_attachment ) {
+			$post_type_object = get_post_type_object($post_type);
+		} elseif ($this->is_attachment) {
 			$where .= " AND $wpdb->posts.post_type = 'attachment'";
-			$post_type_object = get_post_type_object ( 'attachment' );
-		} elseif ( $this->is_page ) {
+			$post_type_object = get_post_type_object('attachment');
+		} elseif ($this->is_page) {
 			$where .= " AND $wpdb->posts.post_type = 'page'";
-			$post_type_object = get_post_type_object ( 'page' );
+			$post_type_object = get_post_type_object('page');
 		} else {
 			$where .= " AND $wpdb->posts.post_type = 'post'";
-			$post_type_object = get_post_type_object ( 'post' );
+			$post_type_object = get_post_type_object('post');
 		}
 
 		$edit_cap = 'edit_post';
 		$read_cap = 'read_post';
 
-		if ( ! empty( $post_type_object ) ) {
+		if ( ! empty($post_type_object)) {
 			$edit_others_cap = $post_type_object->cap->edit_others_posts;
 			$read_private_cap = $post_type_object->cap->read_private_posts;
 		} else {
-			$edit_others_cap = 'edit_others_' . $post_type_cap . 's';
-			$read_private_cap = 'read_private_' . $post_type_cap . 's';
+			$edit_others_cap = 'edit_others_'.$post_type_cap.'s';
+			$read_private_cap = 'read_private_'.$post_type_cap.'s';
 		}
 
 		$user_id = get_current_user_id();
 
 		$q_status = array();
-		if ( ! empty( $q['post_status'] ) ) {
+		if ( ! empty($q['post_status'])) {
 			$statuswheres = array();
 			$q_status = $q['post_status'];
-			if ( ! is_array( $q_status ) )
+			if ( ! is_array($q_status))
 				$q_status = explode(',', $q_status);
 			$r_status = array();
 			$p_status = array();
 			$e_status = array();
-			if ( in_array( 'any', $q_status ) ) {
-				foreach ( get_post_stati( array( 'exclude_from_search' => true ) ) as $status ) {
-					if ( ! in_array( $status, $q_status ) ) {
+			if (in_array('any', $q_status)) {
+				foreach (get_post_stati(array('exclude_from_search' => true)) as $status) {
+					if ( ! in_array($status, $q_status)) {
 						$e_status[] = "$wpdb->posts.post_status <> '$status'";
 					}
 				}
 			} else {
-				foreach ( get_post_stati() as $status ) {
-					if ( in_array( $status, $q_status ) ) {
-						if ( 'private' == $status )
+				foreach (get_post_stati() as $status) {
+					if (in_array($status, $q_status)) {
+						if ('private' == $status)
 							$p_status[] = "$wpdb->posts.post_status = '$status'";
 						else
 							$r_status[] = "$wpdb->posts.post_status = '$status'";
@@ -3111,58 +3111,58 @@ 
 				}
 			}
 
-			if ( empty($q['perm'] ) || 'readable' != $q['perm'] ) {
+			if (empty($q['perm']) || 'readable' != $q['perm']) {
 				$r_status = array_merge($r_status, $p_status);
 				unset($p_status);
 			}
 
-			if ( !empty($e_status) ) {
-				$statuswheres[] = "(" . join( ' AND ', $e_status ) . ")";
+			if ( ! empty($e_status)) {
+				$statuswheres[] = "(".join(' AND ', $e_status).")";
 			}
-			if ( !empty($r_status) ) {
-				if ( !empty($q['perm'] ) && 'editable' == $q['perm'] && !current_user_can($edit_others_cap) )
-					$statuswheres[] = "($wpdb->posts.post_author = $user_id " . "AND (" . join( ' OR ', $r_status ) . "))";
+			if ( ! empty($r_status)) {
+				if ( ! empty($q['perm']) && 'editable' == $q['perm'] && ! current_user_can($edit_others_cap))
+					$statuswheres[] = "($wpdb->posts.post_author = $user_id "."AND (".join(' OR ', $r_status)."))";
 				else
-					$statuswheres[] = "(" . join( ' OR ', $r_status ) . ")";
+					$statuswheres[] = "(".join(' OR ', $r_status).")";
 			}
-			if ( !empty($p_status) ) {
-				if ( !empty($q['perm'] ) && 'readable' == $q['perm'] && !current_user_can($read_private_cap) )
-					$statuswheres[] = "($wpdb->posts.post_author = $user_id " . "AND (" . join( ' OR ', $p_status ) . "))";
+			if ( ! empty($p_status)) {
+				if ( ! empty($q['perm']) && 'readable' == $q['perm'] && ! current_user_can($read_private_cap))
+					$statuswheres[] = "($wpdb->posts.post_author = $user_id "."AND (".join(' OR ', $p_status)."))";
 				else
-					$statuswheres[] = "(" . join( ' OR ', $p_status ) . ")";
+					$statuswheres[] = "(".join(' OR ', $p_status).")";
 			}
-			if ( $post_status_join ) {
+			if ($post_status_join) {
 				$join .= " LEFT JOIN $wpdb->posts AS p2 ON ($wpdb->posts.post_parent = p2.ID) ";
-				foreach ( $statuswheres as $index => $statuswhere )
-					$statuswheres[$index] = "($statuswhere OR ($wpdb->posts.post_status = 'inherit' AND " . str_replace($wpdb->posts, 'p2', $statuswhere) . "))";
+				foreach ($statuswheres as $index => $statuswhere)
+					$statuswheres[$index] = "($statuswhere OR ($wpdb->posts.post_status = 'inherit' AND ".str_replace($wpdb->posts, 'p2', $statuswhere)."))";
 			}
-			$where_status = implode( ' OR ', $statuswheres );
-			if ( ! empty( $where_status ) ) {
+			$where_status = implode(' OR ', $statuswheres);
+			if ( ! empty($where_status)) {
 				$where .= " AND ($where_status)";
 			}
-		} elseif ( !$this->is_singular ) {
+		} elseif ( ! $this->is_singular) {
 			$where .= " AND ($wpdb->posts.post_status = 'publish'";
 
 			// Add public states.
-			$public_states = get_post_stati( array('public' => true) );
-			foreach ( (array) $public_states as $state ) {
-				if ( 'publish' == $state ) // Publish is hard-coded above.
+			$public_states = get_post_stati(array('public' => true));
+			foreach ((array) $public_states as $state) {
+				if ('publish' == $state) // Publish is hard-coded above.
 					continue;
 				$where .= " OR $wpdb->posts.post_status = '$state'";
 			}
 
-			if ( $this->is_admin ) {
+			if ($this->is_admin) {
 				// Add protected states that should show in the admin all list.
-				$admin_all_states = get_post_stati( array('protected' => true, 'show_in_admin_all_list' => true) );
-				foreach ( (array) $admin_all_states as $state )
+				$admin_all_states = get_post_stati(array('protected' => true, 'show_in_admin_all_list' => true));
+				foreach ((array) $admin_all_states as $state)
 					$where .= " OR $wpdb->posts.post_status = '$state'";
 			}
 
-			if ( is_user_logged_in() ) {
+			if (is_user_logged_in()) {
 				// Add private states that are limited to viewing by the author of a post or someone who has caps to read private states.
-				$private_states = get_post_stati( array('private' => true) );
-				foreach ( (array) $private_states as $state )
-					$where .= current_user_can( $read_private_cap ) ? " OR $wpdb->posts.post_status = '$state'" : " OR $wpdb->posts.post_author = $user_id AND $wpdb->posts.post_status = '$state'";
+				$private_states = get_post_stati(array('private' => true));
+				foreach ((array) $private_states as $state)
+					$where .= current_user_can($read_private_cap) ? " OR $wpdb->posts.post_status = '$state'" : " OR $wpdb->posts.post_author = $user_id AND $wpdb->posts.post_status = '$state'";
 			}
 
 			$where .= ')';
@@ -3172,7 +3172,7 @@ 
 		 * Apply filters on where and join prior to paging so that any
 		 * manipulations to them are reflected in the paging by day queries.
 		 */
-		if ( !$q['suppress_filters'] ) {
+		if ( ! $q['suppress_filters']) {
 			/**
 			 * Filter the WHERE clause of the query.
 			 *
@@ -3181,7 +3181,7 @@ 
 			 * @param string   $where The WHERE clause of the query.
 			 * @param WP_Query &$this The WP_Query instance (passed by reference).
 			 */
-			$where = apply_filters_ref_array( 'posts_where', array( $where, &$this ) );
+			$where = apply_filters_ref_array('posts_where', array($where, &$this));
 
 			/**
 			 * Filter the JOIN clause of the query.
@@ -3191,28 +3191,28 @@ 
 			 * @param string   $where The JOIN clause of the query.
 			 * @param WP_Query &$this The WP_Query instance (passed by reference).
 			 */
-			$join = apply_filters_ref_array( 'posts_join', array( $join, &$this ) );
+			$join = apply_filters_ref_array('posts_join', array($join, &$this));
 		}
 
 		// Paging
-		if ( empty($q['nopaging']) && !$this->is_singular ) {
+		if (empty($q['nopaging']) && ! $this->is_singular) {
 			$page = absint($q['paged']);
-			if ( !$page )
+			if ( ! $page)
 				$page = 1;
 
 			// If 'offset' is provided, it takes precedence over 'paged'.
-			if ( isset( $q['offset'] ) && is_numeric( $q['offset'] ) ) {
-				$q['offset'] = absint( $q['offset'] );
-				$pgstrt = $q['offset'] . ', ';
+			if (isset($q['offset']) && is_numeric($q['offset'])) {
+				$q['offset'] = absint($q['offset']);
+				$pgstrt = $q['offset'].', ';
 			} else {
-				$pgstrt = absint( ( $page - 1 ) * $q['posts_per_page'] ) . ', ';
+				$pgstrt = absint(($page - 1) * $q['posts_per_page']).', ';
 			}
-			$limits = 'LIMIT ' . $pgstrt . $q['posts_per_page'];
+			$limits = 'LIMIT '.$pgstrt.$q['posts_per_page'];
 		}
 
 		// Comments feeds
-		if ( $this->is_comment_feed && ! $this->is_singular ) {
-			if ( $this->is_archive || $this->is_search ) {
+		if ($this->is_comment_feed && ! $this->is_singular) {
+			if ($this->is_archive || $this->is_search) {
 				$cjoin = "JOIN $wpdb->posts ON ($wpdb->comments.comment_post_ID = $wpdb->posts.ID) $join ";
 				$cwhere = "WHERE comment_approved = '1' $where";
 				$cgroupby = "$wpdb->comments.comment_id";
@@ -3222,7 +3222,7 @@ 
 				$cgroupby = '';
 			}
 
-			if ( !$q['suppress_filters'] ) {
+			if ( ! $q['suppress_filters']) {
 				/**
 				 * Filter the JOIN clause of the comments feed query before sending.
 				 *
@@ -3231,7 +3231,7 @@ 
 				 * @param string   $cjoin The JOIN clause of the query.
 				 * @param WP_Query &$this The WP_Query instance (passed by reference).
 				 */
-				$cjoin = apply_filters_ref_array( 'comment_feed_join', array( $cjoin, &$this ) );
+				$cjoin = apply_filters_ref_array('comment_feed_join', array($cjoin, &$this));
 
 				/**
 				 * Filter the WHERE clause of the comments feed query before sending.
@@ -3241,7 +3241,7 @@ 
 				 * @param string   $cwhere The WHERE clause of the query.
 				 * @param WP_Query &$this  The WP_Query instance (passed by reference).
 				 */
-				$cwhere = apply_filters_ref_array( 'comment_feed_where', array( $cwhere, &$this ) );
+				$cwhere = apply_filters_ref_array('comment_feed_where', array($cwhere, &$this));
 
 				/**
 				 * Filter the GROUP BY clause of the comments feed query before sending.
@@ -3251,7 +3251,7 @@ 
 				 * @param string   $cgroupby The GROUP BY clause of the query.
 				 * @param WP_Query &$this    The WP_Query instance (passed by reference).
 				 */
-				$cgroupby = apply_filters_ref_array( 'comment_feed_groupby', array( $cgroupby, &$this ) );
+				$cgroupby = apply_filters_ref_array('comment_feed_groupby', array($cgroupby, &$this));
 
 				/**
 				 * Filter the ORDER BY clause of the comments feed query before sending.
@@ -3261,7 +3261,7 @@ 
 				 * @param string   $corderby The ORDER BY clause of the query.
 				 * @param WP_Query &$this    The WP_Query instance (passed by reference).
 				 */
-				$corderby = apply_filters_ref_array( 'comment_feed_orderby', array( 'comment_date_gmt DESC', &$this ) );
+				$corderby = apply_filters_ref_array('comment_feed_orderby', array('comment_date_gmt DESC', &$this));
 
 				/**
 				 * Filter the LIMIT clause of the comments feed query before sending.
@@ -3271,36 +3271,36 @@ 
 				 * @param string   $climits The JOIN clause of the query.
 				 * @param WP_Query &$this   The WP_Query instance (passed by reference).
 				 */
-				$climits = apply_filters_ref_array( 'comment_feed_limits', array( 'LIMIT ' . get_option('posts_per_rss'), &$this ) );
+				$climits = apply_filters_ref_array('comment_feed_limits', array('LIMIT '.get_option('posts_per_rss'), &$this));
 			}
-			$cgroupby = ( ! empty( $cgroupby ) ) ? 'GROUP BY ' . $cgroupby : '';
-			$corderby = ( ! empty( $corderby ) ) ? 'ORDER BY ' . $corderby : '';
+			$cgroupby = ( ! empty($cgroupby)) ? 'GROUP BY '.$cgroupby : '';
+			$corderby = ( ! empty($corderby)) ? 'ORDER BY '.$corderby : '';
 
 			$comments = (array) $wpdb->get_results("SELECT $distinct $wpdb->comments.* FROM $wpdb->comments $cjoin $cwhere $cgroupby $corderby $climits");
 			// Convert to WP_Comment
-			$this->comments = array_map( 'get_comment', $comments );
+			$this->comments = array_map('get_comment', $comments);
 			$this->comment_count = count($this->comments);
 
 			$post_ids = array();
 
-			foreach ( $this->comments as $comment )
+			foreach ($this->comments as $comment)
 				$post_ids[] = (int) $comment->comment_post_ID;
 
 			$post_ids = join(',', $post_ids);
 			$join = '';
-			if ( $post_ids )
+			if ($post_ids)
 				$where = "AND $wpdb->posts.ID IN ($post_ids) ";
 			else
 				$where = "AND 0";
 		}
 
-		$pieces = array( 'where', 'groupby', 'join', 'orderby', 'distinct', 'fields', 'limits' );
+		$pieces = array('where', 'groupby', 'join', 'orderby', 'distinct', 'fields', 'limits');
 
 		/*
 		 * Apply post-paging filters on where and join. Only plugins that
 		 * manipulate paging queries should use these hooks.
 		 */
-		if ( !$q['suppress_filters'] ) {
+		if ( ! $q['suppress_filters']) {
 			/**
 			 * Filter the WHERE clause of the query.
 			 *
@@ -3311,7 +3311,7 @@ 
 			 * @param string   $where The WHERE clause of the query.
 			 * @param WP_Query &$this The WP_Query instance (passed by reference).
 			 */
-			$where = apply_filters_ref_array( 'posts_where_paged', array( $where, &$this ) );
+			$where = apply_filters_ref_array('posts_where_paged', array($where, &$this));
 
 			/**
 			 * Filter the GROUP BY clause of the query.
@@ -3321,7 +3321,7 @@ 
 			 * @param string   $groupby The GROUP BY clause of the query.
 			 * @param WP_Query &$this   The WP_Query instance (passed by reference).
 			 */
-			$groupby = apply_filters_ref_array( 'posts_groupby', array( $groupby, &$this ) );
+			$groupby = apply_filters_ref_array('posts_groupby', array($groupby, &$this));
 
 			/**
 			 * Filter the JOIN clause of the query.
@@ -3333,7 +3333,7 @@ 
 			 * @param string   $join  The JOIN clause of the query.
 			 * @param WP_Query &$this The WP_Query instance (passed by reference).
 			 */
-			$join = apply_filters_ref_array( 'posts_join_paged', array( $join, &$this ) );
+			$join = apply_filters_ref_array('posts_join_paged', array($join, &$this));
 
 			/**
 			 * Filter the ORDER BY clause of the query.
@@ -3343,7 +3343,7 @@ 
 			 * @param string   $orderby The ORDER BY clause of the query.
 			 * @param WP_Query &$this   The WP_Query instance (passed by reference).
 			 */
-			$orderby = apply_filters_ref_array( 'posts_orderby', array( $orderby, &$this ) );
+			$orderby = apply_filters_ref_array('posts_orderby', array($orderby, &$this));
 
 			/**
 			 * Filter the DISTINCT clause of the query.
@@ -3353,7 +3353,7 @@ 
 			 * @param string   $distinct The DISTINCT clause of the query.
 			 * @param WP_Query &$this    The WP_Query instance (passed by reference).
 			 */
-			$distinct = apply_filters_ref_array( 'posts_distinct', array( $distinct, &$this ) );
+			$distinct = apply_filters_ref_array('posts_distinct', array($distinct, &$this));
 
 			/**
 			 * Filter the LIMIT clause of the query.
@@ -3363,7 +3363,7 @@ 
 			 * @param string   $limits The LIMIT clause of the query.
 			 * @param WP_Query &$this  The WP_Query instance (passed by reference).
 			 */
-			$limits = apply_filters_ref_array( 'post_limits', array( $limits, &$this ) );
+			$limits = apply_filters_ref_array('post_limits', array($limits, &$this));
 
 			/**
 			 * Filter the SELECT clause of the query.
@@ -3373,7 +3373,7 @@ 
 			 * @param string   $fields The SELECT clause of the query.
 			 * @param WP_Query &$this  The WP_Query instance (passed by reference).
 			 */
-			$fields = apply_filters_ref_array( 'posts_fields', array( $fields, &$this ) );
+			$fields = apply_filters_ref_array('posts_fields', array($fields, &$this));
 
 			/**
 			 * Filter all query clauses at once, for convenience.
@@ -3386,15 +3386,15 @@ 
 			 * @param array    $clauses The list of clauses for the query.
 			 * @param WP_Query &$this   The WP_Query instance (passed by reference).
 			 */
-			$clauses = (array) apply_filters_ref_array( 'posts_clauses', array( compact( $pieces ), &$this ) );
-
-			$where = isset( $clauses[ 'where' ] ) ? $clauses[ 'where' ] : '';
-			$groupby = isset( $clauses[ 'groupby' ] ) ? $clauses[ 'groupby' ] : '';
-			$join = isset( $clauses[ 'join' ] ) ? $clauses[ 'join' ] : '';
-			$orderby = isset( $clauses[ 'orderby' ] ) ? $clauses[ 'orderby' ] : '';
-			$distinct = isset( $clauses[ 'distinct' ] ) ? $clauses[ 'distinct' ] : '';
-			$fields = isset( $clauses[ 'fields' ] ) ? $clauses[ 'fields' ] : '';
-			$limits = isset( $clauses[ 'limits' ] ) ? $clauses[ 'limits' ] : '';
+			$clauses = (array) apply_filters_ref_array('posts_clauses', array(compact($pieces), &$this));
+
+			$where = isset($clauses['where']) ? $clauses['where'] : '';
+			$groupby = isset($clauses['groupby']) ? $clauses['groupby'] : '';
+			$join = isset($clauses['join']) ? $clauses['join'] : '';
+			$orderby = isset($clauses['orderby']) ? $clauses['orderby'] : '';
+			$distinct = isset($clauses['distinct']) ? $clauses['distinct'] : '';
+			$fields = isset($clauses['fields']) ? $clauses['fields'] : '';
+			$limits = isset($clauses['limits']) ? $clauses['limits'] : '';
 		}
 
 		/**
@@ -3406,13 +3406,13 @@ 
 		 *
 		 * @param string $selection The assembled selection query.
 		 */
-		do_action( 'posts_selection', $where . $groupby . $orderby . $limits . $join );
+		do_action('posts_selection', $where.$groupby.$orderby.$limits.$join);
 
 		/*
 		 * Filter again for the benefit of caching plugins.
 		 * Regular plugins should use the hooks above.
 		 */
-		if ( !$q['suppress_filters'] ) {
+		if ( ! $q['suppress_filters']) {
 			/**
 			 * Filter the WHERE clause of the query.
 			 *
@@ -3423,7 +3423,7 @@ 
 			 * @param string   $where The WHERE clause of the query.
 			 * @param WP_Query &$this The WP_Query instance (passed by reference).
 			 */
-			$where = apply_filters_ref_array( 'posts_where_request', array( $where, &$this ) );
+			$where = apply_filters_ref_array('posts_where_request', array($where, &$this));
 
 			/**
 			 * Filter the GROUP BY clause of the query.
@@ -3435,7 +3435,7 @@ 
 			 * @param string   $groupby The GROUP BY clause of the query.
 			 * @param WP_Query &$this   The WP_Query instance (passed by reference).
 			 */
-			$groupby = apply_filters_ref_array( 'posts_groupby_request', array( $groupby, &$this ) );
+			$groupby = apply_filters_ref_array('posts_groupby_request', array($groupby, &$this));
 
 			/**
 			 * Filter the JOIN clause of the query.
@@ -3447,7 +3447,7 @@ 
 			 * @param string   $join  The JOIN clause of the query.
 			 * @param WP_Query &$this The WP_Query instance (passed by reference).
 			 */
-			$join = apply_filters_ref_array( 'posts_join_request', array( $join, &$this ) );
+			$join = apply_filters_ref_array('posts_join_request', array($join, &$this));
 
 			/**
 			 * Filter the ORDER BY clause of the query.
@@ -3459,7 +3459,7 @@ 
 			 * @param string   $orderby The ORDER BY clause of the query.
 			 * @param WP_Query &$this   The WP_Query instance (passed by reference).
 			 */
-			$orderby = apply_filters_ref_array( 'posts_orderby_request', array( $orderby, &$this ) );
+			$orderby = apply_filters_ref_array('posts_orderby_request', array($orderby, &$this));
 
 			/**
 			 * Filter the DISTINCT clause of the query.
@@ -3471,7 +3471,7 @@ 
 			 * @param string   $distinct The DISTINCT clause of the query.
 			 * @param WP_Query &$this    The WP_Query instance (passed by reference).
 			 */
-			$distinct = apply_filters_ref_array( 'posts_distinct_request', array( $distinct, &$this ) );
+			$distinct = apply_filters_ref_array('posts_distinct_request', array($distinct, &$this));
 
 			/**
 			 * Filter the SELECT clause of the query.
@@ -3483,7 +3483,7 @@ 
 			 * @param string   $fields The SELECT clause of the query.
 			 * @param WP_Query &$this  The WP_Query instance (passed by reference).
 			 */
-			$fields = apply_filters_ref_array( 'posts_fields_request', array( $fields, &$this ) );
+			$fields = apply_filters_ref_array('posts_fields_request', array($fields, &$this));
 
 			/**
 			 * Filter the LIMIT clause of the query.
@@ -3495,7 +3495,7 @@ 
 			 * @param string   $limits The LIMIT clause of the query.
 			 * @param WP_Query &$this  The WP_Query instance (passed by reference).
 			 */
-			$limits = apply_filters_ref_array( 'post_limits_request', array( $limits, &$this ) );
+			$limits = apply_filters_ref_array('post_limits_request', array($limits, &$this));
 
 			/**
 			 * Filter all query clauses at once, for convenience.
@@ -3510,29 +3510,29 @@ 
 			 * @param array    $pieces The pieces of the query.
 			 * @param WP_Query &$this  The WP_Query instance (passed by reference).
 			 */
-			$clauses = (array) apply_filters_ref_array( 'posts_clauses_request', array( compact( $pieces ), &$this ) );
-
-			$where = isset( $clauses[ 'where' ] ) ? $clauses[ 'where' ] : '';
-			$groupby = isset( $clauses[ 'groupby' ] ) ? $clauses[ 'groupby' ] : '';
-			$join = isset( $clauses[ 'join' ] ) ? $clauses[ 'join' ] : '';
-			$orderby = isset( $clauses[ 'orderby' ] ) ? $clauses[ 'orderby' ] : '';
-			$distinct = isset( $clauses[ 'distinct' ] ) ? $clauses[ 'distinct' ] : '';
-			$fields = isset( $clauses[ 'fields' ] ) ? $clauses[ 'fields' ] : '';
-			$limits = isset( $clauses[ 'limits' ] ) ? $clauses[ 'limits' ] : '';
+			$clauses = (array) apply_filters_ref_array('posts_clauses_request', array(compact($pieces), &$this));
+
+			$where = isset($clauses['where']) ? $clauses['where'] : '';
+			$groupby = isset($clauses['groupby']) ? $clauses['groupby'] : '';
+			$join = isset($clauses['join']) ? $clauses['join'] : '';
+			$orderby = isset($clauses['orderby']) ? $clauses['orderby'] : '';
+			$distinct = isset($clauses['distinct']) ? $clauses['distinct'] : '';
+			$fields = isset($clauses['fields']) ? $clauses['fields'] : '';
+			$limits = isset($clauses['limits']) ? $clauses['limits'] : '';
 		}
 
-		if ( ! empty($groupby) )
-			$groupby = 'GROUP BY ' . $groupby;
-		if ( !empty( $orderby ) )
-			$orderby = 'ORDER BY ' . $orderby;
+		if ( ! empty($groupby))
+			$groupby = 'GROUP BY '.$groupby;
+		if ( ! empty($orderby))
+			$orderby = 'ORDER BY '.$orderby;
 
 		$found_rows = '';
-		if ( !$q['no_found_rows'] && !empty($limits) )
+		if ( ! $q['no_found_rows'] && ! empty($limits))
 			$found_rows = 'SQL_CALC_FOUND_ROWS';
 
 		$this->request = $old_request = "SELECT $found_rows $distinct $fields FROM $wpdb->posts $join WHERE 1=1 $where $groupby $orderby $limits";
 
-		if ( !$q['suppress_filters'] ) {
+		if ( ! $q['suppress_filters']) {
 			/**
 			 * Filter the completed SQL query before sending.
 			 *
@@ -3541,35 +3541,35 @@ 
 			 * @param array    $request The complete SQL query.
 			 * @param WP_Query &$this   The WP_Query instance (passed by reference).
 			 */
-			$this->request = apply_filters_ref_array( 'posts_request', array( $this->request, &$this ) );
+			$this->request = apply_filters_ref_array('posts_request', array($this->request, &$this));
 		}
 
-		if ( 'ids' == $q['fields'] ) {
-			$this->posts = $wpdb->get_col( $this->request );
-			$this->posts = array_map( 'intval', $this->posts );
-			$this->post_count = count( $this->posts );
-			$this->set_found_posts( $q, $limits );
+		if ('ids' == $q['fields']) {
+			$this->posts = $wpdb->get_col($this->request);
+			$this->posts = array_map('intval', $this->posts);
+			$this->post_count = count($this->posts);
+			$this->set_found_posts($q, $limits);
 
 			return $this->posts;
 		}
 
-		if ( 'id=>parent' == $q['fields'] ) {
-			$this->posts = $wpdb->get_results( $this->request );
-			$this->post_count = count( $this->posts );
-			$this->set_found_posts( $q, $limits );
+		if ('id=>parent' == $q['fields']) {
+			$this->posts = $wpdb->get_results($this->request);
+			$this->post_count = count($this->posts);
+			$this->set_found_posts($q, $limits);
 
 			$r = array();
-			foreach ( $this->posts as $key => $post ) {
-				$this->posts[ $key ]->ID = (int) $post->ID;
-				$this->posts[ $key ]->post_parent = (int) $post->post_parent;
+			foreach ($this->posts as $key => $post) {
+				$this->posts[$key]->ID = (int) $post->ID;
+				$this->posts[$key]->post_parent = (int) $post->post_parent;
 
-				$r[ (int) $post->ID ] = (int) $post->post_parent;
+				$r[(int) $post->ID] = (int) $post->post_parent;
 			}
 
 			return $r;
 		}
 
-		$split_the_query = ( $old_request == $this->request && "$wpdb->posts.*" == $fields && !empty( $limits ) && $q['posts_per_page'] < 500 );
+		$split_the_query = ($old_request == $this->request && "$wpdb->posts.*" == $fields && ! empty($limits) && $q['posts_per_page'] < 500);
 
 		/**
 		 * Filter whether to split the query.
@@ -3583,9 +3583,9 @@ 
 		 * @param bool     $split_the_query Whether or not to split the query.
 		 * @param WP_Query $this            The WP_Query instance.
 		 */
-		$split_the_query = apply_filters( 'split_the_query', $split_the_query, $this );
+		$split_the_query = apply_filters('split_the_query', $split_the_query, $this);
 
-		if ( $split_the_query ) {
+		if ($split_the_query) {
 			// First get the IDs and then fill in the objects
 
 			$this->request = "SELECT $found_rows $distinct $wpdb->posts.ID FROM $wpdb->posts $join WHERE 1=1 $where $groupby $orderby $limits";
@@ -3598,27 +3598,27 @@ 
 			 * @param string   $request The post ID request.
 			 * @param WP_Query $this    The WP_Query instance.
 			 */
-			$this->request = apply_filters( 'posts_request_ids', $this->request, $this );
+			$this->request = apply_filters('posts_request_ids', $this->request, $this);
 
-			$ids = $wpdb->get_col( $this->request );
+			$ids = $wpdb->get_col($this->request);
 
-			if ( $ids ) {
+			if ($ids) {
 				$this->posts = $ids;
-				$this->set_found_posts( $q, $limits );
-				_prime_post_caches( $ids, $q['update_post_term_cache'], $q['update_post_meta_cache'] );
+				$this->set_found_posts($q, $limits);
+				_prime_post_caches($ids, $q['update_post_term_cache'], $q['update_post_meta_cache']);
 			} else {
 				$this->posts = array();
 			}
 		} else {
-			$this->posts = $wpdb->get_results( $this->request );
-			$this->set_found_posts( $q, $limits );
+			$this->posts = $wpdb->get_results($this->request);
+			$this->set_found_posts($q, $limits);
 		}
 
 		// Convert to WP_Post objects
-		if ( $this->posts )
-			$this->posts = array_map( 'get_post', $this->posts );
+		if ($this->posts)
+			$this->posts = array_map('get_post', $this->posts);
 
-		if ( ! $q['suppress_filters'] ) {
+		if ( ! $q['suppress_filters']) {
 			/**
 			 * Filter the raw post results array, prior to status checks.
 			 *
@@ -3627,38 +3627,38 @@ 
 			 * @param array    $posts The post results array.
 			 * @param WP_Query &$this The WP_Query instance (passed by reference).
 			 */
-			$this->posts = apply_filters_ref_array( 'posts_results', array( $this->posts, &$this ) );
+			$this->posts = apply_filters_ref_array('posts_results', array($this->posts, &$this));
 		}
 
-		if ( !empty($this->posts) && $this->is_comment_feed && $this->is_singular ) {
+		if ( ! empty($this->posts) && $this->is_comment_feed && $this->is_singular) {
 			/** This filter is documented in wp-includes/query.php */
-			$cjoin = apply_filters_ref_array( 'comment_feed_join', array( '', &$this ) );
+			$cjoin = apply_filters_ref_array('comment_feed_join', array('', &$this));
 
 			/** This filter is documented in wp-includes/query.php */
-			$cwhere = apply_filters_ref_array( 'comment_feed_where', array( "WHERE comment_post_ID = '{$this->posts[0]->ID}' AND comment_approved = '1'", &$this ) );
+			$cwhere = apply_filters_ref_array('comment_feed_where', array("WHERE comment_post_ID = '{$this->posts[0]->ID}' AND comment_approved = '1'", &$this));
 
 			/** This filter is documented in wp-includes/query.php */
-			$cgroupby = apply_filters_ref_array( 'comment_feed_groupby', array( '', &$this ) );
-			$cgroupby = ( ! empty( $cgroupby ) ) ? 'GROUP BY ' . $cgroupby : '';
+			$cgroupby = apply_filters_ref_array('comment_feed_groupby', array('', &$this));
+			$cgroupby = ( ! empty($cgroupby)) ? 'GROUP BY '.$cgroupby : '';
 
 			/** This filter is documented in wp-includes/query.php */
-			$corderby = apply_filters_ref_array( 'comment_feed_orderby', array( 'comment_date_gmt DESC', &$this ) );
-			$corderby = ( ! empty( $corderby ) ) ? 'ORDER BY ' . $corderby : '';
+			$corderby = apply_filters_ref_array('comment_feed_orderby', array('comment_date_gmt DESC', &$this));
+			$corderby = ( ! empty($corderby)) ? 'ORDER BY '.$corderby : '';
 
 			/** This filter is documented in wp-includes/query.php */
-			$climits = apply_filters_ref_array( 'comment_feed_limits', array( 'LIMIT ' . get_option('posts_per_rss'), &$this ) );
+			$climits = apply_filters_ref_array('comment_feed_limits', array('LIMIT '.get_option('posts_per_rss'), &$this));
 
 			$comments_request = "SELECT $wpdb->comments.* FROM $wpdb->comments $cjoin $cwhere $cgroupby $corderby $climits";
 			$comments = $wpdb->get_results($comments_request);
 			// Convert to WP_Comment
-			$this->comments = array_map( 'get_comment', $comments );
+			$this->comments = array_map('get_comment', $comments);
 			$this->comment_count = count($this->comments);
 		}
 
 		// Check post status to determine if post should be displayed.
-		if ( !empty($this->posts) && ($this->is_single || $this->is_page) ) {
+		if ( ! empty($this->posts) && ($this->is_single || $this->is_page)) {
 			$status = get_post_status($this->posts[0]);
-			if ( 'attachment' === $this->posts[0]->post_type && 0 === (int) $this->posts[0]->post_parent ) {
+			if ('attachment' === $this->posts[0]->post_type && 0 === (int) $this->posts[0]->post_parent) {
 				$this->is_page = false;
 				$this->is_single = true;
 				$this->is_attachment = true;
@@ -3666,23 +3666,23 @@ 
 			$post_status_obj = get_post_status_object($status);
 
 			// If the post_status was specifically requested, let it pass through.
-			if ( !$post_status_obj->public && ! in_array( $status, $q_status ) ) {
+			if ( ! $post_status_obj->public && ! in_array($status, $q_status)) {
 
-				if ( ! is_user_logged_in() ) {
+				if ( ! is_user_logged_in()) {
 					// User must be logged in to view unpublished posts.
 					$this->posts = array();
 				} else {
-					if  ( $post_status_obj->protected ) {
+					if ($post_status_obj->protected) {
 						// User must have edit permissions on the draft to preview.
-						if ( ! current_user_can($edit_cap, $this->posts[0]->ID) ) {
+						if ( ! current_user_can($edit_cap, $this->posts[0]->ID)) {
 							$this->posts = array();
 						} else {
 							$this->is_preview = true;
-							if ( 'future' != $status )
+							if ('future' != $status)
 								$this->posts[0]->post_date = current_time('mysql');
 						}
-					} elseif ( $post_status_obj->private ) {
-						if ( ! current_user_can($read_cap, $this->posts[0]->ID) )
+					} elseif ($post_status_obj->private) {
+						if ( ! current_user_can($read_cap, $this->posts[0]->ID))
 							$this->posts = array();
 					} else {
 						$this->posts = array();
@@ -3690,7 +3690,7 @@ 
 				}
 			}
 
-			if ( $this->is_preview && $this->posts && current_user_can( $edit_cap, $this->posts[0]->ID ) ) {
+			if ($this->is_preview && $this->posts && current_user_can($edit_cap, $this->posts[0]->ID)) {
 				/**
 				 * Filter the single post for preview mode.
 				 *
@@ -3699,18 +3699,18 @@ 
 				 * @param WP_Post  $post_preview  The Post object.
 				 * @param WP_Query &$this         The WP_Query instance (passed by reference).
 				 */
-				$this->posts[0] = get_post( apply_filters_ref_array( 'the_preview', array( $this->posts[0], &$this ) ) );
+				$this->posts[0] = get_post(apply_filters_ref_array('the_preview', array($this->posts[0], &$this)));
 			}
 		}
 
 		// Put sticky posts at the top of the posts array
 		$sticky_posts = get_option('sticky_posts');
-		if ( $this->is_home && $page <= 1 && is_array($sticky_posts) && !empty($sticky_posts) && !$q['ignore_sticky_posts'] ) {
+		if ($this->is_home && $page <= 1 && is_array($sticky_posts) && ! empty($sticky_posts) && ! $q['ignore_sticky_posts']) {
 			$num_posts = count($this->posts);
 			$sticky_offset = 0;
 			// Loop over posts and relocate stickies to the front.
-			for ( $i = 0; $i < $num_posts; $i++ ) {
-				if ( in_array($this->posts[$i]->ID, $sticky_posts) ) {
+			for ($i = 0; $i < $num_posts; $i++) {
+				if (in_array($this->posts[$i]->ID, $sticky_posts)) {
 					$sticky_post = $this->posts[$i];
 					// Remove sticky from current position
 					array_splice($this->posts, $i, 1);
@@ -3720,36 +3720,36 @@ 
 					$sticky_offset++;
 					// Remove post from sticky posts array
 					$offset = array_search($sticky_post->ID, $sticky_posts);
-					unset( $sticky_posts[$offset] );
+					unset($sticky_posts[$offset]);
 				}
 			}
 
 			// If any posts have been excluded specifically, Ignore those that are sticky.
-			if ( !empty($sticky_posts) && !empty($q['post__not_in']) )
+			if ( ! empty($sticky_posts) && ! empty($q['post__not_in']))
 				$sticky_posts = array_diff($sticky_posts, $q['post__not_in']);
 
 			// Fetch sticky posts that weren't in the query results
-			if ( !empty($sticky_posts) ) {
-				$stickies = get_posts( array(
+			if ( ! empty($sticky_posts)) {
+				$stickies = get_posts(array(
 					'post__in' => $sticky_posts,
 					'post_type' => $post_type,
 					'post_status' => 'publish',
 					'nopaging' => true
-				) );
+				));
 
-				foreach ( $stickies as $sticky_post ) {
-					array_splice( $this->posts, $sticky_offset, 0, array( $sticky_post ) );
+				foreach ($stickies as $sticky_post) {
+					array_splice($this->posts, $sticky_offset, 0, array($sticky_post));
 					$sticky_offset++;
 				}
 			}
 		}
 
 		// If comments have been fetched as part of the query, make sure comment meta lazy-loading is set up.
-		if ( ! empty( $this->comments ) ) {
-			wp_queue_comments_for_comment_meta_lazyload( $this->comments );
+		if ( ! empty($this->comments)) {
+			wp_queue_comments_for_comment_meta_lazyload($this->comments);
 		}
 
-		if ( ! $q['suppress_filters'] ) {
+		if ( ! $q['suppress_filters']) {
 			/**
 			 * Filter the array of retrieved posts after they've been fetched and
 			 * internally processed.
@@ -3759,27 +3759,27 @@ 
 			 * @param array    $posts The array of retrieved posts.
 			 * @param WP_Query &$this The WP_Query instance (passed by reference).
 			 */
-			$this->posts = apply_filters_ref_array( 'the_posts', array( $this->posts, &$this ) );
+			$this->posts = apply_filters_ref_array('the_posts', array($this->posts, &$this));
 		}
 
 		// Ensure that any posts added/modified via one of the filters above are
 		// of the type WP_Post and are filtered.
-		if ( $this->posts ) {
-			$this->post_count = count( $this->posts );
+		if ($this->posts) {
+			$this->post_count = count($this->posts);
 
-			$this->posts = array_map( 'get_post', $this->posts );
+			$this->posts = array_map('get_post', $this->posts);
 
-			if ( $q['cache_results'] )
+			if ($q['cache_results'])
 				update_post_caches($this->posts, $post_type, $q['update_post_term_cache'], $q['update_post_meta_cache']);
 
-			$this->post = reset( $this->posts );
+			$this->post = reset($this->posts);
 		} else {
 			$this->post_count = 0;
 			$this->posts = array();
 		}
 
-		if ( $q['update_post_term_cache'] ) {
-			wp_queue_posts_for_term_meta_lazyload( $this->posts );
+		if ($q['update_post_term_cache']) {
+			wp_queue_posts_for_term_meta_lazyload($this->posts);
 		}
 
 		return $this->posts;
@@ -3797,15 +3797,15 @@ 
 	 * @param array  $q      Query variables.
 	 * @param string $limits LIMIT clauses of the query.
 	 */
-	private function set_found_posts( $q, $limits ) {
+	private function set_found_posts($q, $limits) {
 		global $wpdb;
 
 		// Bail if posts is an empty array. Continue if posts is an empty string,
 		// null, or false to accommodate caching plugins that fill posts later.
-		if ( $q['no_found_rows'] || ( is_array( $this->posts ) && ! $this->posts ) )
+		if ($q['no_found_rows'] || (is_array($this->posts) && ! $this->posts))
 			return;
 
-		if ( ! empty( $limits ) ) {
+		if ( ! empty($limits)) {
 			/**
 			 * Filter the query to run for retrieving the found posts.
 			 *
@@ -3814,9 +3814,9 @@ 
 			 * @param string   $found_posts The query to run to find the found posts.
 			 * @param WP_Query &$this       The WP_Query instance (passed by reference).
 			 */
-			$this->found_posts = $wpdb->get_var( apply_filters_ref_array( 'found_posts_query', array( 'SELECT FOUND_ROWS()', &$this ) ) );
+			$this->found_posts = $wpdb->get_var(apply_filters_ref_array('found_posts_query', array('SELECT FOUND_ROWS()', &$this)));
 		} else {
-			$this->found_posts = count( $this->posts );
+			$this->found_posts = count($this->posts);
 		}
 
 		/**
@@ -3827,10 +3827,10 @@ 
 		 * @param int      $found_posts The number of posts found.
 		 * @param WP_Query &$this       The WP_Query instance (passed by reference).
 		 */
-		$this->found_posts = apply_filters_ref_array( 'found_posts', array( $this->found_posts, &$this ) );
+		$this->found_posts = apply_filters_ref_array('found_posts', array($this->found_posts, &$this));
 
-		if ( ! empty( $limits ) )
-			$this->max_num_pages = ceil( $this->found_posts / $q['posts_per_page'] );
+		if ( ! empty($limits))
+			$this->max_num_pages = ceil($this->found_posts / $q['posts_per_page']);
 	}
 
 	/**
@@ -3864,7 +3864,7 @@ 
 		global $post;
 		$this->in_the_loop = true;
 
-		if ( $this->current_post == -1 ) // loop has just started
+		if ($this->current_post == -1) // loop has just started
 			/**
 			 * Fires once the loop is started.
 			 *
@@ -3872,10 +3872,10 @@ 
 			 *
 			 * @param WP_Query &$this The WP_Query instance (passed by reference).
 			 */
-			do_action_ref_array( 'loop_start', array( &$this ) );
+			do_action_ref_array('loop_start', array(&$this));
 
 		$post = $this->next_post();
-		$this->setup_postdata( $post );
+		$this->setup_postdata($post);
 	}
 
 	/**
@@ -3889,9 +3889,9 @@ 
 	 * @return bool True if posts are available, false if end of loop.
 	 */
 	public function have_posts() {
-		if ( $this->current_post + 1 < $this->post_count ) {
+		if ($this->current_post + 1 < $this->post_count) {
 			return true;
-		} elseif ( $this->current_post + 1 == $this->post_count && $this->post_count > 0 ) {
+		} elseif ($this->current_post + 1 == $this->post_count && $this->post_count > 0) {
 			/**
 			 * Fires once the loop has ended.
 			 *
@@ -3899,7 +3899,7 @@ 
 			 *
 			 * @param WP_Query &$this The WP_Query instance (passed by reference).
 			 */
-			do_action_ref_array( 'loop_end', array( &$this ) );
+			do_action_ref_array('loop_end', array(&$this));
 			// Do some cleaning up after the loop
 			$this->rewind_posts();
 		}
@@ -3916,7 +3916,7 @@ 
 	 */
 	public function rewind_posts() {
 		$this->current_post = -1;
-		if ( $this->post_count > 0 ) {
+		if ($this->post_count > 0) {
 			$this->post = $this->posts[0];
 		}
 	}
@@ -3948,13 +3948,13 @@ 
 
 		$comment = $this->next_comment();
 
-		if ( $this->current_comment == 0 ) {
+		if ($this->current_comment == 0) {
 			/**
 			 * Fires once the comment loop is started.
 			 *
 			 * @since 2.2.0
 			 */
-			do_action( 'comment_loop_start' );
+			do_action('comment_loop_start');
 		}
 	}
 
@@ -3969,9 +3969,9 @@ 
 	 * @return bool True, if more comments. False, if no more posts.
 	 */
 	public function have_comments() {
-		if ( $this->current_comment + 1 < $this->comment_count ) {
+		if ($this->current_comment + 1 < $this->comment_count) {
 			return true;
-		} elseif ( $this->current_comment + 1 == $this->comment_count ) {
+		} elseif ($this->current_comment + 1 == $this->comment_count) {
 			$this->rewind_comments();
 		}
 
@@ -3986,7 +3986,7 @@ 
 	 */
 	public function rewind_comments() {
 		$this->current_comment = -1;
-		if ( $this->comment_count > 0 ) {
+		if ($this->comment_count > 0) {
 			$this->comment = $this->comments[0];
 		}
 	}
@@ -4000,9 +4000,9 @@ 
 	 * @param string $query URL query string.
 	 * @return array List of posts.
 	 */
-	public function query( $query ) {
+	public function query($query) {
 		$this->init();
-		$this->query = $this->query_vars = wp_parse_args( $query );
+		$this->query = $this->query_vars = wp_parse_args($query);
 		return $this->get_posts();
 	}
 
@@ -4019,66 +4019,66 @@ 
 	 * @return object
 	 */
 	public function get_queried_object() {
-		if ( isset($this->queried_object) )
+		if (isset($this->queried_object))
 			return $this->queried_object;
 
 		$this->queried_object = null;
 		$this->queried_object_id = null;
 
-		if ( $this->is_category || $this->is_tag || $this->is_tax ) {
-			if ( $this->is_category ) {
-				if ( $this->get( 'cat' ) ) {
-					$term = get_term( $this->get( 'cat' ), 'category' );
-				} elseif ( $this->get( 'category_name' ) ) {
-					$term = get_term_by( 'slug', $this->get( 'category_name' ), 'category' );
+		if ($this->is_category || $this->is_tag || $this->is_tax) {
+			if ($this->is_category) {
+				if ($this->get('cat')) {
+					$term = get_term($this->get('cat'), 'category');
+				} elseif ($this->get('category_name')) {
+					$term = get_term_by('slug', $this->get('category_name'), 'category');
 				}
-			} elseif ( $this->is_tag ) {
-				if ( $this->get( 'tag_id' ) ) {
-					$term = get_term( $this->get( 'tag_id' ), 'post_tag' );
-				} elseif ( $this->get( 'tag' ) ) {
-					$term = get_term_by( 'slug', $this->get( 'tag' ), 'post_tag' );
+			} elseif ($this->is_tag) {
+				if ($this->get('tag_id')) {
+					$term = get_term($this->get('tag_id'), 'post_tag');
+				} elseif ($this->get('tag')) {
+					$term = get_term_by('slug', $this->get('tag'), 'post_tag');
 				}
 			} else {
 				// For other tax queries, grab the first term from the first clause.
-				$tax_query_in_and = wp_list_filter( $this->tax_query->queried_terms, array( 'operator' => 'NOT IN' ), 'NOT' );
+				$tax_query_in_and = wp_list_filter($this->tax_query->queried_terms, array('operator' => 'NOT IN'), 'NOT');
 
-				if ( ! empty( $tax_query_in_and ) ) {
-					$queried_taxonomies = array_keys( $tax_query_in_and );
-					$matched_taxonomy = reset( $queried_taxonomies );
-					$query = $tax_query_in_and[ $matched_taxonomy ];
+				if ( ! empty($tax_query_in_and)) {
+					$queried_taxonomies = array_keys($tax_query_in_and);
+					$matched_taxonomy = reset($queried_taxonomies);
+					$query = $tax_query_in_and[$matched_taxonomy];
 
-					if ( $query['terms'] ) {
-						if ( 'term_id' == $query['field'] ) {
-							$term = get_term( reset( $query['terms'] ), $matched_taxonomy );
+					if ($query['terms']) {
+						if ('term_id' == $query['field']) {
+							$term = get_term(reset($query['terms']), $matched_taxonomy);
 						} else {
-							$term = get_term_by( $query['field'], reset( $query['terms'] ), $matched_taxonomy );
+							$term = get_term_by($query['field'], reset($query['terms']), $matched_taxonomy);
 						}
 					}
 				}
 			}
 
-			if ( ! empty( $term ) && ! is_wp_error( $term ) )  {
+			if ( ! empty($term) && ! is_wp_error($term)) {
 				$this->queried_object = $term;
 				$this->queried_object_id = (int) $term->term_id;
 
-				if ( $this->is_category && 'category' === $this->queried_object->taxonomy )
-					_make_cat_compat( $this->queried_object );
+				if ($this->is_category && 'category' === $this->queried_object->taxonomy)
+					_make_cat_compat($this->queried_object);
 			}
-		} elseif ( $this->is_post_type_archive ) {
-			$post_type = $this->get( 'post_type' );
-			if ( is_array( $post_type ) )
-				$post_type = reset( $post_type );
-			$this->queried_object = get_post_type_object( $post_type );
-		} elseif ( $this->is_posts_page ) {
+		} elseif ($this->is_post_type_archive) {
+			$post_type = $this->get('post_type');
+			if (is_array($post_type))
+				$post_type = reset($post_type);
+			$this->queried_object = get_post_type_object($post_type);
+		} elseif ($this->is_posts_page) {
 			$page_for_posts = get_option('page_for_posts');
-			$this->queried_object = get_post( $page_for_posts );
+			$this->queried_object = get_post($page_for_posts);
 			$this->queried_object_id = (int) $this->queried_object->ID;
-		} elseif ( $this->is_singular && ! empty( $this->post ) ) {
+		} elseif ($this->is_singular && ! empty($this->post)) {
 			$this->queried_object = $this->post;
 			$this->queried_object_id = (int) $this->post->ID;
-		} elseif ( $this->is_author ) {
+		} elseif ($this->is_author) {
 			$this->queried_object_id = (int) $this->get('author');
-			$this->queried_object = get_userdata( $this->queried_object_id );
+			$this->queried_object = get_userdata($this->queried_object_id);
 		}
 
 		return $this->queried_object;
@@ -4095,7 +4095,7 @@ 
 	public function get_queried_object_id() {
 		$this->get_queried_object();
 
-		if ( isset($this->queried_object_id) ) {
+		if (isset($this->queried_object_id)) {
 			return $this->queried_object_id;
 		}
 
@@ -4113,7 +4113,7 @@ 
 	 * @param string|array $query URL query string or array of vars.
 	 */
 	public function __construct($query = '') {
-		if ( ! empty($query) ) {
+		if ( ! empty($query)) {
 			$this->query($query);
 		}
 	}
@@ -4127,8 +4127,8 @@ 
 	 * @param string $name Property to get.
 	 * @return mixed Property.
 	 */
-	public function __get( $name ) {
-		if ( in_array( $name, $this->compat_fields ) ) {
+	public function __get($name) {
+		if (in_array($name, $this->compat_fields)) {
 			return $this->$name;
 		}
 	}
@@ -4142,9 +4142,9 @@ 
 	 * @param string $name Property to check if set.
 	 * @return bool Whether the property is set.
 	 */
-	public function __isset( $name ) {
-		if ( in_array( $name, $this->compat_fields ) ) {
-			return isset( $this->$name );
+	public function __isset($name) {
+		if (in_array($name, $this->compat_fields)) {
+			return isset($this->$name);
 		}
 	}
 
@@ -4158,9 +4158,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 ( in_array( $name, $this->compat_methods ) ) {
-			return call_user_func_array( array( $this, $name ), $arguments );
+	public function __call($name, $arguments) {
+		if (in_array($name, $this->compat_methods)) {
+			return call_user_func_array(array($this, $name), $arguments);
 		}
 		return false;
 	}
@@ -4186,16 +4186,16 @@ 
 	 * @param mixed $post_types Optional. Post type or array of posts types to check against.
 	 * @return bool
 	 */
-	public function is_post_type_archive( $post_types = '' ) {
-		if ( empty( $post_types ) || ! $this->is_post_type_archive )
+	public function is_post_type_archive($post_types = '') {
+		if (empty($post_types) || ! $this->is_post_type_archive)
 			return (bool) $this->is_post_type_archive;
 
-		$post_type = $this->get( 'post_type' );
-		if ( is_array( $post_type ) )
-			$post_type = reset( $post_type );
-		$post_type_object = get_post_type_object( $post_type );
+		$post_type = $this->get('post_type');
+		if (is_array($post_type))
+			$post_type = reset($post_type);
+		$post_type_object = get_post_type_object($post_type);
 
-		return in_array( $post_type_object->name, (array) $post_types );
+		return in_array($post_type_object->name, (array) $post_types);
 	}
 
 	/**
@@ -4206,24 +4206,24 @@ 
 	 * @param mixed $attachment Attachment ID, title, slug, or array of such.
 	 * @return bool
 	 */
-	public function is_attachment( $attachment = '' ) {
-		if ( ! $this->is_attachment ) {
+	public function is_attachment($attachment = '') {
+		if ( ! $this->is_attachment) {
 			return false;
 		}
 
-		if ( empty( $attachment ) ) {
+		if (empty($attachment)) {
 			return true;
 		}
 
-		$attachment = array_map( 'strval', (array) $attachment );
+		$attachment = array_map('strval', (array) $attachment);
 
 		$post_obj = $this->get_queried_object();
 
-		if ( in_array( (string) $post_obj->ID, $attachment ) ) {
+		if (in_array((string) $post_obj->ID, $attachment)) {
 			return true;
-		} elseif ( in_array( $post_obj->post_title, $attachment ) ) {
+		} elseif (in_array($post_obj->post_title, $attachment)) {
 			return true;
-		} elseif ( in_array( $post_obj->post_name, $attachment ) ) {
+		} elseif (in_array($post_obj->post_name, $attachment)) {
 			return true;
 		}
 		return false;
@@ -4240,22 +4240,22 @@ 
 	 * @param mixed $author Optional. User ID, nickname, nicename, or array of User IDs, nicknames, and nicenames
 	 * @return bool
 	 */
-	public function is_author( $author = '' ) {
-		if ( !$this->is_author )
+	public function is_author($author = '') {
+		if ( ! $this->is_author)
 			return false;
 
-		if ( empty($author) )
+		if (empty($author))
 			return true;
 
 		$author_obj = $this->get_queried_object();
 
-		$author = array_map( 'strval', (array) $author );
+		$author = array_map('strval', (array) $author);
 
-		if ( in_array( (string) $author_obj->ID, $author ) )
+		if (in_array((string) $author_obj->ID, $author))
 			return true;
-		elseif ( in_array( $author_obj->nickname, $author ) )
+		elseif (in_array($author_obj->nickname, $author))
 			return true;
-		elseif ( in_array( $author_obj->user_nicename, $author ) )
+		elseif (in_array($author_obj->user_nicename, $author))
 			return true;
 
 		return false;
@@ -4272,22 +4272,22 @@ 
 	 * @param mixed $category Optional. Category ID, name, slug, or array of Category IDs, names, and slugs.
 	 * @return bool
 	 */
-	public function is_category( $category = '' ) {
-		if ( !$this->is_category )
+	public function is_category($category = '') {
+		if ( ! $this->is_category)
 			return false;
 
-		if ( empty($category) )
+		if (empty($category))
 			return true;
 
 		$cat_obj = $this->get_queried_object();
 
-		$category = array_map( 'strval', (array) $category );
+		$category = array_map('strval', (array) $category);
 
-		if ( in_array( (string) $cat_obj->term_id, $category ) )
+		if (in_array((string) $cat_obj->term_id, $category))
 			return true;
-		elseif ( in_array( $cat_obj->name, $category ) )
+		elseif (in_array($cat_obj->name, $category))
 			return true;
-		elseif ( in_array( $cat_obj->slug, $category ) )
+		elseif (in_array($cat_obj->slug, $category))
 			return true;
 
 		return false;
@@ -4304,22 +4304,22 @@ 
 	 * @param mixed $tag Optional. Tag ID, name, slug, or array of Tag IDs, names, and slugs.
 	 * @return bool
 	 */
-	public function is_tag( $tag = '' ) {
-		if ( ! $this->is_tag )
+	public function is_tag($tag = '') {
+		if ( ! $this->is_tag)
 			return false;
 
-		if ( empty( $tag ) )
+		if (empty($tag))
 			return true;
 
 		$tag_obj = $this->get_queried_object();
 
-		$tag = array_map( 'strval', (array) $tag );
+		$tag = array_map('strval', (array) $tag);
 
-		if ( in_array( (string) $tag_obj->term_id, $tag ) )
+		if (in_array((string) $tag_obj->term_id, $tag))
 			return true;
-		elseif ( in_array( $tag_obj->name, $tag ) )
+		elseif (in_array($tag_obj->name, $tag))
 			return true;
-		elseif ( in_array( $tag_obj->slug, $tag ) )
+		elseif (in_array($tag_obj->slug, $tag))
 			return true;
 
 		return false;
@@ -4343,32 +4343,32 @@ 
 	 * @param mixed $term     Optional. Term ID, name, slug or array of Term IDs, names, and slugs.
 	 * @return bool
 	 */
-	public function is_tax( $taxonomy = '', $term = '' ) {
+	public function is_tax($taxonomy = '', $term = '') {
 		global $wp_taxonomies;
 
-		if ( !$this->is_tax )
+		if ( ! $this->is_tax)
 			return false;
 
-		if ( empty( $taxonomy ) )
+		if (empty($taxonomy))
 			return true;
 
 		$queried_object = $this->get_queried_object();
-		$tax_array = array_intersect( array_keys( $wp_taxonomies ), (array) $taxonomy );
+		$tax_array = array_intersect(array_keys($wp_taxonomies), (array) $taxonomy);
 		$term_array = (array) $term;
 
 		// Check that the taxonomy matches.
-		if ( ! ( isset( $queried_object->taxonomy ) && count( $tax_array ) && in_array( $queried_object->taxonomy, $tax_array ) ) )
+		if ( ! (isset($queried_object->taxonomy) && count($tax_array) && in_array($queried_object->taxonomy, $tax_array)))
 			return false;
 
 		// Only a Taxonomy provided.
-		if ( empty( $term ) )
+		if (empty($term))
 			return true;
 
-		return isset( $queried_object->term_id ) &&
-			count( array_intersect(
-				array( $queried_object->term_id, $queried_object->name, $queried_object->slug ),
+		return isset($queried_object->term_id) &&
+			count(array_intersect(
+				array($queried_object->term_id, $queried_object->name, $queried_object->slug),
 				$term_array
-			) );
+			));
 	}
 
 	/**
@@ -4380,7 +4380,7 @@ 
 	 * @return bool
 	 */
 	public function is_comments_popup() {
-		_deprecated_function( __FUNCTION__, '4.5' );
+		_deprecated_function(__FUNCTION__, '4.5');
 
 		return false;
 	}
@@ -4415,13 +4415,13 @@ 
 	 * @param string|array $feeds Optional feed types to check.
 	 * @return bool
 	 */
-	public function is_feed( $feeds = '' ) {
-		if ( empty( $feeds ) || ! $this->is_feed )
+	public function is_feed($feeds = '') {
+		if (empty($feeds) || ! $this->is_feed)
 			return (bool) $this->is_feed;
-		$qv = $this->get( 'feed' );
-		if ( 'feed' == $qv )
+		$qv = $this->get('feed');
+		if ('feed' == $qv)
 			$qv = get_default_feed();
-		return in_array( $qv, (array) $feeds );
+		return in_array($qv, (array) $feeds);
 	}
 
 	/**
@@ -4453,9 +4453,9 @@ 
 	 */
 	public function is_front_page() {
 		// most likely case
-		if ( 'posts' == get_option( 'show_on_front') && $this->is_home() )
+		if ('posts' == get_option('show_on_front') && $this->is_home())
 			return true;
-		elseif ( 'page' == get_option( 'show_on_front') && get_option( 'page_on_front' ) && $this->is_page( get_option( 'page_on_front' ) ) )
+		elseif ('page' == get_option('show_on_front') && get_option('page_on_front') && $this->is_page(get_option('page_on_front')))
 			return true;
 		else
 			return false;
@@ -4506,31 +4506,31 @@ 
 	 * @param int|string|array $page Optional. Page ID, title, slug, path, or array of such. Default empty.
 	 * @return bool Whether the query is for an existing single page.
 	 */
-	public function is_page( $page = '' ) {
-		if ( !$this->is_page )
+	public function is_page($page = '') {
+		if ( ! $this->is_page)
 			return false;
 
-		if ( empty( $page ) )
+		if (empty($page))
 			return true;
 
 		$page_obj = $this->get_queried_object();
 
-		$page = array_map( 'strval', (array) $page );
+		$page = array_map('strval', (array) $page);
 
-		if ( in_array( (string) $page_obj->ID, $page ) ) {
+		if (in_array((string) $page_obj->ID, $page)) {
 			return true;
-		} elseif ( in_array( $page_obj->post_title, $page ) ) {
+		} elseif (in_array($page_obj->post_title, $page)) {
 			return true;
-		} elseif ( in_array( $page_obj->post_name, $page ) ) {
+		} elseif (in_array($page_obj->post_name, $page)) {
 			return true;
 		} else {
-			foreach ( $page as $pagepath ) {
-				if ( ! strpos( $pagepath, '/' ) ) {
+			foreach ($page as $pagepath) {
+				if ( ! strpos($pagepath, '/')) {
 					continue;
 				}
-				$pagepath_obj = get_page_by_path( $pagepath );
+				$pagepath_obj = get_page_by_path($pagepath);
 
-				if ( $pagepath_obj && ( $pagepath_obj->ID == $page_obj->ID ) ) {
+				if ($pagepath_obj && ($pagepath_obj->ID == $page_obj->ID)) {
 					return true;
 				}
 			}
@@ -4599,31 +4599,31 @@ 
 	 * @param int|string|array $post Optional. Post ID, title, slug, path, or array of such. Default empty.
 	 * @return bool Whether the query is for an existing single post.
 	 */
-	public function is_single( $post = '' ) {
-		if ( !$this->is_single )
+	public function is_single($post = '') {
+		if ( ! $this->is_single)
 			return false;
 
-		if ( empty($post) )
+		if (empty($post))
 			return true;
 
 		$post_obj = $this->get_queried_object();
 
-		$post = array_map( 'strval', (array) $post );
+		$post = array_map('strval', (array) $post);
 
-		if ( in_array( (string) $post_obj->ID, $post ) ) {
+		if (in_array((string) $post_obj->ID, $post)) {
 			return true;
-		} elseif ( in_array( $post_obj->post_title, $post ) ) {
+		} elseif (in_array($post_obj->post_title, $post)) {
 			return true;
-		} elseif ( in_array( $post_obj->post_name, $post ) ) {
+		} elseif (in_array($post_obj->post_name, $post)) {
 			return true;
 		} else {
-			foreach ( $post as $postpath ) {
-				if ( ! strpos( $postpath, '/' ) ) {
+			foreach ($post as $postpath) {
+				if ( ! strpos($postpath, '/')) {
 					continue;
 				}
-				$postpath_obj = get_page_by_path( $postpath, OBJECT, $post_obj->post_type );
+				$postpath_obj = get_page_by_path($postpath, OBJECT, $post_obj->post_type);
 
-				if ( $postpath_obj && ( $postpath_obj->ID == $post_obj->ID ) ) {
+				if ($postpath_obj && ($postpath_obj->ID == $post_obj->ID)) {
 					return true;
 				}
 			}
@@ -4645,13 +4645,13 @@ 
 	 * @param string|array $post_types Optional. Post type or array of post types. Default empty.
 	 * @return bool Whether the query is for an existing single post of any of the given post types.
 	 */
-	public function is_singular( $post_types = '' ) {
-		if ( empty( $post_types ) || !$this->is_singular )
+	public function is_singular($post_types = '') {
+		if (empty($post_types) || ! $this->is_singular)
 			return (bool) $this->is_singular;
 
 		$post_obj = $this->get_queried_object();
 
-		return in_array( $post_obj->post_type, (array) $post_types );
+		return in_array($post_obj->post_type, (array) $post_types);
 	}
 
 	/**
@@ -4742,14 +4742,14 @@ 
 	 * @param WP_Post|object|int $post WP_Post instance or Post ID/object.
 	 * @return true True when finished.
 	 */
-	public function setup_postdata( $post ) {
+	public function setup_postdata($post) {
 		global $id, $authordata, $currentday, $currentmonth, $page, $pages, $multipage, $more, $numpages;
 
-		if ( ! ( $post instanceof WP_Post ) ) {
-			$post = get_post( $post );
+		if ( ! ($post instanceof WP_Post)) {
+			$post = get_post($post);
 		}
 
-		if ( ! $post ) {
+		if ( ! $post) {
 			return;
 		}
 
@@ -4761,35 +4761,35 @@ 
 		$currentmonth = mysql2date('m', $post->post_date, false);
 		$numpages = 1;
 		$multipage = 0;
-		$page = $this->get( 'page' );
-		if ( ! $page )
+		$page = $this->get('page');
+		if ( ! $page)
 			$page = 1;
 
 		/*
 		 * Force full post content when viewing the permalink for the $post,
 		 * or when on an RSS feed. Otherwise respect the 'more' tag.
 		 */
-		if ( $post->ID === get_queried_object_id() && ( $this->is_page() || $this->is_single() ) ) {
+		if ($post->ID === get_queried_object_id() && ($this->is_page() || $this->is_single())) {
 			$more = 1;
-		} elseif ( $this->is_feed() ) {
+		} elseif ($this->is_feed()) {
 			$more = 1;
 		} else {
 			$more = 0;
 		}
 
 		$content = $post->post_content;
-		if ( false !== strpos( $content, '<!--nextpage-->' ) ) {
-			$content = str_replace( "\n<!--nextpage-->\n", '<!--nextpage-->', $content );
-			$content = str_replace( "\n<!--nextpage-->", '<!--nextpage-->', $content );
-			$content = str_replace( "<!--nextpage-->\n", '<!--nextpage-->', $content );
+		if (false !== strpos($content, '<!--nextpage-->')) {
+			$content = str_replace("\n<!--nextpage-->\n", '<!--nextpage-->', $content);
+			$content = str_replace("\n<!--nextpage-->", '<!--nextpage-->', $content);
+			$content = str_replace("<!--nextpage-->\n", '<!--nextpage-->', $content);
 
 			// Ignore nextpage at the beginning of the content.
-			if ( 0 === strpos( $content, '<!--nextpage-->' ) )
-				$content = substr( $content, 15 );
+			if (0 === strpos($content, '<!--nextpage-->'))
+				$content = substr($content, 15);
 
 			$pages = explode('<!--nextpage-->', $content);
 		} else {
-			$pages = array( $post->post_content );
+			$pages = array($post->post_content);
 		}
 
 		/**
@@ -4804,12 +4804,12 @@ 
 		 *                       of `<!-- nextpage -->` tags..
 		 * @param WP_Post $post  Current post object.
 		 */
-		$pages = apply_filters( 'content_pagination', $pages, $post );
+		$pages = apply_filters('content_pagination', $pages, $post);
 
-		$numpages = count( $pages );
+		$numpages = count($pages);
 
-		if ( $numpages > 1 ) {
-			if ( $page > 1 ) {
+		if ($numpages > 1) {
+			if ($page > 1) {
 				$more = 1;
 			}
 			$multipage = 1;
@@ -4826,7 +4826,7 @@ 
 		 * @param WP_Post  &$post The Post object (passed by reference).
 		 * @param WP_Query &$this The current Query object (passed by reference).
 		 */
-		do_action_ref_array( 'the_post', array( &$post, &$this ) );
+		do_action_ref_array('the_post', array(&$post, &$this));
 
 		return true;
 	}
@@ -4839,9 +4839,9 @@ 
 	 * @global WP_Post $post
 	 */
 	public function reset_postdata() {
-		if ( ! empty( $this->post ) ) {
+		if ( ! empty($this->post)) {
 			$GLOBALS['post'] = $this->post;
-			$this->setup_postdata( $this->post );
+			$this->setup_postdata($this->post);
 		}
 	}
 
@@ -4855,8 +4855,8 @@ 
 	 * @param int   $term_id
 	 * @return mixed
 	 */
-	public function lazyload_term_meta( $check, $term_id ) {
-		_deprecated_function( __METHOD__, '4.5.0' );
+	public function lazyload_term_meta($check, $term_id) {
+		_deprecated_function(__METHOD__, '4.5.0');
 		return $check;
 	}
 
@@ -4870,8 +4870,8 @@ 
 	 * @param int   $comment_id
 	 * @return mixed
 	 */
-	public function lazyload_comment_meta( $check, $comment_id ) {
-		_deprecated_function( __METHOD__, '4.5.0' );
+	public function lazyload_comment_meta($check, $comment_id) {
+		_deprecated_function(__METHOD__, '4.5.0');
 		return $check;
 	}
 }
@@ -4890,63 +4890,63 @@ 
 function wp_old_slug_redirect() {
 	global $wp_query, $wp_rewrite;
 
-	if ( get_queried_object() ) {
+	if (get_queried_object()) {
 		return;
 	}
 
-	if ( '' !== $wp_query->query_vars['name'] ) :
+	if ('' !== $wp_query->query_vars['name']) :
 		global $wpdb;
 
 		// Guess the current post_type based on the query vars.
-		if ( get_query_var( 'post_type' ) ) {
-			$post_type = get_query_var( 'post_type' );
-		} elseif ( get_query_var( 'attachment' ) ) {
+		if (get_query_var('post_type')) {
+			$post_type = get_query_var('post_type');
+		} elseif (get_query_var('attachment')) {
 			$post_type = 'attachment';
-		} elseif ( ! empty( $wp_query->query_vars['pagename'] ) ) {
+		} elseif ( ! empty($wp_query->query_vars['pagename'])) {
 			$post_type = 'page';
 		} else {
 			$post_type = 'post';
 		}
 
-		if ( is_array( $post_type ) ) {
-			if ( count( $post_type ) > 1 )
+		if (is_array($post_type)) {
+			if (count($post_type) > 1)
 				return;
-			$post_type = reset( $post_type );
+			$post_type = reset($post_type);
 		}
 
 		// Do not attempt redirect for hierarchical post types
-		if ( is_post_type_hierarchical( $post_type ) )
+		if (is_post_type_hierarchical($post_type))
 			return;
 
 		$query = $wpdb->prepare("SELECT post_id FROM $wpdb->postmeta, $wpdb->posts WHERE ID = post_id AND post_type = %s AND meta_key = '_wp_old_slug' AND meta_value = %s", $post_type, $wp_query->query_vars['name']);
 
 		// if year, monthnum, or day have been specified, make our query more precise
 		// just in case there are multiple identical _wp_old_slug values
-		if ( '' != $wp_query->query_vars['year'] )
+		if ('' != $wp_query->query_vars['year'])
 			$query .= $wpdb->prepare(" AND YEAR(post_date) = %d", $wp_query->query_vars['year']);
-		if ( '' != $wp_query->query_vars['monthnum'] )
+		if ('' != $wp_query->query_vars['monthnum'])
 			$query .= $wpdb->prepare(" AND MONTH(post_date) = %d", $wp_query->query_vars['monthnum']);
-		if ( '' != $wp_query->query_vars['day'] )
+		if ('' != $wp_query->query_vars['day'])
 			$query .= $wpdb->prepare(" AND DAYOFMONTH(post_date) = %d", $wp_query->query_vars['day']);
 
 		$id = (int) $wpdb->get_var($query);
 
-		if ( ! $id )
+		if ( ! $id)
 			return;
 
-		$link = get_permalink( $id );
+		$link = get_permalink($id);
 
-		if ( is_feed() ) {
-			$link = user_trailingslashit( trailingslashit( $link ) . 'feed' );
-		} elseif ( isset( $GLOBALS['wp_query']->query_vars['paged'] ) && $GLOBALS['wp_query']->query_vars['paged'] > 1 ) {
-			$link = user_trailingslashit( trailingslashit( $link ) . 'page/' . $GLOBALS['wp_query']->query_vars['paged'] );
-		} elseif( is_embed() ) {
-			$link = user_trailingslashit( trailingslashit( $link ) . 'embed' );
-		} elseif ( is_404() ) {
+		if (is_feed()) {
+			$link = user_trailingslashit(trailingslashit($link).'feed');
+		} elseif (isset($GLOBALS['wp_query']->query_vars['paged']) && $GLOBALS['wp_query']->query_vars['paged'] > 1) {
+			$link = user_trailingslashit(trailingslashit($link).'page/'.$GLOBALS['wp_query']->query_vars['paged']);
+		} elseif (is_embed()) {
+			$link = user_trailingslashit(trailingslashit($link).'embed');
+		} elseif (is_404()) {
 			// Add rewrite endpoints if necessary.
-			foreach ( $wp_rewrite->endpoints as $endpoint ) {
-				if ( $endpoint[2] && false !== get_query_var( $endpoint[2], false ) ) {
-					$link = user_trailingslashit( trailingslashit( $link ) . $endpoint[1] );
+			foreach ($wp_rewrite->endpoints as $endpoint) {
+				if ($endpoint[2] && false !== get_query_var($endpoint[2], false)) {
+					$link = user_trailingslashit(trailingslashit($link).$endpoint[1]);
 				}
 			}
 		}
@@ -4958,13 +4958,13 @@ 
 		 *
 		 * @param string $link The redirect URL.
 		 */
-		$link = apply_filters( 'old_slug_redirect_url', $link );
+		$link = apply_filters('old_slug_redirect_url', $link);
 
-		if ( ! $link ) {
+		if ( ! $link) {
 			return;
 		}
 
-		wp_redirect( $link, 301 ); // Permanent redirect
+		wp_redirect($link, 301); // Permanent redirect
 		exit;
 	endif;
 }
@@ -4980,11 +4980,11 @@ 
  * @param WP_Post|object|int $post WP_Post instance or Post ID/object.
  * @return bool True when finished.
  */
-function setup_postdata( $post ) {
+function setup_postdata($post) {
 	global $wp_query;
 
-	if ( ! empty( $wp_query ) && $wp_query instanceof WP_Query ) {
-		return $wp_query->setup_postdata( $post );
+	if ( ! empty($wp_query) && $wp_query instanceof WP_Query) {
+		return $wp_query->setup_postdata($post);
 	}
 
 	return false;

Braces +437 added lines, -300 removed lines

@@ -1442,8 +1442,9 @@ 
 		);
 
 		foreach ( $keys as $key ) {
-			if ( !isset($array[$key]) )
-				$array[$key] = '';
+			if ( !isset($array[$key]) ) {
+							$array[$key] = '';
+			}
 		}
 
 		$array_keys = array( 'category__in', 'category__not_in', 'category__and', 'post__in', 'post__not_in', 'post_name__in',
@@ -1451,8 +1452,9 @@ 
 			'author__in', 'author__not_in' );
 
 		foreach ( $array_keys as $key ) {
-			if ( !isset($array[$key]) )
-				$array[$key] = array();
+			if ( !isset($array[$key]) ) {
+							$array[$key] = array();
+			}
 		}
 		return $array;
 	}
@@ -1582,8 +1584,9 @@ 
 		$qv = &$this->query_vars;
 		$this->query_vars_changed = true;
 
-		if ( ! empty($qv['robots']) )
-			$this->is_robots = true;
+		if ( ! empty($qv['robots']) ) {
+					$this->is_robots = true;
+		}
 
 		$qv['p'] =  absint($qv['p']);
 		$qv['page_id'] =  absint($qv['page_id']);
@@ -1598,10 +1601,18 @@ 
 		$qv['pagename'] = trim( $qv['pagename'] );
 		$qv['name'] = trim( $qv['name'] );
 		$qv['title'] = trim( $qv['title'] );
-		if ( '' !== $qv['hour'] ) $qv['hour'] = absint($qv['hour']);
-		if ( '' !== $qv['minute'] ) $qv['minute'] = absint($qv['minute']);
-		if ( '' !== $qv['second'] ) $qv['second'] = absint($qv['second']);
-		if ( '' !== $qv['menu_order'] ) $qv['menu_order'] = absint($qv['menu_order']);
+		if ( '' !== $qv['hour'] ) {
+			$qv['hour'] = absint($qv['hour']);
+		}
+		if ( '' !== $qv['minute'] ) {
+			$qv['minute'] = absint($qv['minute']);
+		}
+		if ( '' !== $qv['second'] ) {
+			$qv['second'] = absint($qv['second']);
+		}
+		if ( '' !== $qv['menu_order'] ) {
+			$qv['menu_order'] = absint($qv['menu_order']);
+		}
 
 		// Fairly insane upper bound for search string lengths.
 		if ( ! is_scalar( $qv['s'] ) || ( ! empty( $qv['s'] ) && strlen( $qv['s'] ) > 1600 ) ) {
@@ -1609,10 +1620,12 @@ 
 		}
 
 		// Compat. Map subpost to attachment.
-		if ( '' != $qv['subpost'] )
-			$qv['attachment'] = $qv['subpost'];
-		if ( '' != $qv['subpost_id'] )
-			$qv['attachment_id'] = $qv['subpost_id'];
+		if ( '' != $qv['subpost'] ) {
+					$qv['attachment'] = $qv['subpost'];
+		}
+		if ( '' != $qv['subpost_id'] ) {
+					$qv['attachment_id'] = $qv['subpost_id'];
+		}
 
 		$qv['attachment_id'] = absint($qv['attachment_id']);
 
@@ -1728,38 +1741,46 @@ 
 				$this->is_author = true;
 			}
 
-			if ( '' != $qv['author_name'] )
-				$this->is_author = true;
+			if ( '' != $qv['author_name'] ) {
+							$this->is_author = true;
+			}
 
 			if ( !empty( $qv['post_type'] ) && ! is_array( $qv['post_type'] ) ) {
 				$post_type_obj = get_post_type_object( $qv['post_type'] );
-				if ( ! empty( $post_type_obj->has_archive ) )
-					$this->is_post_type_archive = true;
+				if ( ! empty( $post_type_obj->has_archive ) ) {
+									$this->is_post_type_archive = true;
+				}
 			}
 
-			if ( $this->is_post_type_archive || $this->is_date || $this->is_author || $this->is_category || $this->is_tag || $this->is_tax )
-				$this->is_archive = true;
+			if ( $this->is_post_type_archive || $this->is_date || $this->is_author || $this->is_category || $this->is_tag || $this->is_tax ) {
+							$this->is_archive = true;
+			}
 		}
 
-		if ( '' != $qv['feed'] )
-			$this->is_feed = true;
+		if ( '' != $qv['feed'] ) {
+					$this->is_feed = true;
+		}
 
 		if ( '' != $qv['embed'] ) {
 			$this->is_embed = true;
 		}
 
-		if ( '' != $qv['tb'] )
-			$this->is_trackback = true;
+		if ( '' != $qv['tb'] ) {
+					$this->is_trackback = true;
+		}
 
-		if ( '' != $qv['paged'] && ( intval($qv['paged']) > 1 ) )
-			$this->is_paged = true;
+		if ( '' != $qv['paged'] && ( intval($qv['paged']) > 1 ) ) {
+					$this->is_paged = true;
+		}
 
 		// if we're previewing inside the write screen
-		if ( '' != $qv['preview'] )
-			$this->is_preview = true;
+		if ( '' != $qv['preview'] ) {
+					$this->is_preview = true;
+		}
 
-		if ( is_admin() )
-			$this->is_admin = true;
+		if ( is_admin() ) {
+					$this->is_admin = true;
+		}
 
 		if ( false !== strpos($qv['feed'], 'comments-') ) {
 			$qv['feed'] = str_replace('comments-', '', $qv['feed']);
@@ -1768,18 +1789,21 @@ 
 
 		$this->is_singular = $this->is_single || $this->is_page || $this->is_attachment;
 
-		if ( $this->is_feed && ( !empty($qv['withcomments']) || ( empty($qv['withoutcomments']) && $this->is_singular ) ) )
-			$this->is_comment_feed = true;
+		if ( $this->is_feed && ( !empty($qv['withcomments']) || ( empty($qv['withoutcomments']) && $this->is_singular ) ) ) {
+					$this->is_comment_feed = true;
+		}
 
-		if ( !( $this->is_singular || $this->is_archive || $this->is_search || $this->is_feed || ( defined( 'REST_REQUEST' ) && REST_REQUEST ) || $this->is_trackback || $this->is_404 || $this->is_admin || $this->is_robots ) )
-			$this->is_home = true;
+		if ( !( $this->is_singular || $this->is_archive || $this->is_search || $this->is_feed || ( defined( 'REST_REQUEST' ) && REST_REQUEST ) || $this->is_trackback || $this->is_404 || $this->is_admin || $this->is_robots ) ) {
+					$this->is_home = true;
+		}
 
 		// Correct is_* for page_on_front and page_for_posts
 		if ( $this->is_home && 'page' == get_option('show_on_front') && get_option('page_on_front') ) {
 			$_query = wp_parse_args($this->query);
 			// pagename can be set and empty depending on matched rewrite rules. Ignore an empty pagename.
-			if ( isset($_query['pagename']) && '' == $_query['pagename'] )
-				unset($_query['pagename']);
+			if ( isset($_query['pagename']) && '' == $_query['pagename'] ) {
+							unset($_query['pagename']);
+			}
 
 			unset( $_query['embed'] );
 
@@ -1832,27 +1856,31 @@ 
 		}
 
 		if ( !empty($qv['post_type']) ) {
-			if ( is_array($qv['post_type']) )
-				$qv['post_type'] = array_map('sanitize_key', $qv['post_type']);
-			else
-				$qv['post_type'] = sanitize_key($qv['post_type']);
+			if ( is_array($qv['post_type']) ) {
+							$qv['post_type'] = array_map('sanitize_key', $qv['post_type']);
+			} else {
+							$qv['post_type'] = sanitize_key($qv['post_type']);
+			}
 		}
 
 		if ( ! empty( $qv['post_status'] ) ) {
-			if ( is_array( $qv['post_status'] ) )
-				$qv['post_status'] = array_map('sanitize_key', $qv['post_status']);
-			else
-				$qv['post_status'] = preg_replace('|[^a-z0-9_,-]|', '', $qv['post_status']);
+			if ( is_array( $qv['post_status'] ) ) {
+							$qv['post_status'] = array_map('sanitize_key', $qv['post_status']);
+			} else {
+							$qv['post_status'] = preg_replace('|[^a-z0-9_,-]|', '', $qv['post_status']);
+			}
 		}
 
-		if ( $this->is_posts_page && ( ! isset($qv['withcomments']) || ! $qv['withcomments'] ) )
-			$this->is_comment_feed = false;
+		if ( $this->is_posts_page && ( ! isset($qv['withcomments']) || ! $qv['withcomments'] ) ) {
+					$this->is_comment_feed = false;
+		}
 
 		$this->is_singular = $this->is_single || $this->is_page || $this->is_attachment;
 		// Done correcting is_* for page_on_front and page_for_posts
 
-		if ( '404' == $qv['error'] )
-			$this->set_404();
+		if ( '404' == $qv['error'] ) {
+					$this->set_404();
+		}
 
 		$this->is_embed = $this->is_embed && ( $this->is_singular || $this->is_404 );
 
@@ -1895,8 +1923,10 @@ 
 		}
 
 		foreach ( get_taxonomies( array() , 'objects' ) as $taxonomy => $t ) {
-			if ( 'post_tag' == $taxonomy )
-				continue;	// Handled further down in the $q['tag'] block
+			if ( 'post_tag' == $taxonomy ) {
+							continue;
+			}
+			// Handled further down in the $q['tag'] block
 
 			if ( $t->query_var && !empty( $q[$t->query_var] ) ) {
 				$tax_query_defaults = array(
@@ -1943,10 +1973,11 @@ 
 			$q['cat'] = implode( ',', $cat_array );
 
 			foreach ( $cat_array as $cat ) {
-				if ( $cat > 0 )
-					$cat_in[] = $cat;
-				elseif ( $cat < 0 )
-					$cat_not_in[] = abs( $cat );
+				if ( $cat > 0 ) {
+									$cat_in[] = $cat;
+				} elseif ( $cat < 0 ) {
+									$cat_not_in[] = abs( $cat );
+				}
 			}
 
 			if ( ! empty( $cat_in ) ) {
@@ -1972,8 +2003,9 @@ 
 
 		if ( ! empty( $q['category__and'] ) && 1 === count( (array) $q['category__and'] ) ) {
 			$q['category__and'] = (array) $q['category__and'];
-			if ( ! isset( $q['category__in'] ) )
-				$q['category__in'] = array();
+			if ( ! isset( $q['category__in'] ) ) {
+							$q['category__in'] = array();
+			}
 			$q['category__in'][] = absint( reset( $q['category__and'] ) );
 			unset( $q['category__and'] );
 		}
@@ -2116,8 +2148,9 @@ 
 
 		// added slashes screw with quote grouping when done early, so done later
 		$q['s'] = stripslashes( $q['s'] );
-		if ( empty( $_GET['s'] ) && $this->is_main_query() )
-			$q['s'] = urldecode( $q['s'] );
+		if ( empty( $_GET['s'] ) && $this->is_main_query() ) {
+					$q['s'] = urldecode( $q['s'] );
+		}
 		// there are no line breaks in <input /> fields
 		$q['s'] = str_replace( array( "\r", "\n" ), '', $q['s'] );
 		$q['search_terms_count'] = 1;
@@ -2128,8 +2161,9 @@ 
 				$q['search_terms_count'] = count( $matches[0] );
 				$q['search_terms'] = $this->parse_search_terms( $matches[0] );
 				// if the search string has only short terms or stopwords, or is 10+ terms long, match it as sentence
-				if ( empty( $q['search_terms'] ) || count( $q['search_terms'] ) > 9 )
-					$q['search_terms'] = array( $q['s'] );
+				if ( empty( $q['search_terms'] ) || count( $q['search_terms'] ) > 9 ) {
+									$q['search_terms'] = array( $q['s'] );
+				}
 			} else {
 				$q['search_terms'] = array( $q['s'] );
 			}
@@ -2162,8 +2196,9 @@ 
 
 		if ( ! empty( $search ) ) {
 			$search = " AND ({$search}) ";
-			if ( ! is_user_logged_in() )
-				$search .= " AND ($wpdb->posts.post_password = '') ";
+			if ( ! is_user_logged_in() ) {
+							$search .= " AND ($wpdb->posts.post_password = '') ";
+			}
 		}
 
 		return $search;
@@ -2189,17 +2224,20 @@ 
 
 		foreach ( $terms as $term ) {
 			// keep before/after spaces when term is for exact match
-			if ( preg_match( '/^".+"$/', $term ) )
-				$term = trim( $term, "\"'" );
-			else
-				$term = trim( $term, "\"' " );
+			if ( preg_match( '/^".+"$/', $term ) ) {
+							$term = trim( $term, "\"'" );
+			} else {
+							$term = trim( $term, "\"' " );
+			}
 
 			// Avoid single A-Z and single dashes.
-			if ( ! $term || ( 1 === strlen( $term ) && preg_match( '/^[a-z\-]$/i', $term ) ) )
-				continue;
+			if ( ! $term || ( 1 === strlen( $term ) && preg_match( '/^[a-z\-]$/i', $term ) ) ) {
+							continue;
+			}
 
-			if ( in_array( call_user_func( $strtolower, $term ), $stopwords, true ) )
-				continue;
+			if ( in_array( call_user_func( $strtolower, $term ), $stopwords, true ) ) {
+							continue;
+			}
 
 			$checked[] = $term;
 		}
@@ -2215,8 +2253,9 @@ 
 	 * @return array Stopwords.
 	 */
 	protected function get_search_stopwords() {
-		if ( isset( $this->stopwords ) )
-			return $this->stopwords;
+		if ( isset( $this->stopwords ) ) {
+					return $this->stopwords;
+		}
 
 		/* translators: This is a comma-separated list of very common words that should be excluded from a search,
 		 * like a, an, and the. These are usually called "stopwords". You should not simply translate these individual
@@ -2228,8 +2267,9 @@ 
 		$stopwords = array();
 		foreach ( $words as $word ) {
 			$word = trim( $word, "\r\n\t " );
-			if ( $word )
-				$stopwords[] = $word;
+			if ( $word ) {
+							$stopwords[] = $word;
+			}
 		}
 
 		/**
@@ -2276,8 +2316,9 @@ 
 				// all words in title
 				$search_orderby .= 'WHEN ' . implode( ' AND ', $q['search_orderby_title'] ) . ' THEN 2 ';
 				// any word in title, not needed when $num_terms == 1
-				if ( $num_terms > 1 )
-					$search_orderby .= 'WHEN ' . implode( ' OR ', $q['search_orderby_title'] ) . ' THEN 3 ';
+				if ( $num_terms > 1 ) {
+									$search_orderby .= 'WHEN ' . implode( ' OR ', $q['search_orderby_title'] ) . ' THEN 3 ';
+				}
 			}
 
 			// Sentence match in 'post_content' and 'post_excerpt'.
@@ -2524,34 +2565,41 @@ 
 
 		if ( isset( $q['caller_get_posts'] ) ) {
 			_deprecated_argument( 'WP_Query', '3.1', __( '"caller_get_posts" is deprecated. Use "ignore_sticky_posts" instead.' ) );
-			if ( !isset( $q['ignore_sticky_posts'] ) )
-				$q['ignore_sticky_posts'] = $q['caller_get_posts'];
+			if ( !isset( $q['ignore_sticky_posts'] ) ) {
+							$q['ignore_sticky_posts'] = $q['caller_get_posts'];
+			}
 		}
 
-		if ( !isset( $q['ignore_sticky_posts'] ) )
-			$q['ignore_sticky_posts'] = false;
+		if ( !isset( $q['ignore_sticky_posts'] ) ) {
+					$q['ignore_sticky_posts'] = false;
+		}
 
-		if ( !isset($q['suppress_filters']) )
-			$q['suppress_filters'] = false;
+		if ( !isset($q['suppress_filters']) ) {
+					$q['suppress_filters'] = false;
+		}
 
 		if ( !isset($q['cache_results']) ) {
-			if ( wp_using_ext_object_cache() )
-				$q['cache_results'] = false;
-			else
-				$q['cache_results'] = true;
+			if ( wp_using_ext_object_cache() ) {
+							$q['cache_results'] = false;
+			} else {
+							$q['cache_results'] = true;
+			}
 		}
 
-		if ( !isset($q['update_post_term_cache']) )
-			$q['update_post_term_cache'] = true;
+		if ( !isset($q['update_post_term_cache']) ) {
+					$q['update_post_term_cache'] = true;
+		}
 
-		if ( !isset($q['update_post_meta_cache']) )
-			$q['update_post_meta_cache'] = true;
+		if ( !isset($q['update_post_meta_cache']) ) {
+					$q['update_post_meta_cache'] = true;
+		}
 
 		if ( !isset($q['post_type']) ) {
-			if ( $this->is_search )
-				$q['post_type'] = 'any';
-			else
-				$q['post_type'] = '';
+			if ( $this->is_search ) {
+							$q['post_type'] = 'any';
+			} else {
+							$q['post_type'] = '';
+			}
 		}
 		$post_type = $q['post_type'];
 		if ( empty( $q['posts_per_page'] ) ) {
@@ -2561,8 +2609,9 @@ 
 			$q['showposts'] = (int) $q['showposts'];
 			$q['posts_per_page'] = $q['showposts'];
 		}
-		if ( (isset($q['posts_per_archive_page']) && $q['posts_per_archive_page'] != 0) && ($this->is_archive || $this->is_search) )
-			$q['posts_per_page'] = $q['posts_per_archive_page'];
+		if ( (isset($q['posts_per_archive_page']) && $q['posts_per_archive_page'] != 0) && ($this->is_archive || $this->is_search) ) {
+					$q['posts_per_page'] = $q['posts_per_archive_page'];
+		}
 		if ( !isset($q['nopaging']) ) {
 			if ( $q['posts_per_page'] == -1 ) {
 				$q['nopaging'] = true;
@@ -2581,13 +2630,15 @@ 
 			$q['nopaging'] = false;
 		}
 		$q['posts_per_page'] = (int) $q['posts_per_page'];
-		if ( $q['posts_per_page'] < -1 )
-			$q['posts_per_page'] = abs($q['posts_per_page']);
-		elseif ( $q['posts_per_page'] == 0 )
-			$q['posts_per_page'] = 1;
+		if ( $q['posts_per_page'] < -1 ) {
+					$q['posts_per_page'] = abs($q['posts_per_page']);
+		} elseif ( $q['posts_per_page'] == 0 ) {
+					$q['posts_per_page'] = 1;
+		}
 
-		if ( !isset($q['comments_per_page']) || $q['comments_per_page'] == 0 )
-			$q['comments_per_page'] = get_option('comments_per_page');
+		if ( !isset($q['comments_per_page']) || $q['comments_per_page'] == 0 ) {
+					$q['comments_per_page'] = get_option('comments_per_page');
+		}
 
 		if ( $this->is_home && (empty($this->query) || $q['preview'] == 'true') && ( 'page' == get_option('show_on_front') ) && get_option('page_on_front') ) {
 			$this->is_page = true;
@@ -2601,10 +2652,11 @@ 
 		}
 
 		// If true, forcibly turns off SQL_CALC_FOUND_ROWS even when limits are present.
-		if ( isset($q['no_found_rows']) )
-			$q['no_found_rows'] = (bool) $q['no_found_rows'];
-		else
-			$q['no_found_rows'] = false;
+		if ( isset($q['no_found_rows']) ) {
+					$q['no_found_rows'] = (bool) $q['no_found_rows'];
+		} else {
+					$q['no_found_rows'] = false;
+		}
 
 		switch ( $q['fields'] ) {
 			case 'ids':
@@ -2617,47 +2669,60 @@ 
 				$fields = "$wpdb->posts.*";
 		}
 
-		if ( '' !== $q['menu_order'] )
-			$where .= " AND $wpdb->posts.menu_order = " . $q['menu_order'];
+		if ( '' !== $q['menu_order'] ) {
+					$where .= " AND $wpdb->posts.menu_order = " . $q['menu_order'];
+		}
 
 		// The "m" parameter is meant for months but accepts datetimes of varying specificity
 		if ( $q['m'] ) {
 			$where .= " AND YEAR($wpdb->posts.post_date)=" . substr($q['m'], 0, 4);
-			if ( strlen($q['m']) > 5 )
-				$where .= " AND MONTH($wpdb->posts.post_date)=" . substr($q['m'], 4, 2);
-			if ( strlen($q['m']) > 7 )
-				$where .= " AND DAYOFMONTH($wpdb->posts.post_date)=" . substr($q['m'], 6, 2);
-			if ( strlen($q['m']) > 9 )
-				$where .= " AND HOUR($wpdb->posts.post_date)=" . substr($q['m'], 8, 2);
-			if ( strlen($q['m']) > 11 )
-				$where .= " AND MINUTE($wpdb->posts.post_date)=" . substr($q['m'], 10, 2);
-			if ( strlen($q['m']) > 13 )
-				$where .= " AND SECOND($wpdb->posts.post_date)=" . substr($q['m'], 12, 2);
+			if ( strlen($q['m']) > 5 ) {
+							$where .= " AND MONTH($wpdb->posts.post_date)=" . substr($q['m'], 4, 2);
+			}
+			if ( strlen($q['m']) > 7 ) {
+							$where .= " AND DAYOFMONTH($wpdb->posts.post_date)=" . substr($q['m'], 6, 2);
+			}
+			if ( strlen($q['m']) > 9 ) {
+							$where .= " AND HOUR($wpdb->posts.post_date)=" . substr($q['m'], 8, 2);
+			}
+			if ( strlen($q['m']) > 11 ) {
+							$where .= " AND MINUTE($wpdb->posts.post_date)=" . substr($q['m'], 10, 2);
+			}
+			if ( strlen($q['m']) > 13 ) {
+							$where .= " AND SECOND($wpdb->posts.post_date)=" . substr($q['m'], 12, 2);
+			}
 		}
 
 		// Handle the other individual date parameters
 		$date_parameters = array();
 
-		if ( '' !== $q['hour'] )
-			$date_parameters['hour'] = $q['hour'];
+		if ( '' !== $q['hour'] ) {
+					$date_parameters['hour'] = $q['hour'];
+		}
 
-		if ( '' !== $q['minute'] )
-			$date_parameters['minute'] = $q['minute'];
+		if ( '' !== $q['minute'] ) {
+					$date_parameters['minute'] = $q['minute'];
+		}
 
-		if ( '' !== $q['second'] )
-			$date_parameters['second'] = $q['second'];
+		if ( '' !== $q['second'] ) {
+					$date_parameters['second'] = $q['second'];
+		}
 
-		if ( $q['year'] )
-			$date_parameters['year'] = $q['year'];
+		if ( $q['year'] ) {
+					$date_parameters['year'] = $q['year'];
+		}
 
-		if ( $q['monthnum'] )
-			$date_parameters['monthnum'] = $q['monthnum'];
+		if ( $q['monthnum'] ) {
+					$date_parameters['monthnum'] = $q['monthnum'];
+		}
 
-		if ( $q['w'] )
-			$date_parameters['week'] = $q['w'];
+		if ( $q['w'] ) {
+					$date_parameters['week'] = $q['w'];
+		}
 
-		if ( $q['day'] )
-			$date_parameters['day'] = $q['day'];
+		if ( $q['day'] ) {
+					$date_parameters['day'] = $q['day'];
+		}
 
 		if ( $date_parameters ) {
 			$date_query = new WP_Date_Query( array( $date_parameters ) );
@@ -2676,8 +2741,9 @@ 
 		if ( !empty($q['post_type']) && 'any' != $q['post_type'] ) {
 			foreach ( (array)$q['post_type'] as $_post_type ) {
 				$ptype_obj = get_post_type_object($_post_type);
-				if ( !$ptype_obj || !$ptype_obj->query_var || empty($q[ $ptype_obj->query_var ]) )
-					continue;
+				if ( !$ptype_obj || !$ptype_obj->query_var || empty($q[ $ptype_obj->query_var ]) ) {
+									continue;
+				}
 
 				if ( ! $ptype_obj->hierarchical ) {
 					// Non-hierarchical post types can directly use 'name'.
@@ -2709,21 +2775,24 @@ 
 				if ( 'page' != $q['post_type'] ) {
 					foreach ( (array)$q['post_type'] as $_post_type ) {
 						$ptype_obj = get_post_type_object($_post_type);
-						if ( !$ptype_obj || !$ptype_obj->hierarchical )
-							continue;
+						if ( !$ptype_obj || !$ptype_obj->hierarchical ) {
+													continue;
+						}
 
 						$reqpage = get_page_by_path($q['pagename'], OBJECT, $_post_type);
-						if ( $reqpage )
-							break;
+						if ( $reqpage ) {
+													break;
+						}
 					}
 					unset($ptype_obj);
 				} else {
 					$reqpage = get_page_by_path($q['pagename']);
 				}
-				if ( !empty($reqpage) )
-					$reqpage = $reqpage->ID;
-				else
-					$reqpage = 0;
+				if ( !empty($reqpage) ) {
+									$reqpage = $reqpage->ID;
+				} else {
+									$reqpage = 0;
+				}
 			}
 
 			$page_for_posts = get_option('page_for_posts');
@@ -2749,8 +2818,9 @@ 
 		}
 
 		// If an attachment is requested by number, let it supersede any post number.
-		if ( $q['attachment_id'] )
-			$q['p'] = absint($q['attachment_id']);
+		if ( $q['attachment_id'] ) {
+					$q['p'] = absint($q['attachment_id']);
+		}
 
 		// If a post number is specified, load that post
 		if ( $q['p'] ) {
@@ -2814,13 +2884,15 @@ 
 				$taxonomies = array_keys( $this->tax_query->queried_terms );
 				foreach ( get_post_types( array( 'exclude_from_search' => false ) ) as $pt ) {
 					$object_taxonomies = $pt === 'attachment' ? get_taxonomies_for_attachments() : get_object_taxonomies( $pt );
-					if ( array_intersect( $taxonomies, $object_taxonomies ) )
-						$post_type[] = $pt;
+					if ( array_intersect( $taxonomies, $object_taxonomies ) ) {
+											$post_type[] = $pt;
+					}
+				}
+				if ( ! $post_type ) {
+									$post_type = 'any';
+				} elseif ( count( $post_type ) == 1 ) {
+									$post_type = $post_type[0];
 				}
-				if ( ! $post_type )
-					$post_type = 'any';
-				elseif ( count( $post_type ) == 1 )
-					$post_type = $post_type[0];
 
 				$post_status_join = true;
 			} elseif ( in_array('attachment', (array) $post_type) ) {
@@ -2921,15 +2993,17 @@ 
 			}
 			$q['author_name'] = sanitize_title_for_query( $q['author_name'] );
 			$q['author'] = get_user_by('slug', $q['author_name']);
-			if ( $q['author'] )
-				$q['author'] = $q['author']->ID;
+			if ( $q['author'] ) {
+							$q['author'] = $q['author']->ID;
+			}
 			$whichauthor .= " AND ($wpdb->posts.post_author = " . absint($q['author']) . ')';
 		}
 
 		// MIME-Type stuff for attachment browsing
 
-		if ( isset( $q['post_mime_type'] ) && '' != $q['post_mime_type'] )
-			$whichmimetype = wp_post_mime_type_where( $q['post_mime_type'], $wpdb->posts );
+		if ( isset( $q['post_mime_type'] ) && '' != $q['post_mime_type'] ) {
+					$whichmimetype = wp_post_mime_type_where( $q['post_mime_type'], $wpdb->posts );
+		}
 
 		$where .= $search . $whichauthor . $whichmimetype;
 
@@ -3004,8 +3078,9 @@ 
 		// Order search results by relevance only when another "orderby" is not specified in the query.
 		if ( ! empty( $q['s'] ) ) {
 			$search_orderby = '';
-			if ( ! empty( $q['search_orderby_title'] ) && ( empty( $q['orderby'] ) && ! $this->is_feed ) || ( isset( $q['orderby'] ) && 'relevance' === $q['orderby'] ) )
-				$search_orderby = $this->parse_search_order( $q );
+			if ( ! empty( $q['search_orderby_title'] ) && ( empty( $q['orderby'] ) && ! $this->is_feed ) || ( isset( $q['orderby'] ) && 'relevance' === $q['orderby'] ) ) {
+							$search_orderby = $this->parse_search_order( $q );
+			}
 
 			if ( ! $q['suppress_filters'] ) {
 				/**
@@ -3019,18 +3094,21 @@ 
 				$search_orderby = apply_filters( 'posts_search_orderby', $search_orderby, $this );
 			}
 
-			if ( $search_orderby )
-				$orderby = $orderby ? $search_orderby . ', ' . $orderby : $search_orderby;
+			if ( $search_orderby ) {
+							$orderby = $orderby ? $search_orderby . ', ' . $orderby : $search_orderby;
+			}
 		}
 
 		if ( is_array( $post_type ) && count( $post_type ) > 1 ) {
 			$post_type_cap = 'multiple_post_type';
 		} else {
-			if ( is_array( $post_type ) )
-				$post_type = reset( $post_type );
+			if ( is_array( $post_type ) ) {
+							$post_type = reset( $post_type );
+			}
 			$post_type_object = get_post_type_object( $post_type );
-			if ( empty( $post_type_object ) )
-				$post_type_cap = $post_type;
+			if ( empty( $post_type_object ) ) {
+							$post_type_cap = $post_type;
+			}
 		}
 
 		if ( isset( $q['post_password'] ) ) {
@@ -3052,10 +3130,11 @@ 
 
 		if ( 'any' == $post_type ) {
 			$in_search_post_types = get_post_types( array('exclude_from_search' => false) );
-			if ( empty( $in_search_post_types ) )
-				$where .= ' AND 1=0 ';
-			else
-				$where .= " AND $wpdb->posts.post_type IN ('" . join("', '", $in_search_post_types ) . "')";
+			if ( empty( $in_search_post_types ) ) {
+							$where .= ' AND 1=0 ';
+			} else {
+							$where .= " AND $wpdb->posts.post_type IN ('" . join("', '", $in_search_post_types ) . "')";
+			}
 		} elseif ( !empty( $post_type ) && is_array( $post_type ) ) {
 			$where .= " AND $wpdb->posts.post_type IN ('" . join("', '", $post_type) . "')";
 		} elseif ( ! empty( $post_type ) ) {
@@ -3089,8 +3168,9 @@ 
 		if ( ! empty( $q['post_status'] ) ) {
 			$statuswheres = array();
 			$q_status = $q['post_status'];
-			if ( ! is_array( $q_status ) )
-				$q_status = explode(',', $q_status);
+			if ( ! is_array( $q_status ) ) {
+							$q_status = explode(',', $q_status);
+			}
 			$r_status = array();
 			$p_status = array();
 			$e_status = array();
@@ -3103,10 +3183,11 @@ 
 			} else {
 				foreach ( get_post_stati() as $status ) {
 					if ( in_array( $status, $q_status ) ) {
-						if ( 'private' == $status )
-							$p_status[] = "$wpdb->posts.post_status = '$status'";
-						else
-							$r_status[] = "$wpdb->posts.post_status = '$status'";
+						if ( 'private' == $status ) {
+													$p_status[] = "$wpdb->posts.post_status = '$status'";
+						} else {
+													$r_status[] = "$wpdb->posts.post_status = '$status'";
+						}
 					}
 				}
 			}
@@ -3120,21 +3201,24 @@ 
 				$statuswheres[] = "(" . join( ' AND ', $e_status ) . ")";
 			}
 			if ( !empty($r_status) ) {
-				if ( !empty($q['perm'] ) && 'editable' == $q['perm'] && !current_user_can($edit_others_cap) )
-					$statuswheres[] = "($wpdb->posts.post_author = $user_id " . "AND (" . join( ' OR ', $r_status ) . "))";
-				else
-					$statuswheres[] = "(" . join( ' OR ', $r_status ) . ")";
+				if ( !empty($q['perm'] ) && 'editable' == $q['perm'] && !current_user_can($edit_others_cap) ) {
+									$statuswheres[] = "($wpdb->posts.post_author = $user_id " . "AND (" . join( ' OR ', $r_status ) . "))";
+				} else {
+									$statuswheres[] = "(" . join( ' OR ', $r_status ) . ")";
+				}
 			}
 			if ( !empty($p_status) ) {
-				if ( !empty($q['perm'] ) && 'readable' == $q['perm'] && !current_user_can($read_private_cap) )
-					$statuswheres[] = "($wpdb->posts.post_author = $user_id " . "AND (" . join( ' OR ', $p_status ) . "))";
-				else
-					$statuswheres[] = "(" . join( ' OR ', $p_status ) . ")";
+				if ( !empty($q['perm'] ) && 'readable' == $q['perm'] && !current_user_can($read_private_cap) ) {
+									$statuswheres[] = "($wpdb->posts.post_author = $user_id " . "AND (" . join( ' OR ', $p_status ) . "))";
+				} else {
+									$statuswheres[] = "(" . join( ' OR ', $p_status ) . ")";
+				}
 			}
 			if ( $post_status_join ) {
 				$join .= " LEFT JOIN $wpdb->posts AS p2 ON ($wpdb->posts.post_parent = p2.ID) ";
-				foreach ( $statuswheres as $index => $statuswhere )
-					$statuswheres[$index] = "($statuswhere OR ($wpdb->posts.post_status = 'inherit' AND " . str_replace($wpdb->posts, 'p2', $statuswhere) . "))";
+				foreach ( $statuswheres as $index => $statuswhere ) {
+									$statuswheres[$index] = "($statuswhere OR ($wpdb->posts.post_status = 'inherit' AND " . str_replace($wpdb->posts, 'p2', $statuswhere) . "))";
+				}
 			}
 			$where_status = implode( ' OR ', $statuswheres );
 			if ( ! empty( $where_status ) ) {
@@ -3146,23 +3230,27 @@ 
 			// Add public states.
 			$public_states = get_post_stati( array('public' => true) );
 			foreach ( (array) $public_states as $state ) {
-				if ( 'publish' == $state ) // Publish is hard-coded above.
+				if ( 'publish' == $state ) {
+					// Publish is hard-coded above.
 					continue;
+				}
 				$where .= " OR $wpdb->posts.post_status = '$state'";
 			}
 
 			if ( $this->is_admin ) {
 				// Add protected states that should show in the admin all list.
 				$admin_all_states = get_post_stati( array('protected' => true, 'show_in_admin_all_list' => true) );
-				foreach ( (array) $admin_all_states as $state )
-					$where .= " OR $wpdb->posts.post_status = '$state'";
+				foreach ( (array) $admin_all_states as $state ) {
+									$where .= " OR $wpdb->posts.post_status = '$state'";
+				}
 			}
 
 			if ( is_user_logged_in() ) {
 				// Add private states that are limited to viewing by the author of a post or someone who has caps to read private states.
 				$private_states = get_post_stati( array('private' => true) );
-				foreach ( (array) $private_states as $state )
-					$where .= current_user_can( $read_private_cap ) ? " OR $wpdb->posts.post_status = '$state'" : " OR $wpdb->posts.post_author = $user_id AND $wpdb->posts.post_status = '$state'";
+				foreach ( (array) $private_states as $state ) {
+									$where .= current_user_can( $read_private_cap ) ? " OR $wpdb->posts.post_status = '$state'" : " OR $wpdb->posts.post_author = $user_id AND $wpdb->posts.post_status = '$state'";
+				}
 			}
 
 			$where .= ')';
@@ -3197,8 +3285,9 @@ 
 		// Paging
 		if ( empty($q['nopaging']) && !$this->is_singular ) {
 			$page = absint($q['paged']);
-			if ( !$page )
-				$page = 1;
+			if ( !$page ) {
+							$page = 1;
+			}
 
 			// If 'offset' is provided, it takes precedence over 'paged'.
 			if ( isset( $q['offset'] ) && is_numeric( $q['offset'] ) ) {
@@ -3283,15 +3372,17 @@ 
 
 			$post_ids = array();
 
-			foreach ( $this->comments as $comment )
-				$post_ids[] = (int) $comment->comment_post_ID;
+			foreach ( $this->comments as $comment ) {
+							$post_ids[] = (int) $comment->comment_post_ID;
+			}
 
 			$post_ids = join(',', $post_ids);
 			$join = '';
-			if ( $post_ids )
-				$where = "AND $wpdb->posts.ID IN ($post_ids) ";
-			else
-				$where = "AND 0";
+			if ( $post_ids ) {
+							$where = "AND $wpdb->posts.ID IN ($post_ids) ";
+			} else {
+							$where = "AND 0";
+			}
 		}
 
 		$pieces = array( 'where', 'groupby', 'join', 'orderby', 'distinct', 'fields', 'limits' );
@@ -3521,14 +3612,17 @@ 
 			$limits = isset( $clauses[ 'limits' ] ) ? $clauses[ 'limits' ] : '';
 		}
 
-		if ( ! empty($groupby) )
-			$groupby = 'GROUP BY ' . $groupby;
-		if ( !empty( $orderby ) )
-			$orderby = 'ORDER BY ' . $orderby;
+		if ( ! empty($groupby) ) {
+					$groupby = 'GROUP BY ' . $groupby;
+		}
+		if ( !empty( $orderby ) ) {
+					$orderby = 'ORDER BY ' . $orderby;
+		}
 
 		$found_rows = '';
-		if ( !$q['no_found_rows'] && !empty($limits) )
-			$found_rows = 'SQL_CALC_FOUND_ROWS';
+		if ( !$q['no_found_rows'] && !empty($limits) ) {
+					$found_rows = 'SQL_CALC_FOUND_ROWS';
+		}
 
 		$this->request = $old_request = "SELECT $found_rows $distinct $fields FROM $wpdb->posts $join WHERE 1=1 $where $groupby $orderby $limits";
 
@@ -3615,8 +3709,9 @@ 
 		}
 
 		// Convert to WP_Post objects
-		if ( $this->posts )
-			$this->posts = array_map( 'get_post', $this->posts );
+		if ( $this->posts ) {
+					$this->posts = array_map( 'get_post', $this->posts );
+		}
 
 		if ( ! $q['suppress_filters'] ) {
 			/**
@@ -3678,12 +3773,14 @@ 
 							$this->posts = array();
 						} else {
 							$this->is_preview = true;
-							if ( 'future' != $status )
-								$this->posts[0]->post_date = current_time('mysql');
+							if ( 'future' != $status ) {
+															$this->posts[0]->post_date = current_time('mysql');
+							}
 						}
 					} elseif ( $post_status_obj->private ) {
-						if ( ! current_user_can($read_cap, $this->posts[0]->ID) )
-							$this->posts = array();
+						if ( ! current_user_can($read_cap, $this->posts[0]->ID) ) {
+													$this->posts = array();
+						}
 					} else {
 						$this->posts = array();
 					}
@@ -3725,8 +3822,9 @@ 
 			}
 
 			// If any posts have been excluded specifically, Ignore those that are sticky.
-			if ( !empty($sticky_posts) && !empty($q['post__not_in']) )
-				$sticky_posts = array_diff($sticky_posts, $q['post__not_in']);
+			if ( !empty($sticky_posts) && !empty($q['post__not_in']) ) {
+							$sticky_posts = array_diff($sticky_posts, $q['post__not_in']);
+			}
 
 			// Fetch sticky posts that weren't in the query results
 			if ( !empty($sticky_posts) ) {
@@ -3769,8 +3867,9 @@ 
 
 			$this->posts = array_map( 'get_post', $this->posts );
 
-			if ( $q['cache_results'] )
-				update_post_caches($this->posts, $post_type, $q['update_post_term_cache'], $q['update_post_meta_cache']);
+			if ( $q['cache_results'] ) {
+							update_post_caches($this->posts, $post_type, $q['update_post_term_cache'], $q['update_post_meta_cache']);
+			}
 
 			$this->post = reset( $this->posts );
 		} else {
@@ -3802,8 +3901,9 @@ 
 
 		// Bail if posts is an empty array. Continue if posts is an empty string,
 		// null, or false to accommodate caching plugins that fill posts later.
-		if ( $q['no_found_rows'] || ( is_array( $this->posts ) && ! $this->posts ) )
-			return;
+		if ( $q['no_found_rows'] || ( is_array( $this->posts ) && ! $this->posts ) ) {
+					return;
+		}
 
 		if ( ! empty( $limits ) ) {
 			/**
@@ -3829,8 +3929,9 @@ 
 		 */
 		$this->found_posts = apply_filters_ref_array( 'found_posts', array( $this->found_posts, &$this ) );
 
-		if ( ! empty( $limits ) )
-			$this->max_num_pages = ceil( $this->found_posts / $q['posts_per_page'] );
+		if ( ! empty( $limits ) ) {
+					$this->max_num_pages = ceil( $this->found_posts / $q['posts_per_page'] );
+		}
 	}
 
 	/**
@@ -3864,7 +3965,8 @@ 
 		global $post;
 		$this->in_the_loop = true;
 
-		if ( $this->current_post == -1 ) // loop has just started
+		if ( $this->current_post == -1 ) {
+			// loop has just started
 			/**
 			 * Fires once the loop is started.
 			 *
@@ -3873,6 +3975,7 @@ 
 			 * @param WP_Query &$this The WP_Query instance (passed by reference).
 			 */
 			do_action_ref_array( 'loop_start', array( &$this ) );
+		}
 
 		$post = $this->next_post();
 		$this->setup_postdata( $post );
@@ -4019,8 +4122,9 @@ 
 	 * @return object
 	 */
 	public function get_queried_object() {
-		if ( isset($this->queried_object) )
-			return $this->queried_object;
+		if ( isset($this->queried_object) ) {
+					return $this->queried_object;
+		}
 
 		$this->queried_object = null;
 		$this->queried_object_id = null;
@@ -4061,13 +4165,15 @@ 
 				$this->queried_object = $term;
 				$this->queried_object_id = (int) $term->term_id;
 
-				if ( $this->is_category && 'category' === $this->queried_object->taxonomy )
-					_make_cat_compat( $this->queried_object );
+				if ( $this->is_category && 'category' === $this->queried_object->taxonomy ) {
+									_make_cat_compat( $this->queried_object );
+				}
 			}
 		} elseif ( $this->is_post_type_archive ) {
 			$post_type = $this->get( 'post_type' );
-			if ( is_array( $post_type ) )
-				$post_type = reset( $post_type );
+			if ( is_array( $post_type ) ) {
+							$post_type = reset( $post_type );
+			}
 			$this->queried_object = get_post_type_object( $post_type );
 		} elseif ( $this->is_posts_page ) {
 			$page_for_posts = get_option('page_for_posts');
@@ -4187,12 +4293,14 @@ 
 	 * @return bool
 	 */
 	public function is_post_type_archive( $post_types = '' ) {
-		if ( empty( $post_types ) || ! $this->is_post_type_archive )
-			return (bool) $this->is_post_type_archive;
+		if ( empty( $post_types ) || ! $this->is_post_type_archive ) {
+					return (bool) $this->is_post_type_archive;
+		}
 
 		$post_type = $this->get( 'post_type' );
-		if ( is_array( $post_type ) )
-			$post_type = reset( $post_type );
+		if ( is_array( $post_type ) ) {
+					$post_type = reset( $post_type );
+		}
 		$post_type_object = get_post_type_object( $post_type );
 
 		return in_array( $post_type_object->name, (array) $post_types );
@@ -4241,22 +4349,25 @@ 
 	 * @return bool
 	 */
 	public function is_author( $author = '' ) {
-		if ( !$this->is_author )
-			return false;
+		if ( !$this->is_author ) {
+					return false;
+		}
 
-		if ( empty($author) )
-			return true;
+		if ( empty($author) ) {
+					return true;
+		}
 
 		$author_obj = $this->get_queried_object();
 
 		$author = array_map( 'strval', (array) $author );
 
-		if ( in_array( (string) $author_obj->ID, $author ) )
-			return true;
-		elseif ( in_array( $author_obj->nickname, $author ) )
-			return true;
-		elseif ( in_array( $author_obj->user_nicename, $author ) )
-			return true;
+		if ( in_array( (string) $author_obj->ID, $author ) ) {
+					return true;
+		} elseif ( in_array( $author_obj->nickname, $author ) ) {
+					return true;
+		} elseif ( in_array( $author_obj->user_nicename, $author ) ) {
+					return true;
+		}
 
 		return false;
 	}
@@ -4273,22 +4384,25 @@ 
 	 * @return bool
 	 */
 	public function is_category( $category = '' ) {
-		if ( !$this->is_category )
-			return false;
+		if ( !$this->is_category ) {
+					return false;
+		}
 
-		if ( empty($category) )
-			return true;
+		if ( empty($category) ) {
+					return true;
+		}
 
 		$cat_obj = $this->get_queried_object();
 
 		$category = array_map( 'strval', (array) $category );
 
-		if ( in_array( (string) $cat_obj->term_id, $category ) )
-			return true;
-		elseif ( in_array( $cat_obj->name, $category ) )
-			return true;
-		elseif ( in_array( $cat_obj->slug, $category ) )
-			return true;
+		if ( in_array( (string) $cat_obj->term_id, $category ) ) {
+					return true;
+		} elseif ( in_array( $cat_obj->name, $category ) ) {
+					return true;
+		} elseif ( in_array( $cat_obj->slug, $category ) ) {
+					return true;
+		}
 
 		return false;
 	}
@@ -4305,22 +4419,25 @@ 
 	 * @return bool
 	 */
 	public function is_tag( $tag = '' ) {
-		if ( ! $this->is_tag )
-			return false;
+		if ( ! $this->is_tag ) {
+					return false;
+		}
 
-		if ( empty( $tag ) )
-			return true;
+		if ( empty( $tag ) ) {
+					return true;
+		}
 
 		$tag_obj = $this->get_queried_object();
 
 		$tag = array_map( 'strval', (array) $tag );
 
-		if ( in_array( (string) $tag_obj->term_id, $tag ) )
-			return true;
-		elseif ( in_array( $tag_obj->name, $tag ) )
-			return true;
-		elseif ( in_array( $tag_obj->slug, $tag ) )
-			return true;
+		if ( in_array( (string) $tag_obj->term_id, $tag ) ) {
+					return true;
+		} elseif ( in_array( $tag_obj->name, $tag ) ) {
+					return true;
+		} elseif ( in_array( $tag_obj->slug, $tag ) ) {
+					return true;
+		}
 
 		return false;
 	}
@@ -4346,23 +4463,27 @@ 
 	public function is_tax( $taxonomy = '', $term = '' ) {
 		global $wp_taxonomies;
 
-		if ( !$this->is_tax )
-			return false;
+		if ( !$this->is_tax ) {
+					return false;
+		}
 
-		if ( empty( $taxonomy ) )
-			return true;
+		if ( empty( $taxonomy ) ) {
+					return true;
+		}
 
 		$queried_object = $this->get_queried_object();
 		$tax_array = array_intersect( array_keys( $wp_taxonomies ), (array) $taxonomy );
 		$term_array = (array) $term;
 
 		// Check that the taxonomy matches.
-		if ( ! ( isset( $queried_object->taxonomy ) && count( $tax_array ) && in_array( $queried_object->taxonomy, $tax_array ) ) )
-			return false;
+		if ( ! ( isset( $queried_object->taxonomy ) && count( $tax_array ) && in_array( $queried_object->taxonomy, $tax_array ) ) ) {
+					return false;
+		}
 
 		// Only a Taxonomy provided.
-		if ( empty( $term ) )
-			return true;
+		if ( empty( $term ) ) {
+					return true;
+		}
 
 		return isset( $queried_object->term_id ) &&
 			count( array_intersect(
@@ -4416,11 +4537,13 @@ 
 	 * @return bool
 	 */
 	public function is_feed( $feeds = '' ) {
-		if ( empty( $feeds ) || ! $this->is_feed )
-			return (bool) $this->is_feed;
+		if ( empty( $feeds ) || ! $this->is_feed ) {
+					return (bool) $this->is_feed;
+		}
 		$qv = $this->get( 'feed' );
-		if ( 'feed' == $qv )
-			$qv = get_default_feed();
+		if ( 'feed' == $qv ) {
+					$qv = get_default_feed();
+		}
 		return in_array( $qv, (array) $feeds );
 	}
 
@@ -4453,12 +4576,13 @@ 
 	 */
 	public function is_front_page() {
 		// most likely case
-		if ( 'posts' == get_option( 'show_on_front') && $this->is_home() )
-			return true;
-		elseif ( 'page' == get_option( 'show_on_front') && get_option( 'page_on_front' ) && $this->is_page( get_option( 'page_on_front' ) ) )
-			return true;
-		else
-			return false;
+		if ( 'posts' == get_option( 'show_on_front') && $this->is_home() ) {
+					return true;
+		} elseif ( 'page' == get_option( 'show_on_front') && get_option( 'page_on_front' ) && $this->is_page( get_option( 'page_on_front' ) ) ) {
+					return true;
+		} else {
+					return false;
+		}
 	}
 
 	/**
@@ -4507,11 +4631,13 @@ 
 	 * @return bool Whether the query is for an existing single page.
 	 */
 	public function is_page( $page = '' ) {
-		if ( !$this->is_page )
-			return false;
+		if ( !$this->is_page ) {
+					return false;
+		}
 
-		if ( empty( $page ) )
-			return true;
+		if ( empty( $page ) ) {
+					return true;
+		}
 
 		$page_obj = $this->get_queried_object();
 
@@ -4600,11 +4726,13 @@ 
 	 * @return bool Whether the query is for an existing single post.
 	 */
 	public function is_single( $post = '' ) {
-		if ( !$this->is_single )
-			return false;
+		if ( !$this->is_single ) {
+					return false;
+		}
 
-		if ( empty($post) )
-			return true;
+		if ( empty($post) ) {
+					return true;
+		}
 
 		$post_obj = $this->get_queried_object();
 
@@ -4646,8 +4774,9 @@ 
 	 * @return bool Whether the query is for an existing single post of any of the given post types.
 	 */
 	public function is_singular( $post_types = '' ) {
-		if ( empty( $post_types ) || !$this->is_singular )
-			return (bool) $this->is_singular;
+		if ( empty( $post_types ) || !$this->is_singular ) {
+					return (bool) $this->is_singular;
+		}
 
 		$post_obj = $this->get_queried_object();
 
@@ -4762,8 +4891,9 @@ 
 		$numpages = 1;
 		$multipage = 0;
 		$page = $this->get( 'page' );
-		if ( ! $page )
-			$page = 1;
+		if ( ! $page ) {
+					$page = 1;
+		}
 
 		/*
 		 * Force full post content when viewing the permalink for the $post,
@@ -4784,8 +4914,9 @@ 
 			$content = str_replace( "<!--nextpage-->\n", '<!--nextpage-->', $content );
 
 			// Ignore nextpage at the beginning of the content.
-			if ( 0 === strpos( $content, '<!--nextpage-->' ) )
-				$content = substr( $content, 15 );
+			if ( 0 === strpos( $content, '<!--nextpage-->' ) ) {
+							$content = substr( $content, 15 );
+			}
 
 			$pages = explode('<!--nextpage-->', $content);
 		} else {
@@ -4909,30 +5040,36 @@ 
 		}
 
 		if ( is_array( $post_type ) ) {
-			if ( count( $post_type ) > 1 )
-				return;
+			if ( count( $post_type ) > 1 ) {
+							return;
+			}
 			$post_type = reset( $post_type );
 		}
 
 		// Do not attempt redirect for hierarchical post types
-		if ( is_post_type_hierarchical( $post_type ) )
-			return;
+		if ( is_post_type_hierarchical( $post_type ) ) {
+					return;
+		}
 
 		$query = $wpdb->prepare("SELECT post_id FROM $wpdb->postmeta, $wpdb->posts WHERE ID = post_id AND post_type = %s AND meta_key = '_wp_old_slug' AND meta_value = %s", $post_type, $wp_query->query_vars['name']);
 
 		// if year, monthnum, or day have been specified, make our query more precise
 		// just in case there are multiple identical _wp_old_slug values
-		if ( '' != $wp_query->query_vars['year'] )
-			$query .= $wpdb->prepare(" AND YEAR(post_date) = %d", $wp_query->query_vars['year']);
-		if ( '' != $wp_query->query_vars['monthnum'] )
-			$query .= $wpdb->prepare(" AND MONTH(post_date) = %d", $wp_query->query_vars['monthnum']);
-		if ( '' != $wp_query->query_vars['day'] )
-			$query .= $wpdb->prepare(" AND DAYOFMONTH(post_date) = %d", $wp_query->query_vars['day']);
+		if ( '' != $wp_query->query_vars['year'] ) {
+					$query .= $wpdb->prepare(" AND YEAR(post_date) = %d", $wp_query->query_vars['year']);
+		}
+		if ( '' != $wp_query->query_vars['monthnum'] ) {
+					$query .= $wpdb->prepare(" AND MONTH(post_date) = %d", $wp_query->query_vars['monthnum']);
+		}
+		if ( '' != $wp_query->query_vars['day'] ) {
+					$query .= $wpdb->prepare(" AND DAYOFMONTH(post_date) = %d", $wp_query->query_vars['day']);
+		}
 
 		$id = (int) $wpdb->get_var($query);
 
-		if ( ! $id )
-			return;
+		if ( ! $id ) {
+					return;
+		}
 
 		$link = get_permalink( $id );
 

src/wp-includes/rest-api/class-wp-rest-request.php

Doc Comments +2 added lines, -2 removed lines

@@ -479,7 +479,7 @@ 
 	 * @since 4.4.0
 	 * @access public
 	 *
-	 * @param array $params Parameter map of key to value.
+	 * @param string[] $params Parameter map of key to value.
 	 */
 	public function set_url_params( $params ) {
 		$this->params['URL'] = $params;
@@ -781,7 +781,7 @@ 
 	 * @since 4.4.0
 	 * @access public
 	 *
-	 * @return true|null True if there are no parameters to sanitize, null otherwise.
+	 * @return boolean|null True if there are no parameters to sanitize, null otherwise.
 	 */
 	public function sanitize_params() {
 

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * REST API: WP_REST_Request class
- *
- * @package WordPress
- * @subpackage REST_API
- * @since 4.4.0
- */
+	 * REST API: WP_REST_Request class
+	 *
+	 * @package WordPress
+	 * @subpackage REST_API
+	 * @since 4.4.0
+	 */
 
 /**
  * Core class used to implement a REST request object.

Spacing +118 added lines, -118 removed lines

@@ -119,7 +119,7 @@ 
 	 * @param string $route      Optional. Request route. Default empty.
 	 * @param array  $attributes Optional. Request attributes. Default empty array.
 	 */
-	public function __construct( $method = '', $route = '', $attributes = array() ) {
+	public function __construct($method = '', $route = '', $attributes = array()) {
 		$this->params = array(
 			'URL'   => array(),
 			'GET'   => array(),
@@ -132,9 +132,9 @@ 
 			'defaults' => array(),
 		);
 
-		$this->set_method( $method );
-		$this->set_route( $route );
-		$this->set_attributes( $attributes );
+		$this->set_method($method);
+		$this->set_route($route);
+		$this->set_attributes($attributes);
 	}
 
 	/**
@@ -157,8 +157,8 @@ 
 	 *
 	 * @param string $method HTTP method.
 	 */
-	public function set_method( $method ) {
-		$this->method = strtoupper( $method );
+	public function set_method($method) {
+		$this->method = strtoupper($method);
 	}
 
 	/**
@@ -193,9 +193,9 @@ 
 	 * @param string $key Header name.
 	 * @return string Canonicalized name.
 	 */
-	public static function canonicalize_header_name( $key ) {
-		$key = strtolower( $key );
-		$key = str_replace( '-', '_', $key );
+	public static function canonicalize_header_name($key) {
+		$key = strtolower($key);
+		$key = str_replace('-', '_', $key);
 
 		return $key;
 	}
@@ -213,14 +213,14 @@ 
 	 * @param string $key Header name, will be canonicalized to lowercase.
 	 * @return string|null String value if set, null otherwise.
 	 */
-	public function get_header( $key ) {
-		$key = $this->canonicalize_header_name( $key );
+	public function get_header($key) {
+		$key = $this->canonicalize_header_name($key);
 
-		if ( ! isset( $this->headers[ $key ] ) ) {
+		if ( ! isset($this->headers[$key])) {
 			return null;
 		}
 
-		return implode( ',', $this->headers[ $key ] );
+		return implode(',', $this->headers[$key]);
 	}
 
 	/**
@@ -232,14 +232,14 @@ 
 	 * @param string $key Header name, will be canonicalized to lowercase.
 	 * @return array|null List of string values if set, null otherwise.
 	 */
-	public function get_header_as_array( $key ) {
-		$key = $this->canonicalize_header_name( $key );
+	public function get_header_as_array($key) {
+		$key = $this->canonicalize_header_name($key);
 
-		if ( ! isset( $this->headers[ $key ] ) ) {
+		if ( ! isset($this->headers[$key])) {
 			return null;
 		}
 
-		return $this->headers[ $key ];
+		return $this->headers[$key];
 	}
 
 	/**
@@ -251,11 +251,11 @@ 
 	 * @param string $key   Header name.
 	 * @param string $value Header value, or list of values.
 	 */
-	public function set_header( $key, $value ) {
-		$key = $this->canonicalize_header_name( $key );
+	public function set_header($key, $value) {
+		$key = $this->canonicalize_header_name($key);
 		$value = (array) $value;
 
-		$this->headers[ $key ] = $value;
+		$this->headers[$key] = $value;
 	}
 
 	/**
@@ -267,15 +267,15 @@ 
 	 * @param string $key   Header name.
 	 * @param string $value Header value, or list of values.
 	 */
-	public function add_header( $key, $value ) {
-		$key = $this->canonicalize_header_name( $key );
+	public function add_header($key, $value) {
+		$key = $this->canonicalize_header_name($key);
 		$value = (array) $value;
 
-		if ( ! isset( $this->headers[ $key ] ) ) {
-			$this->headers[ $key ] = array();
+		if ( ! isset($this->headers[$key])) {
+			$this->headers[$key] = array();
 		}
 
-		$this->headers[ $key ] = array_merge( $this->headers[ $key ], $value );
+		$this->headers[$key] = array_merge($this->headers[$key], $value);
 	}
 
 	/**
@@ -286,8 +286,8 @@ 
 	 *
 	 * @param string $key Header name.
 	 */
-	public function remove_header( $key ) {
-		unset( $this->headers[ $key ] );
+	public function remove_header($key) {
+		unset($this->headers[$key]);
 	}
 
 	/**
@@ -299,13 +299,13 @@ 
 	 * @param array $headers  Map of header name to value.
 	 * @param bool  $override If true, replace the request's headers. Otherwise, merge with existing.
 	 */
-	public function set_headers( $headers, $override = true ) {
-		if ( true === $override ) {
+	public function set_headers($headers, $override = true) {
+		if (true === $override) {
 			$this->headers = array();
 		}
 
-		foreach ( $headers as $key => $value ) {
-			$this->set_header( $key, $value );
+		foreach ($headers as $key => $value) {
+			$this->set_header($key, $value);
 		}
 	}
 
@@ -318,26 +318,26 @@ 
 	 * @return array Map containing 'value' and 'parameters' keys.
 	 */
 	public function get_content_type() {
-		$value = $this->get_header( 'content-type' );
-		if ( empty( $value ) ) {
+		$value = $this->get_header('content-type');
+		if (empty($value)) {
 			return null;
 		}
 
 		$parameters = '';
-		if ( strpos( $value, ';' ) ) {
-			list( $value, $parameters ) = explode( ';', $value, 2 );
+		if (strpos($value, ';')) {
+			list($value, $parameters) = explode(';', $value, 2);
 		}
 
-		$value = strtolower( $value );
-		if ( strpos( $value, '/' ) === false ) {
+		$value = strtolower($value);
+		if (strpos($value, '/') === false) {
 			return null;
 		}
 
 		// Parse type and subtype out.
-		list( $type, $subtype ) = explode( '/', $value, 2 );
+		list($type, $subtype) = explode('/', $value, 2);
 
-		$data = compact( 'value', 'type', 'subtype', 'parameters' );
-		$data = array_map( 'trim', $data );
+		$data = compact('value', 'type', 'subtype', 'parameters');
+		$data = array_map('trim', $data);
 
 		return $data;
 	}
@@ -360,12 +360,12 @@ 
 
 		// Ensure we parse the body data.
 		$body = $this->get_body();
-		if ( $this->method !== 'POST' && ! empty( $body ) ) {
+		if ($this->method !== 'POST' && ! empty($body)) {
 			$this->parse_body_params();
 		}
 
-		$accepts_body_data = array( 'POST', 'PUT', 'PATCH' );
-		if ( in_array( $this->method, $accepts_body_data ) ) {
+		$accepts_body_data = array('POST', 'PUT', 'PATCH');
+		if (in_array($this->method, $accepts_body_data)) {
 			$order[] = 'POST';
 		}
 
@@ -388,7 +388,7 @@ 
 		 * }
 		 * @param WP_REST_Request $this The request object.
 		 */
-		return apply_filters( 'rest_request_parameter_order', $order, $this );
+		return apply_filters('rest_request_parameter_order', $order, $this);
 	}
 
 	/**
@@ -400,13 +400,13 @@ 
 	 * @param string $key Parameter name.
 	 * @return mixed|null Value if set, null otherwise.
 	 */
-	public function get_param( $key ) {
+	public function get_param($key) {
 		$order = $this->get_parameter_order();
 
-		foreach ( $order as $type ) {
+		foreach ($order as $type) {
 			// Determine if we have the parameter for this type.
-			if ( isset( $this->params[ $type ][ $key ] ) ) {
-				return $this->params[ $type ][ $key ];
+			if (isset($this->params[$type][$key])) {
+				return $this->params[$type][$key];
 			}
 		}
 
@@ -422,14 +422,14 @@ 
 	 * @param string $key   Parameter name.
 	 * @param mixed  $value Parameter value.
 	 */
-	public function set_param( $key, $value ) {
-		switch ( $this->method ) {
+	public function set_param($key, $value) {
+		switch ($this->method) {
 			case 'POST':
-				$this->params['POST'][ $key ] = $value;
+				$this->params['POST'][$key] = $value;
 				break;
 
 			default:
-				$this->params['GET'][ $key ] = $value;
+				$this->params['GET'][$key] = $value;
 				break;
 		}
 	}
@@ -447,11 +447,11 @@ 
 	 */
 	public function get_params() {
 		$order = $this->get_parameter_order();
-		$order = array_reverse( $order, true );
+		$order = array_reverse($order, true);
 
 		$params = array();
-		foreach ( $order as $type ) {
-			$params = array_merge( $params, (array) $this->params[ $type ] );
+		foreach ($order as $type) {
+			$params = array_merge($params, (array) $this->params[$type]);
 		}
 
 		return $params;
@@ -481,7 +481,7 @@ 
 	 *
 	 * @param array $params Parameter map of key to value.
 	 */
-	public function set_url_params( $params ) {
+	public function set_url_params($params) {
 		$this->params['URL'] = $params;
 	}
 
@@ -509,7 +509,7 @@ 
 	 *
 	 * @param array $params Parameter map of key to value.
 	 */
-	public function set_query_params( $params ) {
+	public function set_query_params($params) {
 		$this->params['GET'] = $params;
 	}
 
@@ -537,7 +537,7 @@ 
 	 *
 	 * @param array $params Parameter map of key to value.
 	 */
-	public function set_body_params( $params ) {
+	public function set_body_params($params) {
 		$this->params['POST'] = $params;
 	}
 
@@ -565,7 +565,7 @@ 
 	 *
 	 * @param array $params Parameter map of key to value.
 	 */
-	public function set_file_params( $params ) {
+	public function set_file_params($params) {
 		$this->params['FILES'] = $params;
 	}
 
@@ -593,7 +593,7 @@ 
 	 *
 	 * @param array $params Parameter map of key to value.
 	 */
-	public function set_default_params( $params ) {
+	public function set_default_params($params) {
 		$this->params['defaults'] = $params;
 	}
 
@@ -617,7 +617,7 @@ 
 	 *
 	 * @param string $data Binary data from the request body.
 	 */
-	public function set_body( $data ) {
+	public function set_body($data) {
 		$this->body = $data;
 
 		// Enable lazy parsing.
@@ -650,7 +650,7 @@ 
 	 * @access protected
 	 */
 	protected function parse_json_params() {
-		if ( $this->parsed_json ) {
+		if ($this->parsed_json) {
 			return;
 		}
 
@@ -659,11 +659,11 @@ 
 		// Check that we actually got JSON.
 		$content_type = $this->get_content_type();
 
-		if ( empty( $content_type ) || 'application/json' !== $content_type['value'] ) {
+		if (empty($content_type) || 'application/json' !== $content_type['value']) {
 			return;
 		}
 
-		$params = json_decode( $this->get_body(), true );
+		$params = json_decode($this->get_body(), true);
 
 		/*
 		 * Check for a parsing error.
@@ -671,7 +671,7 @@ 
 		 * Note that due to WP's JSON compatibility functions, json_last_error
 		 * might not be defined: https://core.trac.wordpress.org/ticket/27799
 		 */
-		if ( null === $params && ( ! function_exists( 'json_last_error' ) || JSON_ERROR_NONE !== json_last_error() ) ) {
+		if (null === $params && ( ! function_exists('json_last_error') || JSON_ERROR_NONE !== json_last_error())) {
 			return;
 		}
 
@@ -688,7 +688,7 @@ 
 	 * @access protected
 	 */
 	protected function parse_body_params() {
-		if ( $this->parsed_body ) {
+		if ($this->parsed_body) {
 			return;
 		}
 
@@ -700,26 +700,26 @@ 
 		 */
 		$content_type = $this->get_content_type();
 
-		if ( ! empty( $content_type ) && 'application/x-www-form-urlencoded' !== $content_type['value'] ) {
+		if ( ! empty($content_type) && 'application/x-www-form-urlencoded' !== $content_type['value']) {
 			return;
 		}
 
-		parse_str( $this->get_body(), $params );
+		parse_str($this->get_body(), $params);
 
 		/*
 		 * Amazingly, parse_str follows magic quote rules. Sigh.
 		 *
 		 * NOTE: Do not refactor to use `wp_unslash`.
 		 */
-		if ( get_magic_quotes_gpc() ) {
-			$params = stripslashes_deep( $params );
+		if (get_magic_quotes_gpc()) {
+			$params = stripslashes_deep($params);
 		}
 
 		/*
 		 * Add to the POST parameters stored internally. If a user has already
 		 * set these manually (via `set_body_params`), don't override them.
 		 */
-		$this->params['POST'] = array_merge( $params, $this->params['POST'] );
+		$this->params['POST'] = array_merge($params, $this->params['POST']);
 	}
 
 	/**
@@ -742,7 +742,7 @@ 
 	 *
 	 * @param string $route Route matching regex.
 	 */
-	public function set_route( $route ) {
+	public function set_route($route) {
 		$this->route = $route;
 	}
 
@@ -768,7 +768,7 @@ 
 	 *
 	 * @param array $attributes Attributes for the request.
 	 */
-	public function set_attributes( $attributes ) {
+	public function set_attributes($attributes) {
 		$this->attributes = $attributes;
 	}
 
@@ -788,20 +788,20 @@ 
 		$attributes = $this->get_attributes();
 
 		// No arguments set, skip sanitizing.
-		if ( empty( $attributes['args'] ) ) {
+		if (empty($attributes['args'])) {
 			return true;
 		}
 
 		$order = $this->get_parameter_order();
 
-		foreach ( $order as $type ) {
-			if ( empty( $this->params[ $type ] ) ) {
+		foreach ($order as $type) {
+			if (empty($this->params[$type])) {
 				continue;
 			}
-			foreach ( $this->params[ $type ] as $key => $value ) {
+			foreach ($this->params[$type] as $key => $value) {
 				// Check if this param has a sanitize_callback added.
-				if ( isset( $attributes['args'][ $key ] ) && ! empty( $attributes['args'][ $key ]['sanitize_callback'] ) ) {
-					$this->params[ $type ][ $key ] = call_user_func( $attributes['args'][ $key ]['sanitize_callback'], $value, $this, $key );
+				if (isset($attributes['args'][$key]) && ! empty($attributes['args'][$key]['sanitize_callback'])) {
+					$this->params[$type][$key] = call_user_func($attributes['args'][$key]['sanitize_callback'], $value, $this, $key);
 				}
 			}
 		}
@@ -823,20 +823,20 @@ 
 		$required = array();
 
 		// No arguments set, skip validation.
-		if ( empty( $attributes['args'] ) ) {
+		if (empty($attributes['args'])) {
 			return true;
 		}
 
-		foreach ( $attributes['args'] as $key => $arg ) {
+		foreach ($attributes['args'] as $key => $arg) {
 
-			$param = $this->get_param( $key );
-			if ( isset( $arg['required'] ) && true === $arg['required'] && null === $param ) {
+			$param = $this->get_param($key);
+			if (isset($arg['required']) && true === $arg['required'] && null === $param) {
 				$required[] = $key;
 			}
 		}
 
-		if ( ! empty( $required ) ) {
-			return new WP_Error( 'rest_missing_callback_param', sprintf( __( 'Missing parameter(s): %s' ), implode( ', ', $required ) ), array( 'status' => 400, 'params' => $required ) );
+		if ( ! empty($required)) {
+			return new WP_Error('rest_missing_callback_param', sprintf(__('Missing parameter(s): %s'), implode(', ', $required)), array('status' => 400, 'params' => $required));
 		}
 
 		/*
@@ -846,25 +846,25 @@ 
 		 */
 		$invalid_params = array();
 
-		foreach ( $attributes['args'] as $key => $arg ) {
+		foreach ($attributes['args'] as $key => $arg) {
 
-			$param = $this->get_param( $key );
+			$param = $this->get_param($key);
 
-			if ( null !== $param && ! empty( $arg['validate_callback'] ) ) {
-				$valid_check = call_user_func( $arg['validate_callback'], $param, $this, $key );
+			if (null !== $param && ! empty($arg['validate_callback'])) {
+				$valid_check = call_user_func($arg['validate_callback'], $param, $this, $key);
 
-				if ( false === $valid_check ) {
-					$invalid_params[ $key ] = __( 'Invalid parameter.' );
+				if (false === $valid_check) {
+					$invalid_params[$key] = __('Invalid parameter.');
 				}
 
-				if ( is_wp_error( $valid_check ) ) {
-					$invalid_params[ $key ] = $valid_check->get_error_message();
+				if (is_wp_error($valid_check)) {
+					$invalid_params[$key] = $valid_check->get_error_message();
 				}
 			}
 		}
 
-		if ( $invalid_params ) {
-			return new WP_Error( 'rest_invalid_param', sprintf( __( 'Invalid parameter(s): %s' ), implode( ', ', array_keys( $invalid_params ) ) ), array( 'status' => 400, 'params' => $invalid_params ) );
+		if ($invalid_params) {
+			return new WP_Error('rest_invalid_param', sprintf(__('Invalid parameter(s): %s'), implode(', ', array_keys($invalid_params))), array('status' => 400, 'params' => $invalid_params));
 		}
 
 		return true;
@@ -880,11 +880,11 @@ 
 	 * @param string $offset Parameter name.
 	 * @return bool Whether the parameter is set.
 	 */
-	public function offsetExists( $offset ) {
+	public function offsetExists($offset) {
 		$order = $this->get_parameter_order();
 
-		foreach ( $order as $type ) {
-			if ( isset( $this->params[ $type ][ $offset ] ) ) {
+		foreach ($order as $type) {
+			if (isset($this->params[$type][$offset])) {
 				return true;
 			}
 		}
@@ -901,8 +901,8 @@ 
 	 * @param string $offset Parameter name.
 	 * @return mixed|null Value if set, null otherwise.
 	 */
-	public function offsetGet( $offset ) {
-		return $this->get_param( $offset );
+	public function offsetGet($offset) {
+		return $this->get_param($offset);
 	}
 
 	/**
@@ -914,8 +914,8 @@ 
 	 * @param string $offset Parameter name.
 	 * @param mixed  $value  Parameter value.
 	 */
-	public function offsetSet( $offset, $value ) {
-		$this->set_param( $offset, $value );
+	public function offsetSet($offset, $value) {
+		$this->set_param($offset, $value);
 	}
 
 	/**
@@ -926,12 +926,12 @@ 
 	 *
 	 * @param string $offset Parameter name.
 	 */
-	public function offsetUnset( $offset ) {
+	public function offsetUnset($offset) {
 		$order = $this->get_parameter_order();
 
 		// Remove the offset from every group.
-		foreach ( $order as $type ) {
-			unset( $this->params[ $type ][ $offset ] );
+		foreach ($order as $type) {
+			unset($this->params[$type][$offset]);
 		}
 	}
 
@@ -945,29 +945,29 @@ 
 	 * @param string $url URL with protocol, domain, path and query args.
 	 * @return WP_REST_Request|false WP_REST_Request object on success, false on failure.
 	 */
-	public static function from_url( $url ) {
-		$bits = parse_url( $url );
+	public static function from_url($url) {
+		$bits = parse_url($url);
 		$query_params = array();
 
-		if ( ! empty( $bits['query'] ) ) {
-			wp_parse_str( $bits['query'], $query_params );
+		if ( ! empty($bits['query'])) {
+			wp_parse_str($bits['query'], $query_params);
 		}
 
 		$api_root = rest_url();
-		if ( get_option( 'permalink_structure' ) && 0 === strpos( $url, $api_root ) ) {
+		if (get_option('permalink_structure') && 0 === strpos($url, $api_root)) {
 			// Pretty permalinks on, and URL is under the API root
-			$api_url_part = substr( $url, strlen( untrailingslashit( $api_root ) ) );
-			$route = parse_url( $api_url_part, PHP_URL_PATH );
-		} elseif ( ! empty( $query_params['rest_route'] ) ) {
+			$api_url_part = substr($url, strlen(untrailingslashit($api_root)));
+			$route = parse_url($api_url_part, PHP_URL_PATH);
+		} elseif ( ! empty($query_params['rest_route'])) {
 			// ?rest_route=... set directly
 			$route = $query_params['rest_route'];
-			unset( $query_params['rest_route'] );
+			unset($query_params['rest_route']);
 		}
 
 		$request = false;
-		if ( ! empty( $route ) ) {
-			$request = new WP_REST_Request( 'GET', $route );
-			$request->set_query_params( $query_params );
+		if ( ! empty($route)) {
+			$request = new WP_REST_Request('GET', $route);
+			$request->set_query_params($query_params);
 		}
 
 		/**
@@ -979,6 +979,6 @@ 
 		 *                                       could not be parsed.
 		 * @param string                $url     URL the request was generated from.
 		 */
-		return apply_filters( 'rest_request_from_url', $request, $url );
+		return apply_filters('rest_request_from_url', $request, $url);
 	}
 }

src/wp-includes/rest-api/class-wp-rest-server.php

Doc Comments +1 added lines, -1 removed lines

@@ -907,7 +907,7 @@
 	 * @since 4.4.0
 	 * @access protected
 	 *
-	 * @return bool|string Boolean false or string error message.
+	 * @return false|string Boolean false or string error message.
 	 */
 	protected function get_json_last_error() {
 		// See https://core.trac.wordpress.org/ticket/27799.

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * REST API: WP_REST_Server class
- *
- * @package WordPress
- * @subpackage REST_API
- * @since 4.4.0
- */
+	 * REST API: WP_REST_Server class
+	 *
+	 * @package WordPress
+	 * @subpackage REST_API
+	 * @since 4.4.0
+	 */
 
 /**
  * Core class used to implement the WordPress REST API server.

Spacing +245 added lines, -245 removed lines

@@ -91,7 +91,7 @@ 
 		$this->endpoints = array(
 			// Meta endpoints.
 			'/' => array(
-				'callback' => array( $this, 'get_index' ),
+				'callback' => array($this, 'get_index'),
 				'methods' => 'GET',
 				'args' => array(
 					'context' => array(
@@ -137,7 +137,7 @@ 
 		 * @param WP_Error|null|bool WP_Error if authentication error, null if authentication
 		 *                              method wasn't used, true if authentication succeeded.
 		 */
-		return apply_filters( 'rest_authentication_errors', null );
+		return apply_filters('rest_authentication_errors', null);
 	}
 
 	/**
@@ -153,10 +153,10 @@ 
 	 * @param WP_Error $error WP_Error instance.
 	 * @return WP_REST_Response List of associative arrays with code and message keys.
 	 */
-	protected function error_to_response( $error ) {
+	protected function error_to_response($error) {
 		$error_data = $error->get_error_data();
 
-		if ( is_array( $error_data ) && isset( $error_data['status'] ) ) {
+		if (is_array($error_data) && isset($error_data['status'])) {
 			$status = $error_data['status'];
 		} else {
 			$status = 500;
@@ -164,20 +164,20 @@ 
 
 		$errors = array();
 
-		foreach ( (array) $error->errors as $code => $messages ) {
-			foreach ( (array) $messages as $message ) {
-				$errors[] = array( 'code' => $code, 'message' => $message, 'data' => $error->get_error_data( $code ) );
+		foreach ((array) $error->errors as $code => $messages) {
+			foreach ((array) $messages as $message) {
+				$errors[] = array('code' => $code, 'message' => $message, 'data' => $error->get_error_data($code));
 			}
 		}
 
 		$data = $errors[0];
-		if ( count( $errors ) > 1 ) {
+		if (count($errors) > 1) {
 			// Remove the primary error.
-			array_shift( $errors );
+			array_shift($errors);
 			$data['additional_errors'] = $errors;
 		}
 
-		$response = new WP_REST_Response( $data, $status );
+		$response = new WP_REST_Response($data, $status);
 
 		return $response;
 	}
@@ -198,14 +198,14 @@ 
 	 * @param int    $status  Optional. HTTP status code to send. Default null.
 	 * @return string JSON representation of the error
 	 */
-	protected function json_error( $code, $message, $status = null ) {
-		if ( $status ) {
-			$this->set_status( $status );
+	protected function json_error($code, $message, $status = null) {
+		if ($status) {
+			$this->set_status($status);
 		}
 
-		$error = compact( 'code', 'message' );
+		$error = compact('code', 'message');
 
-		return wp_json_encode( $error );
+		return wp_json_encode($error);
 	}
 
 	/**
@@ -223,18 +223,18 @@ 
 	 *                     Default null.
 	 * @return false|null Null if not served and a HEAD request, false otherwise.
 	 */
-	public function serve_request( $path = null ) {
-		$content_type = isset( $_GET['_jsonp'] ) ? 'application/javascript' : 'application/json';
-		$this->send_header( 'Content-Type', $content_type . '; charset=' . get_option( 'blog_charset' ) );
+	public function serve_request($path = null) {
+		$content_type = isset($_GET['_jsonp']) ? 'application/javascript' : 'application/json';
+		$this->send_header('Content-Type', $content_type.'; charset='.get_option('blog_charset'));
 
 		/*
 		 * Mitigate possible JSONP Flash attacks.
 		 *
 		 * http://miki.it/blog/2014/7/8/abusing-jsonp-with-rosetta-flash/
 		 */
-		$this->send_header( 'X-Content-Type-Options', 'nosniff' );
-		$this->send_header( 'Access-Control-Expose-Headers', 'X-WP-Total, X-WP-TotalPages' );
-		$this->send_header( 'Access-Control-Allow-Headers', 'Authorization' );
+		$this->send_header('X-Content-Type-Options', 'nosniff');
+		$this->send_header('Access-Control-Expose-Headers', 'X-WP-Total, X-WP-TotalPages');
+		$this->send_header('Access-Control-Allow-Headers', 'Authorization');
 
 		/**
 		 * Send nocache headers on authenticated requests.
@@ -243,10 +243,10 @@ 
 		 *
 		 * @param bool $rest_send_nocache_headers Whether to send no-cache headers.
 		 */
-		$send_no_cache_headers = apply_filters( 'rest_send_nocache_headers', is_user_logged_in() );
-		if ( $send_no_cache_headers ) {
-			foreach ( wp_get_nocache_headers() as $header => $header_value ) {
-				$this->send_header( $header, $header_value );
+		$send_no_cache_headers = apply_filters('rest_send_nocache_headers', is_user_logged_in());
+		if ($send_no_cache_headers) {
+			foreach (wp_get_nocache_headers() as $header => $header_value) {
+				$this->send_header($header, $header_value);
 			}
 		}
 
@@ -257,7 +257,7 @@ 
 		 *
 		 * @param bool $rest_enabled Whether the REST API is enabled. Default true.
 		 */
-		$enabled = apply_filters( 'rest_enabled', true );
+		$enabled = apply_filters('rest_enabled', true);
 
 		/**
 		 * Filter whether jsonp is enabled.
@@ -266,72 +266,72 @@ 
 		 *
 		 * @param bool $jsonp_enabled Whether jsonp is enabled. Default true.
 		 */
-		$jsonp_enabled = apply_filters( 'rest_jsonp_enabled', true );
+		$jsonp_enabled = apply_filters('rest_jsonp_enabled', true);
 
 		$jsonp_callback = null;
 
-		if ( ! $enabled ) {
-			echo $this->json_error( 'rest_disabled', __( 'The REST API is disabled on this site.' ), 404 );
+		if ( ! $enabled) {
+			echo $this->json_error('rest_disabled', __('The REST API is disabled on this site.'), 404);
 			return false;
 		}
-		if ( isset( $_GET['_jsonp'] ) ) {
-			if ( ! $jsonp_enabled ) {
-				echo $this->json_error( 'rest_callback_disabled', __( 'JSONP support is disabled on this site.' ), 400 );
+		if (isset($_GET['_jsonp'])) {
+			if ( ! $jsonp_enabled) {
+				echo $this->json_error('rest_callback_disabled', __('JSONP support is disabled on this site.'), 400);
 				return false;
 			}
 
 			// Check for invalid characters (only alphanumeric allowed).
-			if ( is_string( $_GET['_jsonp'] ) ) {
-				$jsonp_callback = preg_replace( '/[^\w\.]/', '', wp_unslash( $_GET['_jsonp'] ), -1, $illegal_char_count );
-				if ( 0 !== $illegal_char_count ) {
+			if (is_string($_GET['_jsonp'])) {
+				$jsonp_callback = preg_replace('/[^\w\.]/', '', wp_unslash($_GET['_jsonp']), -1, $illegal_char_count);
+				if (0 !== $illegal_char_count) {
 					$jsonp_callback = null;
 				}
 			}
-			if ( null === $jsonp_callback ) {
-				echo $this->json_error( 'rest_callback_invalid', __( 'The JSONP callback function is invalid.' ), 400 );
+			if (null === $jsonp_callback) {
+				echo $this->json_error('rest_callback_invalid', __('The JSONP callback function is invalid.'), 400);
 				return false;
 			}
 		}
 
-		if ( empty( $path ) ) {
-			if ( isset( $_SERVER['PATH_INFO'] ) ) {
+		if (empty($path)) {
+			if (isset($_SERVER['PATH_INFO'])) {
 				$path = $_SERVER['PATH_INFO'];
 			} else {
 				$path = '/';
 			}
 		}
 
-		$request = new WP_REST_Request( $_SERVER['REQUEST_METHOD'], $path );
+		$request = new WP_REST_Request($_SERVER['REQUEST_METHOD'], $path);
 
-		$request->set_query_params( $_GET );
-		$request->set_body_params( $_POST );
-		$request->set_file_params( $_FILES );
-		$request->set_headers( $this->get_headers( $_SERVER ) );
-		$request->set_body( $this->get_raw_data() );
+		$request->set_query_params($_GET);
+		$request->set_body_params($_POST);
+		$request->set_file_params($_FILES);
+		$request->set_headers($this->get_headers($_SERVER));
+		$request->set_body($this->get_raw_data());
 
 		/*
 		 * HTTP method override for clients that can't use PUT/PATCH/DELETE. First, we check
 		 * $_GET['_method']. If that is not set, we check for the HTTP_X_HTTP_METHOD_OVERRIDE
 		 * header.
 		 */
-		if ( isset( $_GET['_method'] ) ) {
-			$request->set_method( $_GET['_method'] );
-		} elseif ( isset( $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'] ) ) {
-			$request->set_method( $_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'] );
+		if (isset($_GET['_method'])) {
+			$request->set_method($_GET['_method']);
+		} elseif (isset($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE'])) {
+			$request->set_method($_SERVER['HTTP_X_HTTP_METHOD_OVERRIDE']);
 		}
 
 		$result = $this->check_authentication();
 
-		if ( ! is_wp_error( $result ) ) {
-			$result = $this->dispatch( $request );
+		if ( ! is_wp_error($result)) {
+			$result = $this->dispatch($request);
 		}
 
 		// Normalize to either WP_Error or WP_REST_Response...
-		$result = rest_ensure_response( $result );
+		$result = rest_ensure_response($result);
 
 		// ...then convert WP_Error across.
-		if ( is_wp_error( $result ) ) {
-			$result = $this->error_to_response( $result );
+		if (is_wp_error($result)) {
+			$result = $this->error_to_response($result);
 		}
 
 		/**
@@ -346,19 +346,19 @@ 
 		 * @param WP_REST_Server   $this    Server instance.
 		 * @param WP_REST_Request  $request Request used to generate the response.
 		 */
-		$result = apply_filters( 'rest_post_dispatch', rest_ensure_response( $result ), $this, $request );
+		$result = apply_filters('rest_post_dispatch', rest_ensure_response($result), $this, $request);
 
 		// Wrap the response in an envelope if asked for.
-		if ( isset( $_GET['_envelope'] ) ) {
-			$result = $this->envelope_response( $result, isset( $_GET['_embed'] ) );
+		if (isset($_GET['_envelope'])) {
+			$result = $this->envelope_response($result, isset($_GET['_embed']));
 		}
 
 		// Send extra data from response objects.
 		$headers = $result->get_headers();
-		$this->send_headers( $headers );
+		$this->send_headers($headers);
 
 		$code = $result->get_status();
-		$this->set_status( $code );
+		$this->set_status($code);
 
 		/**
 		 * Filter whether the request has already been served.
@@ -374,29 +374,29 @@ 
 		 * @param WP_REST_Request  $request Request used to generate the response.
 		 * @param WP_REST_Server   $this    Server instance.
 		 */
-		$served = apply_filters( 'rest_pre_serve_request', false, $result, $request, $this );
+		$served = apply_filters('rest_pre_serve_request', false, $result, $request, $this);
 
-		if ( ! $served ) {
-			if ( 'HEAD' === $request->get_method() ) {
+		if ( ! $served) {
+			if ('HEAD' === $request->get_method()) {
 				return null;
 			}
 
 			// Embed links inside the request.
-			$result = $this->response_to_data( $result, isset( $_GET['_embed'] ) );
+			$result = $this->response_to_data($result, isset($_GET['_embed']));
 
-			$result = wp_json_encode( $result );
+			$result = wp_json_encode($result);
 
 			$json_error_message = $this->get_json_last_error();
-			if ( $json_error_message ) {
-				$json_error_obj = new WP_Error( 'rest_encode_error', $json_error_message, array( 'status' => 500 ) );
-				$result = $this->error_to_response( $json_error_obj );
-				$result = wp_json_encode( $result->data[0] );
+			if ($json_error_message) {
+				$json_error_obj = new WP_Error('rest_encode_error', $json_error_message, array('status' => 500));
+				$result = $this->error_to_response($json_error_obj);
+				$result = wp_json_encode($result->data[0]);
 			}
 
-			if ( $jsonp_callback ) {
+			if ($jsonp_callback) {
 				// Prepend '/**/' to mitigate possible JSONP Flash attacks
 				// http://miki.it/blog/2014/7/8/abusing-jsonp-with-rosetta-flash/
-				echo '/**/' . $jsonp_callback . '(' . $result . ')';
+				echo '/**/'.$jsonp_callback.'('.$result.')';
 			} else {
 				echo $result;
 			}
@@ -419,20 +419,20 @@ 
 	 *     @type array [$_embedded] Embeddeds.
 	 * }
 	 */
-	public function response_to_data( $response, $embed ) {
+	public function response_to_data($response, $embed) {
 		$data  = $response->get_data();
-		$links = $this->get_response_links( $response );
+		$links = $this->get_response_links($response);
 
-		if ( ! empty( $links ) ) {
+		if ( ! empty($links)) {
 			// Convert links to part of the data.
 			$data['_links'] = $links;
 		}
-		if ( $embed ) {
+		if ($embed) {
 			// Determine if this is a numeric array.
-			if ( wp_is_numeric_array( $data ) ) {
-				$data = array_map( array( $this, 'embed_links' ), $data );
+			if (wp_is_numeric_array($data)) {
+				$data = array_map(array($this, 'embed_links'), $data);
 			} else {
-				$data = $this->embed_links( $data );
+				$data = $this->embed_links($data);
 			}
 		}
 
@@ -452,10 +452,10 @@ 
 	 * @param WP_REST_Response $response Response to extract links from.
 	 * @return array Map of link relation to list of link hashes.
 	 */
-	public static function get_response_links( $response ) {
+	public static function get_response_links($response) {
 		$links = $response->get_links();
 
-		if ( empty( $links ) ) {
+		if (empty($links)) {
 			return array();
 		}
 
@@ -464,37 +464,37 @@ 
 		$curies = $response->get_curies();
 		$used_curies = array();
 
-		foreach ( $links as $rel => $items ) {
+		foreach ($links as $rel => $items) {
 
 			// Convert $rel URIs to their compact versions if they exist.
-			foreach ( $curies as $curie ) {
-				$href_prefix = substr( $curie['href'], 0, strpos( $curie['href'], '{rel}' ) );
-				if ( strpos( $rel, $href_prefix ) !== 0 ) {
+			foreach ($curies as $curie) {
+				$href_prefix = substr($curie['href'], 0, strpos($curie['href'], '{rel}'));
+				if (strpos($rel, $href_prefix) !== 0) {
 					continue;
 				}
-				$used_curies[ $curie['name'] ] = $curie;
+				$used_curies[$curie['name']] = $curie;
 
 				// Relation now changes from '$uri' to '$curie:$relation'
-				$rel_regex = str_replace( '\{rel\}', '([\w]+)', preg_quote( $curie['href'], '!' ) );
-				preg_match( '!' . $rel_regex . '!', $rel, $matches );
-				if ( $matches ) {
-					$rel = $curie['name'] . ':' . $matches[1];
+				$rel_regex = str_replace('\{rel\}', '([\w]+)', preg_quote($curie['href'], '!'));
+				preg_match('!'.$rel_regex.'!', $rel, $matches);
+				if ($matches) {
+					$rel = $curie['name'].':'.$matches[1];
 				}
 				break;
 			}
 
-			$data[ $rel ] = array();
+			$data[$rel] = array();
 
-			foreach ( $items as $item ) {
+			foreach ($items as $item) {
 				$attributes = $item['attributes'];
 				$attributes['href'] = $item['href'];
-				$data[ $rel ][] = $attributes;
+				$data[$rel][] = $attributes;
 			}
 		}
 
 		// Push the curies onto the start of the links array.
-		if ( $used_curies ) {
-			$data = array_merge( array( 'curies' => array_values( $used_curies ) ), $data );
+		if ($used_curies) {
+			$data = array_merge(array('curies' => array_values($used_curies)), $data);
 		}
 
 		return $data;
@@ -514,57 +514,57 @@ 
 	 *     @type array [$_embedded] Embeddeds.
 	 * }
 	 */
-	protected function embed_links( $data ) {
-		if ( empty( $data['_links'] ) ) {
+	protected function embed_links($data) {
+		if (empty($data['_links'])) {
 			return $data;
 		}
 
 		$embedded = array();
 
-		foreach ( $data['_links'] as $rel => $links ) {
+		foreach ($data['_links'] as $rel => $links) {
 			// Ignore links to self, for obvious reasons.
-			if ( 'self' === $rel ) {
+			if ('self' === $rel) {
 				continue;
 			}
 
 			$embeds = array();
 
-			foreach ( $links as $item ) {
+			foreach ($links as $item) {
 				// Determine if the link is embeddable.
-				if ( empty( $item['embeddable'] ) ) {
+				if (empty($item['embeddable'])) {
 					// Ensure we keep the same order.
 					$embeds[] = array();
 					continue;
 				}
 
 				// Run through our internal routing and serve.
-				$request = WP_REST_Request::from_url( $item['href'] );
-				if ( ! $request ) {
+				$request = WP_REST_Request::from_url($item['href']);
+				if ( ! $request) {
 					$embeds[] = array();
 					continue;
 				}
 
 				// Embedded resources get passed context=embed.
-				if ( empty( $request['context'] ) ) {
+				if (empty($request['context'])) {
 					$request['context'] = 'embed';
 				}
 
-				$response = $this->dispatch( $request );
+				$response = $this->dispatch($request);
 
 				/** This filter is documented in wp-includes/rest-api/class-wp-rest-server.php */
-				$response = apply_filters( 'rest_post_dispatch', rest_ensure_response( $response ), $this, $request );
+				$response = apply_filters('rest_post_dispatch', rest_ensure_response($response), $this, $request);
 
-				$embeds[] = $this->response_to_data( $response, false );
+				$embeds[] = $this->response_to_data($response, false);
 			}
 
 			// Determine if any real links were found.
-			$has_links = count( array_filter( $embeds ) );
-			if ( $has_links ) {
-				$embedded[ $rel ] = $embeds;
+			$has_links = count(array_filter($embeds));
+			if ($has_links) {
+				$embedded[$rel] = $embeds;
 			}
 		}
 
-		if ( ! empty( $embedded ) ) {
+		if ( ! empty($embedded)) {
 			$data['_embedded'] = $embedded;
 		}
 
@@ -585,9 +585,9 @@ 
 	 * @param bool             $embed    Whether links should be embedded.
 	 * @return WP_REST_Response New response with wrapped data
 	 */
-	public function envelope_response( $response, $embed ) {
+	public function envelope_response($response, $embed) {
 		$envelope = array(
-			'body'    => $this->response_to_data( $response, $embed ),
+			'body'    => $this->response_to_data($response, $embed),
 			'status'  => $response->get_status(),
 			'headers' => $response->get_headers(),
 		);
@@ -600,10 +600,10 @@ 
 		 * @param array            $envelope Envelope data.
 		 * @param WP_REST_Response $response Original response data.
 		 */
-		$envelope = apply_filters( 'rest_envelope_response', $envelope, $response );
+		$envelope = apply_filters('rest_envelope_response', $envelope, $response);
 
 		// Ensure it's still a response and return.
-		return rest_ensure_response( $envelope );
+		return rest_ensure_response($envelope);
 	}
 
 	/**
@@ -618,14 +618,14 @@ 
 	 * @param bool   $override   Optional. Whether the route should be overriden if it already exists.
 	 *                           Default false.
 	 */
-	public function register_route( $namespace, $route, $route_args, $override = false ) {
-		if ( ! isset( $this->namespaces[ $namespace ] ) ) {
-			$this->namespaces[ $namespace ] = array();
+	public function register_route($namespace, $route, $route_args, $override = false) {
+		if ( ! isset($this->namespaces[$namespace])) {
+			$this->namespaces[$namespace] = array();
 
-			$this->register_route( $namespace, '/' . $namespace, array(
+			$this->register_route($namespace, '/'.$namespace, array(
 				array(
 					'methods' => self::READABLE,
-					'callback' => array( $this, 'get_namespace_index' ),
+					'callback' => array($this, 'get_namespace_index'),
 					'args' => array(
 						'namespace' => array(
 							'default' => $namespace,
@@ -635,17 +635,17 @@ 
 						),
 					),
 				),
-			) );
+			));
 		}
 
 		// Associative to avoid double-registration.
-		$this->namespaces[ $namespace ][ $route ] = true;
+		$this->namespaces[$namespace][$route] = true;
 		$route_args['namespace'] = $namespace;
 
-		if ( $override || empty( $this->endpoints[ $route ] ) ) {
-			$this->endpoints[ $route ] = $route_args;
+		if ($override || empty($this->endpoints[$route])) {
+			$this->endpoints[$route] = $route_args;
 		} else {
-			$this->endpoints[ $route ] = array_merge( $this->endpoints[ $route ], $route_args );
+			$this->endpoints[$route] = array_merge($this->endpoints[$route], $route_args);
 		}
 	}
 
@@ -682,7 +682,7 @@ 
 		 *                         `'/path/regex' => array( $callback, $bitmask )` or
 		 *                         `'/path/regex' => array( array( $callback, $bitmask ).
 		 */
-		$endpoints = apply_filters( 'rest_endpoints', $this->endpoints );
+		$endpoints = apply_filters('rest_endpoints', $this->endpoints);
 
 		// Normalise the endpoints.
 		$defaults = array(
@@ -693,32 +693,32 @@ 
 			'args'          => array(),
 		);
 
-		foreach ( $endpoints as $route => &$handlers ) {
+		foreach ($endpoints as $route => &$handlers) {
 
-			if ( isset( $handlers['callback'] ) ) {
+			if (isset($handlers['callback'])) {
 				// Single endpoint, add one deeper.
-				$handlers = array( $handlers );
+				$handlers = array($handlers);
 			}
 
-			if ( ! isset( $this->route_options[ $route ] ) ) {
-				$this->route_options[ $route ] = array();
+			if ( ! isset($this->route_options[$route])) {
+				$this->route_options[$route] = array();
 			}
 
-			foreach ( $handlers as $key => &$handler ) {
+			foreach ($handlers as $key => &$handler) {
 
-				if ( ! is_numeric( $key ) ) {
+				if ( ! is_numeric($key)) {
 					// Route option, move it to the options.
-					$this->route_options[ $route ][ $key ] = $handler;
-					unset( $handlers[ $key ] );
+					$this->route_options[$route][$key] = $handler;
+					unset($handlers[$key]);
 					continue;
 				}
 
-				$handler = wp_parse_args( $handler, $defaults );
+				$handler = wp_parse_args($handler, $defaults);
 
 				// Allow comma-separated HTTP methods.
-				if ( is_string( $handler['methods'] ) ) {
-					$methods = explode( ',', $handler['methods'] );
-				} else if ( is_array( $handler['methods'] ) ) {
+				if (is_string($handler['methods'])) {
+					$methods = explode(',', $handler['methods']);
+				} else if (is_array($handler['methods'])) {
 					$methods = $handler['methods'];
 				} else {
 					$methods = array();
@@ -726,9 +726,9 @@ 
 
 				$handler['methods'] = array();
 
-				foreach ( $methods as $method ) {
-					$method = strtoupper( trim( $method ) );
-					$handler['methods'][ $method ] = true;
+				foreach ($methods as $method) {
+					$method = strtoupper(trim($method));
+					$handler['methods'][$method] = true;
 				}
 			}
 		}
@@ -744,7 +744,7 @@ 
 	 * @return array List of registered namespaces.
 	 */
 	public function get_namespaces() {
-		return array_keys( $this->namespaces );
+		return array_keys($this->namespaces);
 	}
 
 	/**
@@ -756,12 +756,12 @@ 
 	 * @param string $route Route pattern to fetch options for.
 	 * @return array|null Data as an associative array if found, or null if not found.
 	 */
-	public function get_route_options( $route ) {
-		if ( ! isset( $this->route_options[ $route ] ) ) {
+	public function get_route_options($route) {
+		if ( ! isset($this->route_options[$route])) {
 			return null;
 		}
 
-		return $this->route_options[ $route ];
+		return $this->route_options[$route];
 	}
 
 	/**
@@ -773,7 +773,7 @@ 
 	 * @param WP_REST_Request $request Request to attempt dispatching.
 	 * @return WP_REST_Response Response returned by the callback.
 	 */
-	public function dispatch( $request ) {
+	public function dispatch($request) {
 		/**
 		 * Filter the pre-calculated result of a REST dispatch request.
 		 *
@@ -787,78 +787,78 @@ 
 		 * @param WP_REST_Server  $this    Server instance.
 		 * @param WP_REST_Request $request Request used to generate the response.
 		 */
-		$result = apply_filters( 'rest_pre_dispatch', null, $this, $request );
+		$result = apply_filters('rest_pre_dispatch', null, $this, $request);
 
-		if ( ! empty( $result ) ) {
+		if ( ! empty($result)) {
 			return $result;
 		}
 
 		$method = $request->get_method();
 		$path   = $request->get_route();
 
-		foreach ( $this->get_routes() as $route => $handlers ) {
-			$match = preg_match( '@^' . $route . '$@i', $path, $args );
+		foreach ($this->get_routes() as $route => $handlers) {
+			$match = preg_match('@^'.$route.'$@i', $path, $args);
 
-			if ( ! $match ) {
+			if ( ! $match) {
 				continue;
 			}
 
-			foreach ( $handlers as $handler ) {
-				$callback  = $handler['callback'];
+			foreach ($handlers as $handler) {
+				$callback = $handler['callback'];
 				$response = null;
 
 				// Fallback to GET method if no HEAD method is registered.
 				$checked_method = $method;
-				if ( 'HEAD' === $method && empty( $handler['methods']['HEAD'] ) ) {
+				if ('HEAD' === $method && empty($handler['methods']['HEAD'])) {
 					$checked_method = 'GET';
 				}
-				if ( empty( $handler['methods'][ $checked_method ] ) ) {
+				if (empty($handler['methods'][$checked_method])) {
 					continue;
 				}
 
-				if ( ! is_callable( $callback ) ) {
-					$response = new WP_Error( 'rest_invalid_handler', __( 'The handler for the route is invalid' ), array( 'status' => 500 ) );
+				if ( ! is_callable($callback)) {
+					$response = new WP_Error('rest_invalid_handler', __('The handler for the route is invalid'), array('status' => 500));
 				}
 
-				if ( ! is_wp_error( $response ) ) {
+				if ( ! is_wp_error($response)) {
 					// Remove the redundant preg_match argument.
-					unset( $args[0] );
+					unset($args[0]);
 
-					$request->set_url_params( $args );
-					$request->set_attributes( $handler );
+					$request->set_url_params($args);
+					$request->set_attributes($handler);
 
 					$request->sanitize_params();
 
 					$defaults = array();
 
-					foreach ( $handler['args'] as $arg => $options ) {
-						if ( isset( $options['default'] ) ) {
-							$defaults[ $arg ] = $options['default'];
+					foreach ($handler['args'] as $arg => $options) {
+						if (isset($options['default'])) {
+							$defaults[$arg] = $options['default'];
 						}
 					}
 
-					$request->set_default_params( $defaults );
+					$request->set_default_params($defaults);
 
 					$check_required = $request->has_valid_params();
-					if ( is_wp_error( $check_required ) ) {
+					if (is_wp_error($check_required)) {
 						$response = $check_required;
 					}
 				}
 
-				if ( ! is_wp_error( $response ) ) {
+				if ( ! is_wp_error($response)) {
 					// Check permission specified on the route.
-					if ( ! empty( $handler['permission_callback'] ) ) {
-						$permission = call_user_func( $handler['permission_callback'], $request );
+					if ( ! empty($handler['permission_callback'])) {
+						$permission = call_user_func($handler['permission_callback'], $request);
 
-						if ( is_wp_error( $permission ) ) {
+						if (is_wp_error($permission)) {
 							$response = $permission;
-						} else if ( false === $permission || null === $permission ) {
-							$response = new WP_Error( 'rest_forbidden', __( "You don't have permission to do this." ), array( 'status' => 403 ) );
+						} else if (false === $permission || null === $permission) {
+							$response = new WP_Error('rest_forbidden', __("You don't have permission to do this."), array('status' => 403));
 						}
 					}
 				}
 
-				if ( ! is_wp_error( $response ) ) {
+				if ( ! is_wp_error($response)) {
 					/**
 					 * Filter the REST dispatch request result.
 					 *
@@ -872,30 +872,30 @@ 
 					 * @param string          $route           Route matched for the request.
 					 * @param array           $handler         Route handler used for the request.
 					 */
-					$dispatch_result = apply_filters( 'rest_dispatch_request', null, $request, $route, $handler );
+					$dispatch_result = apply_filters('rest_dispatch_request', null, $request, $route, $handler);
 
 					// Allow plugins to halt the request via this filter.
-					if ( null !== $dispatch_result ) {
+					if (null !== $dispatch_result) {
 						$response = $dispatch_result;
 					} else {
-						$response = call_user_func( $callback, $request );
+						$response = call_user_func($callback, $request);
 					}
 				}
 
-				if ( is_wp_error( $response ) ) {
-					$response = $this->error_to_response( $response );
+				if (is_wp_error($response)) {
+					$response = $this->error_to_response($response);
 				} else {
-					$response = rest_ensure_response( $response );
+					$response = rest_ensure_response($response);
 				}
 
-				$response->set_matched_route( $route );
-				$response->set_matched_handler( $handler );
+				$response->set_matched_route($route);
+				$response->set_matched_handler($handler);
 
 				return $response;
 			}
 		}
 
-		return $this->error_to_response( new WP_Error( 'rest_no_route', __( 'No route was found matching the URL and request method' ), array( 'status' => 404 ) ) );
+		return $this->error_to_response(new WP_Error('rest_no_route', __('No route was found matching the URL and request method'), array('status' => 404)));
 	}
 
 	/**
@@ -911,13 +911,13 @@ 
 	 */
 	protected function get_json_last_error() {
 		// See https://core.trac.wordpress.org/ticket/27799.
-		if ( ! function_exists( 'json_last_error' ) ) {
+		if ( ! function_exists('json_last_error')) {
 			return false;
 		}
 
 		$last_error_code = json_last_error();
 
-		if ( ( defined( 'JSON_ERROR_NONE' ) && JSON_ERROR_NONE === $last_error_code ) || empty( $last_error_code ) ) {
+		if ((defined('JSON_ERROR_NONE') && JSON_ERROR_NONE === $last_error_code) || empty($last_error_code)) {
 			return false;
 		}
 
@@ -939,20 +939,20 @@ 
 	 * }
 	 * @return array Index entity
 	 */
-	public function get_index( $request ) {
+	public function get_index($request) {
 		// General site data.
 		$available = array(
-			'name'           => get_option( 'blogname' ),
-			'description'    => get_option( 'blogdescription' ),
-			'url'            => get_option( 'siteurl' ),
-			'namespaces'     => array_keys( $this->namespaces ),
+			'name'           => get_option('blogname'),
+			'description'    => get_option('blogdescription'),
+			'url'            => get_option('siteurl'),
+			'namespaces'     => array_keys($this->namespaces),
 			'authentication' => array(),
-			'routes'         => $this->get_data_for_routes( $this->get_routes(), $request['context'] ),
+			'routes'         => $this->get_data_for_routes($this->get_routes(), $request['context']),
 		);
 
-		$response = new WP_REST_Response( $available );
+		$response = new WP_REST_Response($available);
 
-		$response->add_link( 'help', 'http://v2.wp-api.org/' );
+		$response->add_link('help', 'http://v2.wp-api.org/');
 
 		/**
 		 * Filter the API root index data.
@@ -965,7 +965,7 @@ 
 		 *
 		 * @param WP_REST_Response $response Response data.
 		 */
-		return apply_filters( 'rest_index', $response );
+		return apply_filters('rest_index', $response);
 	}
 
 	/**
@@ -978,24 +978,24 @@ 
 	 * @return WP_REST_Response|WP_Error WP_REST_Response instance if the index was found,
 	 *                                   WP_Error if the namespace isn't set.
 	 */
-	public function get_namespace_index( $request ) {
+	public function get_namespace_index($request) {
 		$namespace = $request['namespace'];
 
-		if ( ! isset( $this->namespaces[ $namespace ] ) ) {
-			return new WP_Error( 'rest_invalid_namespace', __( 'The specified namespace could not be found.' ), array( 'status' => 404 ) );
+		if ( ! isset($this->namespaces[$namespace])) {
+			return new WP_Error('rest_invalid_namespace', __('The specified namespace could not be found.'), array('status' => 404));
 		}
 
-		$routes = $this->namespaces[ $namespace ];
-		$endpoints = array_intersect_key( $this->get_routes(), $routes );
+		$routes = $this->namespaces[$namespace];
+		$endpoints = array_intersect_key($this->get_routes(), $routes);
 
 		$data = array(
 			'namespace' => $namespace,
-			'routes' => $this->get_data_for_routes( $endpoints, $request['context'] ),
+			'routes' => $this->get_data_for_routes($endpoints, $request['context']),
 		);
-		$response = rest_ensure_response( $data );
+		$response = rest_ensure_response($data);
 
 		// Link to the root index.
-		$response->add_link( 'up', rest_url( '/' ) );
+		$response->add_link('up', rest_url('/'));
 
 		/**
 		 * Filter the namespace index data.
@@ -1008,7 +1008,7 @@ 
 		 * @param WP_REST_Response $response Response data.
 		 * @param WP_REST_Request  $request  Request data. The namespace is passed as the 'namespace' parameter.
 		 */
-		return apply_filters( 'rest_namespace_index', $response, $request );
+		return apply_filters('rest_namespace_index', $response, $request);
 	}
 
 	/**
@@ -1021,13 +1021,13 @@ 
 	 * @param string $context Optional. Context for data. Accepts 'view' or 'help'. Default 'view'.
 	 * @return array Route data to expose in indexes.
 	 */
-	public function get_data_for_routes( $routes, $context = 'view' ) {
+	public function get_data_for_routes($routes, $context = 'view') {
 		$available = array();
 
 		// Find the available routes.
-		foreach ( $routes as $route => $callbacks ) {
-			$data = $this->get_data_for_route( $route, $callbacks, $context );
-			if ( empty( $data ) ) {
+		foreach ($routes as $route => $callbacks) {
+			$data = $this->get_data_for_route($route, $callbacks, $context);
+			if (empty($data)) {
 				continue;
 			}
 
@@ -1038,7 +1038,7 @@ 
 			 *
 			 * @param WP_REST_Request $request Request data. The namespace is passed as the 'namespace' parameter.
 			 */
-			$available[ $route ] = apply_filters( 'rest_endpoints_description', $data );
+			$available[$route] = apply_filters('rest_endpoints_description', $data);
 		}
 
 		/**
@@ -1053,7 +1053,7 @@ 
 		 * @param array $available Map of route to route data.
 		 * @param array $routes    Internal route data as an associative array.
 		 */
-		return apply_filters( 'rest_route_data', $available, $routes );
+		return apply_filters('rest_route_data', $available, $routes);
 	}
 
 	/**
@@ -1067,68 +1067,68 @@ 
 	 * @param string $context   Optional. Context for the data. Accepts 'view' or 'help'. Default 'view'.
 	 * @return array|null Data for the route, or null if no publicly-visible data.
 	 */
-	public function get_data_for_route( $route, $callbacks, $context = 'view' ) {
+	public function get_data_for_route($route, $callbacks, $context = 'view') {
 		$data = array(
 			'namespace' => '',
 			'methods' => array(),
 			'endpoints' => array(),
 		);
 
-		if ( isset( $this->route_options[ $route ] ) ) {
-			$options = $this->route_options[ $route ];
+		if (isset($this->route_options[$route])) {
+			$options = $this->route_options[$route];
 
-			if ( isset( $options['namespace'] ) ) {
+			if (isset($options['namespace'])) {
 				$data['namespace'] = $options['namespace'];
 			}
 
-			if ( isset( $options['schema'] ) && 'help' === $context ) {
-				$data['schema'] = call_user_func( $options['schema'] );
+			if (isset($options['schema']) && 'help' === $context) {
+				$data['schema'] = call_user_func($options['schema']);
 			}
 		}
 
-		$route = preg_replace( '#\(\?P<(\w+?)>.*?\)#', '{$1}', $route );
+		$route = preg_replace('#\(\?P<(\w+?)>.*?\)#', '{$1}', $route);
 
-		foreach ( $callbacks as $callback ) {
+		foreach ($callbacks as $callback) {
 			// Skip to the next route if any callback is hidden.
-			if ( empty( $callback['show_in_index'] ) ) {
+			if (empty($callback['show_in_index'])) {
 				continue;
 			}
 
-			$data['methods'] = array_merge( $data['methods'], array_keys( $callback['methods'] ) );
+			$data['methods'] = array_merge($data['methods'], array_keys($callback['methods']));
 			$endpoint_data = array(
-				'methods' => array_keys( $callback['methods'] ),
+				'methods' => array_keys($callback['methods']),
 			);
 
-			if ( isset( $callback['args'] ) ) {
+			if (isset($callback['args'])) {
 				$endpoint_data['args'] = array();
-				foreach ( $callback['args'] as $key => $opts ) {
+				foreach ($callback['args'] as $key => $opts) {
 					$arg_data = array(
-						'required' => ! empty( $opts['required'] ),
+						'required' => ! empty($opts['required']),
 					);
-					if ( isset( $opts['default'] ) ) {
+					if (isset($opts['default'])) {
 						$arg_data['default'] = $opts['default'];
 					}
-					if ( isset( $opts['enum'] ) ) {
+					if (isset($opts['enum'])) {
 						$arg_data['enum'] = $opts['enum'];
 					}
-					if ( isset( $opts['description'] ) ) {
+					if (isset($opts['description'])) {
 						$arg_data['description'] = $opts['description'];
 					}
-					$endpoint_data['args'][ $key ] = $arg_data;
+					$endpoint_data['args'][$key] = $arg_data;
 				}
 			}
 
 			$data['endpoints'][] = $endpoint_data;
 
 			// For non-variable routes, generate links.
-			if ( strpos( $route, '{' ) === false ) {
+			if (strpos($route, '{') === false) {
 				$data['_links'] = array(
-					'self' => rest_url( $route ),
+					'self' => rest_url($route),
 				);
 			}
 		}
 
-		if ( empty( $data['methods'] ) ) {
+		if (empty($data['methods'])) {
 			// No methods supported, hide the route.
 			return null;
 		}
@@ -1144,8 +1144,8 @@ 
 	 *
 	 * @param int $code HTTP status.
 	 */
-	protected function set_status( $code ) {
-		status_header( $code );
+	protected function set_status($code) {
+		status_header($code);
 	}
 
 	/**
@@ -1157,7 +1157,7 @@ 
 	 * @param string $key Header key.
 	 * @param string $value Header value.
 	 */
-	public function send_header( $key, $value ) {
+	public function send_header($key, $value) {
 		/*
 		 * Sanitize as per RFC2616 (Section 4.2):
 		 *
@@ -1165,8 +1165,8 @@ 
 		 * single SP before interpreting the field value or forwarding the
 		 * message downstream.
 		 */
-		$value = preg_replace( '/\s+/', ' ', $value );
-		header( sprintf( '%s: %s', $key, $value ) );
+		$value = preg_replace('/\s+/', ' ', $value);
+		header(sprintf('%s: %s', $key, $value));
 	}
 
 	/**
@@ -1177,9 +1177,9 @@ 
 	 *
 	 * @param array $headers Map of header name to header value.
 	 */
-	public function send_headers( $headers ) {
-		foreach ( $headers as $key => $value ) {
-			$this->send_header( $key, $value );
+	public function send_headers($headers) {
+		foreach ($headers as $key => $value) {
+			$this->send_header($key, $value);
 		}
 	}
 
@@ -1200,8 +1200,8 @@ 
 		 * A bug in PHP < 5.2.2 makes $HTTP_RAW_POST_DATA not set by default,
 		 * but we can do it ourself.
 		 */
-		if ( ! isset( $HTTP_RAW_POST_DATA ) ) {
-			$HTTP_RAW_POST_DATA = file_get_contents( 'php://input' );
+		if ( ! isset($HTTP_RAW_POST_DATA)) {
+			$HTTP_RAW_POST_DATA = file_get_contents('php://input');
 		}
 
 		return $HTTP_RAW_POST_DATA;
@@ -1216,17 +1216,17 @@ 
 	 * @param array $server Associative array similar to `$_SERVER`.
 	 * @return array Headers extracted from the input.
 	 */
-	public function get_headers( $server ) {
+	public function get_headers($server) {
 		$headers = array();
 
 		// CONTENT_* headers are not prefixed with HTTP_.
-		$additional = array( 'CONTENT_LENGTH' => true, 'CONTENT_MD5' => true, 'CONTENT_TYPE' => true );
+		$additional = array('CONTENT_LENGTH' => true, 'CONTENT_MD5' => true, 'CONTENT_TYPE' => true);
 
-		foreach ( $server as $key => $value ) {
-			if ( strpos( $key, 'HTTP_' ) === 0 ) {
-				$headers[ substr( $key, 5 ) ] = $value;
-			} elseif ( isset( $additional[ $key ] ) ) {
-				$headers[ $key ] = $value;
+		foreach ($server as $key => $value) {
+			if (strpos($key, 'HTTP_') === 0) {
+				$headers[substr($key, 5)] = $value;
+			} elseif (isset($additional[$key])) {
+				$headers[$key] = $value;
 			}
 		}
 

src/wp-includes/user.php

Doc Comments +2 added lines, -2 removed lines

@@ -734,7 +734,7 @@ 
  *
  * @param int    $user_id    User ID.
  * @param string $meta_key   Metadata name.
- * @param mixed  $meta_value Metadata value.
+ * @param string  $meta_value Metadata value.
  * @param bool   $unique     Optional, default is false. Whether the same key should not be added.
  * @return int|false Meta ID on success, false on failure.
  */
@@ -1211,7 +1211,7 @@ 
  * @since 3.0.0
  *
  * @param object|WP_User $user User object to be cached
- * @return bool|null Returns false on failure.
+ * @return false|null Returns false on failure.
  */
 function update_user_caches( $user ) {
 	if ( $user instanceof WP_User ) {

Indentation +24 added lines, -24 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 /**
- * Core User API
- *
- * @package WordPress
- * @subpackage Users
- */
+	 * Core User API
+	 *
+	 * @package WordPress
+	 * @subpackage Users
+	 */
 
 /**
  * Authenticates and logs a user in with 'remember' capability.
@@ -65,13 +65,13 @@ 
 	 *
 	 * @param bool  $secure_cookie Whether to use a secure sign-on cookie.
 	 * @param array $credentials {
- 	 *     Array of entered sign-on data.
- 	 *
- 	 *     @type string $user_login    Username.
- 	 *     @type string $user_password Password entered.
+	 *     Array of entered sign-on data.
+	 *
+	 *     @type string $user_login    Username.
+	 *     @type string $user_password Password entered.
 	 *     @type bool   $remember      Whether to 'remember' the user. Increases the time
 	 *                                 that the cookie will be kept. Default false.
- 	 * }
+	 * }
 	 */
 	$secure_cookie = apply_filters( 'secure_signon_cookie', $secure_cookie, $credentials );
 
@@ -1163,7 +1163,7 @@ 
 			 *
 			 * The dynamic portion of the hook name, `$field`, refers to the prefixed user
 			 * field being filtered, such as 'user_login', 'user_email', 'first_name', etc.
- 			 *
+			 *
 			 * @since 2.9.0
 			 *
 			 * @param mixed $value Value of the prefixed user field.
@@ -1604,16 +1604,16 @@ 
 	$user = new WP_User( $user_id );
 
 	/**
- 	 * Filter a user's meta values and keys before the user is created or updated.
- 	 *
- 	 * Does not include contact methods. These are added using `wp_get_user_contact_methods( $user )`.
- 	 *
- 	 * @since 4.4.0
- 	 *
- 	 * @param array $meta {
- 	 *     Default meta values and keys for the user.
- 	 *
- 	 *     @type string   $nickname             The user's nickname. Default is the user's username.
+	 * Filter a user's meta values and keys before the user is created or updated.
+	 *
+	 * Does not include contact methods. These are added using `wp_get_user_contact_methods( $user )`.
+	 *
+	 * @since 4.4.0
+	 *
+	 * @param array $meta {
+	 *     Default meta values and keys for the user.
+	 *
+	 *     @type string   $nickname             The user's nickname. Default is the user's username.
 	 *     @type string   $first_name           The user's first name.
 	 *     @type string   $last_name            The user's last name.
 	 *     @type string   $description          The user's description.
@@ -1624,10 +1624,10 @@ 
 	 *                                          not forced.
 	 *     @type bool     $show_admin_bar_front Whether to show the admin bar on the front end for the user.
 	 *                                          Default true.
- 	 * }
+	 * }
 	 * @param WP_User $user   User object.
 	 * @param bool    $update Whether the user is being updated rather than created.
- 	 */
+	 */
 	$meta = apply_filters( 'insert_user_meta', $meta, $user, $update );
 
 	// Update user meta.
@@ -1962,7 +1962,7 @@ 
 	 * @since 2.9.0
 	 *
 	 * @param array   $methods Array of contact methods and their labels.
- 	 * @param WP_User $user    WP_User object.
+	 * @param WP_User $user    WP_User object.
 	 */
 	return apply_filters( 'user_contactmethods', $methods, $user );
 }

Spacing +488 added lines, -488 removed lines

@@ -25,17 +25,17 @@ 
  * @param string|bool $secure_cookie Optional. Whether to use secure cookie.
  * @return WP_User|WP_Error WP_User on success, WP_Error on failure.
  */
-function wp_signon( $credentials = array(), $secure_cookie = '' ) {
-	if ( empty($credentials) ) {
-		if ( ! empty($_POST['log']) )
+function wp_signon($credentials = array(), $secure_cookie = '') {
+	if (empty($credentials)) {
+		if ( ! empty($_POST['log']))
 			$credentials['user_login'] = $_POST['log'];
-		if ( ! empty($_POST['pwd']) )
+		if ( ! empty($_POST['pwd']))
 			$credentials['user_password'] = $_POST['pwd'];
-		if ( ! empty($_POST['rememberme']) )
+		if ( ! empty($_POST['rememberme']))
 			$credentials['remember'] = $_POST['rememberme'];
 	}
 
-	if ( !empty($credentials['remember']) )
+	if ( ! empty($credentials['remember']))
 		$credentials['remember'] = true;
 	else
 		$credentials['remember'] = false;
@@ -53,9 +53,9 @@ 
 	 * @param string $user_login    Username, passed by reference.
 	 * @param string $user_password User password, passed by reference.
 	 */
-	do_action_ref_array( 'wp_authenticate', array( &$credentials['user_login'], &$credentials['user_password'] ) );
+	do_action_ref_array('wp_authenticate', array(&$credentials['user_login'], &$credentials['user_password']));
 
-	if ( '' === $secure_cookie )
+	if ('' === $secure_cookie)
 		$secure_cookie = is_ssl();
 
 	/**
@@ -73,7 +73,7 @@ 
 	 *                                 that the cookie will be kept. Default false.
  	 * }
 	 */
-	$secure_cookie = apply_filters( 'secure_signon_cookie', $secure_cookie, $credentials );
+	$secure_cookie = apply_filters('secure_signon_cookie', $secure_cookie, $credentials);
 
 	global $auth_secure_cookie; // XXX ugly hack to pass this to wp_authenticate_cookie
 	$auth_secure_cookie = $secure_cookie;
@@ -82,8 +82,8 @@ 
 
 	$user = wp_authenticate($credentials['user_login'], $credentials['user_password']);
 
-	if ( is_wp_error($user) ) {
-		if ( $user->get_error_codes() == array('empty_username', 'empty_password') ) {
+	if (is_wp_error($user)) {
+		if ($user->get_error_codes() == array('empty_username', 'empty_password')) {
 			$user = new WP_Error('', '');
 		}
 
@@ -99,7 +99,7 @@ 
 	 * @param string  $user_login Username.
 	 * @param WP_User $user       WP_User object of the logged-in user.
 	 */
-	do_action( 'wp_login', $user->user_login, $user );
+	do_action('wp_login', $user->user_login, $user);
 	return $user;
 }
 
@@ -114,20 +114,20 @@ 
  * @return WP_User|WP_Error WP_User on success, WP_Error on failure.
  */
 function wp_authenticate_username_password($user, $username, $password) {
-	if ( $user instanceof WP_User ) {
+	if ($user instanceof WP_User) {
 		return $user;
 	}
 
-	if ( empty($username) || empty($password) ) {
-		if ( is_wp_error( $user ) )
+	if (empty($username) || empty($password)) {
+		if (is_wp_error($user))
 			return $user;
 
 		$error = new WP_Error();
 
-		if ( empty($username) )
+		if (empty($username))
 			$error->add('empty_username', __('<strong>ERROR</strong>: The username field is empty.'));
 
-		if ( empty($password) )
+		if (empty($password))
 			$error->add('empty_password', __('<strong>ERROR</strong>: The password field is empty.'));
 
 		return $error;
@@ -135,11 +135,11 @@ 
 
 	$user = get_user_by('login', $username);
 
-	if ( !$user ) {
-		return new WP_Error( 'invalid_username',
-			__( '<strong>ERROR</strong>: Invalid username.' ) .
-			' <a href="' . wp_lostpassword_url() . '">' .
-			__( 'Lost your password?' ) .
+	if ( ! $user) {
+		return new WP_Error('invalid_username',
+			__('<strong>ERROR</strong>: Invalid username.').
+			' <a href="'.wp_lostpassword_url().'">'.
+			__('Lost your password?').
 			'</a>'
 		);
 	}
@@ -153,19 +153,19 @@ 
 	 *                                   callback failed authentication.
 	 * @param string           $password Password to check against the user.
 	 */
-	$user = apply_filters( 'wp_authenticate_user', $user, $password );
-	if ( is_wp_error($user) )
+	$user = apply_filters('wp_authenticate_user', $user, $password);
+	if (is_wp_error($user))
 		return $user;
 
-	if ( ! wp_check_password( $password, $user->user_pass, $user->ID ) ) {
-		return new WP_Error( 'incorrect_password',
+	if ( ! wp_check_password($password, $user->user_pass, $user->ID)) {
+		return new WP_Error('incorrect_password',
 			sprintf(
 				/* translators: %s: user name */
-				__( '<strong>ERROR</strong>: The password you entered for the username %s is incorrect.' ),
-				'<strong>' . $username . '</strong>'
-			) .
-			' <a href="' . wp_lostpassword_url() . '">' .
-			__( 'Lost your password?' ) .
+				__('<strong>ERROR</strong>: The password you entered for the username %s is incorrect.'),
+				'<strong>'.$username.'</strong>'
+			).
+			' <a href="'.wp_lostpassword_url().'">'.
+			__('Lost your password?').
 			'</a>'
 		);
 	}
@@ -184,60 +184,60 @@ 
  * @param string                $password Password for authentication.
  * @return WP_User|WP_Error WP_User on success, WP_Error on failure.
  */
-function wp_authenticate_email_password( $user, $email, $password ) {
-	if ( $user instanceof WP_User ) {
+function wp_authenticate_email_password($user, $email, $password) {
+	if ($user instanceof WP_User) {
 		return $user;
 	}
 
-	if ( empty( $email ) || empty( $password ) ) {
-		if ( is_wp_error( $user ) ) {
+	if (empty($email) || empty($password)) {
+		if (is_wp_error($user)) {
 			return $user;
 		}
 
 		$error = new WP_Error();
 
-		if ( empty( $email ) ) {
-			$error->add( 'empty_username', __( '<strong>ERROR</strong>: The email field is empty.' ) ); // Uses 'empty_username' for back-compat with wp_signon()
+		if (empty($email)) {
+			$error->add('empty_username', __('<strong>ERROR</strong>: The email field is empty.')); // Uses 'empty_username' for back-compat with wp_signon()
 		}
 
-		if ( empty( $password ) ) {
-			$error->add( 'empty_password', __( '<strong>ERROR</strong>: The password field is empty.' ) );
+		if (empty($password)) {
+			$error->add('empty_password', __('<strong>ERROR</strong>: The password field is empty.'));
 		}
 
 		return $error;
 	}
 
-	if ( ! is_email( $email ) ) {
+	if ( ! is_email($email)) {
 		return $user;
 	}
 
-	$user = get_user_by( 'email', $email );
+	$user = get_user_by('email', $email);
 
-	if ( ! $user ) {
-		return new WP_Error( 'invalid_email',
-			__( '<strong>ERROR</strong>: Invalid email address.' ) .
-			' <a href="' . wp_lostpassword_url() . '">' .
-			__( 'Lost your password?' ) .
+	if ( ! $user) {
+		return new WP_Error('invalid_email',
+			__('<strong>ERROR</strong>: Invalid email address.').
+			' <a href="'.wp_lostpassword_url().'">'.
+			__('Lost your password?').
 			'</a>'
 		);
 	}
 
 	/** This filter is documented in wp-includes/user.php */
-	$user = apply_filters( 'wp_authenticate_user', $user, $password );
+	$user = apply_filters('wp_authenticate_user', $user, $password);
 
-	if ( is_wp_error( $user ) ) {
+	if (is_wp_error($user)) {
 		return $user;
 	}
 
-	if ( ! wp_check_password( $password, $user->user_pass, $user->ID ) ) {
-		return new WP_Error( 'incorrect_password',
+	if ( ! wp_check_password($password, $user->user_pass, $user->ID)) {
+		return new WP_Error('incorrect_password',
 			sprintf(
 				/* translators: %s: email address */
-				__( '<strong>ERROR</strong>: The password you entered for the email address %s is incorrect.' ),
-				'<strong>' . $email . '</strong>'
-			) .
-			' <a href="' . wp_lostpassword_url() . '">' .
-			__( 'Lost your password?' ) .
+				__('<strong>ERROR</strong>: The password you entered for the email address %s is incorrect.'),
+				'<strong>'.$email.'</strong>'
+			).
+			' <a href="'.wp_lostpassword_url().'">'.
+			__('Lost your password?').
 			'</a>'
 		);
 	}
@@ -258,23 +258,23 @@ 
  * @return WP_User|WP_Error WP_User on success, WP_Error on failure.
  */
 function wp_authenticate_cookie($user, $username, $password) {
-	if ( $user instanceof WP_User ) {
+	if ($user instanceof WP_User) {
 		return $user;
 	}
 
-	if ( empty($username) && empty($password) ) {
+	if (empty($username) && empty($password)) {
 		$user_id = wp_validate_auth_cookie();
-		if ( $user_id )
+		if ($user_id)
 			return new WP_User($user_id);
 
 		global $auth_secure_cookie;
 
-		if ( $auth_secure_cookie )
+		if ($auth_secure_cookie)
 			$auth_cookie = SECURE_AUTH_COOKIE;
 		else
 			$auth_cookie = AUTH_COOKIE;
 
-		if ( !empty($_COOKIE[$auth_cookie]) )
+		if ( ! empty($_COOKIE[$auth_cookie]))
 			return new WP_Error('expired_session', __('Please log in again.'));
 
 		// If the cookie is not set, be silent.
@@ -292,8 +292,8 @@ 
  * @param WP_User|WP_Error|null $user WP_User or WP_Error object from a previous callback. Default null.
  * @return WP_User|WP_Error WP_User on success, WP_Error if the user is considered a spammer.
  */
-function wp_authenticate_spam_check( $user ) {
-	if ( $user instanceof WP_User && is_multisite() ) {
+function wp_authenticate_spam_check($user) {
+	if ($user instanceof WP_User && is_multisite()) {
 		/**
 		 * Filter whether the user has been marked as a spammer.
 		 *
@@ -302,10 +302,10 @@ 
 		 * @param bool    $spammed Whether the user is considered a spammer.
 		 * @param WP_User $user    User to check against.
 		 */
-		$spammed = apply_filters( 'check_is_user_spammed', is_user_spammy(), $user );
+		$spammed = apply_filters('check_is_user_spammed', is_user_spammy(), $user);
 
-		if ( $spammed )
-			return new WP_Error( 'spammer_account', __( '<strong>ERROR</strong>: Your account has been marked as a spammer.' ) );
+		if ($spammed)
+			return new WP_Error('spammer_account', __('<strong>ERROR</strong>: Your account has been marked as a spammer.'));
 	}
 	return $user;
 }
@@ -325,16 +325,16 @@ 
  * @return int|false User ID if validated, false otherwise. If a user ID from
  *                   an earlier filter callback is received, that value is returned.
  */
-function wp_validate_logged_in_cookie( $user_id ) {
-	if ( $user_id ) {
+function wp_validate_logged_in_cookie($user_id) {
+	if ($user_id) {
 		return $user_id;
 	}
 
-	if ( is_blog_admin() || is_network_admin() || empty( $_COOKIE[LOGGED_IN_COOKIE] ) ) {
+	if (is_blog_admin() || is_network_admin() || empty($_COOKIE[LOGGED_IN_COOKIE])) {
 		return false;
 	}
 
-	return wp_validate_auth_cookie( $_COOKIE[LOGGED_IN_COOKIE], 'logged_in' );
+	return wp_validate_auth_cookie($_COOKIE[LOGGED_IN_COOKIE], 'logged_in');
 }
 
 /**
@@ -352,12 +352,12 @@ 
  * @param bool         $public_only Optional. Whether to only return counts for public posts. Default false.
  * @return string Number of posts the user has written in this post type.
  */
-function count_user_posts( $userid, $post_type = 'post', $public_only = false ) {
+function count_user_posts($userid, $post_type = 'post', $public_only = false) {
 	global $wpdb;
 
-	$where = get_posts_by_author_sql( $post_type, true, $userid, $public_only );
+	$where = get_posts_by_author_sql($post_type, true, $userid, $public_only);
 
-	$count = $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->posts $where" );
+	$count = $wpdb->get_var("SELECT COUNT(*) FROM $wpdb->posts $where");
 
 	/**
 	 * Filter the number of posts a user has written.
@@ -371,7 +371,7 @@ 
 	 * @param string|array $post_type   Single post type or array of post types to count the number of posts for.
 	 * @param bool         $public_only Whether to limit counted posts to public posts.
 	 */
-	return apply_filters( 'get_usernumposts', $count, $userid, $post_type, $public_only );
+	return apply_filters('get_usernumposts', $count, $userid, $post_type, $public_only);
 }
 
 /**
@@ -386,24 +386,24 @@ 
  * @param bool         $public_only Optional. Only return counts for public posts.  Defaults to false.
  * @return array Amount of posts each user has written.
  */
-function count_many_users_posts( $users, $post_type = 'post', $public_only = false ) {
+function count_many_users_posts($users, $post_type = 'post', $public_only = false) {
 	global $wpdb;
 
 	$count = array();
-	if ( empty( $users ) || ! is_array( $users ) )
+	if (empty($users) || ! is_array($users))
 		return $count;
 
-	$userlist = implode( ',', array_map( 'absint', $users ) );
-	$where = get_posts_by_author_sql( $post_type, true, null, $public_only );
+	$userlist = implode(',', array_map('absint', $users));
+	$where = get_posts_by_author_sql($post_type, true, null, $public_only);
 
-	$result = $wpdb->get_results( "SELECT post_author, COUNT(*) FROM $wpdb->posts $where AND post_author IN ($userlist) GROUP BY post_author", ARRAY_N );
-	foreach ( $result as $row ) {
-		$count[ $row[0] ] = $row[1];
+	$result = $wpdb->get_results("SELECT post_author, COUNT(*) FROM $wpdb->posts $where AND post_author IN ($userlist) GROUP BY post_author", ARRAY_N);
+	foreach ($result as $row) {
+		$count[$row[0]] = $row[1];
 	}
 
-	foreach ( $users as $id ) {
-		if ( ! isset( $count[ $id ] ) )
-			$count[ $id ] = 0;
+	foreach ($users as $id) {
+		if ( ! isset($count[$id]))
+			$count[$id] = 0;
 	}
 
 	return $count;
@@ -421,10 +421,10 @@ 
  * @return int The current user's ID
  */
 function get_current_user_id() {
-	if ( ! function_exists( 'wp_get_current_user' ) )
+	if ( ! function_exists('wp_get_current_user'))
 		return 0;
 	$user = wp_get_current_user();
-	return ( isset( $user->ID ) ? (int) $user->ID : 0 );
+	return (isset($user->ID) ? (int) $user->ID : 0);
 }
 
 /**
@@ -446,23 +446,23 @@ 
  * @param string $deprecated Use get_option() to check for an option in the options table.
  * @return mixed User option value on success, false on failure.
  */
-function get_user_option( $option, $user = 0, $deprecated = '' ) {
+function get_user_option($option, $user = 0, $deprecated = '') {
 	global $wpdb;
 
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '3.0' );
+	if ( ! empty($deprecated))
+		_deprecated_argument(__FUNCTION__, '3.0');
 
-	if ( empty( $user ) )
+	if (empty($user))
 		$user = get_current_user_id();
 
-	if ( ! $user = get_userdata( $user ) )
+	if ( ! $user = get_userdata($user))
 		return false;
 
 	$prefix = $wpdb->get_blog_prefix();
-	if ( $user->has_prop( $prefix . $option ) ) // Blog specific
-		$result = $user->get( $prefix . $option );
-	elseif ( $user->has_prop( $option ) ) // User specific and cross-blog
-		$result = $user->get( $option );
+	if ($user->has_prop($prefix.$option)) // Blog specific
+		$result = $user->get($prefix.$option);
+	elseif ($user->has_prop($option)) // User specific and cross-blog
+		$result = $user->get($option);
 	else
 		$result = false;
 
@@ -477,7 +477,7 @@ 
 	 * @param string  $option Name of the option being retrieved.
 	 * @param WP_User $user   WP_User object of the user whose option is being retrieved.
 	 */
-	return apply_filters( "get_user_option_{$option}", $result, $option, $user );
+	return apply_filters("get_user_option_{$option}", $result, $option, $user);
 }
 
 /**
@@ -501,13 +501,13 @@ 
  * @return int|bool User meta ID if the option didn't exist, true on successful update,
  *                  false on failure.
  */
-function update_user_option( $user_id, $option_name, $newvalue, $global = false ) {
+function update_user_option($user_id, $option_name, $newvalue, $global = false) {
 	global $wpdb;
 
-	if ( !$global )
-		$option_name = $wpdb->get_blog_prefix() . $option_name;
+	if ( ! $global)
+		$option_name = $wpdb->get_blog_prefix().$option_name;
 
-	return update_user_meta( $user_id, $option_name, $newvalue );
+	return update_user_meta($user_id, $option_name, $newvalue);
 }
 
 /**
@@ -527,12 +527,12 @@ 
  *                            Default false (blog specific).
  * @return bool True on success, false on failure.
  */
-function delete_user_option( $user_id, $option_name, $global = false ) {
+function delete_user_option($user_id, $option_name, $global = false) {
 	global $wpdb;
 
-	if ( !$global )
-		$option_name = $wpdb->get_blog_prefix() . $option_name;
-	return delete_user_meta( $user_id, $option_name );
+	if ( ! $global)
+		$option_name = $wpdb->get_blog_prefix().$option_name;
+	return delete_user_meta($user_id, $option_name);
 }
 
 /**
@@ -546,9 +546,9 @@ 
  *                    for more information on accepted arguments.
  * @return array List of users.
  */
-function get_users( $args = array() ) {
+function get_users($args = array()) {
 
-	$args = wp_parse_args( $args );
+	$args = wp_parse_args($args);
 	$args['count_total'] = false;
 
 	$user_search = new WP_User_Query($args);
@@ -569,40 +569,40 @@ 
  * @return array A list of the user's blogs. An empty array if the user doesn't exist
  *               or belongs to no blogs.
  */
-function get_blogs_of_user( $user_id, $all = false ) {
+function get_blogs_of_user($user_id, $all = false) {
 	global $wpdb;
 
 	$user_id = (int) $user_id;
 
 	// Logged out users can't have blogs
-	if ( empty( $user_id ) )
+	if (empty($user_id))
 		return array();
 
-	$keys = get_user_meta( $user_id );
-	if ( empty( $keys ) )
+	$keys = get_user_meta($user_id);
+	if (empty($keys))
 		return array();
 
-	if ( ! is_multisite() ) {
+	if ( ! is_multisite()) {
 		$blog_id = get_current_blog_id();
-		$blogs = array( $blog_id => new stdClass );
-		$blogs[ $blog_id ]->userblog_id = $blog_id;
-		$blogs[ $blog_id ]->blogname = get_option('blogname');
-		$blogs[ $blog_id ]->domain = '';
-		$blogs[ $blog_id ]->path = '';
-		$blogs[ $blog_id ]->site_id = 1;
-		$blogs[ $blog_id ]->siteurl = get_option('siteurl');
-		$blogs[ $blog_id ]->archived = 0;
-		$blogs[ $blog_id ]->spam = 0;
-		$blogs[ $blog_id ]->deleted = 0;
+		$blogs = array($blog_id => new stdClass);
+		$blogs[$blog_id]->userblog_id = $blog_id;
+		$blogs[$blog_id]->blogname = get_option('blogname');
+		$blogs[$blog_id]->domain = '';
+		$blogs[$blog_id]->path = '';
+		$blogs[$blog_id]->site_id = 1;
+		$blogs[$blog_id]->siteurl = get_option('siteurl');
+		$blogs[$blog_id]->archived = 0;
+		$blogs[$blog_id]->spam = 0;
+		$blogs[$blog_id]->deleted = 0;
 		return $blogs;
 	}
 
 	$blogs = array();
 
-	if ( isset( $keys[ $wpdb->base_prefix . 'capabilities' ] ) && defined( 'MULTISITE' ) ) {
-		$blog = get_blog_details( 1 );
-		if ( $blog && isset( $blog->domain ) && ( $all || ( ! $blog->archived && ! $blog->spam && ! $blog->deleted ) ) ) {
-			$blogs[ 1 ] = (object) array(
+	if (isset($keys[$wpdb->base_prefix.'capabilities']) && defined('MULTISITE')) {
+		$blog = get_blog_details(1);
+		if ($blog && isset($blog->domain) && ($all || ( ! $blog->archived && ! $blog->spam && ! $blog->deleted))) {
+			$blogs[1] = (object) array(
 				'userblog_id' => 1,
 				'blogname'    => $blog->blogname,
 				'domain'      => $blog->domain,
@@ -615,24 +615,24 @@ 
 				'deleted'     => $blog->deleted,
 			);
 		}
-		unset( $keys[ $wpdb->base_prefix . 'capabilities' ] );
+		unset($keys[$wpdb->base_prefix.'capabilities']);
 	}
 
-	$keys = array_keys( $keys );
+	$keys = array_keys($keys);
 
-	foreach ( $keys as $key ) {
-		if ( 'capabilities' !== substr( $key, -12 ) )
+	foreach ($keys as $key) {
+		if ('capabilities' !== substr($key, -12))
 			continue;
-		if ( $wpdb->base_prefix && 0 !== strpos( $key, $wpdb->base_prefix ) )
+		if ($wpdb->base_prefix && 0 !== strpos($key, $wpdb->base_prefix))
 			continue;
-		$blog_id = str_replace( array( $wpdb->base_prefix, '_capabilities' ), '', $key );
-		if ( ! is_numeric( $blog_id ) )
+		$blog_id = str_replace(array($wpdb->base_prefix, '_capabilities'), '', $key);
+		if ( ! is_numeric($blog_id))
 			continue;
 
 		$blog_id = (int) $blog_id;
-		$blog = get_blog_details( $blog_id );
-		if ( $blog && isset( $blog->domain ) && ( $all || ( ! $blog->archived && ! $blog->spam && ! $blog->deleted ) ) ) {
-			$blogs[ $blog_id ] = (object) array(
+		$blog = get_blog_details($blog_id);
+		if ($blog && isset($blog->domain) && ($all || ( ! $blog->archived && ! $blog->spam && ! $blog->deleted))) {
+			$blogs[$blog_id] = (object) array(
 				'userblog_id' => $blog_id,
 				'blogname'    => $blog->blogname,
 				'domain'      => $blog->domain,
@@ -657,7 +657,7 @@ 
 	 * @param bool  $all     Whether the returned blogs array should contain all blogs, including
 	 *                       those marked 'deleted', 'archived', or 'spam'. Default false.
 	 */
-	return apply_filters( 'get_blogs_of_user', $blogs, $user_id, $all );
+	return apply_filters('get_blogs_of_user', $blogs, $user_id, $all);
 }
 
 /**
@@ -669,55 +669,55 @@ 
  * @param int $blog_id Optional. ID of the blog to check. Defaults to the current site.
  * @return bool
  */
-function is_user_member_of_blog( $user_id = 0, $blog_id = 0 ) {
+function is_user_member_of_blog($user_id = 0, $blog_id = 0) {
 	global $wpdb;
 
 	$user_id = (int) $user_id;
 	$blog_id = (int) $blog_id;
 
-	if ( empty( $user_id ) ) {
+	if (empty($user_id)) {
 		$user_id = get_current_user_id();
 	}
 
 	// Technically not needed, but does save calls to get_blog_details and get_user_meta
 	// in the event that the function is called when a user isn't logged in
-	if ( empty( $user_id ) ) {
+	if (empty($user_id)) {
 		return false;
 	} else {
-		$user = get_userdata( $user_id );
-		if ( ! $user instanceof WP_User ) {
+		$user = get_userdata($user_id);
+		if ( ! $user instanceof WP_User) {
 			return false;
 		}
 	}
 
-	if ( ! is_multisite() ) {
+	if ( ! is_multisite()) {
 		return true;
 	}
 
-	if ( empty( $blog_id ) ) {
+	if (empty($blog_id)) {
 		$blog_id = get_current_blog_id();
 	}
 
-	$blog = get_blog_details( $blog_id );
+	$blog = get_blog_details($blog_id);
 
-	if ( ! $blog || ! isset( $blog->domain ) || $blog->archived || $blog->spam || $blog->deleted ) {
+	if ( ! $blog || ! isset($blog->domain) || $blog->archived || $blog->spam || $blog->deleted) {
 		return false;
 	}
 
-	$keys = get_user_meta( $user_id );
-	if ( empty( $keys ) ) {
+	$keys = get_user_meta($user_id);
+	if (empty($keys)) {
 		return false;
 	}
 
 	// no underscore before capabilities in $base_capabilities_key
-	$base_capabilities_key = $wpdb->base_prefix . 'capabilities';
-	$site_capabilities_key = $wpdb->base_prefix . $blog_id . '_capabilities';
+	$base_capabilities_key = $wpdb->base_prefix.'capabilities';
+	$site_capabilities_key = $wpdb->base_prefix.$blog_id.'_capabilities';
 
-	if ( isset( $keys[ $base_capabilities_key ] ) && $blog_id == 1 ) {
+	if (isset($keys[$base_capabilities_key]) && $blog_id == 1) {
 		return true;
 	}
 
-	if ( isset( $keys[ $site_capabilities_key ] ) ) {
+	if (isset($keys[$site_capabilities_key])) {
 		return true;
 	}
 
@@ -821,24 +821,24 @@ 
 	$blog_prefix = $wpdb->get_blog_prefix($id);
 	$result = array();
 
-	if ( 'time' == $strategy ) {
+	if ('time' == $strategy) {
 		$avail_roles = wp_roles()->get_names();
 
 		// Build a CPU-intensive query that will return concise information.
 		$select_count = array();
-		foreach ( $avail_roles as $this_role => $name ) {
-			$select_count[] = $wpdb->prepare( "COUNT(NULLIF(`meta_value` LIKE %s, false))", '%' . $wpdb->esc_like( '"' . $this_role . '"' ) . '%');
+		foreach ($avail_roles as $this_role => $name) {
+			$select_count[] = $wpdb->prepare("COUNT(NULLIF(`meta_value` LIKE %s, false))", '%'.$wpdb->esc_like('"'.$this_role.'"').'%');
 		}
 		$select_count[] = "COUNT(NULLIF(`meta_value` = 'a:0:{}', false))";
 		$select_count = implode(', ', $select_count);
 
 		// Add the meta_value index to the selection list, then run the query.
-		$row = $wpdb->get_row( "SELECT $select_count, COUNT(*) FROM $wpdb->usermeta WHERE meta_key = '{$blog_prefix}capabilities'", ARRAY_N );
+		$row = $wpdb->get_row("SELECT $select_count, COUNT(*) FROM $wpdb->usermeta WHERE meta_key = '{$blog_prefix}capabilities'", ARRAY_N);
 
 		// Run the previous loop again to associate results with role names.
 		$col = 0;
 		$role_counts = array();
-		foreach ( $avail_roles as $this_role => $name ) {
+		foreach ($avail_roles as $this_role => $name) {
 			$count = (int) $row[$col++];
 			if ($count > 0) {
 				$role_counts[$this_role] = $count;
@@ -851,23 +851,23 @@ 
 		$total_users = (int) $row[$col];
 
 		$result['total_users'] = $total_users;
-		$result['avail_roles'] =& $role_counts;
+		$result['avail_roles'] = & $role_counts;
 	} else {
 		$avail_roles = array(
 			'none' => 0,
 		);
 
-		$users_of_blog = $wpdb->get_col( "SELECT meta_value FROM $wpdb->usermeta WHERE meta_key = '{$blog_prefix}capabilities'" );
+		$users_of_blog = $wpdb->get_col("SELECT meta_value FROM $wpdb->usermeta WHERE meta_key = '{$blog_prefix}capabilities'");
 
-		foreach ( $users_of_blog as $caps_meta ) {
+		foreach ($users_of_blog as $caps_meta) {
 			$b_roles = maybe_unserialize($caps_meta);
-			if ( ! is_array( $b_roles ) )
+			if ( ! is_array($b_roles))
 				continue;
-			if ( empty( $b_roles ) ) {
+			if (empty($b_roles)) {
 				$avail_roles['none']++;
 			}
-			foreach ( $b_roles as $b_role => $val ) {
-				if ( isset($avail_roles[$b_role]) ) {
+			foreach ($b_roles as $b_role => $val) {
+				if (isset($avail_roles[$b_role])) {
 					$avail_roles[$b_role]++;
 				} else {
 					$avail_roles[$b_role] = 1;
@@ -875,11 +875,11 @@ 
 			}
 		}
 
-		$result['total_users'] = count( $users_of_blog );
-		$result['avail_roles'] =& $avail_roles;
+		$result['total_users'] = count($users_of_blog);
+		$result['avail_roles'] = & $avail_roles;
 	}
 
-	if ( is_multisite() ) {
+	if (is_multisite()) {
 		$result['avail_roles']['none'] = 0;
 	}
 
@@ -910,11 +910,11 @@ 
 function setup_userdata($for_user_id = '') {
 	global $user_login, $userdata, $user_level, $user_ID, $user_email, $user_url, $user_identity;
 
-	if ( '' == $for_user_id )
+	if ('' == $for_user_id)
 		$for_user_id = get_current_user_id();
-	$user = get_userdata( $for_user_id );
+	$user = get_userdata($for_user_id);
 
-	if ( ! $user ) {
+	if ( ! $user) {
 		$user_ID = 0;
 		$user_level = 0;
 		$userdata = null;
@@ -988,7 +988,7 @@ 
  * }
  * @return string String of HTML content.
  */
-function wp_dropdown_users( $args = '' ) {
+function wp_dropdown_users($args = '') {
 	$defaults = array(
 		'show_option_all' => '', 'show_option_none' => '', 'hide_if_only_one_author' => '',
 		'orderby' => 'display_name', 'order' => 'ASC',
@@ -999,16 +999,16 @@ 
 		'option_none_value' => -1
 	);
 
-	$defaults['selected'] = is_author() ? get_query_var( 'author' ) : 0;
+	$defaults['selected'] = is_author() ? get_query_var('author') : 0;
 
-	$r = wp_parse_args( $args, $defaults );
+	$r = wp_parse_args($args, $defaults);
 
-	$query_args = wp_array_slice_assoc( $r, array( 'blog_id', 'include', 'exclude', 'orderby', 'order', 'who' ) );
+	$query_args = wp_array_slice_assoc($r, array('blog_id', 'include', 'exclude', 'orderby', 'order', 'who'));
 
-	$fields = array( 'ID', 'user_login' );
+	$fields = array('ID', 'user_login');
 
-	$show = ! empty( $r['show'] ) ? $r['show'] : 'display_name';
-	if ( 'display_name_with_login' === $show ) {
+	$show = ! empty($r['show']) ? $r['show'] : 'display_name';
+	if ('display_name_with_login' === $show) {
 		$fields[] = 'display_name';
 	} else {
 		$fields[] = $show;
@@ -1028,56 +1028,56 @@ 
 	 * @param array $query_args The query arguments for wp_dropdown_users().
 	 * @param array $r          The default arguments for wp_dropdown_users().
 	 */
-	$query_args = apply_filters( 'wp_dropdown_users_args', $query_args, $r );
+	$query_args = apply_filters('wp_dropdown_users_args', $query_args, $r);
 
-	$users = get_users( $query_args );
+	$users = get_users($query_args);
 
 	$output = '';
-	if ( ! empty( $users ) && ( empty( $r['hide_if_only_one_author'] ) || count( $users ) > 1 ) ) {
-		$name = esc_attr( $r['name'] );
-		if ( $r['multi'] && ! $r['id'] ) {
+	if ( ! empty($users) && (empty($r['hide_if_only_one_author']) || count($users) > 1)) {
+		$name = esc_attr($r['name']);
+		if ($r['multi'] && ! $r['id']) {
 			$id = '';
 		} else {
-			$id = $r['id'] ? " id='" . esc_attr( $r['id'] ) . "'" : " id='$name'";
+			$id = $r['id'] ? " id='".esc_attr($r['id'])."'" : " id='$name'";
 		}
-		$output = "<select name='{$name}'{$id} class='" . $r['class'] . "'>\n";
+		$output = "<select name='{$name}'{$id} class='".$r['class']."'>\n";
 
-		if ( $show_option_all ) {
+		if ($show_option_all) {
 			$output .= "\t<option value='0'>$show_option_all</option>\n";
 		}
 
-		if ( $show_option_none ) {
-			$_selected = selected( $option_none_value, $r['selected'], false );
-			$output .= "\t<option value='" . esc_attr( $option_none_value ) . "'$_selected>$show_option_none</option>\n";
+		if ($show_option_none) {
+			$_selected = selected($option_none_value, $r['selected'], false);
+			$output .= "\t<option value='".esc_attr($option_none_value)."'$_selected>$show_option_none</option>\n";
 		}
 
-		if ( $r['include_selected'] && ( $r['selected'] > 0 ) ) {
+		if ($r['include_selected'] && ($r['selected'] > 0)) {
 			$found_selected = false;
 			$r['selected'] = (int) $r['selected'];
-			foreach ( (array) $users as $user ) {
+			foreach ((array) $users as $user) {
 				$user->ID = (int) $user->ID;
-				if ( $user->ID === $r['selected'] ) {
+				if ($user->ID === $r['selected']) {
 					$found_selected = true;
 				}
 			}
 
-			if ( ! $found_selected ) {
-				$users[] = get_userdata( $r['selected'] );
+			if ( ! $found_selected) {
+				$users[] = get_userdata($r['selected']);
 			}
 		}
 
-		foreach ( (array) $users as $user ) {
-			if ( 'display_name_with_login' === $show ) {
+		foreach ((array) $users as $user) {
+			if ('display_name_with_login' === $show) {
 				/* translators: 1: display name, 2: user_login */
-				$display = sprintf( _x( '%1$s (%2$s)', 'user dropdown' ), $user->display_name, $user->user_login );
-			} elseif ( ! empty( $user->$show ) ) {
+				$display = sprintf(_x('%1$s (%2$s)', 'user dropdown'), $user->display_name, $user->user_login);
+			} elseif ( ! empty($user->$show)) {
 				$display = $user->$show;
 			} else {
-				$display = '(' . $user->user_login . ')';
+				$display = '('.$user->user_login.')';
 			}
 
-			$_selected = selected( $user->ID, $r['selected'], false );
-			$output .= "\t<option value='$user->ID'$_selected>" . esc_html( $display ) . "</option>\n";
+			$_selected = selected($user->ID, $r['selected'], false);
+			$output .= "\t<option value='$user->ID'$_selected>".esc_html($display)."</option>\n";
 		}
 
 		$output .= "</select>";
@@ -1090,9 +1090,9 @@ 
 	 *
 	 * @param string $output HTML output generated by wp_dropdown_users().
 	 */
-	$html = apply_filters( 'wp_dropdown_users', $output );
+	$html = apply_filters('wp_dropdown_users', $output);
 
-	if ( $r['echo'] ) {
+	if ($r['echo']) {
 		echo $html;
 	}
 	return $html;
@@ -1116,22 +1116,22 @@ 
  */
 function sanitize_user_field($field, $value, $user_id, $context) {
 	$int_fields = array('ID');
-	if ( in_array($field, $int_fields) )
+	if (in_array($field, $int_fields))
 		$value = (int) $value;
 
-	if ( 'raw' == $context )
+	if ('raw' == $context)
 		return $value;
 
-	if ( !is_string($value) && !is_numeric($value) )
+	if ( ! is_string($value) && ! is_numeric($value))
 		return $value;
 
-	$prefixed = false !== strpos( $field, 'user_' );
+	$prefixed = false !== strpos($field, 'user_');
 
-	if ( 'edit' == $context ) {
-		if ( $prefixed ) {
+	if ('edit' == $context) {
+		if ($prefixed) {
 
 			/** This filter is documented in wp-includes/post.php */
-			$value = apply_filters( "edit_{$field}", $value, $user_id );
+			$value = apply_filters("edit_{$field}", $value, $user_id);
 		} else {
 
 			/**
@@ -1145,17 +1145,17 @@ 
 			 * @param mixed $value   Value of the prefixed user field.
 			 * @param int   $user_id User ID.
 			 */
-			$value = apply_filters( "edit_user_{$field}", $value, $user_id );
+			$value = apply_filters("edit_user_{$field}", $value, $user_id);
 		}
 
-		if ( 'description' == $field )
-			$value = esc_html( $value ); // textarea_escaped?
+		if ('description' == $field)
+			$value = esc_html($value); // textarea_escaped?
 		else
 			$value = esc_attr($value);
-	} elseif ( 'db' == $context ) {
-		if ( $prefixed ) {
+	} elseif ('db' == $context) {
+		if ($prefixed) {
 			/** This filter is documented in wp-includes/post.php */
-			$value = apply_filters( "pre_{$field}", $value );
+			$value = apply_filters("pre_{$field}", $value);
 		} else {
 
 			/**
@@ -1168,14 +1168,14 @@ 
 			 *
 			 * @param mixed $value Value of the prefixed user field.
 			 */
-			$value = apply_filters( "pre_user_{$field}", $value );
+			$value = apply_filters("pre_user_{$field}", $value);
 		}
 	} else {
 		// Use display filters by default.
-		if ( $prefixed ) {
+		if ($prefixed) {
 
 			/** This filter is documented in wp-includes/post.php */
-			$value = apply_filters( $field, $value, $user_id, $context );
+			$value = apply_filters($field, $value, $user_id, $context);
 		} else {
 
 			/**
@@ -1190,17 +1190,17 @@ 
 			 * @param int    $user_id User ID.
 			 * @param string $context The context to filter within.
 			 */
-			$value = apply_filters( "user_{$field}", $value, $user_id, $context );
+			$value = apply_filters("user_{$field}", $value, $user_id, $context);
 		}
 	}
 
-	if ( 'user_url' == $field )
+	if ('user_url' == $field)
 		$value = esc_url($value);
 
-	if ( 'attribute' == $context ) {
-		$value = esc_attr( $value );
-	} elseif ( 'js' == $context ) {
-		$value = esc_js( $value );
+	if ('attribute' == $context) {
+		$value = esc_attr($value);
+	} elseif ('js' == $context) {
+		$value = esc_js($value);
 	}
 	return $value;
 }
@@ -1213,9 +1213,9 @@ 
  * @param object|WP_User $user User object to be cached
  * @return bool|null Returns false on failure.
  */
-function update_user_caches( $user ) {
-	if ( $user instanceof WP_User ) {
-		if ( ! $user->exists() ) {
+function update_user_caches($user) {
+	if ($user instanceof WP_User) {
+		if ( ! $user->exists()) {
 			return false;
 		}
 
@@ -1236,17 +1236,17 @@ 
  *
  * @param WP_User|int $user User object or ID to be cleaned from the cache
  */
-function clean_user_cache( $user ) {
-	if ( is_numeric( $user ) )
-		$user = new WP_User( $user );
+function clean_user_cache($user) {
+	if (is_numeric($user))
+		$user = new WP_User($user);
 
-	if ( ! $user->exists() )
+	if ( ! $user->exists())
 		return;
 
-	wp_cache_delete( $user->ID, 'users' );
-	wp_cache_delete( $user->user_login, 'userlogins' );
-	wp_cache_delete( $user->user_email, 'useremail' );
-	wp_cache_delete( $user->user_nicename, 'userslugs' );
+	wp_cache_delete($user->ID, 'users');
+	wp_cache_delete($user->user_login, 'userlogins');
+	wp_cache_delete($user->user_email, 'useremail');
+	wp_cache_delete($user->user_nicename, 'userslugs');
 
 	/**
 	 * Fires immediately after the given user's cache is cleaned.
@@ -1256,7 +1256,7 @@ 
 	 * @param int     $user_id User ID.
 	 * @param WP_User $user    User object.
 	 */
-	do_action( 'clean_user_cache', $user->ID, $user );
+	do_action('clean_user_cache', $user->ID, $user);
 }
 
 /**
@@ -1267,8 +1267,8 @@ 
  * @param string $username Username.
  * @return int|false The user's ID on success, and false on failure.
  */
-function username_exists( $username ) {
-	if ( $user = get_user_by( 'login', $username ) ) {
+function username_exists($username) {
+	if ($user = get_user_by('login', $username)) {
 		return $user->ID;
 	}
 	return false;
@@ -1282,8 +1282,8 @@ 
  * @param string $email Email.
  * @return int|false The user's ID on success, and false on failure.
  */
-function email_exists( $email ) {
-	if ( $user = get_user_by( 'email', $email) ) {
+function email_exists($email) {
+	if ($user = get_user_by('email', $email)) {
 		return $user->ID;
 	}
 	return false;
@@ -1298,9 +1298,9 @@ 
  * @param string $username Username.
  * @return bool Whether username given is valid
  */
-function validate_username( $username ) {
-	$sanitized = sanitize_user( $username, true );
-	$valid = ( $sanitized == $username && ! empty( $sanitized ) );
+function validate_username($username) {
+	$sanitized = sanitize_user($username, true);
+	$valid = ($sanitized == $username && ! empty($sanitized));
 
 	/**
 	 * Filter whether the provided username is valid or not.
@@ -1310,7 +1310,7 @@ 
 	 * @param bool   $valid    Whether given username is valid.
 	 * @param string $username Username to check.
 	 */
-	return apply_filters( 'validate_username', $valid, $username );
+	return apply_filters('validate_username', $valid, $username);
 }
 
 /**
@@ -1363,34 +1363,34 @@ 
  * @return int|WP_Error The newly created user's ID or a WP_Error object if the user could not
  *                      be created.
  */
-function wp_insert_user( $userdata ) {
+function wp_insert_user($userdata) {
 	global $wpdb;
 
-	if ( $userdata instanceof stdClass ) {
-		$userdata = get_object_vars( $userdata );
-	} elseif ( $userdata instanceof WP_User ) {
+	if ($userdata instanceof stdClass) {
+		$userdata = get_object_vars($userdata);
+	} elseif ($userdata instanceof WP_User) {
 		$userdata = $userdata->to_array();
 	}
 
 	// Are we updating or creating?
-	if ( ! empty( $userdata['ID'] ) ) {
+	if ( ! empty($userdata['ID'])) {
 		$ID = (int) $userdata['ID'];
 		$update = true;
-		$old_user_data = get_userdata( $ID );
+		$old_user_data = get_userdata($ID);
 
-		if ( ! $old_user_data ) {
-			return new WP_Error( 'invalid_user_id', __( 'Invalid user ID.' ) );
+		if ( ! $old_user_data) {
+			return new WP_Error('invalid_user_id', __('Invalid user ID.'));
 		}
 
 		// hashed in wp_update_user(), plaintext if called directly
-		$user_pass = ! empty( $userdata['user_pass'] ) ? $userdata['user_pass'] : $old_user_data->user_pass;
+		$user_pass = ! empty($userdata['user_pass']) ? $userdata['user_pass'] : $old_user_data->user_pass;
 	} else {
 		$update = false;
 		// Hash the password
-		$user_pass = wp_hash_password( $userdata['user_pass'] );
+		$user_pass = wp_hash_password($userdata['user_pass']);
 	}
 
-	$sanitized_user_login = sanitize_user( $userdata['user_login'], true );
+	$sanitized_user_login = sanitize_user($userdata['user_login'], true);
 
 	/**
 	 * Filter a username after it has been sanitized.
@@ -1401,20 +1401,20 @@ 
 	 *
 	 * @param string $sanitized_user_login Username after it has been sanitized.
 	 */
-	$pre_user_login = apply_filters( 'pre_user_login', $sanitized_user_login );
+	$pre_user_login = apply_filters('pre_user_login', $sanitized_user_login);
 
 	//Remove any non-printable chars from the login string to see if we have ended up with an empty username
-	$user_login = trim( $pre_user_login );
+	$user_login = trim($pre_user_login);
 
 	// user_login must be between 0 and 60 characters.
-	if ( empty( $user_login ) ) {
-		return new WP_Error('empty_user_login', __('Cannot create a user with an empty login name.') );
-	} elseif ( mb_strlen( $user_login ) > 60 ) {
-		return new WP_Error( 'user_login_too_long', __( 'Username may not be longer than 60 characters.' ) );
+	if (empty($user_login)) {
+		return new WP_Error('empty_user_login', __('Cannot create a user with an empty login name.'));
+	} elseif (mb_strlen($user_login) > 60) {
+		return new WP_Error('user_login_too_long', __('Username may not be longer than 60 characters.'));
 	}
 
-	if ( ! $update && username_exists( $user_login ) ) {
-		return new WP_Error( 'existing_user_login', __( 'Sorry, that username already exists!' ) );
+	if ( ! $update && username_exists($user_login)) {
+		return new WP_Error('existing_user_login', __('Sorry, that username already exists!'));
 	}
 
 	/**
@@ -1424,26 +1424,26 @@ 
 	 *
 	 * @param array $usernames Array of blacklisted usernames.
 	 */
-	$illegal_logins = (array) apply_filters( 'illegal_user_logins', array() );
+	$illegal_logins = (array) apply_filters('illegal_user_logins', array());
 
-	if ( in_array( strtolower( $user_login ), array_map( 'strtolower', $illegal_logins ) ) ) {
-		return new WP_Error( 'invalid_username', __( 'Sorry, that username is not allowed.' ) );
+	if (in_array(strtolower($user_login), array_map('strtolower', $illegal_logins))) {
+		return new WP_Error('invalid_username', __('Sorry, that username is not allowed.'));
 	}
 
 	/*
 	 * If a nicename is provided, remove unsafe user characters before using it.
 	 * Otherwise build a nicename from the user_login.
 	 */
-	if ( ! empty( $userdata['user_nicename'] ) ) {
-		$user_nicename = sanitize_user( $userdata['user_nicename'], true );
-		if ( mb_strlen( $user_nicename ) > 50 ) {
-			return new WP_Error( 'user_nicename_too_long', __( 'Nicename may not be longer than 50 characters.' ) );
+	if ( ! empty($userdata['user_nicename'])) {
+		$user_nicename = sanitize_user($userdata['user_nicename'], true);
+		if (mb_strlen($user_nicename) > 50) {
+			return new WP_Error('user_nicename_too_long', __('Nicename may not be longer than 50 characters.'));
 		}
 	} else {
-		$user_nicename = mb_substr( $user_login, 0, 50 );
+		$user_nicename = mb_substr($user_login, 0, 50);
 	}
 
-	$user_nicename = sanitize_title( $user_nicename );
+	$user_nicename = sanitize_title($user_nicename);
 
 	// Store values to save in user meta.
 	$meta = array();
@@ -1455,9 +1455,9 @@ 
 	 *
 	 * @param string $user_nicename The user's nicename.
 	 */
-	$user_nicename = apply_filters( 'pre_user_nicename', $user_nicename );
+	$user_nicename = apply_filters('pre_user_nicename', $user_nicename);
 
-	$raw_user_url = empty( $userdata['user_url'] ) ? '' : $userdata['user_url'];
+	$raw_user_url = empty($userdata['user_url']) ? '' : $userdata['user_url'];
 
 	/**
 	 * Filter a user's URL before the user is created or updated.
@@ -1466,9 +1466,9 @@ 
 	 *
 	 * @param string $raw_user_url The user's URL.
 	 */
-	$user_url = apply_filters( 'pre_user_url', $raw_user_url );
+	$user_url = apply_filters('pre_user_url', $raw_user_url);
 
-	$raw_user_email = empty( $userdata['user_email'] ) ? '' : $userdata['user_email'];
+	$raw_user_email = empty($userdata['user_email']) ? '' : $userdata['user_email'];
 
 	/**
 	 * Filter a user's email before the user is created or updated.
@@ -1477,20 +1477,20 @@ 
 	 *
 	 * @param string $raw_user_email The user's email.
 	 */
-	$user_email = apply_filters( 'pre_user_email', $raw_user_email );
+	$user_email = apply_filters('pre_user_email', $raw_user_email);
 
 	/*
 	 * If there is no update, just check for `email_exists`. If there is an update,
 	 * check if current email and new email are the same, or not, and check `email_exists`
 	 * accordingly.
 	 */
-	if ( ( ! $update || ( ! empty( $old_user_data ) && 0 !== strcasecmp( $user_email, $old_user_data->user_email ) ) )
-		&& ! defined( 'WP_IMPORTING' )
-		&& email_exists( $user_email )
+	if (( ! $update || ( ! empty($old_user_data) && 0 !== strcasecmp($user_email, $old_user_data->user_email)))
+		&& ! defined('WP_IMPORTING')
+		&& email_exists($user_email)
 	) {
-		return new WP_Error( 'existing_user_email', __( 'Sorry, that email address is already used!' ) );
+		return new WP_Error('existing_user_email', __('Sorry, that email address is already used!'));
 	}
-	$nickname = empty( $userdata['nickname'] ) ? $user_login : $userdata['nickname'];
+	$nickname = empty($userdata['nickname']) ? $user_login : $userdata['nickname'];
 
 	/**
 	 * Filter a user's nickname before the user is created or updated.
@@ -1499,9 +1499,9 @@ 
 	 *
 	 * @param string $nickname The user's nickname.
 	 */
-	$meta['nickname'] = apply_filters( 'pre_user_nickname', $nickname );
+	$meta['nickname'] = apply_filters('pre_user_nickname', $nickname);
 
-	$first_name = empty( $userdata['first_name'] ) ? '' : $userdata['first_name'];
+	$first_name = empty($userdata['first_name']) ? '' : $userdata['first_name'];
 
 	/**
 	 * Filter a user's first name before the user is created or updated.
@@ -1510,9 +1510,9 @@ 
 	 *
 	 * @param string $first_name The user's first name.
 	 */
-	$meta['first_name'] = apply_filters( 'pre_user_first_name', $first_name );
+	$meta['first_name'] = apply_filters('pre_user_first_name', $first_name);
 
-	$last_name = empty( $userdata['last_name'] ) ? '' : $userdata['last_name'];
+	$last_name = empty($userdata['last_name']) ? '' : $userdata['last_name'];
 
 	/**
 	 * Filter a user's last name before the user is created or updated.
@@ -1521,17 +1521,17 @@ 
 	 *
 	 * @param string $last_name The user's last name.
 	 */
-	$meta['last_name'] = apply_filters( 'pre_user_last_name', $last_name );
+	$meta['last_name'] = apply_filters('pre_user_last_name', $last_name);
 
-	if ( empty( $userdata['display_name'] ) ) {
-		if ( $update ) {
+	if (empty($userdata['display_name'])) {
+		if ($update) {
 			$display_name = $user_login;
-		} elseif ( $meta['first_name'] && $meta['last_name'] ) {
+		} elseif ($meta['first_name'] && $meta['last_name']) {
 			/* translators: 1: first name, 2: last name */
-			$display_name = sprintf( _x( '%1$s %2$s', 'Display name based on first name and last name' ), $meta['first_name'], $meta['last_name'] );
-		} elseif ( $meta['first_name'] ) {
+			$display_name = sprintf(_x('%1$s %2$s', 'Display name based on first name and last name'), $meta['first_name'], $meta['last_name']);
+		} elseif ($meta['first_name']) {
 			$display_name = $meta['first_name'];
-		} elseif ( $meta['last_name'] ) {
+		} elseif ($meta['last_name']) {
 			$display_name = $meta['last_name'];
 		} else {
 			$display_name = $user_login;
@@ -1547,9 +1547,9 @@ 
 	 *
 	 * @param string $display_name The user's display name.
 	 */
-	$display_name = apply_filters( 'pre_user_display_name', $display_name );
+	$display_name = apply_filters('pre_user_display_name', $display_name);
 
-	$description = empty( $userdata['description'] ) ? '' : $userdata['description'];
+	$description = empty($userdata['description']) ? '' : $userdata['description'];
 
 	/**
 	 * Filter a user's description before the user is created or updated.
@@ -1558,50 +1558,50 @@ 
 	 *
 	 * @param string $description The user's description.
 	 */
-	$meta['description'] = apply_filters( 'pre_user_description', $description );
+	$meta['description'] = apply_filters('pre_user_description', $description);
 
-	$meta['rich_editing'] = empty( $userdata['rich_editing'] ) ? 'true' : $userdata['rich_editing'];
+	$meta['rich_editing'] = empty($userdata['rich_editing']) ? 'true' : $userdata['rich_editing'];
 
-	$meta['comment_shortcuts'] = empty( $userdata['comment_shortcuts'] ) || 'false' === $userdata['comment_shortcuts'] ? 'false' : 'true';
+	$meta['comment_shortcuts'] = empty($userdata['comment_shortcuts']) || 'false' === $userdata['comment_shortcuts'] ? 'false' : 'true';
 
-	$admin_color = empty( $userdata['admin_color'] ) ? 'fresh' : $userdata['admin_color'];
-	$meta['admin_color'] = preg_replace( '|[^a-z0-9 _.\-@]|i', '', $admin_color );
+	$admin_color = empty($userdata['admin_color']) ? 'fresh' : $userdata['admin_color'];
+	$meta['admin_color'] = preg_replace('|[^a-z0-9 _.\-@]|i', '', $admin_color);
 
-	$meta['use_ssl'] = empty( $userdata['use_ssl'] ) ? 0 : $userdata['use_ssl'];
+	$meta['use_ssl'] = empty($userdata['use_ssl']) ? 0 : $userdata['use_ssl'];
 
-	$user_registered = empty( $userdata['user_registered'] ) ? gmdate( 'Y-m-d H:i:s' ) : $userdata['user_registered'];
+	$user_registered = empty($userdata['user_registered']) ? gmdate('Y-m-d H:i:s') : $userdata['user_registered'];
 
-	$meta['show_admin_bar_front'] = empty( $userdata['show_admin_bar_front'] ) ? 'true' : $userdata['show_admin_bar_front'];
+	$meta['show_admin_bar_front'] = empty($userdata['show_admin_bar_front']) ? 'true' : $userdata['show_admin_bar_front'];
 
-	$user_nicename_check = $wpdb->get_var( $wpdb->prepare("SELECT ID FROM $wpdb->users WHERE user_nicename = %s AND user_login != %s LIMIT 1" , $user_nicename, $user_login));
+	$user_nicename_check = $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->users WHERE user_nicename = %s AND user_login != %s LIMIT 1", $user_nicename, $user_login));
 
-	if ( $user_nicename_check ) {
+	if ($user_nicename_check) {
 		$suffix = 2;
 		while ($user_nicename_check) {
 			// user_nicename allows 50 chars. Subtract one for a hyphen, plus the length of the suffix.
-			$base_length = 49 - mb_strlen( $suffix );
-			$alt_user_nicename = mb_substr( $user_nicename, 0, $base_length ) . "-$suffix";
-			$user_nicename_check = $wpdb->get_var( $wpdb->prepare("SELECT ID FROM $wpdb->users WHERE user_nicename = %s AND user_login != %s LIMIT 1" , $alt_user_nicename, $user_login));
+			$base_length = 49 - mb_strlen($suffix);
+			$alt_user_nicename = mb_substr($user_nicename, 0, $base_length)."-$suffix";
+			$user_nicename_check = $wpdb->get_var($wpdb->prepare("SELECT ID FROM $wpdb->users WHERE user_nicename = %s AND user_login != %s LIMIT 1", $alt_user_nicename, $user_login));
 			$suffix++;
 		}
 		$user_nicename = $alt_user_nicename;
 	}
 
-	$compacted = compact( 'user_pass', 'user_email', 'user_url', 'user_nicename', 'display_name', 'user_registered' );
-	$data = wp_unslash( $compacted );
+	$compacted = compact('user_pass', 'user_email', 'user_url', 'user_nicename', 'display_name', 'user_registered');
+	$data = wp_unslash($compacted);
 
-	if ( $update ) {
-		if ( $user_email !== $old_user_data->user_email ) {
+	if ($update) {
+		if ($user_email !== $old_user_data->user_email) {
 			$data['user_activation_key'] = '';
 		}
-		$wpdb->update( $wpdb->users, $data, compact( 'ID' ) );
+		$wpdb->update($wpdb->users, $data, compact('ID'));
 		$user_id = (int) $ID;
 	} else {
-		$wpdb->insert( $wpdb->users, $data + compact( 'user_login' ) );
+		$wpdb->insert($wpdb->users, $data + compact('user_login'));
 		$user_id = (int) $wpdb->insert_id;
 	}
 
-	$user = new WP_User( $user_id );
+	$user = new WP_User($user_id);
 
 	/**
  	 * Filter a user's meta values and keys before the user is created or updated.
@@ -1628,28 +1628,28 @@ 
 	 * @param WP_User $user   User object.
 	 * @param bool    $update Whether the user is being updated rather than created.
  	 */
-	$meta = apply_filters( 'insert_user_meta', $meta, $user, $update );
+	$meta = apply_filters('insert_user_meta', $meta, $user, $update);
 
 	// Update user meta.
-	foreach ( $meta as $key => $value ) {
-		update_user_meta( $user_id, $key, $value );
+	foreach ($meta as $key => $value) {
+		update_user_meta($user_id, $key, $value);
 	}
 
-	foreach ( wp_get_user_contact_methods( $user ) as $key => $value ) {
-		if ( isset( $userdata[ $key ] ) ) {
-			update_user_meta( $user_id, $key, $userdata[ $key ] );
+	foreach (wp_get_user_contact_methods($user) as $key => $value) {
+		if (isset($userdata[$key])) {
+			update_user_meta($user_id, $key, $userdata[$key]);
 		}
 	}
 
-	if ( isset( $userdata['role'] ) ) {
-		$user->set_role( $userdata['role'] );
-	} elseif ( ! $update ) {
+	if (isset($userdata['role'])) {
+		$user->set_role($userdata['role']);
+	} elseif ( ! $update) {
 		$user->set_role(get_option('default_role'));
 	}
-	wp_cache_delete( $user_id, 'users' );
-	wp_cache_delete( $user_login, 'userlogins' );
+	wp_cache_delete($user_id, 'users');
+	wp_cache_delete($user_login, 'userlogins');
 
-	if ( $update ) {
+	if ($update) {
 		/**
 		 * Fires immediately after an existing user is updated.
 		 *
@@ -1658,7 +1658,7 @@ 
 		 * @param int    $user_id       User ID.
 		 * @param object $old_user_data Object containing user's data prior to update.
 		 */
-		do_action( 'profile_update', $user_id, $old_user_data );
+		do_action('profile_update', $user_id, $old_user_data);
 	} else {
 		/**
 		 * Fires immediately after a new user is registered.
@@ -1667,7 +1667,7 @@ 
 		 *
 		 * @param int $user_id User ID.
 		 */
-		do_action( 'user_register', $user_id );
+		do_action('user_register', $user_id);
 	}
 
 	return $user_id;
@@ -1690,37 +1690,37 @@ 
  * @return int|WP_Error The updated user's ID or a WP_Error object if the user could not be updated.
  */
 function wp_update_user($userdata) {
-	if ( $userdata instanceof stdClass ) {
-		$userdata = get_object_vars( $userdata );
-	} elseif ( $userdata instanceof WP_User ) {
+	if ($userdata instanceof stdClass) {
+		$userdata = get_object_vars($userdata);
+	} elseif ($userdata instanceof WP_User) {
 		$userdata = $userdata->to_array();
 	}
 
-	$ID = isset( $userdata['ID'] ) ? (int) $userdata['ID'] : 0;
-	if ( ! $ID ) {
-		return new WP_Error( 'invalid_user_id', __( 'Invalid user ID.' ) );
+	$ID = isset($userdata['ID']) ? (int) $userdata['ID'] : 0;
+	if ( ! $ID) {
+		return new WP_Error('invalid_user_id', __('Invalid user ID.'));
 	}
 
 	// First, get all of the original fields
-	$user_obj = get_userdata( $ID );
-	if ( ! $user_obj ) {
-		return new WP_Error( 'invalid_user_id', __( 'Invalid user ID.' ) );
+	$user_obj = get_userdata($ID);
+	if ( ! $user_obj) {
+		return new WP_Error('invalid_user_id', __('Invalid user ID.'));
 	}
 
 	$user = $user_obj->to_array();
 
 	// Add additional custom fields
-	foreach ( _get_additional_user_keys( $user_obj ) as $key ) {
-		$user[ $key ] = get_user_meta( $ID, $key, true );
+	foreach (_get_additional_user_keys($user_obj) as $key) {
+		$user[$key] = get_user_meta($ID, $key, true);
 	}
 
 	// Escape data pulled from DB.
-	$user = add_magic_quotes( $user );
+	$user = add_magic_quotes($user);
 
-	if ( ! empty( $userdata['user_pass'] ) && $userdata['user_pass'] !== $user_obj->user_pass ) {
+	if ( ! empty($userdata['user_pass']) && $userdata['user_pass'] !== $user_obj->user_pass) {
 		// If password is changing, hash it now
 		$plaintext_pass = $userdata['user_pass'];
-		$userdata['user_pass'] = wp_hash_password( $userdata['user_pass'] );
+		$userdata['user_pass'] = wp_hash_password($userdata['user_pass']);
 
 		/**
 		 * Filter whether to send the password change email.
@@ -1734,10 +1734,10 @@ 
 		 * @param array $userdata The updated user array.
 		 *
 		 */
-		$send_password_change_email = apply_filters( 'send_password_change_email', true, $user, $userdata );
+		$send_password_change_email = apply_filters('send_password_change_email', true, $user, $userdata);
 	}
 
-	if ( isset( $userdata['user_email'] ) && $user['user_email'] !== $userdata['user_email'] ) {
+	if (isset($userdata['user_email']) && $user['user_email'] !== $userdata['user_email']) {
 		/**
 		 * Filter whether to send the email change email.
 		 *
@@ -1750,24 +1750,24 @@ 
 		 * @param array $userdata The updated user array.
 		 *
 		 */
-		$send_email_change_email = apply_filters( 'send_email_change_email', true, $user, $userdata );
+		$send_email_change_email = apply_filters('send_email_change_email', true, $user, $userdata);
 	}
 
-	wp_cache_delete( $user['user_email'], 'useremail' );
-	wp_cache_delete( $user['user_nicename'], 'userslugs' );
+	wp_cache_delete($user['user_email'], 'useremail');
+	wp_cache_delete($user['user_nicename'], 'userslugs');
 
 	// Merge old and new fields with new fields overwriting old ones.
-	$userdata = array_merge( $user, $userdata );
-	$user_id = wp_insert_user( $userdata );
+	$userdata = array_merge($user, $userdata);
+	$user_id = wp_insert_user($userdata);
 
-	if ( ! is_wp_error( $user_id ) ) {
+	if ( ! is_wp_error($user_id)) {
 
-		$blog_name = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
+		$blog_name = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
 
-		if ( ! empty( $send_password_change_email ) ) {
+		if ( ! empty($send_password_change_email)) {
 
 			/* translators: Do not translate USERNAME, ADMIN_EMAIL, EMAIL, SITENAME, SITEURL: those are placeholders. */
-			$pass_change_text = __( 'Hi ###USERNAME###,
+			$pass_change_text = __('Hi ###USERNAME###,
 
 This notice confirms that your password was changed on ###SITENAME###.
 
@@ -1782,7 +1782,7 @@ 
 
 			$pass_change_email = array(
 				'to'      => $user['user_email'],
-				'subject' => __( '[%s] Notice of Password Change' ),
+				'subject' => __('[%s] Notice of Password Change'),
 				'message' => $pass_change_text,
 				'headers' => '',
 			);
@@ -1809,20 +1809,20 @@ 
 			 * @param array $userdata The updated user array.
 			 *
 			 */
-			$pass_change_email = apply_filters( 'password_change_email', $pass_change_email, $user, $userdata );
+			$pass_change_email = apply_filters('password_change_email', $pass_change_email, $user, $userdata);
 
-			$pass_change_email['message'] = str_replace( '###USERNAME###', $user['user_login'], $pass_change_email['message'] );
-			$pass_change_email['message'] = str_replace( '###ADMIN_EMAIL###', get_option( 'admin_email' ), $pass_change_email['message'] );
-			$pass_change_email['message'] = str_replace( '###EMAIL###', $user['user_email'], $pass_change_email['message'] );
-			$pass_change_email['message'] = str_replace( '###SITENAME###', $blog_name, $pass_change_email['message'] );
-			$pass_change_email['message'] = str_replace( '###SITEURL###', home_url(), $pass_change_email['message'] );
+			$pass_change_email['message'] = str_replace('###USERNAME###', $user['user_login'], $pass_change_email['message']);
+			$pass_change_email['message'] = str_replace('###ADMIN_EMAIL###', get_option('admin_email'), $pass_change_email['message']);
+			$pass_change_email['message'] = str_replace('###EMAIL###', $user['user_email'], $pass_change_email['message']);
+			$pass_change_email['message'] = str_replace('###SITENAME###', $blog_name, $pass_change_email['message']);
+			$pass_change_email['message'] = str_replace('###SITEURL###', home_url(), $pass_change_email['message']);
 
-			wp_mail( $pass_change_email['to'], sprintf( $pass_change_email['subject'], $blog_name ), $pass_change_email['message'], $pass_change_email['headers'] );
+			wp_mail($pass_change_email['to'], sprintf($pass_change_email['subject'], $blog_name), $pass_change_email['message'], $pass_change_email['headers']);
 		}
 
-		if ( ! empty( $send_email_change_email ) ) {
+		if ( ! empty($send_email_change_email)) {
 			/* translators: Do not translate USERNAME, ADMIN_EMAIL, EMAIL, SITENAME, SITEURL: those are placeholders. */
-			$email_change_text = __( 'Hi ###USERNAME###,
+			$email_change_text = __('Hi ###USERNAME###,
 
 This notice confirms that your email was changed on ###SITENAME###.
 
@@ -1837,7 +1837,7 @@ 
 
 			$email_change_email = array(
 				'to'      => $user['user_email'],
-				'subject' => __( '[%s] Notice of Email Change' ),
+				'subject' => __('[%s] Notice of Email Change'),
 				'message' => $email_change_text,
 				'headers' => '',
 			);
@@ -1863,32 +1863,32 @@ 
 			 * @param array $user The original user array.
 			 * @param array $userdata The updated user array.
 			 */
-			$email_change_email = apply_filters( 'email_change_email', $email_change_email, $user, $userdata );
+			$email_change_email = apply_filters('email_change_email', $email_change_email, $user, $userdata);
 
-			$email_change_email['message'] = str_replace( '###USERNAME###', $user['user_login'], $email_change_email['message'] );
-			$email_change_email['message'] = str_replace( '###ADMIN_EMAIL###', get_option( 'admin_email' ), $email_change_email['message'] );
-			$email_change_email['message'] = str_replace( '###EMAIL###', $user['user_email'], $email_change_email['message'] );
-			$email_change_email['message'] = str_replace( '###SITENAME###', $blog_name, $email_change_email['message'] );
-			$email_change_email['message'] = str_replace( '###SITEURL###', home_url(), $email_change_email['message'] );
+			$email_change_email['message'] = str_replace('###USERNAME###', $user['user_login'], $email_change_email['message']);
+			$email_change_email['message'] = str_replace('###ADMIN_EMAIL###', get_option('admin_email'), $email_change_email['message']);
+			$email_change_email['message'] = str_replace('###EMAIL###', $user['user_email'], $email_change_email['message']);
+			$email_change_email['message'] = str_replace('###SITENAME###', $blog_name, $email_change_email['message']);
+			$email_change_email['message'] = str_replace('###SITEURL###', home_url(), $email_change_email['message']);
 
-			wp_mail( $email_change_email['to'], sprintf( $email_change_email['subject'], $blog_name ), $email_change_email['message'], $email_change_email['headers'] );
+			wp_mail($email_change_email['to'], sprintf($email_change_email['subject'], $blog_name), $email_change_email['message'], $email_change_email['headers']);
 		}
 	}
 
 	// Update the cookies if the password changed.
 	$current_user = wp_get_current_user();
-	if ( $current_user->ID == $ID ) {
-		if ( isset($plaintext_pass) ) {
+	if ($current_user->ID == $ID) {
+		if (isset($plaintext_pass)) {
 			wp_clear_auth_cookie();
 
 			// Here we calculate the expiration length of the current auth cookie and compare it to the default expiration.
 			// If it's greater than this, then we know the user checked 'Remember Me' when they logged in.
-			$logged_in_cookie    = wp_parse_auth_cookie( '', 'logged_in' );
+			$logged_in_cookie    = wp_parse_auth_cookie('', 'logged_in');
 			/** This filter is documented in wp-includes/pluggable.php */
-			$default_cookie_life = apply_filters( 'auth_cookie_expiration', ( 2 * DAY_IN_SECONDS ), $ID, false );
-			$remember            = ( ( $logged_in_cookie['expiration'] - time() ) > $default_cookie_life );
+			$default_cookie_life = apply_filters('auth_cookie_expiration', (2 * DAY_IN_SECONDS), $ID, false);
+			$remember            = (($logged_in_cookie['expiration'] - time()) > $default_cookie_life);
 
-			wp_set_auth_cookie( $ID, $remember );
+			wp_set_auth_cookie($ID, $remember);
 		}
 	}
 
@@ -1911,8 +1911,8 @@ 
  *                      be created.
  */
 function wp_create_user($username, $password, $email = '') {
-	$user_login = wp_slash( $username );
-	$user_email = wp_slash( $email    );
+	$user_login = wp_slash($username);
+	$user_email = wp_slash($email);
 	$user_pass = $password;
 
 	$userdata = compact('user_login', 'user_email', 'user_pass');
@@ -1931,9 +1931,9 @@ 
  * @param WP_User $user WP_User instance.
  * @return array List of user keys to be populated in wp_update_user().
  */
-function _get_additional_user_keys( $user ) {
-	$keys = array( 'first_name', 'last_name', 'nickname', 'description', 'rich_editing', 'comment_shortcuts', 'admin_color', 'use_ssl', 'show_admin_bar_front' );
-	return array_merge( $keys, array_keys( wp_get_user_contact_methods( $user ) ) );
+function _get_additional_user_keys($user) {
+	$keys = array('first_name', 'last_name', 'nickname', 'description', 'rich_editing', 'comment_shortcuts', 'admin_color', 'use_ssl', 'show_admin_bar_front');
+	return array_merge($keys, array_keys(wp_get_user_contact_methods($user)));
 }
 
 /**
@@ -1946,13 +1946,13 @@ 
  * @param WP_User $user Optional. WP_User object.
  * @return array Array of contact methods and their labels.
  */
-function wp_get_user_contact_methods( $user = null ) {
+function wp_get_user_contact_methods($user = null) {
 	$methods = array();
-	if ( get_site_option( 'initial_db_version' ) < 23588 ) {
+	if (get_site_option('initial_db_version') < 23588) {
 		$methods = array(
-			'aim'    => __( 'AIM' ),
-			'yim'    => __( 'Yahoo IM' ),
-			'jabber' => __( 'Jabber / Google Talk' )
+			'aim'    => __('AIM'),
+			'yim'    => __('Yahoo IM'),
+			'jabber' => __('Jabber / Google Talk')
 		);
 	}
 
@@ -1964,7 +1964,7 @@ 
 	 * @param array   $methods Array of contact methods and their labels.
  	 * @param WP_User $user    WP_User object.
 	 */
-	return apply_filters( 'user_contactmethods', $methods, $user );
+	return apply_filters('user_contactmethods', $methods, $user);
 }
 
 /**
@@ -1978,8 +1978,8 @@ 
  * @param WP_User $user Optional. WP_User object. Default null.
  * @return array Array of contact methods and their labels.
  */
-function _wp_get_user_contactmethods( $user = null ) {
-	return wp_get_user_contact_methods( $user );
+function _wp_get_user_contactmethods($user = null) {
+	return wp_get_user_contact_methods($user);
 }
 
 /**
@@ -1990,7 +1990,7 @@ 
  * @return string The password hint text.
  */
 function wp_get_password_hint() {
-	$hint = __( 'Hint: The password should be at least twelve characters long. To make it stronger, use upper and lower case letters, numbers, and symbols like ! " ? $ % ^ &amp; ).' );
+	$hint = __('Hint: The password should be at least twelve characters long. To make it stronger, use upper and lower case letters, numbers, and symbols like ! " ? $ % ^ &amp; ).');
 
 	/**
 	 * Filter the text describing the site's password complexity policy.
@@ -1999,7 +1999,7 @@ 
 	 *
 	 * @param string $hint The password hint text.
 	 */
-	return apply_filters( 'password_hint', $hint );
+	return apply_filters('password_hint', $hint);
 }
 
 /**
@@ -2014,7 +2014,7 @@ 
  *
  * @return string|WP_Error Password reset key on success. WP_Error on error.
  */
-function get_password_reset_key( $user ) {
+function get_password_reset_key($user) {
 	global $wpdb, $wp_hasher;
 
 	/**
@@ -2025,7 +2025,7 @@ 
 	 *
 	 * @param string $user_login The user login name.
 	 */
-	do_action( 'retreive_password', $user->user_login );
+	do_action('retreive_password', $user->user_login);
 
 	/**
 	 * Fires before a new password is retrieved.
@@ -2034,7 +2034,7 @@ 
 	 *
 	 * @param string $user_login The user login name.
 	 */
-	do_action( 'retrieve_password', $user->user_login );
+	do_action('retrieve_password', $user->user_login);
 
 	/**
 	 * Filter whether to allow a password to be reset.
@@ -2044,16 +2044,16 @@ 
 	 * @param bool $allow         Whether to allow the password to be reset. Default true.
 	 * @param int  $user_data->ID The ID of the user attempting to reset a password.
 	 */
-	$allow = apply_filters( 'allow_password_reset', true, $user->ID );
+	$allow = apply_filters('allow_password_reset', true, $user->ID);
 
-	if ( ! $allow ) {
-		return new WP_Error( 'no_password_reset', __( 'Password reset is not allowed for this user' ) );
-	} elseif ( is_wp_error( $allow ) ) {
+	if ( ! $allow) {
+		return new WP_Error('no_password_reset', __('Password reset is not allowed for this user'));
+	} elseif (is_wp_error($allow)) {
 		return $allow;
 	}
 
 	// Generate something random for a password reset key.
-	$key = wp_generate_password( 20, false );
+	$key = wp_generate_password(20, false);
 
 	/**
 	 * Fires when a password reset key is generated.
@@ -2063,17 +2063,17 @@ 
 	 * @param string $user_login The username for the user.
 	 * @param string $key        The generated password reset key.
 	 */
-	do_action( 'retrieve_password_key', $user->user_login, $key );
+	do_action('retrieve_password_key', $user->user_login, $key);
 
 	// Now insert the key, hashed, into the DB.
-	if ( empty( $wp_hasher ) ) {
-		require_once ABSPATH . WPINC . '/class-phpass.php';
-		$wp_hasher = new PasswordHash( 8, true );
+	if (empty($wp_hasher)) {
+		require_once ABSPATH.WPINC.'/class-phpass.php';
+		$wp_hasher = new PasswordHash(8, true);
 	}
-	$hashed = time() . ':' . $wp_hasher->HashPassword( $key );
-	$key_saved = $wpdb->update( $wpdb->users, array( 'user_activation_key' => $hashed ), array( 'user_login' => $user->user_login ) );
-	if ( false === $key_saved ) {
-		return new WP_Error( 'no_password_key_update', __( 'Could not save password reset key to database.' ) );
+	$hashed = time().':'.$wp_hasher->HashPassword($key);
+	$key_saved = $wpdb->update($wpdb->users, array('user_activation_key' => $hashed), array('user_login' => $user->user_login));
+	if (false === $key_saved) {
+		return new WP_Error('no_password_key_update', __('Could not save password reset key to database.'));
 	}
 
 	return $key;
@@ -2101,19 +2101,19 @@ 
 
 	$key = preg_replace('/[^a-z0-9]/i', '', $key);
 
-	if ( empty( $key ) || !is_string( $key ) )
+	if (empty($key) || ! is_string($key))
 		return new WP_Error('invalid_key', __('Invalid key'));
 
-	if ( empty($login) || !is_string($login) )
+	if (empty($login) || ! is_string($login))
 		return new WP_Error('invalid_key', __('Invalid key'));
 
-	$row = $wpdb->get_row( $wpdb->prepare( "SELECT ID, user_activation_key FROM $wpdb->users WHERE user_login = %s", $login ) );
-	if ( ! $row )
+	$row = $wpdb->get_row($wpdb->prepare("SELECT ID, user_activation_key FROM $wpdb->users WHERE user_login = %s", $login));
+	if ( ! $row)
 		return new WP_Error('invalid_key', __('Invalid key'));
 
-	if ( empty( $wp_hasher ) ) {
-		require_once ABSPATH . WPINC . '/class-phpass.php';
-		$wp_hasher = new PasswordHash( 8, true );
+	if (empty($wp_hasher)) {
+		require_once ABSPATH.WPINC.'/class-phpass.php';
+		$wp_hasher = new PasswordHash(8, true);
 	}
 
 	/**
@@ -2123,31 +2123,31 @@ 
 	 *
 	 * @param int $expiration The expiration time in seconds.
 	 */
-	$expiration_duration = apply_filters( 'password_reset_expiration', DAY_IN_SECONDS );
+	$expiration_duration = apply_filters('password_reset_expiration', DAY_IN_SECONDS);
 
-	if ( false !== strpos( $row->user_activation_key, ':' ) ) {
-		list( $pass_request_time, $pass_key ) = explode( ':', $row->user_activation_key, 2 );
+	if (false !== strpos($row->user_activation_key, ':')) {
+		list($pass_request_time, $pass_key) = explode(':', $row->user_activation_key, 2);
 		$expiration_time = $pass_request_time + $expiration_duration;
 	} else {
 		$pass_key = $row->user_activation_key;
 		$expiration_time = false;
 	}
 
-	if ( ! $pass_key ) {
-		return new WP_Error( 'invalid_key', __( 'Invalid key' ) );
+	if ( ! $pass_key) {
+		return new WP_Error('invalid_key', __('Invalid key'));
 	}
 
-	$hash_is_correct = $wp_hasher->CheckPassword( $key, $pass_key );
+	$hash_is_correct = $wp_hasher->CheckPassword($key, $pass_key);
 
-	if ( $hash_is_correct && $expiration_time && time() < $expiration_time ) {
-		return get_userdata( $row->ID );
-	} elseif ( $hash_is_correct && $expiration_time ) {
+	if ($hash_is_correct && $expiration_time && time() < $expiration_time) {
+		return get_userdata($row->ID);
+	} elseif ($hash_is_correct && $expiration_time) {
 		// Key has an expiration time that's passed
-		return new WP_Error( 'expired_key', __( 'Invalid key' ) );
+		return new WP_Error('expired_key', __('Invalid key'));
 	}
 
-	if ( hash_equals( $row->user_activation_key, $key ) || ( $hash_is_correct && ! $expiration_time ) ) {
-		$return = new WP_Error( 'expired_key', __( 'Invalid key' ) );
+	if (hash_equals($row->user_activation_key, $key) || ($hash_is_correct && ! $expiration_time)) {
+		$return = new WP_Error('expired_key', __('Invalid key'));
 		$user_id = $row->ID;
 
 		/**
@@ -2161,10 +2161,10 @@ 
 		 *                          Return a WP_User object to validate the key.
 		 * @param int      $user_id The matched user ID.
 		 */
-		return apply_filters( 'password_reset_key_expired', $return, $user_id );
+		return apply_filters('password_reset_key_expired', $return, $user_id);
 	}
 
-	return new WP_Error( 'invalid_key', __( 'Invalid key' ) );
+	return new WP_Error('invalid_key', __('Invalid key'));
 }
 
 /**
@@ -2175,7 +2175,7 @@ 
  * @param object $user     The user
  * @param string $new_pass New password for the user in plaintext
  */
-function reset_password( $user, $new_pass ) {
+function reset_password($user, $new_pass) {
 	/**
 	 * Fires before the user's password is reset.
 	 *
@@ -2184,10 +2184,10 @@ 
 	 * @param object $user     The user.
 	 * @param string $new_pass New user password.
 	 */
-	do_action( 'password_reset', $user, $new_pass );
+	do_action('password_reset', $user, $new_pass);
 
-	wp_set_password( $new_pass, $user->ID );
-	update_user_option( $user->ID, 'default_password_nag', false, true );
+	wp_set_password($new_pass, $user->ID);
+	update_user_option($user->ID, 'default_password_nag', false, true);
 
 	/**
 	 * Fires after the user's password is reset.
@@ -2197,7 +2197,7 @@ 
 	 * @param object $user     The user.
 	 * @param string $new_pass New user password.
 	 */
-	do_action( 'after_password_reset', $user, $new_pass );
+	do_action('after_password_reset', $user, $new_pass);
 }
 
 /**
@@ -2209,10 +2209,10 @@ 
  * @param string $user_email User's email address to send password and add
  * @return int|WP_Error Either user's ID or error on failure.
  */
-function register_new_user( $user_login, $user_email ) {
+function register_new_user($user_login, $user_email) {
 	$errors = new WP_Error();
 
-	$sanitized_user_login = sanitize_user( $user_login );
+	$sanitized_user_login = sanitize_user($user_login);
 	/**
 	 * Filter the email address of a user being registered.
 	 *
@@ -2220,33 +2220,33 @@ 
 	 *
 	 * @param string $user_email The email address of the new user.
 	 */
-	$user_email = apply_filters( 'user_registration_email', $user_email );
+	$user_email = apply_filters('user_registration_email', $user_email);
 
 	// Check the username
-	if ( $sanitized_user_login == '' ) {
-		$errors->add( 'empty_username', __( '<strong>ERROR</strong>: Please enter a username.' ) );
-	} elseif ( ! validate_username( $user_login ) ) {
-		$errors->add( 'invalid_username', __( '<strong>ERROR</strong>: This username is invalid because it uses illegal characters. Please enter a valid username.' ) );
+	if ($sanitized_user_login == '') {
+		$errors->add('empty_username', __('<strong>ERROR</strong>: Please enter a username.'));
+	} elseif ( ! validate_username($user_login)) {
+		$errors->add('invalid_username', __('<strong>ERROR</strong>: This username is invalid because it uses illegal characters. Please enter a valid username.'));
 		$sanitized_user_login = '';
-	} elseif ( username_exists( $sanitized_user_login ) ) {
-		$errors->add( 'username_exists', __( '<strong>ERROR</strong>: This username is already registered. Please choose another one.' ) );
+	} elseif (username_exists($sanitized_user_login)) {
+		$errors->add('username_exists', __('<strong>ERROR</strong>: This username is already registered. Please choose another one.'));
 
 	} else {
 		/** This filter is documented in wp-includes/user.php */
-		$illegal_user_logins = array_map( 'strtolower', (array) apply_filters( 'illegal_user_logins', array() ) );
-		if ( in_array( strtolower( $sanitized_user_login ), $illegal_user_logins ) ) {
-			$errors->add( 'invalid_username', __( '<strong>ERROR</strong>: Sorry, that username is not allowed.' ) );
+		$illegal_user_logins = array_map('strtolower', (array) apply_filters('illegal_user_logins', array()));
+		if (in_array(strtolower($sanitized_user_login), $illegal_user_logins)) {
+			$errors->add('invalid_username', __('<strong>ERROR</strong>: Sorry, that username is not allowed.'));
 		}
 	}
 
 	// Check the email address
-	if ( $user_email == '' ) {
-		$errors->add( 'empty_email', __( '<strong>ERROR</strong>: Please type your email address.' ) );
-	} elseif ( ! is_email( $user_email ) ) {
-		$errors->add( 'invalid_email', __( '<strong>ERROR</strong>: The email address isn&#8217;t correct.' ) );
+	if ($user_email == '') {
+		$errors->add('empty_email', __('<strong>ERROR</strong>: Please type your email address.'));
+	} elseif ( ! is_email($user_email)) {
+		$errors->add('invalid_email', __('<strong>ERROR</strong>: The email address isn&#8217;t correct.'));
 		$user_email = '';
-	} elseif ( email_exists( $user_email ) ) {
-		$errors->add( 'email_exists', __( '<strong>ERROR</strong>: This email is already registered, please choose another one.' ) );
+	} elseif (email_exists($user_email)) {
+		$errors->add('email_exists', __('<strong>ERROR</strong>: This email is already registered, please choose another one.'));
 	}
 
 	/**
@@ -2260,7 +2260,7 @@ 
 	 *                                       e.g., an empty field, an invalid username or email,
 	 *                                       or an existing username or email.
 	 */
-	do_action( 'register_post', $sanitized_user_login, $user_email, $errors );
+	do_action('register_post', $sanitized_user_login, $user_email, $errors);
 
 	/**
 	 * Filter the errors encountered when a new user is being registered.
@@ -2278,19 +2278,19 @@ 
 	 * @param string   $sanitized_user_login User's username after it has been sanitized.
 	 * @param string   $user_email           User's email.
 	 */
-	$errors = apply_filters( 'registration_errors', $errors, $sanitized_user_login, $user_email );
+	$errors = apply_filters('registration_errors', $errors, $sanitized_user_login, $user_email);
 
-	if ( $errors->get_error_code() )
+	if ($errors->get_error_code())
 		return $errors;
 
-	$user_pass = wp_generate_password( 12, false );
-	$user_id = wp_create_user( $sanitized_user_login, $user_pass, $user_email );
-	if ( ! $user_id || is_wp_error( $user_id ) ) {
-		$errors->add( 'registerfail', sprintf( __( '<strong>ERROR</strong>: Couldn&#8217;t register you&hellip; please contact the <a href="mailto:%s">webmaster</a> !' ), get_option( 'admin_email' ) ) );
+	$user_pass = wp_generate_password(12, false);
+	$user_id = wp_create_user($sanitized_user_login, $user_pass, $user_email);
+	if ( ! $user_id || is_wp_error($user_id)) {
+		$errors->add('registerfail', sprintf(__('<strong>ERROR</strong>: Couldn&#8217;t register you&hellip; please contact the <a href="mailto:%s">webmaster</a> !'), get_option('admin_email')));
 		return $errors;
 	}
 
-	update_user_option( $user_id, 'default_password_nag', true, true ); //Set up the Password change nag.
+	update_user_option($user_id, 'default_password_nag', true, true); //Set up the Password change nag.
 
 	/**
 	 * Fires after a new user registration has been recorded.
@@ -2299,7 +2299,7 @@ 
 	 *
 	 * @param int $user_id ID of the newly registered user.
 	 */
-	do_action( 'register_new_user', $user_id );
+	do_action('register_new_user', $user_id);
 
 	return $user_id;
 }
@@ -2315,8 +2315,8 @@ 
  * @param string $notify  Optional. Type of notification that should happen. Accepts 'admin' or an empty string
  *                        (admin only), or 'both' (admin and user). Default 'both'.
  */
-function wp_send_new_user_notifications( $user_id, $notify = 'both' ) {
-	wp_new_user_notification( $user_id, null, $notify );
+function wp_send_new_user_notifications($user_id, $notify = 'both') {
+	wp_new_user_notification($user_id, null, $notify);
 }
 
 /**
@@ -2327,8 +2327,8 @@ 
  * @return string Token.
  */
 function wp_get_session_token() {
-	$cookie = wp_parse_auth_cookie( '', 'logged_in' );
-	return ! empty( $cookie['token'] ) ? $cookie['token'] : '';
+	$cookie = wp_parse_auth_cookie('', 'logged_in');
+	return ! empty($cookie['token']) ? $cookie['token'] : '';
 }
 
 /**
@@ -2338,7 +2338,7 @@ 
  * @return array Array of sessions.
  */
 function wp_get_all_sessions() {
-	$manager = WP_Session_Tokens::get_instance( get_current_user_id() );
+	$manager = WP_Session_Tokens::get_instance(get_current_user_id());
 	return $manager->get_all();
 }
 
@@ -2349,9 +2349,9 @@ 
  */
 function wp_destroy_current_session() {
 	$token = wp_get_session_token();
-	if ( $token ) {
-		$manager = WP_Session_Tokens::get_instance( get_current_user_id() );
-		$manager->destroy( $token );
+	if ($token) {
+		$manager = WP_Session_Tokens::get_instance(get_current_user_id());
+		$manager->destroy($token);
 	}
 }
 
@@ -2362,9 +2362,9 @@ 
  */
 function wp_destroy_other_sessions() {
 	$token = wp_get_session_token();
-	if ( $token ) {
-		$manager = WP_Session_Tokens::get_instance( get_current_user_id() );
-		$manager->destroy_others( $token );
+	if ($token) {
+		$manager = WP_Session_Tokens::get_instance(get_current_user_id());
+		$manager->destroy_others($token);
 	}
 }
 
@@ -2374,7 +2374,7 @@ 
  * @since 4.0.0
  */
 function wp_destroy_all_sessions() {
-	$manager = WP_Session_Tokens::get_instance( get_current_user_id() );
+	$manager = WP_Session_Tokens::get_instance(get_current_user_id());
 	$manager->destroy_all();
 }
 
@@ -2390,19 +2390,19 @@ 
 function wp_get_users_with_no_role() {
 	global $wpdb;
 
-	if ( is_multisite() ) {
+	if (is_multisite()) {
 		return array();
 	}
 
 	$prefix = $wpdb->get_blog_prefix();
-	$regex  = implode( '|', wp_roles()->get_names() );
-	$regex  = preg_replace( '/[^a-zA-Z_\|-]/', '', $regex );
-	$users  = $wpdb->get_col( $wpdb->prepare( "
+	$regex  = implode('|', wp_roles()->get_names());
+	$regex  = preg_replace('/[^a-zA-Z_\|-]/', '', $regex);
+	$users  = $wpdb->get_col($wpdb->prepare("
 		SELECT user_id
 		FROM $wpdb->usermeta
 		WHERE meta_key = '{$prefix}capabilities'
 		AND meta_value NOT REGEXP %s
-	", $regex ) );
+	", $regex));
 
 	return $users;
 }
@@ -2429,27 +2429,27 @@ 
 function _wp_get_current_user() {
 	global $current_user;
 
-	if ( ! empty( $current_user ) ) {
-		if ( $current_user instanceof WP_User ) {
+	if ( ! empty($current_user)) {
+		if ($current_user instanceof WP_User) {
 			return $current_user;
 		}
 
 		// Upgrade stdClass to WP_User
-		if ( is_object( $current_user ) && isset( $current_user->ID ) ) {
+		if (is_object($current_user) && isset($current_user->ID)) {
 			$cur_id = $current_user->ID;
 			$current_user = null;
-			wp_set_current_user( $cur_id );
+			wp_set_current_user($cur_id);
 			return $current_user;
 		}
 
 		// $current_user has a junk value. Force to WP_User with ID 0.
 		$current_user = null;
-		wp_set_current_user( 0 );
+		wp_set_current_user(0);
 		return $current_user;
 	}
 
-	if ( defined('XMLRPC_REQUEST') && XMLRPC_REQUEST ) {
-		wp_set_current_user( 0 );
+	if (defined('XMLRPC_REQUEST') && XMLRPC_REQUEST) {
+		wp_set_current_user(0);
 		return $current_user;
 	}
 
@@ -2466,13 +2466,13 @@ 
 	 *
 	 * @param int|bool $user_id User ID if one has been determined, false otherwise.
 	 */
-	$user_id = apply_filters( 'determine_current_user', false );
-	if ( ! $user_id ) {
-		wp_set_current_user( 0 );
+	$user_id = apply_filters('determine_current_user', false);
+	if ( ! $user_id) {
+		wp_set_current_user(0);
 		return $current_user;
 	}
 
-	wp_set_current_user( $user_id );
+	wp_set_current_user($user_id);
 
 	return $current_user;
 }

Braces +132 added lines, -88 removed lines

@@ -27,18 +27,22 @@ 
  */
 function wp_signon( $credentials = array(), $secure_cookie = '' ) {
 	if ( empty($credentials) ) {
-		if ( ! empty($_POST['log']) )
-			$credentials['user_login'] = $_POST['log'];
-		if ( ! empty($_POST['pwd']) )
-			$credentials['user_password'] = $_POST['pwd'];
-		if ( ! empty($_POST['rememberme']) )
-			$credentials['remember'] = $_POST['rememberme'];
+		if ( ! empty($_POST['log']) ) {
+					$credentials['user_login'] = $_POST['log'];
+		}
+		if ( ! empty($_POST['pwd']) ) {
+					$credentials['user_password'] = $_POST['pwd'];
+		}
+		if ( ! empty($_POST['rememberme']) ) {
+					$credentials['remember'] = $_POST['rememberme'];
+		}
 	}
 
-	if ( !empty($credentials['remember']) )
-		$credentials['remember'] = true;
-	else
-		$credentials['remember'] = false;
+	if ( !empty($credentials['remember']) ) {
+			$credentials['remember'] = true;
+	} else {
+			$credentials['remember'] = false;
+	}
 
 	/**
 	 * Fires before the user is authenticated.
@@ -55,8 +59,9 @@ 
 	 */
 	do_action_ref_array( 'wp_authenticate', array( &$credentials['user_login'], &$credentials['user_password'] ) );
 
-	if ( '' === $secure_cookie )
-		$secure_cookie = is_ssl();
+	if ( '' === $secure_cookie ) {
+			$secure_cookie = is_ssl();
+	}
 
 	/**
 	 * Filter whether to use a secure sign-on cookie.
@@ -119,16 +124,19 @@ 
 	}
 
 	if ( empty($username) || empty($password) ) {
-		if ( is_wp_error( $user ) )
-			return $user;
+		if ( is_wp_error( $user ) ) {
+					return $user;
+		}
 
 		$error = new WP_Error();
 
-		if ( empty($username) )
-			$error->add('empty_username', __('<strong>ERROR</strong>: The username field is empty.'));
+		if ( empty($username) ) {
+					$error->add('empty_username', __('<strong>ERROR</strong>: The username field is empty.'));
+		}
 
-		if ( empty($password) )
-			$error->add('empty_password', __('<strong>ERROR</strong>: The password field is empty.'));
+		if ( empty($password) ) {
+					$error->add('empty_password', __('<strong>ERROR</strong>: The password field is empty.'));
+		}
 
 		return $error;
 	}
@@ -154,8 +162,9 @@ 
 	 * @param string           $password Password to check against the user.
 	 */
 	$user = apply_filters( 'wp_authenticate_user', $user, $password );
-	if ( is_wp_error($user) )
-		return $user;
+	if ( is_wp_error($user) ) {
+			return $user;
+	}
 
 	if ( ! wp_check_password( $password, $user->user_pass, $user->ID ) ) {
 		return new WP_Error( 'incorrect_password',
@@ -264,18 +273,21 @@ 
 
 	if ( empty($username) && empty($password) ) {
 		$user_id = wp_validate_auth_cookie();
-		if ( $user_id )
-			return new WP_User($user_id);
+		if ( $user_id ) {
+					return new WP_User($user_id);
+		}
 
 		global $auth_secure_cookie;
 
-		if ( $auth_secure_cookie )
-			$auth_cookie = SECURE_AUTH_COOKIE;
-		else
-			$auth_cookie = AUTH_COOKIE;
+		if ( $auth_secure_cookie ) {
+					$auth_cookie = SECURE_AUTH_COOKIE;
+		} else {
+					$auth_cookie = AUTH_COOKIE;
+		}
 
-		if ( !empty($_COOKIE[$auth_cookie]) )
-			return new WP_Error('expired_session', __('Please log in again.'));
+		if ( !empty($_COOKIE[$auth_cookie]) ) {
+					return new WP_Error('expired_session', __('Please log in again.'));
+		}
 
 		// If the cookie is not set, be silent.
 	}
@@ -304,8 +316,9 @@ 
 		 */
 		$spammed = apply_filters( 'check_is_user_spammed', is_user_spammy(), $user );
 
-		if ( $spammed )
-			return new WP_Error( 'spammer_account', __( '<strong>ERROR</strong>: Your account has been marked as a spammer.' ) );
+		if ( $spammed ) {
+					return new WP_Error( 'spammer_account', __( '<strong>ERROR</strong>: Your account has been marked as a spammer.' ) );
+		}
 	}
 	return $user;
 }
@@ -390,8 +403,9 @@ 
 	global $wpdb;
 
 	$count = array();
-	if ( empty( $users ) || ! is_array( $users ) )
-		return $count;
+	if ( empty( $users ) || ! is_array( $users ) ) {
+			return $count;
+	}
 
 	$userlist = implode( ',', array_map( 'absint', $users ) );
 	$where = get_posts_by_author_sql( $post_type, true, null, $public_only );
@@ -402,8 +416,9 @@ 
 	}
 
 	foreach ( $users as $id ) {
-		if ( ! isset( $count[ $id ] ) )
-			$count[ $id ] = 0;
+		if ( ! isset( $count[ $id ] ) ) {
+					$count[ $id ] = 0;
+		}
 	}
 
 	return $count;
@@ -421,8 +436,9 @@ 
  * @return int The current user's ID
  */
 function get_current_user_id() {
-	if ( ! function_exists( 'wp_get_current_user' ) )
-		return 0;
+	if ( ! function_exists( 'wp_get_current_user' ) ) {
+			return 0;
+	}
 	$user = wp_get_current_user();
 	return ( isset( $user->ID ) ? (int) $user->ID : 0 );
 }
@@ -449,22 +465,28 @@ 
 function get_user_option( $option, $user = 0, $deprecated = '' ) {
 	global $wpdb;
 
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '3.0' );
+	if ( !empty( $deprecated ) ) {
+			_deprecated_argument( __FUNCTION__, '3.0' );
+	}
 
-	if ( empty( $user ) )
-		$user = get_current_user_id();
+	if ( empty( $user ) ) {
+			$user = get_current_user_id();
+	}
 
-	if ( ! $user = get_userdata( $user ) )
-		return false;
+	if ( ! $user = get_userdata( $user ) ) {
+			return false;
+	}
 
 	$prefix = $wpdb->get_blog_prefix();
-	if ( $user->has_prop( $prefix . $option ) ) // Blog specific
+	if ( $user->has_prop( $prefix . $option ) ) {
+		// Blog specific
 		$result = $user->get( $prefix . $option );
-	elseif ( $user->has_prop( $option ) ) // User specific and cross-blog
+	} elseif ( $user->has_prop( $option ) ) {
+		// User specific and cross-blog
 		$result = $user->get( $option );
-	else
-		$result = false;
+	} else {
+			$result = false;
+	}
 
 	/**
 	 * Filter a specific user option value.
@@ -504,8 +526,9 @@ 
 function update_user_option( $user_id, $option_name, $newvalue, $global = false ) {
 	global $wpdb;
 
-	if ( !$global )
-		$option_name = $wpdb->get_blog_prefix() . $option_name;
+	if ( !$global ) {
+			$option_name = $wpdb->get_blog_prefix() . $option_name;
+	}
 
 	return update_user_meta( $user_id, $option_name, $newvalue );
 }
@@ -530,8 +553,9 @@ 
 function delete_user_option( $user_id, $option_name, $global = false ) {
 	global $wpdb;
 
-	if ( !$global )
-		$option_name = $wpdb->get_blog_prefix() . $option_name;
+	if ( !$global ) {
+			$option_name = $wpdb->get_blog_prefix() . $option_name;
+	}
 	return delete_user_meta( $user_id, $option_name );
 }
 
@@ -575,12 +599,14 @@ 
 	$user_id = (int) $user_id;
 
 	// Logged out users can't have blogs
-	if ( empty( $user_id ) )
-		return array();
+	if ( empty( $user_id ) ) {
+			return array();
+	}
 
 	$keys = get_user_meta( $user_id );
-	if ( empty( $keys ) )
-		return array();
+	if ( empty( $keys ) ) {
+			return array();
+	}
 
 	if ( ! is_multisite() ) {
 		$blog_id = get_current_blog_id();
@@ -621,13 +647,16 @@ 
 	$keys = array_keys( $keys );
 
 	foreach ( $keys as $key ) {
-		if ( 'capabilities' !== substr( $key, -12 ) )
-			continue;
-		if ( $wpdb->base_prefix && 0 !== strpos( $key, $wpdb->base_prefix ) )
-			continue;
+		if ( 'capabilities' !== substr( $key, -12 ) ) {
+					continue;
+		}
+		if ( $wpdb->base_prefix && 0 !== strpos( $key, $wpdb->base_prefix ) ) {
+					continue;
+		}
 		$blog_id = str_replace( array( $wpdb->base_prefix, '_capabilities' ), '', $key );
-		if ( ! is_numeric( $blog_id ) )
-			continue;
+		if ( ! is_numeric( $blog_id ) ) {
+					continue;
+		}
 
 		$blog_id = (int) $blog_id;
 		$blog = get_blog_details( $blog_id );
@@ -861,8 +890,9 @@ 
 
 		foreach ( $users_of_blog as $caps_meta ) {
 			$b_roles = maybe_unserialize($caps_meta);
-			if ( ! is_array( $b_roles ) )
-				continue;
+			if ( ! is_array( $b_roles ) ) {
+							continue;
+			}
 			if ( empty( $b_roles ) ) {
 				$avail_roles['none']++;
 			}
@@ -910,8 +940,9 @@ 
 function setup_userdata($for_user_id = '') {
 	global $user_login, $userdata, $user_level, $user_ID, $user_email, $user_url, $user_identity;
 
-	if ( '' == $for_user_id )
-		$for_user_id = get_current_user_id();
+	if ( '' == $for_user_id ) {
+			$for_user_id = get_current_user_id();
+	}
 	$user = get_userdata( $for_user_id );
 
 	if ( ! $user ) {
@@ -1116,14 +1147,17 @@ 
  */
 function sanitize_user_field($field, $value, $user_id, $context) {
 	$int_fields = array('ID');
-	if ( in_array($field, $int_fields) )
-		$value = (int) $value;
+	if ( in_array($field, $int_fields) ) {
+			$value = (int) $value;
+	}
 
-	if ( 'raw' == $context )
-		return $value;
+	if ( 'raw' == $context ) {
+			return $value;
+	}
 
-	if ( !is_string($value) && !is_numeric($value) )
-		return $value;
+	if ( !is_string($value) && !is_numeric($value) ) {
+			return $value;
+	}
 
 	$prefixed = false !== strpos( $field, 'user_' );
 
@@ -1148,10 +1182,13 @@ 
 			$value = apply_filters( "edit_user_{$field}", $value, $user_id );
 		}
 
-		if ( 'description' == $field )
-			$value = esc_html( $value ); // textarea_escaped?
-		else
-			$value = esc_attr($value);
+		if ( 'description' == $field ) {
+					$value = esc_html( $value );
+		}
+		// textarea_escaped?
+		else {
+					$value = esc_attr($value);
+		}
 	} elseif ( 'db' == $context ) {
 		if ( $prefixed ) {
 			/** This filter is documented in wp-includes/post.php */
@@ -1194,8 +1231,9 @@ 
 		}
 	}
 
-	if ( 'user_url' == $field )
-		$value = esc_url($value);
+	if ( 'user_url' == $field ) {
+			$value = esc_url($value);
+	}
 
 	if ( 'attribute' == $context ) {
 		$value = esc_attr( $value );
@@ -1237,11 +1275,13 @@ 
  * @param WP_User|int $user User object or ID to be cleaned from the cache
  */
 function clean_user_cache( $user ) {
-	if ( is_numeric( $user ) )
-		$user = new WP_User( $user );
+	if ( is_numeric( $user ) ) {
+			$user = new WP_User( $user );
+	}
 
-	if ( ! $user->exists() )
-		return;
+	if ( ! $user->exists() ) {
+			return;
+	}
 
 	wp_cache_delete( $user->ID, 'users' );
 	wp_cache_delete( $user->user_login, 'userlogins' );
@@ -2101,15 +2141,18 @@ 
 
 	$key = preg_replace('/[^a-z0-9]/i', '', $key);
 
-	if ( empty( $key ) || !is_string( $key ) )
-		return new WP_Error('invalid_key', __('Invalid key'));
+	if ( empty( $key ) || !is_string( $key ) ) {
+			return new WP_Error('invalid_key', __('Invalid key'));
+	}
 
-	if ( empty($login) || !is_string($login) )
-		return new WP_Error('invalid_key', __('Invalid key'));
+	if ( empty($login) || !is_string($login) ) {
+			return new WP_Error('invalid_key', __('Invalid key'));
+	}
 
 	$row = $wpdb->get_row( $wpdb->prepare( "SELECT ID, user_activation_key FROM $wpdb->users WHERE user_login = %s", $login ) );
-	if ( ! $row )
-		return new WP_Error('invalid_key', __('Invalid key'));
+	if ( ! $row ) {
+			return new WP_Error('invalid_key', __('Invalid key'));
+	}
 
 	if ( empty( $wp_hasher ) ) {
 		require_once ABSPATH . WPINC . '/class-phpass.php';
@@ -2280,8 +2323,9 @@ 
 	 */
 	$errors = apply_filters( 'registration_errors', $errors, $sanitized_user_login, $user_email );
 
-	if ( $errors->get_error_code() )
-		return $errors;
+	if ( $errors->get_error_code() ) {
+			return $errors;
+	}
 
 	$user_pass = wp_generate_password( 12, false );
 	$user_id = wp_create_user( $sanitized_user_login, $user_pass, $user_email );

src/wp-includes/wp-db.php

Doc Comments +5 added lines, -7 removed lines

@@ -663,7 +663,7 @@ 
 	 *
 	 * @see wpdb::__construct()
 	 * @since 2.0.8
-	 * @return true
+	 * @return boolean
 	 */
 	public function __destruct() {
 		return true;
@@ -1239,8 +1239,6 @@ 
 	 * @param array|mixed $args     The array of variables to substitute into the query's placeholders if being called like
 	 *                              {@link http://php.net/vsprintf vsprintf()}, or the first variable to substitute into the query's placeholders if
 	 *                              being called like {@link http://php.net/sprintf sprintf()}.
-	 * @param mixed       $args,... further variables to substitute into the query's placeholders if being called like
-	 *                              {@link http://php.net/sprintf sprintf()}.
 	 * @return string|void Sanitized query string, if there is a query to prepare.
 	 */
 	public function prepare( $query, $args ) {
@@ -1449,7 +1447,7 @@ 
 	 * @since 3.9.0 $allow_bail parameter added.
 	 *
 	 * @param bool $allow_bail Optional. Allows the function to bail. Default true.
-	 * @return bool True with a successful connection, false on failure.
+	 * @return boolean|null True with a successful connection, false on failure.
 	 */
 	public function db_connect( $allow_bail = true ) {
 		$this->is_mysql = true;
@@ -3052,7 +3050,7 @@ 
 	 *
 	 * @since 1.5.0
 	 *
-	 * @return true
+	 * @return boolean
 	 */
 	public function timer_start() {
 		$this->time_start = microtime( true );
@@ -3186,7 +3184,7 @@ 
 	 * @param string $db_cap The feature to check for. Accepts 'collation',
 	 *                       'group_concat', 'subqueries', 'set_charset',
 	 *                       or 'utf8mb4'.
-	 * @return int|false Whether the database feature is supported, false otherwise.
+	 * @return boolean Whether the database feature is supported, false otherwise.
 	 */
 	public function has_cap( $db_cap ) {
 		$version = $this->db_version();
@@ -3242,7 +3240,7 @@ 
 	 *
 	 * @since 2.7.0
 	 *
-	 * @return null|string Null on failure, version number on success.
+	 * @return string Null on failure, version number on success.
 	 */
 	public function db_version() {
 		if ( $this->use_mysqli ) {

Spacing +628 added lines, -628 removed lines

@@ -12,28 +12,28 @@ 
 /**
  * @since 0.71
  */
-define( 'EZSQL_VERSION', 'WP1.25' );
+define('EZSQL_VERSION', 'WP1.25');
 
 /**
  * @since 0.71
  */
-define( 'OBJECT', 'OBJECT' );
-define( 'object', 'OBJECT' ); // Back compat.
+define('OBJECT', 'OBJECT');
+define('object', 'OBJECT'); // Back compat.
 
 /**
  * @since 2.5.0
  */
-define( 'OBJECT_K', 'OBJECT_K' );
+define('OBJECT_K', 'OBJECT_K');
 
 /**
  * @since 0.71
  */
-define( 'ARRAY_A', 'ARRAY_A' );
+define('ARRAY_A', 'ARRAY_A');
 
 /**
  * @since 0.71
  */
-define( 'ARRAY_N', 'ARRAY_N' );
+define('ARRAY_N', 'ARRAY_N');
 
 /**
  * WordPress Database Access Abstraction Object
@@ -265,8 +265,8 @@ 
 	 * @see wpdb::tables()
 	 * @var array
 	 */
-	var $tables = array( 'posts', 'comments', 'links', 'options', 'postmeta',
-		'terms', 'term_taxonomy', 'term_relationships', 'termmeta', 'commentmeta' );
+	var $tables = array('posts', 'comments', 'links', 'options', 'postmeta',
+		'terms', 'term_taxonomy', 'term_relationships', 'termmeta', 'commentmeta');
 
 	/**
 	 * List of deprecated WordPress tables
@@ -278,7 +278,7 @@ 
 	 * @see wpdb::tables()
 	 * @var array
 	 */
-	var $old_tables = array( 'categories', 'post2cat', 'link2cat' );
+	var $old_tables = array('categories', 'post2cat', 'link2cat');
 
 	/**
 	 * List of WordPress global tables
@@ -288,7 +288,7 @@ 
 	 * @see wpdb::tables()
 	 * @var array
 	 */
-	var $global_tables = array( 'users', 'usermeta' );
+	var $global_tables = array('users', 'usermeta');
 
 	/**
 	 * List of Multisite global tables
@@ -298,8 +298,8 @@ 
 	 * @see wpdb::tables()
 	 * @var array
 	 */
-	var $ms_global_tables = array( 'blogs', 'signups', 'site', 'sitemeta',
-		'sitecategories', 'registration_log', 'blog_versions' );
+	var $ms_global_tables = array('blogs', 'signups', 'site', 'sitemeta',
+		'sitecategories', 'registration_log', 'blog_versions');
 
 	/**
 	 * WordPress Comments table
@@ -585,8 +585,8 @@ 
 	 * @access protected
 	 * @var array
 	 */
-	protected $incompatible_modes = array( 'NO_ZERO_DATE', 'ONLY_FULL_GROUP_BY',
-		'STRICT_TRANS_TABLES', 'STRICT_ALL_TABLES', 'TRADITIONAL' );
+	protected $incompatible_modes = array('NO_ZERO_DATE', 'ONLY_FULL_GROUP_BY',
+		'STRICT_TRANS_TABLES', 'STRICT_ALL_TABLES', 'TRADITIONAL');
 
 	/**
 	 * Whether to use mysqli over mysql.
@@ -623,10 +623,10 @@ 
 	 * @param string $dbname     MySQL database name
 	 * @param string $dbhost     MySQL database host
 	 */
-	public function __construct( $dbuser, $dbpassword, $dbname, $dbhost ) {
-		register_shutdown_function( array( $this, '__destruct' ) );
+	public function __construct($dbuser, $dbpassword, $dbname, $dbhost) {
+		register_shutdown_function(array($this, '__destruct'));
 
-		if ( WP_DEBUG && WP_DEBUG_DISPLAY )
+		if (WP_DEBUG && WP_DEBUG_DISPLAY)
 			$this->show_errors();
 
 		/* Use ext/mysqli if it exists and:
@@ -635,12 +635,12 @@ 
 		 *  - We are running PHP 5.5 or greater, or
 		 *  - ext/mysql is not loaded.
 		 */
-		if ( function_exists( 'mysqli_connect' ) ) {
-			if ( defined( 'WP_USE_EXT_MYSQL' ) ) {
+		if (function_exists('mysqli_connect')) {
+			if (defined('WP_USE_EXT_MYSQL')) {
 				$this->use_mysqli = ! WP_USE_EXT_MYSQL;
-			} elseif ( version_compare( phpversion(), '5.5', '>=' ) || ! function_exists( 'mysql_connect' ) ) {
+			} elseif (version_compare(phpversion(), '5.5', '>=') || ! function_exists('mysql_connect')) {
 				$this->use_mysqli = true;
-			} elseif ( false !== strpos( $GLOBALS['wp_version'], '-' ) ) {
+			} elseif (false !== strpos($GLOBALS['wp_version'], '-')) {
 				$this->use_mysqli = true;
 			}
 		}
@@ -651,7 +651,7 @@ 
 		$this->dbhost = $dbhost;
 
 		// wp-config.php creation will manually connect when ready.
-		if ( defined( 'WP_SETUP_CONFIG' ) ) {
+		if (defined('WP_SETUP_CONFIG')) {
 			return;
 		}
 
@@ -677,8 +677,8 @@ 
 	 * @param string $name The private member to get, and optionally process
 	 * @return mixed The private member
 	 */
-	public function __get( $name ) {
-		if ( 'col_info' === $name )
+	public function __get($name) {
+		if ('col_info' === $name)
 			$this->load_col_info();
 
 		return $this->$name;
@@ -692,13 +692,13 @@ 
 	 * @param string $name  The private member to set
 	 * @param mixed  $value The value to set
 	 */
-	public function __set( $name, $value ) {
+	public function __set($name, $value) {
 		$protected_members = array(
 			'col_meta',
 			'table_charset',
 			'check_current_query',
 		);
-		if (  in_array( $name, $protected_members, true ) ) {
+		if (in_array($name, $protected_members, true)) {
 			return;
 		}
 		$this->$name = $value;
@@ -713,8 +713,8 @@ 
 	 *
 	 * @return bool If the member is set or not
 	 */
-	public function __isset( $name ) {
-		return isset( $this->$name );
+	public function __isset($name) {
+		return isset($this->$name);
 	}
 
 	/**
@@ -724,8 +724,8 @@ 
 	 *
 	 * @param string $name  The private member to unset
 	 */
-	public function __unset( $name ) {
-		unset( $this->$name );
+	public function __unset($name) {
+		unset($this->$name);
 	}
 
 	/**
@@ -734,30 +734,30 @@ 
 	 * @since 3.1.0
 	 */
 	public function init_charset() {
-		if ( function_exists('is_multisite') && is_multisite() ) {
+		if (function_exists('is_multisite') && is_multisite()) {
 			$this->charset = 'utf8';
-			if ( defined( 'DB_COLLATE' ) && DB_COLLATE ) {
+			if (defined('DB_COLLATE') && DB_COLLATE) {
 				$this->collate = DB_COLLATE;
 			} else {
 				$this->collate = 'utf8_general_ci';
 			}
-		} elseif ( defined( 'DB_COLLATE' ) ) {
+		} elseif (defined('DB_COLLATE')) {
 			$this->collate = DB_COLLATE;
 		}
 
-		if ( defined( 'DB_CHARSET' ) ) {
+		if (defined('DB_CHARSET')) {
 			$this->charset = DB_CHARSET;
 		}
 
-		if ( ( $this->use_mysqli && ! ( $this->dbh instanceof mysqli ) ) || empty( $this->dbh ) ) {
+		if (($this->use_mysqli && ! ($this->dbh instanceof mysqli)) || empty($this->dbh)) {
 			return;
 		}
 
-		if ( 'utf8' === $this->charset && $this->has_cap( 'utf8mb4' ) ) {
+		if ('utf8' === $this->charset && $this->has_cap('utf8mb4')) {
 			$this->charset = 'utf8mb4';
 		}
 
-		if ( 'utf8mb4' === $this->charset && ( ! $this->collate || stripos( $this->collate, 'utf8_' ) === 0 ) ) {
+		if ('utf8mb4' === $this->charset && ( ! $this->collate || stripos($this->collate, 'utf8_') === 0)) {
 			$this->collate = 'utf8mb4_unicode_ci';
 		}
 	}
@@ -771,29 +771,29 @@ 
 	 * @param string   $charset Optional. The character set. Default null.
 	 * @param string   $collate Optional. The collation. Default null.
 	 */
-	public function set_charset( $dbh, $charset = null, $collate = null ) {
-		if ( ! isset( $charset ) )
+	public function set_charset($dbh, $charset = null, $collate = null) {
+		if ( ! isset($charset))
 			$charset = $this->charset;
-		if ( ! isset( $collate ) )
+		if ( ! isset($collate))
 			$collate = $this->collate;
-		if ( $this->has_cap( 'collation' ) && ! empty( $charset ) ) {
-			if ( $this->use_mysqli ) {
-				if ( function_exists( 'mysqli_set_charset' ) && $this->has_cap( 'set_charset' ) ) {
-					mysqli_set_charset( $dbh, $charset );
+		if ($this->has_cap('collation') && ! empty($charset)) {
+			if ($this->use_mysqli) {
+				if (function_exists('mysqli_set_charset') && $this->has_cap('set_charset')) {
+					mysqli_set_charset($dbh, $charset);
 				} else {
-					$query = $this->prepare( 'SET NAMES %s', $charset );
-					if ( ! empty( $collate ) )
-						$query .= $this->prepare( ' COLLATE %s', $collate );
-					mysqli_query( $dbh, $query );
+					$query = $this->prepare('SET NAMES %s', $charset);
+					if ( ! empty($collate))
+						$query .= $this->prepare(' COLLATE %s', $collate);
+					mysqli_query($dbh, $query);
 				}
 			} else {
-				if ( function_exists( 'mysql_set_charset' ) && $this->has_cap( 'set_charset' ) ) {
-					mysql_set_charset( $charset, $dbh );
+				if (function_exists('mysql_set_charset') && $this->has_cap('set_charset')) {
+					mysql_set_charset($charset, $dbh);
 				} else {
-					$query = $this->prepare( 'SET NAMES %s', $charset );
-					if ( ! empty( $collate ) )
-						$query .= $this->prepare( ' COLLATE %s', $collate );
-					mysql_query( $query, $dbh );
+					$query = $this->prepare('SET NAMES %s', $charset);
+					if ( ! empty($collate))
+						$query .= $this->prepare(' COLLATE %s', $collate);
+					mysql_query($query, $dbh);
 				}
 			}
 		}
@@ -809,36 +809,36 @@ 
 	 *
 	 * @param array $modes Optional. A list of SQL modes to set.
 	 */
-	public function set_sql_mode( $modes = array() ) {
-		if ( empty( $modes ) ) {
-			if ( $this->use_mysqli ) {
-				$res = mysqli_query( $this->dbh, 'SELECT @@SESSION.sql_mode' );
+	public function set_sql_mode($modes = array()) {
+		if (empty($modes)) {
+			if ($this->use_mysqli) {
+				$res = mysqli_query($this->dbh, 'SELECT @@SESSION.sql_mode');
 			} else {
-				$res = mysql_query( 'SELECT @@SESSION.sql_mode', $this->dbh );
+				$res = mysql_query('SELECT @@SESSION.sql_mode', $this->dbh);
 			}
 
-			if ( empty( $res ) ) {
+			if (empty($res)) {
 				return;
 			}
 
-			if ( $this->use_mysqli ) {
-				$modes_array = mysqli_fetch_array( $res );
-				if ( empty( $modes_array[0] ) ) {
+			if ($this->use_mysqli) {
+				$modes_array = mysqli_fetch_array($res);
+				if (empty($modes_array[0])) {
 					return;
 				}
 				$modes_str = $modes_array[0];
 			} else {
-				$modes_str = mysql_result( $res, 0 );
+				$modes_str = mysql_result($res, 0);
 			}
 
-			if ( empty( $modes_str ) ) {
+			if (empty($modes_str)) {
 				return;
 			}
 
-			$modes = explode( ',', $modes_str );
+			$modes = explode(',', $modes_str);
 		}
 
-		$modes = array_change_key_case( $modes, CASE_UPPER );
+		$modes = array_change_key_case($modes, CASE_UPPER);
 
 		/**
 		 * Filter the list of incompatible SQL modes to exclude.
@@ -847,20 +847,20 @@ 
 		 *
 		 * @param array $incompatible_modes An array of incompatible modes.
 		 */
-		$incompatible_modes = (array) apply_filters( 'incompatible_sql_modes', $this->incompatible_modes );
+		$incompatible_modes = (array) apply_filters('incompatible_sql_modes', $this->incompatible_modes);
 
-		foreach ( $modes as $i => $mode ) {
-			if ( in_array( $mode, $incompatible_modes ) ) {
-				unset( $modes[ $i ] );
+		foreach ($modes as $i => $mode) {
+			if (in_array($mode, $incompatible_modes)) {
+				unset($modes[$i]);
 			}
 		}
 
-		$modes_str = implode( ',', $modes );
+		$modes_str = implode(',', $modes);
 
-		if ( $this->use_mysqli ) {
-			mysqli_query( $this->dbh, "SET SESSION sql_mode='$modes_str'" );
+		if ($this->use_mysqli) {
+			mysqli_query($this->dbh, "SET SESSION sql_mode='$modes_str'");
 		} else {
-			mysql_query( "SET SESSION sql_mode='$modes_str'", $this->dbh );
+			mysql_query("SET SESSION sql_mode='$modes_str'", $this->dbh);
 		}
 	}
 
@@ -873,31 +873,31 @@ 
 	 * @param bool   $set_table_names Optional. Whether the table names, e.g. wpdb::$posts, should be updated or not.
 	 * @return string|WP_Error Old prefix or WP_Error on error
 	 */
-	public function set_prefix( $prefix, $set_table_names = true ) {
+	public function set_prefix($prefix, $set_table_names = true) {
 
-		if ( preg_match( '|[^a-z0-9_]|i', $prefix ) )
-			return new WP_Error('invalid_db_prefix', 'Invalid database prefix' );
+		if (preg_match('|[^a-z0-9_]|i', $prefix))
+			return new WP_Error('invalid_db_prefix', 'Invalid database prefix');
 
 		$old_prefix = is_multisite() ? '' : $prefix;
 
-		if ( isset( $this->base_prefix ) )
+		if (isset($this->base_prefix))
 			$old_prefix = $this->base_prefix;
 
 		$this->base_prefix = $prefix;
 
-		if ( $set_table_names ) {
-			foreach ( $this->tables( 'global' ) as $table => $prefixed_table )
+		if ($set_table_names) {
+			foreach ($this->tables('global') as $table => $prefixed_table)
 				$this->$table = $prefixed_table;
 
-			if ( is_multisite() && empty( $this->blogid ) )
+			if (is_multisite() && empty($this->blogid))
 				return $old_prefix;
 
 			$this->prefix = $this->get_blog_prefix();
 
-			foreach ( $this->tables( 'blog' ) as $table => $prefixed_table )
+			foreach ($this->tables('blog') as $table => $prefixed_table)
 				$this->$table = $prefixed_table;
 
-			foreach ( $this->tables( 'old' ) as $table => $prefixed_table )
+			foreach ($this->tables('old') as $table => $prefixed_table)
 				$this->$table = $prefixed_table;
 		}
 		return $old_prefix;
@@ -913,8 +913,8 @@ 
 	 * @param int $site_id Optional.
 	 * @return int previous blog id
 	 */
-	public function set_blog_id( $blog_id, $site_id = 0 ) {
-		if ( ! empty( $site_id ) )
+	public function set_blog_id($blog_id, $site_id = 0) {
+		if ( ! empty($site_id))
 			$this->siteid = $site_id;
 
 		$old_blog_id  = $this->blogid;
@@ -922,10 +922,10 @@ 
 
 		$this->prefix = $this->get_blog_prefix();
 
-		foreach ( $this->tables( 'blog' ) as $table => $prefixed_table )
+		foreach ($this->tables('blog') as $table => $prefixed_table)
 			$this->$table = $prefixed_table;
 
-		foreach ( $this->tables( 'old' ) as $table => $prefixed_table )
+		foreach ($this->tables('old') as $table => $prefixed_table)
 			$this->$table = $prefixed_table;
 
 		return $old_blog_id;
@@ -938,15 +938,15 @@ 
 	 * @param int $blog_id Optional.
 	 * @return string Blog prefix.
 	 */
-	public function get_blog_prefix( $blog_id = null ) {
-		if ( is_multisite() ) {
-			if ( null === $blog_id )
+	public function get_blog_prefix($blog_id = null) {
+		if (is_multisite()) {
+			if (null === $blog_id)
 				$blog_id = $this->blogid;
 			$blog_id = (int) $blog_id;
-			if ( defined( 'MULTISITE' ) && ( 0 == $blog_id || 1 == $blog_id ) )
+			if (defined('MULTISITE') && (0 == $blog_id || 1 == $blog_id))
 				return $this->base_prefix;
 			else
-				return $this->base_prefix . $blog_id . '_';
+				return $this->base_prefix.$blog_id.'_';
 		} else {
 			return $this->base_prefix;
 		}
@@ -979,20 +979,20 @@ 
 	 * @param int    $blog_id Optional. The blog_id to prefix. Defaults to wpdb::$blogid. Used only when prefix is requested.
 	 * @return array Table names. When a prefix is requested, the key is the unprefixed table name.
 	 */
-	public function tables( $scope = 'all', $prefix = true, $blog_id = 0 ) {
-		switch ( $scope ) {
+	public function tables($scope = 'all', $prefix = true, $blog_id = 0) {
+		switch ($scope) {
 			case 'all' :
-				$tables = array_merge( $this->global_tables, $this->tables );
-				if ( is_multisite() )
-					$tables = array_merge( $tables, $this->ms_global_tables );
+				$tables = array_merge($this->global_tables, $this->tables);
+				if (is_multisite())
+					$tables = array_merge($tables, $this->ms_global_tables);
 				break;
 			case 'blog' :
 				$tables = $this->tables;
 				break;
 			case 'global' :
 				$tables = $this->global_tables;
-				if ( is_multisite() )
-					$tables = array_merge( $tables, $this->ms_global_tables );
+				if (is_multisite())
+					$tables = array_merge($tables, $this->ms_global_tables);
 				break;
 			case 'ms_global' :
 				$tables = $this->ms_global_tables;
@@ -1004,24 +1004,24 @@ 
 				return array();
 		}
 
-		if ( $prefix ) {
-			if ( ! $blog_id )
+		if ($prefix) {
+			if ( ! $blog_id)
 				$blog_id = $this->blogid;
-			$blog_prefix = $this->get_blog_prefix( $blog_id );
+			$blog_prefix = $this->get_blog_prefix($blog_id);
 			$base_prefix = $this->base_prefix;
-			$global_tables = array_merge( $this->global_tables, $this->ms_global_tables );
-			foreach ( $tables as $k => $table ) {
-				if ( in_array( $table, $global_tables ) )
-					$tables[ $table ] = $base_prefix . $table;
+			$global_tables = array_merge($this->global_tables, $this->ms_global_tables);
+			foreach ($tables as $k => $table) {
+				if (in_array($table, $global_tables))
+					$tables[$table] = $base_prefix.$table;
 				else
-					$tables[ $table ] = $blog_prefix . $table;
-				unset( $tables[ $k ] );
+					$tables[$table] = $blog_prefix.$table;
+				unset($tables[$k]);
 			}
 
-			if ( isset( $tables['users'] ) && defined( 'CUSTOM_USER_TABLE' ) )
+			if (isset($tables['users']) && defined('CUSTOM_USER_TABLE'))
 				$tables['users'] = CUSTOM_USER_TABLE;
 
-			if ( isset( $tables['usermeta'] ) && defined( 'CUSTOM_USER_META_TABLE' ) )
+			if (isset($tables['usermeta']) && defined('CUSTOM_USER_META_TABLE'))
 				$tables['usermeta'] = CUSTOM_USER_META_TABLE;
 		}
 
@@ -1039,53 +1039,53 @@ 
 	 * @param string        $db  MySQL database name
 	 * @param resource|null $dbh Optional link identifier.
 	 */
-	public function select( $db, $dbh = null ) {
-		if ( is_null($dbh) )
+	public function select($db, $dbh = null) {
+		if (is_null($dbh))
 			$dbh = $this->dbh;
 
-		if ( $this->use_mysqli ) {
-			$success = mysqli_select_db( $dbh, $db );
+		if ($this->use_mysqli) {
+			$success = mysqli_select_db($dbh, $db);
 		} else {
-			$success = mysql_select_db( $db, $dbh );
+			$success = mysql_select_db($db, $dbh);
 		}
-		if ( ! $success ) {
+		if ( ! $success) {
 			$this->ready = false;
-			if ( ! did_action( 'template_redirect' ) ) {
+			if ( ! did_action('template_redirect')) {
 				wp_load_translations_early();
 
-				$message = '<h1>' . __( 'Can&#8217;t select database' ) . "</h1>\n";
+				$message = '<h1>'.__('Can&#8217;t select database')."</h1>\n";
 
-				$message .= '<p>' . sprintf(
+				$message .= '<p>'.sprintf(
 					/* translators: %s: database name */
-					__( 'We were able to connect to the database server (which means your username and password is okay) but not able to select the %s database.' ),
-					'<code>' . htmlspecialchars( $db, ENT_QUOTES ) . '</code>'
-				) . "</p>\n";
+					__('We were able to connect to the database server (which means your username and password is okay) but not able to select the %s database.'),
+					'<code>'.htmlspecialchars($db, ENT_QUOTES).'</code>'
+				)."</p>\n";
 
 				$message .= "<ul>\n";
-				$message .= '<li>' . __( 'Are you sure it exists?' ) . "</li>\n";
+				$message .= '<li>'.__('Are you sure it exists?')."</li>\n";
 
-				$message .= '<li>' . sprintf(
+				$message .= '<li>'.sprintf(
 					/* translators: 1: database user, 2: database name */
-					__( 'Does the user %1$s have permission to use the %2$s database?' ),
-					'<code>' . htmlspecialchars( $this->dbuser, ENT_QUOTES )  . '</code>',
-					'<code>' . htmlspecialchars( $db, ENT_QUOTES ) . '</code>'
-				) . "</li>\n";
+					__('Does the user %1$s have permission to use the %2$s database?'),
+					'<code>'.htmlspecialchars($this->dbuser, ENT_QUOTES).'</code>',
+					'<code>'.htmlspecialchars($db, ENT_QUOTES).'</code>'
+				)."</li>\n";
 
-				$message .= '<li>' . sprintf(
+				$message .= '<li>'.sprintf(
 					/* translators: %s: database name */
-					__( 'On some systems the name of your database is prefixed with your username, so it would be like <code>username_%1$s</code>. Could that be the problem?' ),
-					htmlspecialchars( $db, ENT_QUOTES )
-				). "</li>\n";
+					__('On some systems the name of your database is prefixed with your username, so it would be like <code>username_%1$s</code>. Could that be the problem?'),
+					htmlspecialchars($db, ENT_QUOTES)
+				)."</li>\n";
 
 				$message .= "</ul>\n";
 
-				$message .= '<p>' . sprintf(
+				$message .= '<p>'.sprintf(
 					/* translators: %s: support forums URL */
-					__( 'If you don&#8217;t know how to set up a database you should <strong>contact your host</strong>. If all else fails you may find help at the <a href="%s">WordPress Support Forums</a>.' ),
-					__( 'https://wordpress.org/support/' )
-				) . "</p>\n";
+					__('If you don&#8217;t know how to set up a database you should <strong>contact your host</strong>. If all else fails you may find help at the <a href="%s">WordPress Support Forums</a>.'),
+					__('https://wordpress.org/support/')
+				)."</p>\n";
 
-				$this->bail( $message, 'db_select_fail' );
+				$this->bail($message, 'db_select_fail');
 			}
 		}
 	}
@@ -1104,10 +1104,10 @@ 
 	 * @param string $string
 	 * @return string
 	 */
-	function _weak_escape( $string ) {
-		if ( func_num_args() === 1 && function_exists( '_deprecated_function' ) )
-			_deprecated_function( __METHOD__, '3.6', 'wpdb::prepare() or esc_sql()' );
-		return addslashes( $string );
+	function _weak_escape($string) {
+		if (func_num_args() === 1 && function_exists('_deprecated_function'))
+			_deprecated_function(__METHOD__, '3.6', 'wpdb::prepare() or esc_sql()');
+		return addslashes($string);
 	}
 
 	/**
@@ -1121,23 +1121,23 @@ 
 	 * @param  string $string to escape
 	 * @return string escaped
 	 */
-	function _real_escape( $string ) {
-		if ( $this->dbh ) {
-			if ( $this->use_mysqli ) {
-				return mysqli_real_escape_string( $this->dbh, $string );
+	function _real_escape($string) {
+		if ($this->dbh) {
+			if ($this->use_mysqli) {
+				return mysqli_real_escape_string($this->dbh, $string);
 			} else {
-				return mysql_real_escape_string( $string, $this->dbh );
+				return mysql_real_escape_string($string, $this->dbh);
 			}
 		}
 
-		$class = get_class( $this );
-		if ( function_exists( '__' ) ) {
+		$class = get_class($this);
+		if (function_exists('__')) {
 			/* translators: %s: database access abstraction class, usually wpdb or a class extending wpdb */
-			_doing_it_wrong( $class, sprintf( __( '%s must set a database connection for use with escaping.' ), $class ), E_USER_NOTICE );
+			_doing_it_wrong($class, sprintf(__('%s must set a database connection for use with escaping.'), $class), E_USER_NOTICE);
 		} else {
-			_doing_it_wrong( $class, sprintf( '%s must set a database connection for use with escaping.', $class ), E_USER_NOTICE );
+			_doing_it_wrong($class, sprintf('%s must set a database connection for use with escaping.', $class), E_USER_NOTICE);
 		}
-		return addslashes( $string );
+		return addslashes($string);
 	}
 
 	/**
@@ -1150,16 +1150,16 @@ 
 	 * @param  string|array $data
 	 * @return string|array escaped
 	 */
-	function _escape( $data ) {
-		if ( is_array( $data ) ) {
-			foreach ( $data as $k => $v ) {
-				if ( is_array($v) )
-					$data[$k] = $this->_escape( $v );
+	function _escape($data) {
+		if (is_array($data)) {
+			foreach ($data as $k => $v) {
+				if (is_array($v))
+					$data[$k] = $this->_escape($v);
 				else
-					$data[$k] = $this->_real_escape( $v );
+					$data[$k] = $this->_real_escape($v);
 			}
 		} else {
-			$data = $this->_real_escape( $data );
+			$data = $this->_real_escape($data);
 		}
 
 		return $data;
@@ -1178,18 +1178,18 @@ 
 	 * @param mixed $data
 	 * @return mixed
 	 */
-	public function escape( $data ) {
-		if ( func_num_args() === 1 && function_exists( '_deprecated_function' ) )
-			_deprecated_function( __METHOD__, '3.6', 'wpdb::prepare() or esc_sql()' );
-		if ( is_array( $data ) ) {
-			foreach ( $data as $k => $v ) {
-				if ( is_array( $v ) )
-					$data[$k] = $this->escape( $v, 'recursive' );
+	public function escape($data) {
+		if (func_num_args() === 1 && function_exists('_deprecated_function'))
+			_deprecated_function(__METHOD__, '3.6', 'wpdb::prepare() or esc_sql()');
+		if (is_array($data)) {
+			foreach ($data as $k => $v) {
+				if (is_array($v))
+					$data[$k] = $this->escape($v, 'recursive');
 				else
-					$data[$k] = $this->_weak_escape( $v, 'internal' );
+					$data[$k] = $this->_weak_escape($v, 'internal');
 			}
 		} else {
-			$data = $this->_weak_escape( $data, 'internal' );
+			$data = $this->_weak_escape($data, 'internal');
 		}
 
 		return $data;
@@ -1204,9 +1204,9 @@ 
 	 *
 	 * @param string $string to escape
 	 */
-	public function escape_by_ref( &$string ) {
-		if ( ! is_float( $string ) )
-			$string = $this->_real_escape( $string );
+	public function escape_by_ref(&$string) {
+		if ( ! is_float($string))
+			$string = $this->_real_escape($string);
 	}
 
 	/**
@@ -1243,26 +1243,26 @@ 
 	 *                              {@link http://php.net/sprintf sprintf()}.
 	 * @return string|void Sanitized query string, if there is a query to prepare.
 	 */
-	public function prepare( $query, $args ) {
-		if ( is_null( $query ) )
+	public function prepare($query, $args) {
+		if (is_null($query))
 			return;
 
 		// This is not meant to be foolproof -- but it will catch obviously incorrect usage.
-		if ( strpos( $query, '%' ) === false ) {
-			_doing_it_wrong( 'wpdb::prepare', sprintf( __( 'The query argument of %s must have a placeholder.' ), 'wpdb::prepare()' ), '3.9' );
+		if (strpos($query, '%') === false) {
+			_doing_it_wrong('wpdb::prepare', sprintf(__('The query argument of %s must have a placeholder.'), 'wpdb::prepare()'), '3.9');
 		}
 
 		$args = func_get_args();
-		array_shift( $args );
+		array_shift($args);
 		// If args were passed as an array (as in vsprintf), move them up
-		if ( isset( $args[0] ) && is_array($args[0]) )
+		if (isset($args[0]) && is_array($args[0]))
 			$args = $args[0];
-		$query = str_replace( "'%s'", '%s', $query ); // in case someone mistakenly already singlequoted it
-		$query = str_replace( '"%s"', '%s', $query ); // doublequote unquoting
-		$query = preg_replace( '|(?<!%)%f|' , '%F', $query ); // Force floats to be locale unaware
-		$query = preg_replace( '|(?<!%)%s|', "'%s'", $query ); // quote the strings, avoiding escaped strings like %%s
-		array_walk( $args, array( $this, 'escape_by_ref' ) );
-		return @vsprintf( $query, $args );
+		$query = str_replace("'%s'", '%s', $query); // in case someone mistakenly already singlequoted it
+		$query = str_replace('"%s"', '%s', $query); // doublequote unquoting
+		$query = preg_replace('|(?<!%)%f|', '%F', $query); // Force floats to be locale unaware
+		$query = preg_replace('|(?<!%)%s|', "'%s'", $query); // quote the strings, avoiding escaped strings like %%s
+		array_walk($args, array($this, 'escape_by_ref'));
+		return @vsprintf($query, $args);
 	}
 
 	/**
@@ -1287,8 +1287,8 @@ 
 	 * @return string Text in the form of a LIKE phrase. The output is not SQL safe. Call $wpdb::prepare()
 	 *                or real_escape next.
 	 */
-	public function esc_like( $text ) {
-		return addcslashes( $text, '_%\\' );
+	public function esc_like($text) {
+		return addcslashes($text, '_%\\');
 	}
 
 	/**
@@ -1300,56 +1300,56 @@ 
 	 * @param string $str The error to display
 	 * @return false|void False if the showing of errors is disabled.
 	 */
-	public function print_error( $str = '' ) {
+	public function print_error($str = '') {
 		global $EZSQL_ERROR;
 
-		if ( !$str ) {
-			if ( $this->use_mysqli ) {
-				$str = mysqli_error( $this->dbh );
+		if ( ! $str) {
+			if ($this->use_mysqli) {
+				$str = mysqli_error($this->dbh);
 			} else {
-				$str = mysql_error( $this->dbh );
+				$str = mysql_error($this->dbh);
 			}
 		}
-		$EZSQL_ERROR[] = array( 'query' => $this->last_query, 'error_str' => $str );
+		$EZSQL_ERROR[] = array('query' => $this->last_query, 'error_str' => $str);
 
-		if ( $this->suppress_errors )
+		if ($this->suppress_errors)
 			return false;
 
 		wp_load_translations_early();
 
-		if ( $caller = $this->get_caller() )
-			$error_str = sprintf( __( 'WordPress database error %1$s for query %2$s made by %3$s' ), $str, $this->last_query, $caller );
+		if ($caller = $this->get_caller())
+			$error_str = sprintf(__('WordPress database error %1$s for query %2$s made by %3$s'), $str, $this->last_query, $caller);
 		else
-			$error_str = sprintf( __( 'WordPress database error %1$s for query %2$s' ), $str, $this->last_query );
+			$error_str = sprintf(__('WordPress database error %1$s for query %2$s'), $str, $this->last_query);
 
-		error_log( $error_str );
+		error_log($error_str);
 
 		// Are we showing errors?
-		if ( ! $this->show_errors )
+		if ( ! $this->show_errors)
 			return false;
 
 		// If there is an error then take note of it
-		if ( is_multisite() ) {
+		if (is_multisite()) {
 			$msg = sprintf(
 				"%s [%s]\n%s\n",
-				__( 'WordPress database error:' ),
+				__('WordPress database error:'),
 				$str,
 				$this->last_query
 			);
 
-			if ( defined( 'ERRORLOGFILE' ) ) {
-				error_log( $msg, 3, ERRORLOGFILE );
+			if (defined('ERRORLOGFILE')) {
+				error_log($msg, 3, ERRORLOGFILE);
 			}
-			if ( defined( 'DIEONDBERROR' ) ) {
-				wp_die( $msg );
+			if (defined('DIEONDBERROR')) {
+				wp_die($msg);
 			}
 		} else {
-			$str   = htmlspecialchars( $str, ENT_QUOTES );
-			$query = htmlspecialchars( $this->last_query, ENT_QUOTES );
+			$str   = htmlspecialchars($str, ENT_QUOTES);
+			$query = htmlspecialchars($this->last_query, ENT_QUOTES);
 
 			printf(
 				'<div id="error"><p class="wpdberror"><strong>%s</strong> [%s]<br /><code>%s</code></p></div>',
-				__( 'WordPress database error:' ),
+				__('WordPress database error:'),
 				$str,
 				$query
 			);
@@ -1370,7 +1370,7 @@ 
 	 * @param bool $show Whether to show or hide errors
 	 * @return bool Old value for showing errors.
 	 */
-	public function show_errors( $show = true ) {
+	public function show_errors($show = true) {
 		$errors = $this->show_errors;
 		$this->show_errors = $show;
 		return $errors;
@@ -1403,7 +1403,7 @@ 
 	 * @param bool $suppress Optional. New value. Defaults to true.
 	 * @return bool Old value
 	 */
-	public function suppress_errors( $suppress = true ) {
+	public function suppress_errors($suppress = true) {
 		$errors = $this->suppress_errors;
 		$this->suppress_errors = (bool) $suppress;
 		return $errors;
@@ -1421,21 +1421,21 @@ 
 		$this->rows_affected = $this->num_rows = 0;
 		$this->last_error  = '';
 
-		if ( $this->use_mysqli && $this->result instanceof mysqli_result ) {
-			mysqli_free_result( $this->result );
+		if ($this->use_mysqli && $this->result instanceof mysqli_result) {
+			mysqli_free_result($this->result);
 			$this->result = null;
 
 			// Sanity check before using the handle
-			if ( empty( $this->dbh ) || !( $this->dbh instanceof mysqli ) ) {
+			if (empty($this->dbh) || ! ($this->dbh instanceof mysqli)) {
 				return;
 			}
 
 			// Clear out any results from a multi-query
-			while ( mysqli_more_results( $this->dbh ) ) {
-				mysqli_next_result( $this->dbh );
+			while (mysqli_more_results($this->dbh)) {
+				mysqli_next_result($this->dbh);
 			}
-		} elseif ( is_resource( $this->result ) ) {
-			mysql_free_result( $this->result );
+		} elseif (is_resource($this->result)) {
+			mysql_free_result($this->result);
 		}
 	}
 
@@ -1451,17 +1451,17 @@ 
 	 * @param bool $allow_bail Optional. Allows the function to bail. Default true.
 	 * @return bool True with a successful connection, false on failure.
 	 */
-	public function db_connect( $allow_bail = true ) {
+	public function db_connect($allow_bail = true) {
 		$this->is_mysql = true;
 
 		/*
 		 * Deprecated in 3.9+ when using MySQLi. No equivalent
 		 * $new_link parameter exists for mysqli_* functions.
 		 */
-		$new_link = defined( 'MYSQL_NEW_LINK' ) ? MYSQL_NEW_LINK : true;
-		$client_flags = defined( 'MYSQL_CLIENT_FLAGS' ) ? MYSQL_CLIENT_FLAGS : 0;
+		$new_link = defined('MYSQL_NEW_LINK') ? MYSQL_NEW_LINK : true;
+		$client_flags = defined('MYSQL_CLIENT_FLAGS') ? MYSQL_CLIENT_FLAGS : 0;
 
-		if ( $this->use_mysqli ) {
+		if ($this->use_mysqli) {
 			$this->dbh = mysqli_init();
 
 			// mysqli_real_connect doesn't support the host param including a port or socket
@@ -1469,24 +1469,24 @@ 
 			$port = null;
 			$socket = null;
 			$host = $this->dbhost;
-			$port_or_socket = strstr( $host, ':' );
-			if ( ! empty( $port_or_socket ) ) {
-				$host = substr( $host, 0, strpos( $host, ':' ) );
-				$port_or_socket = substr( $port_or_socket, 1 );
-				if ( 0 !== strpos( $port_or_socket, '/' ) ) {
-					$port = intval( $port_or_socket );
-					$maybe_socket = strstr( $port_or_socket, ':' );
-					if ( ! empty( $maybe_socket ) ) {
-						$socket = substr( $maybe_socket, 1 );
+			$port_or_socket = strstr($host, ':');
+			if ( ! empty($port_or_socket)) {
+				$host = substr($host, 0, strpos($host, ':'));
+				$port_or_socket = substr($port_or_socket, 1);
+				if (0 !== strpos($port_or_socket, '/')) {
+					$port = intval($port_or_socket);
+					$maybe_socket = strstr($port_or_socket, ':');
+					if ( ! empty($maybe_socket)) {
+						$socket = substr($maybe_socket, 1);
 					}
 				} else {
 					$socket = $port_or_socket;
 				}
 			}
 
-			mysqli_real_connect( $this->dbh, $host, $this->dbuser, $this->dbpassword, null, $port, $socket, $client_flags );
+			mysqli_real_connect($this->dbh, $host, $this->dbuser, $this->dbpassword, null, $port, $socket, $client_flags);
 
-			if ( $this->dbh->connect_errno ) {
+			if ($this->dbh->connect_errno) {
 				$this->dbh = null;
 
 				/* It's possible ext/mysqli is misconfigured. Fall back to ext/mysql if:
@@ -1496,68 +1496,68 @@ 
 		 		 */
 				$attempt_fallback = true;
 
-				if ( $this->has_connected ) {
+				if ($this->has_connected) {
 					$attempt_fallback = false;
-				} elseif ( defined( 'WP_USE_EXT_MYSQL' ) && ! WP_USE_EXT_MYSQL ) {
+				} elseif (defined('WP_USE_EXT_MYSQL') && ! WP_USE_EXT_MYSQL) {
 					$attempt_fallback = false;
-				} elseif ( ! function_exists( 'mysql_connect' ) ) {
+				} elseif ( ! function_exists('mysql_connect')) {
 					$attempt_fallback = false;
 				}
 
-				if ( $attempt_fallback ) {
+				if ($attempt_fallback) {
 					$this->use_mysqli = false;
-					return $this->db_connect( $allow_bail );
+					return $this->db_connect($allow_bail);
 				}
 			}
 		} else {
-			$this->dbh = mysql_connect( $this->dbhost, $this->dbuser, $this->dbpassword, $new_link, $client_flags );
+			$this->dbh = mysql_connect($this->dbhost, $this->dbuser, $this->dbpassword, $new_link, $client_flags);
 		}
 
-		if ( ! $this->dbh && $allow_bail ) {
+		if ( ! $this->dbh && $allow_bail) {
 			wp_load_translations_early();
 
 			// Load custom DB error template, if present.
-			if ( file_exists( WP_CONTENT_DIR . '/db-error.php' ) ) {
-				require_once( WP_CONTENT_DIR . '/db-error.php' );
+			if (file_exists(WP_CONTENT_DIR.'/db-error.php')) {
+				require_once(WP_CONTENT_DIR.'/db-error.php');
 				die();
 			}
 
-			$message = '<h1>' . __( 'Error establishing a database connection' ) . "</h1>\n";
+			$message = '<h1>'.__('Error establishing a database connection')."</h1>\n";
 
-			$message .= '<p>' . sprintf(
+			$message .= '<p>'.sprintf(
 				/* translators: 1: wp-config.php. 2: database host */
-				__( 'This either means that the username and password information in your %1$s file is incorrect or we can&#8217;t contact the database server at %2$s. This could mean your host&#8217;s database server is down.' ),
+				__('This either means that the username and password information in your %1$s file is incorrect or we can&#8217;t contact the database server at %2$s. This could mean your host&#8217;s database server is down.'),
 				'<code>wp-config.php</code>',
-				'<code>' . htmlspecialchars( $this->dbhost, ENT_QUOTES ) . '</code>'
-			) . "</p>\n";
+				'<code>'.htmlspecialchars($this->dbhost, ENT_QUOTES).'</code>'
+			)."</p>\n";
 
 			$message .= "<ul>\n";
-			$message .= '<li>' . __( 'Are you sure you have the correct username and password?' ) . "</li>\n";
-			$message .= '<li>' . __( 'Are you sure that you have typed the correct hostname?' ) . "</li>\n";
-			$message .= '<li>' . __( 'Are you sure that the database server is running?' ) . "</li>\n";
+			$message .= '<li>'.__('Are you sure you have the correct username and password?')."</li>\n";
+			$message .= '<li>'.__('Are you sure that you have typed the correct hostname?')."</li>\n";
+			$message .= '<li>'.__('Are you sure that the database server is running?')."</li>\n";
 			$message .= "</ul>\n";
 
-			$message .= '<p>' . sprintf(
+			$message .= '<p>'.sprintf(
 				/* translators: %s: support forums URL */
-				__( 'If you&#8217;re unsure what these terms mean you should probably contact your host. If you still need help you can always visit the <a href="%s">WordPress Support Forums</a>.' ),
-				__( 'https://wordpress.org/support/' )
-			) . "</p>\n";
+				__('If you&#8217;re unsure what these terms mean you should probably contact your host. If you still need help you can always visit the <a href="%s">WordPress Support Forums</a>.'),
+				__('https://wordpress.org/support/')
+			)."</p>\n";
 
-			$this->bail( $message, 'db_connect_fail' );
+			$this->bail($message, 'db_connect_fail');
 
 			return false;
-		} elseif ( $this->dbh ) {
-			if ( ! $this->has_connected ) {
+		} elseif ($this->dbh) {
+			if ( ! $this->has_connected) {
 				$this->init_charset();
 			}
 
 			$this->has_connected = true;
 
-			$this->set_charset( $this->dbh );
+			$this->set_charset($this->dbh);
 
 			$this->ready = true;
 			$this->set_sql_mode();
-			$this->select( $this->dbname, $this->dbh );
+			$this->select($this->dbname, $this->dbh);
 
 			return true;
 		}
@@ -1579,13 +1579,13 @@ 
 	 * @param bool $allow_bail Optional. Allows the function to bail. Default true.
 	 * @return bool|void True if the connection is up.
 	 */
-	public function check_connection( $allow_bail = true ) {
-		if ( $this->use_mysqli ) {
-			if ( ! empty( $this->dbh ) && mysqli_ping( $this->dbh ) ) {
+	public function check_connection($allow_bail = true) {
+		if ($this->use_mysqli) {
+			if ( ! empty($this->dbh) && mysqli_ping($this->dbh)) {
 				return true;
 			}
 		} else {
-			if ( ! empty( $this->dbh ) && mysql_ping( $this->dbh ) ) {
+			if ( ! empty($this->dbh) && mysql_ping($this->dbh)) {
 				return true;
 			}
 		}
@@ -1593,62 +1593,62 @@ 
 		$error_reporting = false;
 
 		// Disable warnings, as we don't want to see a multitude of "unable to connect" messages
-		if ( WP_DEBUG ) {
+		if (WP_DEBUG) {
 			$error_reporting = error_reporting();
-			error_reporting( $error_reporting & ~E_WARNING );
+			error_reporting($error_reporting & ~E_WARNING);
 		}
 
-		for ( $tries = 1; $tries <= $this->reconnect_retries; $tries++ ) {
+		for ($tries = 1; $tries <= $this->reconnect_retries; $tries++) {
 			// On the last try, re-enable warnings. We want to see a single instance of the
 			// "unable to connect" message on the bail() screen, if it appears.
-			if ( $this->reconnect_retries === $tries && WP_DEBUG ) {
-				error_reporting( $error_reporting );
+			if ($this->reconnect_retries === $tries && WP_DEBUG) {
+				error_reporting($error_reporting);
 			}
 
-			if ( $this->db_connect( false ) ) {
-				if ( $error_reporting ) {
-					error_reporting( $error_reporting );
+			if ($this->db_connect(false)) {
+				if ($error_reporting) {
+					error_reporting($error_reporting);
 				}
 
 				return true;
 			}
 
-			sleep( 1 );
+			sleep(1);
 		}
 
 		// If template_redirect has already happened, it's too late for wp_die()/dead_db().
 		// Let's just return and hope for the best.
-		if ( did_action( 'template_redirect' ) ) {
+		if (did_action('template_redirect')) {
 			return false;
 		}
 
-		if ( ! $allow_bail ) {
+		if ( ! $allow_bail) {
 			return false;
 		}
 
 		wp_load_translations_early();
 
-		$message = '<h1>' . __( 'Error reconnecting to the database' ) . "</h1>\n";
+		$message = '<h1>'.__('Error reconnecting to the database')."</h1>\n";
 
-		$message .= '<p>' . sprintf(
+		$message .= '<p>'.sprintf(
 			/* translators: %s: database host */
-			__( 'This means that we lost contact with the database server at %s. This could mean your host&#8217;s database server is down.' ),
-			'<code>' . htmlspecialchars( $this->dbhost, ENT_QUOTES ) . '</code>'
-		) . "</p>\n";
+			__('This means that we lost contact with the database server at %s. This could mean your host&#8217;s database server is down.'),
+			'<code>'.htmlspecialchars($this->dbhost, ENT_QUOTES).'</code>'
+		)."</p>\n";
 
 		$message .= "<ul>\n";
-		$message .= '<li>' . __( 'Are you sure that the database server is running?' ) . "</li>\n";
-		$message .= '<li>' . __( 'Are you sure that the database server is not under particularly heavy load?' ) . "</li>\n";
+		$message .= '<li>'.__('Are you sure that the database server is running?')."</li>\n";
+		$message .= '<li>'.__('Are you sure that the database server is not under particularly heavy load?')."</li>\n";
 		$message .= "</ul>\n";
 
-		$message .= '<p>' . sprintf(
+		$message .= '<p>'.sprintf(
 			/* translators: %s: support forums URL */
-			__( 'If you&#8217;re unsure what these terms mean you should probably contact your host. If you still need help you can always visit the <a href="%s">WordPress Support Forums</a>.' ),
-			__( 'https://wordpress.org/support/' )
-		) . "</p>\n";
+			__('If you&#8217;re unsure what these terms mean you should probably contact your host. If you still need help you can always visit the <a href="%s">WordPress Support Forums</a>.'),
+			__('https://wordpress.org/support/')
+		)."</p>\n";
 
 		// We weren't able to reconnect, so we better bail.
-		$this->bail( $message, 'db_connect_fail' );
+		$this->bail($message, 'db_connect_fail');
 
 		// Call dead_db() if bail didn't die, because this database is no more. It has ceased to be (at least temporarily).
 		dead_db();
@@ -1664,8 +1664,8 @@ 
 	 * @param string $query Database query
 	 * @return int|false Number of rows affected/selected or false on error
 	 */
-	public function query( $query ) {
-		if ( ! $this->ready ) {
+	public function query($query) {
+		if ( ! $this->ready) {
 			$this->check_current_query = true;
 			return false;
 		}
@@ -1680,7 +1680,7 @@ 
 		 *
 		 * @param string $query Database query.
 		 */
-		$query = apply_filters( 'query', $query );
+		$query = apply_filters('query', $query);
 
 		$this->flush();
 
@@ -1688,12 +1688,12 @@ 
 		$this->func_call = "\$db->query(\"$query\")";
 
 		// If we're writing to the database, make sure the query will write safely.
-		if ( $this->check_current_query && ! $this->check_ascii( $query ) ) {
-			$stripped_query = $this->strip_invalid_text_from_query( $query );
+		if ($this->check_current_query && ! $this->check_ascii($query)) {
+			$stripped_query = $this->strip_invalid_text_from_query($query);
 			// strip_invalid_text_from_query() can perform queries, so we need
 			// to flush again, just to make sure everything is clear.
 			$this->flush();
-			if ( $stripped_query !== $query ) {
+			if ($stripped_query !== $query) {
 				$this->insert_id = 0;
 				return false;
 			}
@@ -1704,21 +1704,21 @@ 
 		// Keep track of the last query for debug..
 		$this->last_query = $query;
 
-		$this->_do_query( $query );
+		$this->_do_query($query);
 
 		// MySQL server has gone away, try to reconnect
 		$mysql_errno = 0;
-		if ( ! empty( $this->dbh ) ) {
-			if ( $this->use_mysqli ) {
-				$mysql_errno = mysqli_errno( $this->dbh );
+		if ( ! empty($this->dbh)) {
+			if ($this->use_mysqli) {
+				$mysql_errno = mysqli_errno($this->dbh);
 			} else {
-				$mysql_errno = mysql_errno( $this->dbh );
+				$mysql_errno = mysql_errno($this->dbh);
 			}
 		}
 
-		if ( empty( $this->dbh ) || 2006 == $mysql_errno ) {
-			if ( $this->check_connection() ) {
-				$this->_do_query( $query );
+		if (empty($this->dbh) || 2006 == $mysql_errno) {
+			if ($this->check_connection()) {
+				$this->_do_query($query);
 			} else {
 				$this->insert_id = 0;
 				return false;
@@ -1726,48 +1726,48 @@ 
 		}
 
 		// If there is an error then take note of it..
-		if ( $this->use_mysqli ) {
-			$this->last_error = mysqli_error( $this->dbh );
+		if ($this->use_mysqli) {
+			$this->last_error = mysqli_error($this->dbh);
 		} else {
-			$this->last_error = mysql_error( $this->dbh );
+			$this->last_error = mysql_error($this->dbh);
 		}
 
-		if ( $this->last_error ) {
+		if ($this->last_error) {
 			// Clear insert_id on a subsequent failed insert.
-			if ( $this->insert_id && preg_match( '/^\s*(insert|replace)\s/i', $query ) )
+			if ($this->insert_id && preg_match('/^\s*(insert|replace)\s/i', $query))
 				$this->insert_id = 0;
 
 			$this->print_error();
 			return false;
 		}
 
-		if ( preg_match( '/^\s*(create|alter|truncate|drop)\s/i', $query ) ) {
+		if (preg_match('/^\s*(create|alter|truncate|drop)\s/i', $query)) {
 			$return_val = $this->result;
-		} elseif ( preg_match( '/^\s*(insert|delete|update|replace)\s/i', $query ) ) {
-			if ( $this->use_mysqli ) {
-				$this->rows_affected = mysqli_affected_rows( $this->dbh );
+		} elseif (preg_match('/^\s*(insert|delete|update|replace)\s/i', $query)) {
+			if ($this->use_mysqli) {
+				$this->rows_affected = mysqli_affected_rows($this->dbh);
 			} else {
-				$this->rows_affected = mysql_affected_rows( $this->dbh );
+				$this->rows_affected = mysql_affected_rows($this->dbh);
 			}
 			// Take note of the insert_id
-			if ( preg_match( '/^\s*(insert|replace)\s/i', $query ) ) {
-				if ( $this->use_mysqli ) {
-					$this->insert_id = mysqli_insert_id( $this->dbh );
+			if (preg_match('/^\s*(insert|replace)\s/i', $query)) {
+				if ($this->use_mysqli) {
+					$this->insert_id = mysqli_insert_id($this->dbh);
 				} else {
-					$this->insert_id = mysql_insert_id( $this->dbh );
+					$this->insert_id = mysql_insert_id($this->dbh);
 				}
 			}
 			// Return number of rows affected
 			$return_val = $this->rows_affected;
 		} else {
 			$num_rows = 0;
-			if ( $this->use_mysqli && $this->result instanceof mysqli_result ) {
-				while ( $row = mysqli_fetch_object( $this->result ) ) {
+			if ($this->use_mysqli && $this->result instanceof mysqli_result) {
+				while ($row = mysqli_fetch_object($this->result)) {
 					$this->last_result[$num_rows] = $row;
 					$num_rows++;
 				}
-			} elseif ( is_resource( $this->result ) ) {
-				while ( $row = mysql_fetch_object( $this->result ) ) {
+			} elseif (is_resource($this->result)) {
+				while ($row = mysql_fetch_object($this->result)) {
 					$this->last_result[$num_rows] = $row;
 					$num_rows++;
 				}
@@ -1792,20 +1792,20 @@ 
 	 *
 	 * @param string $query The query to run.
 	 */
-	private function _do_query( $query ) {
-		if ( defined( 'SAVEQUERIES' ) && SAVEQUERIES ) {
+	private function _do_query($query) {
+		if (defined('SAVEQUERIES') && SAVEQUERIES) {
 			$this->timer_start();
 		}
 
-		if ( ! empty( $this->dbh ) && $this->use_mysqli ) {
-			$this->result = mysqli_query( $this->dbh, $query );
-		} elseif ( ! empty( $this->dbh ) ) {
-			$this->result = mysql_query( $query, $this->dbh );
+		if ( ! empty($this->dbh) && $this->use_mysqli) {
+			$this->result = mysqli_query($this->dbh, $query);
+		} elseif ( ! empty($this->dbh)) {
+			$this->result = mysql_query($query, $this->dbh);
 		}
 		$this->num_queries++;
 
-		if ( defined( 'SAVEQUERIES' ) && SAVEQUERIES ) {
-			$this->queries[] = array( $query, $this->timer_stop(), $this->get_caller() );
+		if (defined('SAVEQUERIES') && SAVEQUERIES) {
+			$this->queries[] = array($query, $this->timer_stop(), $this->get_caller());
 		}
 	}
 
@@ -1830,8 +1830,8 @@ 
 	 *                             If omitted, all values in $data will be treated as strings unless otherwise specified in wpdb::$field_types.
 	 * @return int|false The number of rows inserted, or false on error.
 	 */
-	public function insert( $table, $data, $format = null ) {
-		return $this->_insert_replace_helper( $table, $data, $format, 'INSERT' );
+	public function insert($table, $data, $format = null) {
+		return $this->_insert_replace_helper($table, $data, $format, 'INSERT');
 	}
 
 	/**
@@ -1855,8 +1855,8 @@ 
 	 *                             If omitted, all values in $data will be treated as strings unless otherwise specified in wpdb::$field_types.
 	 * @return int|false The number of rows affected, or false on error.
 	 */
-	public function replace( $table, $data, $format = null ) {
-		return $this->_insert_replace_helper( $table, $data, $format, 'REPLACE' );
+	public function replace($table, $data, $format = null) {
+		return $this->_insert_replace_helper($table, $data, $format, 'REPLACE');
 	}
 
 	/**
@@ -1881,21 +1881,21 @@ 
 	 * @param string $type         Optional. What type of operation is this? INSERT or REPLACE. Defaults to INSERT.
 	 * @return int|false The number of rows affected, or false on error.
 	 */
-	function _insert_replace_helper( $table, $data, $format = null, $type = 'INSERT' ) {
+	function _insert_replace_helper($table, $data, $format = null, $type = 'INSERT') {
 		$this->insert_id = 0;
 
-		if ( ! in_array( strtoupper( $type ), array( 'REPLACE', 'INSERT' ) ) ) {
+		if ( ! in_array(strtoupper($type), array('REPLACE', 'INSERT'))) {
 			return false;
 		}
 
-		$data = $this->process_fields( $table, $data, $format );
-		if ( false === $data ) {
+		$data = $this->process_fields($table, $data, $format);
+		if (false === $data) {
 			return false;
 		}
 
 		$formats = $values = array();
-		foreach ( $data as $value ) {
-			if ( is_null( $value['value'] ) ) {
+		foreach ($data as $value) {
+			if (is_null($value['value'])) {
 				$formats[] = 'NULL';
 				continue;
 			}
@@ -1904,13 +1904,13 @@ 
 			$values[]  = $value['value'];
 		}
 
-		$fields  = '`' . implode( '`, `', array_keys( $data ) ) . '`';
-		$formats = implode( ', ', $formats );
+		$fields  = '`'.implode('`, `', array_keys($data)).'`';
+		$formats = implode(', ', $formats);
 
 		$sql = "$type INTO `$table` ($fields) VALUES ($formats)";
 
 		$this->check_current_query = false;
-		return $this->query( $this->prepare( $sql, $values ) );
+		return $this->query($this->prepare($sql, $values));
 	}
 
 	/**
@@ -1943,47 +1943,47 @@ 
 	 *                                   If omitted, all values in $where will be treated as strings.
 	 * @return int|false The number of rows updated, or false on error.
 	 */
-	public function update( $table, $data, $where, $format = null, $where_format = null ) {
-		if ( ! is_array( $data ) || ! is_array( $where ) ) {
+	public function update($table, $data, $where, $format = null, $where_format = null) {
+		if ( ! is_array($data) || ! is_array($where)) {
 			return false;
 		}
 
-		$data = $this->process_fields( $table, $data, $format );
-		if ( false === $data ) {
+		$data = $this->process_fields($table, $data, $format);
+		if (false === $data) {
 			return false;
 		}
-		$where = $this->process_fields( $table, $where, $where_format );
-		if ( false === $where ) {
+		$where = $this->process_fields($table, $where, $where_format);
+		if (false === $where) {
 			return false;
 		}
 
 		$fields = $conditions = $values = array();
-		foreach ( $data as $field => $value ) {
-			if ( is_null( $value['value'] ) ) {
+		foreach ($data as $field => $value) {
+			if (is_null($value['value'])) {
 				$fields[] = "`$field` = NULL";
 				continue;
 			}
 
-			$fields[] = "`$field` = " . $value['format'];
+			$fields[] = "`$field` = ".$value['format'];
 			$values[] = $value['value'];
 		}
-		foreach ( $where as $field => $value ) {
-			if ( is_null( $value['value'] ) ) {
+		foreach ($where as $field => $value) {
+			if (is_null($value['value'])) {
 				$conditions[] = "`$field` IS NULL";
 				continue;
 			}
 
-			$conditions[] = "`$field` = " . $value['format'];
+			$conditions[] = "`$field` = ".$value['format'];
 			$values[] = $value['value'];
 		}
 
-		$fields = implode( ', ', $fields );
-		$conditions = implode( ' AND ', $conditions );
+		$fields = implode(', ', $fields);
+		$conditions = implode(' AND ', $conditions);
 
 		$sql = "UPDATE `$table` SET $fields WHERE $conditions";
 
 		$this->check_current_query = false;
-		return $this->query( $this->prepare( $sql, $values ) );
+		return $this->query($this->prepare($sql, $values));
 	}
 
 	/**
@@ -2008,33 +2008,33 @@ 
 	 *                                   If omitted, all values in $where will be treated as strings unless otherwise specified in wpdb::$field_types.
 	 * @return int|false The number of rows updated, or false on error.
 	 */
-	public function delete( $table, $where, $where_format = null ) {
-		if ( ! is_array( $where ) ) {
+	public function delete($table, $where, $where_format = null) {
+		if ( ! is_array($where)) {
 			return false;
 		}
 
-		$where = $this->process_fields( $table, $where, $where_format );
-		if ( false === $where ) {
+		$where = $this->process_fields($table, $where, $where_format);
+		if (false === $where) {
 			return false;
 		}
 
 		$conditions = $values = array();
-		foreach ( $where as $field => $value ) {
-			if ( is_null( $value['value'] ) ) {
+		foreach ($where as $field => $value) {
+			if (is_null($value['value'])) {
 				$conditions[] = "`$field` IS NULL";
 				continue;
 			}
 
-			$conditions[] = "`$field` = " . $value['format'];
+			$conditions[] = "`$field` = ".$value['format'];
 			$values[] = $value['value'];
 		}
 
-		$conditions = implode( ' AND ', $conditions );
+		$conditions = implode(' AND ', $conditions);
 
 		$sql = "DELETE FROM `$table` WHERE $conditions";
 
 		$this->check_current_query = false;
-		return $this->query( $this->prepare( $sql, $values ) );
+		return $this->query($this->prepare($sql, $values));
 	}
 
 	/**
@@ -2055,25 +2055,25 @@ 
 	 * @return array|false Returns an array of fields that contain paired values
 	 *                    and formats. Returns false for invalid values.
 	 */
-	protected function process_fields( $table, $data, $format ) {
-		$data = $this->process_field_formats( $data, $format );
-		if ( false === $data ) {
+	protected function process_fields($table, $data, $format) {
+		$data = $this->process_field_formats($data, $format);
+		if (false === $data) {
 			return false;
 		}
 
-		$data = $this->process_field_charsets( $data, $table );
-		if ( false === $data ) {
+		$data = $this->process_field_charsets($data, $table);
+		if (false === $data) {
 			return false;
 		}
 
-		$data = $this->process_field_lengths( $data, $table );
-		if ( false === $data ) {
+		$data = $this->process_field_lengths($data, $table);
+		if (false === $data) {
 			return false;
 		}
 
-		$converted_data = $this->strip_invalid_text( $data );
+		$converted_data = $this->strip_invalid_text($data);
 
-		if ( $data !== $converted_data ) {
+		if ($data !== $converted_data) {
 			return false;
 		}
 
@@ -2091,25 +2091,25 @@ 
 	 * @return array Array, keyed by field names with values being an array
 	 *               of 'value' and 'format' keys.
 	 */
-	protected function process_field_formats( $data, $format ) {
+	protected function process_field_formats($data, $format) {
 		$formats = $original_formats = (array) $format;
 
-		foreach ( $data as $field => $value ) {
+		foreach ($data as $field => $value) {
 			$value = array(
 				'value'  => $value,
 				'format' => '%s',
 			);
 
-			if ( ! empty( $format ) ) {
-				$value['format'] = array_shift( $formats );
-				if ( ! $value['format'] ) {
-					$value['format'] = reset( $original_formats );
+			if ( ! empty($format)) {
+				$value['format'] = array_shift($formats);
+				if ( ! $value['format']) {
+					$value['format'] = reset($original_formats);
 				}
-			} elseif ( isset( $this->field_types[ $field ] ) ) {
-				$value['format'] = $this->field_types[ $field ];
+			} elseif (isset($this->field_types[$field])) {
+				$value['format'] = $this->field_types[$field];
 			}
 
-			$data[ $field ] = $value;
+			$data[$field] = $value;
 		}
 
 		return $data;
@@ -2126,22 +2126,22 @@ 
 	 * @param string $table Table name.
 	 * @return array|false The same array as $data with additional 'charset' keys.
 	 */
-	protected function process_field_charsets( $data, $table ) {
-		foreach ( $data as $field => $value ) {
-			if ( '%d' === $value['format'] || '%f' === $value['format'] ) {
+	protected function process_field_charsets($data, $table) {
+		foreach ($data as $field => $value) {
+			if ('%d' === $value['format'] || '%f' === $value['format']) {
 				/*
 				 * We can skip this field if we know it isn't a string.
 				 * This checks %d/%f versus ! %s because its sprintf() could take more.
 				 */
 				$value['charset'] = false;
 			} else {
-				$value['charset'] = $this->get_col_charset( $table, $field );
-				if ( is_wp_error( $value['charset'] ) ) {
+				$value['charset'] = $this->get_col_charset($table, $field);
+				if (is_wp_error($value['charset'])) {
 					return false;
 				}
 			}
 
-			$data[ $field ] = $value;
+			$data[$field] = $value;
 		}
 
 		return $data;
@@ -2158,22 +2158,22 @@ 
 	 * @return array|false The same array as $data with additional 'length' keys, or false if
 	 *                     any of the values were too long for their corresponding field.
 	 */
-	protected function process_field_lengths( $data, $table ) {
-		foreach ( $data as $field => $value ) {
-			if ( '%d' === $value['format'] || '%f' === $value['format'] ) {
+	protected function process_field_lengths($data, $table) {
+		foreach ($data as $field => $value) {
+			if ('%d' === $value['format'] || '%f' === $value['format']) {
 				/*
 				 * We can skip this field if we know it isn't a string.
 				 * This checks %d/%f versus ! %s because its sprintf() could take more.
 				 */
 				$value['length'] = false;
 			} else {
-				$value['length'] = $this->get_col_length( $table, $field );
-				if ( is_wp_error( $value['length'] ) ) {
+				$value['length'] = $this->get_col_length($table, $field);
+				if (is_wp_error($value['length'])) {
 					return false;
 				}
 			}
 
-			$data[ $field ] = $value;
+			$data[$field] = $value;
 		}
 
 		return $data;
@@ -2193,24 +2193,24 @@ 
 	 * @param int         $y     Optional. Row of value to return. Indexed from 0.
 	 * @return string|null Database query result (as string), or null on failure
 	 */
-	public function get_var( $query = null, $x = 0, $y = 0 ) {
+	public function get_var($query = null, $x = 0, $y = 0) {
 		$this->func_call = "\$db->get_var(\"$query\", $x, $y)";
 
-		if ( $this->check_current_query && $this->check_safe_collation( $query ) ) {
+		if ($this->check_current_query && $this->check_safe_collation($query)) {
 			$this->check_current_query = false;
 		}
 
-		if ( $query ) {
-			$this->query( $query );
+		if ($query) {
+			$this->query($query);
 		}
 
 		// Extract var out of cached results based x,y vals
-		if ( !empty( $this->last_result[$y] ) ) {
-			$values = array_values( get_object_vars( $this->last_result[$y] ) );
+		if ( ! empty($this->last_result[$y])) {
+			$values = array_values(get_object_vars($this->last_result[$y]));
 		}
 
 		// If there is a value return it else return null
-		return ( isset( $values[$x] ) && $values[$x] !== '' ) ? $values[$x] : null;
+		return (isset($values[$x]) && $values[$x] !== '') ? $values[$x] : null;
 	}
 
 	/**
@@ -2228,33 +2228,33 @@ 
 	 * @param int         $y      Optional. Row to return. Indexed from 0.
 	 * @return array|object|null|void Database query result in format specified by $output or null on failure
 	 */
-	public function get_row( $query = null, $output = OBJECT, $y = 0 ) {
+	public function get_row($query = null, $output = OBJECT, $y = 0) {
 		$this->func_call = "\$db->get_row(\"$query\",$output,$y)";
 
-		if ( $this->check_current_query && $this->check_safe_collation( $query ) ) {
+		if ($this->check_current_query && $this->check_safe_collation($query)) {
 			$this->check_current_query = false;
 		}
 
-		if ( $query ) {
-			$this->query( $query );
+		if ($query) {
+			$this->query($query);
 		} else {
 			return null;
 		}
 
-		if ( !isset( $this->last_result[$y] ) )
+		if ( ! isset($this->last_result[$y]))
 			return null;
 
-		if ( $output == OBJECT ) {
+		if ($output == OBJECT) {
 			return $this->last_result[$y] ? $this->last_result[$y] : null;
-		} elseif ( $output == ARRAY_A ) {
-			return $this->last_result[$y] ? get_object_vars( $this->last_result[$y] ) : null;
-		} elseif ( $output == ARRAY_N ) {
-			return $this->last_result[$y] ? array_values( get_object_vars( $this->last_result[$y] ) ) : null;
-		} elseif ( strtoupper( $output ) === OBJECT ) {
+		} elseif ($output == ARRAY_A) {
+			return $this->last_result[$y] ? get_object_vars($this->last_result[$y]) : null;
+		} elseif ($output == ARRAY_N) {
+			return $this->last_result[$y] ? array_values(get_object_vars($this->last_result[$y])) : null;
+		} elseif (strtoupper($output) === OBJECT) {
 			// Back compat for OBJECT being previously case insensitive.
 			return $this->last_result[$y] ? $this->last_result[$y] : null;
 		} else {
-			$this->print_error( " \$db->get_row(string query, output type, int offset) -- Output type must be one of: OBJECT, ARRAY_A, ARRAY_N" );
+			$this->print_error(" \$db->get_row(string query, output type, int offset) -- Output type must be one of: OBJECT, ARRAY_A, ARRAY_N");
 		}
 	}
 
@@ -2271,19 +2271,19 @@ 
 	 * @param int         $x     Optional. Column to return. Indexed from 0.
 	 * @return array Database query result. Array indexed from 0 by SQL result row number.
 	 */
-	public function get_col( $query = null , $x = 0 ) {
-		if ( $this->check_current_query && $this->check_safe_collation( $query ) ) {
+	public function get_col($query = null, $x = 0) {
+		if ($this->check_current_query && $this->check_safe_collation($query)) {
 			$this->check_current_query = false;
 		}
 
-		if ( $query ) {
-			$this->query( $query );
+		if ($query) {
+			$this->query($query);
 		}
 
 		$new_array = array();
 		// Extract the column values
-		for ( $i = 0, $j = count( $this->last_result ); $i < $j; $i++ ) {
-			$new_array[$i] = $this->get_var( null, $x, $i );
+		for ($i = 0, $j = count($this->last_result); $i < $j; $i++) {
+			$new_array[$i] = $this->get_var(null, $x, $i);
 		}
 		return $new_array;
 	}
@@ -2303,48 +2303,48 @@ 
 	 *                       Duplicate keys are discarded.
 	 * @return array|object|null Database query results
 	 */
-	public function get_results( $query = null, $output = OBJECT ) {
+	public function get_results($query = null, $output = OBJECT) {
 		$this->func_call = "\$db->get_results(\"$query\", $output)";
 
-		if ( $this->check_current_query && $this->check_safe_collation( $query ) ) {
+		if ($this->check_current_query && $this->check_safe_collation($query)) {
 			$this->check_current_query = false;
 		}
 
-		if ( $query ) {
-			$this->query( $query );
+		if ($query) {
+			$this->query($query);
 		} else {
 			return null;
 		}
 
 		$new_array = array();
-		if ( $output == OBJECT ) {
+		if ($output == OBJECT) {
 			// Return an integer-keyed array of row objects
 			return $this->last_result;
-		} elseif ( $output == OBJECT_K ) {
+		} elseif ($output == OBJECT_K) {
 			// Return an array of row objects with keys from column 1
 			// (Duplicates are discarded)
-			foreach ( $this->last_result as $row ) {
-				$var_by_ref = get_object_vars( $row );
-				$key = array_shift( $var_by_ref );
-				if ( ! isset( $new_array[ $key ] ) )
-					$new_array[ $key ] = $row;
+			foreach ($this->last_result as $row) {
+				$var_by_ref = get_object_vars($row);
+				$key = array_shift($var_by_ref);
+				if ( ! isset($new_array[$key]))
+					$new_array[$key] = $row;
 			}
 			return $new_array;
-		} elseif ( $output == ARRAY_A || $output == ARRAY_N ) {
+		} elseif ($output == ARRAY_A || $output == ARRAY_N) {
 			// Return an integer-keyed array of...
-			if ( $this->last_result ) {
-				foreach ( (array) $this->last_result as $row ) {
-					if ( $output == ARRAY_N ) {
+			if ($this->last_result) {
+				foreach ((array) $this->last_result as $row) {
+					if ($output == ARRAY_N) {
 						// ...integer-keyed row arrays
-						$new_array[] = array_values( get_object_vars( $row ) );
+						$new_array[] = array_values(get_object_vars($row));
 					} else {
 						// ...column name-keyed row arrays
-						$new_array[] = get_object_vars( $row );
+						$new_array[] = get_object_vars($row);
 					}
 				}
 			}
 			return $new_array;
-		} elseif ( strtoupper( $output ) === OBJECT ) {
+		} elseif (strtoupper($output) === OBJECT) {
 			// Back compat for OBJECT being previously case insensitive.
 			return $this->last_result;
 		}
@@ -2360,8 +2360,8 @@ 
 	 * @param string $table Table name.
 	 * @return string|WP_Error Table character set, WP_Error object if it couldn't be found.
 	 */
-	protected function get_table_charset( $table ) {
-		$tablekey = strtolower( $table );
+	protected function get_table_charset($table) {
+		$tablekey = strtolower($table);
 
 		/**
 		 * Filter the table charset value before the DB is checked.
@@ -2374,72 +2374,72 @@ 
 		 * @param string $charset The character set to use. Default null.
 		 * @param string $table   The name of the table being checked.
 		 */
-		$charset = apply_filters( 'pre_get_table_charset', null, $table );
-		if ( null !== $charset ) {
+		$charset = apply_filters('pre_get_table_charset', null, $table);
+		if (null !== $charset) {
 			return $charset;
 		}
 
-		if ( isset( $this->table_charset[ $tablekey ] ) ) {
-			return $this->table_charset[ $tablekey ];
+		if (isset($this->table_charset[$tablekey])) {
+			return $this->table_charset[$tablekey];
 		}
 
 		$charsets = $columns = array();
 
-		$table_parts = explode( '.', $table );
-		$table = '`' . implode( '`.`', $table_parts ) . '`';
-		$results = $this->get_results( "SHOW FULL COLUMNS FROM $table" );
-		if ( ! $results ) {
-			return new WP_Error( 'wpdb_get_table_charset_failure' );
+		$table_parts = explode('.', $table);
+		$table = '`'.implode('`.`', $table_parts).'`';
+		$results = $this->get_results("SHOW FULL COLUMNS FROM $table");
+		if ( ! $results) {
+			return new WP_Error('wpdb_get_table_charset_failure');
 		}
 
-		foreach ( $results as $column ) {
-			$columns[ strtolower( $column->Field ) ] = $column;
+		foreach ($results as $column) {
+			$columns[strtolower($column->Field)] = $column;
 		}
 
-		$this->col_meta[ $tablekey ] = $columns;
+		$this->col_meta[$tablekey] = $columns;
 
-		foreach ( $columns as $column ) {
-			if ( ! empty( $column->Collation ) ) {
-				list( $charset ) = explode( '_', $column->Collation );
+		foreach ($columns as $column) {
+			if ( ! empty($column->Collation)) {
+				list($charset) = explode('_', $column->Collation);
 
 				// If the current connection can't support utf8mb4 characters, let's only send 3-byte utf8 characters.
-				if ( 'utf8mb4' === $charset && ! $this->has_cap( 'utf8mb4' ) ) {
+				if ('utf8mb4' === $charset && ! $this->has_cap('utf8mb4')) {
 					$charset = 'utf8';
 				}
 
-				$charsets[ strtolower( $charset ) ] = true;
+				$charsets[strtolower($charset)] = true;
 			}
 
-			list( $type ) = explode( '(', $column->Type );
+			list($type) = explode('(', $column->Type);
 
 			// A binary/blob means the whole query gets treated like this.
-			if ( in_array( strtoupper( $type ), array( 'BINARY', 'VARBINARY', 'TINYBLOB', 'MEDIUMBLOB', 'BLOB', 'LONGBLOB' ) ) ) {
-				$this->table_charset[ $tablekey ] = 'binary';
+			if (in_array(strtoupper($type), array('BINARY', 'VARBINARY', 'TINYBLOB', 'MEDIUMBLOB', 'BLOB', 'LONGBLOB'))) {
+				$this->table_charset[$tablekey] = 'binary';
 				return 'binary';
 			}
 		}
 
 		// utf8mb3 is an alias for utf8.
-		if ( isset( $charsets['utf8mb3'] ) ) {
+		if (isset($charsets['utf8mb3'])) {
 			$charsets['utf8'] = true;
-			unset( $charsets['utf8mb3'] );
+			unset($charsets['utf8mb3']);
 		}
 
 		// Check if we have more than one charset in play.
-		$count = count( $charsets );
-		if ( 1 === $count ) {
-			$charset = key( $charsets );
-		} elseif ( 0 === $count ) {
+		$count = count($charsets);
+		if (1 === $count) {
+			$charset = key($charsets);
+		} elseif (0 === $count) {
 			// No charsets, assume this table can store whatever.
 			$charset = false;
 		} else {
 			// More than one charset. Remove latin1 if present and recalculate.
-			unset( $charsets['latin1'] );
-			$count = count( $charsets );
-			if ( 1 === $count ) {
+			unset($charsets['latin1']);
+			$count = count($charsets);
+			if (1 === $count) {
 				// Only one charset (besides latin1).
-				$charset = key( $charsets );
-			} elseif ( 2 === $count && isset( $charsets['utf8'], $charsets['utf8mb4'] ) ) {
+				$charset = key($charsets);
+			} elseif (2 === $count && isset($charsets['utf8'], $charsets['utf8mb4'])) {
 				// Two charsets, but they're utf8 and utf8mb4, use utf8.
 				$charset = 'utf8';
 			} else {
@@ -2448,7 +2448,7 @@ 
 			}
 		}
 
-		$this->table_charset[ $tablekey ] = $charset;
+		$this->table_charset[$tablekey] = $charset;
 		return $charset;
 	}
 
@@ -2463,9 +2463,9 @@ 
 	 * @return string|false|WP_Error Column character set as a string. False if the column has no
 	 *                               character set. WP_Error object if there was an error.
 	 */
-	public function get_col_charset( $table, $column ) {
-		$tablekey = strtolower( $table );
-		$columnkey = strtolower( $column );
+	public function get_col_charset($table, $column) {
+		$tablekey = strtolower($table);
+		$columnkey = strtolower($column);
 
 		/**
 		 * Filter the column charset value before the DB is checked.
@@ -2479,40 +2479,40 @@ 
 		 * @param string $table   The name of the table being checked.
 		 * @param string $column  The name of the column being checked.
 		 */
-		$charset = apply_filters( 'pre_get_col_charset', null, $table, $column );
-		if ( null !== $charset ) {
+		$charset = apply_filters('pre_get_col_charset', null, $table, $column);
+		if (null !== $charset) {
 			return $charset;
 		}
 
 		// Skip this entirely if this isn't a MySQL database.
-		if ( empty( $this->is_mysql ) ) {
+		if (empty($this->is_mysql)) {
 			return false;
 		}
 
-		if ( empty( $this->table_charset[ $tablekey ] ) ) {
+		if (empty($this->table_charset[$tablekey])) {
 			// This primes column information for us.
-			$table_charset = $this->get_table_charset( $table );
-			if ( is_wp_error( $table_charset ) ) {
+			$table_charset = $this->get_table_charset($table);
+			if (is_wp_error($table_charset)) {
 				return $table_charset;
 			}
 		}
 
 		// If still no column information, return the table charset.
-		if ( empty( $this->col_meta[ $tablekey ] ) ) {
-			return $this->table_charset[ $tablekey ];
+		if (empty($this->col_meta[$tablekey])) {
+			return $this->table_charset[$tablekey];
 		}
 
 		// If this column doesn't exist, return the table charset.
-		if ( empty( $this->col_meta[ $tablekey ][ $columnkey ] ) ) {
-			return $this->table_charset[ $tablekey ];
+		if (empty($this->col_meta[$tablekey][$columnkey])) {
+			return $this->table_charset[$tablekey];
 		}
 
 		// Return false when it's not a string column.
-		if ( empty( $this->col_meta[ $tablekey ][ $columnkey ]->Collation ) ) {
+		if (empty($this->col_meta[$tablekey][$columnkey]->Collation)) {
 			return false;
 		}
 
-		list( $charset ) = explode( '_', $this->col_meta[ $tablekey ][ $columnkey ]->Collation );
+		list($charset) = explode('_', $this->col_meta[$tablekey][$columnkey]->Collation);
 		return $charset;
 	}
 
@@ -2529,37 +2529,37 @@ 
 	 *                              false if the column has no length (for example, numeric column)
 	 *                              WP_Error object if there was an error.
 	 */
-	public function get_col_length( $table, $column ) {
-		$tablekey = strtolower( $table );
-		$columnkey = strtolower( $column );
+	public function get_col_length($table, $column) {
+		$tablekey = strtolower($table);
+		$columnkey = strtolower($column);
 
 		// Skip this entirely if this isn't a MySQL database.
-		if ( empty( $this->is_mysql ) ) {
+		if (empty($this->is_mysql)) {
 			return false;
 		}
 
-		if ( empty( $this->col_meta[ $tablekey ] ) ) {
+		if (empty($this->col_meta[$tablekey])) {
 			// This primes column information for us.
-			$table_charset = $this->get_table_charset( $table );
-			if ( is_wp_error( $table_charset ) ) {
+			$table_charset = $this->get_table_charset($table);
+			if (is_wp_error($table_charset)) {
 				return $table_charset;
 			}
 		}
 
-		if ( empty( $this->col_meta[ $tablekey ][ $columnkey ] ) ) {
+		if (empty($this->col_meta[$tablekey][$columnkey])) {
 			return false;
 		}
 
-		$typeinfo = explode( '(', $this->col_meta[ $tablekey ][ $columnkey ]->Type );
+		$typeinfo = explode('(', $this->col_meta[$tablekey][$columnkey]->Type);
 
-		$type = strtolower( $typeinfo[0] );
-		if ( ! empty( $typeinfo[1] ) ) {
-			$length = trim( $typeinfo[1], ')' );
+		$type = strtolower($typeinfo[0]);
+		if ( ! empty($typeinfo[1])) {
+			$length = trim($typeinfo[1], ')');
 		} else {
 			$length = false;
 		}
 
-		switch( $type ) {
+		switch ($type) {
 			case 'char':
 			case 'varchar':
 				return array(
@@ -2578,21 +2578,21 @@ 
 			case 'tinytext':
 				return array(
 					'type'   => 'byte',
-					'length' => 255,        // 2^8 - 1
+					'length' => 255, // 2^8 - 1
 				);
 
 			case 'blob':
 			case 'text':
 				return array(
 					'type'   => 'byte',
-					'length' => 65535,      // 2^16 - 1
+					'length' => 65535, // 2^16 - 1
 				);
 
 			case 'mediumblob':
 			case 'mediumtext':
 				return array(
 					'type'   => 'byte',
-					'length' => 16777215,   // 2^24 - 1
+					'length' => 16777215, // 2^24 - 1
 				);
 
 			case 'longblob':
@@ -2619,12 +2619,12 @@ 
 	 * @param string $string String to check.
 	 * @return bool True if ASCII, false if not.
 	 */
-	protected function check_ascii( $string ) {
-		if ( function_exists( 'mb_check_encoding' ) ) {
-			if ( mb_check_encoding( $string, 'ASCII' ) ) {
+	protected function check_ascii($string) {
+		if (function_exists('mb_check_encoding')) {
+			if (mb_check_encoding($string, 'ASCII')) {
 				return true;
 			}
-		} elseif ( ! preg_match( '/[^\x00-\x7F]/', $string ) ) {
+		} elseif ( ! preg_match('/[^\x00-\x7F]/', $string)) {
 			return true;
 		}
 
@@ -2640,48 +2640,48 @@ 
 	 * @param string $query The query to check.
 	 * @return bool True if the collation is safe, false if it isn't.
 	 */
-	protected function check_safe_collation( $query ) {
-		if ( $this->checking_collation ) {
+	protected function check_safe_collation($query) {
+		if ($this->checking_collation) {
 			return true;
 		}
 
 		// We don't need to check the collation for queries that don't read data.
-		$query = ltrim( $query, "\r\n\t (" );
-		if ( preg_match( '/^(?:SHOW|DESCRIBE|DESC|EXPLAIN|CREATE)\s/i', $query ) ) {
+		$query = ltrim($query, "\r\n\t (");
+		if (preg_match('/^(?:SHOW|DESCRIBE|DESC|EXPLAIN|CREATE)\s/i', $query)) {
 			return true;
 		}
 
 		// All-ASCII queries don't need extra checking.
-		if ( $this->check_ascii( $query ) ) {
+		if ($this->check_ascii($query)) {
 			return true;
 		}
 
-		$table = $this->get_table_from_query( $query );
-		if ( ! $table ) {
+		$table = $this->get_table_from_query($query);
+		if ( ! $table) {
 			return false;
 		}
 
 		$this->checking_collation = true;
-		$collation = $this->get_table_charset( $table );
+		$collation = $this->get_table_charset($table);
 		$this->checking_collation = false;
 
 		// Tables with no collation, or latin1 only, don't need extra checking.
-		if ( false === $collation || 'latin1' === $collation ) {
+		if (false === $collation || 'latin1' === $collation) {
 			return true;
 		}
 
-		$table = strtolower( $table );
-		if ( empty( $this->col_meta[ $table ] ) ) {
+		$table = strtolower($table);
+		if (empty($this->col_meta[$table])) {
 			return false;
 		}
 
 		// If any of the columns don't have one of these collations, it needs more sanity checking.
-		foreach ( $this->col_meta[ $table ] as $col ) {
-			if ( empty( $col->Collation ) ) {
+		foreach ($this->col_meta[$table] as $col) {
+			if (empty($col->Collation)) {
 				continue;
 			}
 
-			if ( ! in_array( $col->Collation, array( 'utf8_general_ci', 'utf8_bin', 'utf8mb4_general_ci', 'utf8mb4_bin' ), true ) ) {
+			if ( ! in_array($col->Collation, array('utf8_general_ci', 'utf8_bin', 'utf8mb4_general_ci', 'utf8mb4_bin'), true)) {
 				return false;
 			}
 		}
@@ -2703,13 +2703,13 @@ 
 	 *                        such as 'field' are retained in each value array. If we cannot
 	 *                        remove invalid characters, a WP_Error object is returned.
 	 */
-	protected function strip_invalid_text( $data ) {
+	protected function strip_invalid_text($data) {
 		$db_check_string = false;
 
-		foreach ( $data as &$value ) {
+		foreach ($data as &$value) {
 			$charset = $value['charset'];
 
-			if ( is_array( $value['length'] ) ) {
+			if (is_array($value['length'])) {
 				$length = $value['length']['length'];
 				$truncate_by_byte_length = 'byte' === $value['length']['type'];
 			} else {
@@ -2721,12 +2721,12 @@ 
 			}
 
 			// There's no charset to work with.
-			if ( false === $charset ) {
+			if (false === $charset) {
 				continue;
 			}
 
 			// Column isn't a string.
-			if ( ! is_string( $value['value'] ) ) {
+			if ( ! is_string($value['value'])) {
 				continue;
 			}
 
@@ -2736,26 +2736,26 @@ 
 				'latin1' === $charset
 			||
 				// ASCII is always OK.
-				( ! isset( $value['ascii'] ) && $this->check_ascii( $value['value'] ) )
+				( ! isset($value['ascii']) && $this->check_ascii($value['value']))
 			) {
 				$truncate_by_byte_length = true;
 				$needs_validation = false;
 			}
 
-			if ( $truncate_by_byte_length ) {
+			if ($truncate_by_byte_length) {
 				mbstring_binary_safe_encoding();
-				if ( false !== $length && strlen( $value['value'] ) > $length ) {
-					$value['value'] = substr( $value['value'], 0, $length );
+				if (false !== $length && strlen($value['value']) > $length) {
+					$value['value'] = substr($value['value'], 0, $length);
 				}
 				reset_mbstring_encoding();
 
-				if ( ! $needs_validation ) {
+				if ( ! $needs_validation) {
 					continue;
 				}
 			}
 
 			// utf8 can be handled by regex, which is a bunch faster than a DB lookup.
-			if ( ( 'utf8' === $charset || 'utf8mb3' === $charset || 'utf8mb4' === $charset ) && function_exists( 'mb_strlen' ) ) {
+			if (('utf8' === $charset || 'utf8mb3' === $charset || 'utf8mb4' === $charset) && function_exists('mb_strlen')) {
 				$regex = '/
 					(
 						(?: [\x00-\x7F]                  # single-byte sequences   0xxxxxxx
@@ -2765,7 +2765,7 @@ 
 						|   \xED[\x80-\x9F][\x80-\xBF]
 						|   [\xEE-\xEF][\x80-\xBF]{2}';
 
-				if ( 'utf8mb4' === $charset ) {
+				if ('utf8mb4' === $charset) {
 					$regex .= '
 						|    \xF0[\x90-\xBF][\x80-\xBF]{2} # four-byte sequences   11110xxx 10xxxxxx * 3
 						|    [\xF1-\xF3][\x80-\xBF]{3}
@@ -2777,11 +2777,11 @@ 
 					)
 					| .                                  # anything else
 					/x';
-				$value['value'] = preg_replace( $regex, '$1', $value['value'] );
+				$value['value'] = preg_replace($regex, '$1', $value['value']);
 
 
-				if ( false !== $length && mb_strlen( $value['value'], 'UTF-8' ) > $length ) {
-					$value['value'] = mb_substr( $value['value'], 0, $length, 'UTF-8' );
+				if (false !== $length && mb_strlen($value['value'], 'UTF-8') > $length) {
+					$value['value'] = mb_substr($value['value'], 0, $length, 'UTF-8');
 				}
 				continue;
 			}
@@ -2789,59 +2789,59 @@ 
 			// We couldn't use any local conversions, send it to the DB.
 			$value['db'] = $db_check_string = true;
 		}
-		unset( $value ); // Remove by reference.
+		unset($value); // Remove by reference.
 
-		if ( $db_check_string ) {
+		if ($db_check_string) {
 			$queries = array();
-			foreach ( $data as $col => $value ) {
-				if ( ! empty( $value['db'] ) ) {
+			foreach ($data as $col => $value) {
+				if ( ! empty($value['db'])) {
 					// We're going to need to truncate by characters or bytes, depending on the length value we have.
-					if ( 'byte' === $value['length']['type'] ) {
+					if ('byte' === $value['length']['type']) {
 						// Using binary causes LEFT() to truncate by bytes.
 						$charset = 'binary';
 					} else {
 						$charset = $value['charset'];
 					}
 
-					if ( $this->charset ) {
+					if ($this->charset) {
 						$connection_charset = $this->charset;
 					} else {
-						if ( $this->use_mysqli ) {
-							$connection_charset = mysqli_character_set_name( $this->dbh );
+						if ($this->use_mysqli) {
+							$connection_charset = mysqli_character_set_name($this->dbh);
 						} else {
 							$connection_charset = mysql_client_encoding();
 						}
 					}
 
-					if ( is_array( $value['length'] ) ) {
-						$queries[ $col ] = $this->prepare( "CONVERT( LEFT( CONVERT( %s USING $charset ), %.0f ) USING $connection_charset )", $value['value'], $value['length']['length'] );
-					} else if ( 'binary' !== $charset ) {
+					if (is_array($value['length'])) {
+						$queries[$col] = $this->prepare("CONVERT( LEFT( CONVERT( %s USING $charset ), %.0f ) USING $connection_charset )", $value['value'], $value['length']['length']);
+					} else if ('binary' !== $charset) {
 						// If we don't have a length, there's no need to convert binary - it will always return the same result.
-						$queries[ $col ] = $this->prepare( "CONVERT( CONVERT( %s USING $charset ) USING $connection_charset )", $value['value'] );
+						$queries[$col] = $this->prepare("CONVERT( CONVERT( %s USING $charset ) USING $connection_charset )", $value['value']);
 					}
 
-					unset( $data[ $col ]['db'] );
+					unset($data[$col]['db']);
 				}
 			}
 
 			$sql = array();
-			foreach ( $queries as $column => $query ) {
-				if ( ! $query ) {
+			foreach ($queries as $column => $query) {
+				if ( ! $query) {
 					continue;
 				}
 
-				$sql[] = $query . " AS x_$column";
+				$sql[] = $query." AS x_$column";
 			}
 
 			$this->check_current_query = false;
-			$row = $this->get_row( "SELECT " . implode( ', ', $sql ), ARRAY_A );
-			if ( ! $row ) {
-				return new WP_Error( 'wpdb_strip_invalid_text_failure' );
+			$row = $this->get_row("SELECT ".implode(', ', $sql), ARRAY_A);
+			if ( ! $row) {
+				return new WP_Error('wpdb_strip_invalid_text_failure');
 			}
 
-			foreach ( array_keys( $data ) as $column ) {
-				if ( isset( $row["x_$column"] ) ) {
-					$data[ $column ]['value'] = $row["x_$column"];
+			foreach (array_keys($data) as $column) {
+				if (isset($row["x_$column"])) {
+					$data[$column]['value'] = $row["x_$column"];
 				}
 			}
 		}
@@ -2858,22 +2858,22 @@ 
 	 * @param string $query Query to convert.
 	 * @return string|WP_Error The converted query, or a WP_Error object if the conversion fails.
 	 */
-	protected function strip_invalid_text_from_query( $query ) {
+	protected function strip_invalid_text_from_query($query) {
 		// We don't need to check the collation for queries that don't read data.
-		$trimmed_query = ltrim( $query, "\r\n\t (" );
-		if ( preg_match( '/^(?:SHOW|DESCRIBE|DESC|EXPLAIN|CREATE)\s/i', $trimmed_query ) ) {
+		$trimmed_query = ltrim($query, "\r\n\t (");
+		if (preg_match('/^(?:SHOW|DESCRIBE|DESC|EXPLAIN|CREATE)\s/i', $trimmed_query)) {
 			return $query;
 		}
 
-		$table = $this->get_table_from_query( $query );
-		if ( $table ) {
-			$charset = $this->get_table_charset( $table );
-			if ( is_wp_error( $charset ) ) {
+		$table = $this->get_table_from_query($query);
+		if ($table) {
+			$charset = $this->get_table_charset($table);
+			if (is_wp_error($charset)) {
 				return $charset;
 			}
 
 			// We can't reliably strip text from tables containing binary/blob columns
-			if ( 'binary' === $charset ) {
+			if ('binary' === $charset) {
 				return $query;
 			}
 		} else {
@@ -2887,8 +2887,8 @@ 
 			'length'  => false,
 		);
 
-		$data = $this->strip_invalid_text( array( $data ) );
-		if ( is_wp_error( $data ) ) {
+		$data = $this->strip_invalid_text(array($data));
+		if (is_wp_error($data)) {
 			return $data;
 		}
 
@@ -2906,16 +2906,16 @@ 
 	 * @param string $value  The text to check.
 	 * @return string|WP_Error The converted string, or a WP_Error object if the conversion fails.
 	 */
-	public function strip_invalid_text_for_column( $table, $column, $value ) {
-		if ( ! is_string( $value ) ) {
+	public function strip_invalid_text_for_column($table, $column, $value) {
+		if ( ! is_string($value)) {
 			return $value;
 		}
 
-		$charset = $this->get_col_charset( $table, $column );
-		if ( ! $charset ) {
+		$charset = $this->get_col_charset($table, $column);
+		if ( ! $charset) {
 			// Not a string column.
 			return $value;
-		} elseif ( is_wp_error( $charset ) ) {
+		} elseif (is_wp_error($charset)) {
 			// Bail on real errors.
 			return $charset;
 		}
@@ -2924,16 +2924,16 @@ 
 			$column => array(
 				'value'   => $value,
 				'charset' => $charset,
-				'length'  => $this->get_col_length( $table, $column ),
+				'length'  => $this->get_col_length($table, $column),
 			)
 		);
 
-		$data = $this->strip_invalid_text( $data );
-		if ( is_wp_error( $data ) ) {
+		$data = $this->strip_invalid_text($data);
+		if (is_wp_error($data)) {
 			return $data;
 		}
 
-		return $data[ $column ]['value'];
+		return $data[$column]['value'];
 	}
 
 	/**
@@ -2945,37 +2945,37 @@ 
 	 * @param string $query The query to search.
 	 * @return string|false $table The table name found, or false if a table couldn't be found.
 	 */
-	protected function get_table_from_query( $query ) {
+	protected function get_table_from_query($query) {
 		// Remove characters that can legally trail the table name.
-		$query = rtrim( $query, ';/-#' );
+		$query = rtrim($query, ';/-#');
 
 		// Allow (select...) union [...] style queries. Use the first query's table name.
-		$query = ltrim( $query, "\r\n\t (" );
+		$query = ltrim($query, "\r\n\t (");
 
 		// Strip everything between parentheses except nested selects.
-		$query = preg_replace( '/\((?!\s*select)[^(]*?\)/is', '()', $query );
+		$query = preg_replace('/\((?!\s*select)[^(]*?\)/is', '()', $query);
 
 		// Quickly match most common queries.
-		if ( preg_match( '/^\s*(?:'
+		if (preg_match('/^\s*(?:'
 				. 'SELECT.*?\s+FROM'
 				. '|INSERT(?:\s+LOW_PRIORITY|\s+DELAYED|\s+HIGH_PRIORITY)?(?:\s+IGNORE)?(?:\s+INTO)?'
 				. '|REPLACE(?:\s+LOW_PRIORITY|\s+DELAYED)?(?:\s+INTO)?'
 				. '|UPDATE(?:\s+LOW_PRIORITY)?(?:\s+IGNORE)?'
 				. '|DELETE(?:\s+LOW_PRIORITY|\s+QUICK|\s+IGNORE)*(?:\s+FROM)?'
-				. ')\s+((?:[0-9a-zA-Z$_.`-]|[\xC2-\xDF][\x80-\xBF])+)/is', $query, $maybe ) ) {
-			return str_replace( '`', '', $maybe[1] );
+				. ')\s+((?:[0-9a-zA-Z$_.`-]|[\xC2-\xDF][\x80-\xBF])+)/is', $query, $maybe)) {
+			return str_replace('`', '', $maybe[1]);
 		}
 
 		// SHOW TABLE STATUS and SHOW TABLES
-		if ( preg_match( '/^\s*(?:'
+		if (preg_match('/^\s*(?:'
 				. 'SHOW\s+TABLE\s+STATUS.+(?:LIKE\s+|WHERE\s+Name\s*=\s*)'
 				. '|SHOW\s+(?:FULL\s+)?TABLES.+(?:LIKE\s+|WHERE\s+Name\s*=\s*)'
-				. ')\W((?:[0-9a-zA-Z$_.`-]|[\xC2-\xDF][\x80-\xBF])+)\W/is', $query, $maybe ) ) {
-			return str_replace( '`', '', $maybe[1] );
+				. ')\W((?:[0-9a-zA-Z$_.`-]|[\xC2-\xDF][\x80-\xBF])+)\W/is', $query, $maybe)) {
+			return str_replace('`', '', $maybe[1]);
 		}
 
 		// Big pattern for the rest of the table-related queries.
-		if ( preg_match( '/^\s*(?:'
+		if (preg_match('/^\s*(?:'
 				. '(?:EXPLAIN\s+(?:EXTENDED\s+)?)?SELECT.*?\s+FROM'
 				. '|DESCRIBE|DESC|EXPLAIN|HANDLER'
 				. '|(?:LOCK|UNLOCK)\s+TABLE(?:S)?'
@@ -2989,8 +2989,8 @@ 
 				. '|LOAD\s+DATA.*INFILE.*INTO\s+TABLE'
 				. '|(?:GRANT|REVOKE).*ON\s+TABLE'
 				. '|SHOW\s+(?:.*FROM|.*TABLE)'
-				. ')\s+\(*\s*((?:[0-9a-zA-Z$_.`-]|[\xC2-\xDF][\x80-\xBF])+)\s*\)*/is', $query, $maybe ) ) {
-			return str_replace( '`', '', $maybe[1] );
+				. ')\s+\(*\s*((?:[0-9a-zA-Z$_.`-]|[\xC2-\xDF][\x80-\xBF])+)\s*\)*/is', $query, $maybe)) {
+			return str_replace('`', '', $maybe[1]);
 		}
 
 		return false;
@@ -3004,18 +3004,18 @@ 
 	 * @access protected
 	 */
 	protected function load_col_info() {
-		if ( $this->col_info )
+		if ($this->col_info)
 			return;
 
-		if ( $this->use_mysqli ) {
-			$num_fields = mysqli_num_fields( $this->result );
-			for ( $i = 0; $i < $num_fields; $i++ ) {
-				$this->col_info[ $i ] = mysqli_fetch_field( $this->result );
+		if ($this->use_mysqli) {
+			$num_fields = mysqli_num_fields($this->result);
+			for ($i = 0; $i < $num_fields; $i++) {
+				$this->col_info[$i] = mysqli_fetch_field($this->result);
 			}
 		} else {
-			$num_fields = mysql_num_fields( $this->result );
-			for ( $i = 0; $i < $num_fields; $i++ ) {
-				$this->col_info[ $i ] = mysql_fetch_field( $this->result, $i );
+			$num_fields = mysql_num_fields($this->result);
+			for ($i = 0; $i < $num_fields; $i++) {
+				$this->col_info[$i] = mysql_fetch_field($this->result, $i);
 			}
 		}
 	}
@@ -3029,14 +3029,14 @@ 
 	 * @param int    $col_offset Optional. 0: col name. 1: which table the col's in. 2: col's max length. 3: if the col is numeric. 4: col's type
 	 * @return mixed Column Results
 	 */
-	public function get_col_info( $info_type = 'name', $col_offset = -1 ) {
+	public function get_col_info($info_type = 'name', $col_offset = -1) {
 		$this->load_col_info();
 
-		if ( $this->col_info ) {
-			if ( $col_offset == -1 ) {
+		if ($this->col_info) {
+			if ($col_offset == -1) {
 				$i = 0;
 				$new_array = array();
-				foreach ( (array) $this->col_info as $col ) {
+				foreach ((array) $this->col_info as $col) {
 					$new_array[$i] = $col->{$info_type};
 					$i++;
 				}
@@ -3055,7 +3055,7 @@ 
 	 * @return true
 	 */
 	public function timer_start() {
-		$this->time_start = microtime( true );
+		$this->time_start = microtime(true);
 		return true;
 	}
 
@@ -3067,7 +3067,7 @@ 
 	 * @return float Total time spent on the query, in seconds
 	 */
 	public function timer_stop() {
-		return ( microtime( true ) - $this->time_start );
+		return (microtime(true) - $this->time_start);
 	}
 
 	/**
@@ -3081,9 +3081,9 @@ 
 	 * @param string $error_code Optional. A Computer readable string to identify the error.
 	 * @return false|void
 	 */
-	public function bail( $message, $error_code = '500' ) {
-		if ( !$this->show_errors ) {
-			if ( class_exists( 'WP_Error', false ) ) {
+	public function bail($message, $error_code = '500') {
+		if ( ! $this->show_errors) {
+			if (class_exists('WP_Error', false)) {
 				$this->error = new WP_Error($error_code, $message);
 			} else {
 				$this->error = $message;
@@ -3104,17 +3104,17 @@ 
 	 *              or the connection doesn't exist.
 	 */
 	public function close() {
-		if ( ! $this->dbh ) {
+		if ( ! $this->dbh) {
 			return false;
 		}
 
-		if ( $this->use_mysqli ) {
-			$closed = mysqli_close( $this->dbh );
+		if ($this->use_mysqli) {
+			$closed = mysqli_close($this->dbh);
 		} else {
-			$closed = mysql_close( $this->dbh );
+			$closed = mysql_close($this->dbh);
 		}
 
-		if ( $closed ) {
+		if ($closed) {
 			$this->dbh = null;
 			$this->ready = false;
 			$this->has_connected = false;
@@ -3136,8 +3136,8 @@ 
 	public function check_database_version() {
 		global $wp_version, $required_mysql_version;
 		// Make sure the server has the required MySQL version
-		if ( version_compare($this->db_version(), $required_mysql_version, '<') )
-			return new WP_Error('database_version', sprintf( __( '<strong>ERROR</strong>: WordPress %1$s requires MySQL %2$s or higher' ), $wp_version, $required_mysql_version ));
+		if (version_compare($this->db_version(), $required_mysql_version, '<'))
+			return new WP_Error('database_version', sprintf(__('<strong>ERROR</strong>: WordPress %1$s requires MySQL %2$s or higher'), $wp_version, $required_mysql_version));
 	}
 
 	/**
@@ -3153,8 +3153,8 @@ 
 	 * @return bool True if collation is supported, false if version does not
 	 */
 	public function supports_collation() {
-		_deprecated_function( __FUNCTION__, '3.5', 'wpdb::has_cap( \'collation\' )' );
-		return $this->has_cap( 'collation' );
+		_deprecated_function(__FUNCTION__, '3.5', 'wpdb::has_cap( \'collation\' )');
+		return $this->has_cap('collation');
 	}
 
 	/**
@@ -3167,9 +3167,9 @@ 
 	public function get_charset_collate() {
 		$charset_collate = '';
 
-		if ( ! empty( $this->charset ) )
+		if ( ! empty($this->charset))
 			$charset_collate = "DEFAULT CHARACTER SET $this->charset";
-		if ( ! empty( $this->collate ) )
+		if ( ! empty($this->collate))
 			$charset_collate .= " COLLATE $this->collate";
 
 		return $charset_collate;
@@ -3188,21 +3188,21 @@ 
 	 *                       or 'utf8mb4'.
 	 * @return int|false Whether the database feature is supported, false otherwise.
 	 */
-	public function has_cap( $db_cap ) {
+	public function has_cap($db_cap) {
 		$version = $this->db_version();
 
-		switch ( strtolower( $db_cap ) ) {
+		switch (strtolower($db_cap)) {
 			case 'collation' :    // @since 2.5.0
 			case 'group_concat' : // @since 2.7.0
 			case 'subqueries' :   // @since 2.7.0
-				return version_compare( $version, '4.1', '>=' );
+				return version_compare($version, '4.1', '>=');
 			case 'set_charset' :
-				return version_compare( $version, '5.0.7', '>=' );
+				return version_compare($version, '5.0.7', '>=');
 			case 'utf8mb4' :      // @since 4.1.0
-				if ( version_compare( $version, '5.5.3', '<' ) ) {
+				if (version_compare($version, '5.5.3', '<')) {
 					return false;
 				}
-				if ( $this->use_mysqli ) {
+				if ($this->use_mysqli) {
 					$client_version = mysqli_get_client_info();
 				} else {
 					$client_version = mysql_get_client_info();
@@ -3212,11 +3212,11 @@ 
 				 * libmysql has supported utf8mb4 since 5.5.3, same as the MySQL server.
 				 * mysqlnd has supported utf8mb4 since 5.0.9.
 				 */
-				if ( false !== strpos( $client_version, 'mysqlnd' ) ) {
-					$client_version = preg_replace( '/^\D+([\d.]+).*/', '$1', $client_version );
-					return version_compare( $client_version, '5.0.9', '>=' );
+				if (false !== strpos($client_version, 'mysqlnd')) {
+					$client_version = preg_replace('/^\D+([\d.]+).*/', '$1', $client_version);
+					return version_compare($client_version, '5.0.9', '>=');
 				} else {
-					return version_compare( $client_version, '5.5.3', '>=' );
+					return version_compare($client_version, '5.5.3', '>=');
 				}
 		}
 
@@ -3234,7 +3234,7 @@ 
 	 * @return string|array The name of the calling function
 	 */
 	public function get_caller() {
-		return wp_debug_backtrace_summary( __CLASS__ );
+		return wp_debug_backtrace_summary(__CLASS__);
 	}
 
 	/**
@@ -3245,11 +3245,11 @@ 
 	 * @return null|string Null on failure, version number on success.
 	 */
 	public function db_version() {
-		if ( $this->use_mysqli ) {
-			$server_info = mysqli_get_server_info( $this->dbh );
+		if ($this->use_mysqli) {
+			$server_info = mysqli_get_server_info($this->dbh);
 		} else {
-			$server_info = mysql_get_server_info( $this->dbh );
+			$server_info = mysql_get_server_info($this->dbh);
 		}
-		return preg_replace( '/[^0-9.].*/', '', $server_info );
+		return preg_replace('/[^0-9.].*/', '', $server_info);
 	}
 }

Braces +133 added lines, -92 removed lines

@@ -626,8 +626,9 @@ 
 	public function __construct( $dbuser, $dbpassword, $dbname, $dbhost ) {
 		register_shutdown_function( array( $this, '__destruct' ) );
 
-		if ( WP_DEBUG && WP_DEBUG_DISPLAY )
-			$this->show_errors();
+		if ( WP_DEBUG && WP_DEBUG_DISPLAY ) {
+					$this->show_errors();
+		}
 
 		/* Use ext/mysqli if it exists and:
 		 *  - WP_USE_EXT_MYSQL is defined as false, or
@@ -678,8 +679,9 @@ 
 	 * @return mixed The private member
 	 */
 	public function __get( $name ) {
-		if ( 'col_info' === $name )
-			$this->load_col_info();
+		if ( 'col_info' === $name ) {
+					$this->load_col_info();
+		}
 
 		return $this->$name;
 	}
@@ -772,18 +774,21 @@ 
 	 * @param string   $collate Optional. The collation. Default null.
 	 */
 	public function set_charset( $dbh, $charset = null, $collate = null ) {
-		if ( ! isset( $charset ) )
-			$charset = $this->charset;
-		if ( ! isset( $collate ) )
-			$collate = $this->collate;
+		if ( ! isset( $charset ) ) {
+					$charset = $this->charset;
+		}
+		if ( ! isset( $collate ) ) {
+					$collate = $this->collate;
+		}
 		if ( $this->has_cap( 'collation' ) && ! empty( $charset ) ) {
 			if ( $this->use_mysqli ) {
 				if ( function_exists( 'mysqli_set_charset' ) && $this->has_cap( 'set_charset' ) ) {
 					mysqli_set_charset( $dbh, $charset );
 				} else {
 					$query = $this->prepare( 'SET NAMES %s', $charset );
-					if ( ! empty( $collate ) )
-						$query .= $this->prepare( ' COLLATE %s', $collate );
+					if ( ! empty( $collate ) ) {
+											$query .= $this->prepare( ' COLLATE %s', $collate );
+					}
 					mysqli_query( $dbh, $query );
 				}
 			} else {
@@ -791,8 +796,9 @@ 
 					mysql_set_charset( $charset, $dbh );
 				} else {
 					$query = $this->prepare( 'SET NAMES %s', $charset );
-					if ( ! empty( $collate ) )
-						$query .= $this->prepare( ' COLLATE %s', $collate );
+					if ( ! empty( $collate ) ) {
+											$query .= $this->prepare( ' COLLATE %s', $collate );
+					}
 					mysql_query( $query, $dbh );
 				}
 			}
@@ -875,30 +881,36 @@ 
 	 */
 	public function set_prefix( $prefix, $set_table_names = true ) {
 
-		if ( preg_match( '|[^a-z0-9_]|i', $prefix ) )
-			return new WP_Error('invalid_db_prefix', 'Invalid database prefix' );
+		if ( preg_match( '|[^a-z0-9_]|i', $prefix ) ) {
+					return new WP_Error('invalid_db_prefix', 'Invalid database prefix' );
+		}
 
 		$old_prefix = is_multisite() ? '' : $prefix;
 
-		if ( isset( $this->base_prefix ) )
-			$old_prefix = $this->base_prefix;
+		if ( isset( $this->base_prefix ) ) {
+					$old_prefix = $this->base_prefix;
+		}
 
 		$this->base_prefix = $prefix;
 
 		if ( $set_table_names ) {
-			foreach ( $this->tables( 'global' ) as $table => $prefixed_table )
-				$this->$table = $prefixed_table;
+			foreach ( $this->tables( 'global' ) as $table => $prefixed_table ) {
+							$this->$table = $prefixed_table;
+			}
 
-			if ( is_multisite() && empty( $this->blogid ) )
-				return $old_prefix;
+			if ( is_multisite() && empty( $this->blogid ) ) {
+							return $old_prefix;
+			}
 
 			$this->prefix = $this->get_blog_prefix();
 
-			foreach ( $this->tables( 'blog' ) as $table => $prefixed_table )
-				$this->$table = $prefixed_table;
+			foreach ( $this->tables( 'blog' ) as $table => $prefixed_table ) {
+							$this->$table = $prefixed_table;
+			}
 
-			foreach ( $this->tables( 'old' ) as $table => $prefixed_table )
-				$this->$table = $prefixed_table;
+			foreach ( $this->tables( 'old' ) as $table => $prefixed_table ) {
+							$this->$table = $prefixed_table;
+			}
 		}
 		return $old_prefix;
 	}
@@ -914,19 +926,22 @@ 
 	 * @return int previous blog id
 	 */
 	public function set_blog_id( $blog_id, $site_id = 0 ) {
-		if ( ! empty( $site_id ) )
-			$this->siteid = $site_id;
+		if ( ! empty( $site_id ) ) {
+					$this->siteid = $site_id;
+		}
 
 		$old_blog_id  = $this->blogid;
 		$this->blogid = $blog_id;
 
 		$this->prefix = $this->get_blog_prefix();
 
-		foreach ( $this->tables( 'blog' ) as $table => $prefixed_table )
-			$this->$table = $prefixed_table;
+		foreach ( $this->tables( 'blog' ) as $table => $prefixed_table ) {
+					$this->$table = $prefixed_table;
+		}
 
-		foreach ( $this->tables( 'old' ) as $table => $prefixed_table )
-			$this->$table = $prefixed_table;
+		foreach ( $this->tables( 'old' ) as $table => $prefixed_table ) {
+					$this->$table = $prefixed_table;
+		}
 
 		return $old_blog_id;
 	}
@@ -940,13 +955,15 @@ 
 	 */
 	public function get_blog_prefix( $blog_id = null ) {
 		if ( is_multisite() ) {
-			if ( null === $blog_id )
-				$blog_id = $this->blogid;
+			if ( null === $blog_id ) {
+							$blog_id = $this->blogid;
+			}
 			$blog_id = (int) $blog_id;
-			if ( defined( 'MULTISITE' ) && ( 0 == $blog_id || 1 == $blog_id ) )
-				return $this->base_prefix;
-			else
-				return $this->base_prefix . $blog_id . '_';
+			if ( defined( 'MULTISITE' ) && ( 0 == $blog_id || 1 == $blog_id ) ) {
+							return $this->base_prefix;
+			} else {
+							return $this->base_prefix . $blog_id . '_';
+			}
 		} else {
 			return $this->base_prefix;
 		}
@@ -983,16 +1000,18 @@ 
 		switch ( $scope ) {
 			case 'all' :
 				$tables = array_merge( $this->global_tables, $this->tables );
-				if ( is_multisite() )
-					$tables = array_merge( $tables, $this->ms_global_tables );
+				if ( is_multisite() ) {
+									$tables = array_merge( $tables, $this->ms_global_tables );
+				}
 				break;
 			case 'blog' :
 				$tables = $this->tables;
 				break;
 			case 'global' :
 				$tables = $this->global_tables;
-				if ( is_multisite() )
-					$tables = array_merge( $tables, $this->ms_global_tables );
+				if ( is_multisite() ) {
+									$tables = array_merge( $tables, $this->ms_global_tables );
+				}
 				break;
 			case 'ms_global' :
 				$tables = $this->ms_global_tables;
@@ -1005,24 +1024,28 @@ 
 		}
 
 		if ( $prefix ) {
-			if ( ! $blog_id )
-				$blog_id = $this->blogid;
+			if ( ! $blog_id ) {
+							$blog_id = $this->blogid;
+			}
 			$blog_prefix = $this->get_blog_prefix( $blog_id );
 			$base_prefix = $this->base_prefix;
 			$global_tables = array_merge( $this->global_tables, $this->ms_global_tables );
 			foreach ( $tables as $k => $table ) {
-				if ( in_array( $table, $global_tables ) )
-					$tables[ $table ] = $base_prefix . $table;
-				else
-					$tables[ $table ] = $blog_prefix . $table;
+				if ( in_array( $table, $global_tables ) ) {
+									$tables[ $table ] = $base_prefix . $table;
+				} else {
+									$tables[ $table ] = $blog_prefix . $table;
+				}
 				unset( $tables[ $k ] );
 			}
 
-			if ( isset( $tables['users'] ) && defined( 'CUSTOM_USER_TABLE' ) )
-				$tables['users'] = CUSTOM_USER_TABLE;
+			if ( isset( $tables['users'] ) && defined( 'CUSTOM_USER_TABLE' ) ) {
+							$tables['users'] = CUSTOM_USER_TABLE;
+			}
 
-			if ( isset( $tables['usermeta'] ) && defined( 'CUSTOM_USER_META_TABLE' ) )
-				$tables['usermeta'] = CUSTOM_USER_META_TABLE;
+			if ( isset( $tables['usermeta'] ) && defined( 'CUSTOM_USER_META_TABLE' ) ) {
+							$tables['usermeta'] = CUSTOM_USER_META_TABLE;
+			}
 		}
 
 		return $tables;
@@ -1040,8 +1063,9 @@ 
 	 * @param resource|null $dbh Optional link identifier.
 	 */
 	public function select( $db, $dbh = null ) {
-		if ( is_null($dbh) )
-			$dbh = $this->dbh;
+		if ( is_null($dbh) ) {
+					$dbh = $this->dbh;
+		}
 
 		if ( $this->use_mysqli ) {
 			$success = mysqli_select_db( $dbh, $db );
@@ -1105,8 +1129,9 @@ 
 	 * @return string
 	 */
 	function _weak_escape( $string ) {
-		if ( func_num_args() === 1 && function_exists( '_deprecated_function' ) )
-			_deprecated_function( __METHOD__, '3.6', 'wpdb::prepare() or esc_sql()' );
+		if ( func_num_args() === 1 && function_exists( '_deprecated_function' ) ) {
+					_deprecated_function( __METHOD__, '3.6', 'wpdb::prepare() or esc_sql()' );
+		}
 		return addslashes( $string );
 	}
 
@@ -1153,10 +1178,11 @@ 
 	function _escape( $data ) {
 		if ( is_array( $data ) ) {
 			foreach ( $data as $k => $v ) {
-				if ( is_array($v) )
-					$data[$k] = $this->_escape( $v );
-				else
-					$data[$k] = $this->_real_escape( $v );
+				if ( is_array($v) ) {
+									$data[$k] = $this->_escape( $v );
+				} else {
+									$data[$k] = $this->_real_escape( $v );
+				}
 			}
 		} else {
 			$data = $this->_real_escape( $data );
@@ -1179,14 +1205,16 @@ 
 	 * @return mixed
 	 */
 	public function escape( $data ) {
-		if ( func_num_args() === 1 && function_exists( '_deprecated_function' ) )
-			_deprecated_function( __METHOD__, '3.6', 'wpdb::prepare() or esc_sql()' );
+		if ( func_num_args() === 1 && function_exists( '_deprecated_function' ) ) {
+					_deprecated_function( __METHOD__, '3.6', 'wpdb::prepare() or esc_sql()' );
+		}
 		if ( is_array( $data ) ) {
 			foreach ( $data as $k => $v ) {
-				if ( is_array( $v ) )
-					$data[$k] = $this->escape( $v, 'recursive' );
-				else
-					$data[$k] = $this->_weak_escape( $v, 'internal' );
+				if ( is_array( $v ) ) {
+									$data[$k] = $this->escape( $v, 'recursive' );
+				} else {
+									$data[$k] = $this->_weak_escape( $v, 'internal' );
+				}
 			}
 		} else {
 			$data = $this->_weak_escape( $data, 'internal' );
@@ -1205,8 +1233,9 @@ 
 	 * @param string $string to escape
 	 */
 	public function escape_by_ref( &$string ) {
-		if ( ! is_float( $string ) )
-			$string = $this->_real_escape( $string );
+		if ( ! is_float( $string ) ) {
+					$string = $this->_real_escape( $string );
+		}
 	}
 
 	/**
@@ -1244,8 +1273,9 @@ 
 	 * @return string|void Sanitized query string, if there is a query to prepare.
 	 */
 	public function prepare( $query, $args ) {
-		if ( is_null( $query ) )
-			return;
+		if ( is_null( $query ) ) {
+					return;
+		}
 
 		// This is not meant to be foolproof -- but it will catch obviously incorrect usage.
 		if ( strpos( $query, '%' ) === false ) {
@@ -1255,8 +1285,9 @@ 
 		$args = func_get_args();
 		array_shift( $args );
 		// If args were passed as an array (as in vsprintf), move them up
-		if ( isset( $args[0] ) && is_array($args[0]) )
-			$args = $args[0];
+		if ( isset( $args[0] ) && is_array($args[0]) ) {
+					$args = $args[0];
+		}
 		$query = str_replace( "'%s'", '%s', $query ); // in case someone mistakenly already singlequoted it
 		$query = str_replace( '"%s"', '%s', $query ); // doublequote unquoting
 		$query = preg_replace( '|(?<!%)%f|' , '%F', $query ); // Force floats to be locale unaware
@@ -1312,21 +1343,24 @@ 
 		}
 		$EZSQL_ERROR[] = array( 'query' => $this->last_query, 'error_str' => $str );
 
-		if ( $this->suppress_errors )
-			return false;
+		if ( $this->suppress_errors ) {
+					return false;
+		}
 
 		wp_load_translations_early();
 
-		if ( $caller = $this->get_caller() )
-			$error_str = sprintf( __( 'WordPress database error %1$s for query %2$s made by %3$s' ), $str, $this->last_query, $caller );
-		else
-			$error_str = sprintf( __( 'WordPress database error %1$s for query %2$s' ), $str, $this->last_query );
+		if ( $caller = $this->get_caller() ) {
+					$error_str = sprintf( __( 'WordPress database error %1$s for query %2$s made by %3$s' ), $str, $this->last_query, $caller );
+		} else {
+					$error_str = sprintf( __( 'WordPress database error %1$s for query %2$s' ), $str, $this->last_query );
+		}
 
 		error_log( $error_str );
 
 		// Are we showing errors?
-		if ( ! $this->show_errors )
-			return false;
+		if ( ! $this->show_errors ) {
+					return false;
+		}
 
 		// If there is an error then take note of it
 		if ( is_multisite() ) {
@@ -1734,8 +1768,9 @@ 
 
 		if ( $this->last_error ) {
 			// Clear insert_id on a subsequent failed insert.
-			if ( $this->insert_id && preg_match( '/^\s*(insert|replace)\s/i', $query ) )
-				$this->insert_id = 0;
+			if ( $this->insert_id && preg_match( '/^\s*(insert|replace)\s/i', $query ) ) {
+							$this->insert_id = 0;
+			}
 
 			$this->print_error();
 			return false;
@@ -2241,8 +2276,9 @@ 
 			return null;
 		}
 
-		if ( !isset( $this->last_result[$y] ) )
-			return null;
+		if ( !isset( $this->last_result[$y] ) ) {
+					return null;
+		}
 
 		if ( $output == OBJECT ) {
 			return $this->last_result[$y] ? $this->last_result[$y] : null;
@@ -2326,8 +2362,9 @@ 
 			foreach ( $this->last_result as $row ) {
 				$var_by_ref = get_object_vars( $row );
 				$key = array_shift( $var_by_ref );
-				if ( ! isset( $new_array[ $key ] ) )
-					$new_array[ $key ] = $row;
+				if ( ! isset( $new_array[ $key ] ) ) {
+									$new_array[ $key ] = $row;
+				}
 			}
 			return $new_array;
 		} elseif ( $output == ARRAY_A || $output == ARRAY_N ) {
@@ -3004,8 +3041,9 @@ 
 	 * @access protected
 	 */
 	protected function load_col_info() {
-		if ( $this->col_info )
-			return;
+		if ( $this->col_info ) {
+					return;
+		}
 
 		if ( $this->use_mysqli ) {
 			$num_fields = mysqli_num_fields( $this->result );
@@ -3136,8 +3174,9 @@ 
 	public function check_database_version() {
 		global $wp_version, $required_mysql_version;
 		// Make sure the server has the required MySQL version
-		if ( version_compare($this->db_version(), $required_mysql_version, '<') )
-			return new WP_Error('database_version', sprintf( __( '<strong>ERROR</strong>: WordPress %1$s requires MySQL %2$s or higher' ), $wp_version, $required_mysql_version ));
+		if ( version_compare($this->db_version(), $required_mysql_version, '<') ) {
+					return new WP_Error('database_version', sprintf( __( '<strong>ERROR</strong>: WordPress %1$s requires MySQL %2$s or higher' ), $wp_version, $required_mysql_version ));
+		}
 	}
 
 	/**
@@ -3167,10 +3206,12 @@ 
 	public function get_charset_collate() {
 		$charset_collate = '';
 
-		if ( ! empty( $this->charset ) )
-			$charset_collate = "DEFAULT CHARACTER SET $this->charset";
-		if ( ! empty( $this->collate ) )
-			$charset_collate .= " COLLATE $this->collate";
+		if ( ! empty( $this->charset ) ) {
+					$charset_collate = "DEFAULT CHARACTER SET $this->charset";
+		}
+		if ( ! empty( $this->collate ) ) {
+					$charset_collate .= " COLLATE $this->collate";
+		}
 
 		return $charset_collate;
 	}

src/wp-content/themes/twentythirteen/footer.php

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * The template for displaying the footer
- *
- * Contains footer content and the closing of the #main and #page div elements.
- *
- * @package WordPress
- * @subpackage Twenty_Thirteen
- * @since Twenty Thirteen 1.0
- */
+		 * The template for displaying the footer
+		 *
+		 * Contains footer content and the closing of the #main and #page div elements.
+		 *
+		 * @package WordPress
+		 * @subpackage Twenty_Thirteen
+		 * @since Twenty Thirteen 1.0
+		 */
 ?>
 
 		</div><!-- #main -->

Spacing +3 added lines, -3 removed lines

@@ -12,11 +12,11 @@
 
 		</div><!-- #main -->
 		<footer id="colophon" class="site-footer" role="contentinfo">
-			<?php get_sidebar( 'main' ); ?>
+			<?php get_sidebar('main'); ?>
 
 			<div class="site-info">
-				<?php do_action( 'twentythirteen_credits' ); ?>
-				<a href="<?php echo esc_url( __( 'https://wordpress.org/', 'twentythirteen' ) ); ?>"><?php printf( __( 'Proudly powered by %s', 'twentythirteen' ), 'WordPress' ); ?></a>
+				<?php do_action('twentythirteen_credits'); ?>
+				<a href="<?php echo esc_url(__('https://wordpress.org/', 'twentythirteen')); ?>"><?php printf(__('Proudly powered by %s', 'twentythirteen'), 'WordPress'); ?></a>
 			</div><!-- .site-info -->
 		</footer><!-- #colophon -->
 	</div><!-- #page -->

src/wp-content/themes/twentyfifteen/functions.php

Spacing +84 added lines, -84 removed lines

@@ -30,18 +30,18 @@ 
  *
  * @since Twenty Fifteen 1.0
  */
-if ( ! isset( $content_width ) ) {
+if ( ! isset($content_width)) {
 	$content_width = 660;
 }
 
 /**
  * Twenty Fifteen only works in WordPress 4.1 or later.
  */
-if ( version_compare( $GLOBALS['wp_version'], '4.1-alpha', '<' ) ) {
-	require get_template_directory() . '/inc/back-compat.php';
+if (version_compare($GLOBALS['wp_version'], '4.1-alpha', '<')) {
+	require get_template_directory().'/inc/back-compat.php';
 }
 
-if ( ! function_exists( 'twentyfifteen_setup' ) ) :
+if ( ! function_exists('twentyfifteen_setup')) :
 /**
  * Sets up theme defaults and registers support for various WordPress features.
  *
@@ -59,10 +59,10 @@ 
 	 * If you're building a theme based on twentyfifteen, use a find and replace
 	 * to change 'twentyfifteen' to the name of your theme in all the template files
 	 */
-	load_theme_textdomain( 'twentyfifteen', get_template_directory() . '/languages' );
+	load_theme_textdomain('twentyfifteen', get_template_directory().'/languages');
 
 	// Add default posts and comments RSS feed links to head.
-	add_theme_support( 'automatic-feed-links' );
+	add_theme_support('automatic-feed-links');
 
 	/*
 	 * Let WordPress manage the document title.
@@ -70,64 +70,64 @@ 
 	 * hard-coded <title> tag in the document head, and expect WordPress to
 	 * provide it for us.
 	 */
-	add_theme_support( 'title-tag' );
+	add_theme_support('title-tag');
 
 	/*
 	 * Enable support for Post Thumbnails on posts and pages.
 	 *
 	 * See: https://codex.wordpress.org/Function_Reference/add_theme_support#Post_Thumbnails
 	 */
-	add_theme_support( 'post-thumbnails' );
-	set_post_thumbnail_size( 825, 510, true );
+	add_theme_support('post-thumbnails');
+	set_post_thumbnail_size(825, 510, true);
 
 	// This theme uses wp_nav_menu() in two locations.
-	register_nav_menus( array(
-		'primary' => __( 'Primary Menu',      'twentyfifteen' ),
-		'social'  => __( 'Social Links Menu', 'twentyfifteen' ),
-	) );
+	register_nav_menus(array(
+		'primary' => __('Primary Menu', 'twentyfifteen'),
+		'social'  => __('Social Links Menu', 'twentyfifteen'),
+	));
 
 	/*
 	 * Switch default core markup for search form, comment form, and comments
 	 * to output valid HTML5.
 	 */
-	add_theme_support( 'html5', array(
+	add_theme_support('html5', array(
 		'search-form', 'comment-form', 'comment-list', 'gallery', 'caption'
-	) );
+	));
 
 	/*
 	 * Enable support for Post Formats.
 	 *
 	 * See: https://codex.wordpress.org/Post_Formats
 	 */
-	add_theme_support( 'post-formats', array(
+	add_theme_support('post-formats', array(
 		'aside', 'image', 'video', 'quote', 'link', 'gallery', 'status', 'audio', 'chat'
-	) );
+	));
 
 	/*
 	 * Enable support for custom logo.
 	 *
 	 * @since Twenty Fifteen 1.5
 	 */
-	add_image_size( 'twentyfifteen-logo', 248, 248 );
-	add_theme_support( 'custom-logo', array( 'size' => 'twentyfifteen-logo' ) );
+	add_image_size('twentyfifteen-logo', 248, 248);
+	add_theme_support('custom-logo', array('size' => 'twentyfifteen-logo'));
 
 	$color_scheme  = twentyfifteen_get_color_scheme();
-	$default_color = trim( $color_scheme[0], '#' );
+	$default_color = trim($color_scheme[0], '#');
 
 	// Setup the WordPress core custom background feature.
-	add_theme_support( 'custom-background', apply_filters( 'twentyfifteen_custom_background_args', array(
+	add_theme_support('custom-background', apply_filters('twentyfifteen_custom_background_args', array(
 		'default-color'      => $default_color,
 		'default-attachment' => 'fixed',
-	) ) );
+	)));
 
 	/*
 	 * This theme styles the visual editor to resemble the theme style,
 	 * specifically font, colors, icons, and column width.
 	 */
-	add_editor_style( array( 'css/editor-style.css', 'genericons/genericons.css', twentyfifteen_fonts_url() ) );
+	add_editor_style(array('css/editor-style.css', 'genericons/genericons.css', twentyfifteen_fonts_url()));
 }
 endif; // twentyfifteen_setup
-add_action( 'after_setup_theme', 'twentyfifteen_setup' );
+add_action('after_setup_theme', 'twentyfifteen_setup');
 
 /**
  * Register widget area.
@@ -137,19 +137,19 @@ 
  * @link https://codex.wordpress.org/Function_Reference/register_sidebar
  */
 function twentyfifteen_widgets_init() {
-	register_sidebar( array(
-		'name'          => __( 'Widget Area', 'twentyfifteen' ),
+	register_sidebar(array(
+		'name'          => __('Widget Area', 'twentyfifteen'),
 		'id'            => 'sidebar-1',
-		'description'   => __( 'Add widgets here to appear in your sidebar.', 'twentyfifteen' ),
+		'description'   => __('Add widgets here to appear in your sidebar.', 'twentyfifteen'),
 		'before_widget' => '<aside id="%1$s" class="widget %2$s">',
 		'after_widget'  => '</aside>',
 		'before_title'  => '<h2 class="widget-title">',
 		'after_title'   => '</h2>',
-	) );
+	));
 }
-add_action( 'widgets_init', 'twentyfifteen_widgets_init' );
+add_action('widgets_init', 'twentyfifteen_widgets_init');
 
-if ( ! function_exists( 'twentyfifteen_fonts_url' ) ) :
+if ( ! function_exists('twentyfifteen_fonts_url')) :
 /**
  * Register Google fonts for Twenty Fifteen.
  *
@@ -166,7 +166,7 @@ 
 	 * Translators: If there are characters in your language that are not supported
 	 * by Noto Sans, translate this to 'off'. Do not translate into your own language.
 	 */
-	if ( 'off' !== _x( 'on', 'Noto Sans font: on or off', 'twentyfifteen' ) ) {
+	if ('off' !== _x('on', 'Noto Sans font: on or off', 'twentyfifteen')) {
 		$fonts[] = 'Noto Sans:400italic,700italic,400,700';
 	}
 
@@ -174,7 +174,7 @@ 
 	 * Translators: If there are characters in your language that are not supported
 	 * by Noto Serif, translate this to 'off'. Do not translate into your own language.
 	 */
-	if ( 'off' !== _x( 'on', 'Noto Serif font: on or off', 'twentyfifteen' ) ) {
+	if ('off' !== _x('on', 'Noto Serif font: on or off', 'twentyfifteen')) {
 		$fonts[] = 'Noto Serif:400italic,700italic,400,700';
 	}
 
@@ -182,7 +182,7 @@ 
 	 * Translators: If there are characters in your language that are not supported
 	 * by Inconsolata, translate this to 'off'. Do not translate into your own language.
 	 */
-	if ( 'off' !== _x( 'on', 'Inconsolata font: on or off', 'twentyfifteen' ) ) {
+	if ('off' !== _x('on', 'Inconsolata font: on or off', 'twentyfifteen')) {
 		$fonts[] = 'Inconsolata:400,700';
 	}
 
@@ -190,23 +190,23 @@ 
 	 * Translators: To add an additional character subset specific to your language,
 	 * translate this to 'greek', 'cyrillic', 'devanagari' or 'vietnamese'. Do not translate into your own language.
 	 */
-	$subset = _x( 'no-subset', 'Add new subset (greek, cyrillic, devanagari, vietnamese)', 'twentyfifteen' );
+	$subset = _x('no-subset', 'Add new subset (greek, cyrillic, devanagari, vietnamese)', 'twentyfifteen');
 
-	if ( 'cyrillic' == $subset ) {
+	if ('cyrillic' == $subset) {
 		$subsets .= ',cyrillic,cyrillic-ext';
-	} elseif ( 'greek' == $subset ) {
+	} elseif ('greek' == $subset) {
 		$subsets .= ',greek,greek-ext';
-	} elseif ( 'devanagari' == $subset ) {
+	} elseif ('devanagari' == $subset) {
 		$subsets .= ',devanagari';
-	} elseif ( 'vietnamese' == $subset ) {
+	} elseif ('vietnamese' == $subset) {
 		$subsets .= ',vietnamese';
 	}
 
-	if ( $fonts ) {
-		$fonts_url = add_query_arg( array(
-			'family' => urlencode( implode( '|', $fonts ) ),
-			'subset' => urlencode( $subsets ),
-		), 'https://fonts.googleapis.com/css' );
+	if ($fonts) {
+		$fonts_url = add_query_arg(array(
+			'family' => urlencode(implode('|', $fonts)),
+			'subset' => urlencode($subsets),
+		), 'https://fonts.googleapis.com/css');
 	}
 
 	return $fonts_url;
@@ -223,7 +223,7 @@ 
 function twentyfifteen_javascript_detection() {
 	echo "<script>(function(html){html.className = html.className.replace(/\bno-js\b/,'js')})(document.documentElement);</script>\n";
 }
-add_action( 'wp_head', 'twentyfifteen_javascript_detection', 0 );
+add_action('wp_head', 'twentyfifteen_javascript_detection', 0);
 
 /**
  * Enqueue scripts and styles.
@@ -232,39 +232,39 @@ 
  */
 function twentyfifteen_scripts() {
 	// Add custom fonts, used in the main stylesheet.
-	wp_enqueue_style( 'twentyfifteen-fonts', twentyfifteen_fonts_url(), array(), null );
+	wp_enqueue_style('twentyfifteen-fonts', twentyfifteen_fonts_url(), array(), null);
 
 	// Add Genericons, used in the main stylesheet.
-	wp_enqueue_style( 'genericons', get_template_directory_uri() . '/genericons/genericons.css', array(), '3.2' );
+	wp_enqueue_style('genericons', get_template_directory_uri().'/genericons/genericons.css', array(), '3.2');
 
 	// Load our main stylesheet.
-	wp_enqueue_style( 'twentyfifteen-style', get_stylesheet_uri() );
+	wp_enqueue_style('twentyfifteen-style', get_stylesheet_uri());
 
 	// Load the Internet Explorer specific stylesheet.
-	wp_enqueue_style( 'twentyfifteen-ie', get_template_directory_uri() . '/css/ie.css', array( 'twentyfifteen-style' ), '20141010' );
-	wp_style_add_data( 'twentyfifteen-ie', 'conditional', 'lt IE 9' );
+	wp_enqueue_style('twentyfifteen-ie', get_template_directory_uri().'/css/ie.css', array('twentyfifteen-style'), '20141010');
+	wp_style_add_data('twentyfifteen-ie', 'conditional', 'lt IE 9');
 
 	// Load the Internet Explorer 7 specific stylesheet.
-	wp_enqueue_style( 'twentyfifteen-ie7', get_template_directory_uri() . '/css/ie7.css', array( 'twentyfifteen-style' ), '20141010' );
-	wp_style_add_data( 'twentyfifteen-ie7', 'conditional', 'lt IE 8' );
+	wp_enqueue_style('twentyfifteen-ie7', get_template_directory_uri().'/css/ie7.css', array('twentyfifteen-style'), '20141010');
+	wp_style_add_data('twentyfifteen-ie7', 'conditional', 'lt IE 8');
 
-	wp_enqueue_script( 'twentyfifteen-skip-link-focus-fix', get_template_directory_uri() . '/js/skip-link-focus-fix.js', array(), '20141010', true );
+	wp_enqueue_script('twentyfifteen-skip-link-focus-fix', get_template_directory_uri().'/js/skip-link-focus-fix.js', array(), '20141010', true);
 
-	if ( is_singular() && comments_open() && get_option( 'thread_comments' ) ) {
-		wp_enqueue_script( 'comment-reply' );
+	if (is_singular() && comments_open() && get_option('thread_comments')) {
+		wp_enqueue_script('comment-reply');
 	}
 
-	if ( is_singular() && wp_attachment_is_image() ) {
-		wp_enqueue_script( 'twentyfifteen-keyboard-image-navigation', get_template_directory_uri() . '/js/keyboard-image-navigation.js', array( 'jquery' ), '20141010' );
+	if (is_singular() && wp_attachment_is_image()) {
+		wp_enqueue_script('twentyfifteen-keyboard-image-navigation', get_template_directory_uri().'/js/keyboard-image-navigation.js', array('jquery'), '20141010');
 	}
 
-	wp_enqueue_script( 'twentyfifteen-script', get_template_directory_uri() . '/js/functions.js', array( 'jquery' ), '20150330', true );
-	wp_localize_script( 'twentyfifteen-script', 'screenReaderText', array(
-		'expand'   => '<span class="screen-reader-text">' . __( 'expand child menu', 'twentyfifteen' ) . '</span>',
-		'collapse' => '<span class="screen-reader-text">' . __( 'collapse child menu', 'twentyfifteen' ) . '</span>',
-	) );
+	wp_enqueue_script('twentyfifteen-script', get_template_directory_uri().'/js/functions.js', array('jquery'), '20150330', true);
+	wp_localize_script('twentyfifteen-script', 'screenReaderText', array(
+		'expand'   => '<span class="screen-reader-text">'.__('expand child menu', 'twentyfifteen').'</span>',
+		'collapse' => '<span class="screen-reader-text">'.__('collapse child menu', 'twentyfifteen').'</span>',
+	));
 }
-add_action( 'wp_enqueue_scripts', 'twentyfifteen_scripts' );
+add_action('wp_enqueue_scripts', 'twentyfifteen_scripts');
 
 /**
  * Add featured image as background image to post navigation elements.
@@ -274,39 +274,39 @@ 
  * @see wp_add_inline_style()
  */
 function twentyfifteen_post_nav_background() {
-	if ( ! is_single() ) {
+	if ( ! is_single()) {
 		return;
 	}
 
-	$previous = ( is_attachment() ) ? get_post( get_post()->post_parent ) : get_adjacent_post( false, '', true );
-	$next     = get_adjacent_post( false, '', false );
+	$previous = (is_attachment()) ? get_post(get_post()->post_parent) : get_adjacent_post(false, '', true);
+	$next     = get_adjacent_post(false, '', false);
 	$css      = '';
 
-	if ( is_attachment() && 'attachment' == $previous->post_type ) {
+	if (is_attachment() && 'attachment' == $previous->post_type) {
 		return;
 	}
 
-	if ( $previous &&  has_post_thumbnail( $previous->ID ) ) {
-		$prevthumb = wp_get_attachment_image_src( get_post_thumbnail_id( $previous->ID ), 'post-thumbnail' );
+	if ($previous && has_post_thumbnail($previous->ID)) {
+		$prevthumb = wp_get_attachment_image_src(get_post_thumbnail_id($previous->ID), 'post-thumbnail');
 		$css .= '
-			.post-navigation .nav-previous { background-image: url(' . esc_url( $prevthumb[0] ) . '); }
+			.post-navigation .nav-previous { background-image: url(' . esc_url($prevthumb[0]).'); }
 			.post-navigation .nav-previous .post-title, .post-navigation .nav-previous a:hover .post-title, .post-navigation .nav-previous .meta-nav { color: #fff; }
 			.post-navigation .nav-previous a:before { background-color: rgba(0, 0, 0, 0.4); }
 		';
 	}
 
-	if ( $next && has_post_thumbnail( $next->ID ) ) {
-		$nextthumb = wp_get_attachment_image_src( get_post_thumbnail_id( $next->ID ), 'post-thumbnail' );
+	if ($next && has_post_thumbnail($next->ID)) {
+		$nextthumb = wp_get_attachment_image_src(get_post_thumbnail_id($next->ID), 'post-thumbnail');
 		$css .= '
-			.post-navigation .nav-next { background-image: url(' . esc_url( $nextthumb[0] ) . '); border-top: 0; }
+			.post-navigation .nav-next { background-image: url(' . esc_url($nextthumb[0]).'); border-top: 0; }
 			.post-navigation .nav-next .post-title, .post-navigation .nav-next a:hover .post-title, .post-navigation .nav-next .meta-nav { color: #fff; }
 			.post-navigation .nav-next a:before { background-color: rgba(0, 0, 0, 0.4); }
 		';
 	}
 
-	wp_add_inline_style( 'twentyfifteen-style', $css );
+	wp_add_inline_style('twentyfifteen-style', $css);
 }
-add_action( 'wp_enqueue_scripts', 'twentyfifteen_post_nav_background' );
+add_action('wp_enqueue_scripts', 'twentyfifteen_post_nav_background');
 
 /**
  * Display descriptions in main navigation.
@@ -319,14 +319,14 @@ 
  * @param array   $args        wp_nav_menu() arguments.
  * @return string Menu item with possible description.
  */
-function twentyfifteen_nav_description( $item_output, $item, $depth, $args ) {
-	if ( 'primary' == $args->theme_location && $item->description ) {
-		$item_output = str_replace( $args->link_after . '</a>', '<div class="menu-item-description">' . $item->description . '</div>' . $args->link_after . '</a>', $item_output );
+function twentyfifteen_nav_description($item_output, $item, $depth, $args) {
+	if ('primary' == $args->theme_location && $item->description) {
+		$item_output = str_replace($args->link_after.'</a>', '<div class="menu-item-description">'.$item->description.'</div>'.$args->link_after.'</a>', $item_output);
 	}
 
 	return $item_output;
 }
-add_filter( 'walker_nav_menu_start_el', 'twentyfifteen_nav_description', 10, 4 );
+add_filter('walker_nav_menu_start_el', 'twentyfifteen_nav_description', 10, 4);
 
 /**
  * Add a `screen-reader-text` class to the search form's submit button.
@@ -336,28 +336,28 @@ 
  * @param string $html Search form HTML.
  * @return string Modified search form HTML.
  */
-function twentyfifteen_search_form_modify( $html ) {
-	return str_replace( 'class="search-submit"', 'class="search-submit screen-reader-text"', $html );
+function twentyfifteen_search_form_modify($html) {
+	return str_replace('class="search-submit"', 'class="search-submit screen-reader-text"', $html);
 }
-add_filter( 'get_search_form', 'twentyfifteen_search_form_modify' );
+add_filter('get_search_form', 'twentyfifteen_search_form_modify');
 
 /**
  * Implement the Custom Header feature.
  *
  * @since Twenty Fifteen 1.0
  */
-require get_template_directory() . '/inc/custom-header.php';
+require get_template_directory().'/inc/custom-header.php';
 
 /**
  * Custom template tags for this theme.
  *
  * @since Twenty Fifteen 1.0
  */
-require get_template_directory() . '/inc/template-tags.php';
+require get_template_directory().'/inc/template-tags.php';
 
 /**
  * Customizer additions.
  *
  * @since Twenty Fifteen 1.0
  */
-require get_template_directory() . '/inc/customizer.php';
+require get_template_directory().'/inc/customizer.php';

src/wp-content/themes/twentyfifteen/inc/template-tags.php

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * Custom template tags for Twenty Fifteen
- *
- * Eventually, some of the functionality here could be replaced by core features.
- *
- * @package WordPress
- * @subpackage Twenty_Fifteen
- * @since Twenty Fifteen 1.0
- */
+			 * Custom template tags for Twenty Fifteen
+			 *
+			 * Eventually, some of the functionality here could be replaced by core features.
+			 *
+			 * @package WordPress
+			 * @subpackage Twenty_Fifteen
+			 * @since Twenty Fifteen 1.0
+			 */
 
 if ( ! function_exists( 'twentyfifteen_comment_nav' ) ) :
 /**

Spacing +67 added lines, -67 removed lines

@@ -9,7 +9,7 @@ 
  * @since Twenty Fifteen 1.0
  */
 
-if ( ! function_exists( 'twentyfifteen_comment_nav' ) ) :
+if ( ! function_exists('twentyfifteen_comment_nav')) :
 /**
  * Display navigation to next/previous comments when applicable.
  *
@@ -17,18 +17,18 @@ 
  */
 function twentyfifteen_comment_nav() {
 	// Are there comments to navigate through?
-	if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) :
+	if (get_comment_pages_count() > 1 && get_option('page_comments')) :
 	?>
 	<nav class="navigation comment-navigation" role="navigation">
-		<h2 class="screen-reader-text"><?php _e( 'Comment navigation', 'twentyfifteen' ); ?></h2>
+		<h2 class="screen-reader-text"><?php _e('Comment navigation', 'twentyfifteen'); ?></h2>
 		<div class="nav-links">
 			<?php
-				if ( $prev_link = get_previous_comments_link( __( 'Older Comments', 'twentyfifteen' ) ) ) :
-					printf( '<div class="nav-previous">%s</div>', $prev_link );
+				if ($prev_link = get_previous_comments_link(__('Older Comments', 'twentyfifteen'))) :
+					printf('<div class="nav-previous">%s</div>', $prev_link);
 				endif;
 
-				if ( $next_link = get_next_comments_link( __( 'Newer Comments', 'twentyfifteen' ) ) ) :
-					printf( '<div class="nav-next">%s</div>', $next_link );
+				if ($next_link = get_next_comments_link(__('Newer Comments', 'twentyfifteen'))) :
+					printf('<div class="nav-next">%s</div>', $next_link);
 				endif;
 			?>
 		</div><!-- .nav-links -->
@@ -38,89 +38,89 @@ 
 }
 endif;
 
-if ( ! function_exists( 'twentyfifteen_entry_meta' ) ) :
+if ( ! function_exists('twentyfifteen_entry_meta')) :
 /**
  * Prints HTML with meta information for the categories, tags.
  *
  * @since Twenty Fifteen 1.0
  */
 function twentyfifteen_entry_meta() {
-	if ( is_sticky() && is_home() && ! is_paged() ) {
-		printf( '<span class="sticky-post">%s</span>', __( 'Featured', 'twentyfifteen' ) );
+	if (is_sticky() && is_home() && ! is_paged()) {
+		printf('<span class="sticky-post">%s</span>', __('Featured', 'twentyfifteen'));
 	}
 
 	$format = get_post_format();
-	if ( current_theme_supports( 'post-formats', $format ) ) {
-		printf( '<span class="entry-format">%1$s<a href="%2$s">%3$s</a></span>',
-			sprintf( '<span class="screen-reader-text">%s </span>', _x( 'Format', 'Used before post format.', 'twentyfifteen' ) ),
-			esc_url( get_post_format_link( $format ) ),
-			get_post_format_string( $format )
+	if (current_theme_supports('post-formats', $format)) {
+		printf('<span class="entry-format">%1$s<a href="%2$s">%3$s</a></span>',
+			sprintf('<span class="screen-reader-text">%s </span>', _x('Format', 'Used before post format.', 'twentyfifteen')),
+			esc_url(get_post_format_link($format)),
+			get_post_format_string($format)
 		);
 	}
 
-	if ( in_array( get_post_type(), array( 'post', 'attachment' ) ) ) {
+	if (in_array(get_post_type(), array('post', 'attachment'))) {
 		$time_string = '<time class="entry-date published updated" datetime="%1$s">%2$s</time>';
 
-		if ( get_the_time( 'U' ) !== get_the_modified_time( 'U' ) ) {
+		if (get_the_time('U') !== get_the_modified_time('U')) {
 			$time_string = '<time class="entry-date published" datetime="%1$s">%2$s</time><time class="updated" datetime="%3$s">%4$s</time>';
 		}
 
-		$time_string = sprintf( $time_string,
-			esc_attr( get_the_date( 'c' ) ),
+		$time_string = sprintf($time_string,
+			esc_attr(get_the_date('c')),
 			get_the_date(),
-			esc_attr( get_the_modified_date( 'c' ) ),
+			esc_attr(get_the_modified_date('c')),
 			get_the_modified_date()
 		);
 
-		printf( '<span class="posted-on"><span class="screen-reader-text">%1$s </span><a href="%2$s" rel="bookmark">%3$s</a></span>',
-			_x( 'Posted on', 'Used before publish date.', 'twentyfifteen' ),
-			esc_url( get_permalink() ),
+		printf('<span class="posted-on"><span class="screen-reader-text">%1$s </span><a href="%2$s" rel="bookmark">%3$s</a></span>',
+			_x('Posted on', 'Used before publish date.', 'twentyfifteen'),
+			esc_url(get_permalink()),
 			$time_string
 		);
 	}
 
-	if ( 'post' == get_post_type() ) {
-		if ( is_singular() || is_multi_author() ) {
-			printf( '<span class="byline"><span class="author vcard"><span class="screen-reader-text">%1$s </span><a class="url fn n" href="%2$s">%3$s</a></span></span>',
-				_x( 'Author', 'Used before post author name.', 'twentyfifteen' ),
-				esc_url( get_author_posts_url( get_the_author_meta( 'ID' ) ) ),
+	if ('post' == get_post_type()) {
+		if (is_singular() || is_multi_author()) {
+			printf('<span class="byline"><span class="author vcard"><span class="screen-reader-text">%1$s </span><a class="url fn n" href="%2$s">%3$s</a></span></span>',
+				_x('Author', 'Used before post author name.', 'twentyfifteen'),
+				esc_url(get_author_posts_url(get_the_author_meta('ID'))),
 				get_the_author()
 			);
 		}
 
-		$categories_list = get_the_category_list( _x( ', ', 'Used between list items, there is a space after the comma.', 'twentyfifteen' ) );
-		if ( $categories_list && twentyfifteen_categorized_blog() ) {
-			printf( '<span class="cat-links"><span class="screen-reader-text">%1$s </span>%2$s</span>',
-				_x( 'Categories', 'Used before category names.', 'twentyfifteen' ),
+		$categories_list = get_the_category_list(_x(', ', 'Used between list items, there is a space after the comma.', 'twentyfifteen'));
+		if ($categories_list && twentyfifteen_categorized_blog()) {
+			printf('<span class="cat-links"><span class="screen-reader-text">%1$s </span>%2$s</span>',
+				_x('Categories', 'Used before category names.', 'twentyfifteen'),
 				$categories_list
 			);
 		}
 
-		$tags_list = get_the_tag_list( '', _x( ', ', 'Used between list items, there is a space after the comma.', 'twentyfifteen' ) );
-		if ( $tags_list ) {
-			printf( '<span class="tags-links"><span class="screen-reader-text">%1$s </span>%2$s</span>',
-				_x( 'Tags', 'Used before tag names.', 'twentyfifteen' ),
+		$tags_list = get_the_tag_list('', _x(', ', 'Used between list items, there is a space after the comma.', 'twentyfifteen'));
+		if ($tags_list) {
+			printf('<span class="tags-links"><span class="screen-reader-text">%1$s </span>%2$s</span>',
+				_x('Tags', 'Used before tag names.', 'twentyfifteen'),
 				$tags_list
 			);
 		}
 	}
 
-	if ( is_attachment() && wp_attachment_is_image() ) {
+	if (is_attachment() && wp_attachment_is_image()) {
 		// Retrieve attachment metadata.
 		$metadata = wp_get_attachment_metadata();
 
-		printf( '<span class="full-size-link"><span class="screen-reader-text">%1$s </span><a href="%2$s">%3$s &times; %4$s</a></span>',
-			_x( 'Full size', 'Used before full size attachment link.', 'twentyfifteen' ),
-			esc_url( wp_get_attachment_url() ),
+		printf('<span class="full-size-link"><span class="screen-reader-text">%1$s </span><a href="%2$s">%3$s &times; %4$s</a></span>',
+			_x('Full size', 'Used before full size attachment link.', 'twentyfifteen'),
+			esc_url(wp_get_attachment_url()),
 			$metadata['width'],
 			$metadata['height']
 		);
 	}
 
-	if ( ! is_single() && ! post_password_required() && ( comments_open() || get_comments_number() ) ) {
+	if ( ! is_single() && ! post_password_required() && (comments_open() || get_comments_number())) {
 		echo '<span class="comments-link">';
 		/* translators: %s: post title */
-		comments_popup_link( sprintf( __( 'Leave a comment<span class="screen-reader-text"> on %s</span>', 'twentyfifteen' ), get_the_title() ) );
+		comments_popup_link(sprintf(__('Leave a comment<span class="screen-reader-text"> on %s</span>', 'twentyfifteen'), get_the_title()));
 		echo '</span>';
 	}
 }
@@ -134,23 +134,23 @@ 
  * @return bool True of there is more than one category, false otherwise.
  */
 function twentyfifteen_categorized_blog() {
-	if ( false === ( $all_the_cool_cats = get_transient( 'twentyfifteen_categories' ) ) ) {
+	if (false === ($all_the_cool_cats = get_transient('twentyfifteen_categories'))) {
 		// Create an array of all the categories that are attached to posts.
-		$all_the_cool_cats = get_categories( array(
+		$all_the_cool_cats = get_categories(array(
 			'fields'     => 'ids',
 			'hide_empty' => 1,
 
 			// We only need to know if there is more than one category.
 			'number'     => 2,
-		) );
+		));
 
 		// Count the number of categories that are attached to the posts.
-		$all_the_cool_cats = count( $all_the_cool_cats );
+		$all_the_cool_cats = count($all_the_cool_cats);
 
-		set_transient( 'twentyfifteen_categories', $all_the_cool_cats );
+		set_transient('twentyfifteen_categories', $all_the_cool_cats);
 	}
 
-	if ( $all_the_cool_cats > 1 ) {
+	if ($all_the_cool_cats > 1) {
 		// This blog has more than 1 category so twentyfifteen_categorized_blog should return true.
 		return true;
 	} else {
@@ -166,12 +166,12 @@ 
  */
 function twentyfifteen_category_transient_flusher() {
 	// Like, beat it. Dig?
-	delete_transient( 'twentyfifteen_categories' );
+	delete_transient('twentyfifteen_categories');
 }
-add_action( 'edit_category', 'twentyfifteen_category_transient_flusher' );
-add_action( 'save_post',     'twentyfifteen_category_transient_flusher' );
+add_action('edit_category', 'twentyfifteen_category_transient_flusher');
+add_action('save_post', 'twentyfifteen_category_transient_flusher');
 
-if ( ! function_exists( 'twentyfifteen_post_thumbnail' ) ) :
+if ( ! function_exists('twentyfifteen_post_thumbnail')) :
 /**
  * Display an optional post thumbnail.
  *
@@ -181,11 +181,11 @@ 
  * @since Twenty Fifteen 1.0
  */
 function twentyfifteen_post_thumbnail() {
-	if ( post_password_required() || is_attachment() || ! has_post_thumbnail() ) {
+	if (post_password_required() || is_attachment() || ! has_post_thumbnail()) {
 		return;
 	}
 
-	if ( is_singular() ) :
+	if (is_singular()) :
 	?>
 
 	<div class="post-thumbnail">
@@ -196,7 +196,7 @@ 
 
 	<a class="post-thumbnail" href="<?php the_permalink(); ?>" aria-hidden="true">
 		<?php
-			the_post_thumbnail( 'post-thumbnail', array( 'alt' => get_the_title() ) );
+			the_post_thumbnail('post-thumbnail', array('alt' => get_the_title()));
 		?>
 	</a>
 
@@ -204,7 +204,7 @@ 
 }
 endif;
 
-if ( ! function_exists( 'twentyfifteen_get_link_url' ) ) :
+if ( ! function_exists('twentyfifteen_get_link_url')) :
 /**
  * Return the post URL.
  *
@@ -217,13 +217,13 @@ 
  * @return string The Link format URL.
  */
 function twentyfifteen_get_link_url() {
-	$has_url = get_url_in_content( get_the_content() );
+	$has_url = get_url_in_content(get_the_content());
 
-	return $has_url ? $has_url : apply_filters( 'the_permalink', get_permalink() );
+	return $has_url ? $has_url : apply_filters('the_permalink', get_permalink());
 }
 endif;
 
-if ( ! function_exists( 'twentyfifteen_excerpt_more' ) && ! is_admin() ) :
+if ( ! function_exists('twentyfifteen_excerpt_more') && ! is_admin()) :
 /**
  * Replaces "[...]" (appended to automatically generated excerpts) with ... and a 'Continue reading' link.
  *
@@ -231,18 +231,18 @@ 
  *
  * @return string 'Continue reading' link prepended with an ellipsis.
  */
-function twentyfifteen_excerpt_more( $more ) {
-	$link = sprintf( '<a href="%1$s" class="more-link">%2$s</a>',
-		esc_url( get_permalink( get_the_ID() ) ),
+function twentyfifteen_excerpt_more($more) {
+	$link = sprintf('<a href="%1$s" class="more-link">%2$s</a>',
+		esc_url(get_permalink(get_the_ID())),
 		/* translators: %s: Name of current post */
-		sprintf( __( 'Continue reading %s', 'twentyfifteen' ), '<span class="screen-reader-text">' . get_the_title( get_the_ID() ) . '</span>' )
+		sprintf(__('Continue reading %s', 'twentyfifteen'), '<span class="screen-reader-text">'.get_the_title(get_the_ID()).'</span>')
 		);
-	return ' &hellip; ' . $link;
+	return ' &hellip; '.$link;
 }
-add_filter( 'excerpt_more', 'twentyfifteen_excerpt_more' );
+add_filter('excerpt_more', 'twentyfifteen_excerpt_more');
 endif;
 
-if ( ! function_exists( 'twentyfifteen_the_custom_logo' ) ) :
+if ( ! function_exists('twentyfifteen_the_custom_logo')) :
 /**
  * Displays the optional custom logo.
  *
@@ -251,7 +251,7 @@ 
  * @since Twenty Fifteen 1.5
  */
 function twentyfifteen_the_custom_logo() {
-	if ( function_exists( 'the_custom_logo' ) ) {
+	if (function_exists('the_custom_logo')) {
 		the_custom_logo();
 	}
 }