ntwb / wordpress

src/wp-includes/post.php

Doc Comments +10 added lines, -10 removed lines

@@ -383,7 +383,7 @@ 
  * @since 1.0.0
  *
  * @param string $post Post content.
- * @return array Post before ('main'), after ('extended'), and custom readmore ('more_text').
+ * @return integer Post before ('main'), after ('extended'), and custom readmore ('more_text').
  */
 function get_extended( $post ) {
 	//Match the new style more links.
@@ -652,7 +652,7 @@ 
 	 * @global wpdb $wpdb
 	 *
 	 * @param int $post_id Post ID.
-	 * @return WP_Post|false Post object, false otherwise.
+	 * @return string Post object, false otherwise.
 	 */
 	public static function get_instance( $post_id ) {
 		global $wpdb;
@@ -1956,7 +1956,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.
  */
@@ -2863,7 +2863,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 ) {
@@ -2919,8 +2919,8 @@ 
  *
  * @global wpdb $wpdb
  *
- * @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;
@@ -5180,7 +5180,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 ) {
@@ -5230,7 +5230,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 ) {
@@ -5242,7 +5242,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 ) {
@@ -5976,7 +5976,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 ) {

Switch Indentation +9 added lines, -9 removed lines

@@ -5208,18 +5208,18 @@
 	}
 
 	switch ( $type ) {
-	case 'image':
-		$image_exts = array( 'jpg', 'jpeg', 'jpe', 'gif', 'png' );
-		return in_array( $ext, $image_exts );
+		case 'image':
+			$image_exts = array( 'jpg', 'jpeg', 'jpe', 'gif', 'png' );
+			return in_array( $ext, $image_exts );
 
-	case 'audio':
-		return in_array( $ext, wp_get_audio_extensions() );
+		case 'audio':
+			return in_array( $ext, wp_get_audio_extensions() );
 
-	case 'video':
-		return in_array( $ext, wp_get_video_extensions() );
+		case 'video':
+			return in_array( $ext, wp_get_video_extensions() );
 
-	default:
-		return $type === $ext;
+		default:
+			return $type === $ext;
 	}
 }
 

Spacing +1198 added lines, -1198 removed lines

@@ -17,9 +17,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,
@@ -47,16 +47,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,
@@ -72,15 +72,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. */
@@ -92,13 +92,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. */
@@ -106,63 +106,63 @@ 
 		'rewrite' => false,
 		'delete_with_user' => false,
 		'query_var' => false,
-	) );
+	));
 
-	register_post_status( 'publish', array(
-		'label'       => _x( 'Published', 'post' ),
+	register_post_status('publish', array(
+		'label'       => _x('Published', 'post'),
 		'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' ),
+	register_post_status('future', array(
+		'label'       => _x('Scheduled', 'post'),
 		'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' ),
+	register_post_status('draft', array(
+		'label'       => _x('Draft', 'post'),
 		'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' ),
+	register_post_status('pending', array(
+		'label'       => _x('Pending', 'post'),
 		'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' ),
+	register_post_status('private', array(
+		'label'       => _x('Private', 'post'),
 		'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' ),
+	register_post_status('trash', array(
+		'label'       => _x('Trash', 'post'),
 		'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,
-	) );
+	));
 }
 
 /**
@@ -183,12 +183,12 @@ 
  * @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_upload_dir()) && false === $uploads['error'] ) )
-		$file = $uploads['basedir'] . "/$file";
-	if ( $unfiltered )
+	if ($file && 0 !== strpos($file, '/') && ! preg_match('|^.:\\\|', $file) && (($uploads = wp_upload_dir()) && false === $uploads['error']))
+		$file = $uploads['basedir']."/$file";
+	if ($unfiltered)
 		return $file;
 
 	/**
@@ -199,7 +199,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);
 }
 
 /**
@@ -214,8 +214,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;
 
 	/**
@@ -226,12 +226,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');
 }
 
 /**
@@ -244,13 +244,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_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, '/');
 	}
 
 	/**
@@ -261,7 +261,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);
 }
 
 /**
@@ -316,17 +316,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);
 	}
 
@@ -335,32 +335,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;
@@ -385,9 +385,9 @@ 
  * @param string $post Post content.
  * @return array Post before ('main'), after ('extended'), and custom readmore ('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 {
@@ -401,7 +401,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);
 }
 
 /**
@@ -422,34 +422,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;
 }
@@ -654,28 +654,28 @@ 
 	 * @param int $post_id Post ID.
 	 * @return WP_Post|false Post object, false otherwise.
 	 */
-	public static function get_instance( $post_id ) {
+	public static function get_instance($post_id) {
 		global $wpdb;
 
 		$post_id = (int) $post_id;
-		if ( ! $post_id )
+		if ( ! $post_id)
 			return false;
 
-		$_post = wp_cache_get( $post_id, 'posts' );
+		$_post = wp_cache_get($post_id, 'posts');
 
-		if ( ! $_post ) {
-			$_post = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->posts WHERE ID = %d LIMIT 1", $post_id ) );
+		if ( ! $_post) {
+			$_post = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->posts WHERE ID = %d LIMIT 1", $post_id));
 
-			if ( ! $_post )
+			if ( ! $_post)
 				return false;
 
-			$_post = sanitize_post( $_post, 'raw' );
-			wp_cache_add( $_post->ID, $_post, 'posts' );
-		} elseif ( empty( $_post->filter ) ) {
-			$_post = sanitize_post( $_post, 'raw' );
+			$_post = sanitize_post($_post, 'raw');
+			wp_cache_add($_post->ID, $_post, 'posts');
+		} elseif (empty($_post->filter)) {
+			$_post = sanitize_post($_post, 'raw');
 		}
 
-		return new WP_Post( $_post );
+		return new WP_Post($_post);
 	}
 
 	/**
@@ -683,8 +683,8 @@ 
 	 *
 	 * @param WP_Post|object $post Post object.
 	 */
-	public function __construct( $post ) {
-		foreach ( get_object_vars( $post ) as $key => $value )
+	public function __construct($post) {
+		foreach (get_object_vars($post) as $key => $value)
 			$this->$key = $value;
 	}
 
@@ -694,20 +694,20 @@ 
 	 * @param string $key Property to check if set.
 	 * @return bool
 	 */
-	public function __isset( $key ) {
-		if ( 'ancestors' == $key )
+	public function __isset($key) {
+		if ('ancestors' == $key)
 			return true;
 
-		if ( 'page_template' == $key )
-			return ( 'page' == $this->post_type );
+		if ('page_template' == $key)
+			return ('page' == $this->post_type);
 
-		if ( 'post_category' == $key )
+		if ('post_category' == $key)
 		   return true;
 
-		if ( 'tags_input' == $key )
+		if ('tags_input' == $key)
 		   return true;
 
-		return metadata_exists( 'post', $this->ID, $key );
+		return metadata_exists('post', $this->ID, $key);
 	}
 
 	/**
@@ -716,39 +716,39 @@ 
 	 * @param string $key Key to get.
 	 * @return mixed
 	 */
-	public function __get( $key ) {
-		if ( 'page_template' == $key && $this->__isset( $key ) ) {
-			return get_post_meta( $this->ID, '_wp_page_template', true );
+	public function __get($key) {
+		if ('page_template' == $key && $this->__isset($key)) {
+			return get_post_meta($this->ID, '_wp_page_template', true);
 		}
 
-		if ( 'post_category' == $key ) {
-			if ( is_object_in_taxonomy( $this->post_type, 'category' ) )
-				$terms = get_the_terms( $this, 'category' );
+		if ('post_category' == $key) {
+			if (is_object_in_taxonomy($this->post_type, 'category'))
+				$terms = get_the_terms($this, 'category');
 
-			if ( empty( $terms ) )
+			if (empty($terms))
 				return array();
 
-			return wp_list_pluck( $terms, 'term_id' );
+			return wp_list_pluck($terms, 'term_id');
 		}
 
-		if ( 'tags_input' == $key ) {
-			if ( is_object_in_taxonomy( $this->post_type, 'post_tag' ) )
-				$terms = get_the_terms( $this, 'post_tag' );
+		if ('tags_input' == $key) {
+			if (is_object_in_taxonomy($this->post_type, 'post_tag'))
+				$terms = get_the_terms($this, 'post_tag');
 
-			if ( empty( $terms ) )
+			if (empty($terms))
 				return array();
 
-			return wp_list_pluck( $terms, 'name' );
+			return wp_list_pluck($terms, 'name');
 		}
 
 		// Rest of the values need filtering.
-		if ( 'ancestors' == $key )
-			$value = get_post_ancestors( $this );
+		if ('ancestors' == $key)
+			$value = get_post_ancestors($this);
 		else
-			$value = get_post_meta( $this->ID, $key, true );
+			$value = get_post_meta($this->ID, $key, true);
 
-		if ( $this->filter )
-			$value = sanitize_post_field( $key, $value, $this->ID, $this->filter );
+		if ($this->filter)
+			$value = sanitize_post_field($key, $value, $this->ID, $this->filter);
 
 		return $value;
 	}
@@ -759,14 +759,14 @@ 
 	 * @param string $filter Filter.
 	 * @return self|array|bool|object|WP_Post
 	 */
-	public function filter( $filter ) {
-		if ( $this->filter == $filter )
+	public function filter($filter) {
+		if ($this->filter == $filter)
 			return $this;
 
-		if ( $filter == 'raw' )
-			return self::get_instance( $this->ID );
+		if ($filter == 'raw')
+			return self::get_instance($this->ID);
 
-		return sanitize_post( $this, $filter );
+		return sanitize_post($this, $filter);
 	}
 
 	/**
@@ -775,11 +775,11 @@ 
 	 * @return array Object as array.
 	 */
 	public function to_array() {
-		$post = get_object_vars( $this );
+		$post = get_object_vars($this);
 
-		foreach ( array( 'ancestors', 'page_template', 'post_category', 'tags_input' ) as $key ) {
-			if ( $this->__isset( $key ) )
-				$post[ $key ] = $this->__get( $key );
+		foreach (array('ancestors', 'page_template', 'post_category', 'tags_input') as $key) {
+			if ($this->__isset($key))
+				$post[$key] = $this->__get($key);
 		}
 
 		return $post;
@@ -794,19 +794,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;
@@ -834,13 +834,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, $context = 'display' ) {
-	$post = get_post( $post );
+function get_post_field($field, $post, $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);
@@ -857,10 +857,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;
@@ -877,25 +877,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;
 			}
@@ -918,10 +918,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;
@@ -939,9 +939,9 @@ 
  */
 function get_page_statuses() {
 	$status = array(
-		'draft'   => __( 'Draft' ),
-		'private' => __( 'Private' ),
-		'publish' => __( 'Published' )
+		'draft'   => __('Draft'),
+		'private' => __('Private'),
+		'publish' => __('Published')
 	);
 
 	return $status;
@@ -990,10 +990,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.
@@ -1017,38 +1017,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;
 
@@ -1067,10 +1067,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];
@@ -1093,7 +1093,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;
@@ -1113,11 +1113,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;
 }
 
@@ -1131,8 +1131,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);
 }
 
 /**
@@ -1143,8 +1143,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;
@@ -1162,10 +1162,10 @@ 
  * @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 ( empty($wp_post_types[$post_type]) )
+	if (empty($wp_post_types[$post_type]))
 		return null;
 
 	return $wp_post_types[$post_type];
@@ -1189,7 +1189,7 @@ 
  *                               must match. Accepts 'or' or 'and'. 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;
@@ -1310,10 +1310,10 @@ 
  * }
  * @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();
 
 	// Args prefixed with an underscore are reserved for internal use.
@@ -1344,129 +1344,129 @@ 
 		'_builtin'             => false,
 		'_edit_link'           => 'post.php?post=%d',
 	);
-	$args = wp_parse_args( $args, $defaults );
+	$args = wp_parse_args($args, $defaults);
 	$args = (object) $args;
 
-	$post_type = sanitize_key( $post_type );
+	$post_type = sanitize_key($post_type);
 	$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;
 
-	$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 && ! empty( $wp ) ) {
-		if ( true === $args->query_var )
+	if (false !== $args->query_var && ! empty($wp)) {
+		if (true === $args->query_var)
 			$args->query_var = $post_type;
 		else
-			$args->query_var = sanitize_title_with_dashes( $args->query_var );
-		$wp->add_query_var( $args->query_var );
+			$args->query_var = sanitize_title_with_dashes($args->query_var);
+		$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);
 	}
 
 	/**
@@ -1477,7 +1477,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;
 }
@@ -1537,48 +1537,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;
 }
@@ -1593,13 +1593,13 @@ 
  *
  * @param array|void $capabilities Post type meta capabilities.
  */
-function _post_type_meta_capabilities( $capabilities = null ) {
+function _post_type_meta_capabilities($capabilities = null) {
 	static $meta_caps = array();
-	if ( null === $capabilities )
+	if (null === $capabilities)
 		return $meta_caps;
-	foreach ( $capabilities as $core => $custom ) {
-		if ( in_array( $core, array( 'read_post', 'delete_post', 'edit_post' ) ) )
-			$meta_caps[ $custom ] = $core;
+	foreach ($capabilities as $core => $custom) {
+		if (in_array($core, array('read_post', 'delete_post', 'edit_post')))
+			$meta_caps[$custom] = $core;
 	}
 }
 
@@ -1642,28 +1642,28 @@ 
  * @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' ) ),
-		'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' ) ),
+		'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')),
+		'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')),
 	);
 	$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;
 
@@ -1679,7 +1679,7 @@ 
 	 *
 	 * @param object $labels Object with labels for the post type as member variables.
 	 */
-	return apply_filters( "post_type_labels_{$post_type}", $labels );
+	return apply_filters("post_type_labels_{$post_type}", $labels);
 }
 
 /**
@@ -1692,29 +1692,29 @@ 
  * @param object $object                  A custom-something object.
  * @param array  $nohier_vs_hier_defaults Hierarchical vs non-hierarchical default labels.
  */
-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'];
 
 	$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);
 	return (object) $labels;
 }
 
@@ -1725,12 +1725,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");
 	}
 }
 
@@ -1754,15 +1754,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);
 	}
 }
 
@@ -1776,10 +1776,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]);
 }
 
 /**
@@ -1792,10 +1792,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();
@@ -1812,10 +1812,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]));
 }
 
 /**
@@ -1832,13 +1832,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;
 }
@@ -1854,8 +1854,8 @@ 
  * @param object $post_type_object Post type object.
  * @return bool Whether the post type should be considered viewable.
  */
-function is_post_type_viewable( $post_type_object ) {
-	return $post_type_object->publicly_queryable || ( $post_type_object->_builtin && $post_type_object->public );
+function is_post_type_viewable($post_type_object) {
+	return $post_type_object->publicly_queryable || ($post_type_object->_builtin && $post_type_object->public);
 }
 
 /**
@@ -1887,7 +1887,7 @@ 
  * }
  * @return array List of posts.
  */
-function get_posts( $args = null ) {
+function get_posts($args = null) {
 	$defaults = array(
 		'numberposts' => 5, 'offset' => 0,
 		'category' => 0, 'orderby' => 'date',
@@ -1897,19 +1897,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;
@@ -1937,9 +1937,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);
@@ -1960,9 +1960,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);
@@ -1980,7 +1980,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);
 }
 
@@ -2002,9 +2002,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);
@@ -2018,8 +2018,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);
 }
 
 /**
@@ -2033,12 +2033,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);
 }
 
 /**
@@ -2051,13 +2051,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;
 }
 
@@ -2073,8 +2073,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);
@@ -2093,18 +2093,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;
@@ -2127,23 +2127,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;
 	} else {
 		// 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;
 	}
@@ -2168,29 +2168,29 @@ 
  */
 function sanitize_post_field($field, $value, $post_id, $context) {
 	$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.
@@ -2203,7 +2203,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.
@@ -2216,21 +2216,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.
@@ -2242,7 +2242,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.
@@ -2254,9 +2254,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.
@@ -2268,12 +2268,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.
@@ -2289,15 +2289,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;
@@ -2312,13 +2312,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);
@@ -2333,17 +2333,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);
@@ -2360,12 +2360,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;
@@ -2390,40 +2390,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.
@@ -2436,7 +2436,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);
 }
 
 /**
@@ -2455,17 +2455,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.
@@ -2477,7 +2477,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);
 }
 
 /**
@@ -2501,7 +2501,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);
 }
 
 /**
@@ -2518,35 +2518,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;
 				}
 			}
@@ -2566,43 +2566,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;
 }
 
@@ -2627,17 +2627,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);
 
 	/**
 	 * Fires before a post is deleted, at the start of wp_delete_post().
@@ -2648,40 +2648,40 @@ 
 	 *
 	 * @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 );
+		$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);
 
-		$wpdb->update( $wpdb->posts, $parent_data, $parent_where + array( 'post_type' => $post->post_type ) );
+		$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'));
 
-	$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);
 
-	$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.
@@ -2690,9 +2690,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;
 	}
 
@@ -2703,16 +2703,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().
@@ -2723,7 +2723,7 @@ 
 	 *
 	 * @param int $postid Post ID.
 	 */
-	do_action( 'after_delete_post', $postid );
+	do_action('after_delete_post', $postid);
 
 	return $post;
 }
@@ -2739,22 +2739,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);
 }
 
 /**
@@ -2770,14 +2770,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;
 
 	/**
@@ -2787,10 +2787,10 @@ 
 	 *
 	 * @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($post);
@@ -2804,7 +2804,7 @@ 
 	 *
 	 * @param int $post_id Post ID.
 	 */
-	do_action( 'trashed_post', $post_id );
+	do_action('trashed_post', $post_id);
 
 	return $post;
 }
@@ -2817,11 +2817,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;
 
 	/**
@@ -2831,7 +2831,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);
 
@@ -2851,7 +2851,7 @@ 
 	 *
 	 * @param int $post_id Post ID.
 	 */
-	do_action( 'untrashed_post', $post_id );
+	do_action('untrashed_post', $post_id);
 
 	return $post;
 }
@@ -2866,11 +2866,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;
@@ -2882,22 +2882,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.
@@ -2907,7 +2907,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;
 }
@@ -2922,18 +2922,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;
 
 	/**
@@ -2943,23 +2943,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');
 
@@ -2970,7 +2970,7 @@ 
 	 *
 	 * @param int $post_id Post ID.
 	 */
-	do_action( 'untrashed_post_comments', $post_id );
+	do_action('untrashed_post_comments', $post_id);
 }
 
 /**
@@ -2988,11 +2988,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;
@@ -3012,8 +3012,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);
 }
 
 /**
@@ -3032,11 +3032,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);
 
@@ -3054,11 +3054,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.
@@ -3071,14 +3071,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();
 	}
@@ -3140,7 +3140,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();
@@ -3167,7 +3167,7 @@ 
 
 	$postarr = wp_parse_args($postarr, $defaults);
 
-	unset( $postarr[ 'filter' ] );
+	unset($postarr['filter']);
 
 	$postarr = sanitize_post($postarr, 'db');
 
@@ -3176,39 +3176,39 @@ 
 	$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'];
 	}
 
 	$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".
@@ -3226,36 +3226,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 = '';
 	}
 
@@ -3263,16 +3263,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);
@@ -3283,28 +3283,28 @@ 
 	 * 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'] ) {
-		$post_date = current_time( 'mysql' );
+	if (empty($postarr['post_date']) || '0000-00-00 00:00:00' == $postarr['post_date']) {
+		$post_date = current_time('mysql');
 	} 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';
 		}
@@ -3312,34 +3312,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'];
@@ -3347,28 +3347,28 @@ 
 
 	// These variables are needed by compact() later.
 	$post_content_filtered = $postarr['post_content_filtered'];
-	$post_author = empty( $postarr['post_author'] ) ? $user_id : $postarr['post_author'];
-	$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 = empty($postarr['post_author']) ? $user_id : $postarr['post_author'];
+	$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;
@@ -3384,28 +3384,28 @@ 
 	 * @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);
 
-	$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.
 		 *
@@ -3414,7 +3414,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.
@@ -3424,12 +3424,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.
 		 *
@@ -3438,9 +3438,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;
@@ -3448,14 +3448,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;
@@ -3464,75 +3464,75 @@ 
 		$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);
 			// 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);
 			}
 		}
 	}
 
-	$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.
 			 *
@@ -3540,7 +3540,7 @@ 
 			 *
 			 * @param int $post_ID Attachment ID.
 			 */
-			do_action( 'edit_attachment', $post_ID );
+			do_action('edit_attachment', $post_ID);
 		} else {
 
 			/**
@@ -3550,13 +3550,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.
 		 *
@@ -3565,7 +3565,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);
 
 		/**
@@ -3577,7 +3577,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);
 	}
 
 	/**
@@ -3592,7 +3592,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.
@@ -3603,7 +3603,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.
@@ -3614,7 +3614,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;
 }
@@ -3632,8 +3632,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);
@@ -3642,9 +3642,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;
 	}
 
@@ -3652,15 +3652,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;
@@ -3668,7 +3668,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'] = '';
 	}
@@ -3676,7 +3676,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);
 }
 
 /**
@@ -3688,34 +3688,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);
 }
 
 /**
@@ -3728,26 +3728,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 meaninful value
-	wp_publish_post( $post_id );
+	wp_publish_post($post_id);
 }
 
 /**
@@ -3765,8 +3765,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;
@@ -3774,13 +3774,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.
@@ -3790,17 +3790,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 ) || apply_filters( 'wp_unique_post_slug_is_bad_attachment_slug', false, $slug ) ) {
+		if ($post_name_check || in_array($slug, $feeds) || 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;
 
 		/*
@@ -3808,7 +3808,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.
@@ -3820,26 +3820,26 @@ 
 		 * @param string $post_type   Post type.
 		 * @param int    $post_parent Post parent ID.
 		 */
-		if ( $post_name_check || in_array( $slug, $feeds ) || 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) || 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:
@@ -3848,9 +3848,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;
 			}
@@ -3865,13 +3865,13 @@ 
 		 * @param string $slug      The post slug.
 		 * @param string $post_type Post type.
 		 */
-		if ( $post_name_check || in_array( $slug, $feeds ) || $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) || $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;
 		}
 	}
@@ -3888,7 +3888,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);
 }
 
 /**
@@ -3903,16 +3903,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, '-');
 }
 
 /**
@@ -3927,7 +3927,7 @@ 
  * @param string $tags    Optional. The tags to set for the post, separated by commas. Default empty.
  * @return array|false|WP_Error Will return false if $post_id is not an integer or is 0.
  */
-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);
 }
 
@@ -3945,8 +3945,8 @@ 
  *                        replace the tags with the new tags. Default false.
  * @return array|false|WP_Error Array of affected term IDs. 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);
 }
 
 /**
@@ -3963,31 +3963,31 @@ 
  *                         replace the tags with the new tags. Default false.
  * @return array|false|WP_Error Array of affected term IDs. 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);
 }
 
 /**
@@ -4006,24 +4006,24 @@ 
  *                                  If false, replace the categories with the new categories.
  * @return array|bool|WP_Error
  */
-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);
 }
 
 /**
@@ -4047,7 +4047,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.
 	 *
@@ -4057,7 +4057,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.
@@ -4069,7 +4069,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.
@@ -4090,7 +4090,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);
 }
 
 //
@@ -4108,9 +4108,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;
@@ -4123,11 +4123,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));
 }
 
 /**
@@ -4138,18 +4138,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]);
 		}
 	}
 
@@ -4161,7 +4161,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);
 }
 
 /**
@@ -4174,9 +4174,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);
 
@@ -4187,7 +4187,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);
 }
 
 /**
@@ -4200,10 +4200,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);
 
 	/**
@@ -4213,7 +4213,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);
 }
 
 /**
@@ -4224,22 +4224,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);
 		}
 	}
 }
@@ -4261,7 +4261,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');
 	}
@@ -4284,8 +4284,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);
 }
 
 /**
@@ -4301,26 +4301,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
@@ -4328,33 +4328,33 @@ 
 		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;
-			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);
 	}
 }
 
@@ -4371,31 +4371,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);
 	}
 }
 
@@ -4410,25 +4410,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;
 				}
@@ -4451,19 +4451,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;
 }
@@ -4481,11 +4481,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);
 		}
 	}
 }
@@ -4500,16 +4500,16 @@ 
  * @param WP_Post|object|int $page Page object or page ID.
  * @return string|false Page URI, false on error.
  */
-function get_page_uri( $page ) {
-	$page = get_post( $page );
+function get_page_uri($page) {
+	$page = get_post($page);
 
-	if ( ! $page )
+	if ( ! $page)
 		return false;
 
 	$uri = $page->post_name;
 
-	foreach ( $page->ancestors as $parent ) {
-		$uri = get_post( $parent )->post_name . '/' . $uri;
+	foreach ($page->ancestors as $parent) {
+		$uri = get_post($parent)->post_name.'/'.$uri;
 	}
 
 	return $uri;
@@ -4555,7 +4555,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(
@@ -4568,7 +4568,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'];
@@ -4581,87 +4581,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)";
 			}
 		}
@@ -4669,49 +4669,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':
@@ -4724,36 +4724,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;
 	}
 
@@ -4764,38 +4764,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.
@@ -4805,7 +4805,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);
 }
 
 //
@@ -4825,9 +4825,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;
@@ -4856,21 +4856,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);
 }
 
 /**
@@ -4892,27 +4892,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().
@@ -4921,65 +4921,65 @@ 
 	 *
 	 * @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);
 
-	$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);
 
-	$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_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;
 }
@@ -4993,14 +4993,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;
 
 	/**
@@ -5012,7 +5012,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);
 }
 
 /**
@@ -5024,9 +5024,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;
 
 	/**
@@ -5037,10 +5037,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');
 }
 
 /**
@@ -5053,28 +5053,28 @@ 
  * @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_upload_dir()) && false === $uploads['error'] ) {
+		if (($uploads = wp_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') ) {
-				$url = $uploads['baseurl'] . substr( $file, strpos($file, 'wp-content/uploads') + 18 );
+			} elseif (false !== strpos($file, 'wp-content/uploads')) {
+				$url = $uploads['baseurl'].substr($file, strpos($file, 'wp-content/uploads') + 18);
 			} else {
 				// It's a newly-uploaded file, therefore $file is relative to the basedir.
-				$url = $uploads['baseurl'] . "/$file";
+				$url = $uploads['baseurl']."/$file";
 			}
 		}
 	}
@@ -5083,13 +5083,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);
 	}
 
 	/**
@@ -5100,9 +5100,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;
@@ -5116,16 +5116,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.
 		 *
@@ -5134,7 +5134,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;
 }
@@ -5147,18 +5147,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);
@@ -5171,7 +5171,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);
 }
 
 /**
@@ -5183,40 +5183,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;
@@ -5233,8 +5233,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);
 }
 
 /**
@@ -5245,21 +5245,21 @@ 
  * @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;
 				$ext = preg_replace('/^.+?\.([^.]+)$/', '$1', $post->guid);
-				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;
@@ -5272,7 +5272,7 @@ 
 
 		$icon_files = wp_cache_get('icon_files');
 
-		if ( !is_array($icon_files) ) {
+		if ( ! is_array($icon_files)) {
 			/**
 			 * Filter the icon directory path.
 			 *
@@ -5280,7 +5280,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.
@@ -5289,7 +5289,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.
@@ -5298,19 +5298,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;
 						}
@@ -5319,15 +5319,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);
@@ -5336,10 +5336,10 @@ 
 		$matches = wp_match_mime_types(array_keys($types), $post_mimes);
 		$matches['default'] = array('default');
 
-		foreach ( $matches as $match => $wilds ) {
-			if ( isset($types[$wilds[0]])) {
+		foreach ($matches as $match => $wilds) {
+			if (isset($types[$wilds[0]])) {
 				$icon = $types[$wilds[0]];
-				if ( !is_numeric($mime) )
+				if ( ! is_numeric($mime))
 					wp_cache_add("mime_type_icon_$mime", $icon);
 				break;
 			}
@@ -5356,7 +5356,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);
 }
 
 /**
@@ -5378,23 +5378,23 @@ 
  * @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 hasnt 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 ( $post->post_status != 'publish' || is_post_type_hierarchical( $post->post_type ) )
+	if ($post->post_status != 'publish' || is_post_type_hierarchical($post->post_type))
 		return;
 
 	$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) )
+	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) )
+	if (in_array($post->post_name, $old_slugs))
 		delete_post_meta($post_id, '_wp_old_slug', $post->post_name);
 }
 
@@ -5412,8 +5412,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);
 }
 
 /**
@@ -5434,19 +5434,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;
 		}
 
@@ -5459,42 +5459,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;
@@ -5513,7 +5513,7 @@ 
  *                         or 'server'. Default 'server'.
  * @return string The date of the last post.
  */
-function get_lastpostdate( $timezone = 'server' ) {
+function get_lastpostdate($timezone = 'server') {
 	/**
 	 * Filter the date the last post was published.
 	 *
@@ -5523,7 +5523,7 @@ 
 	 *                         'blog', or 'server'.
 	 * @param string $timezone Location to use for getting the post published date.
 	 */
-	return apply_filters( 'get_lastpostdate', _get_last_post_time( $timezone, 'date' ), $timezone );
+	return apply_filters('get_lastpostdate', _get_last_post_time($timezone, 'date'), $timezone);
 }
 
 /**
@@ -5542,11 +5542,11 @@ 
  *                         Default 'server'.
  * @return string The timestamp.
  */
-function get_lastpostmodified( $timezone = 'server' ) {
-	$lastpostmodified = _get_last_post_time( $timezone, 'modified' );
+function get_lastpostmodified($timezone = 'server') {
+	$lastpostmodified = _get_last_post_time($timezone, 'modified');
 
 	$lastpostdate = get_lastpostdate($timezone);
-	if ( $lastpostdate > $lastpostmodified )
+	if ($lastpostdate > $lastpostmodified)
 		$lastpostmodified = $lastpostdate;
 
 	/**
@@ -5558,7 +5558,7 @@ 
 	 * @param string $timezone         Location to use for getting the post modified date.
 	 *                                 See {@see get_lastpostmodified()} for accepted `$timezone` values.
 	 */
-	return apply_filters( 'get_lastpostmodified', $lastpostmodified, $timezone );
+	return apply_filters('get_lastpostmodified', $lastpostmodified, $timezone);
 }
 
 /**
@@ -5574,26 +5574,26 @@ 
  * @param string $field    Post field to check. Accepts 'date' or 'modified'.
  * @return string|false The timestamp.
  */
-function _get_last_post_time( $timezone, $field ) {
+function _get_last_post_time($timezone, $field) {
 	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";
 
-	$date = wp_cache_get( $key, 'timeinfo' );
+	$date = wp_cache_get($key, 'timeinfo');
 
-	if ( !$date ) {
+	if ( ! $date) {
 		$add_seconds_server = date('Z');
 
-		$post_types = get_post_types( array( 'public' => true ) );
-		array_walk( $post_types, array( &$wpdb, 'escape_by_ref' ) );
-		$post_types = "'" . implode( "', '", $post_types ) . "'";
+		$post_types = get_post_types(array('public' => true));
+		array_walk($post_types, array(&$wpdb, 'escape_by_ref'));
+		$post_types = "'".implode("', '", $post_types)."'";
 
-		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;
@@ -5605,8 +5605,8 @@ 
 				break;
 		}
 
-		if ( $date )
-			wp_cache_set( $key, $date, 'timeinfo' );
+		if ($date)
+			wp_cache_set($key, $date, 'timeinfo');
 	}
 
 	return $date;
@@ -5619,12 +5619,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');
 }
 
 /**
@@ -5643,22 +5643,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, $wpdb;
 
-	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.
@@ -5668,10 +5668,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.
@@ -5680,10 +5680,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');
 }
 
 /**
@@ -5696,27 +5696,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);
@@ -5724,11 +5724,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);
 }
 
@@ -5745,7 +5745,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);
 }
 
@@ -5764,10 +5764,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;
@@ -5775,7 +5775,7 @@ 
 	wp_cache_delete($id, 'posts');
 	wp_cache_delete($id, 'post_meta');
 
-	if ( $clean_terms )
+	if ($clean_terms)
 		clean_object_term_cache($id, 'attachment');
 
 	/**
@@ -5785,7 +5785,7 @@ 
 	 *
 	 * @param int $id Attachment ID.
 	 */
-	do_action( 'clean_attachment_cache', $id );
+	do_action('clean_attachment_cache', $id);
 }
 
 //
@@ -5805,13 +5805,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.
@@ -5825,20 +5825,20 @@ 
 	}
 
 	// 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' );
+	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');
 		}
 	}
 
-	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));
 }
 
 /**
@@ -5855,9 +5855,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));
 }
 
 /**
@@ -5870,8 +5870,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.
 		 *
@@ -5879,15 +5879,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');
 }
@@ -5901,9 +5901,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;
 }
@@ -5922,30 +5922,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;
 }
@@ -5959,14 +5959,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;
 }
@@ -5979,10 +5979,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;
 }
 
@@ -5997,10 +5997,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);
 	}
 }
 
@@ -6017,11 +6017,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);
 	}
 }
 
@@ -6039,13 +6039,13 @@ 
  * @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);
 	}
 }

Braces +689 added lines, -472 removed lines

@@ -186,10 +186,12 @@ 
 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_upload_dir()) && false === $uploads['error'] ) )
-		$file = $uploads['basedir'] . "/$file";
-	if ( $unfiltered )
-		return $file;
+	if ( $file && 0 !== strpos($file, '/') && !preg_match('|^.:\\\|', $file) && ( ($uploads = wp_upload_dir()) && false === $uploads['error'] ) ) {
+			$file = $uploads['basedir'] . "/$file";
+	}
+	if ( $unfiltered ) {
+			return $file;
+	}
 
 	/**
 	 * Filter the attached file based on the given ID.
@@ -215,8 +217,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.
@@ -228,11 +231,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.
@@ -339,16 +343,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;
@@ -423,8 +430,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;
@@ -441,15 +449,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;
 }
@@ -658,16 +668,18 @@ 
 		global $wpdb;
 
 		$post_id = (int) $post_id;
-		if ( ! $post_id )
-			return false;
+		if ( ! $post_id ) {
+					return false;
+		}
 
 		$_post = wp_cache_get( $post_id, 'posts' );
 
 		if ( ! $_post ) {
 			$_post = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->posts WHERE ID = %d LIMIT 1", $post_id ) );
 
-			if ( ! $_post )
-				return false;
+			if ( ! $_post ) {
+							return false;
+			}
 
 			$_post = sanitize_post( $_post, 'raw' );
 			wp_cache_add( $_post->ID, $_post, 'posts' );
@@ -684,8 +696,9 @@ 
 	 * @param WP_Post|object $post Post object.
 	 */
 	public function __construct( $post ) {
-		foreach ( get_object_vars( $post ) as $key => $value )
-			$this->$key = $value;
+		foreach ( get_object_vars( $post ) as $key => $value ) {
+					$this->$key = $value;
+		}
 	}
 
 	/**
@@ -695,17 +708,21 @@ 
 	 * @return bool
 	 */
 	public function __isset( $key ) {
-		if ( 'ancestors' == $key )
-			return true;
+		if ( 'ancestors' == $key ) {
+					return true;
+		}
 
-		if ( 'page_template' == $key )
-			return ( 'page' == $this->post_type );
+		if ( 'page_template' == $key ) {
+					return ( 'page' == $this->post_type );
+		}
 
-		if ( 'post_category' == $key )
-		   return true;
+		if ( 'post_category' == $key ) {
+				   return true;
+		}
 
-		if ( 'tags_input' == $key )
-		   return true;
+		if ( 'tags_input' == $key ) {
+				   return true;
+		}
 
 		return metadata_exists( 'post', $this->ID, $key );
 	}
@@ -722,33 +739,39 @@ 
 		}
 
 		if ( 'post_category' == $key ) {
-			if ( is_object_in_taxonomy( $this->post_type, 'category' ) )
-				$terms = get_the_terms( $this, 'category' );
+			if ( is_object_in_taxonomy( $this->post_type, 'category' ) ) {
+							$terms = get_the_terms( $this, 'category' );
+			}
 
-			if ( empty( $terms ) )
-				return array();
+			if ( empty( $terms ) ) {
+							return array();
+			}
 
 			return wp_list_pluck( $terms, 'term_id' );
 		}
 
 		if ( 'tags_input' == $key ) {
-			if ( is_object_in_taxonomy( $this->post_type, 'post_tag' ) )
-				$terms = get_the_terms( $this, 'post_tag' );
+			if ( is_object_in_taxonomy( $this->post_type, 'post_tag' ) ) {
+							$terms = get_the_terms( $this, 'post_tag' );
+			}
 
-			if ( empty( $terms ) )
-				return array();
+			if ( empty( $terms ) ) {
+							return array();
+			}
 
 			return wp_list_pluck( $terms, 'name' );
 		}
 
 		// Rest of the values need filtering.
-		if ( 'ancestors' == $key )
-			$value = get_post_ancestors( $this );
-		else
-			$value = get_post_meta( $this->ID, $key, true );
+		if ( 'ancestors' == $key ) {
+					$value = get_post_ancestors( $this );
+		} else {
+					$value = get_post_meta( $this->ID, $key, true );
+		}
 
-		if ( $this->filter )
-			$value = sanitize_post_field( $key, $value, $this->ID, $this->filter );
+		if ( $this->filter ) {
+					$value = sanitize_post_field( $key, $value, $this->ID, $this->filter );
+		}
 
 		return $value;
 	}
@@ -760,11 +783,13 @@ 
 	 * @return self|array|bool|object|WP_Post
 	 */
 	public function filter( $filter ) {
-		if ( $this->filter == $filter )
-			return $this;
+		if ( $this->filter == $filter ) {
+					return $this;
+		}
 
-		if ( $filter == 'raw' )
-			return self::get_instance( $this->ID );
+		if ( $filter == 'raw' ) {
+					return self::get_instance( $this->ID );
+		}
 
 		return sanitize_post( $this, $filter );
 	}
@@ -778,8 +803,9 @@ 
 		$post = get_object_vars( $this );
 
 		foreach ( array( 'ancestors', 'page_template', 'post_category', 'tags_input' ) as $key ) {
-			if ( $this->__isset( $key ) )
-				$post[ $key ] = $this->__get( $key );
+			if ( $this->__isset( $key ) ) {
+							$post[ $key ] = $this->__get( $key );
+			}
 		}
 
 		return $post;
@@ -797,8 +823,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();
 
@@ -806,8 +833,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;
 	}
@@ -837,11 +865,13 @@ 
 function get_post_field( $field, $post, $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);
 }
@@ -860,8 +890,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;
 }
@@ -880,16 +911,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 ) ) {
@@ -993,8 +1027,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(
@@ -1017,38 +1052,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;
 
@@ -1070,8 +1116,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];
 }
@@ -1114,8 +1161,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;
@@ -1144,8 +1192,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;
 }
@@ -1165,8 +1214,9 @@ 
 function get_post_type_object( $post_type ) {
 	global $wp_post_types;
 
-	if ( empty($wp_post_types[$post_type]) )
-		return null;
+	if ( empty($wp_post_types[$post_type]) ) {
+			return null;
+	}
 
 	return $wp_post_types[$post_type];
 }
@@ -1313,8 +1363,9 @@ 
 function register_post_type( $post_type, $args = array() ) {
 	global $wp_post_types, $wp_rewrite, $wp;
 
-	if ( ! is_array( $wp_post_types ) )
-		$wp_post_types = array();
+	if ( ! is_array( $wp_post_types ) ) {
+			$wp_post_types = array();
+	}
 
 	// Args prefixed with an underscore are reserved for internal use.
 	$defaults = array(
@@ -1356,42 +1407,51 @@ 
 	}
 
 	// 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;
+	}
 
 	$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 );
@@ -1402,42 +1462,51 @@ 
 	}
 
 	if ( false !== $args->query_var && ! empty( $wp ) ) {
-		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 );
+		}
 		$wp->add_query_var( $args->query_var );
 	}
 
 	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 ) {
@@ -1445,8 +1514,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;
@@ -1455,8 +1525,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;
@@ -1538,8 +1609,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;
@@ -1573,12 +1645,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;
 }
@@ -1595,11 +1669,13 @@ 
  */
 function _post_type_meta_capabilities( $capabilities = null ) {
 	static $meta_caps = array();
-	if ( null === $capabilities )
-		return $meta_caps;
+	if ( null === $capabilities ) {
+			return $meta_caps;
+	}
 	foreach ( $capabilities as $core => $custom ) {
-		if ( in_array( $core, array( 'read_post', 'delete_post', 'edit_post' ) ) )
-			$meta_caps[ $custom ] = $core;
+		if ( in_array( $core, array( 'read_post', 'delete_post', 'edit_post' ) ) ) {
+					$meta_caps[ $custom ] = $core;
+		}
 	}
 }
 
@@ -1695,20 +1771,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'];
+	}
 
 	$defaults = array();
 	foreach ( $nohier_vs_hier_defaults as $key => $value ) {
@@ -1728,8 +1809,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" );
 	}
 }
@@ -1759,10 +1841,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 );
+		}
 	}
 }
 
@@ -1795,8 +1878,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();
 }
@@ -1898,18 +1982,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;
@@ -1939,8 +2027,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);
 }
@@ -1962,8 +2051,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);
 }
@@ -2004,8 +2094,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);
 }
@@ -2035,8 +2126,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 );
 }
@@ -2054,12 +2146,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.
@@ -2074,8 +2168,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);
 
@@ -2096,16 +2191,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;
 }
@@ -2130,21 +2228,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;
 	} else {
 		// 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;
@@ -2168,8 +2272,9 @@ 
  */
 function sanitize_post_field($field, $value, $post_id, $context) {
 	$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' );
@@ -2178,8 +2283,9 @@ 
 		return $value;
 	}
 
-	if ( 'raw' == $context )
-		return $value;
+	if ( 'raw' == $context ) {
+			return $value;
+	}
 
 	$prefixed = false;
 	if ( false !== strpos($field, 'post_') ) {
@@ -2222,10 +2328,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);
 		}
@@ -2295,10 +2402,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;
 }
@@ -2315,11 +2423,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);
 }
@@ -2336,15 +2446,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);
 
@@ -2393,8 +2506,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 );
 
@@ -2569,8 +2683,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();
 
@@ -2580,29 +2695,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;
 }
 
@@ -2630,14 +2750,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 );
+	}
 
 	/**
 	 * Fires before a post is deleted, at the start of wp_delete_post().
@@ -2669,19 +2792,22 @@ 
 	// 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' ) );
 
 	$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 );
+	foreach ( $comment_ids as $comment_id ) {
+			wp_delete_comment( $comment_id, true );
+	}
 
 	$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.
@@ -2708,8 +2834,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 ) );
@@ -2771,14 +2898,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.
@@ -2818,11 +2948,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.
@@ -2870,8 +3002,9 @@ 
 	global $wpdb;
 
 	$post = get_post($post);
-	if ( empty($post) )
-		return;
+	if ( empty($post) ) {
+			return;
+	}
 
 	$post_id = $post->ID;
 
@@ -2885,13 +3018,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.
@@ -2926,15 +3061,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.
@@ -2947,8 +3084,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.
@@ -3643,8 +3781,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;
 	}
 
@@ -3653,17 +3792,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);
@@ -3673,8 +3814,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 );
 }
@@ -3691,11 +3833,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 ) );
 
@@ -3731,11 +3875,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' );
 
@@ -3766,16 +3912,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.
@@ -3800,8 +3948,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
@@ -3906,10 +4055,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, '-' );
@@ -3966,16 +4116,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," ) );
 	}
 
@@ -4141,12 +4294,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 ] );
@@ -4340,15 +4495,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;
+				}
 			}
 		}
 	}
@@ -4503,8 +4660,9 @@ 
 function get_page_uri( $page ) {
 	$page = get_post( $page );
 
-	if ( ! $page )
-		return false;
+	if ( ! $page ) {
+			return false;
+	}
 
 	$uri = $page->post_name;
 
@@ -4821,14 +4979,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;
 }
@@ -4895,14 +5056,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');
@@ -4911,8 +5075,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().
@@ -4930,12 +5095,14 @@ 
 	delete_metadata( 'post', null, '_thumbnail_id', $post_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 );
+	foreach ( $comment_ids as $comment_id ) {
+			wp_delete_comment( $comment_id, true );
+	}
 
 	$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 );
@@ -4995,13 +5162,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.
@@ -5026,8 +5195,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.
@@ -5037,11 +5207,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.
@@ -5055,11 +5226,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.
@@ -5102,8 +5275,9 @@ 
 	 */
 	$url = apply_filters( 'wp_get_attachment_url', $url, $post->ID );
 
-	if ( empty( $url ) )
-		return false;
+	if ( empty( $url ) ) {
+			return false;
+	}
 
 	return $url;
 }
@@ -5118,10 +5292,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 );
 
@@ -5149,17 +5325,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);
 
@@ -5246,8 +5426,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) ) {
@@ -5259,8 +5440,9 @@ 
 				$ext = preg_replace('/^.+?\.([^.]+)$/', '$1', $post->guid);
 				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 {
@@ -5307,11 +5489,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";
@@ -5324,8 +5508,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, '/'));
@@ -5339,8 +5524,9 @@ 
 		foreach ( $matches as $match => $wilds ) {
 			if ( isset($types[$wilds[0]])) {
 				$icon = $types[$wilds[0]];
-				if ( !is_numeric($mime) )
-					wp_cache_add("mime_type_icon_$mime", $icon);
+				if ( !is_numeric($mime) ) {
+									wp_cache_add("mime_type_icon_$mime", $icon);
+				}
 				break;
 			}
 		}
@@ -5380,23 +5566,27 @@ 
  */
 function wp_check_for_changed_slugs( $post_id, $post, $post_before ) {
 	// Don't bother if it hasnt changed.
-	if ( $post->post_name == $post_before->post_name )
-		return;
+	if ( $post->post_name == $post_before->post_name ) {
+			return;
+	}
 
 	// We're only concerned with published, non-hierarchical objects.
-	if ( $post->post_status != 'publish' || is_post_type_hierarchical( $post->post_type ) )
-		return;
+	if ( $post->post_status != 'publish' || is_post_type_hierarchical( $post->post_type ) ) {
+			return;
+	}
 
 	$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);
+	}
+	}
 
 /**
  * Retrieve the private post SQL based on capability.
@@ -5546,8 +5736,9 @@ 
 	$lastpostmodified = _get_last_post_time( $timezone, 'modified' );
 
 	$lastpostdate = get_lastpostdate($timezone);
-	if ( $lastpostdate > $lastpostmodified )
-		$lastpostmodified = $lastpostdate;
+	if ( $lastpostdate > $lastpostmodified ) {
+			$lastpostmodified = $lastpostdate;
+	}
 
 	/**
 	 * Filter the date the last post was modified.
@@ -5577,8 +5768,9 @@ 
 function _get_last_post_time( $timezone, $field ) {
 	global $wpdb;
 
-	if ( !in_array( $field, array( 'date', 'modified' ) ) )
-		return false;
+	if ( !in_array( $field, array( 'date', 'modified' ) ) ) {
+			return false;
+	}
 
 	$timezone = strtolower( $timezone );
 
@@ -5605,8 +5797,9 @@ 
 				break;
 		}
 
-		if ( $date )
-			wp_cache_set( $key, $date, 'timeinfo' );
+		if ( $date ) {
+					wp_cache_set( $key, $date, 'timeinfo' );
+		}
 	}
 
 	return $date;
@@ -5620,12 +5813,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.
@@ -5646,12 +5841,14 @@ 
 function clean_post_cache( $post ) {
 	global $_wp_suspend_cache_invalidation, $wpdb;
 
-	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' );
@@ -5698,17 +5895,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) ) {
@@ -5724,13 +5924,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.
@@ -5767,16 +5969,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.
@@ -5810,8 +6014,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.
@@ -5882,11 +6087,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');
@@ -5903,8 +6110,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;
 }
 
@@ -5924,28 +6132,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;
 }
@@ -5963,10 +6178,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;
 }
@@ -5981,8 +6197,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 +5 added lines, -5 removed lines

@@ -277,8 +277,8 @@ 
  *
  * @global WP_Query $wp_query
  *
- * @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 = '' ) {
@@ -2115,7 +2115,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 ) {
@@ -4013,7 +4013,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 ) ) {
@@ -4598,7 +4598,7 @@ 
 	 * @global int             $numpages
 	 *
 	 * @param WP_Post $post Post data.
-	 * @return true True when finished.
+	 * @return 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.
@@ -4039,14 +4039,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 +845 added lines, -845 removed lines

@@ -22,9 +22,9 @@ 
  * @param mixed  $default   Value to return if the query variable is not set. Default ''.
  * @return mixed
  */
-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);
 }
 
 /**
@@ -67,9 +67,9 @@ 
  * @param string $var   Query variable key.
  * @param mixed  $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);
 }
 
 /**
@@ -118,7 +118,7 @@ 
 function wp_reset_postdata() {
 	global $wp_query;
 
-	if ( isset( $wp_query ) ) {
+	if (isset($wp_query)) {
 		$wp_query->reset_postdata();
 	}
 }
@@ -141,8 +141,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;
 	}
 
@@ -159,15 +159,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);
 }
 
 /**
@@ -180,15 +180,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);
 }
 
 /**
@@ -204,15 +204,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);
 }
 
 /**
@@ -228,15 +228,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);
 }
 
 /**
@@ -252,15 +252,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);
 }
 
 /**
@@ -281,15 +281,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);
 }
 
 /**
@@ -304,8 +304,8 @@ 
 function is_comments_popup() {
 	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;
 	}
 
@@ -324,8 +324,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;
 	}
 
@@ -344,8 +344,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;
 	}
 
@@ -362,15 +362,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);
 }
 
 /**
@@ -385,8 +385,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;
 	}
 
@@ -414,8 +414,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;
 	}
 
@@ -443,8 +443,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;
 	}
 
@@ -463,8 +463,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;
 	}
 
@@ -487,15 +487,15 @@ 
  * @param mixed $page Page ID, title, slug, or array of such.
  * @return bool
  */
-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);
 }
 
 /**
@@ -510,8 +510,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;
 	}
 
@@ -530,8 +530,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;
 	}
 
@@ -550,8 +550,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;
 	}
 
@@ -570,8 +570,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;
 	}
 
@@ -596,15 +596,15 @@ 
  * @param mixed $post Post ID, title, slug, or array of such.
  * @return bool
  */
-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);
 }
 
 /**
@@ -623,15 +623,15 @@ 
  * @param mixed $post_types Optional. Post Type or array of Post Types
  * @return bool
  */
-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);
 }
 
 /**
@@ -646,8 +646,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;
 	}
 
@@ -666,8 +666,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;
 	}
 
@@ -686,8 +686,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;
 	}
 
@@ -706,8 +706,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;
 	}
 
@@ -724,10 +724,10 @@ 
  * @return bool
  */
 function is_main_query() {
-	if ( 'pre_get_posts' === current_filter() ) {
-		$message = sprintf( __( 'In <code>%1$s</code>, use the <code>%2$s</code> method, not the <code>%3$s</code> function. See %4$s.' ),
-			'pre_get_posts', 'WP_Query::is_main_query()', 'is_main_query()', __( 'https://codex.wordpress.org/Function_Reference/is_main_query' ) );
-		_doing_it_wrong( __FUNCTION__, $message, '3.7' );
+	if ('pre_get_posts' === current_filter()) {
+		$message = sprintf(__('In <code>%1$s</code>, use the <code>%2$s</code> method, not the <code>%3$s</code> function. See %4$s.'),
+			'pre_get_posts', 'WP_Query::is_main_query()', 'is_main_query()', __('https://codex.wordpress.org/Function_Reference/is_main_query'));
+		_doing_it_wrong(__FUNCTION__, $message, '3.7');
 	}
 
 	global $wp_query;
@@ -1300,9 +1300,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.
@@ -1357,10 +1357,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;
@@ -1429,17 +1429,17 @@ 
 			, 'menu_order'
 		);
 
-		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;
@@ -1550,11 +1550,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;
 		}
 
@@ -1562,79 +1562,79 @@ 
 		$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'] );
-		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']);
+		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;
@@ -1643,9 +1643,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;
@@ -1654,40 +1654,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;
@@ -1699,123 +1699,123 @@ 
 					}
 				}
 			}
-			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['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 ( '' != $qv['comments_popup'] )
+		if ('' != $qv['comments_popup'])
 			$this->is_comments_popup = 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 || $this->is_trackback || $this->is_404 || $this->is_admin || $this->is_comments_popup || $this->is_robots ) )
+		if ( ! ($this->is_singular || $this->is_archive || $this->is_search || $this->is_feed || $this->is_trackback || $this->is_404 || $this->is_admin || $this->is_comments_popup || $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']);
-			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'] ) {
+		if ('' != $qv['pagename']) {
 			$this->queried_object = get_page_by_path($qv['pagename']);
-			if ( !empty($this->queried_object) )
+			if ( ! empty($this->queried_object))
 				$this->queried_object_id = (int) $this->queried_object->ID;
 			else
 				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->query_vars_hash = md5( serialize( $this->query_vars ) );
+		$this->query_vars_hash = md5(serialize($this->query_vars));
 		$this->query_vars_changed = false;
 
 		/**
@@ -1825,7 +1825,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));
 	}
 
 	/**
@@ -1838,72 +1838,72 @@ 
 	 *
 	 * @param array &$q The query variables
 	 */
-	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)
+					));
 				}
 			}
 		}
 
 		// 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,
@@ -1912,7 +1912,7 @@ 
 				);
 			}
 
-			if ( ! empty( $cat_not_in ) ) {
+			if ( ! empty($cat_not_in)) {
 				$tax_query[] = array(
 					'taxonomy' => 'category',
 					'terms' => $cat_not_in,
@@ -1921,19 +1921,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'],
@@ -1942,8 +1942,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'],
@@ -1952,8 +1952,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'],
@@ -1964,16 +1964,16 @@ 
 		}
 
 		// 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;
 				}
@@ -1983,24 +1983,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'],
@@ -2008,8 +2008,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'],
@@ -2017,8 +2017,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'],
@@ -2026,8 +2026,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'],
@@ -2036,7 +2036,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.
@@ -2045,7 +2045,7 @@ 
 		 *
 		 * @param WP_Query $this The WP_Query instance.
 		 */
-		do_action( 'parse_tax_query', $this );
+		do_action('parse_tax_query', $this);
 	}
 
 	/**
@@ -2057,49 +2057,49 @@ 
 	 * @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 ) {
-			if ( $n ) {
-				$like = '%' . $wpdb->esc_like( $term ) . '%';
-				$q['search_orderby_title'][] = $wpdb->prepare( "$wpdb->posts.post_title LIKE %s", $like );
+		foreach ($q['search_terms'] as $term) {
+			if ($n) {
+				$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 %s) OR ($wpdb->posts.post_content LIKE %s))", $like, $like );
+			$like = $n.$wpdb->esc_like($term).$n;
+			$search .= $wpdb->prepare("{$searchand}(($wpdb->posts.post_title LIKE %s) OR ($wpdb->posts.post_content LIKE %s))", $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 = '') ";
 		}
 
@@ -2118,24 +2118,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.
-			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;
@@ -2152,20 +2152,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;
 		}
 
@@ -2176,7 +2176,7 @@ 
 		 *
 		 * @param array $stopwords Stopwords.
 		 */
-		$this->stopwords = apply_filters( 'wp_search_stopwords', $stopwords );
+		$this->stopwords = apply_filters('wp_search_stopwords', $stopwords);
 		return $this->stopwords;
 	}
 
@@ -2188,33 +2188,33 @@ 
 	 * @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'] );
-			$like = '%' . $wpdb->esc_like( $q['s'] ) . '%';
+		if ($q['search_terms_count'] > 1) {
+			$num_terms = count($q['search_orderby_title']);
+			$like = '%'.$wpdb->esc_like($q['s']).'%';
 
 			$search_orderby = '(CASE ';
 			// sentence match in 'post_title'
-			$search_orderby .= $wpdb->prepare( "WHEN $wpdb->posts.post_title LIKE %s THEN 1 ", $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'
-			$search_orderby .= $wpdb->prepare( "WHEN $wpdb->posts.post_content LIKE %s THEN 4 ", $like );
+			$search_orderby .= $wpdb->prepare("WHEN $wpdb->posts.post_content LIKE %s THEN 4 ", $like);
 			$search_orderby .= 'ELSE 5 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;
@@ -2232,7 +2232,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.
@@ -2245,24 +2245,24 @@ 
 		$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 ( ! in_array( $orderby, $allowed_keys ) ) {
+		if ( ! in_array($orderby, $allowed_keys)) {
 			return false;
 		}
 
-		switch ( $orderby ) {
+		switch ($orderby) {
 			case 'post_name':
 			case 'post_author':
 			case 'post_date':
@@ -2280,7 +2280,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";
@@ -2290,13 +2290,13 @@ 
 				$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']})";
 				} else {
 					// Default: order by post field.
-					$orderby_clause = "$wpdb->posts.post_" . sanitize_key( $orderby );
+					$orderby_clause = "$wpdb->posts.post_".sanitize_key($orderby);
 				}
 
 				break;
@@ -2314,12 +2314,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';
@@ -2351,9 +2351,9 @@ 
 	 * @param mixed  $default   Value to return if the query variable is not set. Default ''.
 	 * @return mixed
 	 */
-	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;
@@ -2401,7 +2401,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;
@@ -2411,11 +2411,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;
 		}
@@ -2433,91 +2433,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;
@@ -2528,74 +2528,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'] = '';
 				}
 
@@ -2606,93 +2606,93 @@ 
 		}
 
 		// 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 ( intval($q['comments_popup']) )
+		if (intval($q['comments_popup']))
 			$q['p'] = absint($q['comments_popup']);
 
 		// 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 ( ! empty( $q['s'] ) ) {
-			$search = $this->parse_search( $q );
+		if ( ! empty($q['s'])) {
+			$search = $this->parse_search($q);
 		}
 
 		/**
@@ -2703,35 +2703,35 @@ 
 		 * @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;
 			}
 		}
@@ -2740,22 +2740,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];
@@ -2765,152 +2765,152 @@ 
 			}
 
 			// '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);
 
 			/**
 			 * Filter the ORDER BY used when ordering search results.
@@ -2920,84 +2920,84 @@ 
 			 * @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 );
-			if ( $search_orderby )
-				$orderby = $orderby ? $search_orderby . ', ' . $orderby : $search_orderby;
+			$search_orderby = apply_filters('posts_search_orderby', $search_orderby, $this);
+			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 ( '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'";
@@ -3005,58 +3005,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 .= ')';
@@ -3066,7 +3066,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.
 			 *
@@ -3075,7 +3075,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.
@@ -3085,27 +3085,27 @@ 
 			 * @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 ( empty($q['offset']) ) {
-				$pgstrt = absint( ( $page - 1 ) * $q['posts_per_page'] ) . ', ';
+			if (empty($q['offset'])) {
+				$pgstrt = absint(($page - 1) * $q['posts_per_page']).', ';
 			} else { // we're ignoring $page and using 'offset'
 				$q['offset'] = absint($q['offset']);
-				$pgstrt = $q['offset'] . ', ';
+				$pgstrt = $q['offset'].', ';
 			}
-			$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";
@@ -3115,7 +3115,7 @@ 
 				$cgroupby = '';
 			}
 
-			if ( !$q['suppress_filters'] ) {
+			if ( ! $q['suppress_filters']) {
 				/**
 				 * Filter the JOIN clause of the comments feed query before sending.
 				 *
@@ -3124,7 +3124,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.
@@ -3134,7 +3134,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.
@@ -3144,7 +3144,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.
@@ -3154,7 +3154,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.
@@ -3164,34 +3164,34 @@ 
 				 * @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 : '';
 
 			$this->comments = (array) $wpdb->get_results("SELECT $distinct $wpdb->comments.* FROM $wpdb->comments $cjoin $cwhere $cgroupby $corderby $climits");
 			$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.
 			 *
@@ -3202,7 +3202,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.
@@ -3212,7 +3212,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.
@@ -3224,7 +3224,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.
@@ -3234,7 +3234,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.
@@ -3244,7 +3244,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.
@@ -3254,7 +3254,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.
@@ -3264,7 +3264,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.
@@ -3277,15 +3277,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'] : '';
 		}
 
 		/**
@@ -3297,13 +3297,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.
 			 *
@@ -3314,7 +3314,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.
@@ -3326,7 +3326,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.
@@ -3338,7 +3338,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.
@@ -3350,7 +3350,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.
@@ -3362,7 +3362,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.
@@ -3374,7 +3374,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.
@@ -3386,7 +3386,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.
@@ -3401,29 +3401,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.
 			 *
@@ -3432,35 +3432,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.
@@ -3474,9 +3474,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";
@@ -3489,27 +3489,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.
 			 *
@@ -3518,26 +3518,26 @@ 
 			 * @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";
 			$this->comments = $wpdb->get_results($comments_request);
@@ -3545,29 +3545,29 @@ 
 		}
 
 		// 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]);
 			$post_status_obj = get_post_status_object($status);
 			//$type = get_post_type($this->posts[0]);
 
 			// 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();
@@ -3575,7 +3575,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.
 				 *
@@ -3584,18 +3584,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);
@@ -3605,31 +3605,31 @@ 
 					$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 ( ! $q['suppress_filters'] ) {
+		if ( ! $q['suppress_filters']) {
 			/**
 			 * Filter the array of retrieved posts after they've been fetched and
 			 * internally processed.
@@ -3639,20 +3639,20 @@ 
 			 * @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();
@@ -3670,15 +3670,15 @@ 
 	 *
 	 * @global wpdb $wpdb
 	 */
-	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.
 			 *
@@ -3687,9 +3687,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);
 		}
 
 		/**
@@ -3700,10 +3700,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']);
 	}
 
 	/**
@@ -3737,7 +3737,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.
 			 *
@@ -3745,10 +3745,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);
 	}
 
 	/**
@@ -3762,9 +3762,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.
 			 *
@@ -3772,7 +3772,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();
 		}
@@ -3789,7 +3789,7 @@ 
 	 */
 	public function rewind_posts() {
 		$this->current_post = -1;
-		if ( $this->post_count > 0 ) {
+		if ($this->post_count > 0) {
 			$this->post = $this->posts[0];
 		}
 	}
@@ -3821,13 +3821,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');
 		}
 	}
 
@@ -3842,9 +3842,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();
 		}
 
@@ -3859,7 +3859,7 @@ 
 	 */
 	public function rewind_comments() {
 		$this->current_comment = -1;
-		if ( $this->comment_count > 0 ) {
+		if ($this->comment_count > 0) {
 			$this->comment = $this->comments[0];
 		}
 	}
@@ -3873,9 +3873,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();
 	}
 
@@ -3892,66 +3892,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 = 0;
 
-		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;
@@ -3968,7 +3968,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;
 		}
 
@@ -3986,7 +3986,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);
 		}
 	}
@@ -4000,8 +4000,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;
 		}
 	}
@@ -4015,9 +4015,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);
 		}
 	}
 
@@ -4031,9 +4031,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;
 	}
@@ -4059,16 +4059,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);
 	}
 
 	/**
@@ -4079,12 +4079,12 @@ 
 	 * @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;
 		}
 
@@ -4092,11 +4092,11 @@ 
 
 		$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;
@@ -4113,22 +4113,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) $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;
@@ -4145,22 +4145,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) $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;
@@ -4177,22 +4177,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) $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;
@@ -4216,32 +4216,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
-			) );
+			));
 	}
 
 	/**
@@ -4285,13 +4285,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);
 	}
 
 	/**
@@ -4323,9 +4323,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;
@@ -4376,31 +4376,31 @@ 
 	 * @param mixed $page Page ID, title, slug, path, or array of such.
 	 * @return bool
 	 */
-	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) $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;
 				}
 			}
@@ -4469,31 +4469,31 @@ 
 	 * @param mixed $post Post ID, title, slug, path, or array of such.
 	 * @return bool
 	 */
-	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) $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;
 				}
 			}
@@ -4515,13 +4515,13 @@ 
 	 * @param mixed $post_types Optional. Post Type or array of Post Types
 	 * @return bool
 	 */
-	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);
 	}
 
 	/**
@@ -4600,7 +4600,7 @@ 
 	 * @param WP_Post $post Post data.
 	 * @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;
 
 		$id = (int) $post->ID;
@@ -4611,40 +4611,40 @@ 
 		$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-->' ) ) {
-			if ( $page > 1 )
+		if (false !== strpos($content, '<!--nextpage-->')) {
+			if ($page > 1)
 				$more = 1;
-			$content = str_replace( "\n<!--nextpage-->\n", '<!--nextpage-->', $content );
-			$content = str_replace( "\n<!--nextpage-->", '<!--nextpage-->', $content );
-			$content = str_replace( "<!--nextpage-->\n", '<!--nextpage-->', $content );
+			$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);
 			$numpages = count($pages);
-			if ( $numpages > 1 )
+			if ($numpages > 1)
 				$multipage = 1;
 		} else {
-			$pages = array( $post->post_content );
+			$pages = array($post->post_content);
 		}
 
 		/**
@@ -4656,7 +4656,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;
 	}
@@ -4669,9 +4669,9 @@ 
 	 * @global WP_Post $post
 	 */
 	public function reset_postdata() {
-		if ( ! empty( $this->post ) ) {
+		if ( ! empty($this->post)) {
 			$GLOBALS['post'] = $this->post;
-			setup_postdata( $this->post );
+			setup_postdata($this->post);
 		}
 	}
 }
@@ -4688,49 +4688,49 @@ 
  */
 function wp_old_slug_redirect() {
 	global $wp_query;
-	if ( is_404() && '' != $wp_query->query_vars['name'] ) :
+	if (is_404() && '' != $wp_query->query_vars['name']) :
 		global $wpdb;
 
 		// Guess the current post_type based on the query vars.
-		if ( get_query_var('post_type') )
+		if (get_query_var('post_type'))
 			$post_type = get_query_var('post_type');
-		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);
 
-		if ( !$link )
+		if ( ! $link)
 			return;
 
-		wp_redirect( $link, 301 ); // Permanent redirect
+		wp_redirect($link, 301); // Permanent redirect
 		exit;
 	endif;
 }
@@ -4745,11 +4745,11 @@ 
  * @param object $post Post data.
  * @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 +464 added lines, -320 removed lines

@@ -1430,8 +1430,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',
@@ -1439,8 +1440,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;
 	}
@@ -1562,8 +1564,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']);
@@ -1577,10 +1580,18 @@ 
 		$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'] );
-		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 ) ) {
@@ -1588,10 +1599,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']);
 
@@ -1707,37 +1720,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['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 ( '' != $qv['comments_popup'] )
-			$this->is_comments_popup = true;
+		if ( '' != $qv['comments_popup'] ) {
+					$this->is_comments_popup = 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']);
@@ -1746,18 +1768,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 || $this->is_trackback || $this->is_404 || $this->is_admin || $this->is_comments_popup || $this->is_robots ) )
-			$this->is_home = true;
+		if ( !( $this->is_singular || $this->is_archive || $this->is_search || $this->is_feed || $this->is_trackback || $this->is_404 || $this->is_admin || $this->is_comments_popup || $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']);
+			}
 			if ( empty($_query) || !array_diff( array_keys($_query), array('preview', 'page', 'paged', 'cpage') ) ) {
 				$this->is_page = true;
 				$this->is_home = false;
@@ -1772,10 +1797,11 @@ 
 
 		if ( '' != $qv['pagename'] ) {
 			$this->queried_object = get_page_by_path($qv['pagename']);
-			if ( !empty($this->queried_object) )
-				$this->queried_object_id = (int) $this->queried_object->ID;
-			else
-				unset($this->queried_object);
+			if ( !empty($this->queried_object) ) {
+							$this->queried_object_id = (int) $this->queried_object->ID;
+			} else {
+							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') ) {
 				$this->is_page = false;
@@ -1793,27 +1819,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->query_vars_hash = md5( serialize( $this->query_vars ) );
 		$this->query_vars_changed = false;
@@ -1854,8 +1884,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(
@@ -1897,10 +1929,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 ) ) {
@@ -1926,8 +1959,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'] );
 		}
@@ -2064,8 +2098,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;
@@ -2076,8 +2111,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'] );
 			}
@@ -2099,8 +2135,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;
@@ -2126,17 +2163,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.
-			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;
 		}
@@ -2152,8 +2192,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
@@ -2165,8 +2206,9 @@ 
 		$stopwords = array();
 		foreach( $words as $word ) {
 			$word = trim( $word, "\r\n\t " );
-			if ( $word )
-				$stopwords[] = $word;
+			if ( $word ) {
+							$stopwords[] = $word;
+			}
 		}
 
 		/**
@@ -2205,8 +2247,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'
@@ -2435,34 +2478,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'] ) ) {
@@ -2472,8 +2522,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;
@@ -2492,13 +2543,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;
@@ -2512,10 +2565,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':
@@ -2528,47 +2582,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 ) );
@@ -2587,8 +2654,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'.
@@ -2616,21 +2684,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');
@@ -2655,12 +2726,14 @@ 
 			$where .= " AND $wpdb->posts.post_name IN ('" . implode( "' ,'", $q['post_name__in'] ) . "')";
 		}
 
-		if ( intval($q['comments_popup']) )
-			$q['p'] = absint($q['comments_popup']);
+		if ( intval($q['comments_popup']) ) {
+					$q['p'] = absint($q['comments_popup']);
+		}
 
 		// 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'] ) {
@@ -2722,13 +2795,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) ) {
@@ -2826,15 +2901,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;
 
@@ -2909,8 +2986,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 );
+			}
 
 			/**
 			 * Filter the ORDER BY used when ordering search results.
@@ -2921,18 +2999,21 @@ 
 			 * @param WP_Query $this           The current WP_Query instance.
 			 */
 			$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'] ) ) {
@@ -2946,10 +3027,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 ) ) {
@@ -2983,8 +3065,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();
@@ -2997,10 +3080,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'";
+						}
 					}
 				}
 			}
@@ -3014,21 +3098,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 ) ) {
@@ -3040,23 +3127,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 .= ')';
@@ -3091,8 +3182,9 @@ 
 		// Paging
 		if ( empty($q['nopaging']) && !$this->is_singular ) {
 			$page = absint($q['paged']);
-			if ( !$page )
-				$page = 1;
+			if ( !$page ) {
+							$page = 1;
+			}
 
 			if ( empty($q['offset']) ) {
 				$pgstrt = absint( ( $page - 1 ) * $q['posts_per_page'] ) . ', ';
@@ -3174,15 +3266,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' );
@@ -3412,14 +3506,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";
 
@@ -3506,8 +3603,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'] ) {
 			/**
@@ -3563,12 +3661,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();
 					}
@@ -3610,8 +3710,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) ) {
@@ -3649,8 +3750,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 {
@@ -3675,8 +3777,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 ) ) {
 			/**
@@ -3702,8 +3805,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'] );
+		}
 	}
 
 	/**
@@ -3737,7 +3841,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.
 			 *
@@ -3746,6 +3851,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 );
@@ -3892,8 +3998,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 = 0;
@@ -3934,13 +4041,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');
@@ -4060,12 +4169,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 );
@@ -4114,22 +4225,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) $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;
 	}
@@ -4146,22 +4260,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) $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;
 	}
@@ -4178,22 +4295,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) $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;
 	}
@@ -4219,23 +4339,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(
@@ -4286,11 +4410,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 );
 	}
 
@@ -4323,12 +4449,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;
+		}
 	}
 
 	/**
@@ -4377,11 +4504,13 @@ 
 	 * @return bool
 	 */
 	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();
 
@@ -4470,11 +4599,13 @@ 
 	 * @return bool
 	 */
 	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();
 
@@ -4516,8 +4647,9 @@ 
 	 * @return bool
 	 */
 	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();
 
@@ -4612,8 +4744,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,
@@ -4629,20 +4762,23 @@ 
 
 		$content = $post->post_content;
 		if ( false !== strpos( $content, '<!--nextpage-->' ) ) {
-			if ( $page > 1 )
-				$more = 1;
+			if ( $page > 1 ) {
+							$more = 1;
+			}
 			$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);
 			$numpages = count($pages);
-			if ( $numpages > 1 )
-				$multipage = 1;
+			if ( $numpages > 1 ) {
+							$multipage = 1;
+			}
 		} else {
 			$pages = array( $post->post_content );
 		}
@@ -4692,43 +4828,51 @@ 
 		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 ( !empty($wp_query->query_vars['pagename']) )
-			$post_type = 'page';
-		else
-			$post_type = 'post';
+		if ( get_query_var('post_type') ) {
+					$post_type = get_query_var('post_type');
+		} elseif ( !empty($wp_query->query_vars['pagename']) ) {
+					$post_type = 'page';
+		} else {
+					$post_type = 'post';
+		}
 
 		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);
 
-		if ( !$link )
-			return;
+		if ( !$link ) {
+					return;
+		}
 
 		wp_redirect( $link, 301 ); // Permanent redirect
 		exit;

src/wp-includes/revision.php

Doc Comments +2 added lines, -2 removed lines

@@ -411,7 +411,7 @@ 
  *
  * @since 2.6.0
  *
- * @param int|WP_Post $post_id Optional. Post ID or WP_Post object. Default is global $post.
+ * @param integer $post_id Optional. Post ID or WP_Post object. Default is global $post.
  * @return array An array of revisions, or an empty array if none.
  */
 function wp_get_post_revisions( $post_id = 0, $args = null ) {
@@ -489,7 +489,7 @@ 
  * @access private
  *
  * @param WP_Post $post
- * @return WP_Post|false
+ * @return WP_Post
  */
 function _set_preview( $post ) {
 	if ( ! is_object( $post ) ) {

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * Post revision functions.
- *
- * @package WordPress
- * @subpackage Post_Revisions
- */
+	 * Post revision functions.
+	 *
+	 * @package WordPress
+	 * @subpackage Post_Revisions
+	 */
 
 /**
  * Determines which fields of posts are to be saved in revisions.

Spacing +137 added lines, -137 removed lines

@@ -22,15 +22,15 @@ 
  * @param bool  $autosave Optional. Is the revision an autosave?
  * @return array Post array ready to be inserted as a post revision or array of fields that can be versioned.
  */
-function _wp_post_revision_fields( $post = null, $autosave = false ) {
+function _wp_post_revision_fields($post = null, $autosave = false) {
 	static $fields = null;
 
-	if ( is_null( $fields ) ) {
+	if (is_null($fields)) {
 		// Allow these to be versioned
 		$fields = array(
-			'post_title' => __( 'Title' ),
-			'post_content' => __( 'Content' ),
-			'post_excerpt' => __( 'Excerpt' ),
+			'post_title' => __('Title'),
+			'post_content' => __('Content'),
+			'post_excerpt' => __('Excerpt'),
 		);
 
 		/**
@@ -47,18 +47,18 @@ 
 		 * @param array $fields List of fields to revision. Contains 'post_title',
 		 *                      'post_content', and 'post_excerpt' by default.
 		 */
-		$fields = apply_filters( '_wp_post_revision_fields', $fields );
+		$fields = apply_filters('_wp_post_revision_fields', $fields);
 
 		// WP uses these internally either in versioning or elsewhere - they cannot be versioned
-		foreach ( array( 'ID', 'post_name', 'post_parent', 'post_date', 'post_date_gmt', 'post_status', 'post_type', 'comment_count', 'post_author' ) as $protect )
-			unset( $fields[$protect] );
+		foreach (array('ID', 'post_name', 'post_parent', 'post_date', 'post_date_gmt', 'post_status', 'post_type', 'comment_count', 'post_author') as $protect)
+			unset($fields[$protect]);
 	}
 
-	if ( !is_array($post) )
+	if ( ! is_array($post))
 		return $fields;
 
 	$return = array();
-	foreach ( array_intersect( array_keys( $post ), array_keys( $fields ) ) as $field )
+	foreach (array_intersect(array_keys($post), array_keys($fields)) as $field)
 		$return[$field] = $post[$field];
 
 	$return['post_parent']   = $post['ID'];
@@ -82,29 +82,29 @@ 
  * @param int $post_id The ID of the post to save as a revision.
  * @return int|WP_Error|void Void or 0 if error, new revision ID, if success.
  */
-function wp_save_post_revision( $post_id ) {
-	if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE )
+function wp_save_post_revision($post_id) {
+	if (defined('DOING_AUTOSAVE') && DOING_AUTOSAVE)
 		return;
 
-	if ( ! $post = get_post( $post_id ) )
+	if ( ! $post = get_post($post_id))
 		return;
 
-	if ( ! post_type_supports( $post->post_type, 'revisions' ) )
+	if ( ! post_type_supports($post->post_type, 'revisions'))
 		return;
 
-	if ( 'auto-draft' == $post->post_status )
+	if ('auto-draft' == $post->post_status)
 		return;
 
-	if ( ! wp_revisions_enabled( $post ) )
+	if ( ! wp_revisions_enabled($post))
 		return;
 
 	// Compare the proposed update with the last stored revision verifying that
 	// they are different, unless a plugin tells us to always save regardless.
 	// If no previous revisions, save one
-	if ( $revisions = wp_get_post_revisions( $post_id ) ) {
+	if ($revisions = wp_get_post_revisions($post_id)) {
 		// grab the last revision, but not an autosave
-		foreach ( $revisions as $revision ) {
-			if ( false !== strpos( $revision->post_name, "{$revision->post_parent}-revision" ) ) {
+		foreach ($revisions as $revision) {
+			if (false !== strpos($revision->post_name, "{$revision->post_parent}-revision")) {
 				$last_revision = $revision;
 				break;
 			}
@@ -124,11 +124,11 @@ 
 		 * @param WP_Post $post              The post object.
 		 *
 		 */
-		if ( isset( $last_revision ) && apply_filters( 'wp_save_post_revision_check_for_changes', $check_for_changes = true, $last_revision, $post ) ) {
+		if (isset($last_revision) && apply_filters('wp_save_post_revision_check_for_changes', $check_for_changes = true, $last_revision, $post)) {
 			$post_has_changed = false;
 
-			foreach ( array_keys( _wp_post_revision_fields() ) as $field ) {
-				if ( normalize_whitespace( $post->$field ) != normalize_whitespace( $last_revision->$field ) ) {
+			foreach (array_keys(_wp_post_revision_fields()) as $field) {
+				if (normalize_whitespace($post->$field) != normalize_whitespace($last_revision->$field)) {
 					$post_has_changed = true;
 					break;
 				}
@@ -147,38 +147,38 @@ 
 			 * @param WP_Post $post             The post object.
 			 *
 			 */
-			$post_has_changed = (bool) apply_filters( 'wp_save_post_revision_post_has_changed', $post_has_changed, $last_revision, $post );
+			$post_has_changed = (bool) apply_filters('wp_save_post_revision_post_has_changed', $post_has_changed, $last_revision, $post);
 
 			//don't save revision if post unchanged
-			if ( ! $post_has_changed ) {
+			if ( ! $post_has_changed) {
 				return;
 			}
 		}
 	}
 
-	$return = _wp_put_post_revision( $post );
+	$return = _wp_put_post_revision($post);
 
 	// If a limit for the number of revisions to keep has been set,
 	// delete the oldest ones.
-	$revisions_to_keep = wp_revisions_to_keep( $post );
+	$revisions_to_keep = wp_revisions_to_keep($post);
 
-	if ( $revisions_to_keep < 0 )
+	if ($revisions_to_keep < 0)
 		return $return;
 
-	$revisions = wp_get_post_revisions( $post_id, array( 'order' => 'ASC' ) );
+	$revisions = wp_get_post_revisions($post_id, array('order' => 'ASC'));
 
 	$delete = count($revisions) - $revisions_to_keep;
 
-	if ( $delete < 1 )
+	if ($delete < 1)
 		return $return;
 
-	$revisions = array_slice( $revisions, 0, $delete );
+	$revisions = array_slice($revisions, 0, $delete);
 
-	for ( $i = 0; isset( $revisions[$i] ); $i++ ) {
-		if ( false !== strpos( $revisions[ $i ]->post_name, 'autosave' ) )
+	for ($i = 0; isset($revisions[$i]); $i++) {
+		if (false !== strpos($revisions[$i]->post_name, 'autosave'))
 			continue;
 
-		wp_delete_post_revision( $revisions[ $i ]->ID );
+		wp_delete_post_revision($revisions[$i]->ID);
 	}
 
 	return $return;
@@ -197,12 +197,12 @@ 
  * @param int $user_id Optional The post author ID.
  * @return WP_Post|false The autosaved data or false on failure or when no autosave exists.
  */
-function wp_get_post_autosave( $post_id, $user_id = 0 ) {
-	$revisions = wp_get_post_revisions( $post_id, array( 'check_enabled' => false ) );
+function wp_get_post_autosave($post_id, $user_id = 0) {
+	$revisions = wp_get_post_revisions($post_id, array('check_enabled' => false));
 
-	foreach ( $revisions as $revision ) {
-		if ( false !== strpos( $revision->post_name, "{$post_id}-autosave" ) ) {
-			if ( $user_id && $user_id != $revision->post_author )
+	foreach ($revisions as $revision) {
+		if (false !== strpos($revision->post_name, "{$post_id}-autosave")) {
+			if ($user_id && $user_id != $revision->post_author)
 				continue;
 
 			return $revision;
@@ -220,8 +220,8 @@ 
  * @param int|WP_Post $post Post ID or post object.
  * @return false|int False if not a revision, ID of revision's parent otherwise.
  */
-function wp_is_post_revision( $post ) {
-	if ( !$post = wp_get_post_revision( $post ) )
+function wp_is_post_revision($post) {
+	if ( ! $post = wp_get_post_revision($post))
 		return false;
 
 	return (int) $post->post_parent;
@@ -235,11 +235,11 @@ 
  * @param int|WP_Post $post Post ID or post object.
  * @return false|int False if not a revision, ID of autosave's parent otherwise
  */
-function wp_is_post_autosave( $post ) {
-	if ( !$post = wp_get_post_revision( $post ) )
+function wp_is_post_autosave($post) {
+	if ( ! $post = wp_get_post_revision($post))
 		return false;
 
-	if ( false !== strpos( $post->post_name, "{$post->post_parent}-autosave" ) )
+	if (false !== strpos($post->post_name, "{$post->post_parent}-autosave"))
 		return (int) $post->post_parent;
 
 	return false;
@@ -255,26 +255,26 @@ 
  * @param bool                   $autosave Optional. Is the revision an autosave?
  * @return int|WP_Error WP_Error or 0 if error, new revision ID if success.
  */
-function _wp_put_post_revision( $post = null, $autosave = false ) {
-	if ( is_object($post) )
-		$post = get_object_vars( $post );
-	elseif ( !is_array($post) )
+function _wp_put_post_revision($post = null, $autosave = false) {
+	if (is_object($post))
+		$post = get_object_vars($post);
+	elseif ( ! is_array($post))
 		$post = get_post($post, ARRAY_A);
 
-	if ( ! $post || empty($post['ID']) )
-		return new WP_Error( 'invalid_post', __( 'Invalid post ID.' ) );
+	if ( ! $post || empty($post['ID']))
+		return new WP_Error('invalid_post', __('Invalid post ID.'));
 
-	if ( isset($post['post_type']) && 'revision' == $post['post_type'] )
-		return new WP_Error( 'post_type', __( 'Cannot create a revision of a revision' ) );
+	if (isset($post['post_type']) && 'revision' == $post['post_type'])
+		return new WP_Error('post_type', __('Cannot create a revision of a revision'));
 
-	$post = _wp_post_revision_fields( $post, $autosave );
+	$post = _wp_post_revision_fields($post, $autosave);
 	$post = wp_slash($post); //since data is from db
 
-	$revision_id = wp_insert_post( $post );
-	if ( is_wp_error($revision_id) )
+	$revision_id = wp_insert_post($post);
+	if (is_wp_error($revision_id))
 		return $revision_id;
 
-	if ( $revision_id ) {
+	if ($revision_id) {
 		/**
 		 * Fires once a revision has been saved.
 		 *
@@ -282,7 +282,7 @@ 
 		 *
 		 * @param int $revision_id Post revision ID.
 		 */
-		do_action( '_wp_put_post_revision', $revision_id );
+		do_action('_wp_put_post_revision', $revision_id);
 	}
 
 	return $revision_id;
@@ -299,17 +299,17 @@ 
  * @return WP_Post|array|null Null if error or post object if success.
  */
 function wp_get_post_revision(&$post, $output = OBJECT, $filter = 'raw') {
-	if ( !$revision = get_post( $post, OBJECT, $filter ) )
+	if ( ! $revision = get_post($post, OBJECT, $filter))
 		return $revision;
-	if ( 'revision' !== $revision->post_type )
+	if ('revision' !== $revision->post_type)
 		return null;
 
-	if ( $output == OBJECT ) {
+	if ($output == OBJECT) {
 		return $revision;
-	} elseif ( $output == ARRAY_A ) {
+	} elseif ($output == ARRAY_A) {
 		$_revision = get_object_vars($revision);
 		return $_revision;
-	} elseif ( $output == ARRAY_N ) {
+	} elseif ($output == ARRAY_N) {
 		$_revision = array_values(get_object_vars($revision));
 		return $_revision;
 	}
@@ -328,27 +328,27 @@ 
  * @param array       $fields      Optional. What fields to restore from. Defaults to all.
  * @return int|false|null Null if error, false if no fields to restore, (int) post ID if success.
  */
-function wp_restore_post_revision( $revision_id, $fields = null ) {
-	if ( !$revision = wp_get_post_revision( $revision_id, ARRAY_A ) )
+function wp_restore_post_revision($revision_id, $fields = null) {
+	if ( ! $revision = wp_get_post_revision($revision_id, ARRAY_A))
 		return $revision;
 
-	if ( !is_array( $fields ) )
-		$fields = array_keys( _wp_post_revision_fields() );
+	if ( ! is_array($fields))
+		$fields = array_keys(_wp_post_revision_fields());
 
 	$update = array();
-	foreach( array_intersect( array_keys( $revision ), $fields ) as $field ) {
+	foreach (array_intersect(array_keys($revision), $fields) as $field) {
 		$update[$field] = $revision[$field];
 	}
 
-	if ( !$update )
+	if ( ! $update)
 		return false;
 
 	$update['ID'] = $revision['post_parent'];
 
-	$update = wp_slash( $update ); //since data is from db
+	$update = wp_slash($update); //since data is from db
 
-	$post_id = wp_update_post( $update );
-	if ( ! $post_id || is_wp_error( $post_id ) )
+	$post_id = wp_update_post($update);
+	if ( ! $post_id || is_wp_error($post_id))
 		return $post_id;
 
 	// Add restore from details
@@ -357,10 +357,10 @@ 
 		'restored_by_user'     => get_current_user_id(),
 		'restored_time'        => time()
 	);
-	update_post_meta( $post_id, '_post_restored_from', $restore_details );
+	update_post_meta($post_id, '_post_restored_from', $restore_details);
 
 	// Update last edit user
-	update_post_meta( $post_id, '_edit_last', get_current_user_id() );
+	update_post_meta($post_id, '_edit_last', get_current_user_id());
 
 	/**
 	 * Fires after a post revision has been restored.
@@ -370,7 +370,7 @@ 
 	 * @param int $post_id     Post ID.
 	 * @param int $revision_id Post revision ID.
 	 */
-	do_action( 'wp_restore_post_revision', $post_id, $revision['ID'] );
+	do_action('wp_restore_post_revision', $post_id, $revision['ID']);
 
 	return $post_id;
 }
@@ -385,13 +385,13 @@ 
  * @param int|WP_Post $revision_id Revision ID or revision object.
  * @return array|false|WP_Post|WP_Error|null Null or WP_Error if error, deleted post if success.
  */
-function wp_delete_post_revision( $revision_id ) {
-	if ( ! $revision = wp_get_post_revision( $revision_id ) ) {
+function wp_delete_post_revision($revision_id) {
+	if ( ! $revision = wp_get_post_revision($revision_id)) {
 		return $revision;
 	}
 
-	$delete = wp_delete_post( $revision->ID );
-	if ( $delete ) {
+	$delete = wp_delete_post($revision->ID);
+	if ($delete) {
 		/**
 		 * Fires once a post revision has been deleted.
 		 *
@@ -400,7 +400,7 @@ 
 		 * @param int          $revision_id Post revision ID.
 		 * @param object|array $revision    Post revision object or array.
 		 */
-		do_action( 'wp_delete_post_revision', $revision->ID, $revision );
+		do_action('wp_delete_post_revision', $revision->ID, $revision);
 	}
 
 	return $delete;
@@ -414,20 +414,20 @@ 
  * @param int|WP_Post $post_id Optional. Post ID or WP_Post object. Default is global $post.
  * @return array An array of revisions, or an empty array if none.
  */
-function wp_get_post_revisions( $post_id = 0, $args = null ) {
-	$post = get_post( $post_id );
-	if ( ! $post || empty( $post->ID ) )
+function wp_get_post_revisions($post_id = 0, $args = null) {
+	$post = get_post($post_id);
+	if ( ! $post || empty($post->ID))
 		return array();
 
-	$defaults = array( 'order' => 'DESC', 'orderby' => 'date ID', 'check_enabled' => true );
-	$args = wp_parse_args( $args, $defaults );
+	$defaults = array('order' => 'DESC', 'orderby' => 'date ID', 'check_enabled' => true);
+	$args = wp_parse_args($args, $defaults);
 
-	if ( $args['check_enabled'] && ! wp_revisions_enabled( $post ) )
+	if ($args['check_enabled'] && ! wp_revisions_enabled($post))
 		return array();
 
-	$args = array_merge( $args, array( 'post_parent' => $post->ID, 'post_type' => 'revision', 'post_status' => 'inherit' ) );
+	$args = array_merge($args, array('post_parent' => $post->ID, 'post_type' => 'revision', 'post_status' => 'inherit'));
 
-	if ( ! $revisions = get_children( $args ) )
+	if ( ! $revisions = get_children($args))
 		return array();
 
 	return $revisions;
@@ -441,8 +441,8 @@ 
  * @param WP_Post $post The post object.
  * @return bool True if number of revisions to keep isn't zero, false otherwise.
  */
-function wp_revisions_enabled( $post ) {
-	return wp_revisions_to_keep( $post ) !== 0;
+function wp_revisions_enabled($post) {
+	return wp_revisions_to_keep($post) !== 0;
 }
 
 /**
@@ -458,15 +458,15 @@ 
  * @param WP_Post $post The post object.
  * @return int The number of revisions to keep.
  */
-function wp_revisions_to_keep( $post ) {
+function wp_revisions_to_keep($post) {
 	$num = WP_POST_REVISIONS;
 
-	if ( true === $num )
+	if (true === $num)
 		$num = -1;
 	else
-		$num = intval( $num );
+		$num = intval($num);
 
-	if ( ! post_type_supports( $post->post_type, 'revisions' ) )
+	if ( ! post_type_supports($post->post_type, 'revisions'))
 		$num = 0;
 
 	/**
@@ -479,7 +479,7 @@ 
 	 * @param int     $num  Number of revisions to store.
 	 * @param WP_Post $post Post object.
 	 */
-	return (int) apply_filters( 'wp_revisions_to_keep', $num, $post );
+	return (int) apply_filters('wp_revisions_to_keep', $num, $post);
 }
 
 /**
@@ -491,23 +491,23 @@ 
  * @param WP_Post $post
  * @return WP_Post|false
  */
-function _set_preview( $post ) {
-	if ( ! is_object( $post ) ) {
+function _set_preview($post) {
+	if ( ! is_object($post)) {
 		return $post;
 	}
 
-	$preview = wp_get_post_autosave( $post->ID );
-	if ( ! is_object( $preview ) ) {
+	$preview = wp_get_post_autosave($post->ID);
+	if ( ! is_object($preview)) {
 		return $post;
 	}
 
-	$preview = sanitize_post( $preview );
+	$preview = sanitize_post($preview);
 
 	$post->post_content = $preview->post_content;
 	$post->post_title = $preview->post_title;
 	$post->post_excerpt = $preview->post_excerpt;
 
-	add_filter( 'get_the_terms', '_wp_preview_terms_filter', 10, 3 );
+	add_filter('get_the_terms', '_wp_preview_terms_filter', 10, 3);
 
 	return $post;
 }
@@ -519,11 +519,11 @@ 
  * @access private
  */
 function _show_post_preview() {
-	if ( isset($_GET['preview_id']) && isset($_GET['preview_nonce']) ) {
+	if (isset($_GET['preview_id']) && isset($_GET['preview_nonce'])) {
 		$id = (int) $_GET['preview_id'];
 
-		if ( false === wp_verify_nonce( $_GET['preview_nonce'], 'post_preview_' . $id ) )
-			wp_die( __('You do not have permission to preview drafts.') );
+		if (false === wp_verify_nonce($_GET['preview_nonce'], 'post_preview_'.$id))
+			wp_die(__('You do not have permission to preview drafts.'));
 
 		add_filter('the_preview', '_set_preview');
 	}
@@ -540,17 +540,17 @@ 
  * @param string $taxonomy
  * @return array
  */
-function _wp_preview_terms_filter( $terms, $post_id, $taxonomy ) {
-	if ( ! $post = get_post() )
+function _wp_preview_terms_filter($terms, $post_id, $taxonomy) {
+	if ( ! $post = get_post())
 		return $terms;
 
-	if ( empty( $_REQUEST['post_format'] ) || $post->ID != $post_id || 'post_format' != $taxonomy || 'revision' == $post->post_type )
+	if (empty($_REQUEST['post_format']) || $post->ID != $post_id || 'post_format' != $taxonomy || 'revision' == $post->post_type)
 		return $terms;
 
-	if ( 'standard' == $_REQUEST['post_format'] )
+	if ('standard' == $_REQUEST['post_format'])
 		$terms = array();
-	elseif ( $term = get_term_by( 'slug', 'post-format-' . sanitize_key( $_REQUEST['post_format'] ), 'post_format' ) )
-		$terms = array( $term ); // Can only have one post format
+	elseif ($term = get_term_by('slug', 'post-format-'.sanitize_key($_REQUEST['post_format']), 'post_format'))
+		$terms = array($term); // Can only have one post format
 
 	return $terms;
 }
@@ -564,13 +564,13 @@ 
  * @param WP_Post $revision
  * @return int|false
  */
-function _wp_get_post_revision_version( $revision ) {
-	if ( is_object( $revision ) )
-		$revision = get_object_vars( $revision );
-	elseif ( !is_array( $revision ) )
+function _wp_get_post_revision_version($revision) {
+	if (is_object($revision))
+		$revision = get_object_vars($revision);
+	elseif ( ! is_array($revision))
 		return false;
 
-	if ( preg_match( '/^\d+-(?:autosave|revision)-v(\d+)$/', $revision['post_name'], $matches ) )
+	if (preg_match('/^\d+-(?:autosave|revision)-v(\d+)$/', $revision['post_name'], $matches))
 		return (int) $matches[1];
 
 	return 0;
@@ -588,23 +588,23 @@ 
  * @param array   $revisions Current revisions of the post
  * @return bool true if the revisions were upgraded, false if problems
  */
-function _wp_upgrade_revisions_of_post( $post, $revisions ) {
+function _wp_upgrade_revisions_of_post($post, $revisions) {
 	global $wpdb;
 
 	// Add post option exclusively
 	$lock = "revision-upgrade-{$post->ID}";
 	$now = time();
-	$result = $wpdb->query( $wpdb->prepare( "INSERT IGNORE INTO `$wpdb->options` (`option_name`, `option_value`, `autoload`) VALUES (%s, %s, 'no') /* LOCK */", $lock, $now ) );
-	if ( ! $result ) {
+	$result = $wpdb->query($wpdb->prepare("INSERT IGNORE INTO `$wpdb->options` (`option_name`, `option_value`, `autoload`) VALUES (%s, %s, 'no') /* LOCK */", $lock, $now));
+	if ( ! $result) {
 		// If we couldn't get a lock, see how old the previous lock is
-		$locked = get_option( $lock );
-		if ( ! $locked ) {
+		$locked = get_option($lock);
+		if ( ! $locked) {
 			// Can't write to the lock, and can't read the lock.
 			// Something broken has happened
 			return false;
 		}
 
-		if ( $locked > $now - 3600 ) {
+		if ($locked > $now - 3600) {
 			// Lock is not too old: some other process may be upgrading this post.  Bail.
 			return false;
 		}
@@ -613,57 +613,57 @@ 
 	}
 
 	// If we could get a lock, re-"add" the option to fire all the correct filters.
-	update_option( $lock, $now );
+	update_option($lock, $now);
 
-	reset( $revisions );
+	reset($revisions);
 	$add_last = true;
 
 	do {
-		$this_revision = current( $revisions );
-		$prev_revision = next( $revisions );
+		$this_revision = current($revisions);
+		$prev_revision = next($revisions);
 
-		$this_revision_version = _wp_get_post_revision_version( $this_revision );
+		$this_revision_version = _wp_get_post_revision_version($this_revision);
 
 		// Something terrible happened
-		if ( false === $this_revision_version )
+		if (false === $this_revision_version)
 			continue;
 
 		// 1 is the latest revision version, so we're already up to date.
 		// No need to add a copy of the post as latest revision.
-		if ( 0 < $this_revision_version ) {
+		if (0 < $this_revision_version) {
 			$add_last = false;
 			continue;
 		}
 
 		// Always update the revision version
 		$update = array(
-			'post_name' => preg_replace( '/^(\d+-(?:autosave|revision))[\d-]*$/', '$1-v1', $this_revision->post_name ),
+			'post_name' => preg_replace('/^(\d+-(?:autosave|revision))[\d-]*$/', '$1-v1', $this_revision->post_name),
 		);
 
 		// If this revision is the oldest revision of the post, i.e. no $prev_revision,
 		// the correct post_author is probably $post->post_author, but that's only a good guess.
 		// Update the revision version only and Leave the author as-is.
-		if ( $prev_revision ) {
-			$prev_revision_version = _wp_get_post_revision_version( $prev_revision );
+		if ($prev_revision) {
+			$prev_revision_version = _wp_get_post_revision_version($prev_revision);
 
 			// If the previous revision is already up to date, it no longer has the information we need :(
-			if ( $prev_revision_version < 1 )
+			if ($prev_revision_version < 1)
 				$update['post_author'] = $prev_revision->post_author;
 		}
 
 		// Upgrade this revision
-		$result = $wpdb->update( $wpdb->posts, $update, array( 'ID' => $this_revision->ID ) );
+		$result = $wpdb->update($wpdb->posts, $update, array('ID' => $this_revision->ID));
 
-		if ( $result )
-			wp_cache_delete( $this_revision->ID, 'posts' );
+		if ($result)
+			wp_cache_delete($this_revision->ID, 'posts');
 
-	} while ( $prev_revision );
+	} while ($prev_revision);
 
-	delete_option( $lock );
+	delete_option($lock);
 
 	// Add a copy of the post as latest revision.
-	if ( $add_last )
-		wp_save_post_revision( $post->ID );
+	if ($add_last)
+		wp_save_post_revision($post->ID);
 
 	return true;
 }

Braces +129 added lines, -88 removed lines

@@ -50,16 +50,19 @@ 
 		$fields = apply_filters( '_wp_post_revision_fields', $fields );
 
 		// WP uses these internally either in versioning or elsewhere - they cannot be versioned
-		foreach ( array( 'ID', 'post_name', 'post_parent', 'post_date', 'post_date_gmt', 'post_status', 'post_type', 'comment_count', 'post_author' ) as $protect )
-			unset( $fields[$protect] );
+		foreach ( array( 'ID', 'post_name', 'post_parent', 'post_date', 'post_date_gmt', 'post_status', 'post_type', 'comment_count', 'post_author' ) as $protect ) {
+					unset( $fields[$protect] );
+		}
 	}
 
-	if ( !is_array($post) )
-		return $fields;
+	if ( !is_array($post) ) {
+			return $fields;
+	}
 
 	$return = array();
-	foreach ( array_intersect( array_keys( $post ), array_keys( $fields ) ) as $field )
-		$return[$field] = $post[$field];
+	foreach ( array_intersect( array_keys( $post ), array_keys( $fields ) ) as $field ) {
+			$return[$field] = $post[$field];
+	}
 
 	$return['post_parent']   = $post['ID'];
 	$return['post_status']   = 'inherit';
@@ -83,20 +86,25 @@ 
  * @return int|WP_Error|void Void or 0 if error, new revision ID, if success.
  */
 function wp_save_post_revision( $post_id ) {
-	if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE )
-		return;
+	if ( defined( 'DOING_AUTOSAVE' ) && DOING_AUTOSAVE ) {
+			return;
+	}
 
-	if ( ! $post = get_post( $post_id ) )
-		return;
+	if ( ! $post = get_post( $post_id ) ) {
+			return;
+	}
 
-	if ( ! post_type_supports( $post->post_type, 'revisions' ) )
-		return;
+	if ( ! post_type_supports( $post->post_type, 'revisions' ) ) {
+			return;
+	}
 
-	if ( 'auto-draft' == $post->post_status )
-		return;
+	if ( 'auto-draft' == $post->post_status ) {
+			return;
+	}
 
-	if ( ! wp_revisions_enabled( $post ) )
-		return;
+	if ( ! wp_revisions_enabled( $post ) ) {
+			return;
+	}
 
 	// Compare the proposed update with the last stored revision verifying that
 	// they are different, unless a plugin tells us to always save regardless.
@@ -162,21 +170,24 @@ 
 	// delete the oldest ones.
 	$revisions_to_keep = wp_revisions_to_keep( $post );
 
-	if ( $revisions_to_keep < 0 )
-		return $return;
+	if ( $revisions_to_keep < 0 ) {
+			return $return;
+	}
 
 	$revisions = wp_get_post_revisions( $post_id, array( 'order' => 'ASC' ) );
 
 	$delete = count($revisions) - $revisions_to_keep;
 
-	if ( $delete < 1 )
-		return $return;
+	if ( $delete < 1 ) {
+			return $return;
+	}
 
 	$revisions = array_slice( $revisions, 0, $delete );
 
 	for ( $i = 0; isset( $revisions[$i] ); $i++ ) {
-		if ( false !== strpos( $revisions[ $i ]->post_name, 'autosave' ) )
-			continue;
+		if ( false !== strpos( $revisions[ $i ]->post_name, 'autosave' ) ) {
+					continue;
+		}
 
 		wp_delete_post_revision( $revisions[ $i ]->ID );
 	}
@@ -202,8 +213,9 @@ 
 
 	foreach ( $revisions as $revision ) {
 		if ( false !== strpos( $revision->post_name, "{$post_id}-autosave" ) ) {
-			if ( $user_id && $user_id != $revision->post_author )
-				continue;
+			if ( $user_id && $user_id != $revision->post_author ) {
+							continue;
+			}
 
 			return $revision;
 		}
@@ -221,8 +233,9 @@ 
  * @return false|int False if not a revision, ID of revision's parent otherwise.
  */
 function wp_is_post_revision( $post ) {
-	if ( !$post = wp_get_post_revision( $post ) )
-		return false;
+	if ( !$post = wp_get_post_revision( $post ) ) {
+			return false;
+	}
 
 	return (int) $post->post_parent;
 }
@@ -236,11 +249,13 @@ 
  * @return false|int False if not a revision, ID of autosave's parent otherwise
  */
 function wp_is_post_autosave( $post ) {
-	if ( !$post = wp_get_post_revision( $post ) )
-		return false;
+	if ( !$post = wp_get_post_revision( $post ) ) {
+			return false;
+	}
 
-	if ( false !== strpos( $post->post_name, "{$post->post_parent}-autosave" ) )
-		return (int) $post->post_parent;
+	if ( false !== strpos( $post->post_name, "{$post->post_parent}-autosave" ) ) {
+			return (int) $post->post_parent;
+	}
 
 	return false;
 }
@@ -256,23 +271,27 @@ 
  * @return int|WP_Error WP_Error or 0 if error, new revision ID if success.
  */
 function _wp_put_post_revision( $post = null, $autosave = false ) {
-	if ( is_object($post) )
-		$post = get_object_vars( $post );
-	elseif ( !is_array($post) )
-		$post = get_post($post, ARRAY_A);
+	if ( is_object($post) ) {
+			$post = get_object_vars( $post );
+	} elseif ( !is_array($post) ) {
+			$post = get_post($post, ARRAY_A);
+	}
 
-	if ( ! $post || empty($post['ID']) )
-		return new WP_Error( 'invalid_post', __( 'Invalid post ID.' ) );
+	if ( ! $post || empty($post['ID']) ) {
+			return new WP_Error( 'invalid_post', __( 'Invalid post ID.' ) );
+	}
 
-	if ( isset($post['post_type']) && 'revision' == $post['post_type'] )
-		return new WP_Error( 'post_type', __( 'Cannot create a revision of a revision' ) );
+	if ( isset($post['post_type']) && 'revision' == $post['post_type'] ) {
+			return new WP_Error( 'post_type', __( 'Cannot create a revision of a revision' ) );
+	}
 
 	$post = _wp_post_revision_fields( $post, $autosave );
 	$post = wp_slash($post); //since data is from db
 
 	$revision_id = wp_insert_post( $post );
-	if ( is_wp_error($revision_id) )
-		return $revision_id;
+	if ( is_wp_error($revision_id) ) {
+			return $revision_id;
+	}
 
 	if ( $revision_id ) {
 		/**
@@ -299,10 +318,12 @@ 
  * @return WP_Post|array|null Null if error or post object if success.
  */
 function wp_get_post_revision(&$post, $output = OBJECT, $filter = 'raw') {
-	if ( !$revision = get_post( $post, OBJECT, $filter ) )
-		return $revision;
-	if ( 'revision' !== $revision->post_type )
-		return null;
+	if ( !$revision = get_post( $post, OBJECT, $filter ) ) {
+			return $revision;
+	}
+	if ( 'revision' !== $revision->post_type ) {
+			return null;
+	}
 
 	if ( $output == OBJECT ) {
 		return $revision;
@@ -329,27 +350,31 @@ 
  * @return int|false|null Null if error, false if no fields to restore, (int) post ID if success.
  */
 function wp_restore_post_revision( $revision_id, $fields = null ) {
-	if ( !$revision = wp_get_post_revision( $revision_id, ARRAY_A ) )
-		return $revision;
+	if ( !$revision = wp_get_post_revision( $revision_id, ARRAY_A ) ) {
+			return $revision;
+	}
 
-	if ( !is_array( $fields ) )
-		$fields = array_keys( _wp_post_revision_fields() );
+	if ( !is_array( $fields ) ) {
+			$fields = array_keys( _wp_post_revision_fields() );
+	}
 
 	$update = array();
 	foreach( array_intersect( array_keys( $revision ), $fields ) as $field ) {
 		$update[$field] = $revision[$field];
 	}
 
-	if ( !$update )
-		return false;
+	if ( !$update ) {
+			return false;
+	}
 
 	$update['ID'] = $revision['post_parent'];
 
 	$update = wp_slash( $update ); //since data is from db
 
 	$post_id = wp_update_post( $update );
-	if ( ! $post_id || is_wp_error( $post_id ) )
-		return $post_id;
+	if ( ! $post_id || is_wp_error( $post_id ) ) {
+			return $post_id;
+	}
 
 	// Add restore from details
 	$restore_details = array(
@@ -416,19 +441,22 @@ 
  */
 function wp_get_post_revisions( $post_id = 0, $args = null ) {
 	$post = get_post( $post_id );
-	if ( ! $post || empty( $post->ID ) )
-		return array();
+	if ( ! $post || empty( $post->ID ) ) {
+			return array();
+	}
 
 	$defaults = array( 'order' => 'DESC', 'orderby' => 'date ID', 'check_enabled' => true );
 	$args = wp_parse_args( $args, $defaults );
 
-	if ( $args['check_enabled'] && ! wp_revisions_enabled( $post ) )
-		return array();
+	if ( $args['check_enabled'] && ! wp_revisions_enabled( $post ) ) {
+			return array();
+	}
 
 	$args = array_merge( $args, array( 'post_parent' => $post->ID, 'post_type' => 'revision', 'post_status' => 'inherit' ) );
 
-	if ( ! $revisions = get_children( $args ) )
-		return array();
+	if ( ! $revisions = get_children( $args ) ) {
+			return array();
+	}
 
 	return $revisions;
 }
@@ -461,13 +489,15 @@ 
 function wp_revisions_to_keep( $post ) {
 	$num = WP_POST_REVISIONS;
 
-	if ( true === $num )
-		$num = -1;
-	else
-		$num = intval( $num );
+	if ( true === $num ) {
+			$num = -1;
+	} else {
+			$num = intval( $num );
+	}
 
-	if ( ! post_type_supports( $post->post_type, 'revisions' ) )
-		$num = 0;
+	if ( ! post_type_supports( $post->post_type, 'revisions' ) ) {
+			$num = 0;
+	}
 
 	/**
 	 * Filter the number of revisions to save for the given post.
@@ -522,8 +552,9 @@ 
 	if ( isset($_GET['preview_id']) && isset($_GET['preview_nonce']) ) {
 		$id = (int) $_GET['preview_id'];
 
-		if ( false === wp_verify_nonce( $_GET['preview_nonce'], 'post_preview_' . $id ) )
-			wp_die( __('You do not have permission to preview drafts.') );
+		if ( false === wp_verify_nonce( $_GET['preview_nonce'], 'post_preview_' . $id ) ) {
+					wp_die( __('You do not have permission to preview drafts.') );
+		}
 
 		add_filter('the_preview', '_set_preview');
 	}
@@ -541,16 +572,20 @@ 
  * @return array
  */
 function _wp_preview_terms_filter( $terms, $post_id, $taxonomy ) {
-	if ( ! $post = get_post() )
-		return $terms;
+	if ( ! $post = get_post() ) {
+			return $terms;
+	}
 
-	if ( empty( $_REQUEST['post_format'] ) || $post->ID != $post_id || 'post_format' != $taxonomy || 'revision' == $post->post_type )
-		return $terms;
+	if ( empty( $_REQUEST['post_format'] ) || $post->ID != $post_id || 'post_format' != $taxonomy || 'revision' == $post->post_type ) {
+			return $terms;
+	}
 
-	if ( 'standard' == $_REQUEST['post_format'] )
-		$terms = array();
-	elseif ( $term = get_term_by( 'slug', 'post-format-' . sanitize_key( $_REQUEST['post_format'] ), 'post_format' ) )
-		$terms = array( $term ); // Can only have one post format
+	if ( 'standard' == $_REQUEST['post_format'] ) {
+			$terms = array();
+	} elseif ( $term = get_term_by( 'slug', 'post-format-' . sanitize_key( $_REQUEST['post_format'] ), 'post_format' ) ) {
+			$terms = array( $term );
+	}
+	// Can only have one post format
 
 	return $terms;
 }
@@ -565,13 +600,15 @@ 
  * @return int|false
  */
 function _wp_get_post_revision_version( $revision ) {
-	if ( is_object( $revision ) )
-		$revision = get_object_vars( $revision );
-	elseif ( !is_array( $revision ) )
-		return false;
+	if ( is_object( $revision ) ) {
+			$revision = get_object_vars( $revision );
+	} elseif ( !is_array( $revision ) ) {
+			return false;
+	}
 
-	if ( preg_match( '/^\d+-(?:autosave|revision)-v(\d+)$/', $revision['post_name'], $matches ) )
-		return (int) $matches[1];
+	if ( preg_match( '/^\d+-(?:autosave|revision)-v(\d+)$/', $revision['post_name'], $matches ) ) {
+			return (int) $matches[1];
+	}
 
 	return 0;
 }
@@ -625,8 +662,9 @@ 
 		$this_revision_version = _wp_get_post_revision_version( $this_revision );
 
 		// Something terrible happened
-		if ( false === $this_revision_version )
-			continue;
+		if ( false === $this_revision_version ) {
+					continue;
+		}
 
 		// 1 is the latest revision version, so we're already up to date.
 		// No need to add a copy of the post as latest revision.
@@ -647,23 +685,26 @@ 
 			$prev_revision_version = _wp_get_post_revision_version( $prev_revision );
 
 			// If the previous revision is already up to date, it no longer has the information we need :(
-			if ( $prev_revision_version < 1 )
-				$update['post_author'] = $prev_revision->post_author;
+			if ( $prev_revision_version < 1 ) {
+							$update['post_author'] = $prev_revision->post_author;
+			}
 		}
 
 		// Upgrade this revision
 		$result = $wpdb->update( $wpdb->posts, $update, array( 'ID' => $this_revision->ID ) );
 
-		if ( $result )
-			wp_cache_delete( $this_revision->ID, 'posts' );
+		if ( $result ) {
+					wp_cache_delete( $this_revision->ID, 'posts' );
+		}
 
 	} while ( $prev_revision );
 
 	delete_option( $lock );
 
 	// Add a copy of the post as latest revision.
-	if ( $add_last )
-		wp_save_post_revision( $post->ID );
+	if ( $add_last ) {
+			wp_save_post_revision( $post->ID );
+	}
 
 	return true;
 }

src/wp-includes/rss.php

Doc Comments +13 added lines, -4 removed lines

@@ -409,7 +409,7 @@ 
  * @subpackage MagpieRSS
  *
  * @param string $url URL to retrieve feed
- * @return bool|MagpieRSS false on failure or MagpieRSS object on success.
+ * @return integer|null false on failure or MagpieRSS object on success.
  */
 function fetch_rss ($url) {
 	// initialize constants
@@ -547,7 +547,7 @@ 
  *
  * @param string $url URL to retrieve
  * @param array $headers Optional. Headers to send to the URL.
- * @return Snoopy style response
+ * @return stdClass style response
  */
 function _fetch_remote_file($url, $headers = "" ) {
 	$resp = wp_safe_remote_request( $url, array( 'headers' => $headers, 'timeout' => MAGPIE_FETCH_TIME_OUT ) );
@@ -589,7 +589,7 @@ 
  * @package External
  * @subpackage MagpieRSS
  *
- * @param array $resp
+ * @param stdClass $resp
  * @return MagpieRSS|bool
  */
 function _response_to_rss ($resp) {
@@ -746,6 +746,9 @@ 
 	Input:		url from wich the rss file was fetched
 	Output:		true on success
 \*=======================================================================*/
+	/**
+	 * @param string $url
+	 */
 	function set ($url, $rss) {
 		$cache_option = 'rss_' . $this->file_name( $url );
 
@@ -760,6 +763,9 @@ 
 	Input:		url from wich the rss file was fetched
 	Output:		cached object on HIT, false on MISS
 \*=======================================================================*/
+	/**
+	 * @param string $url
+	 */
 	function get ($url) {
 		$this->ERROR = "";
 		$cache_option = 'rss_' . $this->file_name( $url );
@@ -781,6 +787,9 @@ 
 	Input:		url from wich the rss file was fetched
 	Output:		cached object on HIT, false on MISS
 \*=======================================================================*/
+	/**
+	 * @param string $url
+	 */
 	function check_cache ( $url ) {
 		$this->ERROR = "";
 		$cache_option = 'rss_' . $this->file_name( $url );
@@ -936,7 +945,7 @@ 
  *
  * @param string $url URL of feed to display. Will not auto sense feed URL.
  * @param int $num_items Optional. Number of items to display, default is all.
- * @return bool False on failure.
+ * @return null|false False on failure.
  */
 function get_rss ($url, $num_items = 5) { // Like get posts, but for RSS
 	$rss = fetch_rss($url);

Spacing +224 added lines, -224 removed lines

@@ -16,7 +16,7 @@ 
 /**
  * Deprecated. Use SimplePie (class-simplepie.php) instead.
  */
-_deprecated_file( basename( __FILE__ ), '3.0', WPINC . '/class-simplepie.php' );
+_deprecated_file(basename(__FILE__), '3.0', WPINC.'/class-simplepie.php');
 
 /**
  * Fires before MagpieRSS is loaded, to optionally replace it.
@@ -24,32 +24,32 @@ 
  * @since 2.3.0
  * @deprecated 3.0.0
  */
-do_action( 'load_feed_engine' );
+do_action('load_feed_engine');
 
 /** RSS feed constant. */
 define('RSS', 'RSS');
 define('ATOM', 'Atom');
-define('MAGPIE_USER_AGENT', 'WordPress/' . $GLOBALS['wp_version']);
+define('MAGPIE_USER_AGENT', 'WordPress/'.$GLOBALS['wp_version']);
 
 class MagpieRSS {
 	var $parser;
-	var $current_item	= array();	// item currently being parsed
-	var $items			= array();	// collection of parsed items
-	var $channel		= array();	// hash of channel fields
-	var $textinput		= array();
+	var $current_item = array(); // item currently being parsed
+	var $items			= array(); // collection of parsed items
+	var $channel = array(); // hash of channel fields
+	var $textinput = array();
 	var $image			= array();
 	var $feed_type;
 	var $feed_version;
 
 	// parser variables
-	var $stack				= array(); // parser stack
+	var $stack = array(); // parser stack
 	var $inchannel			= false;
-	var $initem 			= false;
+	var $initem = false;
 	var $incontent			= false; // if in Atom <content mode="xml"> field
-	var $intextinput		= false;
-	var $inimage 			= false;
-	var $current_field		= '';
-	var $current_namespace	= false;
+	var $intextinput = false;
+	var $inimage = false;
+	var $current_field = '';
+	var $current_namespace = false;
 
 	//var $ERROR = "";
 
@@ -58,44 +58,44 @@ 
 	/**
 	 * PHP5 constructor.
 	 */
-	function __construct( $source ) {
+	function __construct($source) {
 
 		# if PHP xml isn't compiled in, die
 		#
-		if ( !function_exists('xml_parser_create') )
-			trigger_error( "Failed to load PHP's XML Extension. http://www.php.net/manual/en/ref.xml.php" );
+		if ( ! function_exists('xml_parser_create'))
+			trigger_error("Failed to load PHP's XML Extension. http://www.php.net/manual/en/ref.xml.php");
 
 		$parser = @xml_parser_create();
 
-		if ( !is_resource($parser) )
-			trigger_error( "Failed to create an instance of PHP's XML parser. http://www.php.net/manual/en/ref.xml.php");
+		if ( ! is_resource($parser))
+			trigger_error("Failed to create an instance of PHP's XML parser. http://www.php.net/manual/en/ref.xml.php");
 
 		$this->parser = $parser;
 
 		# pass in parser, and a reference to this object
 		# set up handlers
 		#
-		xml_set_object( $this->parser, $this );
+		xml_set_object($this->parser, $this);
 		xml_set_element_handler($this->parser,
-				'feed_start_element', 'feed_end_element' );
+				'feed_start_element', 'feed_end_element');
 
-		xml_set_character_data_handler( $this->parser, 'feed_cdata' );
+		xml_set_character_data_handler($this->parser, 'feed_cdata');
 
-		$status = xml_parse( $this->parser, $source );
+		$status = xml_parse($this->parser, $source);
 
-		if (! $status ) {
-			$errorcode = xml_get_error_code( $this->parser );
-			if ( $errorcode != XML_ERROR_NONE ) {
-				$xml_error = xml_error_string( $errorcode );
+		if ( ! $status) {
+			$errorcode = xml_get_error_code($this->parser);
+			if ($errorcode != XML_ERROR_NONE) {
+				$xml_error = xml_error_string($errorcode);
 				$error_line = xml_get_current_line_number($this->parser);
 				$error_col = xml_get_current_column_number($this->parser);
 				$errormsg = "$xml_error at line $error_line, column $error_col";
 
-				$this->error( $errormsg );
+				$this->error($errormsg);
 			}
 		}
 
-		xml_parser_free( $this->parser );
+		xml_parser_free($this->parser);
 
 		$this->normalize();
 	}
@@ -103,8 +103,8 @@ 
 	/**
 	 * PHP4 constructor.
 	 */
-	public function MagpieRSS( $source ) {
-		self::__construct( $source );
+	public function MagpieRSS($source) {
+		self::__construct($source);
 	}
 
 	function feed_start_element($p, $element, &$attrs) {
@@ -112,27 +112,27 @@ 
 		$attrs = array_change_key_case($attrs, CASE_LOWER);
 
 		// check for a namespace, and split if found
-		$ns	= false;
-		if ( strpos( $element, ':' ) ) {
-			list($ns, $el) = split( ':', $element, 2);
+		$ns = false;
+		if (strpos($element, ':')) {
+			list($ns, $el) = split(':', $element, 2);
 		}
-		if ( $ns and $ns != 'rdf' ) {
+		if ($ns and $ns != 'rdf') {
 			$this->current_namespace = $ns;
 		}
 
 		# if feed type isn't set, then this is first element of feed
 		# identify feed from root element
 		#
-		if (!isset($this->feed_type) ) {
-			if ( $el == 'rdf' ) {
+		if ( ! isset($this->feed_type)) {
+			if ($el == 'rdf') {
 				$this->feed_type = RSS;
 				$this->feed_version = '1.0';
 			}
-			elseif ( $el == 'rss' ) {
+			elseif ($el == 'rss') {
 				$this->feed_type = RSS;
 				$this->feed_version = $attrs['version'];
 			}
-			elseif ( $el == 'feed' ) {
+			elseif ($el == 'feed') {
 				$this->feed_type = ATOM;
 				$this->feed_version = $attrs['version'];
 				$this->inchannel = true;
@@ -140,14 +140,14 @@ 
 			return;
 		}
 
-		if ( $el == 'channel' )
+		if ($el == 'channel')
 		{
 			$this->inchannel = true;
 		}
-		elseif ($el == 'item' or $el == 'entry' )
+		elseif ($el == 'item' or $el == 'entry')
 		{
 			$this->initem = true;
-			if ( isset($attrs['rdf:about']) ) {
+			if (isset($attrs['rdf:about'])) {
 				$this->current_item['about'] = $attrs['rdf:about'];
 			}
 		}
@@ -171,10 +171,10 @@ 
 		}
 
 		# handle atom content constructs
-		elseif ( $this->feed_type == ATOM and in_array($el, $this->_CONTENT_CONSTRUCTS) )
+		elseif ($this->feed_type == ATOM and in_array($el, $this->_CONTENT_CONSTRUCTS))
 		{
 			// avoid clashing w/ RSS mod_content
-			if ($el == 'content' ) {
+			if ($el == 'content') {
 				$el = 'atom_content';
 			}
 
@@ -183,31 +183,31 @@ 
 		}
 
 		// if inside an Atom content construct (e.g. content or summary) field treat tags as text
-		elseif ($this->feed_type == ATOM and $this->incontent )
+		elseif ($this->feed_type == ATOM and $this->incontent)
 		{
 			// if tags are inlined, then flatten
 			$attrs_str = join(' ',
 					array_map(array('MagpieRSS', 'map_attrs'),
 					array_keys($attrs),
-					array_values($attrs) ) );
+					array_values($attrs)));
 
-			$this->append_content( "<$element $attrs_str>"  );
+			$this->append_content("<$element $attrs_str>");
 
-			array_unshift( $this->stack, $el );
+			array_unshift($this->stack, $el);
 		}
 
 		// Atom support many links per containging element.
 		// Magpie treats link elements of type rel='alternate'
 		// as being equivalent to RSS's simple link element.
 		//
-		elseif ($this->feed_type == ATOM and $el == 'link' )
+		elseif ($this->feed_type == ATOM and $el == 'link')
 		{
-			if ( isset($attrs['rel']) and $attrs['rel'] == 'alternate' )
+			if (isset($attrs['rel']) and $attrs['rel'] == 'alternate')
 			{
 				$link_el = 'link';
 			}
 			else {
-				$link_el = 'link_' . $attrs['rel'];
+				$link_el = 'link_'.$attrs['rel'];
 			}
 
 			$this->append($link_el, $attrs['href']);
@@ -218,11 +218,11 @@ 
 		}
 	}
 
-	function feed_cdata ($p, $text) {
+	function feed_cdata($p, $text) {
 
 		if ($this->feed_type == ATOM and $this->incontent)
 		{
-			$this->append_content( $text );
+			$this->append_content($text);
 		}
 		else {
 			$current_el = join('_', array_reverse($this->stack));
@@ -230,35 +230,35 @@ 
 		}
 	}
 
-	function feed_end_element ($p, $el) {
+	function feed_end_element($p, $el) {
 		$el = strtolower($el);
 
-		if ( $el == 'item' or $el == 'entry' )
+		if ($el == 'item' or $el == 'entry')
 		{
 			$this->items[] = $this->current_item;
 			$this->current_item = array();
 			$this->initem = false;
 		}
-		elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'textinput' )
+		elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'textinput')
 		{
 			$this->intextinput = false;
 		}
-		elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'image' )
+		elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'image')
 		{
 			$this->inimage = false;
 		}
-		elseif ($this->feed_type == ATOM and in_array($el, $this->_CONTENT_CONSTRUCTS) )
+		elseif ($this->feed_type == ATOM and in_array($el, $this->_CONTENT_CONSTRUCTS))
 		{
 			$this->incontent = false;
 		}
-		elseif ($el == 'channel' or $el == 'feed' )
+		elseif ($el == 'channel' or $el == 'feed')
 		{
 			$this->inchannel = false;
 		}
-		elseif ($this->feed_type == ATOM and $this->incontent  ) {
+		elseif ($this->feed_type == ATOM and $this->incontent) {
 			// balance tags properly
 			// note: This may not actually be necessary
-			if ( $this->stack[0] == $el )
+			if ($this->stack[0] == $el)
 			{
 				$this->append_content("</$el>");
 			}
@@ -266,97 +266,97 @@ 
 				$this->append_content("<$el />");
 			}
 
-			array_shift( $this->stack );
+			array_shift($this->stack);
 		}
 		else {
-			array_shift( $this->stack );
+			array_shift($this->stack);
 		}
 
 		$this->current_namespace = false;
 	}
 
-	function concat (&$str1, $str2="") {
-		if (!isset($str1) ) {
-			$str1="";
+	function concat(&$str1, $str2 = "") {
+		if ( ! isset($str1)) {
+			$str1 = "";
 		}
 		$str1 .= $str2;
 	}
 
 	function append_content($text) {
-		if ( $this->initem ) {
-			$this->concat( $this->current_item[ $this->incontent ], $text );
+		if ($this->initem) {
+			$this->concat($this->current_item[$this->incontent], $text);
 		}
-		elseif ( $this->inchannel ) {
-			$this->concat( $this->channel[ $this->incontent ], $text );
+		elseif ($this->inchannel) {
+			$this->concat($this->channel[$this->incontent], $text);
 		}
 	}
 
 	// smart append - field and namespace aware
 	function append($el, $text) {
-		if (!$el) {
+		if ( ! $el) {
 			return;
 		}
-		if ( $this->current_namespace )
+		if ($this->current_namespace)
 		{
-			if ( $this->initem ) {
+			if ($this->initem) {
 				$this->concat(
-					$this->current_item[ $this->current_namespace ][ $el ], $text);
+					$this->current_item[$this->current_namespace][$el], $text);
 			}
 			elseif ($this->inchannel) {
 				$this->concat(
-					$this->channel[ $this->current_namespace][ $el ], $text );
+					$this->channel[$this->current_namespace][$el], $text );
 			}
 			elseif ($this->intextinput) {
 				$this->concat(
-					$this->textinput[ $this->current_namespace][ $el ], $text );
+					$this->textinput[$this->current_namespace][$el], $text );
 			}
 			elseif ($this->inimage) {
 				$this->concat(
-					$this->image[ $this->current_namespace ][ $el ], $text );
+					$this->image[$this->current_namespace][$el], $text );
 			}
 		}
 		else {
-			if ( $this->initem ) {
+			if ($this->initem) {
 				$this->concat(
-					$this->current_item[ $el ], $text);
+					$this->current_item[$el], $text);
 			}
 			elseif ($this->intextinput) {
 				$this->concat(
-					$this->textinput[ $el ], $text );
+					$this->textinput[$el], $text );
 			}
 			elseif ($this->inimage) {
 				$this->concat(
-					$this->image[ $el ], $text );
+					$this->image[$el], $text );
 			}
 			elseif ($this->inchannel) {
 				$this->concat(
-					$this->channel[ $el ], $text );
+					$this->channel[$el], $text );
 			}
 
 		}
 	}
 
-	function normalize () {
+	function normalize() {
 		// if atom populate rss fields
-		if ( $this->is_atom() ) {
+		if ($this->is_atom()) {
 			$this->channel['descripton'] = $this->channel['tagline'];
-			for ( $i = 0; $i < count($this->items); $i++) {
+			for ($i = 0; $i < count($this->items); $i++) {
 				$item = $this->items[$i];
-				if ( isset($item['summary']) )
+				if (isset($item['summary']))
 					$item['description'] = $item['summary'];
-				if ( isset($item['atom_content']))
+				if (isset($item['atom_content']))
 					$item['content']['encoded'] = $item['atom_content'];
 
 				$this->items[$i] = $item;
 			}
 		}
-		elseif ( $this->is_rss() ) {
+		elseif ($this->is_rss()) {
 			$this->channel['tagline'] = $this->channel['description'];
-			for ( $i = 0; $i < count($this->items); $i++) {
+			for ($i = 0; $i < count($this->items); $i++) {
 				$item = $this->items[$i];
-				if ( isset($item['description']))
+				if (isset($item['description']))
 					$item['summary'] = $item['description'];
-				if ( isset($item['content']['encoded'] ) )
+				if (isset($item['content']['encoded']))
 					$item['atom_content'] = $item['content']['encoded'];
 
 				$this->items[$i] = $item;
@@ -364,8 +364,8 @@ 
 		}
 	}
 
-	function is_rss () {
-		if ( $this->feed_type == RSS ) {
+	function is_rss() {
+		if ($this->feed_type == RSS) {
 			return $this->feed_version;
 		}
 		else {
@@ -374,7 +374,7 @@ 
 	}
 
 	function is_atom() {
-		if ( $this->feed_type == ATOM ) {
+		if ($this->feed_type == ATOM) {
 			return $this->feed_version;
 		}
 		else {
@@ -386,21 +386,21 @@ 
 		return "$k=\"$v\"";
 	}
 
-	function error( $errormsg, $lvl = E_USER_WARNING ) {
+	function error($errormsg, $lvl = E_USER_WARNING) {
 		// append PHP's error message if track_errors enabled
-		if ( isset($php_errormsg) ) {
+		if (isset($php_errormsg)) {
 			$errormsg .= " ($php_errormsg)";
 		}
-		if ( MAGPIE_DEBUG ) {
-			trigger_error( $errormsg, $lvl);
+		if (MAGPIE_DEBUG) {
+			trigger_error($errormsg, $lvl);
 		} else {
-			error_log( $errormsg, 0);
+			error_log($errormsg, 0);
 		}
 	}
 
 }
 
-if ( !function_exists('fetch_rss') ) :
+if ( ! function_exists('fetch_rss')) :
 /**
  * Build Magpie object based on RSS from URL.
  *
@@ -411,21 +411,21 @@ 
  * @param string $url URL to retrieve feed
  * @return bool|MagpieRSS false on failure or MagpieRSS object on success.
  */
-function fetch_rss ($url) {
+function fetch_rss($url) {
 	// initialize constants
 	init();
 
-	if ( !isset($url) ) {
+	if ( ! isset($url)) {
 		// error("fetch_rss called without a url");
 		return false;
 	}
 
 	// if cache is disabled
-	if ( !MAGPIE_CACHE_ON ) {
+	if ( ! MAGPIE_CACHE_ON) {
 		// fetch file, and parse it
-		$resp = _fetch_remote_file( $url );
-		if ( is_success( $resp->status ) ) {
-			return _response_to_rss( $resp );
+		$resp = _fetch_remote_file($url);
+		if (is_success($resp->status)) {
+			return _response_to_rss($resp);
 		}
 		else {
 			// error("Failed to fetch $url and cache is off");
@@ -440,28 +440,28 @@ 
 		// 3. if cached obj fails freshness check, fetch remote
 		// 4. if remote fails, return stale object, or error
 
-		$cache = new RSSCache( MAGPIE_CACHE_DIR, MAGPIE_CACHE_AGE );
+		$cache = new RSSCache(MAGPIE_CACHE_DIR, MAGPIE_CACHE_AGE);
 
 		if (MAGPIE_DEBUG and $cache->ERROR) {
 			debug($cache->ERROR, E_USER_WARNING);
 		}
 
-		$cache_status 	 = 0;		// response of check_cache
+		$cache_status = 0; // response of check_cache
 		$request_headers = array(); // HTTP headers to send with fetch
-		$rss 			 = 0;		// parsed RSS object
-		$errormsg		 = 0;		// errors, if any
+		$rss = 0; // parsed RSS object
+		$errormsg = 0; // errors, if any
 
-		if (!$cache->ERROR) {
+		if ( ! $cache->ERROR) {
 			// return cache HIT, MISS, or STALE
-			$cache_status = $cache->check_cache( $url );
+			$cache_status = $cache->check_cache($url);
 		}
 
 		// if object cached, and cache is fresh, return cached obj
-		if ( $cache_status == 'HIT' ) {
-			$rss = $cache->get( $url );
-			if ( isset($rss) and $rss ) {
+		if ($cache_status == 'HIT') {
+			$rss = $cache->get($url);
+			if (isset($rss) and $rss) {
 				$rss->from_cache = 1;
-				if ( MAGPIE_DEBUG > 1) {
+				if (MAGPIE_DEBUG > 1) {
 				debug("MagpieRSS: Cache HIT", E_USER_NOTICE);
 			}
 				return $rss;
@@ -471,47 +471,47 @@ 
 		// else attempt a conditional get
 
 		// set up headers
-		if ( $cache_status == 'STALE' ) {
-			$rss = $cache->get( $url );
-			if ( isset($rss->etag) and $rss->last_modified ) {
+		if ($cache_status == 'STALE') {
+			$rss = $cache->get($url);
+			if (isset($rss->etag) and $rss->last_modified) {
 				$request_headers['If-None-Match'] = $rss->etag;
 				$request_headers['If-Last-Modified'] = $rss->last_modified;
 			}
 		}
 
-		$resp = _fetch_remote_file( $url, $request_headers );
+		$resp = _fetch_remote_file($url, $request_headers);
 
 		if (isset($resp) and $resp) {
-			if ($resp->status == '304' ) {
+			if ($resp->status == '304') {
 				// we have the most current copy
-				if ( MAGPIE_DEBUG > 1) {
+				if (MAGPIE_DEBUG > 1) {
 					debug("Got 304 for $url");
 				}
 				// reset cache on 304 (at minutillo insistent prodding)
 				$cache->set($url, $rss);
 				return $rss;
 			}
-			elseif ( is_success( $resp->status ) ) {
-				$rss = _response_to_rss( $resp );
-				if ( $rss ) {
+			elseif (is_success($resp->status)) {
+				$rss = _response_to_rss($resp);
+				if ($rss) {
 					if (MAGPIE_DEBUG > 1) {
 						debug("Fetch successful");
 					}
 					// add object to cache
-					$cache->set( $url, $rss );
+					$cache->set($url, $rss);
 					return $rss;
 				}
 			}
 			else {
 				$errormsg = "Failed to fetch $url. ";
-				if ( $resp->error ) {
+				if ($resp->error) {
 					# compensate for Snoopy's annoying habbit to tacking
 					# on '\n'
 					$http_error = substr($resp->error, 0, -2);
 					$errormsg .= "(HTTP Error: $http_error)";
 				}
 				else {
-					$errormsg .=  "(HTTP Response: " . $resp->response_code .')';
+					$errormsg .= "(HTTP Response: ".$resp->response_code.')';
 				}
 			}
 		}
@@ -523,7 +523,7 @@ 
 
 		// attempt to return cached object
 		if ($rss) {
-			if ( MAGPIE_DEBUG ) {
+			if (MAGPIE_DEBUG) {
 				debug("Returning STALE object for $url");
 			}
 			return $rss;
@@ -549,35 +549,35 @@ 
  * @param array $headers Optional. Headers to send to the URL.
  * @return Snoopy style response
  */
-function _fetch_remote_file($url, $headers = "" ) {
-	$resp = wp_safe_remote_request( $url, array( 'headers' => $headers, 'timeout' => MAGPIE_FETCH_TIME_OUT ) );
-	if ( is_wp_error($resp) ) {
+function _fetch_remote_file($url, $headers = "") {
+	$resp = wp_safe_remote_request($url, array('headers' => $headers, 'timeout' => MAGPIE_FETCH_TIME_OUT));
+	if (is_wp_error($resp)) {
 		$error = array_shift($resp->errors);
 
 		$resp = new stdClass;
 		$resp->status = 500;
 		$resp->response_code = 500;
-		$resp->error = $error[0] . "\n"; //\n = Snoopy compatibility
+		$resp->error = $error[0]."\n"; //\n = Snoopy compatibility
 		return $resp;
 	}
 
 	// Snoopy returns headers unprocessed.
 	// Also note, WP_HTTP lowercases all keys, Snoopy did not.
 	$return_headers = array();
-	foreach ( wp_remote_retrieve_headers( $resp ) as $key => $value ) {
-		if ( !is_array($value) ) {
+	foreach (wp_remote_retrieve_headers($resp) as $key => $value) {
+		if ( ! is_array($value)) {
 			$return_headers[] = "$key: $value";
 		} else {
-			foreach ( $value as $v )
+			foreach ($value as $v)
 				$return_headers[] = "$key: $v";
 		}
 	}
 
 	$response = new stdClass;
-	$response->status = wp_remote_retrieve_response_code( $resp );
-	$response->response_code = wp_remote_retrieve_response_code( $resp );
+	$response->status = wp_remote_retrieve_response_code($resp);
+	$response->response_code = wp_remote_retrieve_response_code($resp);
 	$response->headers = $return_headers;
-	$response->results = wp_remote_retrieve_body( $resp );
+	$response->results = wp_remote_retrieve_body($resp);
 
 	return $response;
 }
@@ -592,14 +592,14 @@ 
  * @param array $resp
  * @return MagpieRSS|bool
  */
-function _response_to_rss ($resp) {
-	$rss = new MagpieRSS( $resp->results );
+function _response_to_rss($resp) {
+	$rss = new MagpieRSS($resp->results);
 
 	// if RSS parsed successfully
-	if ( $rss && (!isset($rss->ERROR) || !$rss->ERROR) ) {
+	if ($rss && ( ! isset($rss->ERROR) || ! $rss->ERROR)) {
 
 		// find Etag, and Last-Modified
-		foreach( (array) $resp->headers as $h) {
+		foreach ((array) $resp->headers as $h) {
 			// 2003-03-02 - Nicola Asuni (www.tecnick.com) - fixed bug "Undefined offset: 1"
 			if (strpos($h, ": ")) {
 				list($field, $val) = explode(": ", $h, 2);
@@ -609,11 +609,11 @@ 
 				$val = "";
 			}
 
-			if ( $field == 'etag' ) {
+			if ($field == 'etag') {
 				$rss->etag = $val;
 			}
 
-			if ( $field == 'last-modified' ) {
+			if ($field == 'last-modified') {
 				$rss->last_modified = $val;
 			}
 		}
@@ -624,7 +624,7 @@ 
 		$errormsg = "Failed to parse RSS file.";
 
 		if ($rss) {
-			$errormsg .= " (" . $rss->ERROR . ")";
+			$errormsg .= " (".$rss->ERROR.")";
 		}
 		// error($errormsg);
 
@@ -639,95 +639,95 @@ 
  * @package External
  * @subpackage MagpieRSS
  */
-function init () {
-	if ( defined('MAGPIE_INITALIZED') ) {
+function init() {
+	if (defined('MAGPIE_INITALIZED')) {
 		return;
 	}
 	else {
 		define('MAGPIE_INITALIZED', 1);
 	}
 
-	if ( !defined('MAGPIE_CACHE_ON') ) {
+	if ( ! defined('MAGPIE_CACHE_ON')) {
 		define('MAGPIE_CACHE_ON', 1);
 	}
 
-	if ( !defined('MAGPIE_CACHE_DIR') ) {
+	if ( ! defined('MAGPIE_CACHE_DIR')) {
 		define('MAGPIE_CACHE_DIR', './cache');
 	}
 
-	if ( !defined('MAGPIE_CACHE_AGE') ) {
-		define('MAGPIE_CACHE_AGE', 60*60); // one hour
+	if ( ! defined('MAGPIE_CACHE_AGE')) {
+		define('MAGPIE_CACHE_AGE', 60 * 60); // one hour
 	}
 
-	if ( !defined('MAGPIE_CACHE_FRESH_ONLY') ) {
+	if ( ! defined('MAGPIE_CACHE_FRESH_ONLY')) {
 		define('MAGPIE_CACHE_FRESH_ONLY', 0);
 	}
 
-		if ( !defined('MAGPIE_DEBUG') ) {
+		if ( ! defined('MAGPIE_DEBUG')) {
 		define('MAGPIE_DEBUG', 0);
 	}
 
-	if ( !defined('MAGPIE_USER_AGENT') ) {
-		$ua = 'WordPress/' . $GLOBALS['wp_version'];
+	if ( ! defined('MAGPIE_USER_AGENT')) {
+		$ua = 'WordPress/'.$GLOBALS['wp_version'];
 
-		if ( MAGPIE_CACHE_ON ) {
-			$ua = $ua . ')';
+		if (MAGPIE_CACHE_ON) {
+			$ua = $ua.')';
 		}
 		else {
-			$ua = $ua . '; No cache)';
+			$ua = $ua.'; No cache)';
 		}
 
 		define('MAGPIE_USER_AGENT', $ua);
 	}
 
-	if ( !defined('MAGPIE_FETCH_TIME_OUT') ) {
-		define('MAGPIE_FETCH_TIME_OUT', 2);	// 2 second timeout
+	if ( ! defined('MAGPIE_FETCH_TIME_OUT')) {
+		define('MAGPIE_FETCH_TIME_OUT', 2); // 2 second timeout
 	}
 
 	// use gzip encoding to fetch rss files if supported?
-	if ( !defined('MAGPIE_USE_GZIP') ) {
+	if ( ! defined('MAGPIE_USE_GZIP')) {
 		define('MAGPIE_USE_GZIP', true);
 	}
 }
 
-function is_info ($sc) {
+function is_info($sc) {
 	return $sc >= 100 && $sc < 200;
 }
 
-function is_success ($sc) {
+function is_success($sc) {
 	return $sc >= 200 && $sc < 300;
 }
 
-function is_redirect ($sc) {
+function is_redirect($sc) {
 	return $sc >= 300 && $sc < 400;
 }
 
-function is_error ($sc) {
+function is_error($sc) {
 	return $sc >= 400 && $sc < 600;
 }
 
-function is_client_error ($sc) {
+function is_client_error($sc) {
 	return $sc >= 400 && $sc < 500;
 }
 
-function is_server_error ($sc) {
+function is_server_error($sc) {
 	return $sc >= 500 && $sc < 600;
 }
 
 class RSSCache {
-	var $BASE_CACHE;	// where the cache files are stored
-	var $MAX_AGE	= 43200;  		// when are files stale, default twelve hours
-	var $ERROR 		= '';			// accumulate error messages
+	var $BASE_CACHE; // where the cache files are stored
+	var $MAX_AGE	= 43200; // when are files stale, default twelve hours
+	var $ERROR 		= ''; // accumulate error messages
 
 	/**
 	 * PHP5 constructor.
 	 */
-	function __construct( $base = '', $age = '' ) {
-		$this->BASE_CACHE = WP_CONTENT_DIR . '/cache';
-		if ( $base ) {
+	function __construct($base = '', $age = '') {
+		$this->BASE_CACHE = WP_CONTENT_DIR.'/cache';
+		if ($base) {
 			$this->BASE_CACHE = $base;
 		}
-		if ( $age ) {
+		if ($age) {
 			$this->MAX_AGE = $age;
 		}
 
@@ -736,8 +736,8 @@ 
 	/**
 	 * PHP4 constructor.
 	 */
-	public function RSSCache( $base = '', $age = '' ) {
-		self::__construct( $base, $age );
+	public function RSSCache($base = '', $age = '') {
+		self::__construct($base, $age);
 	}
 
 /*=======================================================================*\
@@ -746,8 +746,8 @@ 
 	Input:		url from wich the rss file was fetched
 	Output:		true on success
 \*=======================================================================*/
-	function set ($url, $rss) {
-		$cache_option = 'rss_' . $this->file_name( $url );
+	function set($url, $rss) {
+		$cache_option = 'rss_'.$this->file_name($url);
 
 		set_transient($cache_option, $rss, $this->MAX_AGE);
 
@@ -760,11 +760,11 @@ 
 	Input:		url from wich the rss file was fetched
 	Output:		cached object on HIT, false on MISS
 \*=======================================================================*/
-	function get ($url) {
+	function get($url) {
 		$this->ERROR = "";
-		$cache_option = 'rss_' . $this->file_name( $url );
+		$cache_option = 'rss_'.$this->file_name($url);
 
-		if ( ! $rss = get_transient( $cache_option ) ) {
+		if ( ! $rss = get_transient($cache_option)) {
 			$this->debug(
 				"Cache doesn't contain: $url (cache option: $cache_option)"
 			);
@@ -781,11 +781,11 @@ 
 	Input:		url from wich the rss file was fetched
 	Output:		cached object on HIT, false on MISS
 \*=======================================================================*/
-	function check_cache ( $url ) {
+	function check_cache($url) {
 		$this->ERROR = "";
-		$cache_option = 'rss_' . $this->file_name( $url );
+		$cache_option = 'rss_'.$this->file_name($url);
 
-		if ( get_transient($cache_option) ) {
+		if (get_transient($cache_option)) {
 			// object exists and is current
 				return 'HIT';
 		} else {
@@ -797,15 +797,15 @@ 
 /*=======================================================================*\
 	Function:	serialize
 \*=======================================================================*/
-	function serialize ( $rss ) {
-		return serialize( $rss );
+	function serialize($rss) {
+		return serialize($rss);
 	}
 
 /*=======================================================================*\
 	Function:	unserialize
 \*=======================================================================*/
-	function unserialize ( $data ) {
-		return unserialize( $data );
+	function unserialize($data) {
+		return unserialize($data);
 	}
 
 /*=======================================================================*\
@@ -814,64 +814,64 @@ 
 	Input:		url from wich the rss file was fetched
 	Output:		a file name
 \*=======================================================================*/
-	function file_name ($url) {
-		return md5( $url );
+	function file_name($url) {
+		return md5($url);
 	}
 
 /*=======================================================================*\
 	Function:	error
 	Purpose:	register error
 \*=======================================================================*/
-	function error ($errormsg, $lvl=E_USER_WARNING) {
+	function error($errormsg, $lvl = E_USER_WARNING) {
 		// append PHP's error message if track_errors enabled
-		if ( isset($php_errormsg) ) {
+		if (isset($php_errormsg)) {
 			$errormsg .= " ($php_errormsg)";
 		}
 		$this->ERROR = $errormsg;
-		if ( MAGPIE_DEBUG ) {
-			trigger_error( $errormsg, $lvl);
+		if (MAGPIE_DEBUG) {
+			trigger_error($errormsg, $lvl);
 		}
 		else {
-			error_log( $errormsg, 0);
+			error_log($errormsg, 0);
 		}
 	}
-			function debug ($debugmsg, $lvl=E_USER_NOTICE) {
-		if ( MAGPIE_DEBUG ) {
+			function debug($debugmsg, $lvl = E_USER_NOTICE) {
+		if (MAGPIE_DEBUG) {
 			$this->error("MagpieRSS [debug] $debugmsg", $lvl);
 		}
 	}
 }
 
-if ( !function_exists('parse_w3cdtf') ) :
-function parse_w3cdtf ( $date_str ) {
+if ( ! function_exists('parse_w3cdtf')) :
+function parse_w3cdtf($date_str) {
 
 	# regex to match wc3dtf
 	$pat = "/(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2})(:(\d{2}))?(?:([-+])(\d{2}):?(\d{2})|(Z))?/";
 
-	if ( preg_match( $pat, $date_str, $match ) ) {
-		list( $year, $month, $day, $hours, $minutes, $seconds) =
-			array( $match[1], $match[2], $match[3], $match[4], $match[5], $match[7]);
+	if (preg_match($pat, $date_str, $match)) {
+		list($year, $month, $day, $hours, $minutes, $seconds) =
+			array($match[1], $match[2], $match[3], $match[4], $match[5], $match[7]);
 
 		# calc epoch for current date assuming GMT
-		$epoch = gmmktime( $hours, $minutes, $seconds, $month, $day, $year);
+		$epoch = gmmktime($hours, $minutes, $seconds, $month, $day, $year);
 
 		$offset = 0;
-		if ( $match[11] == 'Z' ) {
+		if ($match[11] == 'Z') {
 			# zulu time, aka GMT
 		}
 		else {
-			list( $tz_mod, $tz_hour, $tz_min ) =
-				array( $match[8], $match[9], $match[10]);
+			list($tz_mod, $tz_hour, $tz_min) =
+				array($match[8], $match[9], $match[10]);
 
 			# zero out the variables
-			if ( ! $tz_hour ) { $tz_hour = 0; }
-			if ( ! $tz_min ) { $tz_min = 0; }
+			if ( ! $tz_hour) { $tz_hour = 0; }
+			if ( ! $tz_min) { $tz_min = 0; }
 
-			$offset_secs = (($tz_hour*60)+$tz_min)*60;
+			$offset_secs = (($tz_hour * 60) + $tz_min) * 60;
 
 			# is timezone ahead of GMT?  then subtract offset
 			#
-			if ( $tz_mod == '+' ) {
+			if ($tz_mod == '+') {
 				$offset_secs = $offset_secs * -1;
 			}
 
@@ -886,7 +886,7 @@ 
 }
 endif;
 
-if ( !function_exists('wp_rss') ) :
+if ( ! function_exists('wp_rss')) :
 /**
  * Display all RSS items in a HTML ordered list.
  *
@@ -897,31 +897,31 @@ 
  * @param string $url URL of feed to display. Will not auto sense feed URL.
  * @param int $num_items Optional. Number of items to display, default is all.
  */
-function wp_rss( $url, $num_items = -1 ) {
-	if ( $rss = fetch_rss( $url ) ) {
+function wp_rss($url, $num_items = -1) {
+	if ($rss = fetch_rss($url)) {
 		echo '<ul>';
 
-		if ( $num_items !== -1 ) {
-			$rss->items = array_slice( $rss->items, 0, $num_items );
+		if ($num_items !== -1) {
+			$rss->items = array_slice($rss->items, 0, $num_items);
 		}
 
-		foreach ( (array) $rss->items as $item ) {
+		foreach ((array) $rss->items as $item) {
 			printf(
 				'<li><a href="%1$s" title="%2$s">%3$s</a></li>',
-				esc_url( $item['link'] ),
-				esc_attr( strip_tags( $item['description'] ) ),
-				esc_html( $item['title'] )
+				esc_url($item['link']),
+				esc_attr(strip_tags($item['description'])),
+				esc_html($item['title'])
 			);
 		}
 
 		echo '</ul>';
 	} else {
-		_e( 'An error has occurred, which probably means the feed is down. Try again later.' );
+		_e('An error has occurred, which probably means the feed is down. Try again later.');
 	}
 }
 endif;
 
-if ( !function_exists('get_rss') ) :
+if ( ! function_exists('get_rss')) :
 /**
  * Display RSS items in HTML list items.
  *
@@ -938,11 +938,11 @@ 
  * @param int $num_items Optional. Number of items to display, default is all.
  * @return bool False on failure.
  */
-function get_rss ($url, $num_items = 5) { // Like get posts, but for RSS
+function get_rss($url, $num_items = 5) { // Like get posts, but for RSS
 	$rss = fetch_rss($url);
-	if ( $rss ) {
+	if ($rss) {
 		$rss->items = array_slice($rss->items, 0, $num_items);
-		foreach ( (array) $rss->items as $item ) {
+		foreach ((array) $rss->items as $item) {
 			echo "<li>\n";
 			echo "<a href='$item[link]' title='$item[description]'>";
 			echo esc_html($item['title']);

Braces +56 added lines, -85 removed lines

@@ -62,13 +62,15 @@ 
 
 		# if PHP xml isn't compiled in, die
 		#
-		if ( !function_exists('xml_parser_create') )
-			trigger_error( "Failed to load PHP's XML Extension. http://www.php.net/manual/en/ref.xml.php" );
+		if ( !function_exists('xml_parser_create') ) {
+					trigger_error( "Failed to load PHP's XML Extension. http://www.php.net/manual/en/ref.xml.php" );
+		}
 
 		$parser = @xml_parser_create();
 
-		if ( !is_resource($parser) )
-			trigger_error( "Failed to create an instance of PHP's XML parser. http://www.php.net/manual/en/ref.xml.php");
+		if ( !is_resource($parser) ) {
+					trigger_error( "Failed to create an instance of PHP's XML parser. http://www.php.net/manual/en/ref.xml.php");
+		}
 
 		$this->parser = $parser;
 
@@ -127,12 +129,10 @@ 
 			if ( $el == 'rdf' ) {
 				$this->feed_type = RSS;
 				$this->feed_version = '1.0';
-			}
-			elseif ( $el == 'rss' ) {
+			} elseif ( $el == 'rss' ) {
 				$this->feed_type = RSS;
 				$this->feed_version = $attrs['version'];
-			}
-			elseif ( $el == 'feed' ) {
+			} elseif ( $el == 'feed' ) {
 				$this->feed_type = ATOM;
 				$this->feed_version = $attrs['version'];
 				$this->inchannel = true;
@@ -143,8 +143,7 @@ 
 		if ( $el == 'channel' )
 		{
 			$this->inchannel = true;
-		}
-		elseif ($el == 'item' or $el == 'entry' )
+		} elseif ($el == 'item' or $el == 'entry' )
 		{
 			$this->initem = true;
 			if ( isset($attrs['rdf:about']) ) {
@@ -160,9 +159,7 @@ 
 			$el == 'textinput' )
 		{
 			$this->intextinput = true;
-		}
-
-		elseif (
+		} elseif (
 			$this->feed_type == RSS and
 			$this->current_namespace == '' and
 			$el == 'image' )
@@ -205,8 +202,7 @@ 
 			if ( isset($attrs['rel']) and $attrs['rel'] == 'alternate' )
 			{
 				$link_el = 'link';
-			}
-			else {
+			} else {
 				$link_el = 'link_' . $attrs['rel'];
 			}
 
@@ -223,8 +219,7 @@ 
 		if ($this->feed_type == ATOM and $this->incontent)
 		{
 			$this->append_content( $text );
-		}
-		else {
+		} else {
 			$current_el = join('_', array_reverse($this->stack));
 			$this->append($current_el, $text);
 		}
@@ -238,37 +233,30 @@ 
 			$this->items[] = $this->current_item;
 			$this->current_item = array();
 			$this->initem = false;
-		}
-		elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'textinput' )
+		} elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'textinput' )
 		{
 			$this->intextinput = false;
-		}
-		elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'image' )
+		} elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'image' )
 		{
 			$this->inimage = false;
-		}
-		elseif ($this->feed_type == ATOM and in_array($el, $this->_CONTENT_CONSTRUCTS) )
+		} elseif ($this->feed_type == ATOM and in_array($el, $this->_CONTENT_CONSTRUCTS) )
 		{
 			$this->incontent = false;
-		}
-		elseif ($el == 'channel' or $el == 'feed' )
+		} elseif ($el == 'channel' or $el == 'feed' )
 		{
 			$this->inchannel = false;
-		}
-		elseif ($this->feed_type == ATOM and $this->incontent  ) {
+		} elseif ($this->feed_type == ATOM and $this->incontent  ) {
 			// balance tags properly
 			// note: This may not actually be necessary
 			if ( $this->stack[0] == $el )
 			{
 				$this->append_content("</$el>");
-			}
-			else {
+			} else {
 				$this->append_content("<$el />");
 			}
 
 			array_shift( $this->stack );
-		}
-		else {
+		} else {
 			array_shift( $this->stack );
 		}
 
@@ -285,8 +273,7 @@ 
 	function append_content($text) {
 		if ( $this->initem ) {
 			$this->concat( $this->current_item[ $this->incontent ], $text );
-		}
-		elseif ( $this->inchannel ) {
+		} elseif ( $this->inchannel ) {
 			$this->concat( $this->channel[ $this->incontent ], $text );
 		}
 	}
@@ -301,34 +288,27 @@ 
 			if ( $this->initem ) {
 				$this->concat(
 					$this->current_item[ $this->current_namespace ][ $el ], $text);
-			}
-			elseif ($this->inchannel) {
+			} elseif ($this->inchannel) {
 				$this->concat(
 					$this->channel[ $this->current_namespace][ $el ], $text );
-			}
-			elseif ($this->intextinput) {
+			} elseif ($this->intextinput) {
 				$this->concat(
 					$this->textinput[ $this->current_namespace][ $el ], $text );
-			}
-			elseif ($this->inimage) {
+			} elseif ($this->inimage) {
 				$this->concat(
 					$this->image[ $this->current_namespace ][ $el ], $text );
 			}
-		}
-		else {
+		} else {
 			if ( $this->initem ) {
 				$this->concat(
 					$this->current_item[ $el ], $text);
-			}
-			elseif ($this->intextinput) {
+			} elseif ($this->intextinput) {
 				$this->concat(
 					$this->textinput[ $el ], $text );
-			}
-			elseif ($this->inimage) {
+			} elseif ($this->inimage) {
 				$this->concat(
 					$this->image[ $el ], $text );
-			}
-			elseif ($this->inchannel) {
+			} elseif ($this->inchannel) {
 				$this->concat(
 					$this->channel[ $el ], $text );
 			}
@@ -342,22 +322,25 @@ 
 			$this->channel['descripton'] = $this->channel['tagline'];
 			for ( $i = 0; $i < count($this->items); $i++) {
 				$item = $this->items[$i];
-				if ( isset($item['summary']) )
-					$item['description'] = $item['summary'];
-				if ( isset($item['atom_content']))
-					$item['content']['encoded'] = $item['atom_content'];
+				if ( isset($item['summary']) ) {
+									$item['description'] = $item['summary'];
+				}
+				if ( isset($item['atom_content'])) {
+									$item['content']['encoded'] = $item['atom_content'];
+				}
 
 				$this->items[$i] = $item;
 			}
-		}
-		elseif ( $this->is_rss() ) {
+		} elseif ( $this->is_rss() ) {
 			$this->channel['tagline'] = $this->channel['description'];
 			for ( $i = 0; $i < count($this->items); $i++) {
 				$item = $this->items[$i];
-				if ( isset($item['description']))
-					$item['summary'] = $item['description'];
-				if ( isset($item['content']['encoded'] ) )
-					$item['atom_content'] = $item['content']['encoded'];
+				if ( isset($item['description'])) {
+									$item['summary'] = $item['description'];
+				}
+				if ( isset($item['content']['encoded'] ) ) {
+									$item['atom_content'] = $item['content']['encoded'];
+				}
 
 				$this->items[$i] = $item;
 			}
@@ -367,8 +350,7 @@ 
 	function is_rss () {
 		if ( $this->feed_type == RSS ) {
 			return $this->feed_version;
-		}
-		else {
+		} else {
 			return false;
 		}
 	}
@@ -376,8 +358,7 @@ 
 	function is_atom() {
 		if ( $this->feed_type == ATOM ) {
 			return $this->feed_version;
-		}
-		else {
+		} else {
 			return false;
 		}
 	}
@@ -426,8 +407,7 @@ 
 		$resp = _fetch_remote_file( $url );
 		if ( is_success( $resp->status ) ) {
 			return _response_to_rss( $resp );
-		}
-		else {
+		} else {
 			// error("Failed to fetch $url and cache is off");
 			return false;
 		}
@@ -490,8 +470,7 @@ 
 				// reset cache on 304 (at minutillo insistent prodding)
 				$cache->set($url, $rss);
 				return $rss;
-			}
-			elseif ( is_success( $resp->status ) ) {
+			} elseif ( is_success( $resp->status ) ) {
 				$rss = _response_to_rss( $resp );
 				if ( $rss ) {
 					if (MAGPIE_DEBUG > 1) {
@@ -501,21 +480,18 @@ 
 					$cache->set( $url, $rss );
 					return $rss;
 				}
-			}
-			else {
+			} else {
 				$errormsg = "Failed to fetch $url. ";
 				if ( $resp->error ) {
 					# compensate for Snoopy's annoying habbit to tacking
 					# on '\n'
 					$http_error = substr($resp->error, 0, -2);
 					$errormsg .= "(HTTP Error: $http_error)";
-				}
-				else {
+				} else {
 					$errormsg .=  "(HTTP Response: " . $resp->response_code .')';
 				}
 			}
-		}
-		else {
+		} else {
 			$errormsg = "Unable to retrieve RSS file for unknown reasons.";
 		}
 
@@ -568,8 +544,9 @@ 
 		if ( !is_array($value) ) {
 			$return_headers[] = "$key: $value";
 		} else {
-			foreach ( $value as $v )
-				$return_headers[] = "$key: $v";
+			foreach ( $value as $v ) {
+							$return_headers[] = "$key: $v";
+			}
 		}
 	}
 
@@ -603,8 +580,7 @@ 
 			// 2003-03-02 - Nicola Asuni (www.tecnick.com) - fixed bug "Undefined offset: 1"
 			if (strpos($h, ": ")) {
 				list($field, $val) = explode(": ", $h, 2);
-			}
-			else {
+			} else {
 				$field = $h;
 				$val = "";
 			}
@@ -642,8 +618,7 @@ 
 function init () {
 	if ( defined('MAGPIE_INITALIZED') ) {
 		return;
-	}
-	else {
+	} else {
 		define('MAGPIE_INITALIZED', 1);
 	}
 
@@ -672,8 +647,7 @@ 
 
 		if ( MAGPIE_CACHE_ON ) {
 			$ua = $ua . ')';
-		}
-		else {
+		} else {
 			$ua = $ua . '; No cache)';
 		}
 
@@ -830,8 +804,7 @@ 
 		$this->ERROR = $errormsg;
 		if ( MAGPIE_DEBUG ) {
 			trigger_error( $errormsg, $lvl);
-		}
-		else {
+		} else {
 			error_log( $errormsg, 0);
 		}
 	}
@@ -858,8 +831,7 @@ 
 		$offset = 0;
 		if ( $match[11] == 'Z' ) {
 			# zulu time, aka GMT
-		}
-		else {
+		} else {
 			list( $tz_mod, $tz_hour, $tz_min ) =
 				array( $match[8], $match[9], $match[10]);
 
@@ -879,8 +851,7 @@ 
 		}
 		$epoch = $epoch + $offset;
 		return $epoch;
-	}
-	else {
+	} else {
 		return -1;
 	}
 }

src/wp-includes/shortcodes.php

Doc Comments +2 added lines, -2 removed lines

@@ -283,7 +283,7 @@ 
  *
  * @global array $shortcode_tags
  *
- * @param array $m Regular expression match array
+ * @param string[] $m Regular expression match array
  * @return string|false False on failure.
  */
 function do_shortcode_tag( $m ) {
@@ -546,7 +546,7 @@ 
 /**
  *
  * @param array $m
- * @return string|false
+ * @return string
  */
 function strip_shortcode_tag( $m ) {
 	// allow [[foo]] syntax for escaping a tag

Indentation +33 added lines, -33 removed lines

@@ -1,34 +1,34 @@ 
 <?php
 /**
- * WordPress API for creating bbcode like tags or what WordPress calls
- * "shortcodes." The tag and attribute parsing or regular expression code is
- * based on the Textpattern tag parser.
- *
- * A few examples are below:
- *
- * [shortcode /]
- * [shortcode foo="bar" baz="bing" /]
- * [shortcode foo="bar"]content[/shortcode]
- *
- * Shortcode tags support attributes and enclosed content, but does not entirely
- * support inline shortcodes in other shortcodes. You will have to call the
- * shortcode parser in your function to account for that.
- *
- * {@internal
- * Please be aware that the above note was made during the beta of WordPress 2.6
- * and in the future may not be accurate. Please update the note when it is no
- * longer the case.}}
- *
- * To apply shortcode tags to content:
- *
- *     $out = do_shortcode( $content );
- *
- * @link https://codex.wordpress.org/Shortcode_API
- *
- * @package WordPress
- * @subpackage Shortcodes
- * @since 2.5.0
- */
+	 * WordPress API for creating bbcode like tags or what WordPress calls
+	 * "shortcodes." The tag and attribute parsing or regular expression code is
+	 * based on the Textpattern tag parser.
+	 *
+	 * A few examples are below:
+	 *
+	 * [shortcode /]
+	 * [shortcode foo="bar" baz="bing" /]
+	 * [shortcode foo="bar"]content[/shortcode]
+	 *
+	 * Shortcode tags support attributes and enclosed content, but does not entirely
+	 * support inline shortcodes in other shortcodes. You will have to call the
+	 * shortcode parser in your function to account for that.
+	 *
+	 * {@internal
+	 * Please be aware that the above note was made during the beta of WordPress 2.6
+	 * and in the future may not be accurate. Please update the note when it is no
+	 * longer the case.}}
+	 *
+	 * To apply shortcode tags to content:
+	 *
+	 *     $out = do_shortcode( $content );
+	 *
+	 * @link https://codex.wordpress.org/Shortcode_API
+	 *
+	 * @package WordPress
+	 * @subpackage Shortcodes
+	 * @since 2.5.0
+	 */
 
 /**
  * Container for storing shortcode tags and their hook to call for the shortcode
@@ -426,11 +426,11 @@ 
  * @return string Content with placeholders removed.
  */
 function unescape_invalid_shortcodes( $content ) {
-        // Clean up entire string, avoids re-parsing HTML.
-        $trans = array( '&#91;' => '[', '&#93;' => ']' );
-        $content = strtr( $content, $trans );
+		// Clean up entire string, avoids re-parsing HTML.
+		$trans = array( '&#91;' => '[', '&#93;' => ']' );
+		$content = strtr( $content, $trans );
 
-        return $content;
+		return $content;
 }
 
 /**

Spacing +88 added lines, -88 removed lines

@@ -88,7 +88,7 @@ 
  */
 function add_shortcode($tag, $func) {
 	global $shortcode_tags;
-	$shortcode_tags[ $tag ] = $func;
+	$shortcode_tags[$tag] = $func;
 }
 
 /**
@@ -133,9 +133,9 @@ 
  * @param string $tag Shortcode tag to check.
  * @return bool Whether the given shortcode exists.
  */
-function shortcode_exists( $tag ) {
+function shortcode_exists($tag) {
 	global $shortcode_tags;
-	return array_key_exists( $tag, $shortcode_tags );
+	return array_key_exists($tag, $shortcode_tags);
 }
 
 /**
@@ -149,20 +149,20 @@ 
  * @param string $tag     Shortcode tag to check.
  * @return bool Whether the passed content contains the given shortcode.
  */
-function has_shortcode( $content, $tag ) {
-	if ( false === strpos( $content, '[' ) ) {
+function has_shortcode($content, $tag) {
+	if (false === strpos($content, '[')) {
 		return false;
 	}
 
-	if ( shortcode_exists( $tag ) ) {
-		preg_match_all( '/' . get_shortcode_regex() . '/s', $content, $matches, PREG_SET_ORDER );
-		if ( empty( $matches ) )
+	if (shortcode_exists($tag)) {
+		preg_match_all('/'.get_shortcode_regex().'/s', $content, $matches, PREG_SET_ORDER);
+		if (empty($matches))
 			return false;
 
-		foreach ( $matches as $shortcode ) {
-			if ( $tag === $shortcode[2] ) {
+		foreach ($matches as $shortcode) {
+			if ($tag === $shortcode[2]) {
 				return true;
-			} elseif ( ! empty( $shortcode[5] ) && has_shortcode( $shortcode[5], $tag ) ) {
+			} elseif ( ! empty($shortcode[5]) && has_shortcode($shortcode[5], $tag)) {
 				return true;
 			}
 		}
@@ -185,32 +185,32 @@ 
  * @param bool $ignore_html When true, shortcodes inside HTML elements will be skipped.
  * @return string Content with shortcodes filtered out.
  */
-function do_shortcode( $content, $ignore_html = false ) {
+function do_shortcode($content, $ignore_html = false) {
 	global $shortcode_tags;
 
-	if ( false === strpos( $content, '[' ) ) {
+	if (false === strpos($content, '[')) {
 		return $content;
 	}
 
-	if (empty($shortcode_tags) || !is_array($shortcode_tags))
+	if (empty($shortcode_tags) || ! is_array($shortcode_tags))
 		return $content;
 
 	$tagnames = array_keys($shortcode_tags);
-	$tagregexp = join( '|', array_map('preg_quote', $tagnames) );
+	$tagregexp = join('|', array_map('preg_quote', $tagnames));
 	$pattern = "/\\[($tagregexp)/s";
 
-	if ( 1 !== preg_match( $pattern, $content ) ) {
+	if (1 !== preg_match($pattern, $content)) {
 		// Avoids parsing HTML when there are no shortcodes or embeds anyway.
 		return $content;
 	}
 
-	$content = do_shortcodes_in_html_tags( $content, $ignore_html );
+	$content = do_shortcodes_in_html_tags($content, $ignore_html);
 
 	$pattern = get_shortcode_regex();
-	$content = preg_replace_callback( "/$pattern/s", 'do_shortcode_tag', $content );
+	$content = preg_replace_callback("/$pattern/s", 'do_shortcode_tag', $content);
 
 	// Always restore square braces so we don't break things like <!--[if IE ]>
-	$content = unescape_invalid_shortcodes( $content );
+	$content = unescape_invalid_shortcodes($content);
 
 	return $content;
 }
@@ -239,7 +239,7 @@ 
 function get_shortcode_regex() {
 	global $shortcode_tags;
 	$tagnames = array_keys($shortcode_tags);
-	$tagregexp = join( '|', array_map('preg_quote', $tagnames) );
+	$tagregexp = join('|', array_map('preg_quote', $tagnames));
 
 	// WARNING! Do not change this regex without changing do_shortcode_tag() and strip_shortcode_tag()
 	// Also, see shortcode_unautop() and shortcode.js.
@@ -271,7 +271,7 @@ 
 		.         '\\[\\/\\2\\]'             // Closing shortcode tag
 		.     ')?'
 		. ')'
-		. '(\\]?)';                          // 6: Optional second closing brocket for escaping shortcodes: [[tag]]
+		. '(\\]?)'; // 6: Optional second closing brocket for escaping shortcodes: [[tag]]
 }
 
 /**
@@ -286,29 +286,29 @@ 
  * @param array $m Regular expression match array
  * @return string|false False on failure.
  */
-function do_shortcode_tag( $m ) {
+function do_shortcode_tag($m) {
 	global $shortcode_tags;
 
 	// allow [[foo]] syntax for escaping a tag
-	if ( $m[1] == '[' && $m[6] == ']' ) {
+	if ($m[1] == '[' && $m[6] == ']') {
 		return substr($m[0], 1, -1);
 	}
 
 	$tag = $m[2];
-	$attr = shortcode_parse_atts( $m[3] );
+	$attr = shortcode_parse_atts($m[3]);
 
-	if ( ! is_callable( $shortcode_tags[ $tag ] ) ) {
-		$message = sprintf( __( 'Attempting to parse a shortcode without a valid callback: %s' ), $tag );
-		_doing_it_wrong( __FUNCTION__, $message, '4.3.0' );
+	if ( ! is_callable($shortcode_tags[$tag])) {
+		$message = sprintf(__('Attempting to parse a shortcode without a valid callback: %s'), $tag);
+		_doing_it_wrong(__FUNCTION__, $message, '4.3.0');
 		return $m[0];
 	}
 
-	if ( isset( $m[5] ) ) {
+	if (isset($m[5])) {
 		// enclosing tag - extra parameter
-		return $m[1] . call_user_func( $shortcode_tags[$tag], $attr, $m[5], $tag ) . $m[6];
+		return $m[1].call_user_func($shortcode_tags[$tag], $attr, $m[5], $tag).$m[6];
 	} else {
 		// self-closing tag
-		return $m[1] . call_user_func( $shortcode_tags[$tag], $attr, null,  $tag ) . $m[6];
+		return $m[1].call_user_func($shortcode_tags[$tag], $attr, null, $tag).$m[6];
 	}
 }
 
@@ -326,93 +326,93 @@ 
  * @param bool $ignore_html When true, all square braces inside elements will be encoded.
  * @return string Content with shortcodes filtered out.
  */
-function do_shortcodes_in_html_tags( $content, $ignore_html ) {
+function do_shortcodes_in_html_tags($content, $ignore_html) {
 	// Normalize entities in unfiltered HTML before adding placeholders.
-	$trans = array( '&#91;' => '&#091;', '&#93;' => '&#093;' );
-	$content = strtr( $content, $trans );
-	$trans = array( '[' => '&#91;', ']' => '&#93;' );
+	$trans = array('&#91;' => '&#091;', '&#93;' => '&#093;');
+	$content = strtr($content, $trans);
+	$trans = array('[' => '&#91;', ']' => '&#93;');
 
 	$pattern = get_shortcode_regex();
-	$textarr = wp_html_split( $content );
+	$textarr = wp_html_split($content);
 
-	foreach ( $textarr as &$element ) {
-		if ( '' == $element || '<' !== $element[0] ) {
+	foreach ($textarr as &$element) {
+		if ('' == $element || '<' !== $element[0]) {
 			continue;
 		}
 
-		$noopen = false === strpos( $element, '[' );
-		$noclose = false === strpos( $element, ']' );
-		if ( $noopen || $noclose ) {
+		$noopen = false === strpos($element, '[');
+		$noclose = false === strpos($element, ']');
+		if ($noopen || $noclose) {
 			// This element does not contain shortcodes.
-			if ( $noopen xor $noclose ) {
+			if ($noopen xor $noclose) {
 				// Need to encode stray [ or ] chars.
-				$element = strtr( $element, $trans );
+				$element = strtr($element, $trans);
 			}
 			continue;
 		}
 
-		if ( $ignore_html || '<!--' === substr( $element, 0, 4 ) || '<![CDATA[' === substr( $element, 0, 9 ) ) {
+		if ($ignore_html || '<!--' === substr($element, 0, 4) || '<![CDATA[' === substr($element, 0, 9)) {
 			// Encode all [ and ] chars.
-			$element = strtr( $element, $trans );
+			$element = strtr($element, $trans);
 			continue;
 		}
 
-		$attributes = wp_kses_attr_parse( $element );
-		if ( false === $attributes ) {
+		$attributes = wp_kses_attr_parse($element);
+		if (false === $attributes) {
 			// Some plugins are doing things like [name] <[email]>.
-			if ( 1 === preg_match( '%^<\s*\[\[?[^\[\]]+\]%', $element ) ) {
-				$element = preg_replace_callback( "/$pattern/s", 'do_shortcode_tag', $element );
+			if (1 === preg_match('%^<\s*\[\[?[^\[\]]+\]%', $element)) {
+				$element = preg_replace_callback("/$pattern/s", 'do_shortcode_tag', $element);
 			}
 
 			// Looks like we found some crazy unfiltered HTML.  Skipping it for sanity.
-			$element = strtr( $element, $trans );
+			$element = strtr($element, $trans);
 			continue;
 		}
 
 		// Get element name
-		$front = array_shift( $attributes );
-		$back = array_pop( $attributes );
+		$front = array_shift($attributes);
+		$back = array_pop($attributes);
 		$matches = array();
 		preg_match('%[a-zA-Z0-9]+%', $front, $matches);
 		$elname = $matches[0];
 
 		// Look for shortcodes in each attribute separately.
-		foreach ( $attributes as &$attr ) {
-			$open = strpos( $attr, '[' );
-			$close = strpos( $attr, ']' );
-			if ( false === $open || false === $close ) {
+		foreach ($attributes as &$attr) {
+			$open = strpos($attr, '[');
+			$close = strpos($attr, ']');
+			if (false === $open || false === $close) {
 				continue; // Go to next attribute.  Square braces will be escaped at end of loop.
 			}
-			$double = strpos( $attr, '"' );
-			$single = strpos( $attr, "'" );
-			if ( ( false === $single || $open < $single ) && ( false === $double || $open < $double ) ) {
+			$double = strpos($attr, '"');
+			$single = strpos($attr, "'");
+			if ((false === $single || $open < $single) && (false === $double || $open < $double)) {
 				// $attr like '[shortcode]' or 'name = [shortcode]' implies unfiltered_html.
 				// In this specific situation we assume KSES did not run because the input
 				// was written by an administrator, so we should avoid changing the output
 				// and we do not need to run KSES here.
-				$attr = preg_replace_callback( "/$pattern/s", 'do_shortcode_tag', $attr );
+				$attr = preg_replace_callback("/$pattern/s", 'do_shortcode_tag', $attr);
 			} else {
 				// $attr like 'name = "[shortcode]"' or "name = '[shortcode]'"
 				// We do not know if $content was unfiltered. Assume KSES ran before shortcodes.
 				$count = 0;
-				$new_attr = preg_replace_callback( "/$pattern/s", 'do_shortcode_tag', $attr, -1, $count );
-				if ( $count > 0 ) {
+				$new_attr = preg_replace_callback("/$pattern/s", 'do_shortcode_tag', $attr, -1, $count);
+				if ($count > 0) {
 					// Sanitize the shortcode output using KSES.
-					$new_attr = wp_kses_one_attr( $new_attr, $elname );
-					if ( '' !== trim( $new_attr ) ) {
+					$new_attr = wp_kses_one_attr($new_attr, $elname);
+					if ('' !== trim($new_attr)) {
 						// The shortcode is safe to use now.
 						$attr = $new_attr;
 					}
 				}
 			}
 		}
-		$element = $front . implode( '', $attributes ) . $back;
+		$element = $front.implode('', $attributes).$back;
 
 		// Now encode any remaining [ or ] chars.
-		$element = strtr( $element, $trans );
+		$element = strtr($element, $trans);
 	}
 
-	$content = implode( '', $textarr );
+	$content = implode('', $textarr);
 
 	return $content;
 }
@@ -425,10 +425,10 @@ 
  * @param string $content Content to search for placeholders.
  * @return string Content with placeholders removed.
  */
-function unescape_invalid_shortcodes( $content ) {
+function unescape_invalid_shortcodes($content) {
         // Clean up entire string, avoids re-parsing HTML.
-        $trans = array( '&#91;' => '[', '&#93;' => ']' );
-        $content = strtr( $content, $trans );
+        $trans = array('&#91;' => '[', '&#93;' => ']');
+        $content = strtr($content, $trans);
 
         return $content;
 }
@@ -449,13 +449,13 @@ 
 	$atts = array();
 	$pattern = '/([\w-]+)\s*=\s*"([^"]*)"(?:\s|$)|([\w-]+)\s*=\s*\'([^\']*)\'(?:\s|$)|([\w-]+)\s*=\s*([^\s\'"]+)(?:\s|$)|"([^"]*)"(?:\s|$)|(\S+)(?:\s|$)/';
 	$text = preg_replace("/[\x{00a0}\x{200b}]+/u", " ", $text);
-	if ( preg_match_all($pattern, $text, $match, PREG_SET_ORDER) ) {
+	if (preg_match_all($pattern, $text, $match, PREG_SET_ORDER)) {
 		foreach ($match as $m) {
-			if (!empty($m[1]))
+			if ( ! empty($m[1]))
 				$atts[strtolower($m[1])] = stripcslashes($m[2]);
-			elseif (!empty($m[3]))
+			elseif ( ! empty($m[3]))
 				$atts[strtolower($m[3])] = stripcslashes($m[4]);
-			elseif (!empty($m[5]))
+			elseif ( ! empty($m[5]))
 				$atts[strtolower($m[5])] = stripcslashes($m[6]);
 			elseif (isset($m[7]) && strlen($m[7]))
 				$atts[] = stripcslashes($m[7]);
@@ -485,11 +485,11 @@ 
  * @param string $shortcode Optional. The name of the shortcode, provided for context to enable filtering
  * @return array Combined and filtered attribute list.
  */
-function shortcode_atts( $pairs, $atts, $shortcode = '' ) {
-	$atts = (array)$atts;
+function shortcode_atts($pairs, $atts, $shortcode = '') {
+	$atts = (array) $atts;
 	$out = array();
-	foreach($pairs as $name => $default) {
-		if ( array_key_exists($name, $atts) )
+	foreach ($pairs as $name => $default) {
+		if (array_key_exists($name, $atts))
 			$out[$name] = $atts[$name];
 		else
 			$out[$name] = $default;
@@ -506,8 +506,8 @@ 
 	 * @param array $pairs The supported attributes and their defaults.
 	 * @param array $atts  The user defined shortcode attributes.
 	 */
-	if ( $shortcode )
-		$out = apply_filters( "shortcode_atts_{$shortcode}", $out, $pairs, $atts );
+	if ($shortcode)
+		$out = apply_filters("shortcode_atts_{$shortcode}", $out, $pairs, $atts);
 
 	return $out;
 }
@@ -522,23 +522,23 @@ 
  * @param string $content Content to remove shortcode tags.
  * @return string Content without shortcode tags.
  */
-function strip_shortcodes( $content ) {
+function strip_shortcodes($content) {
 	global $shortcode_tags;
 
-	if ( false === strpos( $content, '[' ) ) {
+	if (false === strpos($content, '[')) {
 		return $content;
 	}
 
-	if (empty($shortcode_tags) || !is_array($shortcode_tags))
+	if (empty($shortcode_tags) || ! is_array($shortcode_tags))
 		return $content;
 
-	$content = do_shortcodes_in_html_tags( $content, true );
+	$content = do_shortcodes_in_html_tags($content, true);
 
 	$pattern = get_shortcode_regex();
-	$content = preg_replace_callback( "/$pattern/s", 'strip_shortcode_tag', $content );
+	$content = preg_replace_callback("/$pattern/s", 'strip_shortcode_tag', $content);
 
 	// Always restore square braces so we don't break things like <!--[if IE ]>
-	$content = unescape_invalid_shortcodes( $content );
+	$content = unescape_invalid_shortcodes($content);
 
 	return $content;
 }
@@ -548,11 +548,11 @@ 
  * @param array $m
  * @return string|false
  */
-function strip_shortcode_tag( $m ) {
+function strip_shortcode_tag($m) {
 	// allow [[foo]] syntax for escaping a tag
-	if ( $m[1] == '[' && $m[6] == ']' ) {
+	if ($m[1] == '[' && $m[6] == ']') {
 		return substr($m[0], 1, -1);
 	}
 
-	return $m[1] . $m[6];
+	return $m[1].$m[6];
 }

Braces +28 added lines, -22 removed lines

@@ -156,8 +156,9 @@ 
 
 	if ( shortcode_exists( $tag ) ) {
 		preg_match_all( '/' . get_shortcode_regex() . '/s', $content, $matches, PREG_SET_ORDER );
-		if ( empty( $matches ) )
-			return false;
+		if ( empty( $matches ) ) {
+					return false;
+		}
 
 		foreach ( $matches as $shortcode ) {
 			if ( $tag === $shortcode[2] ) {
@@ -192,8 +193,9 @@ 
 		return $content;
 	}
 
-	if (empty($shortcode_tags) || !is_array($shortcode_tags))
-		return $content;
+	if (empty($shortcode_tags) || !is_array($shortcode_tags)) {
+			return $content;
+	}
 
 	$tagnames = array_keys($shortcode_tags);
 	$tagregexp = join( '|', array_map('preg_quote', $tagnames) );
@@ -451,16 +453,17 @@ 
 	$text = preg_replace("/[\x{00a0}\x{200b}]+/u", " ", $text);
 	if ( preg_match_all($pattern, $text, $match, PREG_SET_ORDER) ) {
 		foreach ($match as $m) {
-			if (!empty($m[1]))
-				$atts[strtolower($m[1])] = stripcslashes($m[2]);
-			elseif (!empty($m[3]))
-				$atts[strtolower($m[3])] = stripcslashes($m[4]);
-			elseif (!empty($m[5]))
-				$atts[strtolower($m[5])] = stripcslashes($m[6]);
-			elseif (isset($m[7]) && strlen($m[7]))
-				$atts[] = stripcslashes($m[7]);
-			elseif (isset($m[8]))
-				$atts[] = stripcslashes($m[8]);
+			if (!empty($m[1])) {
+							$atts[strtolower($m[1])] = stripcslashes($m[2]);
+			} elseif (!empty($m[3])) {
+							$atts[strtolower($m[3])] = stripcslashes($m[4]);
+			} elseif (!empty($m[5])) {
+							$atts[strtolower($m[5])] = stripcslashes($m[6]);
+			} elseif (isset($m[7]) && strlen($m[7])) {
+							$atts[] = stripcslashes($m[7]);
+			} elseif (isset($m[8])) {
+							$atts[] = stripcslashes($m[8]);
+			}
 		}
 	} else {
 		$atts = ltrim($text);
@@ -489,10 +492,11 @@ 
 	$atts = (array)$atts;
 	$out = array();
 	foreach($pairs as $name => $default) {
-		if ( array_key_exists($name, $atts) )
-			$out[$name] = $atts[$name];
-		else
-			$out[$name] = $default;
+		if ( array_key_exists($name, $atts) ) {
+					$out[$name] = $atts[$name];
+		} else {
+					$out[$name] = $default;
+		}
 	}
 	/**
 	 * Filter a shortcode's default attributes.
@@ -506,8 +510,9 @@ 
 	 * @param array $pairs The supported attributes and their defaults.
 	 * @param array $atts  The user defined shortcode attributes.
 	 */
-	if ( $shortcode )
-		$out = apply_filters( "shortcode_atts_{$shortcode}", $out, $pairs, $atts );
+	if ( $shortcode ) {
+			$out = apply_filters( "shortcode_atts_{$shortcode}", $out, $pairs, $atts );
+	}
 
 	return $out;
 }
@@ -529,8 +534,9 @@ 
 		return $content;
 	}
 
-	if (empty($shortcode_tags) || !is_array($shortcode_tags))
-		return $content;
+	if (empty($shortcode_tags) || !is_array($shortcode_tags)) {
+			return $content;
+	}
 
 	$content = do_shortcodes_in_html_tags( $content, true );
 

src/wp-includes/SimplePie/Decode/HTML/Entities.php

Doc Comments +2 added lines, -2 removed lines

@@ -109,7 +109,7 @@ 
 	 * Consume the next byte
 	 *
 	 * @access private
-	 * @return mixed The next byte, or false, if there is no more data
+	 * @return string|false The next byte, or false, if there is no more data
 	 */
 	public function consume()
 	{
@@ -129,7 +129,7 @@ 
 	 *
 	 * @access private
 	 * @param string $chars Characters to consume
-	 * @return mixed A series of characters that match the range, or false
+	 * @return string|false A series of characters that match the range, or false
 	 */
 	public function consume_range($chars)
 	{

Indentation +41 added lines, -41 removed lines

@@ -1,46 +1,46 @@
 <?php
 /**
- * SimplePie
- *
- * A PHP-Based RSS and Atom Feed Framework.
- * Takes the hard work out of managing a complete RSS/Atom solution.
- *
- * Copyright (c) 2004-2012, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification, are
- * permitted provided that the following conditions are met:
- *
- * 	* Redistributions of source code must retain the above copyright notice, this list of
- * 	  conditions and the following disclaimer.
- *
- * 	* Redistributions in binary form must reproduce the above copyright notice, this list
- * 	  of conditions and the following disclaimer in the documentation and/or other materials
- * 	  provided with the distribution.
- *
- * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
- * 	  to endorse or promote products derived from this software without specific prior
- * 	  written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
- * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
- * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package SimplePie
- * @version 1.3.1
- * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
- * @author Ryan Parman
- * @author Geoffrey Sneddon
- * @author Ryan McCue
- * @link http://simplepie.org/ SimplePie
- * @license http://www.opensource.org/licenses/bsd-license.php BSD License
- */
+	 * SimplePie
+	 *
+	 * A PHP-Based RSS and Atom Feed Framework.
+	 * Takes the hard work out of managing a complete RSS/Atom solution.
+	 *
+	 * Copyright (c) 2004-2012, Ryan Parman, Geoffrey Sneddon, Ryan McCue, and contributors
+	 * All rights reserved.
+	 *
+	 * Redistribution and use in source and binary forms, with or without modification, are
+	 * permitted provided that the following conditions are met:
+	 *
+	 * 	* Redistributions of source code must retain the above copyright notice, this list of
+	 * 	  conditions and the following disclaimer.
+	 *
+	 * 	* Redistributions in binary form must reproduce the above copyright notice, this list
+	 * 	  of conditions and the following disclaimer in the documentation and/or other materials
+	 * 	  provided with the distribution.
+	 *
+	 * 	* Neither the name of the SimplePie Team nor the names of its contributors may be used
+	 * 	  to endorse or promote products derived from this software without specific prior
+	 * 	  written permission.
+	 *
+	 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
+	 * OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+	 * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS
+	 * AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+	 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+	 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+	 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+	 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+	 * POSSIBILITY OF SUCH DAMAGE.
+	 *
+	 * @package SimplePie
+	 * @version 1.3.1
+	 * @copyright 2004-2012 Ryan Parman, Geoffrey Sneddon, Ryan McCue
+	 * @author Ryan Parman
+	 * @author Geoffrey Sneddon
+	 * @author Ryan McCue
+	 * @link http://simplepie.org/ SimplePie
+	 * @license http://www.opensource.org/licenses/bsd-license.php BSD License
+	 */
 
 
 /**

Spacing +1 added lines, -1 removed lines

@@ -215,7 +215,7 @@
 						$replacement = SimplePie_Misc::codepoint_to_utf8($codepoint);
 					}
 
-					if (!in_array($this->consume(), array(';', false), true))
+					if ( ! in_array($this->consume(), array(';', false), true))
 					{
 						$this->unconsume();
 					}

Braces +4 added lines, -8 removed lines

@@ -117,8 +117,7 @@ 
 		{
 			$this->consumed .= $this->data[$this->position];
 			return $this->data[$this->position++];
-		}
-		else
+		} else
 		{
 			return false;
 		}
@@ -139,8 +138,7 @@ 
 			$this->consumed .= $data;
 			$this->position += $len;
 			return $data;
-		}
-		else
+		} else
 		{
 			return false;
 		}
@@ -200,8 +198,7 @@ 
 					if ($hex)
 					{
 						$codepoint = hexdec($codepoint);
-					}
-					else
+					} else
 					{
 						$codepoint = intval($codepoint);
 					}
@@ -209,8 +206,7 @@ 
 					if (isset($windows_1252_specials[$codepoint]))
 					{
 						$replacement = $windows_1252_specials[$codepoint];
-					}
-					else
+					} else
 					{
 						$replacement = SimplePie_Misc::codepoint_to_utf8($codepoint);
 					}

src/wp-includes/SimplePie/Enclosure.php

Doc Comments +1 added lines, -1 removed lines

@@ -647,7 +647,7 @@
 	/**
 	 * Get length
 	 *
-	 * @return float Length in bytes
+	 * @return string|null Length in bytes
 	 */
 	public function get_length()
 	{

Spacing +19 added lines, -19 removed lines

@@ -813,7 +813,7 @@ 
 		$length = $this->get_length();
 		if ($length !== null)
 		{
-			return round($length/1048576, 2);
+			return round($length / 1048576, 2);
 		}
 		else
 		{
@@ -917,7 +917,7 @@ 
 	 * @param array|string $options See first paramter to {@see embed}
 	 * @return string HTML string to output
 	 */
-	public function native_embed($options='')
+	public function native_embed($options = '')
 	{
 		return $this->embed($options, true);
 	}
@@ -991,7 +991,7 @@ 
 		else
 		{
 			$options = explode(',', $options);
-			foreach($options as $option)
+			foreach ($options as $option)
 			{
 				$opt = explode(':', $option, 2);
 				if (isset($opt[0], $opt[1]))
@@ -1058,11 +1058,11 @@ 
 				}
 				elseif ($widescreen)
 				{
-					$width = round((intval($height)/9)*16);
+					$width = round((intval($height) / 9) * 16);
 				}
 				else
 				{
-					$width = round((intval($height)/3)*4);
+					$width = round((intval($height) / 3) * 4);
 				}
 			}
 			else
@@ -1092,11 +1092,11 @@ 
 				}
 				elseif ($widescreen)
 				{
-					$height = round((intval($width)/16)*9);
+					$height = round((intval($width) / 16) * 9);
 				}
 				else
 				{
-					$height = round((intval($width)/4)*3);
+					$height = round((intval($width) / 4) * 3);
 				}
 			}
 			else
@@ -1126,11 +1126,11 @@ 
 		{
 			if ($native)
 			{
-				$embed .= "<embed src=\"" . $this->get_link() . "\" pluginspage=\"http://adobe.com/go/getflashplayer\" type=\"$type\" quality=\"high\" width=\"$width\" height=\"$height\" bgcolor=\"$bgcolor\" loop=\"$loop\"></embed>";
+				$embed .= "<embed src=\"".$this->get_link()."\" pluginspage=\"http://adobe.com/go/getflashplayer\" type=\"$type\" quality=\"high\" width=\"$width\" height=\"$height\" bgcolor=\"$bgcolor\" loop=\"$loop\"></embed>";
 			}
 			else
 			{
-				$embed .= "<script type='text/javascript'>embed_flash('$bgcolor', '$width', '$height', '" . $this->get_link() . "', '$loop', '$type');</script>";
+				$embed .= "<script type='text/javascript'>embed_flash('$bgcolor', '$width', '$height', '".$this->get_link()."', '$loop', '$type');</script>";
 			}
 		}
 
@@ -1141,11 +1141,11 @@ 
 			$height += 20;
 			if ($native)
 			{
-				$embed .= "<embed src=\"$mediaplayer\" pluginspage=\"http://adobe.com/go/getflashplayer\" type=\"application/x-shockwave-flash\" quality=\"high\" width=\"$width\" height=\"$height\" wmode=\"transparent\" flashvars=\"file=" . rawurlencode($this->get_link().'?file_extension=.'.$this->get_extension()) . "&autostart=false&repeat=$loop&showdigits=true&showfsbutton=false\"></embed>";
+				$embed .= "<embed src=\"$mediaplayer\" pluginspage=\"http://adobe.com/go/getflashplayer\" type=\"application/x-shockwave-flash\" quality=\"high\" width=\"$width\" height=\"$height\" wmode=\"transparent\" flashvars=\"file=".rawurlencode($this->get_link().'?file_extension=.'.$this->get_extension())."&autostart=false&repeat=$loop&showdigits=true&showfsbutton=false\"></embed>";
 			}
 			else
 			{
-				$embed .= "<script type='text/javascript'>embed_flv('$width', '$height', '" . rawurlencode($this->get_link().'?file_extension=.'.$this->get_extension()) . "', '$placeholder', '$loop', '$mediaplayer');</script>";
+				$embed .= "<script type='text/javascript'>embed_flv('$width', '$height', '".rawurlencode($this->get_link().'?file_extension=.'.$this->get_extension())."', '$placeholder', '$loop', '$mediaplayer');</script>";
 			}
 		}
 
@@ -1158,16 +1158,16 @@ 
 			{
 				if ($placeholder !== '')
 				{
-					$embed .= "<embed type=\"$type\" style=\"cursor:hand; cursor:pointer;\" href=\"" . $this->get_link() . "\" src=\"$placeholder\" width=\"$width\" height=\"$height\" autoplay=\"false\" target=\"myself\" controller=\"false\" loop=\"$loop\" scale=\"aspect\" bgcolor=\"$bgcolor\" pluginspage=\"http://apple.com/quicktime/download/\"></embed>";
+					$embed .= "<embed type=\"$type\" style=\"cursor:hand; cursor:pointer;\" href=\"".$this->get_link()."\" src=\"$placeholder\" width=\"$width\" height=\"$height\" autoplay=\"false\" target=\"myself\" controller=\"false\" loop=\"$loop\" scale=\"aspect\" bgcolor=\"$bgcolor\" pluginspage=\"http://apple.com/quicktime/download/\"></embed>";
 				}
 				else
 				{
-					$embed .= "<embed type=\"$type\" style=\"cursor:hand; cursor:pointer;\" src=\"" . $this->get_link() . "\" width=\"$width\" height=\"$height\" autoplay=\"false\" target=\"myself\" controller=\"true\" loop=\"$loop\" scale=\"aspect\" bgcolor=\"$bgcolor\" pluginspage=\"http://apple.com/quicktime/download/\"></embed>";
+					$embed .= "<embed type=\"$type\" style=\"cursor:hand; cursor:pointer;\" src=\"".$this->get_link()."\" width=\"$width\" height=\"$height\" autoplay=\"false\" target=\"myself\" controller=\"true\" loop=\"$loop\" scale=\"aspect\" bgcolor=\"$bgcolor\" pluginspage=\"http://apple.com/quicktime/download/\"></embed>";
 				}
 			}
 			else
 			{
-				$embed .= "<script type='text/javascript'>embed_quicktime('$type', '$bgcolor', '$width', '$height', '" . $this->get_link() . "', '$placeholder', '$loop');</script>";
+				$embed .= "<script type='text/javascript'>embed_quicktime('$type', '$bgcolor', '$width', '$height', '".$this->get_link()."', '$placeholder', '$loop');</script>";
 			}
 		}
 
@@ -1177,16 +1177,16 @@ 
 			$height += 45;
 			if ($native)
 			{
-				$embed .= "<embed type=\"application/x-mplayer2\" src=\"" . $this->get_link() . "\" autosize=\"1\" width=\"$width\" height=\"$height\" showcontrols=\"1\" showstatusbar=\"0\" showdisplay=\"0\" autostart=\"0\"></embed>";
+				$embed .= "<embed type=\"application/x-mplayer2\" src=\"".$this->get_link()."\" autosize=\"1\" width=\"$width\" height=\"$height\" showcontrols=\"1\" showstatusbar=\"0\" showdisplay=\"0\" autostart=\"0\"></embed>";
 			}
 			else
 			{
-				$embed .= "<script type='text/javascript'>embed_wmedia('$width', '$height', '" . $this->get_link() . "');</script>";
+				$embed .= "<script type='text/javascript'>embed_wmedia('$width', '$height', '".$this->get_link()."');</script>";
 			}
 		}
 
 		// Everything else
-		else $embed .= '<a href="' . $this->get_link() . '" class="' . $altclass . '">' . $alt . '</a>';
+		else $embed .= '<a href="'.$this->get_link().'" class="'.$altclass.'">'.$alt.'</a>';
 
 		return $embed;
 	}
@@ -1206,7 +1206,7 @@ 
 	{
 		// Mime-types by handler.
 		$types_flash = array('application/x-shockwave-flash', 'application/futuresplash'); // Flash
-		$types_fmedia = array('video/flv', 'video/x-flv','flv-application/octet-stream'); // Flash Media Player
+		$types_fmedia = array('video/flv', 'video/x-flv', 'flv-application/octet-stream'); // Flash Media Player
 		$types_quicktime = array('audio/3gpp', 'audio/3gpp2', 'audio/aac', 'audio/x-aac', 'audio/aiff', 'audio/x-aiff', 'audio/mid', 'audio/midi', 'audio/x-midi', 'audio/mp4', 'audio/m4a', 'audio/x-m4a', 'audio/wav', 'audio/x-wav', 'video/3gpp', 'video/3gpp2', 'video/m4v', 'video/x-m4v', 'video/mp4', 'video/mpeg', 'video/x-mpeg', 'video/quicktime', 'video/sd-video'); // QuickTime
 		$types_wmedia = array('application/asx', 'application/x-mplayer2', 'audio/x-ms-wma', 'audio/x-ms-wax', 'video/x-ms-asf-plugin', 'video/x-ms-asf', 'video/x-ms-wm', 'video/x-ms-wmv', 'video/x-ms-wvx'); // Windows Media
 		$types_mp3 = array('audio/mp3', 'audio/x-mp3', 'audio/mpeg', 'audio/x-mpeg'); // MP3
@@ -1221,7 +1221,7 @@ 
 		}
 
 		// If we encounter an unsupported mime-type, check the file extension and guess intelligently.
-		if (!in_array($type, array_merge($types_flash, $types_fmedia, $types_quicktime, $types_wmedia, $types_mp3)))
+		if ( ! in_array($type, array_merge($types_flash, $types_fmedia, $types_quicktime, $types_wmedia, $types_mp3)))
 		{
 			switch (strtolower($this->get_extension()))
 			{

Braces +61 added lines, -117 removed lines

@@ -282,8 +282,7 @@ 
 		if ($this->bitrate !== null)
 		{
 			return $this->bitrate;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -301,8 +300,7 @@ 
 		if (isset($captions[$key]))
 		{
 			return $captions[$key];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -318,8 +316,7 @@ 
 		if ($this->captions !== null)
 		{
 			return $this->captions;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -337,8 +334,7 @@ 
 		if (isset($categories[$key]))
 		{
 			return $categories[$key];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -354,8 +350,7 @@ 
 		if ($this->categories !== null)
 		{
 			return $this->categories;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -371,8 +366,7 @@ 
 		if ($this->channels !== null)
 		{
 			return $this->channels;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -388,8 +382,7 @@ 
 		if ($this->copyright !== null)
 		{
 			return $this->copyright;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -407,8 +400,7 @@ 
 		if (isset($credits[$key]))
 		{
 			return $credits[$key];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -424,8 +416,7 @@ 
 		if ($this->credits !== null)
 		{
 			return $this->credits;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -441,8 +432,7 @@ 
 		if ($this->description !== null)
 		{
 			return $this->description;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -462,13 +452,11 @@ 
 			{
 				$time = SimplePie_Misc::time_hms($this->duration);
 				return $time;
-			}
-			else
+			} else
 			{
 				return $this->duration;
 			}
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -484,8 +472,7 @@ 
 		if ($this->expression !== null)
 		{
 			return $this->expression;
-		}
-		else
+		} else
 		{
 			return 'full';
 		}
@@ -519,8 +506,7 @@ 
 		if ($this->framerate !== null)
 		{
 			return $this->framerate;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -549,8 +535,7 @@ 
 		if (isset($hashes[$key]))
 		{
 			return $hashes[$key];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -566,8 +551,7 @@ 
 		if ($this->hashes !== null)
 		{
 			return $this->hashes;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -583,8 +567,7 @@ 
 		if ($this->height !== null)
 		{
 			return $this->height;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -601,8 +584,7 @@ 
 		if ($this->lang !== null)
 		{
 			return $this->lang;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -620,8 +602,7 @@ 
 		if (isset($keywords[$key]))
 		{
 			return $keywords[$key];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -637,8 +618,7 @@ 
 		if ($this->keywords !== null)
 		{
 			return $this->keywords;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -654,8 +634,7 @@ 
 		if ($this->length !== null)
 		{
 			return $this->length;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -671,8 +650,7 @@ 
 		if ($this->link !== null)
 		{
 			return urldecode($this->link);
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -689,8 +667,7 @@ 
 		if ($this->medium !== null)
 		{
 			return $this->medium;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -707,8 +684,7 @@ 
 		if ($this->player !== null)
 		{
 			return $this->player;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -726,8 +702,7 @@ 
 		if (isset($ratings[$key]))
 		{
 			return $ratings[$key];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -743,8 +718,7 @@ 
 		if ($this->ratings !== null)
 		{
 			return $this->ratings;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -762,8 +736,7 @@ 
 		if (isset($restrictions[$key]))
 		{
 			return $restrictions[$key];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -779,8 +752,7 @@ 
 		if ($this->restrictions !== null)
 		{
 			return $this->restrictions;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -796,8 +768,7 @@ 
 		if ($this->samplingrate !== null)
 		{
 			return $this->samplingrate;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -814,8 +785,7 @@ 
 		if ($length !== null)
 		{
 			return round($length/1048576, 2);
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -833,8 +803,7 @@ 
 		if (isset($thumbnails[$key]))
 		{
 			return $thumbnails[$key];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -850,8 +819,7 @@ 
 		if ($this->thumbnails !== null)
 		{
 			return $this->thumbnails;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -867,8 +835,7 @@ 
 		if ($this->title !== null)
 		{
 			return $this->title;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -885,8 +852,7 @@ 
 		if ($this->type !== null)
 		{
 			return $this->type;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -902,8 +868,7 @@ 
 		if ($this->width !== null)
 		{
 			return $this->width;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -987,8 +952,7 @@ 
 		if (is_array($options))
 		{
 			extract($options);
-		}
-		else
+		} else
 		{
 			$options = explode(',', $options);
 			foreach($options as $option)
@@ -1055,17 +1019,14 @@ 
 				if ($height === 'auto')
 				{
 					$width = 480;
-				}
-				elseif ($widescreen)
+				} elseif ($widescreen)
 				{
 					$width = round((intval($height)/9)*16);
-				}
-				else
+				} else
 				{
 					$width = round((intval($height)/3)*4);
 				}
-			}
-			else
+			} else
 			{
 				$width = '100%';
 			}
@@ -1076,35 +1037,29 @@ 
 			if ($mime === 'audio')
 			{
 				$height = 0;
-			}
-			elseif ($mime === 'video')
+			} elseif ($mime === 'video')
 			{
 				if ($width === 'auto')
 				{
 					if ($widescreen)
 					{
 						$height = 270;
-					}
-					else
+					} else
 					{
 						$height = 360;
 					}
-				}
-				elseif ($widescreen)
+				} elseif ($widescreen)
 				{
 					$height = round((intval($width)/16)*9);
-				}
-				else
+				} else
 				{
 					$height = round((intval($width)/4)*3);
 				}
-			}
-			else
+			} else
 			{
 				$height = 376;
 			}
-		}
-		elseif ($mime === 'audio')
+		} elseif ($mime === 'audio')
 		{
 			$height = 0;
 		}
@@ -1113,8 +1068,7 @@ 
 		if ($mime === 'audio')
 		{
 			$placeholder = $audio;
-		}
-		elseif ($mime === 'video')
+		} elseif ($mime === 'video')
 		{
 			$placeholder = $video;
 		}
@@ -1127,8 +1081,7 @@ 
 			if ($native)
 			{
 				$embed .= "<embed src=\"" . $this->get_link() . "\" pluginspage=\"http://adobe.com/go/getflashplayer\" type=\"$type\" quality=\"high\" width=\"$width\" height=\"$height\" bgcolor=\"$bgcolor\" loop=\"$loop\"></embed>";
-			}
-			else
+			} else
 			{
 				$embed .= "<script type='text/javascript'>embed_flash('$bgcolor', '$width', '$height', '" . $this->get_link() . "', '$loop', '$type');</script>";
 			}
@@ -1142,8 +1095,7 @@ 
 			if ($native)
 			{
 				$embed .= "<embed src=\"$mediaplayer\" pluginspage=\"http://adobe.com/go/getflashplayer\" type=\"application/x-shockwave-flash\" quality=\"high\" width=\"$width\" height=\"$height\" wmode=\"transparent\" flashvars=\"file=" . rawurlencode($this->get_link().'?file_extension=.'.$this->get_extension()) . "&autostart=false&repeat=$loop&showdigits=true&showfsbutton=false\"></embed>";
-			}
-			else
+			} else
 			{
 				$embed .= "<script type='text/javascript'>embed_flv('$width', '$height', '" . rawurlencode($this->get_link().'?file_extension=.'.$this->get_extension()) . "', '$placeholder', '$loop', '$mediaplayer');</script>";
 			}
@@ -1159,13 +1111,11 @@ 
 				if ($placeholder !== '')
 				{
 					$embed .= "<embed type=\"$type\" style=\"cursor:hand; cursor:pointer;\" href=\"" . $this->get_link() . "\" src=\"$placeholder\" width=\"$width\" height=\"$height\" autoplay=\"false\" target=\"myself\" controller=\"false\" loop=\"$loop\" scale=\"aspect\" bgcolor=\"$bgcolor\" pluginspage=\"http://apple.com/quicktime/download/\"></embed>";
-				}
-				else
+				} else
 				{
 					$embed .= "<embed type=\"$type\" style=\"cursor:hand; cursor:pointer;\" src=\"" . $this->get_link() . "\" width=\"$width\" height=\"$height\" autoplay=\"false\" target=\"myself\" controller=\"true\" loop=\"$loop\" scale=\"aspect\" bgcolor=\"$bgcolor\" pluginspage=\"http://apple.com/quicktime/download/\"></embed>";
 				}
-			}
-			else
+			} else
 			{
 				$embed .= "<script type='text/javascript'>embed_quicktime('$type', '$bgcolor', '$width', '$height', '" . $this->get_link() . "', '$placeholder', '$loop');</script>";
 			}
@@ -1178,15 +1128,16 @@ 
 			if ($native)
 			{
 				$embed .= "<embed type=\"application/x-mplayer2\" src=\"" . $this->get_link() . "\" autosize=\"1\" width=\"$width\" height=\"$height\" showcontrols=\"1\" showstatusbar=\"0\" showdisplay=\"0\" autostart=\"0\"></embed>";
-			}
-			else
+			} else
 			{
 				$embed .= "<script type='text/javascript'>embed_wmedia('$width', '$height', '" . $this->get_link() . "');</script>";
 			}
 		}
 
 		// Everything else
-		else $embed .= '<a href="' . $this->get_link() . '" class="' . $altclass . '">' . $alt . '</a>';
+		else {
+			$embed .= '<a href="' . $this->get_link() . '" class="' . $altclass . '">' . $alt . '</a>';
+		}
 
 		return $embed;
 	}
@@ -1214,8 +1165,7 @@ 
 		if ($this->get_type() !== null)
 		{
 			$type = strtolower($this->type);
-		}
-		else
+		} else
 		{
 			$type = null;
 		}
@@ -1349,29 +1299,23 @@ 
 			if (in_array($type, $types_flash))
 			{
 				return 'flash';
-			}
-			elseif (in_array($type, $types_fmedia))
+			} elseif (in_array($type, $types_fmedia))
 			{
 				return 'fmedia';
-			}
-			elseif (in_array($type, $types_quicktime))
+			} elseif (in_array($type, $types_quicktime))
 			{
 				return 'quicktime';
-			}
-			elseif (in_array($type, $types_wmedia))
+			} elseif (in_array($type, $types_wmedia))
 			{
 				return 'wmedia';
-			}
-			elseif (in_array($type, $types_mp3))
+			} elseif (in_array($type, $types_mp3))
 			{
 				return 'mp3';
-			}
-			else
+			} else
 			{
 				return null;
 			}
-		}
-		else
+		} else
 		{
 			return $type;
 		}

src/wp-includes/SimplePie/IRI.php

Doc Comments +2 added lines, -1 removed lines

@@ -264,7 +264,7 @@ 
 	 *
 	 * Returns false if $base is not absolute, otherwise an IRI.
 	 *
-	 * @param IRI|string $base (Absolute) Base IRI
+	 * @param SimplePie_IRI $base (Absolute) Base IRI
 	 * @param IRI|string $relative Relative IRI
 	 * @return IRI|false
 	 */
@@ -1119,6 +1119,7 @@ 
 	/**
 	 * Convert an IRI to a URI (or parts thereof)
 	 *
+	 * @param false|string $string
 	 * @return string
 	 */
 	public function to_uri($string)

Spacing +42 added lines, -42 removed lines

@@ -148,9 +148,9 @@ 
 	 */
 	public function __set($name, $value)
 	{
-		if (method_exists($this, 'set_' . $name))
+		if (method_exists($this, 'set_'.$name))
 		{
-			call_user_func(array($this, 'set_' . $name), $value);
+			call_user_func(array($this, 'set_'.$name), $value);
 		}
 		elseif (
 			   $name === 'iauthority'
@@ -161,7 +161,7 @@ 
 			|| $name === 'ifragment'
 		)
 		{
-			call_user_func(array($this, 'set_' . substr($name, 1)), $value);
+			call_user_func(array($this, 'set_'.substr($name, 1)), $value);
 		}
 	}
 
@@ -191,7 +191,7 @@ 
 			$return = $this->$name;
 		}
 		// host -> ihost
-		elseif (($prop = 'i' . $name) && array_key_exists($prop, $props))
+		elseif (($prop = 'i'.$name) && array_key_exists($prop, $props))
 		{
 			$name = $prop;
 			$return = $this->$prop;
@@ -204,7 +204,7 @@ 
 		}
 		else
 		{
-			trigger_error('Undefined property: ' . get_class($this) . '::' . $name, E_USER_NOTICE);
+			trigger_error('Undefined property: '.get_class($this).'::'.$name, E_USER_NOTICE);
 			$return = null;
 		}
 
@@ -226,7 +226,7 @@ 
 	 */
 	public function __isset($name)
 	{
-		if (method_exists($this, 'get_' . $name) || isset($this->$name))
+		if (method_exists($this, 'get_'.$name) || isset($this->$name))
 		{
 			return true;
 		}
@@ -243,9 +243,9 @@ 
 	 */
 	public function __unset($name)
 	{
-		if (method_exists($this, 'set_' . $name))
+		if (method_exists($this, 'set_'.$name))
 		{
-			call_user_func(array($this, 'set_' . $name), '');
+			call_user_func(array($this, 'set_'.$name), '');
 		}
 	}
 
@@ -270,11 +270,11 @@ 
 	 */
 	public static function absolutize($base, $relative)
 	{
-		if (!($relative instanceof SimplePie_IRI))
+		if ( ! ($relative instanceof SimplePie_IRI))
 		{
 			$relative = new SimplePie_IRI($relative);
 		}
-		if (!$relative->is_valid())
+		if ( ! $relative->is_valid())
 		{
 			return false;
 		}
@@ -284,7 +284,7 @@ 
 		}
 		else
 		{
-			if (!($base instanceof SimplePie_IRI))
+			if ( ! ($base instanceof SimplePie_IRI))
 			{
 				$base = new SimplePie_IRI($base);
 			}
@@ -312,11 +312,11 @@ 
 							}
 							elseif (($base->iuserinfo !== null || $base->ihost !== null || $base->port !== null) && $base->ipath === '')
 							{
-								$target->ipath = '/' . $relative->ipath;
+								$target->ipath = '/'.$relative->ipath;
 							}
 							elseif (($last_segment = strrpos($base->ipath, '/')) !== false)
 							{
-								$target->ipath = substr($base->ipath, 0, $last_segment + 1) . $relative->ipath;
+								$target->ipath = substr($base->ipath, 0, $last_segment + 1).$relative->ipath;
 							}
 							else
 							{
@@ -370,19 +370,19 @@ 
 			{
 				$match['scheme'] = null;
 			}
-			if (!isset($match[3]) || $match[3] === '')
+			if ( ! isset($match[3]) || $match[3] === '')
 			{
 				$match['authority'] = null;
 			}
-			if (!isset($match[5]))
+			if ( ! isset($match[5]))
 			{
 				$match['path'] = '';
 			}
-			if (!isset($match[6]) || $match[6] === '')
+			if ( ! isset($match[6]) || $match[6] === '')
 			{
 				$match['query'] = null;
 			}
-			if (!isset($match[8]) || $match[8] === '')
+			if ( ! isset($match[8]) || $match[8] === '')
 			{
 				$match['fragment'] = null;
 			}
@@ -452,7 +452,7 @@ 
 				$input = '';
 			}
 		}
-		return $output . $input;
+		return $output.$input;
 	}
 
 	/**
@@ -551,7 +551,7 @@ 
 			// Percent encode anything invalid or not in ucschar
 			if (
 				// Invalid sequences
-				!$valid
+				! $valid
 				// Non-shortest form sequences are invalid
 				|| $length > 1 && $character <= 0x7F
 				|| $length > 2 && $character <= 0x7FF
@@ -568,7 +568,7 @@ 
 				)
 				&& (
 					// Everything not in iprivate, if it applies
-					   !$iprivate
+					   ! $iprivate
 					|| $character < 0xE000
 					|| $character > 0x10FFFD
 				)
@@ -618,7 +618,7 @@ 
 			$value = hexdec($bytes[$i]);
 
 			// If we're the first byte of sequence:
-			if (!$remaining)
+			if ( ! $remaining)
 			{
 				// Start position
 				$start = $i;
@@ -679,12 +679,12 @@ 
 			}
 
 			// If we've reached the end of the current byte sequence, append it to Unicode::$data
-			if (!$remaining)
+			if ( ! $remaining)
 			{
 				// Percent encode anything invalid or not in iunreserved
 				if (
 					// Invalid sequences
-					!$valid
+					! $valid
 					// Non-shortest form sequences are invalid
 					|| $length > 1 && $character <= 0x7F
 					|| $length > 2 && $character <= 0x7FF
@@ -706,7 +706,7 @@ 
 				{
 					for ($j = $start; $j <= $i; $j++)
 					{
-						$string .= '%' . strtoupper($bytes[$j]);
+						$string .= '%'.strtoupper($bytes[$j]);
 					}
 				}
 				else
@@ -725,7 +725,7 @@ 
 		{
 			for ($j = $start; $j < $len; $j++)
 			{
-				$string .= '%' . strtoupper($bytes[$j]);
+				$string .= '%'.strtoupper($bytes[$j]);
 			}
 		}
 
@@ -777,7 +777,7 @@ 
 				) ||
 				(
 					$this->scheme === null &&
-					!$isauthority &&
+					! $isauthority &&
 					strpos($this->ipath, ':') !== false &&
 					(strpos($this->ipath, '/') === false ? true : strpos($this->ipath, ':') < strpos($this->ipath, '/'))
 				)
@@ -800,7 +800,7 @@ 
 	public function set_iri($iri)
 	{
 		static $cache;
-		if (!$cache)
+		if ( ! $cache)
 		{
 			$cache = array();
 		}
@@ -824,7 +824,7 @@ 
 		else
 		{
 			$parsed = $this->parse_iri((string) $iri);
-			if (!$parsed)
+			if ( ! $parsed)
 			{
 				return false;
 			}
@@ -860,7 +860,7 @@ 
 		{
 			$this->scheme = null;
 		}
-		elseif (!preg_match('/^[A-Za-z][0-9A-Za-z+\-.]*$/', $scheme))
+		elseif ( ! preg_match('/^[A-Za-z][0-9A-Za-z+\-.]*$/', $scheme))
 		{
 			$this->scheme = null;
 			return false;
@@ -882,7 +882,7 @@ 
 	public function set_authority($authority)
 	{
 		static $cache;
-		if (!$cache)
+		if ( ! $cache)
 			$cache = array();
 
 		if ($authority === null)
@@ -978,7 +978,7 @@ 
 		{
 			if (SimplePie_Net_IPv6::check_ipv6(substr($ihost, 1, -1)))
 			{
-				$this->ihost = '[' . SimplePie_Net_IPv6::compress(substr($ihost, 1, -1)) . ']';
+				$this->ihost = '['.SimplePie_Net_IPv6::compress(substr($ihost, 1, -1)).']';
 			}
 			else
 			{
@@ -1052,7 +1052,7 @@ 
 	public function set_path($ipath)
 	{
 		static $cache;
-		if (!$cache)
+		if ( ! $cache)
 		{
 			$cache = array();
 		}
@@ -1069,7 +1069,7 @@ 
 			$removed = $this->remove_dot_segments($valid);
 
 			$cache[$ipath] = array($valid, $removed);
-			$this->ipath =  ($this->scheme !== null) ? $removed : $valid;
+			$this->ipath = ($this->scheme !== null) ? $removed : $valid;
 		}
 
 		$this->scheme_normalization();
@@ -1124,7 +1124,7 @@ 
 	public function to_uri($string)
 	{
 		static $non_ascii;
-		if (!$non_ascii)
+		if ( ! $non_ascii)
 		{
 			$non_ascii = implode('', range("\x80", "\xFF"));
 		}
@@ -1148,7 +1148,7 @@ 
 	 */
 	public function get_iri()
 	{
-		if (!$this->is_valid())
+		if ( ! $this->is_valid())
 		{
 			return false;
 		}
@@ -1156,27 +1156,27 @@ 
 		$iri = '';
 		if ($this->scheme !== null)
 		{
-			$iri .= $this->scheme . ':';
+			$iri .= $this->scheme.':';
 		}
 		if (($iauthority = $this->get_iauthority()) !== null)
 		{
-			$iri .= '//' . $iauthority;
+			$iri .= '//'.$iauthority;
 		}
 		if ($this->ipath !== '')
 		{
 			$iri .= $this->ipath;
 		}
-		elseif (!empty($this->normalization[$this->scheme]['ipath']) && $iauthority !== null && $iauthority !== '')
+		elseif ( ! empty($this->normalization[$this->scheme]['ipath']) && $iauthority !== null && $iauthority !== '')
 		{
 			$iri .= $this->normalization[$this->scheme]['ipath'];
 		}
 		if ($this->iquery !== null)
 		{
-			$iri .= '?' . $this->iquery;
+			$iri .= '?'.$this->iquery;
 		}
 		if ($this->ifragment !== null)
 		{
-			$iri .= '#' . $this->ifragment;
+			$iri .= '#'.$this->ifragment;
 		}
 
 		return $iri;
@@ -1204,7 +1204,7 @@ 
 			$iauthority = '';
 			if ($this->iuserinfo !== null)
 			{
-				$iauthority .= $this->iuserinfo . '@';
+				$iauthority .= $this->iuserinfo.'@';
 			}
 			if ($this->ihost !== null)
 			{
@@ -1212,7 +1212,7 @@ 
 			}
 			if ($this->port !== null)
 			{
-				$iauthority .= ':' . $this->port;
+				$iauthority .= ':'.$this->port;
 			}
 			return $iauthority;
 		}

Braces +53 added lines, -92 removed lines

@@ -151,8 +151,7 @@ 
 		if (method_exists($this, 'set_' . $name))
 		{
 			call_user_func(array($this, 'set_' . $name), $value);
-		}
-		elseif (
+		} elseif (
 			   $name === 'iauthority'
 			|| $name === 'iuserinfo'
 			|| $name === 'ihost'
@@ -185,8 +184,7 @@ 
 		)
 		{
 			$return = $this->{"get_$name"}();
-		}
-		elseif (array_key_exists($name, $props))
+		} elseif (array_key_exists($name, $props))
 		{
 			$return = $this->$name;
 		}
@@ -201,8 +199,7 @@ 
 		{
 			$name = $prop;
 			$return = $this->$prop;
-		}
-		else
+		} else
 		{
 			trigger_error('Undefined property: ' . get_class($this) . '::' . $name, E_USER_NOTICE);
 			$return = null;
@@ -211,8 +208,7 @@ 
 		if ($return === null && isset($this->normalization[$this->scheme][$name]))
 		{
 			return $this->normalization[$this->scheme][$name];
-		}
-		else
+		} else
 		{
 			return $return;
 		}
@@ -229,8 +225,7 @@ 
 		if (method_exists($this, 'get_' . $name) || isset($this->$name))
 		{
 			return true;
-		}
-		else
+		} else
 		{
 			return false;
 		}
@@ -277,12 +272,10 @@ 
 		if (!$relative->is_valid())
 		{
 			return false;
-		}
-		elseif ($relative->scheme !== null)
+		} elseif ($relative->scheme !== null)
 		{
 			return clone $relative;
-		}
-		else
+		} else
 		{
 			if (!($base instanceof SimplePie_IRI))
 			{
@@ -296,8 +289,7 @@ 
 					{
 						$target = clone $relative;
 						$target->scheme = $base->scheme;
-					}
-					else
+					} else
 					{
 						$target = new SimplePie_IRI;
 						$target->scheme = $base->scheme;
@@ -309,46 +301,39 @@ 
 							if ($relative->ipath[0] === '/')
 							{
 								$target->ipath = $relative->ipath;
-							}
-							elseif (($base->iuserinfo !== null || $base->ihost !== null || $base->port !== null) && $base->ipath === '')
+							} elseif (($base->iuserinfo !== null || $base->ihost !== null || $base->port !== null) && $base->ipath === '')
 							{
 								$target->ipath = '/' . $relative->ipath;
-							}
-							elseif (($last_segment = strrpos($base->ipath, '/')) !== false)
+							} elseif (($last_segment = strrpos($base->ipath, '/')) !== false)
 							{
 								$target->ipath = substr($base->ipath, 0, $last_segment + 1) . $relative->ipath;
-							}
-							else
+							} else
 							{
 								$target->ipath = $relative->ipath;
 							}
 							$target->ipath = $target->remove_dot_segments($target->ipath);
 							$target->iquery = $relative->iquery;
-						}
-						else
+						} else
 						{
 							$target->ipath = $base->ipath;
 							if ($relative->iquery !== null)
 							{
 								$target->iquery = $relative->iquery;
-							}
-							elseif ($base->iquery !== null)
+							} elseif ($base->iquery !== null)
 							{
 								$target->iquery = $base->iquery;
 							}
 						}
 						$target->ifragment = $relative->ifragment;
 					}
-				}
-				else
+				} else
 				{
 					$target = clone $base;
 					$target->ifragment = null;
 				}
 				$target->scheme_normalization();
 				return $target;
-			}
-			else
+			} else
 			{
 				return false;
 			}
@@ -387,8 +372,7 @@ 
 				$match['fragment'] = null;
 			}
 			return $match;
-		}
-		else
+		} else
 		{
 			// This can occur when a paragraph is accidentally parsed as a URI
 			return false;
@@ -410,8 +394,7 @@ 
 			if (strpos($input, '../') === 0)
 			{
 				$input = substr($input, 3);
-			}
-			elseif (strpos($input, './') === 0)
+			} elseif (strpos($input, './') === 0)
 			{
 				$input = substr($input, 2);
 			}
@@ -419,8 +402,7 @@ 
 			elseif (strpos($input, '/./') === 0)
 			{
 				$input = substr($input, 2);
-			}
-			elseif ($input === '/.')
+			} elseif ($input === '/.')
 			{
 				$input = '/';
 			}
@@ -429,8 +411,7 @@ 
 			{
 				$input = substr($input, 3);
 				$output = substr_replace($output, '', strrpos($output, '/'));
-			}
-			elseif ($input === '/..')
+			} elseif ($input === '/..')
 			{
 				$input = '/';
 				$output = substr_replace($output, '', strrpos($output, '/'));
@@ -445,8 +426,7 @@ 
 			{
 				$output .= substr($input, 0, $pos);
 				$input = substr_replace($input, '', 0, $pos);
-			}
-			else
+			} else
 			{
 				$output .= $input;
 				$input = '';
@@ -540,8 +520,7 @@ 
 							break;
 						}
 					}
-				}
-				else
+				} else
 				{
 					$position = $strlen - 1;
 					$valid = false;
@@ -575,8 +554,9 @@ 
 			)
 			{
 				// If we were a character, pretend we weren't, but rather an error.
-				if ($valid)
-					$position--;
+				if ($valid) {
+									$position--;
+				}
 
 				for ($j = $start; $j <= $position; $j++)
 				{
@@ -708,8 +688,7 @@ 
 					{
 						$string .= '%' . strtoupper($bytes[$j]);
 					}
-				}
-				else
+				} else
 				{
 					for ($j = $start; $j <= $i; $j++)
 					{
@@ -808,8 +787,7 @@ 
 		if ($iri === null)
 		{
 			return true;
-		}
-		elseif (isset($cache[$iri]))
+		} elseif (isset($cache[$iri]))
 		{
 			list($this->scheme,
 				 $this->iuserinfo,
@@ -820,8 +798,7 @@ 
 				 $this->ifragment,
 				 $return) = $cache[$iri];
 			return $return;
-		}
-		else
+		} else
 		{
 			$parsed = $this->parse_iri((string) $iri);
 			if (!$parsed)
@@ -859,13 +836,11 @@ 
 		if ($scheme === null)
 		{
 			$this->scheme = null;
-		}
-		elseif (!preg_match('/^[A-Za-z][0-9A-Za-z+\-.]*$/', $scheme))
+		} elseif (!preg_match('/^[A-Za-z][0-9A-Za-z+\-.]*$/', $scheme))
 		{
 			$this->scheme = null;
 			return false;
-		}
-		else
+		} else
 		{
 			$this->scheme = strtolower($scheme);
 		}
@@ -882,8 +857,9 @@ 
 	public function set_authority($authority)
 	{
 		static $cache;
-		if (!$cache)
-			$cache = array();
+		if (!$cache) {
+					$cache = array();
+		}
 
 		if ($authority === null)
 		{
@@ -891,8 +867,7 @@ 
 			$this->ihost = null;
 			$this->port = null;
 			return true;
-		}
-		elseif (isset($cache[$authority]))
+		} elseif (isset($cache[$authority]))
 		{
 			list($this->iuserinfo,
 				 $this->ihost,
@@ -900,16 +875,14 @@ 
 				 $return) = $cache[$authority];
 
 			return $return;
-		}
-		else
+		} else
 		{
 			$remaining = $authority;
 			if (($iuserinfo_end = strrpos($remaining, '@')) !== false)
 			{
 				$iuserinfo = substr($remaining, 0, $iuserinfo_end);
 				$remaining = substr($remaining, $iuserinfo_end + 1);
-			}
-			else
+			} else
 			{
 				$iuserinfo = null;
 			}
@@ -920,8 +893,7 @@ 
 					$port = null;
 				}
 				$remaining = substr($remaining, 0, $port_start);
-			}
-			else
+			} else
 			{
 				$port = null;
 			}
@@ -950,8 +922,7 @@ 
 		if ($iuserinfo === null)
 		{
 			$this->iuserinfo = null;
-		}
-		else
+		} else
 		{
 			$this->iuserinfo = $this->replace_invalid_with_pct_encoding($iuserinfo, '!$&\'()*+,;=:');
 			$this->scheme_normalization();
@@ -973,20 +944,17 @@ 
 		{
 			$this->ihost = null;
 			return true;
-		}
-		elseif (substr($ihost, 0, 1) === '[' && substr($ihost, -1) === ']')
+		} elseif (substr($ihost, 0, 1) === '[' && substr($ihost, -1) === ']')
 		{
 			if (SimplePie_Net_IPv6::check_ipv6(substr($ihost, 1, -1)))
 			{
 				$this->ihost = '[' . SimplePie_Net_IPv6::compress(substr($ihost, 1, -1)) . ']';
-			}
-			else
+			} else
 			{
 				$this->ihost = null;
 				return false;
 			}
-		}
-		else
+		} else
 		{
 			$ihost = $this->replace_invalid_with_pct_encoding($ihost, '!$&\'()*+,;=');
 
@@ -1000,8 +968,7 @@ 
 				if ($ihost[$position] === '%')
 				{
 					$position += 3;
-				}
-				else
+				} else
 				{
 					$ihost[$position] = strtolower($ihost[$position]);
 					$position++;
@@ -1029,14 +996,12 @@ 
 		{
 			$this->port = null;
 			return true;
-		}
-		elseif (strspn($port, '0123456789') === strlen($port))
+		} elseif (strspn($port, '0123456789') === strlen($port))
 		{
 			$this->port = (int) $port;
 			$this->scheme_normalization();
 			return true;
-		}
-		else
+		} else
 		{
 			$this->port = null;
 			return false;
@@ -1062,8 +1027,7 @@ 
 		if (isset($cache[$ipath]))
 		{
 			$this->ipath = $cache[$ipath][(int) ($this->scheme !== null)];
-		}
-		else
+		} else
 		{
 			$valid = $this->replace_invalid_with_pct_encoding($ipath, '!$&\'()*+,;=@:/');
 			$removed = $this->remove_dot_segments($valid);
@@ -1087,8 +1051,7 @@ 
 		if ($iquery === null)
 		{
 			$this->iquery = null;
-		}
-		else
+		} else
 		{
 			$this->iquery = $this->replace_invalid_with_pct_encoding($iquery, '!$&\'()*+,;=:@/?', true);
 			$this->scheme_normalization();
@@ -1107,8 +1070,7 @@ 
 		if ($ifragment === null)
 		{
 			$this->ifragment = null;
-		}
-		else
+		} else
 		{
 			$this->ifragment = $this->replace_invalid_with_pct_encoding($ifragment, '!$&\'()*+,;=:@/?');
 			$this->scheme_normalization();
@@ -1165,8 +1127,7 @@ 
 		if ($this->ipath !== '')
 		{
 			$iri .= $this->ipath;
-		}
-		elseif (!empty($this->normalization[$this->scheme]['ipath']) && $iauthority !== null && $iauthority !== '')
+		} elseif (!empty($this->normalization[$this->scheme]['ipath']) && $iauthority !== null && $iauthority !== '')
 		{
 			$iri .= $this->normalization[$this->scheme]['ipath'];
 		}
@@ -1215,8 +1176,7 @@ 
 				$iauthority .= ':' . $this->port;
 			}
 			return $iauthority;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -1230,9 +1190,10 @@ 
 	protected function get_authority()
 	{
 		$iauthority = $this->get_iauthority();
-		if (is_string($iauthority))
-			return $this->to_uri($iauthority);
-		else
-			return $iauthority;
+		if (is_string($iauthority)) {
+					return $this->to_uri($iauthority);
+		} else {
+					return $iauthority;
+		}
 	}
 }

src/wp-includes/SimplePie/Item.php

Doc Comments +5 added lines, -5 removed lines

@@ -860,7 +860,7 @@ 
 	 * @since 1.0
 	 *
 	 * @param string $date_format Supports any PHP date format from {@see http://php.net/strftime} (empty for the raw data)
-	 * @return int|string|null
+	 * @return string|null
 	 */
 	public function get_local_date($date_format = '%c')
 	{
@@ -883,7 +883,7 @@ 
 	 *
 	 * @see get_date
 	 * @param string $date_format Supports any PHP date format from {@see http://php.net/date}
-	 * @return int|string|null
+	 * @return null|string
 	 */
 	public function get_gmdate($date_format = 'j F Y, g:i a')
 	{
@@ -901,7 +901,7 @@ 
 	 *
 	 * @see get_updated_date
 	 * @param string $date_format Supports any PHP date format from {@see http://php.net/date}
-	 * @return int|string|null
+	 * @return null|string
 	 */
 	public function get_updated_gmdate($date_format = 'j F Y, g:i a')
 	{
@@ -2893,7 +2893,7 @@ 
 	 * @since 1.0
 	 * @link http://www.w3.org/2003/01/geo/ W3C WGS84 Basic Geo
 	 * @link http://www.georss.org/ GeoRSS
-	 * @return string|null
+	 * @return double|null
 	 */
 	public function get_latitude()
 	{
@@ -2921,7 +2921,7 @@ 
 	 * @since 1.0
 	 * @link http://www.w3.org/2003/01/geo/ W3C WGS84 Basic Geo
 	 * @link http://www.georss.org/ GeoRSS
-	 * @return string|null
+	 * @return double|null
 	 */
 	public function get_longitude()
 	{

Spacing +26 added lines, -26 removed lines

@@ -122,7 +122,7 @@ 
 	 */
 	public function __destruct()
 	{
-		if ((version_compare(PHP_VERSION, '5.3', '<') || !gc_enabled()) && !ini_get('zend.ze1_compatibility_mode'))
+		if ((version_compare(PHP_VERSION, '5.3', '<') || ! gc_enabled()) && ! ini_get('zend.ze1_compatibility_mode'))
 		{
 			unset($this->feed);
 		}
@@ -212,7 +212,7 @@ 
 	 */
 	public function get_id($hash = false)
 	{
-		if (!$hash)
+		if ( ! $hash)
 		{
 			if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'id'))
 			{
@@ -249,7 +249,7 @@ 
 		}
 		if ($this->get_permalink() !== null || $this->get_title() !== null)
 		{
-			return md5($this->get_permalink() . $this->get_title());
+			return md5($this->get_permalink().$this->get_title());
 		}
 		else
 		{
@@ -267,7 +267,7 @@ 
 	 */
 	public function get_title()
 	{
-		if (!isset($this->data['title']))
+		if ( ! isset($this->data['title']))
 		{
 			if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'title'))
 			{
@@ -359,7 +359,7 @@ 
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML);
 		}
 
-		elseif (!$description_only)
+		elseif ( ! $description_only)
 		{
 			return $this->get_content(true);
 		}
@@ -397,7 +397,7 @@ 
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0]));
 		}
-		elseif (!$content_only)
+		elseif ( ! $content_only)
 		{
 			return $this->get_description(true);
 		}
@@ -482,7 +482,7 @@ 
 			$categories[] = $this->registry->create('Category', array($this->sanitize($category['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null));
 		}
 
-		if (!empty($categories))
+		if ( ! empty($categories))
 		{
 			return array_unique($categories);
 		}
@@ -588,7 +588,7 @@ 
 			}
 		}
 
-		if (!empty($contributors))
+		if ( ! empty($contributors))
 		{
 			return array_unique($contributors);
 		}
@@ -670,7 +670,7 @@ 
 			$authors[] = $this->registry->create('Author', array($this->sanitize($author['data'], SIMPLEPIE_CONSTRUCT_TEXT), null, null));
 		}
 
-		if (!empty($authors))
+		if ( ! empty($authors))
 		{
 			return array_unique($authors);
 		}
@@ -732,7 +732,7 @@ 
 	 */
 	public function get_date($date_format = 'j F Y, g:i a')
 	{
-		if (!isset($this->data['date']))
+		if ( ! isset($this->data['date']))
 		{
 			if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'published'))
 			{
@@ -767,7 +767,7 @@ 
 				$this->data['date']['raw'] = $return[0]['data'];
 			}
 
-			if (!empty($this->data['date']['raw']))
+			if ( ! empty($this->data['date']['raw']))
 			{
 				$parser = $this->registry->call('Parse_Date', 'get');
 				$this->data['date']['parsed'] = $parser->parse($this->data['date']['raw']);
@@ -811,14 +811,14 @@ 
 	 */
 	public function get_updated_date($date_format = 'j F Y, g:i a')
 	{
-		if (!isset($this->data['updated']))
+		if ( ! isset($this->data['updated']))
 		{
 			if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'updated'))
 			{
 				$this->data['updated']['raw'] = $return[0]['data'];
 			}
 
-			if (!empty($this->data['updated']['raw']))
+			if ( ! empty($this->data['updated']['raw']))
 			{
 				$parser = $this->registry->call('Parse_Date', 'get');
 				$this->data['updated']['parsed'] = $parser->parse($this->data['date']['raw']);
@@ -864,7 +864,7 @@ 
 	 */
 	public function get_local_date($date_format = '%c')
 	{
-		if (!$date_format)
+		if ( ! $date_format)
 		{
 			return $this->sanitize($this->get_date(''), SIMPLEPIE_CONSTRUCT_TEXT);
 		}
@@ -974,7 +974,7 @@ 
 	 */
 	public function get_links($rel = 'alternate')
 	{
-		if (!isset($this->data['links']))
+		if ( ! isset($this->data['links']))
 		{
 			$this->data['links'] = array();
 			foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'link') as $link)
@@ -1008,7 +1008,7 @@ 
 			}
 			if ($links = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'guid'))
 			{
-				if (!isset($links[0]['attribs']['']['isPermaLink']) || strtolower(trim($links[0]['attribs']['']['isPermaLink'])) === 'true')
+				if ( ! isset($links[0]['attribs']['']['isPermaLink']) || strtolower(trim($links[0]['attribs']['']['isPermaLink'])) === 'true')
 				{
 					$this->data['links']['alternate'][] = $this->sanitize($links[0]['data'], SIMPLEPIE_CONSTRUCT_IRI, $this->get_base($links[0]));
 				}
@@ -1019,19 +1019,19 @@ 
 			{
 				if ($this->registry->call('Misc', 'is_isegment_nz_nc', array($key)))
 				{
-					if (isset($this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]))
+					if (isset($this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key]))
 					{
-						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] = array_merge($this->data['links'][$key], $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]);
-						$this->data['links'][$key] =& $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key];
+						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key] = array_merge($this->data['links'][$key], $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key]);
+						$this->data['links'][$key] = & $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key];
 					}
 					else
 					{
-						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] =& $this->data['links'][$key];
+						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY.$key] = & $this->data['links'][$key];
 					}
 				}
 				elseif (substr($key, 0, 41) === SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY)
 				{
-					$this->data['links'][substr($key, 41)] =& $this->data['links'][$key];
+					$this->data['links'][substr($key, 41)] = & $this->data['links'][$key];
 				}
 				$this->data['links'][$key] = array_unique($this->data['links'][$key]);
 			}
@@ -1085,7 +1085,7 @@ 
 	 */
 	public function get_enclosures()
 	{
-		if (!isset($this->data['enclosures']))
+		if ( ! isset($this->data['enclosures']))
 		{
 			$this->data['enclosures'] = array();
 
@@ -1732,7 +1732,7 @@ 
 			// If we have media:group tags, loop through them.
 			foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'group') as $group)
 			{
-				if(isset($group['child']) && isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['content']))
+				if (isset($group['child']) && isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['content']))
 				{
 					// If we have media:content tags, loop through them.
 					foreach ((array) $group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['content'] as $content)
@@ -2762,7 +2762,7 @@ 
 
 			foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'link') as $link)
 			{
-				if (isset($link['attribs']['']['href']) && !empty($link['attribs']['']['rel']) && $link['attribs']['']['rel'] === 'enclosure')
+				if (isset($link['attribs']['']['href']) && ! empty($link['attribs']['']['rel']) && $link['attribs']['']['rel'] === 'enclosure')
 				{
 					// Attributes
 					$bitrate = null;
@@ -2797,7 +2797,7 @@ 
 
 			foreach ((array) $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'link') as $link)
 			{
-				if (isset($link['attribs']['']['href']) && !empty($link['attribs']['']['rel']) && $link['attribs']['']['rel'] === 'enclosure')
+				if (isset($link['attribs']['']['href']) && ! empty($link['attribs']['']['rel']) && $link['attribs']['']['rel'] === 'enclosure')
 				{
 					// Attributes
 					$bitrate = null;
@@ -2873,7 +2873,7 @@ 
 
 			$this->data['enclosures'] = array_values(array_unique($this->data['enclosures']));
 		}
-		if (!empty($this->data['enclosures']))
+		if ( ! empty($this->data['enclosures']))
 		{
 			return $this->data['enclosures'];
 		}

Braces +147 added lines, -295 removed lines

@@ -147,8 +147,7 @@ 
 		if (isset($this->data['child'][$namespace][$tag]))
 		{
 			return $this->data['child'][$namespace][$tag];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -217,32 +216,25 @@ 
 			if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'id'))
 			{
 				return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-			}
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'id'))
+			} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'id'))
 			{
 				return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-			}
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'guid'))
+			} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'guid'))
 			{
 				return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-			}
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'identifier'))
+			} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'identifier'))
 			{
 				return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-			}
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'identifier'))
+			} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'identifier'))
 			{
 				return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-			}
-			elseif (isset($this->data['attribs'][SIMPLEPIE_NAMESPACE_RDF]['about']))
+			} elseif (isset($this->data['attribs'][SIMPLEPIE_NAMESPACE_RDF]['about']))
 			{
 				return $this->sanitize($this->data['attribs'][SIMPLEPIE_NAMESPACE_RDF]['about'], SIMPLEPIE_CONSTRUCT_TEXT);
-			}
-			elseif (($return = $this->get_permalink()) !== null)
+			} elseif (($return = $this->get_permalink()) !== null)
 			{
 				return $return;
-			}
-			elseif (($return = $this->get_title()) !== null)
+			} elseif (($return = $this->get_title()) !== null)
 			{
 				return $return;
 			}
@@ -250,8 +242,7 @@ 
 		if ($this->get_permalink() !== null || $this->get_title() !== null)
 		{
 			return md5($this->get_permalink() . $this->get_title());
-		}
-		else
+		} else
 		{
 			return md5(serialize($this->data));
 		}
@@ -272,32 +263,25 @@ 
 			if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'title'))
 			{
 				$this->data['title'] = $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-			}
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'title'))
+			} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'title'))
 			{
 				$this->data['title'] = $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-			}
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'title'))
+			} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'title'))
 			{
 				$this->data['title'] = $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-			}
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'title'))
+			} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'title'))
 			{
 				$this->data['title'] = $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-			}
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'title'))
+			} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'title'))
 			{
 				$this->data['title'] = $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-			}
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'title'))
+			} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'title'))
 			{
 				$this->data['title'] = $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-			}
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'title'))
+			} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'title'))
 			{
 				$this->data['title'] = $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-			}
-			else
+			} else
 			{
 				$this->data['title'] = null;
 			}
@@ -325,45 +309,34 @@ 
 		if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'summary'))
 		{
 			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'summary'))
+		} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'summary'))
 		{
 			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'description'))
+		} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_10, 'description'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_MAYBE_HTML, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'description'))
+		} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'description'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'description'))
+		} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'description'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'description'))
+		} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'description'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'summary'))
+		} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'summary'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'subtitle'))
+		} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'subtitle'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'description'))
+		} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_090, 'description'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML);
-		}
-
-		elseif (!$description_only)
+		} elseif (!$description_only)
 		{
 			return $this->get_content(true);
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -388,20 +361,16 @@ 
 		if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'content'))
 		{
 			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_content_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'content'))
+		} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'content'))
 		{
 			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_03_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_10_MODULES_CONTENT, 'encoded'))
+		} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_10_MODULES_CONTENT, 'encoded'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_HTML, $this->get_base($return[0]));
-		}
-		elseif (!$content_only)
+		} elseif (!$content_only)
 		{
 			return $this->get_description(true);
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -420,8 +389,7 @@ 
 		if (isset($categories[$key]))
 		{
 			return $categories[$key];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -466,8 +434,7 @@ 
 			if (isset($category['attribs']['']['domain']))
 			{
 				$scheme = $this->sanitize($category['attribs']['']['domain'], SIMPLEPIE_CONSTRUCT_TEXT);
-			}
-			else
+			} else
 			{
 				$scheme = null;
 			}
@@ -485,8 +452,7 @@ 
 		if (!empty($categories))
 		{
 			return array_unique($categories);
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -505,8 +471,7 @@ 
 		if (isset($authors[$key]))
 		{
 			return $authors[$key];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -525,8 +490,7 @@ 
 		if (isset($contributors[$key]))
 		{
 			return $contributors[$key];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -591,8 +555,7 @@ 
 		if (!empty($contributors))
 		{
 			return array_unique($contributors);
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -673,16 +636,13 @@ 
 		if (!empty($authors))
 		{
 			return array_unique($authors);
-		}
-		elseif (($source = $this->get_source()) && ($authors = $source->get_authors()))
+		} elseif (($source = $this->get_source()) && ($authors = $source->get_authors()))
 		{
 			return $authors;
-		}
-		elseif ($authors = $this->feed->get_authors())
+		} elseif ($authors = $this->feed->get_authors())
 		{
 			return $authors;
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -701,16 +661,13 @@ 
 		if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'rights'))
 		{
 			return $this->sanitize($return[0]['data'], $this->registry->call('Misc', 'atom_10_construct_type', array($return[0]['attribs'])), $this->get_base($return[0]));
-		}
-		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'rights'))
+		} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'rights'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'rights'))
+		} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'rights'))
 		{
 			return $this->sanitize($return[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -737,32 +694,25 @@ 
 			if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'published'))
 			{
 				$this->data['date']['raw'] = $return[0]['data'];
-			}
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'updated'))
+			} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'updated'))
 			{
 				$this->data['date']['raw'] = $return[0]['data'];
-			}
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'issued'))
+			} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'issued'))
 			{
 				$this->data['date']['raw'] = $return[0]['data'];
-			}
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'created'))
+			} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'created'))
 			{
 				$this->data['date']['raw'] = $return[0]['data'];
-			}
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'modified'))
+			} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_03, 'modified'))
 			{
 				$this->data['date']['raw'] = $return[0]['data'];
-			}
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'pubDate'))
+			} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_RSS_20, 'pubDate'))
 			{
 				$this->data['date']['raw'] = $return[0]['data'];
-			}
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'date'))
+			} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_11, 'date'))
 			{
 				$this->data['date']['raw'] = $return[0]['data'];
-			}
-			elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'date'))
+			} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_DC_10, 'date'))
 			{
 				$this->data['date']['raw'] = $return[0]['data'];
 			}
@@ -771,8 +721,7 @@ 
 			{
 				$parser = $this->registry->call('Parse_Date', 'get');
 				$this->data['date']['parsed'] = $parser->parse($this->data['date']['raw']);
-			}
-			else
+			} else
 			{
 				$this->data['date'] = null;
 			}
@@ -791,8 +740,7 @@ 
 				default:
 					return date($date_format, $this->data['date']['parsed']);
 			}
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -822,8 +770,7 @@ 
 			{
 				$parser = $this->registry->call('Parse_Date', 'get');
 				$this->data['updated']['parsed'] = $parser->parse($this->data['date']['raw']);
-			}
-			else
+			} else
 			{
 				$this->data['updated'] = null;
 			}
@@ -842,8 +789,7 @@ 
 				default:
 					return date($date_format, $this->data['updated']['parsed']);
 			}
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -867,12 +813,10 @@ 
 		if (!$date_format)
 		{
 			return $this->sanitize($this->get_date(''), SIMPLEPIE_CONSTRUCT_TEXT);
-		}
-		elseif (($date = $this->get_date('U')) !== null && $date !== false)
+		} elseif (($date = $this->get_date('U')) !== null && $date !== false)
 		{
 			return strftime($date_format, $date);
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -931,12 +875,10 @@ 
 		if ($link !== null)
 		{
 			return $link;
-		}
-		elseif ($enclosure !== null)
+		} elseif ($enclosure !== null)
 		{
 			return $enclosure->get_link();
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -956,8 +898,7 @@ 
 		if ($links[$key] !== null)
 		{
 			return $links[$key];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -1023,13 +964,11 @@ 
 					{
 						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] = array_merge($this->data['links'][$key], $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key]);
 						$this->data['links'][$key] =& $this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key];
-					}
-					else
+					} else
 					{
 						$this->data['links'][SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY . $key] =& $this->data['links'][$key];
 					}
-				}
-				elseif (substr($key, 0, 41) === SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY)
+				} elseif (substr($key, 0, 41) === SIMPLEPIE_IANA_LINK_RELATIONS_REGISTRY)
 				{
 					$this->data['links'][substr($key, 41)] =& $this->data['links'][$key];
 				}
@@ -1039,8 +978,7 @@ 
 		if (isset($this->data['links'][$rel]))
 		{
 			return $this->data['links'][$rel];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -1062,8 +1000,7 @@ 
 		if (isset($enclosures[$key]))
 		{
 			return $enclosures[$key];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -1139,8 +1076,7 @@ 
 					}
 					$captions_parent[] = $this->registry->create('Caption', array($caption_type, $caption_lang, $caption_startTime, $caption_endTime, $caption_text));
 				}
-			}
-			elseif ($captions = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'text'))
+			} elseif ($captions = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'text'))
 			{
 				foreach ($captions as $caption)
 				{
@@ -1190,8 +1126,7 @@ 
 				if (isset($category['attribs']['']['scheme']))
 				{
 					$scheme = $this->sanitize($category['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-				}
-				else
+				} else
 				{
 					$scheme = 'http://search.yahoo.com/mrss/category_schema';
 				}
@@ -1213,8 +1148,7 @@ 
 				if (isset($category['attribs']['']['scheme']))
 				{
 					$scheme = $this->sanitize($category['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-				}
-				else
+				} else
 				{
 					$scheme = 'http://search.yahoo.com/mrss/category_schema';
 				}
@@ -1266,8 +1200,7 @@ 
 					$copyright_label = $this->sanitize($copyright[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
 				}
 				$copyrights_parent = $this->registry->create('Copyright', array($copyright_url, $copyright_label));
-			}
-			elseif ($copyright = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'copyright'))
+			} elseif ($copyright = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'copyright'))
 			{
 				$copyright_url = null;
 				$copyright_label = null;
@@ -1297,8 +1230,7 @@ 
 					if (isset($credit['attribs']['']['scheme']))
 					{
 						$credit_scheme = $this->sanitize($credit['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-					}
-					else
+					} else
 					{
 						$credit_scheme = 'urn:ebu';
 					}
@@ -1308,8 +1240,7 @@ 
 					}
 					$credits_parent[] = $this->registry->create('Credit', array($credit_role, $credit_scheme, $credit_name));
 				}
-			}
-			elseif ($credits = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'credit'))
+			} elseif ($credits = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'credit'))
 			{
 				foreach ($credits as $credit)
 				{
@@ -1323,8 +1254,7 @@ 
 					if (isset($credit['attribs']['']['scheme']))
 					{
 						$credit_scheme = $this->sanitize($credit['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-					}
-					else
+					} else
 					{
 						$credit_scheme = 'urn:ebu';
 					}
@@ -1347,8 +1277,7 @@ 
 				{
 					$description_parent = $this->sanitize($description_parent[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
 				}
-			}
-			elseif ($description_parent = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'description'))
+			} elseif ($description_parent = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'description'))
 			{
 				if (isset($description_parent[0]['data']))
 				{
@@ -1398,15 +1327,13 @@ 
 					if (isset($hash['attribs']['']['algo']))
 					{
 						$algo = $this->sanitize($hash['attribs']['']['algo'], SIMPLEPIE_CONSTRUCT_TEXT);
-					}
-					else
+					} else
 					{
 						$algo = 'md5';
 					}
 					$hashes_parent[] = $algo.':'.$value;
 				}
-			}
-			elseif ($hashes_iterator = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'hash'))
+			} elseif ($hashes_iterator = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'hash'))
 			{
 				foreach ($hashes_iterator as $hash)
 				{
@@ -1419,8 +1346,7 @@ 
 					if (isset($hash['attribs']['']['algo']))
 					{
 						$algo = $this->sanitize($hash['attribs']['']['algo'], SIMPLEPIE_CONSTRUCT_TEXT);
-					}
-					else
+					} else
 					{
 						$algo = 'md5';
 					}
@@ -1444,8 +1370,7 @@ 
 					}
 				}
 				unset($temp);
-			}
-			elseif ($keywords = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'keywords'))
+			} elseif ($keywords = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'keywords'))
 			{
 				if (isset($keywords[0]['data']))
 				{
@@ -1456,8 +1381,7 @@ 
 					}
 				}
 				unset($temp);
-			}
-			elseif ($keywords = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'keywords'))
+			} elseif ($keywords = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'keywords'))
 			{
 				if (isset($keywords[0]['data']))
 				{
@@ -1468,8 +1392,7 @@ 
 					}
 				}
 				unset($temp);
-			}
-			elseif ($keywords = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'keywords'))
+			} elseif ($keywords = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'keywords'))
 			{
 				if (isset($keywords[0]['data']))
 				{
@@ -1493,8 +1416,7 @@ 
 				{
 					$player_parent = $this->sanitize($player_parent[0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
 				}
-			}
-			elseif ($player_parent = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'player'))
+			} elseif ($player_parent = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'player'))
 			{
 				if (isset($player_parent[0]['attribs']['']['url']))
 				{
@@ -1512,8 +1434,7 @@ 
 					if (isset($rating['attribs']['']['scheme']))
 					{
 						$rating_scheme = $this->sanitize($rating['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-					}
-					else
+					} else
 					{
 						$rating_scheme = 'urn:simple';
 					}
@@ -1523,8 +1444,7 @@ 
 					}
 					$ratings_parent[] = $this->registry->create('Rating', array($rating_scheme, $rating_value));
 				}
-			}
-			elseif ($ratings = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'explicit'))
+			} elseif ($ratings = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'explicit'))
 			{
 				foreach ($ratings as $rating)
 				{
@@ -1536,8 +1456,7 @@ 
 					}
 					$ratings_parent[] = $this->registry->create('Rating', array($rating_scheme, $rating_value));
 				}
-			}
-			elseif ($ratings = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'rating'))
+			} elseif ($ratings = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'rating'))
 			{
 				foreach ($ratings as $rating)
 				{
@@ -1546,8 +1465,7 @@ 
 					if (isset($rating['attribs']['']['scheme']))
 					{
 						$rating_scheme = $this->sanitize($rating['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-					}
-					else
+					} else
 					{
 						$rating_scheme = 'urn:simple';
 					}
@@ -1557,8 +1475,7 @@ 
 					}
 					$ratings_parent[] = $this->registry->create('Rating', array($rating_scheme, $rating_value));
 				}
-			}
-			elseif ($ratings = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'explicit'))
+			} elseif ($ratings = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'explicit'))
 			{
 				foreach ($ratings as $rating)
 				{
@@ -1598,8 +1515,7 @@ 
 					}
 					$restrictions_parent[] = $this->registry->create('Restriction', array($restriction_relationship, $restriction_type, $restriction_value));
 				}
-			}
-			elseif ($restrictions = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'block'))
+			} elseif ($restrictions = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'block'))
 			{
 				foreach ($restrictions as $restriction)
 				{
@@ -1612,8 +1528,7 @@ 
 					}
 					$restrictions_parent[] = $this->registry->create('Restriction', array($restriction_relationship, $restriction_type, $restriction_value));
 				}
-			}
-			elseif ($restrictions = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'restriction'))
+			} elseif ($restrictions = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'restriction'))
 			{
 				foreach ($restrictions as $restriction)
 				{
@@ -1634,8 +1549,7 @@ 
 					}
 					$restrictions_parent[] = $this->registry->create('Restriction', array($restriction_relationship, $restriction_type, $restriction_value));
 				}
-			}
-			elseif ($restrictions = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'block'))
+			} elseif ($restrictions = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_ITUNES, 'block'))
 			{
 				foreach ($restrictions as $restriction)
 				{
@@ -1652,8 +1566,7 @@ 
 			if (is_array($restrictions_parent))
 			{
 				$restrictions_parent = array_values(array_unique($restrictions_parent));
-			}
-			else
+			} else
 			{
 				$restrictions_parent = array(new SimplePie_Restriction('allow', null, 'default'));
 			}
@@ -1668,8 +1581,7 @@ 
 						$thumbnails_parent[] = $this->sanitize($thumbnail['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
 					}
 				}
-			}
-			elseif ($thumbnails = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'thumbnail'))
+			} elseif ($thumbnails = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'thumbnail'))
 			{
 				foreach ($thumbnails as $thumbnail)
 				{
@@ -1687,8 +1599,7 @@ 
 				{
 					$title_parent = $this->sanitize($title_parent[0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
 				}
-			}
-			elseif ($title_parent = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'title'))
+			} elseif ($title_parent = $parent->get_channel_tags(SIMPLEPIE_NAMESPACE_MEDIARSS, 'title'))
 			{
 				if (isset($title_parent[0]['data']))
 				{
@@ -1781,8 +1692,7 @@ 
 							if (isset($content['attribs']['']['duration']))
 							{
 								$duration = $this->sanitize($content['attribs']['']['duration'], SIMPLEPIE_CONSTRUCT_TEXT);
-							}
-							else
+							} else
 							{
 								$duration = $duration_parent;
 							}
@@ -1862,8 +1772,7 @@ 
 								{
 									$captions = array_values(array_unique($captions));
 								}
-							}
-							elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['text']))
+							} elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['text']))
 							{
 								foreach ($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['text'] as $caption)
 								{
@@ -1898,8 +1807,7 @@ 
 								{
 									$captions = array_values(array_unique($captions));
 								}
-							}
-							else
+							} else
 							{
 								$captions = $captions_parent;
 							}
@@ -1919,8 +1827,7 @@ 
 									if (isset($category['attribs']['']['scheme']))
 									{
 										$scheme = $this->sanitize($category['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-									}
-									else
+									} else
 									{
 										$scheme = 'http://search.yahoo.com/mrss/category_schema';
 									}
@@ -1945,8 +1852,7 @@ 
 									if (isset($category['attribs']['']['scheme']))
 									{
 										$scheme = $this->sanitize($category['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-									}
-									else
+									} else
 									{
 										$scheme = 'http://search.yahoo.com/mrss/category_schema';
 									}
@@ -1960,12 +1866,10 @@ 
 							if (is_array($categories) && is_array($categories_parent))
 							{
 								$categories = array_values(array_unique(array_merge($categories, $categories_parent)));
-							}
-							elseif (is_array($categories))
+							} elseif (is_array($categories))
 							{
 								$categories = array_values(array_unique($categories));
-							}
-							elseif (is_array($categories_parent))
+							} elseif (is_array($categories_parent))
 							{
 								$categories = array_values(array_unique($categories_parent));
 							}
@@ -1984,8 +1888,7 @@ 
 									$copyright_label = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
 								}
 								$copyrights = $this->registry->create('Copyright', array($copyright_url, $copyright_label));
-							}
-							elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright']))
+							} elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright']))
 							{
 								$copyright_url = null;
 								$copyright_label = null;
@@ -1998,8 +1901,7 @@ 
 									$copyright_label = $this->sanitize($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
 								}
 								$copyrights = $this->registry->create('Copyright', array($copyright_url, $copyright_label));
-							}
-							else
+							} else
 							{
 								$copyrights = $copyrights_parent;
 							}
@@ -2019,8 +1921,7 @@ 
 									if (isset($credit['attribs']['']['scheme']))
 									{
 										$credit_scheme = $this->sanitize($credit['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-									}
-									else
+									} else
 									{
 										$credit_scheme = 'urn:ebu';
 									}
@@ -2034,8 +1935,7 @@ 
 								{
 									$credits = array_values(array_unique($credits));
 								}
-							}
-							elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['credit']))
+							} elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['credit']))
 							{
 								foreach ($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['credit'] as $credit)
 								{
@@ -2049,8 +1949,7 @@ 
 									if (isset($credit['attribs']['']['scheme']))
 									{
 										$credit_scheme = $this->sanitize($credit['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-									}
-									else
+									} else
 									{
 										$credit_scheme = 'urn:ebu';
 									}
@@ -2064,8 +1963,7 @@ 
 								{
 									$credits = array_values(array_unique($credits));
 								}
-							}
-							else
+							} else
 							{
 								$credits = $credits_parent;
 							}
@@ -2074,12 +1972,10 @@ 
 							if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['description']))
 							{
 								$description = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['description'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-							}
-							elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['description']))
+							} elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['description']))
 							{
 								$description = $this->sanitize($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['description'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-							}
-							else
+							} else
 							{
 								$description = $description_parent;
 							}
@@ -2098,8 +1994,7 @@ 
 									if (isset($hash['attribs']['']['algo']))
 									{
 										$algo = $this->sanitize($hash['attribs']['']['algo'], SIMPLEPIE_CONSTRUCT_TEXT);
-									}
-									else
+									} else
 									{
 										$algo = 'md5';
 									}
@@ -2109,8 +2004,7 @@ 
 								{
 									$hashes = array_values(array_unique($hashes));
 								}
-							}
-							elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['hash']))
+							} elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['hash']))
 							{
 								foreach ($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['hash'] as $hash)
 								{
@@ -2123,8 +2017,7 @@ 
 									if (isset($hash['attribs']['']['algo']))
 									{
 										$algo = $this->sanitize($hash['attribs']['']['algo'], SIMPLEPIE_CONSTRUCT_TEXT);
-									}
-									else
+									} else
 									{
 										$algo = 'md5';
 									}
@@ -2134,8 +2027,7 @@ 
 								{
 									$hashes = array_values(array_unique($hashes));
 								}
-							}
-							else
+							} else
 							{
 								$hashes = $hashes_parent;
 							}
@@ -2156,8 +2048,7 @@ 
 								{
 									$keywords = array_values(array_unique($keywords));
 								}
-							}
-							elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['keywords']))
+							} elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['keywords']))
 							{
 								if (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['keywords'][0]['data']))
 								{
@@ -2172,8 +2063,7 @@ 
 								{
 									$keywords = array_values(array_unique($keywords));
 								}
-							}
-							else
+							} else
 							{
 								$keywords = $keywords_parent;
 							}
@@ -2182,12 +2072,10 @@ 
 							if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player']))
 							{
 								$player = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player'][0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
-							}
-							elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player']))
+							} elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player']))
 							{
 								$player = $this->sanitize($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player'][0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
-							}
-							else
+							} else
 							{
 								$player = $player_parent;
 							}
@@ -2202,8 +2090,7 @@ 
 									if (isset($rating['attribs']['']['scheme']))
 									{
 										$rating_scheme = $this->sanitize($rating['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-									}
-									else
+									} else
 									{
 										$rating_scheme = 'urn:simple';
 									}
@@ -2217,8 +2104,7 @@ 
 								{
 									$ratings = array_values(array_unique($ratings));
 								}
-							}
-							elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['rating']))
+							} elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['rating']))
 							{
 								foreach ($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['rating'] as $rating)
 								{
@@ -2227,8 +2113,7 @@ 
 									if (isset($rating['attribs']['']['scheme']))
 									{
 										$rating_scheme = $this->sanitize($rating['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-									}
-									else
+									} else
 									{
 										$rating_scheme = 'urn:simple';
 									}
@@ -2242,8 +2127,7 @@ 
 								{
 									$ratings = array_values(array_unique($ratings));
 								}
-							}
-							else
+							} else
 							{
 								$ratings = $ratings_parent;
 							}
@@ -2274,8 +2158,7 @@ 
 								{
 									$restrictions = array_values(array_unique($restrictions));
 								}
-							}
-							elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['restriction']))
+							} elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['restriction']))
 							{
 								foreach ($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['restriction'] as $restriction)
 								{
@@ -2300,8 +2183,7 @@ 
 								{
 									$restrictions = array_values(array_unique($restrictions));
 								}
-							}
-							else
+							} else
 							{
 								$restrictions = $restrictions_parent;
 							}
@@ -2317,8 +2199,7 @@ 
 								{
 									$thumbnails = array_values(array_unique($thumbnails));
 								}
-							}
-							elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['thumbnail']))
+							} elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['thumbnail']))
 							{
 								foreach ($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['thumbnail'] as $thumbnail)
 								{
@@ -2328,8 +2209,7 @@ 
 								{
 									$thumbnails = array_values(array_unique($thumbnails));
 								}
-							}
-							else
+							} else
 							{
 								$thumbnails = $thumbnails_parent;
 							}
@@ -2338,12 +2218,10 @@ 
 							if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['title']))
 							{
 								$title = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['title'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-							}
-							elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['title']))
+							} elseif (isset($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['title']))
 							{
 								$title = $this->sanitize($group['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['title'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-							}
-							else
+							} else
 							{
 								$title = $title_parent;
 							}
@@ -2403,8 +2281,7 @@ 
 						if (isset($content['attribs']['']['duration']))
 						{
 							$duration = $this->sanitize($content['attribs']['']['duration'], SIMPLEPIE_CONSTRUCT_TEXT);
-						}
-						else
+						} else
 						{
 							$duration = $duration_parent;
 						}
@@ -2486,8 +2363,7 @@ 
 							{
 								$captions = array_values(array_unique($captions));
 							}
-						}
-						else
+						} else
 						{
 							$captions = $captions_parent;
 						}
@@ -2507,8 +2383,7 @@ 
 								if (isset($category['attribs']['']['scheme']))
 								{
 									$scheme = $this->sanitize($category['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-								}
-								else
+								} else
 								{
 									$scheme = 'http://search.yahoo.com/mrss/category_schema';
 								}
@@ -2522,16 +2397,13 @@ 
 						if (is_array($categories) && is_array($categories_parent))
 						{
 							$categories = array_values(array_unique(array_merge($categories, $categories_parent)));
-						}
-						elseif (is_array($categories))
+						} elseif (is_array($categories))
 						{
 							$categories = array_values(array_unique($categories));
-						}
-						elseif (is_array($categories_parent))
+						} elseif (is_array($categories_parent))
 						{
 							$categories = array_values(array_unique($categories_parent));
-						}
-						else
+						} else
 						{
 							$categories = null;
 						}
@@ -2550,8 +2422,7 @@ 
 								$copyright_label = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['copyright'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
 							}
 							$copyrights = $this->registry->create('Copyright', array($copyright_url, $copyright_label));
-						}
-						else
+						} else
 						{
 							$copyrights = $copyrights_parent;
 						}
@@ -2571,8 +2442,7 @@ 
 								if (isset($credit['attribs']['']['scheme']))
 								{
 									$credit_scheme = $this->sanitize($credit['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-								}
-								else
+								} else
 								{
 									$credit_scheme = 'urn:ebu';
 								}
@@ -2586,8 +2456,7 @@ 
 							{
 								$credits = array_values(array_unique($credits));
 							}
-						}
-						else
+						} else
 						{
 							$credits = $credits_parent;
 						}
@@ -2596,8 +2465,7 @@ 
 						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['description']))
 						{
 							$description = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['description'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-						}
-						else
+						} else
 						{
 							$description = $description_parent;
 						}
@@ -2616,8 +2484,7 @@ 
 								if (isset($hash['attribs']['']['algo']))
 								{
 									$algo = $this->sanitize($hash['attribs']['']['algo'], SIMPLEPIE_CONSTRUCT_TEXT);
-								}
-								else
+								} else
 								{
 									$algo = 'md5';
 								}
@@ -2627,8 +2494,7 @@ 
 							{
 								$hashes = array_values(array_unique($hashes));
 							}
-						}
-						else
+						} else
 						{
 							$hashes = $hashes_parent;
 						}
@@ -2649,8 +2515,7 @@ 
 							{
 								$keywords = array_values(array_unique($keywords));
 							}
-						}
-						else
+						} else
 						{
 							$keywords = $keywords_parent;
 						}
@@ -2659,8 +2524,7 @@ 
 						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player']))
 						{
 							$player = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['player'][0]['attribs']['']['url'], SIMPLEPIE_CONSTRUCT_IRI);
-						}
-						else
+						} else
 						{
 							$player = $player_parent;
 						}
@@ -2675,8 +2539,7 @@ 
 								if (isset($rating['attribs']['']['scheme']))
 								{
 									$rating_scheme = $this->sanitize($rating['attribs']['']['scheme'], SIMPLEPIE_CONSTRUCT_TEXT);
-								}
-								else
+								} else
 								{
 									$rating_scheme = 'urn:simple';
 								}
@@ -2690,8 +2553,7 @@ 
 							{
 								$ratings = array_values(array_unique($ratings));
 							}
-						}
-						else
+						} else
 						{
 							$ratings = $ratings_parent;
 						}
@@ -2722,8 +2584,7 @@ 
 							{
 								$restrictions = array_values(array_unique($restrictions));
 							}
-						}
-						else
+						} else
 						{
 							$restrictions = $restrictions_parent;
 						}
@@ -2739,8 +2600,7 @@ 
 							{
 								$thumbnails = array_values(array_unique($thumbnails));
 							}
-						}
-						else
+						} else
 						{
 							$thumbnails = $thumbnails_parent;
 						}
@@ -2749,8 +2609,7 @@ 
 						if (isset($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['title']))
 						{
 							$title = $this->sanitize($content['child'][SIMPLEPIE_NAMESPACE_MEDIARSS]['title'][0]['data'], SIMPLEPIE_CONSTRUCT_TEXT);
-						}
-						else
+						} else
 						{
 							$title = $title_parent;
 						}
@@ -2876,8 +2735,7 @@ 
 		if (!empty($this->data['enclosures']))
 		{
 			return $this->data['enclosures'];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2900,12 +2758,10 @@ 
 		if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lat'))
 		{
 			return (float) $return[0]['data'];
-		}
-		elseif (($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
+		} elseif (($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
 		{
 			return (float) $match[1];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2928,16 +2784,13 @@ 
 		if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'long'))
 		{
 			return (float) $return[0]['data'];
-		}
-		elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lon'))
+		} elseif ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_W3C_BASIC_GEO, 'lon'))
 		{
 			return (float) $return[0]['data'];
-		}
-		elseif (($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
+		} elseif (($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_GEORSS, 'point')) && preg_match('/^((?:-)?[0-9]+(?:\.[0-9]+)) ((?:-)?[0-9]+(?:\.[0-9]+))$/', trim($return[0]['data']), $match))
 		{
 			return (float) $match[2];
-		}
-		else
+		} else
 		{
 			return null;
 		}
@@ -2954,8 +2807,7 @@ 
 		if ($return = $this->get_item_tags(SIMPLEPIE_NAMESPACE_ATOM_10, 'source'))
 		{
 			return $this->registry->create('Source', array($this, $return[0]));
-		}
-		else
+		} else
 		{
 			return null;
 		}