ntwb / wordpress

src/wp-includes/post.php

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

Doc Comments +10 added lines, -10 removed lines

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

Indentation +5 added lines, -5 removed lines

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

Spacing +1269 added lines, -1269 removed lines

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

Braces +590 added lines, -405 removed lines

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

src/wp-includes/class-wp-ajax-response.php

Spacing +27 added lines, -27 removed lines

@@ -22,8 +22,8 @@ 
 	 *
 	 * @param string|array $args Optional. Will be passed to add() method.
 	 */
-	public function __construct( $args = '' ) {
-		if ( !empty($args) )
+	public function __construct($args = '') {
+		if ( ! empty($args))
 			$this->add($args);
 	}
 
@@ -50,7 +50,7 @@ 
 	 * @param string|array $args Override defaults.
 	 * @return string XML response.
 	 */
-	public function add( $args = '' ) {
+	public function add($args = '') {
 		$defaults = array(
 			'what' => 'object', 'action' => false,
 			'id' => '0', 'old_id' => false,
@@ -58,39 +58,39 @@ 
 			'data' => '', 'supplemental' => array()
 		);
 
-		$r = wp_parse_args( $args, $defaults );
+		$r = wp_parse_args($args, $defaults);
 
-		$position = preg_replace( '/[^a-z0-9:_-]/i', '', $r['position'] );
+		$position = preg_replace('/[^a-z0-9:_-]/i', '', $r['position']);
 		$id = $r['id'];
 		$what = $r['what'];
 		$action = $r['action'];
 		$old_id = $r['old_id'];
 		$data = $r['data'];
 
-		if ( is_wp_error( $id ) ) {
+		if (is_wp_error($id)) {
 			$data = $id;
 			$id = 0;
 		}
 
 		$response = '';
-		if ( is_wp_error( $data ) ) {
-			foreach ( (array) $data->get_error_codes() as $code ) {
-				$response .= "<wp_error code='$code'><![CDATA[" . $data->get_error_message( $code ) . "]]></wp_error>";
-				if ( ! $error_data = $data->get_error_data( $code ) ) {
+		if (is_wp_error($data)) {
+			foreach ((array) $data->get_error_codes() as $code) {
+				$response .= "<wp_error code='$code'><![CDATA[".$data->get_error_message($code)."]]></wp_error>";
+				if ( ! $error_data = $data->get_error_data($code)) {
 					continue;
 				}
 				$class = '';
-				if ( is_object( $error_data ) ) {
-					$class = ' class="' . get_class( $error_data ) . '"';
-					$error_data = get_object_vars( $error_data );
+				if (is_object($error_data)) {
+					$class = ' class="'.get_class($error_data).'"';
+					$error_data = get_object_vars($error_data);
 				}
 
 				$response .= "<wp_error_data code='$code'$class>";
 
-				if ( is_scalar( $error_data ) ) {
+				if (is_scalar($error_data)) {
 					$response .= "<![CDATA[$error_data]]>";
-				} elseif ( is_array( $error_data ) ) {
-					foreach ( $error_data as $k => $v ) {
+				} elseif (is_array($error_data)) {
+					foreach ($error_data as $k => $v) {
 						$response .= "<$k><![CDATA[$v]]></$k>";
 					}
 				}
@@ -102,22 +102,22 @@ 
 		}
 
 		$s = '';
-		if ( is_array( $r['supplemental'] ) ) {
-			foreach ( $r['supplemental'] as $k => $v ) {
+		if (is_array($r['supplemental'])) {
+			foreach ($r['supplemental'] as $k => $v) {
 				$s .= "<$k><![CDATA[$v]]></$k>";
 			}
 			$s = "<supplemental>$s</supplemental>";
 		}
 
-		if ( false === $action ) {
+		if (false === $action) {
 			$action = $_POST['action'];
 		}
 		$x = '';
 		$x .= "<response action='{$action}_$id'>"; // The action attribute in the xml output is formatted like a nonce action
-		$x .=	"<$what id='$id' " . ( false === $old_id ? '' : "old_id='$old_id' " ) . "position='$position'>";
-		$x .=		$response;
-		$x .=		$s;
-		$x .=	"</$what>";
+		$x .= "<$what id='$id' ".(false === $old_id ? '' : "old_id='$old_id' ")."position='$position'>";
+		$x .= $response;
+		$x .= $s;
+		$x .= "</$what>";
 		$x .= "</response>";
 
 		$this->responses[] = $x;
@@ -132,12 +132,12 @@ 
 	 * @since 2.1.0
 	 */
 	public function send() {
-		header( 'Content-Type: text/xml; charset=' . get_option( 'blog_charset' ) );
-		echo "<?xml version='1.0' encoding='" . get_option( 'blog_charset' ) . "' standalone='yes'?><wp_ajax>";
-		foreach ( (array) $this->responses as $response )
+		header('Content-Type: text/xml; charset='.get_option('blog_charset'));
+		echo "<?xml version='1.0' encoding='".get_option('blog_charset')."' standalone='yes'?><wp_ajax>";
+		foreach ((array) $this->responses as $response)
 			echo $response;
 		echo '</wp_ajax>';
-		if ( defined( 'DOING_AJAX' ) && DOING_AJAX )
+		if (defined('DOING_AJAX') && DOING_AJAX)
 			wp_die();
 		else
 			die();

Braces +11 added lines, -8 removed lines

@@ -23,8 +23,9 @@ 
 	 * @param string|array $args Optional. Will be passed to add() method.
 	 */
 	public function __construct( $args = '' ) {
-		if ( !empty($args) )
-			$this->add($args);
+		if ( !empty($args) ) {
+					$this->add($args);
+		}
 	}
 
 	/**
@@ -134,12 +135,14 @@ 
 	public function send() {
 		header( 'Content-Type: text/xml; charset=' . get_option( 'blog_charset' ) );
 		echo "<?xml version='1.0' encoding='" . get_option( 'blog_charset' ) . "' standalone='yes'?><wp_ajax>";
-		foreach ( (array) $this->responses as $response )
-			echo $response;
+		foreach ( (array) $this->responses as $response ) {
+					echo $response;
+		}
 		echo '</wp_ajax>';
-		if ( defined( 'DOING_AJAX' ) && DOING_AJAX )
-			wp_die();
-		else
-			die();
+		if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) {
+					wp_die();
+		} else {
+					die();
+		}
 	}
 }

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * Send XML response back to AJAX request.
- *
- * @package WordPress
- * @since 2.1.0
- */
+	 * Send XML response back to AJAX request.
+	 *
+	 * @package WordPress
+	 * @since 2.1.0
+	 */
 class WP_Ajax_Response {
 	/**
 	 * Store XML responses to send.

src/wp-includes/registration.php

Spacing +1 added lines, -1 removed lines

@@ -4,4 +4,4 @@
  *
  * @package WordPress
  */
-_deprecated_file( basename(__FILE__), '3.1', null, __( 'This file no longer needs to be included.' ) );
+_deprecated_file(basename(__FILE__), '3.1', null, __('This file no longer needs to be included.'));

Indentation +4 added lines, -4 removed lines

@@ -1,7 +1,7 @@
 <?php
 /**
- * Deprecated. No longer needed.
- *
- * @package WordPress
- */
+	 * Deprecated. No longer needed.
+	 *
+	 * @package WordPress
+	 */
 _deprecated_file( basename(__FILE__), '3.1', null, __( 'This file no longer needs to be included.' ) );

src/wp-includes/class-oembed.php

Indentation +9 added lines, -9 removed lines

@@ -1,14 +1,14 @@
 <?php
 /**
- * API for fetching the HTML to embed remote content based on a provided URL.
- * Used internally by the {@link WP_Embed} class, but is designed to be generic.
- *
- * @link https://codex.wordpress.org/oEmbed oEmbed Codex Article
- * @link http://oembed.com/ oEmbed Homepage
- *
- * @package WordPress
- * @subpackage oEmbed
- */
+	 * API for fetching the HTML to embed remote content based on a provided URL.
+	 * Used internally by the {@link WP_Embed} class, but is designed to be generic.
+	 *
+	 * @link https://codex.wordpress.org/oEmbed oEmbed Codex Article
+	 * @link http://oembed.com/ oEmbed Homepage
+	 *
+	 * @package WordPress
+	 * @subpackage oEmbed
+	 */
 
 /**
  * oEmbed class.

Spacing +160 added lines, -160 removed lines

@@ -25,7 +25,7 @@ 
 	 */
 	public static $early_providers = array();
 
-	private $compat_methods = array( '_fetch_with_format', '_parse_json', '_parse_xml', '_parse_body' );
+	private $compat_methods = array('_fetch_with_format', '_parse_json', '_parse_xml', '_parse_body');
 
 	/**
 	 * Constructor
@@ -33,62 +33,62 @@ 
 	 * @since 2.9.0
 	 */
 	public function __construct() {
-		$host = urlencode( home_url() );
+		$host = urlencode(home_url());
 		$providers = array(
-			'#http://((m|www)\.)?youtube\.com/watch.*#i'          => array( 'http://www.youtube.com/oembed',                             true  ),
-			'#https://((m|www)\.)?youtube\.com/watch.*#i'         => array( 'http://www.youtube.com/oembed?scheme=https',                true  ),
-			'#http://((m|www)\.)?youtube\.com/playlist.*#i'       => array( 'http://www.youtube.com/oembed',                             true  ),
-			'#https://((m|www)\.)?youtube\.com/playlist.*#i'      => array( 'http://www.youtube.com/oembed?scheme=https',                true  ),
-			'#http://youtu\.be/.*#i'                              => array( 'http://www.youtube.com/oembed',                             true  ),
-			'#https://youtu\.be/.*#i'                             => array( 'http://www.youtube.com/oembed?scheme=https',                true  ),
-			'#https?://(.+\.)?vimeo\.com/.*#i'                    => array( 'http://vimeo.com/api/oembed.{format}',                      true  ),
-			'#https?://(www\.)?dailymotion\.com/.*#i'             => array( 'https://www.dailymotion.com/services/oembed',               true  ),
-			'#https?://dai.ly/.*#i'                               => array( 'https://www.dailymotion.com/services/oembed',               true  ),
-			'#https?://(www\.)?flickr\.com/.*#i'                  => array( 'https://www.flickr.com/services/oembed/',                   true  ),
-			'#https?://flic\.kr/.*#i'                             => array( 'https://www.flickr.com/services/oembed/',                   true  ),
-			'#https?://(.+\.)?smugmug\.com/.*#i'                  => array( 'http://api.smugmug.com/services/oembed/',                   true  ),
-			'#https?://(www\.)?hulu\.com/watch/.*#i'              => array( 'http://www.hulu.com/api/oembed.{format}',                   true  ),
-			'http://i*.photobucket.com/albums/*'                  => array( 'http://api.photobucket.com/oembed',                         false ),
-			'http://gi*.photobucket.com/groups/*'                 => array( 'http://api.photobucket.com/oembed',                         false ),
-			'#https?://(www\.)?scribd\.com/doc/.*#i'              => array( 'http://www.scribd.com/services/oembed',                     true  ),
-			'#https?://wordpress.tv/.*#i'                         => array( 'http://wordpress.tv/oembed/',                               true  ),
-			'#https?://(.+\.)?polldaddy\.com/.*#i'                => array( 'https://polldaddy.com/oembed/',                             true  ),
-			'#https?://poll\.fm/.*#i'                             => array( 'https://polldaddy.com/oembed/',                             true  ),
-			'#https?://(www\.)?funnyordie\.com/videos/.*#i'       => array( 'http://www.funnyordie.com/oembed',                          true  ),
-			'#https?://(www\.)?twitter\.com/.+?/status(es)?/.*#i' => array( 'https://publish.twitter.com/oembed',                        true  ),
-			'#https?://(www\.)?twitter\.com/.+?/timelines/.*#i'   => array( 'https://publish.twitter.com/oembed',                        true  ),
-			'#https?://(www\.)?twitter\.com/i/moments/.*#i'       => array( 'https://publish.twitter.com/oembed',                        true  ),
-			'#https?://vine.co/v/.*#i'                            => array( 'https://vine.co/oembed.{format}',                           true  ),
-			'#https?://(www\.)?soundcloud\.com/.*#i'              => array( 'http://soundcloud.com/oembed',                              true  ),
-			'#https?://(.+?\.)?slideshare\.net/.*#i'              => array( 'https://www.slideshare.net/api/oembed/2',                   true  ),
-			'#https?://(www\.)?instagr(\.am|am\.com)/p/.*#i'      => array( 'https://api.instagram.com/oembed',                          true  ),
-			'#https?://(open|play)\.spotify\.com/.*#i'            => array( 'https://embed.spotify.com/oembed/',                         true  ),
-			'#https?://(.+\.)?imgur\.com/.*#i'                    => array( 'http://api.imgur.com/oembed',                               true  ),
-			'#https?://(www\.)?meetu(\.ps|p\.com)/.*#i'           => array( 'http://api.meetup.com/oembed',                              true  ),
-			'#https?://(www\.)?issuu\.com/.+/docs/.+#i'           => array( 'http://issuu.com/oembed_wp',                                true  ),
-			'#https?://(www\.)?collegehumor\.com/video/.*#i'      => array( 'http://www.collegehumor.com/oembed.{format}',               true  ),
-			'#https?://(www\.)?mixcloud\.com/.*#i'                => array( 'http://www.mixcloud.com/oembed',                            true  ),
-			'#https?://(www\.|embed\.)?ted\.com/talks/.*#i'       => array( 'http://www.ted.com/talks/oembed.{format}',                  true  ),
-			'#https?://(www\.)?(animoto|video214)\.com/play/.*#i' => array( 'https://animoto.com/oembeds/create',                        true  ),
-			'#https?://(.+)\.tumblr\.com/post/.*#i'               => array( 'https://www.tumblr.com/oembed/1.0',                         true  ),
-			'#https?://(www\.)?kickstarter\.com/projects/.*#i'    => array( 'https://www.kickstarter.com/services/oembed',               true  ),
-			'#https?://kck\.st/.*#i'                              => array( 'https://www.kickstarter.com/services/oembed',               true  ),
-			'#https?://cloudup\.com/.*#i'                         => array( 'https://cloudup.com/oembed',                                true  ),
-			'#https?://(www\.)?reverbnation\.com/.*#i'            => array( 'https://www.reverbnation.com/oembed',                       true  ),
-			'#https?://videopress.com/v/.*#'                      => array( 'https://public-api.wordpress.com/oembed/1.0/?for=' . $host, true  ),
-			'#https?://(www\.)?reddit\.com/r/[^/]+/comments/.*#i' => array( 'https://www.reddit.com/oembed',                             true  ),
-			'#https?://(www\.)?speakerdeck\.com/.*#i'             => array( 'https://speakerdeck.com/oembed.{format}',                   true  ),
+			'#http://((m|www)\.)?youtube\.com/watch.*#i'          => array('http://www.youtube.com/oembed', true),
+			'#https://((m|www)\.)?youtube\.com/watch.*#i'         => array('http://www.youtube.com/oembed?scheme=https', true),
+			'#http://((m|www)\.)?youtube\.com/playlist.*#i'       => array('http://www.youtube.com/oembed', true),
+			'#https://((m|www)\.)?youtube\.com/playlist.*#i'      => array('http://www.youtube.com/oembed?scheme=https', true),
+			'#http://youtu\.be/.*#i'                              => array('http://www.youtube.com/oembed', true),
+			'#https://youtu\.be/.*#i'                             => array('http://www.youtube.com/oembed?scheme=https', true),
+			'#https?://(.+\.)?vimeo\.com/.*#i'                    => array('http://vimeo.com/api/oembed.{format}', true),
+			'#https?://(www\.)?dailymotion\.com/.*#i'             => array('https://www.dailymotion.com/services/oembed', true),
+			'#https?://dai.ly/.*#i'                               => array('https://www.dailymotion.com/services/oembed', true),
+			'#https?://(www\.)?flickr\.com/.*#i'                  => array('https://www.flickr.com/services/oembed/', true),
+			'#https?://flic\.kr/.*#i'                             => array('https://www.flickr.com/services/oembed/', true),
+			'#https?://(.+\.)?smugmug\.com/.*#i'                  => array('http://api.smugmug.com/services/oembed/', true),
+			'#https?://(www\.)?hulu\.com/watch/.*#i'              => array('http://www.hulu.com/api/oembed.{format}', true),
+			'http://i*.photobucket.com/albums/*'                  => array('http://api.photobucket.com/oembed', false),
+			'http://gi*.photobucket.com/groups/*'                 => array('http://api.photobucket.com/oembed', false),
+			'#https?://(www\.)?scribd\.com/doc/.*#i'              => array('http://www.scribd.com/services/oembed', true),
+			'#https?://wordpress.tv/.*#i'                         => array('http://wordpress.tv/oembed/', true),
+			'#https?://(.+\.)?polldaddy\.com/.*#i'                => array('https://polldaddy.com/oembed/', true),
+			'#https?://poll\.fm/.*#i'                             => array('https://polldaddy.com/oembed/', true),
+			'#https?://(www\.)?funnyordie\.com/videos/.*#i'       => array('http://www.funnyordie.com/oembed', true),
+			'#https?://(www\.)?twitter\.com/.+?/status(es)?/.*#i' => array('https://publish.twitter.com/oembed', true),
+			'#https?://(www\.)?twitter\.com/.+?/timelines/.*#i'   => array('https://publish.twitter.com/oembed', true),
+			'#https?://(www\.)?twitter\.com/i/moments/.*#i'       => array('https://publish.twitter.com/oembed', true),
+			'#https?://vine.co/v/.*#i'                            => array('https://vine.co/oembed.{format}', true),
+			'#https?://(www\.)?soundcloud\.com/.*#i'              => array('http://soundcloud.com/oembed', true),
+			'#https?://(.+?\.)?slideshare\.net/.*#i'              => array('https://www.slideshare.net/api/oembed/2', true),
+			'#https?://(www\.)?instagr(\.am|am\.com)/p/.*#i'      => array('https://api.instagram.com/oembed', true),
+			'#https?://(open|play)\.spotify\.com/.*#i'            => array('https://embed.spotify.com/oembed/', true),
+			'#https?://(.+\.)?imgur\.com/.*#i'                    => array('http://api.imgur.com/oembed', true),
+			'#https?://(www\.)?meetu(\.ps|p\.com)/.*#i'           => array('http://api.meetup.com/oembed', true),
+			'#https?://(www\.)?issuu\.com/.+/docs/.+#i'           => array('http://issuu.com/oembed_wp', true),
+			'#https?://(www\.)?collegehumor\.com/video/.*#i'      => array('http://www.collegehumor.com/oembed.{format}', true),
+			'#https?://(www\.)?mixcloud\.com/.*#i'                => array('http://www.mixcloud.com/oembed', true),
+			'#https?://(www\.|embed\.)?ted\.com/talks/.*#i'       => array('http://www.ted.com/talks/oembed.{format}', true),
+			'#https?://(www\.)?(animoto|video214)\.com/play/.*#i' => array('https://animoto.com/oembeds/create', true),
+			'#https?://(.+)\.tumblr\.com/post/.*#i'               => array('https://www.tumblr.com/oembed/1.0', true),
+			'#https?://(www\.)?kickstarter\.com/projects/.*#i'    => array('https://www.kickstarter.com/services/oembed', true),
+			'#https?://kck\.st/.*#i'                              => array('https://www.kickstarter.com/services/oembed', true),
+			'#https?://cloudup\.com/.*#i'                         => array('https://cloudup.com/oembed', true),
+			'#https?://(www\.)?reverbnation\.com/.*#i'            => array('https://www.reverbnation.com/oembed', true),
+			'#https?://videopress.com/v/.*#'                      => array('https://public-api.wordpress.com/oembed/1.0/?for='.$host, true),
+			'#https?://(www\.)?reddit\.com/r/[^/]+/comments/.*#i' => array('https://www.reddit.com/oembed', true),
+			'#https?://(www\.)?speakerdeck\.com/.*#i'             => array('https://speakerdeck.com/oembed.{format}', true),
 		);
 
-		if ( ! empty( self::$early_providers['add'] ) ) {
-			foreach ( self::$early_providers['add'] as $format => $data ) {
-				$providers[ $format ] = $data;
+		if ( ! empty(self::$early_providers['add'])) {
+			foreach (self::$early_providers['add'] as $format => $data) {
+				$providers[$format] = $data;
 			}
 		}
 
-		if ( ! empty( self::$early_providers['remove'] ) ) {
-			foreach ( self::$early_providers['remove'] as $format ) {
-				unset( $providers[ $format ] );
+		if ( ! empty(self::$early_providers['remove'])) {
+			foreach (self::$early_providers['remove'] as $format) {
+				unset($providers[$format]);
 			}
 		}
 
@@ -163,10 +163,10 @@ 
 		 *
 		 * @param array $providers An array of popular oEmbed providers.
 		 */
-		$this->providers = apply_filters( 'oembed_providers', $providers );
+		$this->providers = apply_filters('oembed_providers', $providers);
 
 		// Fix any embeds that contain new lines in the middle of the HTML which breaks wpautop().
-		add_filter( 'oembed_dataparse', array($this, '_strip_newlines'), 10, 3 );
+		add_filter('oembed_dataparse', array($this, '_strip_newlines'), 10, 3);
 	}
 
 	/**
@@ -179,9 +179,9 @@ 
 	 * @param array    $arguments Arguments to pass when calling.
 	 * @return mixed|bool 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;
 	}
@@ -198,30 +198,30 @@ 
 	 * @param string|array  $args Optional provider arguments.
 	 * @return false|string False on failure, otherwise the oEmbed provider URL.
 	 */
-	public function get_provider( $url, $args = '' ) {
+	public function get_provider($url, $args = '') {
 
 		$provider = false;
 
-		if ( !isset($args['discover']) )
+		if ( ! isset($args['discover']))
 			$args['discover'] = true;
 
-		foreach ( $this->providers as $matchmask => $data ) {
-			list( $providerurl, $regex ) = $data;
+		foreach ($this->providers as $matchmask => $data) {
+			list($providerurl, $regex) = $data;
 
 			// Turn the asterisk-type provider URLs into regex
-			if ( !$regex ) {
-				$matchmask = '#' . str_replace( '___wildcard___', '(.+)', preg_quote( str_replace( '*', '___wildcard___', $matchmask ), '#' ) ) . '#i';
-				$matchmask = preg_replace( '|^#http\\\://|', '#https?\://', $matchmask );
+			if ( ! $regex) {
+				$matchmask = '#'.str_replace('___wildcard___', '(.+)', preg_quote(str_replace('*', '___wildcard___', $matchmask), '#')).'#i';
+				$matchmask = preg_replace('|^#http\\\://|', '#https?\://', $matchmask);
 			}
 
-			if ( preg_match( $matchmask, $url ) ) {
-				$provider = str_replace( '{format}', 'json', $providerurl ); // JSON is easier to deal with than XML
+			if (preg_match($matchmask, $url)) {
+				$provider = str_replace('{format}', 'json', $providerurl); // JSON is easier to deal with than XML
 				break;
 			}
 		}
 
-		if ( !$provider && $args['discover'] )
-			$provider = $this->discover( $url );
+		if ( ! $provider && $args['discover'])
+			$provider = $this->discover($url);
 
 		return $provider;
 	}
@@ -244,12 +244,12 @@ 
 	 * @param bool   $regex    Optional. Whether the $format parameter is in a regex format.
 	 *                         Default false.
 	 */
-	public static function _add_provider_early( $format, $provider, $regex = false ) {
-		if ( empty( self::$early_providers['add'] ) ) {
+	public static function _add_provider_early($format, $provider, $regex = false) {
+		if (empty(self::$early_providers['add'])) {
 			self::$early_providers['add'] = array();
 		}
 
-		self::$early_providers['add'][ $format ] = array( $provider, $regex );
+		self::$early_providers['add'][$format] = array($provider, $regex);
 	}
 
 	/**
@@ -267,8 +267,8 @@ 
 	 * @param string $format The format of URL that this provider can handle. You can use
 	 *                       asterisks as wildcards.
 	 */
-	public static function _remove_provider_early( $format ) {
-		if ( empty( self::$early_providers['remove'] ) ) {
+	public static function _remove_provider_early($format) {
+		if (empty(self::$early_providers['remove'])) {
 			self::$early_providers['remove'] = array();
 		}
 
@@ -285,10 +285,10 @@ 
 	 * @param array $args Optional arguments. Usually passed from a shortcode.
 	 * @return false|string False on failure, otherwise the UNSANITIZED (and potentially unsafe) HTML that should be used to embed.
 	 */
-	public function get_html( $url, $args = '' ) {
-		$provider = $this->get_provider( $url, $args );
+	public function get_html($url, $args = '') {
+		$provider = $this->get_provider($url, $args);
 
-		if ( !$provider || false === $data = $this->fetch( $provider, $url, $args ) )
+		if ( ! $provider || false === $data = $this->fetch($provider, $url, $args))
 			return false;
 
 		/**
@@ -300,7 +300,7 @@ 
 		 * @param string $url  URL of the content to be embedded.
 		 * @param array  $args Optional arguments, usually passed from a shortcode.
 		 */
-		return apply_filters( 'oembed_result', $this->data2html( $data, $url ), $url, $args );
+		return apply_filters('oembed_result', $this->data2html($data, $url), $url, $args);
 	}
 
 	/**
@@ -309,7 +309,7 @@ 
 	 * @param string $url The URL that should be inspected for discovery `<link>` tags.
 	 * @return false|string False on failure, otherwise the oEmbed provider URL.
 	 */
-	public function discover( $url ) {
+	public function discover($url) {
 		$providers = array();
 		$args = array(
 			'limit_response_size' => 153600, // 150 KB
@@ -325,11 +325,11 @@ 
 		 * @param array  $args oEmbed remote get arguments.
 		 * @param string $url  URL to be inspected.
 		 */
-		$args = apply_filters( 'oembed_remote_get_args', $args, $url );
+		$args = apply_filters('oembed_remote_get_args', $args, $url);
 
 		// Fetch URL content
-		$request = wp_safe_remote_get( $url, $args );
-		if ( $html = wp_remote_retrieve_body( $request ) ) {
+		$request = wp_safe_remote_get($url, $args);
+		if ($html = wp_remote_retrieve_body($request)) {
 
 			/**
 			 * Filter the link types that contain oEmbed provider URLs.
@@ -340,35 +340,35 @@ 
 			 *                      'text/xml+oembed', and 'application/xml+oembed' (incorrect,
 			 *                      used by at least Vimeo).
 			 */
-			$linktypes = apply_filters( 'oembed_linktypes', array(
+			$linktypes = apply_filters('oembed_linktypes', array(
 				'application/json+oembed' => 'json',
 				'text/xml+oembed' => 'xml',
 				'application/xml+oembed' => 'xml',
-			) );
+			));
 
 			// Strip <body>
-			if ( $html_head_end = stripos( $html, '</head>' ) ) {
-				$html = substr( $html, 0, $html_head_end );
+			if ($html_head_end = stripos($html, '</head>')) {
+				$html = substr($html, 0, $html_head_end);
 			}
 
 			// Do a quick check
 			$tagfound = false;
-			foreach ( $linktypes as $linktype => $format ) {
-				if ( stripos($html, $linktype) ) {
+			foreach ($linktypes as $linktype => $format) {
+				if (stripos($html, $linktype)) {
 					$tagfound = true;
 					break;
 				}
 			}
 
-			if ( $tagfound && preg_match_all( '#<link([^<>]+)/?>#iU', $html, $links ) ) {
-				foreach ( $links[1] as $link ) {
-					$atts = shortcode_parse_atts( $link );
+			if ($tagfound && preg_match_all('#<link([^<>]+)/?>#iU', $html, $links)) {
+				foreach ($links[1] as $link) {
+					$atts = shortcode_parse_atts($link);
 
-					if ( !empty($atts['type']) && !empty($linktypes[$atts['type']]) && !empty($atts['href']) ) {
-						$providers[$linktypes[$atts['type']]] = htmlspecialchars_decode( $atts['href'] );
+					if ( ! empty($atts['type']) && ! empty($linktypes[$atts['type']]) && ! empty($atts['href'])) {
+						$providers[$linktypes[$atts['type']]] = htmlspecialchars_decode($atts['href']);
 
 						// Stop here if it's JSON (that's all we need)
-						if ( 'json' == $linktypes[$atts['type']] )
+						if ('json' == $linktypes[$atts['type']])
 							break;
 					}
 				}
@@ -376,9 +376,9 @@ 
 		}
 
 		// JSON is preferred to XML
-		if ( !empty($providers['json']) )
+		if ( ! empty($providers['json']))
 			return $providers['json'];
-		elseif ( !empty($providers['xml']) )
+		elseif ( ! empty($providers['xml']))
 			return $providers['xml'];
 		else
 			return false;
@@ -392,12 +392,12 @@ 
 	 * @param array $args Optional arguments. Usually passed from a shortcode.
 	 * @return false|object False on failure, otherwise the result in the form of an object.
 	 */
-	public function fetch( $provider, $url, $args = '' ) {
-		$args = wp_parse_args( $args, wp_embed_defaults( $url ) );
+	public function fetch($provider, $url, $args = '') {
+		$args = wp_parse_args($args, wp_embed_defaults($url));
 
-		$provider = add_query_arg( 'maxwidth', (int) $args['width'], $provider );
-		$provider = add_query_arg( 'maxheight', (int) $args['height'], $provider );
-		$provider = add_query_arg( 'url', urlencode($url), $provider );
+		$provider = add_query_arg('maxwidth', (int) $args['width'], $provider);
+		$provider = add_query_arg('maxheight', (int) $args['height'], $provider);
+		$provider = add_query_arg('url', urlencode($url), $provider);
 
 		/**
 		 * Filter the oEmbed URL to be fetched.
@@ -408,13 +408,13 @@ 
 		 * @param string $url      URL of the content to be embedded.
 		 * @param array  $args     Optional arguments, usually passed from a shortcode.
 		 */
-		$provider = apply_filters( 'oembed_fetch_url', $provider, $url, $args );
+		$provider = apply_filters('oembed_fetch_url', $provider, $url, $args);
 
-		foreach ( array( 'json', 'xml' ) as $format ) {
-			$result = $this->_fetch_with_format( $provider, $format );
-			if ( is_wp_error( $result ) && 'not-implemented' == $result->get_error_code() )
+		foreach (array('json', 'xml') as $format) {
+			$result = $this->_fetch_with_format($provider, $format);
+			if (is_wp_error($result) && 'not-implemented' == $result->get_error_code())
 				continue;
-			return ( $result && ! is_wp_error( $result ) ) ? $result : false;
+			return ($result && ! is_wp_error($result)) ? $result : false;
 		}
 		return false;
 	}
@@ -428,19 +428,19 @@ 
 	 * @param string $format Format to use
 	 * @return false|object|WP_Error False on failure, otherwise the result in the form of an object.
 	 */
-	private function _fetch_with_format( $provider_url_with_args, $format ) {
-		$provider_url_with_args = add_query_arg( 'format', $format, $provider_url_with_args );
+	private function _fetch_with_format($provider_url_with_args, $format) {
+		$provider_url_with_args = add_query_arg('format', $format, $provider_url_with_args);
 
 		/** This filter is documented in wp-includes/class-oembed.php */
-		$args = apply_filters( 'oembed_remote_get_args', array(), $provider_url_with_args );
+		$args = apply_filters('oembed_remote_get_args', array(), $provider_url_with_args);
 
-		$response = wp_safe_remote_get( $provider_url_with_args, $args );
-		if ( 501 == wp_remote_retrieve_response_code( $response ) )
-			return new WP_Error( 'not-implemented' );
-		if ( ! $body = wp_remote_retrieve_body( $response ) )
+		$response = wp_safe_remote_get($provider_url_with_args, $args);
+		if (501 == wp_remote_retrieve_response_code($response))
+			return new WP_Error('not-implemented');
+		if ( ! $body = wp_remote_retrieve_body($response))
 			return false;
 		$parse_method = "_parse_$format";
-		return $this->$parse_method( $body );
+		return $this->$parse_method($body);
 	}
 
 	/**
@@ -452,9 +452,9 @@ 
 	 * @param string $response_body
 	 * @return object|false
 	 */
-	private function _parse_json( $response_body ) {
-		$data = json_decode( trim( $response_body ) );
-		return ( $data && is_object( $data ) ) ? $data : false;
+	private function _parse_json($response_body) {
+		$data = json_decode(trim($response_body));
+		return ($data && is_object($data)) ? $data : false;
 	}
 
 	/**
@@ -466,17 +466,17 @@ 
 	 * @param string $response_body
 	 * @return object|false
 	 */
-	private function _parse_xml( $response_body ) {
-		if ( ! function_exists( 'libxml_disable_entity_loader' ) )
+	private function _parse_xml($response_body) {
+		if ( ! function_exists('libxml_disable_entity_loader'))
 			return false;
 
-		$loader = libxml_disable_entity_loader( true );
-		$errors = libxml_use_internal_errors( true );
+		$loader = libxml_disable_entity_loader(true);
+		$errors = libxml_use_internal_errors(true);
 
-		$return = $this->_parse_xml_body( $response_body );
+		$return = $this->_parse_xml_body($response_body);
 
-		libxml_use_internal_errors( $errors );
-		libxml_disable_entity_loader( $loader );
+		libxml_use_internal_errors($errors);
+		libxml_disable_entity_loader($loader);
 
 		return $return;
 	}
@@ -490,29 +490,29 @@ 
 	 * @param string $response_body
 	 * @return object|false
 	 */
-	private function _parse_xml_body( $response_body ) {
-		if ( ! function_exists( 'simplexml_import_dom' ) || ! class_exists( 'DOMDocument', false ) )
+	private function _parse_xml_body($response_body) {
+		if ( ! function_exists('simplexml_import_dom') || ! class_exists('DOMDocument', false))
 			return false;
 
 		$dom = new DOMDocument;
-		$success = $dom->loadXML( $response_body );
-		if ( ! $success )
+		$success = $dom->loadXML($response_body);
+		if ( ! $success)
 			return false;
 
-		if ( isset( $dom->doctype ) )
+		if (isset($dom->doctype))
 			return false;
 
-		foreach ( $dom->childNodes as $child ) {
-			if ( XML_DOCUMENT_TYPE_NODE === $child->nodeType )
+		foreach ($dom->childNodes as $child) {
+			if (XML_DOCUMENT_TYPE_NODE === $child->nodeType)
 				return false;
 		}
 
-		$xml = simplexml_import_dom( $dom );
-		if ( ! $xml )
+		$xml = simplexml_import_dom($dom);
+		if ( ! $xml)
 			return false;
 
 		$return = new stdClass;
-		foreach ( $xml as $key => $value ) {
+		foreach ($xml as $key => $value) {
 			$return->$key = (string) $value;
 		}
 
@@ -526,32 +526,32 @@ 
 	 * @param string $url The URL to the content that is desired to be embedded.
 	 * @return false|string False on error, otherwise the HTML needed to embed.
 	 */
-	public function data2html( $data, $url ) {
-		if ( ! is_object( $data ) || empty( $data->type ) )
+	public function data2html($data, $url) {
+		if ( ! is_object($data) || empty($data->type))
 			return false;
 
 		$return = false;
 
-		switch ( $data->type ) {
+		switch ($data->type) {
 			case 'photo':
-				if ( empty( $data->url ) || empty( $data->width ) || empty( $data->height ) )
+				if (empty($data->url) || empty($data->width) || empty($data->height))
 					break;
-				if ( ! is_string( $data->url ) || ! is_numeric( $data->width ) || ! is_numeric( $data->height ) )
+				if ( ! is_string($data->url) || ! is_numeric($data->width) || ! is_numeric($data->height))
 					break;
 
-				$title = ! empty( $data->title ) && is_string( $data->title ) ? $data->title : '';
-				$return = '<a href="' . esc_url( $url ) . '"><img src="' . esc_url( $data->url ) . '" alt="' . esc_attr($title) . '" width="' . esc_attr($data->width) . '" height="' . esc_attr($data->height) . '" /></a>';
+				$title = ! empty($data->title) && is_string($data->title) ? $data->title : '';
+				$return = '<a href="'.esc_url($url).'"><img src="'.esc_url($data->url).'" alt="'.esc_attr($title).'" width="'.esc_attr($data->width).'" height="'.esc_attr($data->height).'" /></a>';
 				break;
 
 			case 'video':
 			case 'rich':
-				if ( ! empty( $data->html ) && is_string( $data->html ) )
+				if ( ! empty($data->html) && is_string($data->html))
 					$return = $data->html;
 				break;
 
 			case 'link':
-				if ( ! empty( $data->title ) && is_string( $data->title ) )
-					$return = '<a href="' . esc_url( $url ) . '">' . esc_html( $data->title ) . '</a>';
+				if ( ! empty($data->title) && is_string($data->title))
+					$return = '<a href="'.esc_url($url).'">'.esc_html($data->title).'</a>';
 				break;
 
 			default:
@@ -569,7 +569,7 @@ 
 		 * @param object $data   A data object result from an oEmbed provider.
 		 * @param string $url    The URL of the content to be embedded.
 		 */
-		return apply_filters( 'oembed_dataparse', $return, $data, $url );
+		return apply_filters('oembed_dataparse', $return, $data, $url);
 	}
 
 	/**
@@ -581,33 +581,33 @@ 
 	 * @param string $url The original URL passed to oEmbed.
 	 * @return string Possibly modified $html
 	 */
-	public function _strip_newlines( $html, $data, $url ) {
-		if ( false === strpos( $html, "\n" ) ) {
+	public function _strip_newlines($html, $data, $url) {
+		if (false === strpos($html, "\n")) {
 			return $html;
 		}
 
 		$count = 1;
 		$found = array();
 		$token = '__PRE__';
-		$search = array( "\t", "\n", "\r", ' ' );
-		$replace = array( '__TAB__', '__NL__', '__CR__', '__SPACE__' );
-		$tokenized = str_replace( $search, $replace, $html );
+		$search = array("\t", "\n", "\r", ' ');
+		$replace = array('__TAB__', '__NL__', '__CR__', '__SPACE__');
+		$tokenized = str_replace($search, $replace, $html);
 
-		preg_match_all( '#(<pre[^>]*>.+?</pre>)#i', $tokenized, $matches, PREG_SET_ORDER );
-		foreach ( $matches as $i => $match ) {
-			$tag_html = str_replace( $replace, $search, $match[0] );
-			$tag_token = $token . $i;
+		preg_match_all('#(<pre[^>]*>.+?</pre>)#i', $tokenized, $matches, PREG_SET_ORDER);
+		foreach ($matches as $i => $match) {
+			$tag_html = str_replace($replace, $search, $match[0]);
+			$tag_token = $token.$i;
 
-			$found[ $tag_token ] = $tag_html;
-			$html = str_replace( $tag_html, $tag_token, $html, $count );
+			$found[$tag_token] = $tag_html;
+			$html = str_replace($tag_html, $tag_token, $html, $count);
 		}
 
-		$replaced = str_replace( $replace, $search, $html );
-		$stripped = str_replace( array( "\r\n", "\n" ), '', $replaced );
-		$pre = array_values( $found );
-		$tokens = array_keys( $found );
+		$replaced = str_replace($replace, $search, $html);
+		$stripped = str_replace(array("\r\n", "\n"), '', $replaced);
+		$pre = array_values($found);
+		$tokens = array_keys($found);
 
-		return str_replace( $tokens, $pre, $stripped );
+		return str_replace($tokens, $pre, $stripped);
 	}
 }
 
@@ -624,7 +624,7 @@ 
 function _wp_oembed_get_object() {
 	static $wp_oembed = null;
 
-	if ( is_null( $wp_oembed ) ) {
+	if (is_null($wp_oembed)) {
 		$wp_oembed = new WP_oEmbed();
 	}
 	return $wp_oembed;

Braces +61 added lines, -42 removed lines

@@ -202,8 +202,9 @@ 
 
 		$provider = false;
 
-		if ( !isset($args['discover']) )
-			$args['discover'] = true;
+		if ( !isset($args['discover']) ) {
+					$args['discover'] = true;
+		}
 
 		foreach ( $this->providers as $matchmask => $data ) {
 			list( $providerurl, $regex ) = $data;
@@ -220,8 +221,9 @@ 
 			}
 		}
 
-		if ( !$provider && $args['discover'] )
-			$provider = $this->discover( $url );
+		if ( !$provider && $args['discover'] ) {
+					$provider = $this->discover( $url );
+		}
 
 		return $provider;
 	}
@@ -288,8 +290,9 @@ 
 	public function get_html( $url, $args = '' ) {
 		$provider = $this->get_provider( $url, $args );
 
-		if ( !$provider || false === $data = $this->fetch( $provider, $url, $args ) )
-			return false;
+		if ( !$provider || false === $data = $this->fetch( $provider, $url, $args ) ) {
+					return false;
+		}
 
 		/**
 		 * Filter the HTML returned by the oEmbed provider.
@@ -368,20 +371,22 @@ 
 						$providers[$linktypes[$atts['type']]] = htmlspecialchars_decode( $atts['href'] );
 
 						// Stop here if it's JSON (that's all we need)
-						if ( 'json' == $linktypes[$atts['type']] )
-							break;
+						if ( 'json' == $linktypes[$atts['type']] ) {
+													break;
+						}
 					}
 				}
 			}
 		}
 
 		// JSON is preferred to XML
-		if ( !empty($providers['json']) )
-			return $providers['json'];
-		elseif ( !empty($providers['xml']) )
-			return $providers['xml'];
-		else
-			return false;
+		if ( !empty($providers['json']) ) {
+					return $providers['json'];
+		} elseif ( !empty($providers['xml']) ) {
+					return $providers['xml'];
+		} else {
+					return false;
+		}
 	}
 
 	/**
@@ -412,8 +417,9 @@ 
 
 		foreach ( array( 'json', 'xml' ) as $format ) {
 			$result = $this->_fetch_with_format( $provider, $format );
-			if ( is_wp_error( $result ) && 'not-implemented' == $result->get_error_code() )
-				continue;
+			if ( is_wp_error( $result ) && 'not-implemented' == $result->get_error_code() ) {
+							continue;
+			}
 			return ( $result && ! is_wp_error( $result ) ) ? $result : false;
 		}
 		return false;
@@ -435,10 +441,12 @@ 
 		$args = apply_filters( 'oembed_remote_get_args', array(), $provider_url_with_args );
 
 		$response = wp_safe_remote_get( $provider_url_with_args, $args );
-		if ( 501 == wp_remote_retrieve_response_code( $response ) )
-			return new WP_Error( 'not-implemented' );
-		if ( ! $body = wp_remote_retrieve_body( $response ) )
-			return false;
+		if ( 501 == wp_remote_retrieve_response_code( $response ) ) {
+					return new WP_Error( 'not-implemented' );
+		}
+		if ( ! $body = wp_remote_retrieve_body( $response ) ) {
+					return false;
+		}
 		$parse_method = "_parse_$format";
 		return $this->$parse_method( $body );
 	}
@@ -467,8 +475,9 @@ 
 	 * @return object|false
 	 */
 	private function _parse_xml( $response_body ) {
-		if ( ! function_exists( 'libxml_disable_entity_loader' ) )
-			return false;
+		if ( ! function_exists( 'libxml_disable_entity_loader' ) ) {
+					return false;
+		}
 
 		$loader = libxml_disable_entity_loader( true );
 		$errors = libxml_use_internal_errors( true );
@@ -491,25 +500,30 @@ 
 	 * @return object|false
 	 */
 	private function _parse_xml_body( $response_body ) {
-		if ( ! function_exists( 'simplexml_import_dom' ) || ! class_exists( 'DOMDocument', false ) )
-			return false;
+		if ( ! function_exists( 'simplexml_import_dom' ) || ! class_exists( 'DOMDocument', false ) ) {
+					return false;
+		}
 
 		$dom = new DOMDocument;
 		$success = $dom->loadXML( $response_body );
-		if ( ! $success )
-			return false;
+		if ( ! $success ) {
+					return false;
+		}
 
-		if ( isset( $dom->doctype ) )
-			return false;
+		if ( isset( $dom->doctype ) ) {
+					return false;
+		}
 
 		foreach ( $dom->childNodes as $child ) {
-			if ( XML_DOCUMENT_TYPE_NODE === $child->nodeType )
-				return false;
+			if ( XML_DOCUMENT_TYPE_NODE === $child->nodeType ) {
+							return false;
+			}
 		}
 
 		$xml = simplexml_import_dom( $dom );
-		if ( ! $xml )
-			return false;
+		if ( ! $xml ) {
+					return false;
+		}
 
 		$return = new stdClass;
 		foreach ( $xml as $key => $value ) {
@@ -527,17 +541,20 @@ 
 	 * @return false|string False on error, otherwise the HTML needed to embed.
 	 */
 	public function data2html( $data, $url ) {
-		if ( ! is_object( $data ) || empty( $data->type ) )
-			return false;
+		if ( ! is_object( $data ) || empty( $data->type ) ) {
+					return false;
+		}
 
 		$return = false;
 
 		switch ( $data->type ) {
 			case 'photo':
-				if ( empty( $data->url ) || empty( $data->width ) || empty( $data->height ) )
-					break;
-				if ( ! is_string( $data->url ) || ! is_numeric( $data->width ) || ! is_numeric( $data->height ) )
-					break;
+				if ( empty( $data->url ) || empty( $data->width ) || empty( $data->height ) ) {
+									break;
+				}
+				if ( ! is_string( $data->url ) || ! is_numeric( $data->width ) || ! is_numeric( $data->height ) ) {
+									break;
+				}
 
 				$title = ! empty( $data->title ) && is_string( $data->title ) ? $data->title : '';
 				$return = '<a href="' . esc_url( $url ) . '"><img src="' . esc_url( $data->url ) . '" alt="' . esc_attr($title) . '" width="' . esc_attr($data->width) . '" height="' . esc_attr($data->height) . '" /></a>';
@@ -545,13 +562,15 @@ 
 
 			case 'video':
 			case 'rich':
-				if ( ! empty( $data->html ) && is_string( $data->html ) )
-					$return = $data->html;
+				if ( ! empty( $data->html ) && is_string( $data->html ) ) {
+									$return = $data->html;
+				}
 				break;
 
 			case 'link':
-				if ( ! empty( $data->title ) && is_string( $data->title ) )
-					$return = '<a href="' . esc_url( $url ) . '">' . esc_html( $data->title ) . '</a>';
+				if ( ! empty( $data->title ) && is_string( $data->title ) ) {
+									$return = '<a href="' . esc_url( $url ) . '">' . esc_html( $data->title ) . '</a>';
+				}
 				break;
 
 			default:

src/wp-includes/ms-files.php

Spacing +39 added lines, -39 removed lines

@@ -8,75 +8,75 @@
  * @subpackage Multisite
  */
 
-define( 'SHORTINIT', true );
-require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
+define('SHORTINIT', true);
+require_once(dirname(dirname(__FILE__)).'/wp-load.php');
 
-if ( !is_multisite() )
-	die( 'Multisite support not enabled' );
+if ( ! is_multisite())
+	die('Multisite support not enabled');
 
 ms_file_constants();
 
-error_reporting( 0 );
+error_reporting(0);
 
-if ( $current_blog->archived == '1' || $current_blog->spam == '1' || $current_blog->deleted == '1' ) {
-	status_header( 404 );
-	die( '404 — File not found.' );
+if ($current_blog->archived == '1' || $current_blog->spam == '1' || $current_blog->deleted == '1') {
+	status_header(404);
+	die('404 — File not found.');
 }
 
-$file = rtrim( BLOGUPLOADDIR, '/' ) . '/' . str_replace( '..', '', $_GET[ 'file' ] );
-if ( !is_file( $file ) ) {
-	status_header( 404 );
-	die( '404 — File not found.' );
+$file = rtrim(BLOGUPLOADDIR, '/').'/'.str_replace('..', '', $_GET['file']);
+if ( ! is_file($file)) {
+	status_header(404);
+	die('404 — File not found.');
 }
 
-$mime = wp_check_filetype( $file );
-if ( false === $mime[ 'type' ] && function_exists( 'mime_content_type' ) )
-	$mime[ 'type' ] = mime_content_type( $file );
+$mime = wp_check_filetype($file);
+if (false === $mime['type'] && function_exists('mime_content_type'))
+	$mime['type'] = mime_content_type($file);
 
-if ( $mime[ 'type' ] )
-	$mimetype = $mime[ 'type' ];
+if ($mime['type'])
+	$mimetype = $mime['type'];
 else
-	$mimetype = 'image/' . substr( $file, strrpos( $file, '.' ) + 1 );
+	$mimetype = 'image/'.substr($file, strrpos($file, '.') + 1);
 
-header( 'Content-Type: ' . $mimetype ); // always send this
-if ( false === strpos( $_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS' ) )
-	header( 'Content-Length: ' . filesize( $file ) );
+header('Content-Type: '.$mimetype); // always send this
+if (false === strpos($_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS'))
+	header('Content-Length: '.filesize($file));
 
 // Optional support for X-Sendfile and X-Accel-Redirect
-if ( WPMU_ACCEL_REDIRECT ) {
-	header( 'X-Accel-Redirect: ' . str_replace( WP_CONTENT_DIR, '', $file ) );
+if (WPMU_ACCEL_REDIRECT) {
+	header('X-Accel-Redirect: '.str_replace(WP_CONTENT_DIR, '', $file));
 	exit;
-} elseif ( WPMU_SENDFILE ) {
-	header( 'X-Sendfile: ' . $file );
+} elseif (WPMU_SENDFILE) {
+	header('X-Sendfile: '.$file);
 	exit;
 }
 
-$last_modified = gmdate( 'D, d M Y H:i:s', filemtime( $file ) );
-$etag = '"' . md5( $last_modified ) . '"';
-header( "Last-Modified: $last_modified GMT" );
-header( 'ETag: ' . $etag );
-header( 'Expires: ' . gmdate( 'D, d M Y H:i:s', time() + 100000000 ) . ' GMT' );
+$last_modified = gmdate('D, d M Y H:i:s', filemtime($file));
+$etag = '"'.md5($last_modified).'"';
+header("Last-Modified: $last_modified GMT");
+header('ETag: '.$etag);
+header('Expires: '.gmdate('D, d M Y H:i:s', time() + 100000000).' GMT');
 
 // Support for Conditional GET - use stripslashes to avoid formatting.php dependency
-$client_etag = isset( $_SERVER['HTTP_IF_NONE_MATCH'] ) ? stripslashes( $_SERVER['HTTP_IF_NONE_MATCH'] ) : false;
+$client_etag = isset($_SERVER['HTTP_IF_NONE_MATCH']) ? stripslashes($_SERVER['HTTP_IF_NONE_MATCH']) : false;
 
-if ( ! isset( $_SERVER['HTTP_IF_MODIFIED_SINCE'] ) )
+if ( ! isset($_SERVER['HTTP_IF_MODIFIED_SINCE']))
 	$_SERVER['HTTP_IF_MODIFIED_SINCE'] = false;
 
-$client_last_modified = trim( $_SERVER['HTTP_IF_MODIFIED_SINCE'] );
+$client_last_modified = trim($_SERVER['HTTP_IF_MODIFIED_SINCE']);
 // If string is empty, return 0. If not, attempt to parse into a timestamp
-$client_modified_timestamp = $client_last_modified ? strtotime( $client_last_modified ) : 0;
+$client_modified_timestamp = $client_last_modified ? strtotime($client_last_modified) : 0;
 
 // Make a timestamp for our most recent modification...
 $modified_timestamp = strtotime($last_modified);
 
-if ( ( $client_last_modified && $client_etag )
-	? ( ( $client_modified_timestamp >= $modified_timestamp) && ( $client_etag == $etag ) )
-	: ( ( $client_modified_timestamp >= $modified_timestamp) || ( $client_etag == $etag ) )
+if (($client_last_modified && $client_etag)
+	? (($client_modified_timestamp >= $modified_timestamp) && ($client_etag == $etag))
+	: (($client_modified_timestamp >= $modified_timestamp) || ($client_etag == $etag))
 	) {
-	status_header( 304 );
+	status_header(304);
 	exit;
 }
 
 // If we made it this far, just serve the file
-readfile( $file );
+readfile($file);

Braces +11 added lines, -6 removed lines

@@ -11,8 +11,9 @@ 
 define( 'SHORTINIT', true );
 require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
 
-if ( !is_multisite() )
+if ( !is_multisite() ) {
 	die( 'Multisite support not enabled' );
+}
 
 ms_file_constants();
 
@@ -30,17 +31,20 @@ 
 }
 
 $mime = wp_check_filetype( $file );
-if ( false === $mime[ 'type' ] && function_exists( 'mime_content_type' ) )
+if ( false === $mime[ 'type' ] && function_exists( 'mime_content_type' ) ) {
 	$mime[ 'type' ] = mime_content_type( $file );
+}
 
-if ( $mime[ 'type' ] )
+if ( $mime[ 'type' ] ) {
 	$mimetype = $mime[ 'type' ];
-else
+} else {
 	$mimetype = 'image/' . substr( $file, strrpos( $file, '.' ) + 1 );
+}
 
 header( 'Content-Type: ' . $mimetype ); // always send this
-if ( false === strpos( $_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS' ) )
+if ( false === strpos( $_SERVER['SERVER_SOFTWARE'], 'Microsoft-IIS' ) ) {
 	header( 'Content-Length: ' . filesize( $file ) );
+}
 
 // Optional support for X-Sendfile and X-Accel-Redirect
 if ( WPMU_ACCEL_REDIRECT ) {
@@ -60,8 +64,9 @@ 
 // Support for Conditional GET - use stripslashes to avoid formatting.php dependency
 $client_etag = isset( $_SERVER['HTTP_IF_NONE_MATCH'] ) ? stripslashes( $_SERVER['HTTP_IF_NONE_MATCH'] ) : false;
 
-if ( ! isset( $_SERVER['HTTP_IF_MODIFIED_SINCE'] ) )
+if ( ! isset( $_SERVER['HTTP_IF_MODIFIED_SINCE'] ) ) {
 	$_SERVER['HTTP_IF_MODIFIED_SINCE'] = false;
+}
 
 $client_last_modified = trim( $_SERVER['HTTP_IF_MODIFIED_SINCE'] );
 // If string is empty, return 0. If not, attempt to parse into a timestamp

src/wp-includes/compat.php

Braces +15 added lines, -10 removed lines

@@ -161,13 +161,15 @@ 
 function _hash_hmac($algo, $data, $key, $raw_output = false) {
 	$packs = array('md5' => 'H32', 'sha1' => 'H40');
 
-	if ( !isset($packs[$algo]) )
-		return false;
+	if ( !isset($packs[$algo]) ) {
+			return false;
+	}
 
 	$pack = $packs[$algo];
 
-	if (strlen($key) > 64)
-		$key = pack($pack, $algo($key));
+	if (strlen($key) > 64) {
+			$key = pack($pack, $algo($key));
+	}
 
 	$key = str_pad($key, 64, chr(0));
 
@@ -176,8 +178,9 @@ 
 
 	$hmac = $algo($opad . pack($pack, $algo($ipad . $data)));
 
-	if ( $raw_output )
-		return pack( $pack, $hmac );
+	if ( $raw_output ) {
+			return pack( $pack, $hmac );
+	}
 	return $hmac;
 }
 
@@ -210,8 +213,9 @@ 
 		}
 
 		$res = $wp_json->decode( $string );
-		if ( $assoc_array )
-			$res = _json_decode_object_helper( $res );
+		if ( $assoc_array ) {
+					$res = _json_decode_object_helper( $res );
+		}
 		return $res;
 	}
 
@@ -220,8 +224,9 @@ 
 	 * @return array
 	 */
 	function _json_decode_object_helper($data) {
-		if ( is_object($data) )
-			$data = get_object_vars($data);
+		if ( is_object($data) ) {
+					$data = get_object_vars($data);
+		}
 		return is_array($data) ? array_map(__FUNCTION__, $data) : $data;
 	}
 }

Doc Comments +5 added lines, -1 removed lines

@@ -8,6 +8,10 @@ 
 
 // If gettext isn't available
 if ( !function_exists('_') ) {
+
+	/**
+	 * @param string $string
+	 */
 	function _($string) {
 		return $string;
 	}
@@ -366,7 +370,7 @@ 
 	 *
 	 * @internal This is a compatibility function for PHP <5.5
 	 *
-	 * @return bool|string Returns the error message on success, "No Error" if no error has occurred,
+	 * @return false|string Returns the error message on success, "No Error" if no error has occurred,
 	 *                     or false on failure.
 	 */
 	function json_last_error_msg() {

Spacing +79 added lines, -79 removed lines

@@ -7,7 +7,7 @@ 
  */
 
 // If gettext isn't available
-if ( !function_exists('_') ) {
+if ( ! function_exists('_')) {
 	function _($string) {
 		return $string;
 	}
@@ -27,21 +27,21 @@ 
  *             false  : Used for testing - return false for future calls to this function
  *             'reset': Used for testing - restore default behavior of this function
  */
-function _wp_can_use_pcre_u( $set = null ) {
+function _wp_can_use_pcre_u($set = null) {
 	static $utf8_pcre = 'reset';
 
-	if ( null !== $set ) {
+	if (null !== $set) {
 		$utf8_pcre = $set;
 	}
 
-	if ( 'reset' === $utf8_pcre ) {
-		$utf8_pcre = @preg_match( '/^./u', 'a' );
+	if ('reset' === $utf8_pcre) {
+		$utf8_pcre = @preg_match('/^./u', 'a');
 	}
 
 	return $utf8_pcre;
 }
 
-if ( ! function_exists( 'mb_substr' ) ) :
+if ( ! function_exists('mb_substr')) :
 	/**
 	 * Compat function to mimic mb_substr().
 	 *
@@ -57,8 +57,8 @@ 
 	 * @param string|null $encoding Optional. Character encoding to use. Default null.
 	 * @return string Extracted substring.
 	 */
-	function mb_substr( $str, $start, $length = null, $encoding = null ) {
-		return _mb_substr( $str, $start, $length, $encoding );
+	function mb_substr($str, $start, $length = null, $encoding = null) {
+		return _mb_substr($str, $start, $length, $encoding);
 	}
 endif;
 
@@ -79,24 +79,24 @@ 
  * @param string|null $encoding Optional. Character encoding to use. Default null.
  * @return string Extracted substring.
  */
-function _mb_substr( $str, $start, $length = null, $encoding = null ) {
-	if ( null === $encoding ) {
-		$encoding = get_option( 'blog_charset' );
+function _mb_substr($str, $start, $length = null, $encoding = null) {
+	if (null === $encoding) {
+		$encoding = get_option('blog_charset');
 	}
 
 	/*
 	 * The solution below works only for UTF-8, so in case of a different
 	 * charset just use built-in substr().
 	 */
-	if ( ! in_array( $encoding, array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ) ) ) {
-		return is_null( $length ) ? substr( $str, $start ) : substr( $str, $start, $length );
+	if ( ! in_array($encoding, array('utf8', 'utf-8', 'UTF8', 'UTF-8'))) {
+		return is_null($length) ? substr($str, $start) : substr($str, $start, $length);
 	}
 
-	if ( _wp_can_use_pcre_u() ) {
+	if (_wp_can_use_pcre_u()) {
 		// Use the regex unicode support to separate the UTF-8 characters into an array.
-		preg_match_all( '/./us', $str, $match );
-		$chars = is_null( $length ) ? array_slice( $match[0], $start ) : array_slice( $match[0], $start, $length );
-		return implode( '', $chars );
+		preg_match_all('/./us', $str, $match);
+		$chars = is_null($length) ? array_slice($match[0], $start) : array_slice($match[0], $start, $length);
+		return implode('', $chars);
 	}
 
 	$regex = '/(
@@ -112,26 +112,26 @@ 
 	)/x';
 
 	// Start with 1 element instead of 0 since the first thing we do is pop.
-	$chars = array( '' );
+	$chars = array('');
 	do {
 		// We had some string left over from the last round, but we counted it in that last round.
-		array_pop( $chars );
+		array_pop($chars);
 
 		/*
 		 * Split by UTF-8 character, limit to 1000 characters (last array element will contain
 		 * the rest of the string).
 		 */
-		$pieces = preg_split( $regex, $str, 1000, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY );
+		$pieces = preg_split($regex, $str, 1000, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
 
-		$chars = array_merge( $chars, $pieces );
+		$chars = array_merge($chars, $pieces);
 
 	// If there's anything left over, repeat the loop.
-	} while ( count( $pieces ) > 1 && $str = array_pop( $pieces ) );
+	} while (count($pieces) > 1 && $str = array_pop($pieces));
 
-	return join( '', array_slice( $chars, $start, $length ) );
+	return join('', array_slice($chars, $start, $length));
 }
 
-if ( ! function_exists( 'mb_strlen' ) ) :
+if ( ! function_exists('mb_strlen')) :
 	/**
 	 * Compat function to mimic mb_strlen().
 	 *
@@ -144,8 +144,8 @@ 
 	 * @param string|null $encoding Optional. Character encoding to use. Default null.
 	 * @return int String length of `$str`.
 	 */
-	function mb_strlen( $str, $encoding = null ) {
-		return _mb_strlen( $str, $encoding );
+	function mb_strlen($str, $encoding = null) {
+		return _mb_strlen($str, $encoding);
 	}
 endif;
 
@@ -163,23 +163,23 @@ 
  * @param string|null $encoding Optional. Character encoding to use. Default null.
  * @return int String length of `$str`.
  */
-function _mb_strlen( $str, $encoding = null ) {
-	if ( null === $encoding ) {
-		$encoding = get_option( 'blog_charset' );
+function _mb_strlen($str, $encoding = null) {
+	if (null === $encoding) {
+		$encoding = get_option('blog_charset');
 	}
 
 	/*
 	 * The solution below works only for UTF-8, so in case of a different charset
 	 * just use built-in strlen().
 	 */
-	if ( ! in_array( $encoding, array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ) ) ) {
-		return strlen( $str );
+	if ( ! in_array($encoding, array('utf8', 'utf-8', 'UTF8', 'UTF-8'))) {
+		return strlen($str);
 	}
 
-	if ( _wp_can_use_pcre_u() ) {
+	if (_wp_can_use_pcre_u()) {
 		// Use the regex unicode support to separate the UTF-8 characters into an array.
-		preg_match_all( '/./us', $str, $match );
-		return count( $match[0] );
+		preg_match_all('/./us', $str, $match);
+		return count($match[0]);
 	}
 
 	$regex = '/(?:
@@ -204,19 +204,19 @@ 
 		 * Split by UTF-8 character, limit to 1000 characters (last array element will contain
 		 * the rest of the string).
 		 */
-		$pieces = preg_split( $regex, $str, 1000 );
+		$pieces = preg_split($regex, $str, 1000);
 
 		// Increment.
-		$count += count( $pieces );
+		$count += count($pieces);
 
 	// If there's anything left over, repeat the loop.
-	} while ( $str = array_pop( $pieces ) );
+	} while ($str = array_pop($pieces));
 
 	// Fencepost: preg_split() always returns one extra item in the array.
 	return --$count;
 }
 
-if ( !function_exists('hash_hmac') ):
+if ( ! function_exists('hash_hmac')):
 /**
  * Compat function to mimic hash_hmac().
  *
@@ -255,7 +255,7 @@ 
 function _hash_hmac($algo, $data, $key, $raw_output = false) {
 	$packs = array('md5' => 'H32', 'sha1' => 'H40');
 
-	if ( !isset($packs[$algo]) )
+	if ( ! isset($packs[$algo]))
 		return false;
 
 	$pack = $packs[$algo];
@@ -268,44 +268,44 @@ 
 	$ipad = (substr($key, 0, 64) ^ str_repeat(chr(0x36), 64));
 	$opad = (substr($key, 0, 64) ^ str_repeat(chr(0x5C), 64));
 
-	$hmac = $algo($opad . pack($pack, $algo($ipad . $data)));
+	$hmac = $algo($opad.pack($pack, $algo($ipad.$data)));
 
-	if ( $raw_output )
-		return pack( $pack, $hmac );
+	if ($raw_output)
+		return pack($pack, $hmac);
 	return $hmac;
 }
 
-if ( !function_exists('json_encode') ) {
-	function json_encode( $string ) {
+if ( ! function_exists('json_encode')) {
+	function json_encode($string) {
 		global $wp_json;
 
-		if ( ! ( $wp_json instanceof Services_JSON ) ) {
-			require_once( ABSPATH . WPINC . '/class-json.php' );
+		if ( ! ($wp_json instanceof Services_JSON)) {
+			require_once(ABSPATH.WPINC.'/class-json.php');
 			$wp_json = new Services_JSON();
 		}
 
-		return $wp_json->encodeUnsafe( $string );
+		return $wp_json->encodeUnsafe($string);
 	}
 }
 
-if ( !function_exists('json_decode') ) {
+if ( ! function_exists('json_decode')) {
 	/**
 	 * @global Services_JSON $wp_json
 	 * @param string $string
 	 * @param bool   $assoc_array
 	 * @return object|array
 	 */
-	function json_decode( $string, $assoc_array = false ) {
+	function json_decode($string, $assoc_array = false) {
 		global $wp_json;
 
-		if ( ! ($wp_json instanceof Services_JSON ) ) {
-			require_once( ABSPATH . WPINC . '/class-json.php' );
+		if ( ! ($wp_json instanceof Services_JSON)) {
+			require_once(ABSPATH.WPINC.'/class-json.php');
 			$wp_json = new Services_JSON();
 		}
 
-		$res = $wp_json->decode( $string );
-		if ( $assoc_array )
-			$res = _json_decode_object_helper( $res );
+		$res = $wp_json->decode($string);
+		if ($assoc_array)
+			$res = _json_decode_object_helper($res);
 		return $res;
 	}
 
@@ -314,13 +314,13 @@ 
 	 * @return array
 	 */
 	function _json_decode_object_helper($data) {
-		if ( is_object($data) )
+		if (is_object($data))
 			$data = get_object_vars($data);
 		return is_array($data) ? array_map(__FUNCTION__, $data) : $data;
 	}
 }
 
-if ( ! function_exists( 'hash_equals' ) ) :
+if ( ! function_exists('hash_equals')) :
 /**
  * Timing attack safe string comparison
  *
@@ -336,16 +336,16 @@ 
  * @param string $b Actual, user supplied, string.
  * @return bool Whether strings are equal.
  */
-function hash_equals( $a, $b ) {
-	$a_length = strlen( $a );
-	if ( $a_length !== strlen( $b ) ) {
+function hash_equals($a, $b) {
+	$a_length = strlen($a);
+	if ($a_length !== strlen($b)) {
 		return false;
 	}
 	$result = 0;
 
 	// Do not attempt to "optimize" this.
-	for ( $i = 0; $i < $a_length; $i++ ) {
-		$result |= ord( $a[ $i ] ) ^ ord( $b[ $i ] );
+	for ($i = 0; $i < $a_length; $i++) {
+		$result |= ord($a[$i]) ^ ord($b[$i]);
 	}
 
 	return $result === 0;
@@ -354,11 +354,11 @@ 
 
 // JSON_PRETTY_PRINT was introduced in PHP 5.4
 // Defined here to prevent a notice when using it with wp_json_encode()
-if ( ! defined( 'JSON_PRETTY_PRINT' ) ) {
-	define( 'JSON_PRETTY_PRINT', 128 );
+if ( ! defined('JSON_PRETTY_PRINT')) {
+	define('JSON_PRETTY_PRINT', 128);
 }
 
-if ( ! function_exists( 'json_last_error_msg' ) ) :
+if ( ! function_exists('json_last_error_msg')) :
 	/**
 	 * Retrieves the error string of the last json_encode() or json_decode() call.
 	 *
@@ -371,41 +371,41 @@ 
 	 */
 	function json_last_error_msg() {
 		// See https://core.trac.wordpress.org/ticket/27799.
-		if ( ! function_exists( 'json_last_error' ) ) {
+		if ( ! function_exists('json_last_error')) {
 			return false;
 		}
 
 		$last_error_code = json_last_error();
 
 		// Just in case JSON_ERROR_NONE is not defined.
-		$error_code_none = defined( 'JSON_ERROR_NONE' ) ? JSON_ERROR_NONE : 0;
+		$error_code_none = defined('JSON_ERROR_NONE') ? JSON_ERROR_NONE : 0;
 
-		switch ( true ) {
+		switch (true) {
 			case $last_error_code === $error_code_none:
 				return 'No error';
 
-			case defined( 'JSON_ERROR_DEPTH' ) && JSON_ERROR_DEPTH === $last_error_code:
+			case defined('JSON_ERROR_DEPTH') && JSON_ERROR_DEPTH === $last_error_code:
 				return 'Maximum stack depth exceeded';
 
-			case defined( 'JSON_ERROR_STATE_MISMATCH' ) && JSON_ERROR_STATE_MISMATCH === $last_error_code:
+			case defined('JSON_ERROR_STATE_MISMATCH') && JSON_ERROR_STATE_MISMATCH === $last_error_code:
 				return 'State mismatch (invalid or malformed JSON)';
 
-			case defined( 'JSON_ERROR_CTRL_CHAR' ) && JSON_ERROR_CTRL_CHAR === $last_error_code:
+			case defined('JSON_ERROR_CTRL_CHAR') && JSON_ERROR_CTRL_CHAR === $last_error_code:
 				return 'Control character error, possibly incorrectly encoded';
 
-			case defined( 'JSON_ERROR_SYNTAX' ) && JSON_ERROR_SYNTAX === $last_error_code:
+			case defined('JSON_ERROR_SYNTAX') && JSON_ERROR_SYNTAX === $last_error_code:
 				return 'Syntax error';
 
-			case defined( 'JSON_ERROR_UTF8' ) && JSON_ERROR_UTF8 === $last_error_code:
+			case defined('JSON_ERROR_UTF8') && JSON_ERROR_UTF8 === $last_error_code:
 				return 'Malformed UTF-8 characters, possibly incorrectly encoded';
 
-			case defined( 'JSON_ERROR_RECURSION' ) && JSON_ERROR_RECURSION === $last_error_code:
+			case defined('JSON_ERROR_RECURSION') && JSON_ERROR_RECURSION === $last_error_code:
 				return 'Recursion detected';
 
-			case defined( 'JSON_ERROR_INF_OR_NAN' ) && JSON_ERROR_INF_OR_NAN === $last_error_code:
+			case defined('JSON_ERROR_INF_OR_NAN') && JSON_ERROR_INF_OR_NAN === $last_error_code:
 				return 'Inf and NaN cannot be JSON encoded';
 
-			case defined( 'JSON_ERROR_UNSUPPORTED_TYPE' ) && JSON_ERROR_UNSUPPORTED_TYPE === $last_error_code:
+			case defined('JSON_ERROR_UNSUPPORTED_TYPE') && JSON_ERROR_UNSUPPORTED_TYPE === $last_error_code:
 				return 'Type is not supported';
 
 			default:
@@ -414,8 +414,8 @@ 
 	}
 endif;
 
-if ( ! interface_exists( 'JsonSerializable' ) ) {
-	define( 'WP_JSON_SERIALIZE_COMPATIBLE', true );
+if ( ! interface_exists('JsonSerializable')) {
+	define('WP_JSON_SERIALIZE_COMPATIBLE', true);
 	/**
 	 * JsonSerializable interface.
 	 *
@@ -431,6 +431,6 @@ 
 }
 
 // random_int was introduced in PHP 7.0
-if ( ! function_exists( 'random_int' ) ) {
-	require ABSPATH . WPINC . '/random_compat/random.php';
+if ( ! function_exists('random_int')) {
+	require ABSPATH.WPINC.'/random_compat/random.php';
 }

src/wp-includes/wp-db.php

Indentation +8 added lines, -8 removed lines

@@ -1,13 +1,13 @@
 <?php
 /**
- * WordPress DB Class
- *
- * Original code from {@link http://php.justinvincent.com Justin Vincent (justin@visunet.ie)}
- *
- * @package WordPress
- * @subpackage Database
- * @since 0.71
- */
+	 * WordPress DB Class
+	 *
+	 * Original code from {@link http://php.justinvincent.com Justin Vincent (justin@visunet.ie)}
+	 *
+	 * @package WordPress
+	 * @subpackage Database
+	 * @since 0.71
+	 */
 
 /**
  * @since 0.71

Doc Comments +5 added lines, -7 removed lines

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

Spacing +628 added lines, -628 removed lines

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

Braces +133 added lines, -92 removed lines

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

src/wp-includes/Text/Diff/Engine/shell.php

Indentation +142 added lines, -142 removed lines

@@ -16,147 +16,147 @@
  */
 class Text_Diff_Engine_shell {
 
-    /**
-     * Path to the diff executable
-     *
-     * @var string
-     */
-    var $_diffCommand = 'diff';
-
-    /**
-     * Returns the array of differences.
-     *
-     * @param array $from_lines lines of text from old file
-     * @param array $to_lines   lines of text from new file
-     *
-     * @return array all changes made (array with Text_Diff_Op_* objects)
-     */
-    function diff($from_lines, $to_lines)
-    {
-        array_walk($from_lines, array('Text_Diff', 'trimNewlines'));
-        array_walk($to_lines, array('Text_Diff', 'trimNewlines'));
-
-        $temp_dir = Text_Diff::_getTempDir();
-
-        // Execute gnu diff or similar to get a standard diff file.
-        $from_file = tempnam($temp_dir, 'Text_Diff');
-        $to_file = tempnam($temp_dir, 'Text_Diff');
-        $fp = fopen($from_file, 'w');
-        fwrite($fp, implode("\n", $from_lines));
-        fclose($fp);
-        $fp = fopen($to_file, 'w');
-        fwrite($fp, implode("\n", $to_lines));
-        fclose($fp);
-        $diff = shell_exec($this->_diffCommand . ' ' . $from_file . ' ' . $to_file);
-        unlink($from_file);
-        unlink($to_file);
-
-        if (is_null($diff)) {
-            // No changes were made
-            return array(new Text_Diff_Op_copy($from_lines));
-        }
-
-        $from_line_no = 1;
-        $to_line_no = 1;
-        $edits = array();
-
-        // Get changed lines by parsing something like:
-        // 0a1,2
-        // 1,2c4,6
-        // 1,5d6
-        preg_match_all('#^(\d+)(?:,(\d+))?([adc])(\d+)(?:,(\d+))?$#m', $diff,
-            $matches, PREG_SET_ORDER);
-
-        foreach ($matches as $match) {
-            if (!isset($match[5])) {
-                // This paren is not set every time (see regex).
-                $match[5] = false;
-            }
-
-            if ($match[3] == 'a') {
-                $from_line_no--;
-            }
-
-            if ($match[3] == 'd') {
-                $to_line_no--;
-            }
-
-            if ($from_line_no < $match[1] || $to_line_no < $match[4]) {
-                // copied lines
-                assert('$match[1] - $from_line_no == $match[4] - $to_line_no');
-                array_push($edits,
-                    new Text_Diff_Op_copy(
-                        $this->_getLines($from_lines, $from_line_no, $match[1] - 1),
-                        $this->_getLines($to_lines, $to_line_no, $match[4] - 1)));
-            }
-
-            switch ($match[3]) {
-            case 'd':
-                // deleted lines
-                array_push($edits,
-                    new Text_Diff_Op_delete(
-                        $this->_getLines($from_lines, $from_line_no, $match[2])));
-                $to_line_no++;
-                break;
-
-            case 'c':
-                // changed lines
-                array_push($edits,
-                    new Text_Diff_Op_change(
-                        $this->_getLines($from_lines, $from_line_no, $match[2]),
-                        $this->_getLines($to_lines, $to_line_no, $match[5])));
-                break;
-
-            case 'a':
-                // added lines
-                array_push($edits,
-                    new Text_Diff_Op_add(
-                        $this->_getLines($to_lines, $to_line_no, $match[5])));
-                $from_line_no++;
-                break;
-            }
-        }
-
-        if (!empty($from_lines)) {
-            // Some lines might still be pending. Add them as copied
-            array_push($edits,
-                new Text_Diff_Op_copy(
-                    $this->_getLines($from_lines, $from_line_no,
-                                     $from_line_no + count($from_lines) - 1),
-                    $this->_getLines($to_lines, $to_line_no,
-                                     $to_line_no + count($to_lines) - 1)));
-        }
-
-        return $edits;
-    }
-
-    /**
-     * Get lines from either the old or new text
-     *
-     * @access private
-     *
-     * @param array &$text_lines Either $from_lines or $to_lines
-     * @param int   &$line_no    Current line number
-     * @param int   $end         Optional end line, when we want to chop more
-     *                           than one line.
-     *
-     * @return array The chopped lines
-     */
-    function _getLines(&$text_lines, &$line_no, $end = false)
-    {
-        if (!empty($end)) {
-            $lines = array();
-            // We can shift even more
-            while ($line_no <= $end) {
-                array_push($lines, array_shift($text_lines));
-                $line_no++;
-            }
-        } else {
-            $lines = array(array_shift($text_lines));
-            $line_no++;
-        }
-
-        return $lines;
-    }
+	/**
+	 * Path to the diff executable
+	 *
+	 * @var string
+	 */
+	var $_diffCommand = 'diff';
+
+	/**
+	 * Returns the array of differences.
+	 *
+	 * @param array $from_lines lines of text from old file
+	 * @param array $to_lines   lines of text from new file
+	 *
+	 * @return array all changes made (array with Text_Diff_Op_* objects)
+	 */
+	function diff($from_lines, $to_lines)
+	{
+		array_walk($from_lines, array('Text_Diff', 'trimNewlines'));
+		array_walk($to_lines, array('Text_Diff', 'trimNewlines'));
+
+		$temp_dir = Text_Diff::_getTempDir();
+
+		// Execute gnu diff or similar to get a standard diff file.
+		$from_file = tempnam($temp_dir, 'Text_Diff');
+		$to_file = tempnam($temp_dir, 'Text_Diff');
+		$fp = fopen($from_file, 'w');
+		fwrite($fp, implode("\n", $from_lines));
+		fclose($fp);
+		$fp = fopen($to_file, 'w');
+		fwrite($fp, implode("\n", $to_lines));
+		fclose($fp);
+		$diff = shell_exec($this->_diffCommand . ' ' . $from_file . ' ' . $to_file);
+		unlink($from_file);
+		unlink($to_file);
+
+		if (is_null($diff)) {
+			// No changes were made
+			return array(new Text_Diff_Op_copy($from_lines));
+		}
+
+		$from_line_no = 1;
+		$to_line_no = 1;
+		$edits = array();
+
+		// Get changed lines by parsing something like:
+		// 0a1,2
+		// 1,2c4,6
+		// 1,5d6
+		preg_match_all('#^(\d+)(?:,(\d+))?([adc])(\d+)(?:,(\d+))?$#m', $diff,
+			$matches, PREG_SET_ORDER);
+
+		foreach ($matches as $match) {
+			if (!isset($match[5])) {
+				// This paren is not set every time (see regex).
+				$match[5] = false;
+			}
+
+			if ($match[3] == 'a') {
+				$from_line_no--;
+			}
+
+			if ($match[3] == 'd') {
+				$to_line_no--;
+			}
+
+			if ($from_line_no < $match[1] || $to_line_no < $match[4]) {
+				// copied lines
+				assert('$match[1] - $from_line_no == $match[4] - $to_line_no');
+				array_push($edits,
+					new Text_Diff_Op_copy(
+						$this->_getLines($from_lines, $from_line_no, $match[1] - 1),
+						$this->_getLines($to_lines, $to_line_no, $match[4] - 1)));
+			}
+
+			switch ($match[3]) {
+			case 'd':
+				// deleted lines
+				array_push($edits,
+					new Text_Diff_Op_delete(
+						$this->_getLines($from_lines, $from_line_no, $match[2])));
+				$to_line_no++;
+				break;
+
+			case 'c':
+				// changed lines
+				array_push($edits,
+					new Text_Diff_Op_change(
+						$this->_getLines($from_lines, $from_line_no, $match[2]),
+						$this->_getLines($to_lines, $to_line_no, $match[5])));
+				break;
+
+			case 'a':
+				// added lines
+				array_push($edits,
+					new Text_Diff_Op_add(
+						$this->_getLines($to_lines, $to_line_no, $match[5])));
+				$from_line_no++;
+				break;
+			}
+		}
+
+		if (!empty($from_lines)) {
+			// Some lines might still be pending. Add them as copied
+			array_push($edits,
+				new Text_Diff_Op_copy(
+					$this->_getLines($from_lines, $from_line_no,
+									 $from_line_no + count($from_lines) - 1),
+					$this->_getLines($to_lines, $to_line_no,
+									 $to_line_no + count($to_lines) - 1)));
+		}
+
+		return $edits;
+	}
+
+	/**
+	 * Get lines from either the old or new text
+	 *
+	 * @access private
+	 *
+	 * @param array &$text_lines Either $from_lines or $to_lines
+	 * @param int   &$line_no    Current line number
+	 * @param int   $end         Optional end line, when we want to chop more
+	 *                           than one line.
+	 *
+	 * @return array The chopped lines
+	 */
+	function _getLines(&$text_lines, &$line_no, $end = false)
+	{
+		if (!empty($end)) {
+			$lines = array();
+			// We can shift even more
+			while ($line_no <= $end) {
+				array_push($lines, array_shift($text_lines));
+				$line_no++;
+			}
+		} else {
+			$lines = array(array_shift($text_lines));
+			$line_no++;
+		}
+
+		return $lines;
+	}
 
 }

Switch Indentation +23 added lines, -23 removed lines

@@ -91,29 +91,29 @@
             }
 
             switch ($match[3]) {
-            case 'd':
-                // deleted lines
-                array_push($edits,
-                    new Text_Diff_Op_delete(
-                        $this->_getLines($from_lines, $from_line_no, $match[2])));
-                $to_line_no++;
-                break;
-
-            case 'c':
-                // changed lines
-                array_push($edits,
-                    new Text_Diff_Op_change(
-                        $this->_getLines($from_lines, $from_line_no, $match[2]),
-                        $this->_getLines($to_lines, $to_line_no, $match[5])));
-                break;
-
-            case 'a':
-                // added lines
-                array_push($edits,
-                    new Text_Diff_Op_add(
-                        $this->_getLines($to_lines, $to_line_no, $match[5])));
-                $from_line_no++;
-                break;
+            	case 'd':
+                	// deleted lines
+                	array_push($edits,
+                    	new Text_Diff_Op_delete(
+                        	$this->_getLines($from_lines, $from_line_no, $match[2])));
+                	$to_line_no++;
+                	break;
+
+            	case 'c':
+                	// changed lines
+                	array_push($edits,
+                    	new Text_Diff_Op_change(
+                        	$this->_getLines($from_lines, $from_line_no, $match[2]),
+                        	$this->_getLines($to_lines, $to_line_no, $match[5])));
+                	break;
+
+            	case 'a':
+                	// added lines
+                	array_push($edits,
+                    	new Text_Diff_Op_add(
+                        	$this->_getLines($to_lines, $to_line_no, $match[5])));
+                	$from_line_no++;
+                	break;
             }
         }
 

Spacing +4 added lines, -4 removed lines

@@ -47,7 +47,7 @@ 
         $fp = fopen($to_file, 'w');
         fwrite($fp, implode("\n", $to_lines));
         fclose($fp);
-        $diff = shell_exec($this->_diffCommand . ' ' . $from_file . ' ' . $to_file);
+        $diff = shell_exec($this->_diffCommand.' '.$from_file.' '.$to_file);
         unlink($from_file);
         unlink($to_file);
 
@@ -68,7 +68,7 @@ 
             $matches, PREG_SET_ORDER);
 
         foreach ($matches as $match) {
-            if (!isset($match[5])) {
+            if ( ! isset($match[5])) {
                 // This paren is not set every time (see regex).
                 $match[5] = false;
             }
@@ -117,7 +117,7 @@ 
             }
         }
 
-        if (!empty($from_lines)) {
+        if ( ! empty($from_lines)) {
             // Some lines might still be pending. Add them as copied
             array_push($edits,
                 new Text_Diff_Op_copy(
@@ -144,7 +144,7 @@ 
      */
     function _getLines(&$text_lines, &$line_no, $end = false)
     {
-        if (!empty($end)) {
+        if ( ! empty($end)) {
             $lines = array();
             // We can shift even more
             while ($line_no <= $end) {

src/wp-includes/Text/Diff/Engine/xdiff.php

Indentation +32 added lines, -32 removed lines

@@ -15,22 +15,22 @@ 
  */
 class Text_Diff_Engine_xdiff {
 
-    /**
-     */
-    function diff($from_lines, $to_lines)
-    {
-        array_walk($from_lines, array('Text_Diff', 'trimNewlines'));
-        array_walk($to_lines, array('Text_Diff', 'trimNewlines'));
+	/**
+	 */
+	function diff($from_lines, $to_lines)
+	{
+		array_walk($from_lines, array('Text_Diff', 'trimNewlines'));
+		array_walk($to_lines, array('Text_Diff', 'trimNewlines'));
 
-        /* Convert the two input arrays into strings for xdiff processing. */
-        $from_string = implode("\n", $from_lines);
-        $to_string = implode("\n", $to_lines);
+		/* Convert the two input arrays into strings for xdiff processing. */
+		$from_string = implode("\n", $from_lines);
+		$to_string = implode("\n", $to_lines);
 
-        /* Diff the two strings and convert the result to an array. */
-        $diff = xdiff_string_diff($from_string, $to_string, count($to_lines));
-        $diff = explode("\n", $diff);
+		/* Diff the two strings and convert the result to an array. */
+		$diff = xdiff_string_diff($from_string, $to_string, count($to_lines));
+		$diff = explode("\n", $diff);
 
-        /* Walk through the diff one line at a time.  We build the $edits
+		/* Walk through the diff one line at a time.  We build the $edits
          * array of diff operations by reading the first character of the
          * xdiff output (which is in the "unified diff" format).
          *
@@ -38,27 +38,27 @@ 
          * lines using this approach, so we can't add Text_Diff_Op_changed
          * instances to the $edits array.  The result is still perfectly
          * valid, albeit a little less descriptive and efficient. */
-        $edits = array();
-        foreach ($diff as $line) {
-            if (!strlen($line)) {
-                continue;
-            }
-            switch ($line[0]) {
-            case ' ':
-                $edits[] = new Text_Diff_Op_copy(array(substr($line, 1)));
-                break;
+		$edits = array();
+		foreach ($diff as $line) {
+			if (!strlen($line)) {
+				continue;
+			}
+			switch ($line[0]) {
+			case ' ':
+				$edits[] = new Text_Diff_Op_copy(array(substr($line, 1)));
+				break;
 
-            case '+':
-                $edits[] = new Text_Diff_Op_add(array(substr($line, 1)));
-                break;
+			case '+':
+				$edits[] = new Text_Diff_Op_add(array(substr($line, 1)));
+				break;
 
-            case '-':
-                $edits[] = new Text_Diff_Op_delete(array(substr($line, 1)));
-                break;
-            }
-        }
+			case '-':
+				$edits[] = new Text_Diff_Op_delete(array(substr($line, 1)));
+				break;
+			}
+		}
 
-        return $edits;
-    }
+		return $edits;
+	}
 
 }

Switch Indentation +9 added lines, -9 removed lines

@@ -44,17 +44,17 @@
                 continue;
             }
             switch ($line[0]) {
-            case ' ':
-                $edits[] = new Text_Diff_Op_copy(array(substr($line, 1)));
-                break;
+            	case ' ':
+                	$edits[] = new Text_Diff_Op_copy(array(substr($line, 1)));
+                	break;
 
-            case '+':
-                $edits[] = new Text_Diff_Op_add(array(substr($line, 1)));
-                break;
+            	case '+':
+                	$edits[] = new Text_Diff_Op_add(array(substr($line, 1)));
+                	break;
 
-            case '-':
-                $edits[] = new Text_Diff_Op_delete(array(substr($line, 1)));
-                break;
+            	case '-':
+                	$edits[] = new Text_Diff_Op_delete(array(substr($line, 1)));
+                	break;
             }
         }
 

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
          * valid, albeit a little less descriptive and efficient. */
         $edits = array();
         foreach ($diff as $line) {
-            if (!strlen($line)) {
+            if ( ! strlen($line)) {
                 continue;
             }
             switch ($line[0]) {