ntwb / wordpress

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

Doc Comments +1 added lines, -1 removed lines

@@ -63,7 +63,7 @@
 	 * @since 4.4.0
 	 * @access public
 	 *
-	 * @return array Map of header name to header value.
+	 * @return integer Map of header name to header value.
 	 */
 	public function get_headers() {
 		return $this->headers;

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * HTTP API: WP_HTTP_Response class
- *
- * @package WordPress
- * @subpackage HTTP
- * @since 4.4.0
- */
+	 * HTTP API: WP_HTTP_Response class
+	 *
+	 * @package WordPress
+	 * @subpackage HTTP
+	 * @since 4.4.0
+	 */
 
 /**
  * Core class used to prepare HTTP responses.

Spacing +11 added lines, -11 removed lines

@@ -51,10 +51,10 @@ 
 	 * @param int   $status  Optional. HTTP status code. Default 200.
 	 * @param array $headers Optional. HTTP header map. Default empty array.
 	 */
-	public function __construct( $data = null, $status = 200, $headers = array() ) {
+	public function __construct($data = null, $status = 200, $headers = array()) {
 		$this->data = $data;
-		$this->set_status( $status );
-		$this->set_headers( $headers );
+		$this->set_status($status);
+		$this->set_headers($headers);
 	}
 
 	/**
@@ -77,7 +77,7 @@ 
 	 *
 	 * @param array $headers Map of header name to header value.
 	 */
-	public function set_headers( $headers ) {
+	public function set_headers($headers) {
 		$this->headers = $headers;
 	}
 
@@ -92,11 +92,11 @@ 
 	 * @param bool   $replace Optional. Whether to replace an existing header of the same name.
 	 *                        Default true.
 	 */
-	public function header( $key, $value, $replace = true ) {
-		if ( $replace || ! isset( $this->headers[ $key ] ) ) {
-			$this->headers[ $key ] = $value;
+	public function header($key, $value, $replace = true) {
+		if ($replace || ! isset($this->headers[$key])) {
+			$this->headers[$key] = $value;
 		} else {
-			$this->headers[ $key ] .= ', ' . $value;
+			$this->headers[$key] .= ', '.$value;
 		}
 	}
 
@@ -120,8 +120,8 @@ 
 	 *
 	 * @param int $code HTTP status.
 	 */
-	public function set_status( $code ) {
-		$this->status = absint( $code );
+	public function set_status($code) {
+		$this->status = absint($code);
 	}
 
 	/**
@@ -144,7 +144,7 @@ 
 	 *
 	 * @param mixed $data Response data.
 	 */
-	public function set_data( $data ) {
+	public function set_data($data) {
 		$this->data = $data;
 	}
 

src/wp-includes/class-wp-metadata-lazyloader.php

Doc Comments +2 added lines, -2 removed lines

@@ -74,7 +74,7 @@ 
 	 *
 	 * @param string $object_type Type of object whose meta is to be lazy-loaded. Accepts 'term' or 'comment'.
 	 * @param array  $object_ids  Array of object IDs.
-	 * @return bool|WP_Error True on success, WP_Error on failure.
+	 * @return WP_Error|null True on success, WP_Error on failure.
 	 */
 	public function queue_objects( $object_type, $object_ids ) {
 		if ( ! isset( $this->settings[ $object_type ] ) ) {
@@ -115,7 +115,7 @@ 
 	 * @access public
 	 *
 	 * @param string $object_type Object type. Accepts 'comment' or 'term'.
-	 * @return bool|WP_Error True on success, WP_Error on failure.
+	 * @return WP_Error|null True on success, WP_Error on failure.
 	 */
 	public function reset_queue( $object_type ) {
 		if ( ! isset( $this->settings[ $object_type ] ) ) {

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * Meta API: WP_Metadata_Lazyloader class
- *
- * @package WordPress
- * @subpackage Meta
- * @since 4.5.0
- */
+	 * Meta API: WP_Metadata_Lazyloader class
+	 *
+	 * @package WordPress
+	 * @subpackage Meta
+	 * @since 4.5.0
+	 */
 
 /**
  * Core class used for lazy-loading object metadata.

Spacing +27 added lines, -27 removed lines

@@ -57,11 +57,11 @@ 
 		$this->settings = array(
 			'term' => array(
 				'filter'   => 'get_term_metadata',
-				'callback' => array( $this, 'lazyload_term_meta' ),
+				'callback' => array($this, 'lazyload_term_meta'),
 			),
 			'comment' => array(
 				'filter'   => 'get_comment_metadata',
-				'callback' => array( $this, 'lazyload_comment_meta' ),
+				'callback' => array($this, 'lazyload_comment_meta'),
 			),
 		);
 	}
@@ -76,25 +76,25 @@ 
 	 * @param array  $object_ids  Array of object IDs.
 	 * @return bool|WP_Error True on success, WP_Error on failure.
 	 */
-	public function queue_objects( $object_type, $object_ids ) {
-		if ( ! isset( $this->settings[ $object_type ] ) ) {
-			return new WP_Error( 'invalid_object_type', __( 'Invalid object type' ) );
+	public function queue_objects($object_type, $object_ids) {
+		if ( ! isset($this->settings[$object_type])) {
+			return new WP_Error('invalid_object_type', __('Invalid object type'));
 		}
 
-		$type_settings = $this->settings[ $object_type ];
+		$type_settings = $this->settings[$object_type];
 
-		if ( ! isset( $this->pending_objects[ $object_type ] ) ) {
-			$this->pending_objects[ $object_type ] = array();
+		if ( ! isset($this->pending_objects[$object_type])) {
+			$this->pending_objects[$object_type] = array();
 		}
 
-		foreach ( $object_ids as $object_id ) {
+		foreach ($object_ids as $object_id) {
 			// Keyed by ID for faster lookup.
-			if ( ! isset( $this->pending_objects[ $object_type ][ $object_id ] ) ) {
-				$this->pending_objects[ $object_type ][ $object_id ] = 1;
+			if ( ! isset($this->pending_objects[$object_type][$object_id])) {
+				$this->pending_objects[$object_type][$object_id] = 1;
 			}
 		}
 
-		add_filter( $type_settings['filter'], $type_settings['callback'] );
+		add_filter($type_settings['filter'], $type_settings['callback']);
 
 		/**
 		 * Fires after objects are added to the metadata lazy-load queue.
@@ -105,7 +105,7 @@ 
 		 * @param string                 $object_type Type of object being queued.
 		 * @param WP_Metadata_Lazyloader $lazyloader  The lazy-loader object.
 		 */
-		do_action( 'metadata_lazyloader_queued_objects', $object_ids, $object_type, $this );
+		do_action('metadata_lazyloader_queued_objects', $object_ids, $object_type, $this);
 	}
 
 	/**
@@ -117,15 +117,15 @@ 
 	 * @param string $object_type Object type. Accepts 'comment' or 'term'.
 	 * @return bool|WP_Error True on success, WP_Error on failure.
 	 */
-	public function reset_queue( $object_type ) {
-		if ( ! isset( $this->settings[ $object_type ] ) ) {
-			return new WP_Error( 'invalid_object_type', __( 'Invalid object type' ) );
+	public function reset_queue($object_type) {
+		if ( ! isset($this->settings[$object_type])) {
+			return new WP_Error('invalid_object_type', __('Invalid object type'));
 		}
 
-		$type_settings = $this->settings[ $object_type ];
+		$type_settings = $this->settings[$object_type];
 
-		$this->pending_objects[ $object_type ] = array();
-		remove_filter( $type_settings['filter'], $type_settings['callback'] );
+		$this->pending_objects[$object_type] = array();
+		remove_filter($type_settings['filter'], $type_settings['callback']);
 	}
 
 	/**
@@ -141,12 +141,12 @@ 
 	 * @return mixed In order not to short-circuit `get_metadata()`. Generally, this is `null`, but it could be
 	 *               another value if filtered by a plugin.
 	 */
-	public function lazyload_term_meta( $check ) {
-		if ( ! empty( $this->pending_objects['term'] ) ) {
-			update_termmeta_cache( array_keys( $this->pending_objects['term'] ) );
+	public function lazyload_term_meta($check) {
+		if ( ! empty($this->pending_objects['term'])) {
+			update_termmeta_cache(array_keys($this->pending_objects['term']));
 
 			// No need to run again for this set of terms.
-			$this->reset_queue( 'term' );
+			$this->reset_queue('term');
 		}
 
 		return $check;
@@ -163,12 +163,12 @@ 
 	 * @param mixed $check The `$check` param passed from the 'get_comment_metadata' hook.
 	 * @return mixed The original value of `$check`, so as not to short-circuit `get_comment_metadata()`.
 	 */
-	public function lazyload_comment_meta( $check ) {
-		if ( ! empty( $this->pending_objects['comment'] ) ) {
-			update_meta_cache( 'comment', array_keys( $this->pending_objects['comment'] ) );
+	public function lazyload_comment_meta($check) {
+		if ( ! empty($this->pending_objects['comment'])) {
+			update_meta_cache('comment', array_keys($this->pending_objects['comment']));
 
 			// No need to run again for this set of comments.
-			$this->reset_queue( 'comment' );
+			$this->reset_queue('comment');
 		}
 
 		return $check;

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

Doc Comments +1 added lines, -1 removed lines

@@ -205,7 +205,7 @@
 	 * @global wpdb $wpdb WordPress database abstraction object.
 	 *
 	 * @param int $post_id Post ID.
-	 * @return WP_Post|false Post object, false otherwise.
+	 * @return string Post object, false otherwise.
 	 */
 	public static function get_instance( $post_id ) {
 		global $wpdb;

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * Post API: WP_Post class
- *
- * @package WordPress
- * @subpackage Post
- * @since 4.4.0
- */
+	 * Post API: WP_Post class
+	 *
+	 * @package WordPress
+	 * @subpackage Post
+	 * @since 4.4.0
+	 */
 
 /**
  * Core class used to implement the WP_Post object.

Spacing +47 added lines, -47 removed lines

@@ -207,28 +207,28 @@ 
 	 * @param int $post_id Post ID.
 	 * @return WP_Post|false Post object, false otherwise.
 	 */
-	public static function get_instance( $post_id ) {
+	public static function get_instance($post_id) {
 		global $wpdb;
 
 		$post_id = (int) $post_id;
-		if ( ! $post_id )
+		if ( ! $post_id)
 			return false;
 
-		$_post = wp_cache_get( $post_id, 'posts' );
+		$_post = wp_cache_get($post_id, 'posts');
 
-		if ( ! $_post ) {
-			$_post = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->posts WHERE ID = %d LIMIT 1", $post_id ) );
+		if ( ! $_post) {
+			$_post = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->posts WHERE ID = %d LIMIT 1", $post_id));
 
-			if ( ! $_post )
+			if ( ! $_post)
 				return false;
 
-			$_post = sanitize_post( $_post, 'raw' );
-			wp_cache_add( $_post->ID, $_post, 'posts' );
-		} elseif ( empty( $_post->filter ) ) {
-			$_post = sanitize_post( $_post, 'raw' );
+			$_post = sanitize_post($_post, 'raw');
+			wp_cache_add($_post->ID, $_post, 'posts');
+		} elseif (empty($_post->filter)) {
+			$_post = sanitize_post($_post, 'raw');
 		}
 
-		return new WP_Post( $_post );
+		return new WP_Post($_post);
 	}
 
 	/**
@@ -236,8 +236,8 @@ 
 	 *
 	 * @param WP_Post|object $post Post object.
 	 */
-	public function __construct( $post ) {
-		foreach ( get_object_vars( $post ) as $key => $value )
+	public function __construct($post) {
+		foreach (get_object_vars($post) as $key => $value)
 			$this->$key = $value;
 	}
 
@@ -247,20 +247,20 @@ 
 	 * @param string $key Property to check if set.
 	 * @return bool
 	 */
-	public function __isset( $key ) {
-		if ( 'ancestors' == $key )
+	public function __isset($key) {
+		if ('ancestors' == $key)
 			return true;
 
-		if ( 'page_template' == $key )
-			return ( 'page' == $this->post_type );
+		if ('page_template' == $key)
+			return ('page' == $this->post_type);
 
-		if ( 'post_category' == $key )
+		if ('post_category' == $key)
 		   return true;
 
-		if ( 'tags_input' == $key )
+		if ('tags_input' == $key)
 		   return true;
 
-		return metadata_exists( 'post', $this->ID, $key );
+		return metadata_exists('post', $this->ID, $key);
 	}
 
 	/**
@@ -269,39 +269,39 @@ 
 	 * @param string $key Key to get.
 	 * @return mixed
 	 */
-	public function __get( $key ) {
-		if ( 'page_template' == $key && $this->__isset( $key ) ) {
-			return get_post_meta( $this->ID, '_wp_page_template', true );
+	public function __get($key) {
+		if ('page_template' == $key && $this->__isset($key)) {
+			return get_post_meta($this->ID, '_wp_page_template', true);
 		}
 
-		if ( 'post_category' == $key ) {
-			if ( is_object_in_taxonomy( $this->post_type, 'category' ) )
-				$terms = get_the_terms( $this, 'category' );
+		if ('post_category' == $key) {
+			if (is_object_in_taxonomy($this->post_type, 'category'))
+				$terms = get_the_terms($this, 'category');
 
-			if ( empty( $terms ) )
+			if (empty($terms))
 				return array();
 
-			return wp_list_pluck( $terms, 'term_id' );
+			return wp_list_pluck($terms, 'term_id');
 		}
 
-		if ( 'tags_input' == $key ) {
-			if ( is_object_in_taxonomy( $this->post_type, 'post_tag' ) )
-				$terms = get_the_terms( $this, 'post_tag' );
+		if ('tags_input' == $key) {
+			if (is_object_in_taxonomy($this->post_type, 'post_tag'))
+				$terms = get_the_terms($this, 'post_tag');
 
-			if ( empty( $terms ) )
+			if (empty($terms))
 				return array();
 
-			return wp_list_pluck( $terms, 'name' );
+			return wp_list_pluck($terms, 'name');
 		}
 
 		// Rest of the values need filtering.
-		if ( 'ancestors' == $key )
-			$value = get_post_ancestors( $this );
+		if ('ancestors' == $key)
+			$value = get_post_ancestors($this);
 		else
-			$value = get_post_meta( $this->ID, $key, true );
+			$value = get_post_meta($this->ID, $key, true);
 
-		if ( $this->filter )
-			$value = sanitize_post_field( $key, $value, $this->ID, $this->filter );
+		if ($this->filter)
+			$value = sanitize_post_field($key, $value, $this->ID, $this->filter);
 
 		return $value;
 	}
@@ -312,14 +312,14 @@ 
 	 * @param string $filter Filter.
 	 * @return self|array|bool|object|WP_Post
 	 */
-	public function filter( $filter ) {
-		if ( $this->filter == $filter )
+	public function filter($filter) {
+		if ($this->filter == $filter)
 			return $this;
 
-		if ( $filter == 'raw' )
-			return self::get_instance( $this->ID );
+		if ($filter == 'raw')
+			return self::get_instance($this->ID);
 
-		return sanitize_post( $this, $filter );
+		return sanitize_post($this, $filter);
 	}
 
 	/**
@@ -328,11 +328,11 @@ 
 	 * @return array Object as array.
 	 */
 	public function to_array() {
-		$post = get_object_vars( $this );
+		$post = get_object_vars($this);
 
-		foreach ( array( 'ancestors', 'page_template', 'post_category', 'tags_input' ) as $key ) {
-			if ( $this->__isset( $key ) )
-				$post[ $key ] = $this->__get( $key );
+		foreach (array('ancestors', 'page_template', 'post_category', 'tags_input') as $key) {
+			if ($this->__isset($key))
+				$post[$key] = $this->__get($key);
 		}
 
 		return $post;

Braces +50 added lines, -34 removed lines

@@ -211,16 +211,18 @@ 
 		global $wpdb;
 
 		$post_id = (int) $post_id;
-		if ( ! $post_id )
-			return false;
+		if ( ! $post_id ) {
+					return false;
+		}
 
 		$_post = wp_cache_get( $post_id, 'posts' );
 
 		if ( ! $_post ) {
 			$_post = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->posts WHERE ID = %d LIMIT 1", $post_id ) );
 
-			if ( ! $_post )
-				return false;
+			if ( ! $_post ) {
+							return false;
+			}
 
 			$_post = sanitize_post( $_post, 'raw' );
 			wp_cache_add( $_post->ID, $_post, 'posts' );
@@ -237,8 +239,9 @@ 
 	 * @param WP_Post|object $post Post object.
 	 */
 	public function __construct( $post ) {
-		foreach ( get_object_vars( $post ) as $key => $value )
-			$this->$key = $value;
+		foreach ( get_object_vars( $post ) as $key => $value ) {
+					$this->$key = $value;
+		}
 	}
 
 	/**
@@ -248,17 +251,21 @@ 
 	 * @return bool
 	 */
 	public function __isset( $key ) {
-		if ( 'ancestors' == $key )
-			return true;
+		if ( 'ancestors' == $key ) {
+					return true;
+		}
 
-		if ( 'page_template' == $key )
-			return ( 'page' == $this->post_type );
+		if ( 'page_template' == $key ) {
+					return ( 'page' == $this->post_type );
+		}
 
-		if ( 'post_category' == $key )
-		   return true;
+		if ( 'post_category' == $key ) {
+				   return true;
+		}
 
-		if ( 'tags_input' == $key )
-		   return true;
+		if ( 'tags_input' == $key ) {
+				   return true;
+		}
 
 		return metadata_exists( 'post', $this->ID, $key );
 	}
@@ -275,33 +282,39 @@ 
 		}
 
 		if ( 'post_category' == $key ) {
-			if ( is_object_in_taxonomy( $this->post_type, 'category' ) )
-				$terms = get_the_terms( $this, 'category' );
+			if ( is_object_in_taxonomy( $this->post_type, 'category' ) ) {
+							$terms = get_the_terms( $this, 'category' );
+			}
 
-			if ( empty( $terms ) )
-				return array();
+			if ( empty( $terms ) ) {
+							return array();
+			}
 
 			return wp_list_pluck( $terms, 'term_id' );
 		}
 
 		if ( 'tags_input' == $key ) {
-			if ( is_object_in_taxonomy( $this->post_type, 'post_tag' ) )
-				$terms = get_the_terms( $this, 'post_tag' );
+			if ( is_object_in_taxonomy( $this->post_type, 'post_tag' ) ) {
+							$terms = get_the_terms( $this, 'post_tag' );
+			}
 
-			if ( empty( $terms ) )
-				return array();
+			if ( empty( $terms ) ) {
+							return array();
+			}
 
 			return wp_list_pluck( $terms, 'name' );
 		}
 
 		// Rest of the values need filtering.
-		if ( 'ancestors' == $key )
-			$value = get_post_ancestors( $this );
-		else
-			$value = get_post_meta( $this->ID, $key, true );
+		if ( 'ancestors' == $key ) {
+					$value = get_post_ancestors( $this );
+		} else {
+					$value = get_post_meta( $this->ID, $key, true );
+		}
 
-		if ( $this->filter )
-			$value = sanitize_post_field( $key, $value, $this->ID, $this->filter );
+		if ( $this->filter ) {
+					$value = sanitize_post_field( $key, $value, $this->ID, $this->filter );
+		}
 
 		return $value;
 	}
@@ -313,11 +326,13 @@ 
 	 * @return self|array|bool|object|WP_Post
 	 */
 	public function filter( $filter ) {
-		if ( $this->filter == $filter )
-			return $this;
+		if ( $this->filter == $filter ) {
+					return $this;
+		}
 
-		if ( $filter == 'raw' )
-			return self::get_instance( $this->ID );
+		if ( $filter == 'raw' ) {
+					return self::get_instance( $this->ID );
+		}
 
 		return sanitize_post( $this, $filter );
 	}
@@ -331,8 +346,9 @@ 
 		$post = get_object_vars( $this );
 
 		foreach ( array( 'ancestors', 'page_template', 'post_category', 'tags_input' ) as $key ) {
-			if ( $this->__isset( $key ) )
-				$post[ $key ] = $this->__get( $key );
+			if ( $this->__isset( $key ) ) {
+							$post[ $key ] = $this->__get( $key );
+			}
 		}
 
 		return $post;

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

Doc Comments +2 added lines, -2 removed lines

@@ -440,7 +440,7 @@ 
 	 * and care should be taken to use $theme->display('Name') to get a properly
 	 * translated header.
 	 *
-	 * @param mixed $offset
+	 * @param string $offset
 	 * @return mixed
 	 */
 	public function offsetGet( $offset ) {
@@ -974,7 +974,7 @@ 
 	 * @since 3.4.0
 	 * @access public
 	 *
-	 * @param mixed $type Optional. Array of extensions to return. Defaults to all files (null).
+	 * @param string $type Optional. Array of extensions to return. Defaults to all files (null).
 	 * @param int $depth Optional. How deep to search for files. Defaults to a flat scan (0 depth). -1 depth is infinite.
 	 * @param bool $search_parent Optional. Whether to return parent files. Defaults to false.
 	 * @return array Array of files, keyed by the path to the file relative to the theme's directory, with the values

Indentation +7 added lines, -7 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 /**
- * WP_Theme Class
- *
- * @package WordPress
- * @subpackage Theme
- * @since 3.4.0
- */
+	 * WP_Theme Class
+	 *
+	 * @package WordPress
+	 * @subpackage Theme
+	 * @since 3.4.0
+	 */
 final class WP_Theme implements ArrayAccess {
 
 	/**
@@ -705,7 +705,7 @@ 
 	/**
 	 * Mark up a theme header.
 	 *
-     * @since 3.4.0
+	 * @since 3.4.0
 	 * @access private
 	 *
 	 * @staticvar string $comma

Spacing +262 added lines, -262 removed lines

@@ -198,19 +198,19 @@ 
 	 * @param string $theme_root Theme root.
 	 * @param WP_Error|void $_child If this theme is a parent theme, the child may be passed for validation purposes.
 	 */
-	public function __construct( $theme_dir, $theme_root, $_child = null ) {
+	public function __construct($theme_dir, $theme_root, $_child = null) {
 		global $wp_theme_directories;
 
 		// Initialize caching on first run.
-		if ( ! isset( self::$persistently_cache ) ) {
+		if ( ! isset(self::$persistently_cache)) {
 			/** This action is documented in wp-includes/theme.php */
-			self::$persistently_cache = apply_filters( 'wp_cache_themes_persistently', false, 'WP_Theme' );
-			if ( self::$persistently_cache ) {
-				wp_cache_add_global_groups( 'themes' );
-				if ( is_int( self::$persistently_cache ) )
+			self::$persistently_cache = apply_filters('wp_cache_themes_persistently', false, 'WP_Theme');
+			if (self::$persistently_cache) {
+				wp_cache_add_global_groups('themes');
+				if (is_int(self::$persistently_cache))
 					self::$cache_expiration = self::$persistently_cache;
 			} else {
-				wp_cache_add_non_persistent_groups( 'themes' );
+				wp_cache_add_non_persistent_groups('themes');
 			}
 		}
 
@@ -218,114 +218,114 @@ 
 		$this->stylesheet = $theme_dir;
 
 		// Correct a situation where the theme is 'some-directory/some-theme' but 'some-directory' was passed in as part of the theme root instead.
-		if ( ! in_array( $theme_root, (array) $wp_theme_directories ) && in_array( dirname( $theme_root ), (array) $wp_theme_directories ) ) {
-			$this->stylesheet = basename( $this->theme_root ) . '/' . $this->stylesheet;
-			$this->theme_root = dirname( $theme_root );
+		if ( ! in_array($theme_root, (array) $wp_theme_directories) && in_array(dirname($theme_root), (array) $wp_theme_directories)) {
+			$this->stylesheet = basename($this->theme_root).'/'.$this->stylesheet;
+			$this->theme_root = dirname($theme_root);
 		}
 
-		$this->cache_hash = md5( $this->theme_root . '/' . $this->stylesheet );
-		$theme_file = $this->stylesheet . '/style.css';
+		$this->cache_hash = md5($this->theme_root.'/'.$this->stylesheet);
+		$theme_file = $this->stylesheet.'/style.css';
 
-		$cache = $this->cache_get( 'theme' );
+		$cache = $this->cache_get('theme');
 
-		if ( is_array( $cache ) ) {
-			foreach ( array( 'errors', 'headers', 'template' ) as $key ) {
-				if ( isset( $cache[ $key ] ) )
-					$this->$key = $cache[ $key ];
+		if (is_array($cache)) {
+			foreach (array('errors', 'headers', 'template') as $key) {
+				if (isset($cache[$key]))
+					$this->$key = $cache[$key];
 			}
-			if ( $this->errors )
+			if ($this->errors)
 				return;
-			if ( isset( $cache['theme_root_template'] ) )
+			if (isset($cache['theme_root_template']))
 				$theme_root_template = $cache['theme_root_template'];
-		} elseif ( ! file_exists( $this->theme_root . '/' . $theme_file ) ) {
+		} elseif ( ! file_exists($this->theme_root.'/'.$theme_file)) {
 			$this->headers['Name'] = $this->stylesheet;
-			if ( ! file_exists( $this->theme_root . '/' . $this->stylesheet ) )
-				$this->errors = new WP_Error( 'theme_not_found', sprintf( __( 'The theme directory "%s" does not exist.' ), esc_html( $this->stylesheet ) ) );
+			if ( ! file_exists($this->theme_root.'/'.$this->stylesheet))
+				$this->errors = new WP_Error('theme_not_found', sprintf(__('The theme directory "%s" does not exist.'), esc_html($this->stylesheet)));
 			else
-				$this->errors = new WP_Error( 'theme_no_stylesheet', __( 'Stylesheet is missing.' ) );
+				$this->errors = new WP_Error('theme_no_stylesheet', __('Stylesheet is missing.'));
 			$this->template = $this->stylesheet;
-			$this->cache_add( 'theme', array( 'headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet, 'template' => $this->template ) );
-			if ( ! file_exists( $this->theme_root ) ) // Don't cache this one.
-				$this->errors->add( 'theme_root_missing', __( 'ERROR: The themes directory is either empty or doesn’t exist. Please check your installation.' ) );
+			$this->cache_add('theme', array('headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet, 'template' => $this->template));
+			if ( ! file_exists($this->theme_root)) // Don't cache this one.
+				$this->errors->add('theme_root_missing', __('ERROR: The themes directory is either empty or doesn’t exist. Please check your installation.'));
 			return;
-		} elseif ( ! is_readable( $this->theme_root . '/' . $theme_file ) ) {
+		} elseif ( ! is_readable($this->theme_root.'/'.$theme_file)) {
 			$this->headers['Name'] = $this->stylesheet;
-			$this->errors = new WP_Error( 'theme_stylesheet_not_readable', __( 'Stylesheet is not readable.' ) );
+			$this->errors = new WP_Error('theme_stylesheet_not_readable', __('Stylesheet is not readable.'));
 			$this->template = $this->stylesheet;
-			$this->cache_add( 'theme', array( 'headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet, 'template' => $this->template ) );
+			$this->cache_add('theme', array('headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet, 'template' => $this->template));
 			return;
 		} else {
-			$this->headers = get_file_data( $this->theme_root . '/' . $theme_file, self::$file_headers, 'theme' );
+			$this->headers = get_file_data($this->theme_root.'/'.$theme_file, self::$file_headers, 'theme');
 			// Default themes always trump their pretenders.
 			// Properly identify default themes that are inside a directory within wp-content/themes.
-			if ( $default_theme_slug = array_search( $this->headers['Name'], self::$default_themes ) ) {
-				if ( basename( $this->stylesheet ) != $default_theme_slug )
-					$this->headers['Name'] .= '/' . $this->stylesheet;
+			if ($default_theme_slug = array_search($this->headers['Name'], self::$default_themes)) {
+				if (basename($this->stylesheet) != $default_theme_slug)
+					$this->headers['Name'] .= '/'.$this->stylesheet;
 			}
 		}
 
 		// (If template is set from cache [and there are no errors], we know it's good.)
-		if ( ! $this->template && ! ( $this->template = $this->headers['Template'] ) ) {
+		if ( ! $this->template && ! ($this->template = $this->headers['Template'])) {
 			$this->template = $this->stylesheet;
-			if ( ! file_exists( $this->theme_root . '/' . $this->stylesheet . '/index.php' ) ) {
+			if ( ! file_exists($this->theme_root.'/'.$this->stylesheet.'/index.php')) {
 				$error_message = sprintf(
 					/* translators: 1: index.php, 2: Codex URL, 3: style.css */
-					__( 'Template is missing. Standalone themes need to have a %1$s template file. <a href="%2$s">Child themes</a> need to have a Template header in the %3$s stylesheet.' ),
+					__('Template is missing. Standalone themes need to have a %1$s template file. <a href="%2$s">Child themes</a> need to have a Template header in the %3$s stylesheet.'),
 					'<code>index.php</code>',
-					__( 'https://codex.wordpress.org/Child_Themes' ),
+					__('https://codex.wordpress.org/Child_Themes'),
 					'<code>style.css</code>'
 				);
-				$this->errors = new WP_Error( 'theme_no_index', $error_message );
-				$this->cache_add( 'theme', array( 'headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet, 'template' => $this->template ) );
+				$this->errors = new WP_Error('theme_no_index', $error_message);
+				$this->cache_add('theme', array('headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet, 'template' => $this->template));
 				return;
 			}
 		}
 
 		// If we got our data from cache, we can assume that 'template' is pointing to the right place.
-		if ( ! is_array( $cache ) && $this->template != $this->stylesheet && ! file_exists( $this->theme_root . '/' . $this->template . '/index.php' ) ) {
+		if ( ! is_array($cache) && $this->template != $this->stylesheet && ! file_exists($this->theme_root.'/'.$this->template.'/index.php')) {
 			// If we're in a directory of themes inside /themes, look for the parent nearby.
 			// wp-content/themes/directory-of-themes/*
-			$parent_dir = dirname( $this->stylesheet );
-			if ( '.' != $parent_dir && file_exists( $this->theme_root . '/' . $parent_dir . '/' . $this->template . '/index.php' ) ) {
-				$this->template = $parent_dir . '/' . $this->template;
-			} elseif ( ( $directories = search_theme_directories() ) && isset( $directories[ $this->template ] ) ) {
+			$parent_dir = dirname($this->stylesheet);
+			if ('.' != $parent_dir && file_exists($this->theme_root.'/'.$parent_dir.'/'.$this->template.'/index.php')) {
+				$this->template = $parent_dir.'/'.$this->template;
+			} elseif (($directories = search_theme_directories()) && isset($directories[$this->template])) {
 				// Look for the template in the search_theme_directories() results, in case it is in another theme root.
 				// We don't look into directories of themes, just the theme root.
-				$theme_root_template = $directories[ $this->template ]['theme_root'];
+				$theme_root_template = $directories[$this->template]['theme_root'];
 			} else {
 				// Parent theme is missing.
-				$this->errors = new WP_Error( 'theme_no_parent', sprintf( __( 'The parent theme is missing. Please install the "%s" parent theme.' ), esc_html( $this->template ) ) );
-				$this->cache_add( 'theme', array( 'headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet, 'template' => $this->template ) );
-				$this->parent = new WP_Theme( $this->template, $this->theme_root, $this );
+				$this->errors = new WP_Error('theme_no_parent', sprintf(__('The parent theme is missing. Please install the "%s" parent theme.'), esc_html($this->template)));
+				$this->cache_add('theme', array('headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet, 'template' => $this->template));
+				$this->parent = new WP_Theme($this->template, $this->theme_root, $this);
 				return;
 			}
 		}
 
 		// Set the parent, if we're a child theme.
-		if ( $this->template != $this->stylesheet ) {
+		if ($this->template != $this->stylesheet) {
 			// If we are a parent, then there is a problem. Only two generations allowed! Cancel things out.
-			if ( $_child instanceof WP_Theme && $_child->template == $this->stylesheet ) {
+			if ($_child instanceof WP_Theme && $_child->template == $this->stylesheet) {
 				$_child->parent = null;
-				$_child->errors = new WP_Error( 'theme_parent_invalid', sprintf( __( 'The "%s" theme is not a valid parent theme.' ), esc_html( $_child->template ) ) );
-				$_child->cache_add( 'theme', array( 'headers' => $_child->headers, 'errors' => $_child->errors, 'stylesheet' => $_child->stylesheet, 'template' => $_child->template ) );
+				$_child->errors = new WP_Error('theme_parent_invalid', sprintf(__('The "%s" theme is not a valid parent theme.'), esc_html($_child->template)));
+				$_child->cache_add('theme', array('headers' => $_child->headers, 'errors' => $_child->errors, 'stylesheet' => $_child->stylesheet, 'template' => $_child->template));
 				// The two themes actually reference each other with the Template header.
-				if ( $_child->stylesheet == $this->template ) {
-					$this->errors = new WP_Error( 'theme_parent_invalid', sprintf( __( 'The "%s" theme is not a valid parent theme.' ), esc_html( $this->template ) ) );
-					$this->cache_add( 'theme', array( 'headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet, 'template' => $this->template ) );
+				if ($_child->stylesheet == $this->template) {
+					$this->errors = new WP_Error('theme_parent_invalid', sprintf(__('The "%s" theme is not a valid parent theme.'), esc_html($this->template)));
+					$this->cache_add('theme', array('headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet, 'template' => $this->template));
 				}
 				return;
 			}
 			// Set the parent. Pass the current instance so we can do the crazy checks above and assess errors.
-			$this->parent = new WP_Theme( $this->template, isset( $theme_root_template ) ? $theme_root_template : $this->theme_root, $this );
+			$this->parent = new WP_Theme($this->template, isset($theme_root_template) ? $theme_root_template : $this->theme_root, $this);
 		}
 
 		// We're good. If we didn't retrieve from cache, set it.
-		if ( ! is_array( $cache ) ) {
-			$cache = array( 'headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet, 'template' => $this->template );
+		if ( ! is_array($cache)) {
+			$cache = array('headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet, 'template' => $this->template);
 			// If the parent theme is in another root, we'll want to cache this. Avoids an entire branch of filesystem calls above.
-			if ( isset( $theme_root_template ) )
+			if (isset($theme_root_template))
 				$cache['theme_root_template'] = $theme_root_template;
-			$this->cache_add( 'theme', $cache );
+			$this->cache_add('theme', $cache);
 		}
 	}
 
@@ -346,13 +346,13 @@ 
 	 * @param string $offset Property to check if set.
 	 * @return bool Whether the given property is set.
 	 */
-	public function __isset( $offset ) {
+	public function __isset($offset) {
 		static $properties = array(
 			'name', 'title', 'version', 'parent_theme', 'template_dir', 'stylesheet_dir', 'template', 'stylesheet',
 			'screenshot', 'description', 'author', 'tags', 'theme_root', 'theme_root_uri',
 		);
 
-		return in_array( $offset, $properties );
+		return in_array($offset, $properties);
 	}
 
 	/**
@@ -361,8 +361,8 @@ 
 	 * @param string $offset Property to get.
 	 * @return mixed Property value.
 	 */
-	public function __get( $offset ) {
-		switch ( $offset ) {
+	public function __get($offset) {
+		switch ($offset) {
 			case 'name' :
 			case 'title' :
 				return $this->get('Name');
@@ -379,21 +379,21 @@ 
 			case 'stylesheet' :
 				return $this->get_stylesheet();
 			case 'screenshot' :
-				return $this->get_screenshot( 'relative' );
+				return $this->get_screenshot('relative');
 			// 'author' and 'description' did not previously return translated data.
 			case 'description' :
 				return $this->display('Description');
 			case 'author' :
 				return $this->display('Author');
 			case 'tags' :
-				return $this->get( 'Tags' );
+				return $this->get('Tags');
 			case 'theme_root' :
 				return $this->get_theme_root();
 			case 'theme_root_uri' :
 				return $this->get_theme_root_uri();
 			// For cases where the array was converted to an object.
 			default :
-				return $this->offsetGet( $offset );
+				return $this->offsetGet($offset);
 		}
 	}
 
@@ -403,14 +403,14 @@ 
 	 * @param mixed $offset
 	 * @param mixed $value
 	 */
-	public function offsetSet( $offset, $value ) {}
+	public function offsetSet($offset, $value) {}
 
 	/**
 	 * Method to implement ArrayAccess for keys formerly returned by get_themes()
 	 *
 	 * @param mixed $offset
 	 */
-	public function offsetUnset( $offset ) {}
+	public function offsetUnset($offset) {}
 
 	/**
 	 * Method to implement ArrayAccess for keys formerly returned by get_themes()
@@ -420,14 +420,14 @@ 
 	 * @param mixed $offset
 	 * @return bool
 	 */
-	public function offsetExists( $offset ) {
+	public function offsetExists($offset) {
 		static $keys = array(
 			'Name', 'Version', 'Status', 'Title', 'Author', 'Author Name', 'Author URI', 'Description',
 			'Template', 'Stylesheet', 'Template Files', 'Stylesheet Files', 'Template Dir', 'Stylesheet Dir',
 			'Screenshot', 'Tags', 'Theme Root', 'Theme Root URI', 'Parent Theme',
 		);
 
-		return in_array( $offset, $keys );
+		return in_array($offset, $keys);
 	}
 
 	/**
@@ -443,38 +443,38 @@ 
 	 * @param mixed $offset
 	 * @return mixed
 	 */
-	public function offsetGet( $offset ) {
-		switch ( $offset ) {
+	public function offsetGet($offset) {
+		switch ($offset) {
 			case 'Name' :
 			case 'Title' :
 				// See note above about using translated data. get() is not ideal.
 				// It is only for backwards compatibility. Use display().
 				return $this->get('Name');
 			case 'Author' :
-				return $this->display( 'Author');
+				return $this->display('Author');
 			case 'Author Name' :
-				return $this->display( 'Author', false);
+				return $this->display('Author', false);
 			case 'Author URI' :
 				return $this->display('AuthorURI');
 			case 'Description' :
-				return $this->display( 'Description');
+				return $this->display('Description');
 			case 'Version' :
 			case 'Status' :
-				return $this->get( $offset );
+				return $this->get($offset);
 			case 'Template' :
 				return $this->get_template();
 			case 'Stylesheet' :
 				return $this->get_stylesheet();
 			case 'Template Files' :
-				return $this->get_files( 'php', 1, true );
+				return $this->get_files('php', 1, true);
 			case 'Stylesheet Files' :
-				return $this->get_files( 'css', 0, false );
+				return $this->get_files('css', 0, false);
 			case 'Template Dir' :
 				return $this->get_template_directory();
 			case 'Stylesheet Dir' :
 				return $this->get_stylesheet_directory();
 			case 'Screenshot' :
-				return $this->get_screenshot( 'relative' );
+				return $this->get_screenshot('relative');
 			case 'Tags' :
 				return $this->get('Tags');
 			case 'Theme Root' :
@@ -497,7 +497,7 @@ 
 	 * @return WP_Error|false WP_Error if there are errors, or false.
 	 */
 	public function errors() {
-		return is_wp_error( $this->errors ) ? $this->errors : false;
+		return is_wp_error($this->errors) ? $this->errors : false;
 	}
 
 	/**
@@ -512,7 +512,7 @@ 
 	 * @return bool Whether the theme exists.
 	 */
 	public function exists() {
-		return ! ( $this->errors() && in_array( 'theme_not_found', $this->errors()->get_error_codes() ) );
+		return ! ($this->errors() && in_array('theme_not_found', $this->errors()->get_error_codes()));
 	}
 
 	/**
@@ -524,7 +524,7 @@ 
 	 * @return WP_Theme|false Parent theme, or false if the current theme is not a child theme.
 	 */
 	public function parent() {
-		return isset( $this->parent ) ? $this->parent : false;
+		return isset($this->parent) ? $this->parent : false;
 	}
 
 	/**
@@ -539,8 +539,8 @@ 
 	 * @param string $data Data to store
 	 * @return bool Return value from wp_cache_add()
 	 */
-	private function cache_add( $key, $data ) {
-		return wp_cache_add( $key . '-' . $this->cache_hash, $data, 'themes', self::$cache_expiration );
+	private function cache_add($key, $data) {
+		return wp_cache_add($key.'-'.$this->cache_hash, $data, 'themes', self::$cache_expiration);
 	}
 
 	/**
@@ -554,8 +554,8 @@ 
 	 * @param string $key Type of data to retrieve (theme, screenshot, headers, page_templates)
 	 * @return mixed Retrieved data
 	 */
-	private function cache_get( $key ) {
-		return wp_cache_get( $key . '-' . $this->cache_hash, 'themes' );
+	private function cache_get($key) {
+		return wp_cache_get($key.'-'.$this->cache_hash, 'themes');
 	}
 
 	/**
@@ -565,11 +565,11 @@ 
 	 * @access public
 	 */
 	public function cache_delete() {
-		foreach ( array( 'theme', 'screenshot', 'headers', 'page_templates' ) as $key )
-			wp_cache_delete( $key . '-' . $this->cache_hash, 'themes' );
+		foreach (array('theme', 'screenshot', 'headers', 'page_templates') as $key)
+			wp_cache_delete($key.'-'.$this->cache_hash, 'themes');
 		$this->template = $this->textdomain_loaded = $this->theme_root_uri = $this->parent = $this->errors = $this->headers_sanitized = $this->name_translated = null;
 		$this->headers = array();
-		$this->__construct( $this->stylesheet, $this->theme_root );
+		$this->__construct($this->stylesheet, $this->theme_root);
 	}
 
 	/**
@@ -589,29 +589,29 @@ 
 	 * @param string $header Theme header. Name, Description, Author, Version, ThemeURI, AuthorURI, Status, Tags.
 	 * @return string|false String on success, false on failure.
 	 */
-	public function get( $header ) {
-		if ( ! isset( $this->headers[ $header ] ) )
+	public function get($header) {
+		if ( ! isset($this->headers[$header]))
 			return false;
 
-		if ( ! isset( $this->headers_sanitized ) ) {
-			$this->headers_sanitized = $this->cache_get( 'headers' );
-			if ( ! is_array( $this->headers_sanitized ) )
+		if ( ! isset($this->headers_sanitized)) {
+			$this->headers_sanitized = $this->cache_get('headers');
+			if ( ! is_array($this->headers_sanitized))
 				$this->headers_sanitized = array();
 		}
 
-		if ( isset( $this->headers_sanitized[ $header ] ) )
-			return $this->headers_sanitized[ $header ];
+		if (isset($this->headers_sanitized[$header]))
+			return $this->headers_sanitized[$header];
 
 		// If themes are a persistent group, sanitize everything and cache it. One cache add is better than many cache sets.
-		if ( self::$persistently_cache ) {
-			foreach ( array_keys( $this->headers ) as $_header )
-				$this->headers_sanitized[ $_header ] = $this->sanitize_header( $_header, $this->headers[ $_header ] );
-			$this->cache_add( 'headers', $this->headers_sanitized );
+		if (self::$persistently_cache) {
+			foreach (array_keys($this->headers) as $_header)
+				$this->headers_sanitized[$_header] = $this->sanitize_header($_header, $this->headers[$_header]);
+			$this->cache_add('headers', $this->headers_sanitized);
 		} else {
-			$this->headers_sanitized[ $header ] = $this->sanitize_header( $header, $this->headers[ $header ] );
+			$this->headers_sanitized[$header] = $this->sanitize_header($header, $this->headers[$header]);
 		}
 
-		return $this->headers_sanitized[ $header ];
+		return $this->headers_sanitized[$header];
 	}
 
 	/**
@@ -625,20 +625,20 @@ 
 	 * @param bool $translate Optional. Whether to translate the header. Defaults to true.
 	 * @return string|false Processed header, false on failure.
 	 */
-	public function display( $header, $markup = true, $translate = true ) {
-		$value = $this->get( $header );
-		if ( false === $value ) {
+	public function display($header, $markup = true, $translate = true) {
+		$value = $this->get($header);
+		if (false === $value) {
 			return false;
 		}
 
-		if ( $translate && ( empty( $value ) || ! $this->load_textdomain() ) )
+		if ($translate && (empty($value) || ! $this->load_textdomain()))
 			$translate = false;
 
-		if ( $translate )
-			$value = $this->translate_header( $header, $value );
+		if ($translate)
+			$value = $this->translate_header($header, $value);
 
-		if ( $markup )
-			$value = $this->markup_header( $header, $value, $translate );
+		if ($markup)
+			$value = $this->markup_header($header, $value, $translate);
 
 		return $value;
 	}
@@ -656,46 +656,46 @@ 
 	 * @param string $value Value to sanitize.
 	 * @return mixed
 	 */
-	private function sanitize_header( $header, $value ) {
-		switch ( $header ) {
+	private function sanitize_header($header, $value) {
+		switch ($header) {
 			case 'Status' :
-				if ( ! $value ) {
+				if ( ! $value) {
 					$value = 'publish';
 					break;
 				}
 				// Fall through otherwise.
 			case 'Name' :
 				static $header_tags = array(
-					'abbr'    => array( 'title' => true ),
-					'acronym' => array( 'title' => true ),
+					'abbr'    => array('title' => true),
+					'acronym' => array('title' => true),
 					'code'    => true,
 					'em'      => true,
 					'strong'  => true,
 				);
-				$value = wp_kses( $value, $header_tags );
+				$value = wp_kses($value, $header_tags);
 				break;
 			case 'Author' :
 				// There shouldn't be anchor tags in Author, but some themes like to be challenging.
 			case 'Description' :
 				static $header_tags_with_a = array(
-					'a'       => array( 'href' => true, 'title' => true ),
-					'abbr'    => array( 'title' => true ),
-					'acronym' => array( 'title' => true ),
+					'a'       => array('href' => true, 'title' => true),
+					'abbr'    => array('title' => true),
+					'acronym' => array('title' => true),
 					'code'    => true,
 					'em'      => true,
 					'strong'  => true,
 				);
-				$value = wp_kses( $value, $header_tags_with_a );
+				$value = wp_kses($value, $header_tags_with_a);
 				break;
 			case 'ThemeURI' :
 			case 'AuthorURI' :
-				$value = esc_url_raw( $value );
+				$value = esc_url_raw($value);
 				break;
 			case 'Tags' :
-				$value = array_filter( array_map( 'trim', explode( ',', strip_tags( $value ) ) ) );
+				$value = array_filter(array_map('trim', explode(',', strip_tags($value))));
 				break;
 			case 'Version' :
-				$value = strip_tags( $value );
+				$value = strip_tags($value);
 				break;
 		}
 
@@ -715,33 +715,33 @@ 
 	 * @param string $translate Whether the header has been translated.
 	 * @return string Value, marked up.
 	 */
-	private function markup_header( $header, $value, $translate ) {
-		switch ( $header ) {
+	private function markup_header($header, $value, $translate) {
+		switch ($header) {
 			case 'Name' :
-				if ( empty( $value ) )
+				if (empty($value))
 					$value = $this->get_stylesheet();
 				break;
 			case 'Description' :
-				$value = wptexturize( $value );
+				$value = wptexturize($value);
 				break;
 			case 'Author' :
-				if ( $this->get('AuthorURI') ) {
-					$value = sprintf( '<a href="%1$s">%2$s</a>', $this->display( 'AuthorURI', true, $translate ), $value );
-				} elseif ( ! $value ) {
-					$value = __( 'Anonymous' );
+				if ($this->get('AuthorURI')) {
+					$value = sprintf('<a href="%1$s">%2$s</a>', $this->display('AuthorURI', true, $translate), $value);
+				} elseif ( ! $value) {
+					$value = __('Anonymous');
 				}
 				break;
 			case 'Tags' :
 				static $comma = null;
-				if ( ! isset( $comma ) ) {
+				if ( ! isset($comma)) {
 					/* translators: used between list items, there is a space after the comma */
-					$comma = __( ', ' );
+					$comma = __(', ');
 				}
-				$value = implode( $comma, $value );
+				$value = implode($comma, $value);
 				break;
 			case 'ThemeURI' :
 			case 'AuthorURI' :
-				$value = esc_url( $value );
+				$value = esc_url($value);
 				break;
 		}
 
@@ -760,38 +760,38 @@ 
 	 * @param string $value Value to translate.
 	 * @return string Translated value.
 	 */
-	private function translate_header( $header, $value ) {
-		switch ( $header ) {
+	private function translate_header($header, $value) {
+		switch ($header) {
 			case 'Name' :
 				// Cached for sorting reasons.
-				if ( isset( $this->name_translated ) )
+				if (isset($this->name_translated))
 					return $this->name_translated;
-				$this->name_translated = translate( $value, $this->get('TextDomain' ) );
+				$this->name_translated = translate($value, $this->get('TextDomain'));
 				return $this->name_translated;
 			case 'Tags' :
-				if ( empty( $value ) || ! function_exists( 'get_theme_feature_list' ) )
+				if (empty($value) || ! function_exists('get_theme_feature_list'))
 					return $value;
 
 				static $tags_list;
-				if ( ! isset( $tags_list ) ) {
+				if ( ! isset($tags_list)) {
 					$tags_list = array();
-					$feature_list = get_theme_feature_list( false ); // No API
-					foreach ( $feature_list as $tags )
+					$feature_list = get_theme_feature_list(false); // No API
+					foreach ($feature_list as $tags)
 						$tags_list += $tags;
 				}
 
-				foreach ( $value as &$tag ) {
-					if ( isset( $tags_list[ $tag ] ) ) {
-						$tag = $tags_list[ $tag ];
-					} elseif ( isset( self::$tag_map[ $tag ] ) ) {
-						$tag = $tags_list[ self::$tag_map[ $tag ] ];
+				foreach ($value as &$tag) {
+					if (isset($tags_list[$tag])) {
+						$tag = $tags_list[$tag];
+					} elseif (isset(self::$tag_map[$tag])) {
+						$tag = $tags_list[self::$tag_map[$tag]];
 					}
 				}
 
 				return $value;
 
 			default :
-				$value = translate( $value, $this->get('TextDomain') );
+				$value = translate($value, $this->get('TextDomain'));
 		}
 		return $value;
 	}
@@ -838,10 +838,10 @@ 
 	 * @return string Absolute path of the stylesheet directory.
 	 */
 	public function get_stylesheet_directory() {
-		if ( $this->errors() && in_array( 'theme_root_missing', $this->errors()->get_error_codes() ) )
+		if ($this->errors() && in_array('theme_root_missing', $this->errors()->get_error_codes()))
 			return '';
 
-		return $this->theme_root . '/' . $this->stylesheet;
+		return $this->theme_root.'/'.$this->stylesheet;
 	}
 
 	/**
@@ -856,12 +856,12 @@ 
 	 * @return string Absolute path of the template directory.
 	 */
 	public function get_template_directory() {
-		if ( $this->parent() )
+		if ($this->parent())
 			$theme_root = $this->parent()->theme_root;
 		else
 			$theme_root = $this->theme_root;
 
-		return $theme_root . '/' . $this->template;
+		return $theme_root.'/'.$this->template;
 	}
 
 	/**
@@ -876,7 +876,7 @@ 
 	 * @return string URL to the stylesheet directory.
 	 */
 	public function get_stylesheet_directory_uri() {
-		return $this->get_theme_root_uri() . '/' . str_replace( '%2F', '/', rawurlencode( $this->stylesheet ) );
+		return $this->get_theme_root_uri().'/'.str_replace('%2F', '/', rawurlencode($this->stylesheet));
 	}
 
 	/**
@@ -891,12 +891,12 @@ 
 	 * @return string URL to the template directory.
 	 */
 	public function get_template_directory_uri() {
-		if ( $this->parent() )
+		if ($this->parent())
 			$theme_root_uri = $this->parent()->get_theme_root_uri();
 		else
 			$theme_root_uri = $this->get_theme_root_uri();
 
-		return $theme_root_uri . '/' . str_replace( '%2F', '/', rawurlencode( $this->template ) );
+		return $theme_root_uri.'/'.str_replace('%2F', '/', rawurlencode($this->template));
 	}
 
 	/**
@@ -926,8 +926,8 @@ 
 	 * @return string Theme root URI.
 	 */
 	public function get_theme_root_uri() {
-		if ( ! isset( $this->theme_root_uri ) )
-			$this->theme_root_uri = get_theme_root_uri( $this->stylesheet, $this->theme_root );
+		if ( ! isset($this->theme_root_uri))
+			$this->theme_root_uri = get_theme_root_uri($this->stylesheet, $this->theme_root);
 		return $this->theme_root_uri;
 	}
 
@@ -945,26 +945,26 @@ 
 	 * @param string $uri Type of URL to return, either 'relative' or an absolute URI. Defaults to absolute URI.
 	 * @return string|false Screenshot file. False if the theme does not have a screenshot.
 	 */
-	public function get_screenshot( $uri = 'uri' ) {
-		$screenshot = $this->cache_get( 'screenshot' );
-		if ( $screenshot ) {
-			if ( 'relative' == $uri )
+	public function get_screenshot($uri = 'uri') {
+		$screenshot = $this->cache_get('screenshot');
+		if ($screenshot) {
+			if ('relative' == $uri)
 				return $screenshot;
-			return $this->get_stylesheet_directory_uri() . '/' . $screenshot;
-		} elseif ( 0 === $screenshot ) {
+			return $this->get_stylesheet_directory_uri().'/'.$screenshot;
+		} elseif (0 === $screenshot) {
 			return false;
 		}
 
-		foreach ( array( 'png', 'gif', 'jpg', 'jpeg' ) as $ext ) {
-			if ( file_exists( $this->get_stylesheet_directory() . "/screenshot.$ext" ) ) {
-				$this->cache_add( 'screenshot', 'screenshot.' . $ext );
-				if ( 'relative' == $uri )
-					return 'screenshot.' . $ext;
-				return $this->get_stylesheet_directory_uri() . '/' . 'screenshot.' . $ext;
+		foreach (array('png', 'gif', 'jpg', 'jpeg') as $ext) {
+			if (file_exists($this->get_stylesheet_directory()."/screenshot.$ext")) {
+				$this->cache_add('screenshot', 'screenshot.'.$ext);
+				if ('relative' == $uri)
+					return 'screenshot.'.$ext;
+				return $this->get_stylesheet_directory_uri().'/'.'screenshot.'.$ext;
 			}
 		}
 
-		$this->cache_add( 'screenshot', 0 );
+		$this->cache_add('screenshot', 0);
 		return false;
 	}
 
@@ -980,11 +980,11 @@ 
 	 * @return array Array of files, keyed by the path to the file relative to the theme's directory, with the values
 	 * 	             being absolute paths.
 	 */
-	public function get_files( $type = null, $depth = 0, $search_parent = false ) {
-		$files = (array) self::scandir( $this->get_stylesheet_directory(), $type, $depth );
+	public function get_files($type = null, $depth = 0, $search_parent = false) {
+		$files = (array) self::scandir($this->get_stylesheet_directory(), $type, $depth);
 
-		if ( $search_parent && $this->parent() )
-			$files += (array) self::scandir( $this->get_template_directory(), $type, $depth );
+		if ($search_parent && $this->parent())
+			$files += (array) self::scandir($this->get_template_directory(), $type, $depth);
 
 		return $files;
 	}
@@ -998,35 +998,35 @@ 
 	 * @param WP_Post|null $post Optional. The post being edited, provided for context.
 	 * @return array Array of page templates, keyed by filename, with the value of the translated header name.
 	 */
-	public function get_page_templates( $post = null ) {
+	public function get_page_templates($post = null) {
 		// If you screw up your current theme and we invalidate your parent, most things still work. Let it slide.
-		if ( $this->errors() && $this->errors()->get_error_codes() !== array( 'theme_parent_invalid' ) )
+		if ($this->errors() && $this->errors()->get_error_codes() !== array('theme_parent_invalid'))
 			return array();
 
-		$page_templates = $this->cache_get( 'page_templates' );
+		$page_templates = $this->cache_get('page_templates');
 
-		if ( ! is_array( $page_templates ) ) {
+		if ( ! is_array($page_templates)) {
 			$page_templates = array();
 
-			$files = (array) $this->get_files( 'php', 1 );
+			$files = (array) $this->get_files('php', 1);
 
-			foreach ( $files as $file => $full_path ) {
-				if ( ! preg_match( '|Template Name:(.*)$|mi', file_get_contents( $full_path ), $header ) )
+			foreach ($files as $file => $full_path) {
+				if ( ! preg_match('|Template Name:(.*)$|mi', file_get_contents($full_path), $header))
 					continue;
-				$page_templates[ $file ] = _cleanup_header_comment( $header[1] );
+				$page_templates[$file] = _cleanup_header_comment($header[1]);
 			}
 
-			$this->cache_add( 'page_templates', $page_templates );
+			$this->cache_add('page_templates', $page_templates);
 		}
 
-		if ( $this->load_textdomain() ) {
-			foreach ( $page_templates as &$page_template ) {
-				$page_template = $this->translate_header( 'Template Name', $page_template );
+		if ($this->load_textdomain()) {
+			foreach ($page_templates as &$page_template) {
+				$page_template = $this->translate_header('Template Name', $page_template);
 			}
 		}
 
-		if ( $this->parent() )
-			$page_templates += $this->parent()->get_page_templates( $post );
+		if ($this->parent())
+			$page_templates += $this->parent()->get_page_templates($post);
 
 		/**
 		 * Filter list of page templates for a theme.
@@ -1039,7 +1039,7 @@ 
 		 * @param WP_Theme     $this           The theme object.
 		 * @param WP_Post|null $post           The post being edited, provided for context, or null.
 		 */
-		return (array) apply_filters( 'theme_page_templates', $page_templates, $this, $post );
+		return (array) apply_filters('theme_page_templates', $page_templates, $this, $post);
 	}
 
 	/**
@@ -1061,32 +1061,32 @@ 
 	 * @return array|false Array of files, keyed by the path to the file relative to the `$path` directory prepended
 	 *                     with `$relative_path`, with the values being absolute paths. False otherwise.
 	 */
-	private static function scandir( $path, $extensions = null, $depth = 0, $relative_path = '' ) {
-		if ( ! is_dir( $path ) )
+	private static function scandir($path, $extensions = null, $depth = 0, $relative_path = '') {
+		if ( ! is_dir($path))
 			return false;
 
-		if ( $extensions ) {
+		if ($extensions) {
 			$extensions = (array) $extensions;
-			$_extensions = implode( '|', $extensions );
+			$_extensions = implode('|', $extensions);
 		}
 
-		$relative_path = trailingslashit( $relative_path );
-		if ( '/' == $relative_path )
+		$relative_path = trailingslashit($relative_path);
+		if ('/' == $relative_path)
 			$relative_path = '';
 
-		$results = scandir( $path );
+		$results = scandir($path);
 		$files = array();
 
-		foreach ( $results as $result ) {
-			if ( '.' == $result[0] )
+		foreach ($results as $result) {
+			if ('.' == $result[0])
 				continue;
-			if ( is_dir( $path . '/' . $result ) ) {
-				if ( ! $depth || 'CVS' == $result )
+			if (is_dir($path.'/'.$result)) {
+				if ( ! $depth || 'CVS' == $result)
 					continue;
-				$found = self::scandir( $path . '/' . $result, $extensions, $depth - 1 , $relative_path . $result );
-				$files = array_merge_recursive( $files, $found );
-			} elseif ( ! $extensions || preg_match( '~\.(' . $_extensions . ')$~', $result ) ) {
-				$files[ $relative_path . $result ] = $path . '/' . $result;
+				$found = self::scandir($path.'/'.$result, $extensions, $depth - 1, $relative_path.$result);
+				$files = array_merge_recursive($files, $found);
+			} elseif ( ! $extensions || preg_match('~\.('.$_extensions.')$~', $result)) {
+				$files[$relative_path.$result] = $path.'/'.$result;
 			}
 		}
 
@@ -1106,27 +1106,27 @@ 
 	 * 	False if no textdomain was specified in the file headers, or if the domain could not be loaded.
 	 */
 	public function load_textdomain() {
-		if ( isset( $this->textdomain_loaded ) )
+		if (isset($this->textdomain_loaded))
 			return $this->textdomain_loaded;
 
 		$textdomain = $this->get('TextDomain');
-		if ( ! $textdomain ) {
+		if ( ! $textdomain) {
 			$this->textdomain_loaded = false;
 			return false;
 		}
 
-		if ( is_textdomain_loaded( $textdomain ) ) {
+		if (is_textdomain_loaded($textdomain)) {
 			$this->textdomain_loaded = true;
 			return true;
 		}
 
 		$path = $this->get_stylesheet_directory();
-		if ( $domainpath = $this->get('DomainPath') )
+		if ($domainpath = $this->get('DomainPath'))
 			$path .= $domainpath;
 		else
 			$path .= '/languages';
 
-		$this->textdomain_loaded = load_theme_textdomain( $textdomain, $path );
+		$this->textdomain_loaded = load_theme_textdomain($textdomain, $path);
 		return $this->textdomain_loaded;
 	}
 
@@ -1141,19 +1141,19 @@ 
 	 * @param int $blog_id Optional. Ignored if only network-wide settings are checked. Defaults to current site.
 	 * @return bool Whether the theme is allowed for the network. Returns true in single-site.
 	 */
-	public function is_allowed( $check = 'both', $blog_id = null ) {
-		if ( ! is_multisite() )
+	public function is_allowed($check = 'both', $blog_id = null) {
+		if ( ! is_multisite())
 			return true;
 
-		if ( 'both' == $check || 'network' == $check ) {
+		if ('both' == $check || 'network' == $check) {
 			$allowed = self::get_allowed_on_network();
-			if ( ! empty( $allowed[ $this->get_stylesheet() ] ) )
+			if ( ! empty($allowed[$this->get_stylesheet()]))
 				return true;
 		}
 
-		if ( 'both' == $check || 'site' == $check ) {
-			$allowed = self::get_allowed_on_site( $blog_id );
-			if ( ! empty( $allowed[ $this->get_stylesheet() ] ) )
+		if ('both' == $check || 'site' == $check) {
+			$allowed = self::get_allowed_on_site($blog_id);
+			if ( ! empty($allowed[$this->get_stylesheet()]))
 				return true;
 		}
 
@@ -1168,9 +1168,9 @@ 
 	 * @return WP_Theme|false Object, or false if no theme is installed, which would be bad.
 	 */
 	public static function get_core_default_theme() {
-		foreach ( array_reverse( self::$default_themes ) as $slug => $name ) {
-			$theme = wp_get_theme( $slug );
-			if ( $theme->exists() ) {
+		foreach (array_reverse(self::$default_themes) as $slug => $name) {
+			$theme = wp_get_theme($slug);
+			if ($theme->exists()) {
 				return $theme;
 			}
 		}
@@ -1188,7 +1188,7 @@ 
 	 * @param int $blog_id Optional. ID of the site. Defaults to the current site.
 	 * @return array Array of stylesheet names.
 	 */
-	public static function get_allowed( $blog_id = null ) {
+	public static function get_allowed($blog_id = null) {
 		/**
 		 * Filter the array of themes allowed on the network.
 		 *
@@ -1200,8 +1200,8 @@ 
 		 * @param array $allowed_themes An array of theme stylesheet names.
 		 * @param int   $blog_id        ID of the site.
 		 */
-		$network = (array) apply_filters( 'network_allowed_themes', self::get_allowed_on_network(), $blog_id );
-		return $network + self::get_allowed_on_site( $blog_id );
+		$network = (array) apply_filters('network_allowed_themes', self::get_allowed_on_network(), $blog_id);
+		return $network + self::get_allowed_on_site($blog_id);
 	}
 
 	/**
@@ -1218,8 +1218,8 @@ 
 	 */
 	public static function get_allowed_on_network() {
 		static $allowed_themes;
-		if ( ! isset( $allowed_themes ) ) {
-			$allowed_themes = (array) get_site_option( 'allowedthemes' );
+		if ( ! isset($allowed_themes)) {
+			$allowed_themes = (array) get_site_option('allowedthemes');
 		}
 
 		/**
@@ -1229,7 +1229,7 @@ 
 		 *
 		 * @param array $allowed_themes An array of theme stylesheet names.
 		 */
-		$allowed_themes = apply_filters( 'allowed_themes', $allowed_themes );
+		$allowed_themes = apply_filters('allowed_themes', $allowed_themes);
 
 		return $allowed_themes;
 	}
@@ -1247,13 +1247,13 @@ 
 	 * @param int $blog_id Optional. ID of the site. Defaults to the current site.
 	 * @return array Array of stylesheet names.
 	 */
-	public static function get_allowed_on_site( $blog_id = null ) {
+	public static function get_allowed_on_site($blog_id = null) {
 		static $allowed_themes = array();
 
-		if ( ! $blog_id || ! is_multisite() )
+		if ( ! $blog_id || ! is_multisite())
 			$blog_id = get_current_blog_id();
 
-		if ( isset( $allowed_themes[ $blog_id ] ) ) {
+		if (isset($allowed_themes[$blog_id])) {
 			/**
 			 * Filter the array of themes allowed on the site.
 			 *
@@ -1262,57 +1262,57 @@ 
 			 * @param array $allowed_themes An array of theme stylesheet names.
 			 * @param int   $blog_id        ID of the site. Defaults to current site.
 			 */
-			return (array) apply_filters( 'site_allowed_themes', $allowed_themes[ $blog_id ], $blog_id );
+			return (array) apply_filters('site_allowed_themes', $allowed_themes[$blog_id], $blog_id);
 		}
 
 		$current = $blog_id == get_current_blog_id();
 
-		if ( $current ) {
-			$allowed_themes[ $blog_id ] = get_option( 'allowedthemes' );
+		if ($current) {
+			$allowed_themes[$blog_id] = get_option('allowedthemes');
 		} else {
-			switch_to_blog( $blog_id );
-			$allowed_themes[ $blog_id ] = get_option( 'allowedthemes' );
+			switch_to_blog($blog_id);
+			$allowed_themes[$blog_id] = get_option('allowedthemes');
 			restore_current_blog();
 		}
 
 		// This is all super old MU back compat joy.
 		// 'allowedthemes' keys things by stylesheet. 'allowed_themes' keyed things by name.
-		if ( false === $allowed_themes[ $blog_id ] ) {
-			if ( $current ) {
-				$allowed_themes[ $blog_id ] = get_option( 'allowed_themes' );
+		if (false === $allowed_themes[$blog_id]) {
+			if ($current) {
+				$allowed_themes[$blog_id] = get_option('allowed_themes');
 			} else {
-				switch_to_blog( $blog_id );
-				$allowed_themes[ $blog_id ] = get_option( 'allowed_themes' );
+				switch_to_blog($blog_id);
+				$allowed_themes[$blog_id] = get_option('allowed_themes');
 				restore_current_blog();
 			}
 
-			if ( ! is_array( $allowed_themes[ $blog_id ] ) || empty( $allowed_themes[ $blog_id ] ) ) {
-				$allowed_themes[ $blog_id ] = array();
+			if ( ! is_array($allowed_themes[$blog_id]) || empty($allowed_themes[$blog_id])) {
+				$allowed_themes[$blog_id] = array();
 			} else {
 				$converted = array();
 				$themes = wp_get_themes();
-				foreach ( $themes as $stylesheet => $theme_data ) {
-					if ( isset( $allowed_themes[ $blog_id ][ $theme_data->get('Name') ] ) )
-						$converted[ $stylesheet ] = true;
+				foreach ($themes as $stylesheet => $theme_data) {
+					if (isset($allowed_themes[$blog_id][$theme_data->get('Name')]))
+						$converted[$stylesheet] = true;
 				}
-				$allowed_themes[ $blog_id ] = $converted;
+				$allowed_themes[$blog_id] = $converted;
 			}
 			// Set the option so we never have to go through this pain again.
-			if ( is_admin() && $allowed_themes[ $blog_id ] ) {
-				if ( $current ) {
-					update_option( 'allowedthemes', $allowed_themes[ $blog_id ] );
-					delete_option( 'allowed_themes' );
+			if (is_admin() && $allowed_themes[$blog_id]) {
+				if ($current) {
+					update_option('allowedthemes', $allowed_themes[$blog_id]);
+					delete_option('allowed_themes');
 				} else {
-					switch_to_blog( $blog_id );
-					update_option( 'allowedthemes', $allowed_themes[ $blog_id ] );
-					delete_option( 'allowed_themes' );
+					switch_to_blog($blog_id);
+					update_option('allowedthemes', $allowed_themes[$blog_id]);
+					delete_option('allowed_themes');
 					restore_current_blog();
 				}
 			}
 		}
 
 		/** This filter is documented in wp-includes/class-wp-theme.php */
-		return (array) apply_filters( 'site_allowed_themes', $allowed_themes[ $blog_id ], $blog_id );
+		return (array) apply_filters('site_allowed_themes', $allowed_themes[$blog_id], $blog_id);
 	}
 
 	/**
@@ -1325,11 +1325,11 @@ 
 	 *
 	 * @param array $themes Array of themes to sort, passed by reference.
 	 */
-	public static function sort_by_name( &$themes ) {
-		if ( 0 === strpos( get_locale(), 'en_' ) ) {
-			uasort( $themes, array( 'WP_Theme', '_name_sort' ) );
+	public static function sort_by_name(&$themes) {
+		if (0 === strpos(get_locale(), 'en_')) {
+			uasort($themes, array('WP_Theme', '_name_sort'));
 		} else {
-			uasort( $themes, array( 'WP_Theme', '_name_sort_i18n' ) );
+			uasort($themes, array('WP_Theme', '_name_sort_i18n'));
 		}
 	}
 
@@ -1349,8 +1349,8 @@ 
 	 * @return int Negative if `$a` falls lower in the natural order than `$b`. Zero if they fall equally.
 	 *             Greater than 0 if `$a` falls higher in the natural order than `$b`. Used with usort().
 	 */
-	private static function _name_sort( $a, $b ) {
-		return strnatcasecmp( $a->headers['Name'], $b->headers['Name'] );
+	private static function _name_sort($a, $b) {
+		return strnatcasecmp($a->headers['Name'], $b->headers['Name']);
 	}
 
 	/**
@@ -1366,8 +1366,8 @@ 
 	 * @return int Negative if `$a` falls lower in the natural order than `$b`. Zero if they fall equally.
 	 *             Greater than 0 if `$a` falls higher in the natural order than `$b`. Used with usort().
 	 */
-	private static function _name_sort_i18n( $a, $b ) {
+	private static function _name_sort_i18n($a, $b) {
 		// Don't mark up; Do translate.
-		return strnatcasecmp( $a->display( 'Name', false, true ), $b->display( 'Name', false, true ) );
+		return strnatcasecmp($a->display('Name', false, true), $b->display('Name', false, true));
 	}
 }

Braces +131 added lines, -89 removed lines

@@ -207,8 +207,9 @@ 
 			self::$persistently_cache = apply_filters( 'wp_cache_themes_persistently', false, 'WP_Theme' );
 			if ( self::$persistently_cache ) {
 				wp_cache_add_global_groups( 'themes' );
-				if ( is_int( self::$persistently_cache ) )
-					self::$cache_expiration = self::$persistently_cache;
+				if ( is_int( self::$persistently_cache ) ) {
+									self::$cache_expiration = self::$persistently_cache;
+				}
 			} else {
 				wp_cache_add_non_persistent_groups( 'themes' );
 			}
@@ -230,23 +231,29 @@ 
 
 		if ( is_array( $cache ) ) {
 			foreach ( array( 'errors', 'headers', 'template' ) as $key ) {
-				if ( isset( $cache[ $key ] ) )
-					$this->$key = $cache[ $key ];
+				if ( isset( $cache[ $key ] ) ) {
+									$this->$key = $cache[ $key ];
+				}
+			}
+			if ( $this->errors ) {
+							return;
+			}
+			if ( isset( $cache['theme_root_template'] ) ) {
+							$theme_root_template = $cache['theme_root_template'];
 			}
-			if ( $this->errors )
-				return;
-			if ( isset( $cache['theme_root_template'] ) )
-				$theme_root_template = $cache['theme_root_template'];
 		} elseif ( ! file_exists( $this->theme_root . '/' . $theme_file ) ) {
 			$this->headers['Name'] = $this->stylesheet;
-			if ( ! file_exists( $this->theme_root . '/' . $this->stylesheet ) )
-				$this->errors = new WP_Error( 'theme_not_found', sprintf( __( 'The theme directory "%s" does not exist.' ), esc_html( $this->stylesheet ) ) );
-			else
-				$this->errors = new WP_Error( 'theme_no_stylesheet', __( 'Stylesheet is missing.' ) );
+			if ( ! file_exists( $this->theme_root . '/' . $this->stylesheet ) ) {
+							$this->errors = new WP_Error( 'theme_not_found', sprintf( __( 'The theme directory "%s" does not exist.' ), esc_html( $this->stylesheet ) ) );
+			} else {
+							$this->errors = new WP_Error( 'theme_no_stylesheet', __( 'Stylesheet is missing.' ) );
+			}
 			$this->template = $this->stylesheet;
 			$this->cache_add( 'theme', array( 'headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet, 'template' => $this->template ) );
-			if ( ! file_exists( $this->theme_root ) ) // Don't cache this one.
+			if ( ! file_exists( $this->theme_root ) ) {
+				// Don't cache this one.
 				$this->errors->add( 'theme_root_missing', __( 'ERROR: The themes directory is either empty or doesn’t exist. Please check your installation.' ) );
+			}
 			return;
 		} elseif ( ! is_readable( $this->theme_root . '/' . $theme_file ) ) {
 			$this->headers['Name'] = $this->stylesheet;
@@ -259,8 +266,9 @@ 
 			// Default themes always trump their pretenders.
 			// Properly identify default themes that are inside a directory within wp-content/themes.
 			if ( $default_theme_slug = array_search( $this->headers['Name'], self::$default_themes ) ) {
-				if ( basename( $this->stylesheet ) != $default_theme_slug )
-					$this->headers['Name'] .= '/' . $this->stylesheet;
+				if ( basename( $this->stylesheet ) != $default_theme_slug ) {
+									$this->headers['Name'] .= '/' . $this->stylesheet;
+				}
 			}
 		}
 
@@ -323,8 +331,9 @@ 
 		if ( ! is_array( $cache ) ) {
 			$cache = array( 'headers' => $this->headers, 'errors' => $this->errors, 'stylesheet' => $this->stylesheet, 'template' => $this->template );
 			// If the parent theme is in another root, we'll want to cache this. Avoids an entire branch of filesystem calls above.
-			if ( isset( $theme_root_template ) )
-				$cache['theme_root_template'] = $theme_root_template;
+			if ( isset( $theme_root_template ) ) {
+							$cache['theme_root_template'] = $theme_root_template;
+			}
 			$this->cache_add( 'theme', $cache );
 		}
 	}
@@ -565,8 +574,9 @@ 
 	 * @access public
 	 */
 	public function cache_delete() {
-		foreach ( array( 'theme', 'screenshot', 'headers', 'page_templates' ) as $key )
-			wp_cache_delete( $key . '-' . $this->cache_hash, 'themes' );
+		foreach ( array( 'theme', 'screenshot', 'headers', 'page_templates' ) as $key ) {
+					wp_cache_delete( $key . '-' . $this->cache_hash, 'themes' );
+		}
 		$this->template = $this->textdomain_loaded = $this->theme_root_uri = $this->parent = $this->errors = $this->headers_sanitized = $this->name_translated = null;
 		$this->headers = array();
 		$this->__construct( $this->stylesheet, $this->theme_root );
@@ -590,22 +600,26 @@ 
 	 * @return string|false String on success, false on failure.
 	 */
 	public function get( $header ) {
-		if ( ! isset( $this->headers[ $header ] ) )
-			return false;
+		if ( ! isset( $this->headers[ $header ] ) ) {
+					return false;
+		}
 
 		if ( ! isset( $this->headers_sanitized ) ) {
 			$this->headers_sanitized = $this->cache_get( 'headers' );
-			if ( ! is_array( $this->headers_sanitized ) )
-				$this->headers_sanitized = array();
+			if ( ! is_array( $this->headers_sanitized ) ) {
+							$this->headers_sanitized = array();
+			}
 		}
 
-		if ( isset( $this->headers_sanitized[ $header ] ) )
-			return $this->headers_sanitized[ $header ];
+		if ( isset( $this->headers_sanitized[ $header ] ) ) {
+					return $this->headers_sanitized[ $header ];
+		}
 
 		// If themes are a persistent group, sanitize everything and cache it. One cache add is better than many cache sets.
 		if ( self::$persistently_cache ) {
-			foreach ( array_keys( $this->headers ) as $_header )
-				$this->headers_sanitized[ $_header ] = $this->sanitize_header( $_header, $this->headers[ $_header ] );
+			foreach ( array_keys( $this->headers ) as $_header ) {
+							$this->headers_sanitized[ $_header ] = $this->sanitize_header( $_header, $this->headers[ $_header ] );
+			}
 			$this->cache_add( 'headers', $this->headers_sanitized );
 		} else {
 			$this->headers_sanitized[ $header ] = $this->sanitize_header( $header, $this->headers[ $header ] );
@@ -631,14 +645,17 @@ 
 			return false;
 		}
 
-		if ( $translate && ( empty( $value ) || ! $this->load_textdomain() ) )
-			$translate = false;
+		if ( $translate && ( empty( $value ) || ! $this->load_textdomain() ) ) {
+					$translate = false;
+		}
 
-		if ( $translate )
-			$value = $this->translate_header( $header, $value );
+		if ( $translate ) {
+					$value = $this->translate_header( $header, $value );
+		}
 
-		if ( $markup )
-			$value = $this->markup_header( $header, $value, $translate );
+		if ( $markup ) {
+					$value = $this->markup_header( $header, $value, $translate );
+		}
 
 		return $value;
 	}
@@ -718,8 +735,9 @@ 
 	private function markup_header( $header, $value, $translate ) {
 		switch ( $header ) {
 			case 'Name' :
-				if ( empty( $value ) )
-					$value = $this->get_stylesheet();
+				if ( empty( $value ) ) {
+									$value = $this->get_stylesheet();
+				}
 				break;
 			case 'Description' :
 				$value = wptexturize( $value );
@@ -764,20 +782,23 @@ 
 		switch ( $header ) {
 			case 'Name' :
 				// Cached for sorting reasons.
-				if ( isset( $this->name_translated ) )
-					return $this->name_translated;
+				if ( isset( $this->name_translated ) ) {
+									return $this->name_translated;
+				}
 				$this->name_translated = translate( $value, $this->get('TextDomain' ) );
 				return $this->name_translated;
 			case 'Tags' :
-				if ( empty( $value ) || ! function_exists( 'get_theme_feature_list' ) )
-					return $value;
+				if ( empty( $value ) || ! function_exists( 'get_theme_feature_list' ) ) {
+									return $value;
+				}
 
 				static $tags_list;
 				if ( ! isset( $tags_list ) ) {
 					$tags_list = array();
 					$feature_list = get_theme_feature_list( false ); // No API
-					foreach ( $feature_list as $tags )
-						$tags_list += $tags;
+					foreach ( $feature_list as $tags ) {
+											$tags_list += $tags;
+					}
 				}
 
 				foreach ( $value as &$tag ) {
@@ -838,8 +859,9 @@ 
 	 * @return string Absolute path of the stylesheet directory.
 	 */
 	public function get_stylesheet_directory() {
-		if ( $this->errors() && in_array( 'theme_root_missing', $this->errors()->get_error_codes() ) )
-			return '';
+		if ( $this->errors() && in_array( 'theme_root_missing', $this->errors()->get_error_codes() ) ) {
+					return '';
+		}
 
 		return $this->theme_root . '/' . $this->stylesheet;
 	}
@@ -856,10 +878,11 @@ 
 	 * @return string Absolute path of the template directory.
 	 */
 	public function get_template_directory() {
-		if ( $this->parent() )
-			$theme_root = $this->parent()->theme_root;
-		else
-			$theme_root = $this->theme_root;
+		if ( $this->parent() ) {
+					$theme_root = $this->parent()->theme_root;
+		} else {
+					$theme_root = $this->theme_root;
+		}
 
 		return $theme_root . '/' . $this->template;
 	}
@@ -891,10 +914,11 @@ 
 	 * @return string URL to the template directory.
 	 */
 	public function get_template_directory_uri() {
-		if ( $this->parent() )
-			$theme_root_uri = $this->parent()->get_theme_root_uri();
-		else
-			$theme_root_uri = $this->get_theme_root_uri();
+		if ( $this->parent() ) {
+					$theme_root_uri = $this->parent()->get_theme_root_uri();
+		} else {
+					$theme_root_uri = $this->get_theme_root_uri();
+		}
 
 		return $theme_root_uri . '/' . str_replace( '%2F', '/', rawurlencode( $this->template ) );
 	}
@@ -926,8 +950,9 @@ 
 	 * @return string Theme root URI.
 	 */
 	public function get_theme_root_uri() {
-		if ( ! isset( $this->theme_root_uri ) )
-			$this->theme_root_uri = get_theme_root_uri( $this->stylesheet, $this->theme_root );
+		if ( ! isset( $this->theme_root_uri ) ) {
+					$this->theme_root_uri = get_theme_root_uri( $this->stylesheet, $this->theme_root );
+		}
 		return $this->theme_root_uri;
 	}
 
@@ -948,8 +973,9 @@ 
 	public function get_screenshot( $uri = 'uri' ) {
 		$screenshot = $this->cache_get( 'screenshot' );
 		if ( $screenshot ) {
-			if ( 'relative' == $uri )
-				return $screenshot;
+			if ( 'relative' == $uri ) {
+							return $screenshot;
+			}
 			return $this->get_stylesheet_directory_uri() . '/' . $screenshot;
 		} elseif ( 0 === $screenshot ) {
 			return false;
@@ -958,8 +984,9 @@ 
 		foreach ( array( 'png', 'gif', 'jpg', 'jpeg' ) as $ext ) {
 			if ( file_exists( $this->get_stylesheet_directory() . "/screenshot.$ext" ) ) {
 				$this->cache_add( 'screenshot', 'screenshot.' . $ext );
-				if ( 'relative' == $uri )
-					return 'screenshot.' . $ext;
+				if ( 'relative' == $uri ) {
+									return 'screenshot.' . $ext;
+				}
 				return $this->get_stylesheet_directory_uri() . '/' . 'screenshot.' . $ext;
 			}
 		}
@@ -983,8 +1010,9 @@ 
 	public function get_files( $type = null, $depth = 0, $search_parent = false ) {
 		$files = (array) self::scandir( $this->get_stylesheet_directory(), $type, $depth );
 
-		if ( $search_parent && $this->parent() )
-			$files += (array) self::scandir( $this->get_template_directory(), $type, $depth );
+		if ( $search_parent && $this->parent() ) {
+					$files += (array) self::scandir( $this->get_template_directory(), $type, $depth );
+		}
 
 		return $files;
 	}
@@ -1000,8 +1028,9 @@ 
 	 */
 	public function get_page_templates( $post = null ) {
 		// If you screw up your current theme and we invalidate your parent, most things still work. Let it slide.
-		if ( $this->errors() && $this->errors()->get_error_codes() !== array( 'theme_parent_invalid' ) )
-			return array();
+		if ( $this->errors() && $this->errors()->get_error_codes() !== array( 'theme_parent_invalid' ) ) {
+					return array();
+		}
 
 		$page_templates = $this->cache_get( 'page_templates' );
 
@@ -1011,8 +1040,9 @@ 
 			$files = (array) $this->get_files( 'php', 1 );
 
 			foreach ( $files as $file => $full_path ) {
-				if ( ! preg_match( '|Template Name:(.*)$|mi', file_get_contents( $full_path ), $header ) )
-					continue;
+				if ( ! preg_match( '|Template Name:(.*)$|mi', file_get_contents( $full_path ), $header ) ) {
+									continue;
+				}
 				$page_templates[ $file ] = _cleanup_header_comment( $header[1] );
 			}
 
@@ -1025,8 +1055,9 @@ 
 			}
 		}
 
-		if ( $this->parent() )
-			$page_templates += $this->parent()->get_page_templates( $post );
+		if ( $this->parent() ) {
+					$page_templates += $this->parent()->get_page_templates( $post );
+		}
 
 		/**
 		 * Filter list of page templates for a theme.
@@ -1062,8 +1093,9 @@ 
 	 *                     with `$relative_path`, with the values being absolute paths. False otherwise.
 	 */
 	private static function scandir( $path, $extensions = null, $depth = 0, $relative_path = '' ) {
-		if ( ! is_dir( $path ) )
-			return false;
+		if ( ! is_dir( $path ) ) {
+					return false;
+		}
 
 		if ( $extensions ) {
 			$extensions = (array) $extensions;
@@ -1071,18 +1103,21 @@ 
 		}
 
 		$relative_path = trailingslashit( $relative_path );
-		if ( '/' == $relative_path )
-			$relative_path = '';
+		if ( '/' == $relative_path ) {
+					$relative_path = '';
+		}
 
 		$results = scandir( $path );
 		$files = array();
 
 		foreach ( $results as $result ) {
-			if ( '.' == $result[0] )
-				continue;
+			if ( '.' == $result[0] ) {
+							continue;
+			}
 			if ( is_dir( $path . '/' . $result ) ) {
-				if ( ! $depth || 'CVS' == $result )
-					continue;
+				if ( ! $depth || 'CVS' == $result ) {
+									continue;
+				}
 				$found = self::scandir( $path . '/' . $result, $extensions, $depth - 1 , $relative_path . $result );
 				$files = array_merge_recursive( $files, $found );
 			} elseif ( ! $extensions || preg_match( '~\.(' . $_extensions . ')$~', $result ) ) {
@@ -1106,8 +1141,9 @@ 
 	 * 	False if no textdomain was specified in the file headers, or if the domain could not be loaded.
 	 */
 	public function load_textdomain() {
-		if ( isset( $this->textdomain_loaded ) )
-			return $this->textdomain_loaded;
+		if ( isset( $this->textdomain_loaded ) ) {
+					return $this->textdomain_loaded;
+		}
 
 		$textdomain = $this->get('TextDomain');
 		if ( ! $textdomain ) {
@@ -1121,10 +1157,11 @@ 
 		}
 
 		$path = $this->get_stylesheet_directory();
-		if ( $domainpath = $this->get('DomainPath') )
-			$path .= $domainpath;
-		else
-			$path .= '/languages';
+		if ( $domainpath = $this->get('DomainPath') ) {
+					$path .= $domainpath;
+		} else {
+					$path .= '/languages';
+		}
 
 		$this->textdomain_loaded = load_theme_textdomain( $textdomain, $path );
 		return $this->textdomain_loaded;
@@ -1142,19 +1179,22 @@ 
 	 * @return bool Whether the theme is allowed for the network. Returns true in single-site.
 	 */
 	public function is_allowed( $check = 'both', $blog_id = null ) {
-		if ( ! is_multisite() )
-			return true;
+		if ( ! is_multisite() ) {
+					return true;
+		}
 
 		if ( 'both' == $check || 'network' == $check ) {
 			$allowed = self::get_allowed_on_network();
-			if ( ! empty( $allowed[ $this->get_stylesheet() ] ) )
-				return true;
+			if ( ! empty( $allowed[ $this->get_stylesheet() ] ) ) {
+							return true;
+			}
 		}
 
 		if ( 'both' == $check || 'site' == $check ) {
 			$allowed = self::get_allowed_on_site( $blog_id );
-			if ( ! empty( $allowed[ $this->get_stylesheet() ] ) )
-				return true;
+			if ( ! empty( $allowed[ $this->get_stylesheet() ] ) ) {
+							return true;
+			}
 		}
 
 		return false;
@@ -1250,8 +1290,9 @@ 
 	public static function get_allowed_on_site( $blog_id = null ) {
 		static $allowed_themes = array();
 
-		if ( ! $blog_id || ! is_multisite() )
-			$blog_id = get_current_blog_id();
+		if ( ! $blog_id || ! is_multisite() ) {
+					$blog_id = get_current_blog_id();
+		}
 
 		if ( isset( $allowed_themes[ $blog_id ] ) ) {
 			/**
@@ -1292,8 +1333,9 @@ 
 				$converted = array();
 				$themes = wp_get_themes();
 				foreach ( $themes as $stylesheet => $theme_data ) {
-					if ( isset( $allowed_themes[ $blog_id ][ $theme_data->get('Name') ] ) )
-						$converted[ $stylesheet ] = true;
+					if ( isset( $allowed_themes[ $blog_id ][ $theme_data->get('Name') ] ) ) {
+											$converted[ $stylesheet ] = true;
+					}
 				}
 				$allowed_themes[ $blog_id ] = $converted;
 			}

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

Doc Comments +1 added lines, -1 removed lines

@@ -183,7 +183,7 @@
 	 * @access public
 	 *
 	 * @param string $name Property to check if set.
-	 * @return bool Whether the property is set.
+	 * @return boolean|null Whether the property is set.
 	 */
 	public function __isset( $name ) {
 		if ( in_array( $name, $this->compat_fields ) ) {

Spacing +164 added lines, -164 removed lines

@@ -61,7 +61,7 @@ 
 	 */
 	public $request;
 
-	private $compat_fields = array( 'results', 'total_users' );
+	private $compat_fields = array('results', 'total_users');
 
 	// SQL clauses
 	public $query_fields;
@@ -77,9 +77,9 @@ 
 	 *
 	 * @param null|string|array $query Optional. The query variables.
 	 */
-	public function __construct( $query = null ) {
-		if ( ! empty( $query ) ) {
-			$this->prepare_query( $query );
+	public function __construct($query = null) {
+		if ( ! empty($query)) {
+			$this->prepare_query($query);
 			$this->query();
 		}
 	}
@@ -93,7 +93,7 @@ 
 	 * @param array $args Query vars, as passed to `WP_User_Query`.
 	 * @return array Complete query variables with undefined ones filled in with defaults.
 	 */
-	public static function fill_query_vars( $args ) {
+	public static function fill_query_vars($args) {
 		$defaults = array(
 			'blog_id' => $GLOBALS['blog_id'],
 			'role' => '',
@@ -117,7 +117,7 @@ 
 			'has_published_posts' => null,
 		);
 
-		return wp_parse_args( $args, $defaults );
+		return wp_parse_args($args, $defaults);
 	}
 
 	/**
@@ -197,12 +197,12 @@ 
 	 *                                             public post types.
 	 * }
 	 */
-	public function prepare_query( $query = array() ) {
+	public function prepare_query($query = array()) {
 		global $wpdb;
 
-		if ( empty( $this->query_vars ) || ! empty( $query ) ) {
+		if (empty($this->query_vars) || ! empty($query)) {
 			$this->query_limit = null;
-			$this->query_vars = $this->fill_query_vars( $query );
+			$this->query_vars = $this->fill_query_vars($query);
 		}
 
 		/**
@@ -216,99 +216,99 @@ 
 		 * @param WP_User_Query $this The current WP_User_Query instance,
 		 *                            passed by reference.
 		 */
-		do_action( 'pre_get_users', $this );
+		do_action('pre_get_users', $this);
 
 		// Ensure that query vars are filled after 'pre_get_users'.
-		$qv =& $this->query_vars;
-		$qv =  $this->fill_query_vars( $qv );
+		$qv = & $this->query_vars;
+		$qv = $this->fill_query_vars($qv);
 
-		if ( is_array( $qv['fields'] ) ) {
-			$qv['fields'] = array_unique( $qv['fields'] );
+		if (is_array($qv['fields'])) {
+			$qv['fields'] = array_unique($qv['fields']);
 
 			$this->query_fields = array();
-			foreach ( $qv['fields'] as $field ) {
-				$field = 'ID' === $field ? 'ID' : sanitize_key( $field );
+			foreach ($qv['fields'] as $field) {
+				$field = 'ID' === $field ? 'ID' : sanitize_key($field);
 				$this->query_fields[] = "$wpdb->users.$field";
 			}
-			$this->query_fields = implode( ',', $this->query_fields );
-		} elseif ( 'all' == $qv['fields'] ) {
+			$this->query_fields = implode(',', $this->query_fields);
+		} elseif ('all' == $qv['fields']) {
 			$this->query_fields = "$wpdb->users.*";
 		} else {
 			$this->query_fields = "$wpdb->users.ID";
 		}
 
-		if ( isset( $qv['count_total'] ) && $qv['count_total'] )
-			$this->query_fields = 'SQL_CALC_FOUND_ROWS ' . $this->query_fields;
+		if (isset($qv['count_total']) && $qv['count_total'])
+			$this->query_fields = 'SQL_CALC_FOUND_ROWS '.$this->query_fields;
 
 		$this->query_from = "FROM $wpdb->users";
 		$this->query_where = "WHERE 1=1";
 
 		// Parse and sanitize 'include', for use by 'orderby' as well as 'include' below.
-		if ( ! empty( $qv['include'] ) ) {
-			$include = wp_parse_id_list( $qv['include'] );
+		if ( ! empty($qv['include'])) {
+			$include = wp_parse_id_list($qv['include']);
 		} else {
 			$include = false;
 		}
 
 		$blog_id = 0;
-		if ( isset( $qv['blog_id'] ) ) {
-			$blog_id = absint( $qv['blog_id'] );
+		if (isset($qv['blog_id'])) {
+			$blog_id = absint($qv['blog_id']);
 		}
 
-		if ( isset( $qv['who'] ) && 'authors' == $qv['who'] && $blog_id ) {
-			$qv['meta_key'] = $wpdb->get_blog_prefix( $blog_id ) . 'user_level';
+		if (isset($qv['who']) && 'authors' == $qv['who'] && $blog_id) {
+			$qv['meta_key'] = $wpdb->get_blog_prefix($blog_id).'user_level';
 			$qv['meta_value'] = 0;
 			$qv['meta_compare'] = '!=';
 			$qv['blog_id'] = $blog_id = 0; // Prevent extra meta query
 		}
 
-		if ( $qv['has_published_posts'] && $blog_id ) {
-			if ( true === $qv['has_published_posts'] ) {
-				$post_types = get_post_types( array( 'public' => true ) );
+		if ($qv['has_published_posts'] && $blog_id) {
+			if (true === $qv['has_published_posts']) {
+				$post_types = get_post_types(array('public' => true));
 			} else {
 				$post_types = (array) $qv['has_published_posts'];
 			}
 
-			foreach ( $post_types as &$post_type ) {
-				$post_type = $wpdb->prepare( '%s', $post_type );
+			foreach ($post_types as &$post_type) {
+				$post_type = $wpdb->prepare('%s', $post_type);
 			}
 
-			$posts_table = $wpdb->get_blog_prefix( $blog_id ) . 'posts';
-			$this->query_where .= " AND $wpdb->users.ID IN ( SELECT DISTINCT $posts_table.post_author FROM $posts_table WHERE $posts_table.post_status = 'publish' AND $posts_table.post_type IN ( " . join( ", ", $post_types ) . " ) )";
+			$posts_table = $wpdb->get_blog_prefix($blog_id).'posts';
+			$this->query_where .= " AND $wpdb->users.ID IN ( SELECT DISTINCT $posts_table.post_author FROM $posts_table WHERE $posts_table.post_status = 'publish' AND $posts_table.post_type IN ( ".join(", ", $post_types)." ) )";
 		}
 
 		// Meta query.
 		$this->meta_query = new WP_Meta_Query();
-		$this->meta_query->parse_query_vars( $qv );
+		$this->meta_query->parse_query_vars($qv);
 
 		$roles = array();
-		if ( isset( $qv['role'] ) ) {
-			if ( is_array( $qv['role'] ) ) {
+		if (isset($qv['role'])) {
+			if (is_array($qv['role'])) {
 				$roles = $qv['role'];
-			} elseif ( is_string( $qv['role'] ) && ! empty( $qv['role'] ) ) {
-				$roles = array_map( 'trim', explode( ',', $qv['role'] ) );
+			} elseif (is_string($qv['role']) && ! empty($qv['role'])) {
+				$roles = array_map('trim', explode(',', $qv['role']));
 			}
 		}
 
 		$role__in = array();
-		if ( isset( $qv['role__in'] ) ) {
+		if (isset($qv['role__in'])) {
 			$role__in = (array) $qv['role__in'];
 		}
 
 		$role__not_in = array();
-		if ( isset( $qv['role__not_in'] ) ) {
+		if (isset($qv['role__not_in'])) {
 			$role__not_in = (array) $qv['role__not_in'];
 		}
 
-		if ( $blog_id && ( ! empty( $roles ) || ! empty( $role__in ) || ! empty( $role__not_in ) || is_multisite() ) ) {
+		if ($blog_id && ( ! empty($roles) || ! empty($role__in) || ! empty($role__not_in) || is_multisite())) {
 			$role_queries  = array();
 
-			$roles_clauses = array( 'relation' => 'AND' );
-			if ( ! empty( $roles ) ) {
-				foreach ( $roles as $role ) {
+			$roles_clauses = array('relation' => 'AND');
+			if ( ! empty($roles)) {
+				foreach ($roles as $role) {
 					$roles_clauses[] = array(
-						'key'     => $wpdb->get_blog_prefix( $blog_id ) . 'capabilities',
-						'value'   => '"' . $role . '"',
+						'key'     => $wpdb->get_blog_prefix($blog_id).'capabilities',
+						'value'   => '"'.$role.'"',
 						'compare' => 'LIKE',
 					);
 				}
@@ -316,12 +316,12 @@ 
 				$role_queries[] = $roles_clauses;
 			}
 
-			$role__in_clauses = array( 'relation' => 'OR' );
-			if ( ! empty( $role__in ) ) {
-				foreach ( $role__in as $role ) {
+			$role__in_clauses = array('relation' => 'OR');
+			if ( ! empty($role__in)) {
+				foreach ($role__in as $role) {
 					$role__in_clauses[] = array(
-						'key'     => $wpdb->get_blog_prefix( $blog_id ) . 'capabilities',
-						'value'   => '"' . $role . '"',
+						'key'     => $wpdb->get_blog_prefix($blog_id).'capabilities',
+						'value'   => '"'.$role.'"',
 						'compare' => 'LIKE',
 					);
 				}
@@ -329,12 +329,12 @@ 
 				$role_queries[] = $role__in_clauses;
 			}
 
-			$role__not_in_clauses = array( 'relation' => 'AND' );
-			if ( ! empty( $role__not_in ) ) {
-				foreach ( $role__not_in as $role ) {
+			$role__not_in_clauses = array('relation' => 'AND');
+			if ( ! empty($role__not_in)) {
+				foreach ($role__not_in as $role) {
 					$role__not_in_clauses[] = array(
-						'key'     => $wpdb->get_blog_prefix( $blog_id ) . 'capabilities',
-						'value'   => '"' . $role . '"',
+						'key'     => $wpdb->get_blog_prefix($blog_id).'capabilities',
+						'value'   => '"'.$role.'"',
 						'compare' => 'NOT LIKE',
 					);
 				}
@@ -343,9 +343,9 @@ 
 			}
 
 			// If there are no specific roles named, make sure the user is a member of the site.
-			if ( empty( $role_queries ) ) {
+			if (empty($role_queries)) {
 				$role_queries[] = array(
-					'key' => $wpdb->get_blog_prefix( $blog_id ) . 'capabilities',
+					'key' => $wpdb->get_blog_prefix($blog_id).'capabilities',
 					'compare' => 'EXISTS',
 				);
 			}
@@ -353,50 +353,50 @@ 
 			// Specify that role queries should be joined with AND.
 			$role_queries['relation'] = 'AND';
 
-			if ( empty( $this->meta_query->queries ) ) {
+			if (empty($this->meta_query->queries)) {
 				$this->meta_query->queries = $role_queries;
 			} else {
 				// Append the cap query to the original queries and reparse the query.
 				$this->meta_query->queries = array(
 					'relation' => 'AND',
-					array( $this->meta_query->queries, $role_queries ),
+					array($this->meta_query->queries, $role_queries),
 				);
 			}
 
-			$this->meta_query->parse_query_vars( $this->meta_query->queries );
+			$this->meta_query->parse_query_vars($this->meta_query->queries);
 		}
 
-		if ( ! empty( $this->meta_query->queries ) ) {
-			$clauses = $this->meta_query->get_sql( 'user', $wpdb->users, 'ID', $this );
+		if ( ! empty($this->meta_query->queries)) {
+			$clauses = $this->meta_query->get_sql('user', $wpdb->users, 'ID', $this);
 			$this->query_from .= $clauses['join'];
 			$this->query_where .= $clauses['where'];
 
-			if ( $this->meta_query->has_or_relation() ) {
-				$this->query_fields = 'DISTINCT ' . $this->query_fields;
+			if ($this->meta_query->has_or_relation()) {
+				$this->query_fields = 'DISTINCT '.$this->query_fields;
 			}
 		}
 
 		// sorting
-		$qv['order'] = isset( $qv['order'] ) ? strtoupper( $qv['order'] ) : '';
-		$order = $this->parse_order( $qv['order'] );
+		$qv['order'] = isset($qv['order']) ? strtoupper($qv['order']) : '';
+		$order = $this->parse_order($qv['order']);
 
-		if ( empty( $qv['orderby'] ) ) {
+		if (empty($qv['orderby'])) {
 			// Default order is by 'user_login'.
-			$ordersby = array( 'user_login' => $order );
-		} elseif ( is_array( $qv['orderby'] ) ) {
+			$ordersby = array('user_login' => $order);
+		} elseif (is_array($qv['orderby'])) {
 			$ordersby = $qv['orderby'];
 		} else {
 			// 'orderby' values may be a comma- or space-separated list.
-			$ordersby = preg_split( '/[,\s]+/', $qv['orderby'] );
+			$ordersby = preg_split('/[,\s]+/', $qv['orderby']);
 		}
 
 		$orderby_array = array();
-		foreach ( $ordersby as $_key => $_value ) {
-			if ( ! $_value ) {
+		foreach ($ordersby as $_key => $_value) {
+			if ( ! $_value) {
 				continue;
 			}
 
-			if ( is_int( $_key ) ) {
+			if (is_int($_key)) {
 				// Integer key means this is a flat array of 'orderby' fields.
 				$_orderby = $_value;
 				$_order = $order;
@@ -406,58 +406,58 @@ 
 				$_order = $_value;
 			}
 
-			$parsed = $this->parse_orderby( $_orderby );
+			$parsed = $this->parse_orderby($_orderby);
 
-			if ( ! $parsed ) {
+			if ( ! $parsed) {
 				continue;
 			}
 
-			$orderby_array[] = $parsed . ' ' . $this->parse_order( $_order );
+			$orderby_array[] = $parsed.' '.$this->parse_order($_order);
 		}
 
 		// If no valid clauses were found, order by user_login.
-		if ( empty( $orderby_array ) ) {
+		if (empty($orderby_array)) {
 			$orderby_array[] = "user_login $order";
 		}
 
-		$this->query_orderby = 'ORDER BY ' . implode( ', ', $orderby_array );
+		$this->query_orderby = 'ORDER BY '.implode(', ', $orderby_array);
 
 		// limit
-		if ( isset( $qv['number'] ) && $qv['number'] > 0 ) {
-			if ( $qv['offset'] ) {
+		if (isset($qv['number']) && $qv['number'] > 0) {
+			if ($qv['offset']) {
 				$this->query_limit = $wpdb->prepare("LIMIT %d, %d", $qv['offset'], $qv['number']);
 			} else {
-				$this->query_limit = $wpdb->prepare( "LIMIT %d, %d", $qv['number'] * ( $qv['paged'] - 1 ), $qv['number'] );
+				$this->query_limit = $wpdb->prepare("LIMIT %d, %d", $qv['number'] * ($qv['paged'] - 1), $qv['number']);
 			}
 		}
 
 		$search = '';
-		if ( isset( $qv['search'] ) )
-			$search = trim( $qv['search'] );
+		if (isset($qv['search']))
+			$search = trim($qv['search']);
 
-		if ( $search ) {
-			$leading_wild = ( ltrim($search, '*') != $search );
-			$trailing_wild = ( rtrim($search, '*') != $search );
-			if ( $leading_wild && $trailing_wild )
+		if ($search) {
+			$leading_wild = (ltrim($search, '*') != $search);
+			$trailing_wild = (rtrim($search, '*') != $search);
+			if ($leading_wild && $trailing_wild)
 				$wild = 'both';
-			elseif ( $leading_wild )
+			elseif ($leading_wild)
 				$wild = 'leading';
-			elseif ( $trailing_wild )
+			elseif ($trailing_wild)
 				$wild = 'trailing';
 			else
 				$wild = false;
-			if ( $wild )
+			if ($wild)
 				$search = trim($search, '*');
 
 			$search_columns = array();
-			if ( $qv['search_columns'] )
-				$search_columns = array_intersect( $qv['search_columns'], array( 'ID', 'user_login', 'user_email', 'user_url', 'user_nicename' ) );
-			if ( ! $search_columns ) {
-				if ( false !== strpos( $search, '@') )
+			if ($qv['search_columns'])
+				$search_columns = array_intersect($qv['search_columns'], array('ID', 'user_login', 'user_email', 'user_url', 'user_nicename'));
+			if ( ! $search_columns) {
+				if (false !== strpos($search, '@'))
 					$search_columns = array('user_email');
-				elseif ( is_numeric($search) )
+				elseif (is_numeric($search))
 					$search_columns = array('user_login', 'ID');
-				elseif ( preg_match('|^https?://|', $search) && ! ( is_multisite() && wp_is_large_network( 'users' ) ) )
+				elseif (preg_match('|^https?://|', $search) && ! (is_multisite() && wp_is_large_network('users')))
 					$search_columns = array('user_url');
 				else
 					$search_columns = array('user_login', 'user_url', 'user_email', 'user_nicename', 'display_name');
@@ -475,23 +475,23 @@ 
 			 * @param string        $search         Text being searched.
 			 * @param WP_User_Query $this           The current WP_User_Query instance.
 			 */
-			$search_columns = apply_filters( 'user_search_columns', $search_columns, $search, $this );
+			$search_columns = apply_filters('user_search_columns', $search_columns, $search, $this);
 
-			$this->query_where .= $this->get_search_sql( $search, $search_columns, $wild );
+			$this->query_where .= $this->get_search_sql($search, $search_columns, $wild);
 		}
 
-		if ( ! empty( $include ) ) {
+		if ( ! empty($include)) {
 			// Sanitized earlier.
-			$ids = implode( ',', $include );
+			$ids = implode(',', $include);
 			$this->query_where .= " AND $wpdb->users.ID IN ($ids)";
-		} elseif ( ! empty( $qv['exclude'] ) ) {
-			$ids = implode( ',', wp_parse_id_list( $qv['exclude'] ) );
+		} elseif ( ! empty($qv['exclude'])) {
+			$ids = implode(',', wp_parse_id_list($qv['exclude']));
 			$this->query_where .= " AND $wpdb->users.ID NOT IN ($ids)";
 		}
 
 		// Date queries are allowed for the user_registered field.
-		if ( ! empty( $qv['date_query'] ) && is_array( $qv['date_query'] ) ) {
-			$date_query = new WP_Date_Query( $qv['date_query'], 'user_registered' );
+		if ( ! empty($qv['date_query']) && is_array($qv['date_query'])) {
+			$date_query = new WP_Date_Query($qv['date_query'], 'user_registered');
 			$this->query_where .= $date_query->get_sql();
 		}
 
@@ -507,7 +507,7 @@ 
 		 * @param WP_User_Query $this The current WP_User_Query instance,
 		 *                            passed by reference.
 		 */
-		do_action_ref_array( 'pre_user_query', array( &$this ) );
+		do_action_ref_array('pre_user_query', array(&$this));
 	}
 
 	/**
@@ -520,14 +520,14 @@ 
 	public function query() {
 		global $wpdb;
 
-		$qv =& $this->query_vars;
+		$qv = & $this->query_vars;
 
 		$this->request = "SELECT $this->query_fields $this->query_from $this->query_where $this->query_orderby $this->query_limit";
 
-		if ( is_array( $qv['fields'] ) || 'all' == $qv['fields'] ) {
-			$this->results = $wpdb->get_results( $this->request );
+		if (is_array($qv['fields']) || 'all' == $qv['fields']) {
+			$this->results = $wpdb->get_results($this->request);
 		} else {
-			$this->results = $wpdb->get_col( $this->request );
+			$this->results = $wpdb->get_col($this->request);
 		}
 
 		/**
@@ -539,23 +539,23 @@ 
 		 *
 		 * @param string $sql The SELECT FOUND_ROWS() query for the current WP_User_Query.
 		 */
-		if ( isset( $qv['count_total'] ) && $qv['count_total'] )
-			$this->total_users = $wpdb->get_var( apply_filters( 'found_users_query', 'SELECT FOUND_ROWS()' ) );
+		if (isset($qv['count_total']) && $qv['count_total'])
+			$this->total_users = $wpdb->get_var(apply_filters('found_users_query', 'SELECT FOUND_ROWS()'));
 
-		if ( !$this->results )
+		if ( ! $this->results)
 			return;
 
-		if ( 'all_with_meta' == $qv['fields'] ) {
-			cache_users( $this->results );
+		if ('all_with_meta' == $qv['fields']) {
+			cache_users($this->results);
 
 			$r = array();
-			foreach ( $this->results as $userid )
-				$r[ $userid ] = new WP_User( $userid, '', $qv['blog_id'] );
+			foreach ($this->results as $userid)
+				$r[$userid] = new WP_User($userid, '', $qv['blog_id']);
 
 			$this->results = $r;
-		} elseif ( 'all' == $qv['fields'] ) {
-			foreach ( $this->results as $key => $user ) {
-				$this->results[ $key ] = new WP_User( $user, '', $qv['blog_id'] );
+		} elseif ('all' == $qv['fields']) {
+			foreach ($this->results as $key => $user) {
+				$this->results[$key] = new WP_User($user, '', $qv['blog_id']);
 			}
 		}
 	}
@@ -569,8 +569,8 @@ 
 	 * @param string $query_var Query variable key.
 	 * @return mixed
 	 */
-	public function get( $query_var ) {
-		if ( isset( $this->query_vars[$query_var] ) )
+	public function get($query_var) {
+		if (isset($this->query_vars[$query_var]))
 			return $this->query_vars[$query_var];
 
 		return null;
@@ -585,7 +585,7 @@ 
 	 * @param string $query_var Query variable key.
 	 * @param mixed $value Query variable value.
 	 */
-	public function set( $query_var, $value ) {
+	public function set($query_var, $value) {
 		$this->query_vars[$query_var] = $value;
 	}
 
@@ -603,23 +603,23 @@ 
 	 *                       Single site allows leading and trailing wildcards, Network Admin only trailing.
 	 * @return string
 	 */
-	protected function get_search_sql( $string, $cols, $wild = false ) {
+	protected function get_search_sql($string, $cols, $wild = false) {
 		global $wpdb;
 
 		$searches = array();
-		$leading_wild = ( 'leading' == $wild || 'both' == $wild ) ? '%' : '';
-		$trailing_wild = ( 'trailing' == $wild || 'both' == $wild ) ? '%' : '';
-		$like = $leading_wild . $wpdb->esc_like( $string ) . $trailing_wild;
+		$leading_wild = ('leading' == $wild || 'both' == $wild) ? '%' : '';
+		$trailing_wild = ('trailing' == $wild || 'both' == $wild) ? '%' : '';
+		$like = $leading_wild.$wpdb->esc_like($string).$trailing_wild;
 
-		foreach ( $cols as $col ) {
-			if ( 'ID' == $col ) {
-				$searches[] = $wpdb->prepare( "$col = %s", $string );
+		foreach ($cols as $col) {
+			if ('ID' == $col) {
+				$searches[] = $wpdb->prepare("$col = %s", $string);
 			} else {
-				$searches[] = $wpdb->prepare( "$col LIKE %s", $like );
+				$searches[] = $wpdb->prepare("$col LIKE %s", $like);
 			}
 		}
 
-		return ' AND (' . implode(' OR ', $searches) . ')';
+		return ' AND ('.implode(' OR ', $searches).')';
 	}
 
 	/**
@@ -657,21 +657,21 @@ 
 	 * @param string $orderby Alias for the field to order by.
 	 * @return string Value to used in the ORDER clause, if `$orderby` is valid.
 	 */
-	protected function parse_orderby( $orderby ) {
+	protected function parse_orderby($orderby) {
 		global $wpdb;
 
 		$meta_query_clauses = $this->meta_query->get_clauses();
 
 		$_orderby = '';
-		if ( in_array( $orderby, array( 'login', 'nicename', 'email', 'url', 'registered' ) ) ) {
-			$_orderby = 'user_' . $orderby;
-		} elseif ( in_array( $orderby, array( 'user_login', 'user_nicename', 'user_email', 'user_url', 'user_registered' ) ) ) {
+		if (in_array($orderby, array('login', 'nicename', 'email', 'url', 'registered'))) {
+			$_orderby = 'user_'.$orderby;
+		} elseif (in_array($orderby, array('user_login', 'user_nicename', 'user_email', 'user_url', 'user_registered'))) {
 			$_orderby = $orderby;
-		} elseif ( 'name' == $orderby || 'display_name' == $orderby ) {
+		} elseif ('name' == $orderby || 'display_name' == $orderby) {
 			$_orderby = 'display_name';
-		} elseif ( 'post_count' == $orderby ) {
+		} elseif ('post_count' == $orderby) {
 			// todo: avoid the JOIN
-			$where = get_posts_by_author_sql( 'post' );
+			$where = get_posts_by_author_sql('post');
 			$this->query_from .= " LEFT OUTER JOIN (
 				SELECT post_author, COUNT(*) as post_count
 				FROM $wpdb->posts
@@ -680,19 +680,19 @@ 
 			) p ON ({$wpdb->users}.ID = p.post_author)
 			";
 			$_orderby = 'post_count';
-		} elseif ( 'ID' == $orderby || 'id' == $orderby ) {
+		} elseif ('ID' == $orderby || 'id' == $orderby) {
 			$_orderby = 'ID';
-		} elseif ( 'meta_value' == $orderby || $this->get( 'meta_key' ) == $orderby ) {
+		} elseif ('meta_value' == $orderby || $this->get('meta_key') == $orderby) {
 			$_orderby = "$wpdb->usermeta.meta_value";
-		} elseif ( 'meta_value_num' == $orderby ) {
+		} elseif ('meta_value_num' == $orderby) {
 			$_orderby = "$wpdb->usermeta.meta_value+0";
-		} elseif ( 'include' === $orderby && ! empty( $this->query_vars['include'] ) ) {
-			$include = wp_parse_id_list( $this->query_vars['include'] );
-			$include_sql = implode( ',', $include );
+		} elseif ('include' === $orderby && ! empty($this->query_vars['include'])) {
+			$include = wp_parse_id_list($this->query_vars['include']);
+			$include_sql = implode(',', $include);
 			$_orderby = "FIELD( $wpdb->users.ID, $include_sql )";
-		} elseif ( isset( $meta_query_clauses[ $orderby ] ) ) {
-			$meta_clause = $meta_query_clauses[ $orderby ];
-			$_orderby = sprintf( "CAST(%s.meta_value AS %s)", esc_sql( $meta_clause['alias'] ), esc_sql( $meta_clause['cast'] ) );
+		} elseif (isset($meta_query_clauses[$orderby])) {
+			$meta_clause = $meta_query_clauses[$orderby];
+			$_orderby = sprintf("CAST(%s.meta_value AS %s)", esc_sql($meta_clause['alias']), esc_sql($meta_clause['cast']));
 		}
 
 		return $_orderby;
@@ -707,12 +707,12 @@ 
 	 * @param string $order The 'order' query variable.
 	 * @return string The sanitized 'order' query variable.
 	 */
-	protected function parse_order( $order ) {
-		if ( ! is_string( $order ) || empty( $order ) ) {
+	protected function parse_order($order) {
+		if ( ! is_string($order) || empty($order)) {
 			return 'DESC';
 		}
 
-		if ( 'ASC' === strtoupper( $order ) ) {
+		if ('ASC' === strtoupper($order)) {
 			return 'ASC';
 		} else {
 			return 'DESC';
@@ -728,8 +728,8 @@ 
 	 * @param string $name Property to get.
 	 * @return mixed Property.
 	 */
-	public function __get( $name ) {
-		if ( in_array( $name, $this->compat_fields ) ) {
+	public function __get($name) {
+		if (in_array($name, $this->compat_fields)) {
 			return $this->$name;
 		}
 	}
@@ -744,8 +744,8 @@ 
 	 * @param mixed  $value Property value.
 	 * @return mixed Newly-set property.
 	 */
-	public function __set( $name, $value ) {
-		if ( in_array( $name, $this->compat_fields ) ) {
+	public function __set($name, $value) {
+		if (in_array($name, $this->compat_fields)) {
 			return $this->$name = $value;
 		}
 	}
@@ -759,9 +759,9 @@ 
 	 * @param string $name Property to check if set.
 	 * @return bool Whether the property is set.
 	 */
-	public function __isset( $name ) {
-		if ( in_array( $name, $this->compat_fields ) ) {
-			return isset( $this->$name );
+	public function __isset($name) {
+		if (in_array($name, $this->compat_fields)) {
+			return isset($this->$name);
 		}
 	}
 
@@ -773,9 +773,9 @@ 
 	 *
 	 * @param string $name Property to unset.
 	 */
-	public function __unset( $name ) {
-		if ( in_array( $name, $this->compat_fields ) ) {
-			unset( $this->$name );
+	public function __unset($name) {
+		if (in_array($name, $this->compat_fields)) {
+			unset($this->$name);
 		}
 	}
 
@@ -789,9 +789,9 @@ 
 	 * @param array    $arguments Arguments to pass when calling.
 	 * @return mixed Return value of the callback, false otherwise.
 	 */
-	public function __call( $name, $arguments ) {
-		if ( 'get_search_sql' === $name ) {
-			return call_user_func_array( array( $this, $name ), $arguments );
+	public function __call($name, $arguments) {
+		if ('get_search_sql' === $name) {
+			return call_user_func_array(array($this, $name), $arguments);
 		}
 		return false;
 	}

Braces +42 added lines, -32 removed lines

@@ -237,8 +237,9 @@ 
 			$this->query_fields = "$wpdb->users.ID";
 		}
 
-		if ( isset( $qv['count_total'] ) && $qv['count_total'] )
-			$this->query_fields = 'SQL_CALC_FOUND_ROWS ' . $this->query_fields;
+		if ( isset( $qv['count_total'] ) && $qv['count_total'] ) {
+					$this->query_fields = 'SQL_CALC_FOUND_ROWS ' . $this->query_fields;
+		}
 
 		$this->query_from = "FROM $wpdb->users";
 		$this->query_where = "WHERE 1=1";
@@ -432,35 +433,40 @@ 
 		}
 
 		$search = '';
-		if ( isset( $qv['search'] ) )
-			$search = trim( $qv['search'] );
+		if ( isset( $qv['search'] ) ) {
+					$search = trim( $qv['search'] );
+		}
 
 		if ( $search ) {
 			$leading_wild = ( ltrim($search, '*') != $search );
 			$trailing_wild = ( rtrim($search, '*') != $search );
-			if ( $leading_wild && $trailing_wild )
-				$wild = 'both';
-			elseif ( $leading_wild )
-				$wild = 'leading';
-			elseif ( $trailing_wild )
-				$wild = 'trailing';
-			else
-				$wild = false;
-			if ( $wild )
-				$search = trim($search, '*');
+			if ( $leading_wild && $trailing_wild ) {
+							$wild = 'both';
+			} elseif ( $leading_wild ) {
+							$wild = 'leading';
+			} elseif ( $trailing_wild ) {
+							$wild = 'trailing';
+			} else {
+							$wild = false;
+			}
+			if ( $wild ) {
+							$search = trim($search, '*');
+			}
 
 			$search_columns = array();
-			if ( $qv['search_columns'] )
-				$search_columns = array_intersect( $qv['search_columns'], array( 'ID', 'user_login', 'user_email', 'user_url', 'user_nicename' ) );
+			if ( $qv['search_columns'] ) {
+							$search_columns = array_intersect( $qv['search_columns'], array( 'ID', 'user_login', 'user_email', 'user_url', 'user_nicename' ) );
+			}
 			if ( ! $search_columns ) {
-				if ( false !== strpos( $search, '@') )
-					$search_columns = array('user_email');
-				elseif ( is_numeric($search) )
-					$search_columns = array('user_login', 'ID');
-				elseif ( preg_match('|^https?://|', $search) && ! ( is_multisite() && wp_is_large_network( 'users' ) ) )
-					$search_columns = array('user_url');
-				else
-					$search_columns = array('user_login', 'user_url', 'user_email', 'user_nicename', 'display_name');
+				if ( false !== strpos( $search, '@') ) {
+									$search_columns = array('user_email');
+				} elseif ( is_numeric($search) ) {
+									$search_columns = array('user_login', 'ID');
+				} elseif ( preg_match('|^https?://|', $search) && ! ( is_multisite() && wp_is_large_network( 'users' ) ) ) {
+									$search_columns = array('user_url');
+				} else {
+									$search_columns = array('user_login', 'user_url', 'user_email', 'user_nicename', 'display_name');
+				}
 			}
 
 			/**
@@ -539,18 +545,21 @@ 
 		 *
 		 * @param string $sql The SELECT FOUND_ROWS() query for the current WP_User_Query.
 		 */
-		if ( isset( $qv['count_total'] ) && $qv['count_total'] )
-			$this->total_users = $wpdb->get_var( apply_filters( 'found_users_query', 'SELECT FOUND_ROWS()' ) );
+		if ( isset( $qv['count_total'] ) && $qv['count_total'] ) {
+					$this->total_users = $wpdb->get_var( apply_filters( 'found_users_query', 'SELECT FOUND_ROWS()' ) );
+		}
 
-		if ( !$this->results )
-			return;
+		if ( !$this->results ) {
+					return;
+		}
 
 		if ( 'all_with_meta' == $qv['fields'] ) {
 			cache_users( $this->results );
 
 			$r = array();
-			foreach ( $this->results as $userid )
-				$r[ $userid ] = new WP_User( $userid, '', $qv['blog_id'] );
+			foreach ( $this->results as $userid ) {
+							$r[ $userid ] = new WP_User( $userid, '', $qv['blog_id'] );
+			}
 
 			$this->results = $r;
 		} elseif ( 'all' == $qv['fields'] ) {
@@ -570,8 +579,9 @@ 
 	 * @return mixed
 	 */
 	public function get( $query_var ) {
-		if ( isset( $this->query_vars[$query_var] ) )
-			return $this->query_vars[$query_var];
+		if ( isset( $this->query_vars[$query_var] ) ) {
+					return $this->query_vars[$query_var];
+		}
 
 		return null;
 	}

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

Doc Comments +1 added lines, -6 removed lines

@@ -111,7 +111,7 @@ 
 	 *
 	 * @global wpdb $wpdb WordPress database abstraction object.
 	 *
-	 * @param int|string|stdClass|WP_User $id User's ID, a WP_User object, or a user object from the DB.
+	 * @param integer $id User's ID, a WP_User object, or a user object from the DB.
 	 * @param string $name Optional. User's username
 	 * @param int $blog_id Optional Site ID, defaults to current site.
 	 */
@@ -702,11 +702,6 @@ 
 	 * @see map_meta_cap()
 	 *
 	 * @param string $cap           Capability name.
-	 * @param int    $object_id,... Optional. ID of the specific object to check against if `$cap` is a "meta" cap.
-	 *                              "Meta" capabilities, e.g. 'edit_post', 'edit_user', etc., are capabilities used
-	 *                              by map_meta_cap() to map to other "primitive" capabilities, e.g. 'edit_posts',
-	 *                              'edit_others_posts', etc. The parameter is accessed via func_get_args() and passed
-	 *                              to map_meta_cap().
 	 * @return bool Whether the current user has the given capability. If `$cap` is a meta cap and `$object_id` is
 	 *              passed, whether the current user has the given meta capability for the given object.
 	 */

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * User API: WP_User class
- *
- * @package WordPress
- * @subpackage Users
- * @since 4.4.0
- */
+	 * User API: WP_User class
+	 *
+	 * @package WordPress
+	 * @subpackage Users
+	 * @since 4.4.0
+	 */
 
 /**
  * Core class used to implement the WP_User object.

Spacing +131 added lines, -131 removed lines

@@ -115,40 +115,40 @@ 
 	 * @param string $name Optional. User's username
 	 * @param int $blog_id Optional Site ID, defaults to current site.
 	 */
-	public function __construct( $id = 0, $name = '', $blog_id = '' ) {
-		if ( ! isset( self::$back_compat_keys ) ) {
+	public function __construct($id = 0, $name = '', $blog_id = '') {
+		if ( ! isset(self::$back_compat_keys)) {
 			$prefix = $GLOBALS['wpdb']->prefix;
 			self::$back_compat_keys = array(
 				'user_firstname' => 'first_name',
 				'user_lastname' => 'last_name',
 				'user_description' => 'description',
-				'user_level' => $prefix . 'user_level',
-				$prefix . 'usersettings' => $prefix . 'user-settings',
-				$prefix . 'usersettingstime' => $prefix . 'user-settings-time',
+				'user_level' => $prefix.'user_level',
+				$prefix.'usersettings' => $prefix.'user-settings',
+				$prefix.'usersettingstime' => $prefix.'user-settings-time',
 			);
 		}
 
-		if ( $id instanceof WP_User ) {
-			$this->init( $id->data, $blog_id );
+		if ($id instanceof WP_User) {
+			$this->init($id->data, $blog_id);
 			return;
-		} elseif ( is_object( $id ) ) {
-			$this->init( $id, $blog_id );
+		} elseif (is_object($id)) {
+			$this->init($id, $blog_id);
 			return;
 		}
 
-		if ( ! empty( $id ) && ! is_numeric( $id ) ) {
+		if ( ! empty($id) && ! is_numeric($id)) {
 			$name = $id;
 			$id = 0;
 		}
 
-		if ( $id ) {
-			$data = self::get_data_by( 'id', $id );
+		if ($id) {
+			$data = self::get_data_by('id', $id);
 		} else {
-			$data = self::get_data_by( 'login', $name );
+			$data = self::get_data_by('login', $name);
 		}
 
-		if ( $data ) {
-			$this->init( $data, $blog_id );
+		if ($data) {
+			$this->init($data, $blog_id);
 		} else {
 			$this->data = new stdClass;
 		}
@@ -160,11 +160,11 @@ 
 	 * @param object $data    User DB row object.
 	 * @param int    $blog_id Optional. The site ID to initialize for.
 	 */
-	public function init( $data, $blog_id = '' ) {
+	public function init($data, $blog_id = '') {
 		$this->data = $data;
 		$this->ID = (int) $data->ID;
 
-		$this->for_blog( $blog_id );
+		$this->for_blog($blog_id);
 	}
 
 	/**
@@ -181,30 +181,30 @@ 
 	 * @param string|int $value The field value
 	 * @return object|false Raw user object
 	 */
-	public static function get_data_by( $field, $value ) {
+	public static function get_data_by($field, $value) {
 		global $wpdb;
 
 		// 'ID' is an alias of 'id'.
-		if ( 'ID' === $field ) {
+		if ('ID' === $field) {
 			$field = 'id';
 		}
 
-		if ( 'id' == $field ) {
+		if ('id' == $field) {
 			// Make sure the value is numeric to avoid casting objects, for example,
 			// to int 1.
-			if ( ! is_numeric( $value ) )
+			if ( ! is_numeric($value))
 				return false;
-			$value = intval( $value );
-			if ( $value < 1 )
+			$value = intval($value);
+			if ($value < 1)
 				return false;
 		} else {
-			$value = trim( $value );
+			$value = trim($value);
 		}
 
-		if ( !$value )
+		if ( ! $value)
 			return false;
 
-		switch ( $field ) {
+		switch ($field) {
 			case 'id':
 				$user_id = $value;
 				$db_field = 'ID';
@@ -218,7 +218,7 @@ 
 				$db_field = 'user_email';
 				break;
 			case 'login':
-				$value = sanitize_user( $value );
+				$value = sanitize_user($value);
 				$user_id = wp_cache_get($value, 'userlogins');
 				$db_field = 'user_login';
 				break;
@@ -226,17 +226,17 @@ 
 				return false;
 		}
 
-		if ( false !== $user_id ) {
-			if ( $user = wp_cache_get( $user_id, 'users' ) )
+		if (false !== $user_id) {
+			if ($user = wp_cache_get($user_id, 'users'))
 				return $user;
 		}
 
-		if ( !$user = $wpdb->get_row( $wpdb->prepare(
+		if ( ! $user = $wpdb->get_row($wpdb->prepare(
 			"SELECT * FROM $wpdb->users WHERE $db_field = %s", $value
-		) ) )
+		)))
 			return false;
 
-		update_user_caches( $user );
+		update_user_caches($user);
 
 		return $user;
 	}
@@ -251,9 +251,9 @@ 
 	 * @param array    $arguments Arguments to pass when calling.
 	 * @return mixed|false Return value of the callback, false otherwise.
 	 */
-	public function __call( $name, $arguments ) {
-		if ( '_init_caps' === $name ) {
-			return call_user_func_array( array( $this, $name ), $arguments );
+	public function __call($name, $arguments) {
+		if ('_init_caps' === $name) {
+			return call_user_func_array(array($this, $name), $arguments);
 		}
 		return false;
 	}
@@ -267,25 +267,25 @@ 
 	 * @param string $key User meta key to check if set.
 	 * @return bool Whether the given user meta key is set.
 	 */
-	public function __isset( $key ) {
-		if ( 'id' == $key ) {
-			_deprecated_argument( 'WP_User->id', '2.1',
+	public function __isset($key) {
+		if ('id' == $key) {
+			_deprecated_argument('WP_User->id', '2.1',
 				sprintf(
 					/* translators: %s: WP_User->ID */
-					__( 'Use %s instead.' ),
+					__('Use %s instead.'),
 					'<code>WP_User->ID</code>'
 				)
 			);
 			$key = 'ID';
 		}
 
-		if ( isset( $this->data->$key ) )
+		if (isset($this->data->$key))
 			return true;
 
-		if ( isset( self::$back_compat_keys[ $key ] ) )
-			$key = self::$back_compat_keys[ $key ];
+		if (isset(self::$back_compat_keys[$key]))
+			$key = self::$back_compat_keys[$key];
 
-		return metadata_exists( 'user', $this->ID, $key );
+		return metadata_exists('user', $this->ID, $key);
 	}
 
 	/**
@@ -297,28 +297,28 @@ 
 	 * @param string $key User meta key to retrieve.
 	 * @return mixed Value of the given user meta key (if set). If `$key` is 'id', the user ID.
 	 */
-	public function __get( $key ) {
-		if ( 'id' == $key ) {
-			_deprecated_argument( 'WP_User->id', '2.1',
+	public function __get($key) {
+		if ('id' == $key) {
+			_deprecated_argument('WP_User->id', '2.1',
 				sprintf(
 					/* translators: %s: WP_User->ID */
-					__( 'Use %s instead.' ),
+					__('Use %s instead.'),
 					'<code>WP_User->ID</code>'
 				)
 			);
 			return $this->ID;
 		}
 
-		if ( isset( $this->data->$key ) ) {
+		if (isset($this->data->$key)) {
 			$value = $this->data->$key;
 		} else {
-			if ( isset( self::$back_compat_keys[ $key ] ) )
-				$key = self::$back_compat_keys[ $key ];
-			$value = get_user_meta( $this->ID, $key, true );
+			if (isset(self::$back_compat_keys[$key]))
+				$key = self::$back_compat_keys[$key];
+			$value = get_user_meta($this->ID, $key, true);
 		}
 
-		if ( $this->filter ) {
-			$value = sanitize_user_field( $key, $value, $this->ID, $this->filter );
+		if ($this->filter) {
+			$value = sanitize_user_field($key, $value, $this->ID, $this->filter);
 		}
 
 		return $value;
@@ -336,12 +336,12 @@ 
 	 * @param string $key   User meta key.
 	 * @param mixed  $value User meta value.
 	 */
-	public function __set( $key, $value ) {
-		if ( 'id' == $key ) {
-			_deprecated_argument( 'WP_User->id', '2.1',
+	public function __set($key, $value) {
+		if ('id' == $key) {
+			_deprecated_argument('WP_User->id', '2.1',
 				sprintf(
 					/* translators: %s: WP_User->ID */
-					__( 'Use %s instead.' ),
+					__('Use %s instead.'),
 					'<code>WP_User->ID</code>'
 				)
 			);
@@ -360,23 +360,23 @@ 
 	 *
 	 * @param string $key User meta key to unset.
 	 */
-	public function __unset( $key ) {
-		if ( 'id' == $key ) {
-			_deprecated_argument( 'WP_User->id', '2.1',
+	public function __unset($key) {
+		if ('id' == $key) {
+			_deprecated_argument('WP_User->id', '2.1',
 				sprintf(
 					/* translators: %s: WP_User->ID */
-					__( 'Use %s instead.' ),
+					__('Use %s instead.'),
 					'<code>WP_User->ID</code>'
 				)
 			);
 		}
 
-		if ( isset( $this->data->$key ) ) {
-			unset( $this->data->$key );
+		if (isset($this->data->$key)) {
+			unset($this->data->$key);
 		}
 
-		if ( isset( self::$back_compat_keys[ $key ] ) ) {
-			unset( self::$back_compat_keys[ $key ] );
+		if (isset(self::$back_compat_keys[$key])) {
+			unset(self::$back_compat_keys[$key]);
 		}
 	}
 
@@ -389,7 +389,7 @@ 
 	 * @return bool True if user exists in the database, false if not.
 	 */
 	public function exists() {
-		return ! empty( $this->ID );
+		return ! empty($this->ID);
 	}
 
 	/**
@@ -402,8 +402,8 @@ 
 	 * @param string $key Property
 	 * @return mixed
 	 */
-	public function get( $key ) {
-		return $this->__get( $key );
+	public function get($key) {
+		return $this->__get($key);
 	}
 
 	/**
@@ -416,8 +416,8 @@ 
 	 * @param string $key Property
 	 * @return bool
 	 */
-	public function has_prop( $key ) {
-		return $this->__isset( $key );
+	public function has_prop($key) {
+		return $this->__isset($key);
 	}
 
 	/**
@@ -428,7 +428,7 @@ 
 	 * @return array Array representation.
 	 */
 	public function to_array() {
-		return get_object_vars( $this->data );
+		return get_object_vars($this->data);
 	}
 
 	/**
@@ -446,17 +446,17 @@ 
 	 *
 	 * @param string $cap_key Optional capability key
 	 */
-	protected function _init_caps( $cap_key = '' ) {
+	protected function _init_caps($cap_key = '') {
 		global $wpdb;
 
-		if ( empty($cap_key) )
-			$this->cap_key = $wpdb->get_blog_prefix() . 'capabilities';
+		if (empty($cap_key))
+			$this->cap_key = $wpdb->get_blog_prefix().'capabilities';
 		else
 			$this->cap_key = $cap_key;
 
-		$this->caps = get_user_meta( $this->ID, $this->cap_key, true );
+		$this->caps = get_user_meta($this->ID, $this->cap_key, true);
 
-		if ( ! is_array( $this->caps ) )
+		if ( ! is_array($this->caps))
 			$this->caps = array();
 
 		$this->get_role_caps();
@@ -479,16 +479,16 @@ 
 		$wp_roles = wp_roles();
 
 		//Filter out caps that are not role names and assign to $this->roles
-		if ( is_array( $this->caps ) )
-			$this->roles = array_filter( array_keys( $this->caps ), array( $wp_roles, 'is_role' ) );
+		if (is_array($this->caps))
+			$this->roles = array_filter(array_keys($this->caps), array($wp_roles, 'is_role'));
 
 		//Build $allcaps from role caps, overlay user's $caps
 		$this->allcaps = array();
-		foreach ( (array) $this->roles as $role ) {
-			$the_role = $wp_roles->get_role( $role );
-			$this->allcaps = array_merge( (array) $this->allcaps, (array) $the_role->capabilities );
+		foreach ((array) $this->roles as $role) {
+			$the_role = $wp_roles->get_role($role);
+			$this->allcaps = array_merge((array) $this->allcaps, (array) $the_role->capabilities);
 		}
-		$this->allcaps = array_merge( (array) $this->allcaps, (array) $this->caps );
+		$this->allcaps = array_merge((array) $this->allcaps, (array) $this->caps);
 
 		return $this->allcaps;
 	}
@@ -503,13 +503,13 @@ 
 	 *
 	 * @param string $role Role name.
 	 */
-	public function add_role( $role ) {
-		if ( empty( $role ) ) {
+	public function add_role($role) {
+		if (empty($role)) {
 			return;
 		}
 
 		$this->caps[$role] = true;
-		update_user_meta( $this->ID, $this->cap_key, $this->caps );
+		update_user_meta($this->ID, $this->cap_key, $this->caps);
 		$this->get_role_caps();
 		$this->update_user_level_from_caps();
 
@@ -521,7 +521,7 @@ 
 		 * @param int    $user_id The user ID.
 		 * @param string $role    The new role.
 		 */
-		do_action( 'add_user_role', $this->ID, $role );
+		do_action('add_user_role', $this->ID, $role);
 	}
 
 	/**
@@ -532,11 +532,11 @@ 
 	 *
 	 * @param string $role Role name.
 	 */
-	public function remove_role( $role ) {
-		if ( !in_array($role, $this->roles) )
+	public function remove_role($role) {
+		if ( ! in_array($role, $this->roles))
 			return;
-		unset( $this->caps[$role] );
-		update_user_meta( $this->ID, $this->cap_key, $this->caps );
+		unset($this->caps[$role]);
+		update_user_meta($this->ID, $this->cap_key, $this->caps);
 		$this->get_role_caps();
 		$this->update_user_level_from_caps();
 
@@ -548,7 +548,7 @@ 
 		 * @param int    $user_id The user ID.
 		 * @param string $role    The removed role.
 		 */
-		do_action( 'remove_user_role', $this->ID, $role );
+		do_action('remove_user_role', $this->ID, $role);
 	}
 
 	/**
@@ -563,21 +563,21 @@ 
 	 *
 	 * @param string $role Role name.
 	 */
-	public function set_role( $role ) {
-		if ( 1 == count( $this->roles ) && $role == current( $this->roles ) )
+	public function set_role($role) {
+		if (1 == count($this->roles) && $role == current($this->roles))
 			return;
 
-		foreach ( (array) $this->roles as $oldrole )
-			unset( $this->caps[$oldrole] );
+		foreach ((array) $this->roles as $oldrole)
+			unset($this->caps[$oldrole]);
 
 		$old_roles = $this->roles;
-		if ( !empty( $role ) ) {
+		if ( ! empty($role)) {
 			$this->caps[$role] = true;
-			$this->roles = array( $role => true );
+			$this->roles = array($role => true);
 		} else {
 			$this->roles = false;
 		}
-		update_user_meta( $this->ID, $this->cap_key, $this->caps );
+		update_user_meta($this->ID, $this->cap_key, $this->caps);
 		$this->get_role_caps();
 		$this->update_user_level_from_caps();
 
@@ -591,7 +591,7 @@ 
 		 * @param string $role      The new role.
 		 * @param array  $old_roles An array of the user's previous roles.
 		 */
-		do_action( 'set_user_role', $this->ID, $role, $old_roles );
+		do_action('set_user_role', $this->ID, $role, $old_roles);
 	}
 
 	/**
@@ -613,10 +613,10 @@ 
 	 * @param string $item Level capability name.
 	 * @return int Max Level.
 	 */
-	public function level_reduction( $max, $item ) {
-		if ( preg_match( '/^level_(10|[0-9])$/i', $item, $matches ) ) {
-			$level = intval( $matches[1] );
-			return max( $max, $level );
+	public function level_reduction($max, $item) {
+		if (preg_match('/^level_(10|[0-9])$/i', $item, $matches)) {
+			$level = intval($matches[1]);
+			return max($max, $level);
 		} else {
 			return $max;
 		}
@@ -636,8 +636,8 @@ 
 	 */
 	public function update_user_level_from_caps() {
 		global $wpdb;
-		$this->user_level = array_reduce( array_keys( $this->allcaps ), array( $this, 'level_reduction' ), 0 );
-		update_user_meta( $this->ID, $wpdb->get_blog_prefix() . 'user_level', $this->user_level );
+		$this->user_level = array_reduce(array_keys($this->allcaps), array($this, 'level_reduction'), 0);
+		update_user_meta($this->ID, $wpdb->get_blog_prefix().'user_level', $this->user_level);
 	}
 
 	/**
@@ -649,9 +649,9 @@ 
 	 * @param string $cap Capability name.
 	 * @param bool $grant Whether to grant capability to user.
 	 */
-	public function add_cap( $cap, $grant = true ) {
+	public function add_cap($cap, $grant = true) {
 		$this->caps[$cap] = $grant;
-		update_user_meta( $this->ID, $this->cap_key, $this->caps );
+		update_user_meta($this->ID, $this->cap_key, $this->caps);
 		$this->get_role_caps();
 		$this->update_user_level_from_caps();
 	}
@@ -664,12 +664,12 @@ 
 	 *
 	 * @param string $cap Capability name.
 	 */
-	public function remove_cap( $cap ) {
-		if ( ! isset( $this->caps[ $cap ] ) ) {
+	public function remove_cap($cap) {
+		if ( ! isset($this->caps[$cap])) {
 			return;
 		}
-		unset( $this->caps[ $cap ] );
-		update_user_meta( $this->ID, $this->cap_key, $this->caps );
+		unset($this->caps[$cap]);
+		update_user_meta($this->ID, $this->cap_key, $this->caps);
 		$this->get_role_caps();
 		$this->update_user_level_from_caps();
 	}
@@ -685,8 +685,8 @@ 
 	public function remove_all_caps() {
 		global $wpdb;
 		$this->caps = array();
-		delete_user_meta( $this->ID, $this->cap_key );
-		delete_user_meta( $this->ID, $wpdb->get_blog_prefix() . 'user_level' );
+		delete_user_meta($this->ID, $this->cap_key);
+		delete_user_meta($this->ID, $wpdb->get_blog_prefix().'user_level');
 		$this->get_role_caps();
 	}
 
@@ -710,19 +710,19 @@ 
 	 * @return bool Whether the current user has the given capability. If `$cap` is a meta cap and `$object_id` is
 	 *              passed, whether the current user has the given meta capability for the given object.
 	 */
-	public function has_cap( $cap ) {
-		if ( is_numeric( $cap ) ) {
-			_deprecated_argument( __FUNCTION__, '2.0', __('Usage of user levels by plugins and themes is deprecated. Use roles and capabilities instead.') );
-			$cap = $this->translate_level_to_cap( $cap );
+	public function has_cap($cap) {
+		if (is_numeric($cap)) {
+			_deprecated_argument(__FUNCTION__, '2.0', __('Usage of user levels by plugins and themes is deprecated. Use roles and capabilities instead.'));
+			$cap = $this->translate_level_to_cap($cap);
 		}
 
-		$args = array_slice( func_get_args(), 1 );
-		$args = array_merge( array( $cap, $this->ID ), $args );
-		$caps = call_user_func_array( 'map_meta_cap', $args );
+		$args = array_slice(func_get_args(), 1);
+		$args = array_merge(array($cap, $this->ID), $args);
+		$caps = call_user_func_array('map_meta_cap', $args);
 
 		// Multisite super admin has all caps by definition, Unless specifically denied.
-		if ( is_multisite() && is_super_admin( $this->ID ) ) {
-			if ( in_array('do_not_allow', $caps) )
+		if (is_multisite() && is_super_admin($this->ID)) {
+			if (in_array('do_not_allow', $caps))
 				return false;
 			return true;
 		}
@@ -738,14 +738,14 @@ 
 		 * @param array   $args    Optional parameters passed to has_cap(), typically object ID.
 		 * @param WP_User $user    The user object.
 		 */
-		$capabilities = apply_filters( 'user_has_cap', $this->allcaps, $caps, $args, $this );
+		$capabilities = apply_filters('user_has_cap', $this->allcaps, $caps, $args, $this);
 
 		// Everyone is allowed to exist.
 		$capabilities['exist'] = true;
 
 		// Must have ALL requested caps.
-		foreach ( (array) $caps as $cap ) {
-			if ( empty( $capabilities[ $cap ] ) )
+		foreach ((array) $caps as $cap) {
+			if (empty($capabilities[$cap]))
 				return false;
 		}
 
@@ -763,8 +763,8 @@ 
 	 * @param int $level Level number, 1 to 10.
 	 * @return string
 	 */
-	public function translate_level_to_cap( $level ) {
-		return 'level_' . $level;
+	public function translate_level_to_cap($level) {
+		return 'level_'.$level;
 	}
 
 	/**
@@ -776,12 +776,12 @@ 
 	 *
 	 * @param int $blog_id Optional. Site ID, defaults to current site.
 	 */
-	public function for_blog( $blog_id = '' ) {
+	public function for_blog($blog_id = '') {
 		global $wpdb;
-		if ( ! empty( $blog_id ) )
-			$cap_key = $wpdb->get_blog_prefix( $blog_id ) . 'capabilities';
+		if ( ! empty($blog_id))
+			$cap_key = $wpdb->get_blog_prefix($blog_id).'capabilities';
 		else
 			$cap_key = '';
-		$this->_init_caps( $cap_key );
+		$this->_init_caps($cap_key);
 	}
 }

Braces +55 added lines, -38 removed lines

@@ -192,17 +192,20 @@ 
 		if ( 'id' == $field ) {
 			// Make sure the value is numeric to avoid casting objects, for example,
 			// to int 1.
-			if ( ! is_numeric( $value ) )
-				return false;
+			if ( ! is_numeric( $value ) ) {
+							return false;
+			}
 			$value = intval( $value );
-			if ( $value < 1 )
-				return false;
+			if ( $value < 1 ) {
+							return false;
+			}
 		} else {
 			$value = trim( $value );
 		}
 
-		if ( !$value )
-			return false;
+		if ( !$value ) {
+					return false;
+		}
 
 		switch ( $field ) {
 			case 'id':
@@ -227,14 +230,16 @@ 
 		}
 
 		if ( false !== $user_id ) {
-			if ( $user = wp_cache_get( $user_id, 'users' ) )
-				return $user;
+			if ( $user = wp_cache_get( $user_id, 'users' ) ) {
+							return $user;
+			}
 		}
 
 		if ( !$user = $wpdb->get_row( $wpdb->prepare(
 			"SELECT * FROM $wpdb->users WHERE $db_field = %s", $value
-		) ) )
-			return false;
+		) ) ) {
+					return false;
+		}
 
 		update_user_caches( $user );
 
@@ -279,11 +284,13 @@ 
 			$key = 'ID';
 		}
 
-		if ( isset( $this->data->$key ) )
-			return true;
+		if ( isset( $this->data->$key ) ) {
+					return true;
+		}
 
-		if ( isset( self::$back_compat_keys[ $key ] ) )
-			$key = self::$back_compat_keys[ $key ];
+		if ( isset( self::$back_compat_keys[ $key ] ) ) {
+					$key = self::$back_compat_keys[ $key ];
+		}
 
 		return metadata_exists( 'user', $this->ID, $key );
 	}
@@ -312,8 +319,9 @@ 
 		if ( isset( $this->data->$key ) ) {
 			$value = $this->data->$key;
 		} else {
-			if ( isset( self::$back_compat_keys[ $key ] ) )
-				$key = self::$back_compat_keys[ $key ];
+			if ( isset( self::$back_compat_keys[ $key ] ) ) {
+							$key = self::$back_compat_keys[ $key ];
+			}
 			$value = get_user_meta( $this->ID, $key, true );
 		}
 
@@ -449,15 +457,17 @@ 
 	protected function _init_caps( $cap_key = '' ) {
 		global $wpdb;
 
-		if ( empty($cap_key) )
-			$this->cap_key = $wpdb->get_blog_prefix() . 'capabilities';
-		else
-			$this->cap_key = $cap_key;
+		if ( empty($cap_key) ) {
+					$this->cap_key = $wpdb->get_blog_prefix() . 'capabilities';
+		} else {
+					$this->cap_key = $cap_key;
+		}
 
 		$this->caps = get_user_meta( $this->ID, $this->cap_key, true );
 
-		if ( ! is_array( $this->caps ) )
-			$this->caps = array();
+		if ( ! is_array( $this->caps ) ) {
+					$this->caps = array();
+		}
 
 		$this->get_role_caps();
 	}
@@ -479,8 +489,9 @@ 
 		$wp_roles = wp_roles();
 
 		//Filter out caps that are not role names and assign to $this->roles
-		if ( is_array( $this->caps ) )
-			$this->roles = array_filter( array_keys( $this->caps ), array( $wp_roles, 'is_role' ) );
+		if ( is_array( $this->caps ) ) {
+					$this->roles = array_filter( array_keys( $this->caps ), array( $wp_roles, 'is_role' ) );
+		}
 
 		//Build $allcaps from role caps, overlay user's $caps
 		$this->allcaps = array();
@@ -533,8 +544,9 @@ 
 	 * @param string $role Role name.
 	 */
 	public function remove_role( $role ) {
-		if ( !in_array($role, $this->roles) )
-			return;
+		if ( !in_array($role, $this->roles) ) {
+					return;
+		}
 		unset( $this->caps[$role] );
 		update_user_meta( $this->ID, $this->cap_key, $this->caps );
 		$this->get_role_caps();
@@ -564,11 +576,13 @@ 
 	 * @param string $role Role name.
 	 */
 	public function set_role( $role ) {
-		if ( 1 == count( $this->roles ) && $role == current( $this->roles ) )
-			return;
+		if ( 1 == count( $this->roles ) && $role == current( $this->roles ) ) {
+					return;
+		}
 
-		foreach ( (array) $this->roles as $oldrole )
-			unset( $this->caps[$oldrole] );
+		foreach ( (array) $this->roles as $oldrole ) {
+					unset( $this->caps[$oldrole] );
+		}
 
 		$old_roles = $this->roles;
 		if ( !empty( $role ) ) {
@@ -722,8 +736,9 @@ 
 
 		// Multisite super admin has all caps by definition, Unless specifically denied.
 		if ( is_multisite() && is_super_admin( $this->ID ) ) {
-			if ( in_array('do_not_allow', $caps) )
-				return false;
+			if ( in_array('do_not_allow', $caps) ) {
+							return false;
+			}
 			return true;
 		}
 
@@ -745,8 +760,9 @@ 
 
 		// Must have ALL requested caps.
 		foreach ( (array) $caps as $cap ) {
-			if ( empty( $capabilities[ $cap ] ) )
-				return false;
+			if ( empty( $capabilities[ $cap ] ) ) {
+							return false;
+			}
 		}
 
 		return true;
@@ -778,10 +794,11 @@ 
 	 */
 	public function for_blog( $blog_id = '' ) {
 		global $wpdb;
-		if ( ! empty( $blog_id ) )
-			$cap_key = $wpdb->get_blog_prefix( $blog_id ) . 'capabilities';
-		else
-			$cap_key = '';
+		if ( ! empty( $blog_id ) ) {
+					$cap_key = $wpdb->get_blog_prefix( $blog_id ) . 'capabilities';
+		} else {
+					$cap_key = '';
+		}
 		$this->_init_caps( $cap_key );
 	}
 }

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

Doc Comments +2 added lines, -2 removed lines

@@ -317,7 +317,7 @@ 
 	 *
 	 * @param array     $args        Display arguments. See {@see WP_Widget::widget()} for information
 	 *                               on accepted arguments.
-	 * @param int|array $widget_args {
+	 * @param integer $widget_args {
 	 *     Optional. Internal order number of the widget instance, or array of multi-widget arguments.
 	 *     Default 1.
 	 *
@@ -457,7 +457,7 @@ 
 	 * @since 2.8.0
 	 * @access public
 	 *
-	 * @param int|array $widget_args Widget instance number or array of widget arguments.
+	 * @param integer $widget_args Widget instance number or array of widget arguments.
 	 * @return string|null
 	 */
 	public function form_callback( $widget_args = 1 ) {

Spacing +82 added lines, -82 removed lines

@@ -98,7 +98,7 @@ 
 	 *                        'before_widget', and 'after_widget'.
 	 * @param array $instance The settings for the particular instance of the widget.
 	 */
-	public function widget( $args, $instance ) {
+	public function widget($args, $instance) {
 		die('function WP_Widget::widget() must be over-ridden in a sub-class.');
 	}
 
@@ -117,7 +117,7 @@ 
 	 * @param array $old_instance Old settings for this instance.
 	 * @return array Settings to save or bool false to cancel saving.
 	 */
-	public function update( $new_instance, $old_instance ) {
+	public function update($new_instance, $old_instance) {
 		return $new_instance;
 	}
 
@@ -130,8 +130,8 @@ 
 	 * @param array $instance Current settings.
 	 * @return string Default return is 'noform'.
 	 */
-	public function form( $instance ) {
-		echo '<p class="no-options-widget">' . __('There are no options for this widget.') . '</p>';
+	public function form($instance) {
+		echo '<p class="no-options-widget">'.__('There are no options for this widget.').'</p>';
 		return 'noform';
 	}
 
@@ -151,12 +151,12 @@ 
 	 * @param array  $control_options Optional. Widget control options. See wp_register_widget_control() for
 	 *                                information on accepted arguments. Default empty array.
 	 */
-	public function __construct( $id_base, $name, $widget_options = array(), $control_options = array() ) {
-		$this->id_base = empty($id_base) ? preg_replace( '/(wp_)?widget_/', '', strtolower(get_class($this)) ) : strtolower($id_base);
+	public function __construct($id_base, $name, $widget_options = array(), $control_options = array()) {
+		$this->id_base = empty($id_base) ? preg_replace('/(wp_)?widget_/', '', strtolower(get_class($this))) : strtolower($id_base);
 		$this->name = $name;
-		$this->option_name = 'widget_' . $this->id_base;
-		$this->widget_options = wp_parse_args( $widget_options, array('classname' => $this->option_name) );
-		$this->control_options = wp_parse_args( $control_options, array('id_base' => $this->id_base) );
+		$this->option_name = 'widget_'.$this->id_base;
+		$this->widget_options = wp_parse_args($widget_options, array('classname' => $this->option_name));
+		$this->control_options = wp_parse_args($control_options, array('id_base' => $this->id_base));
 	}
 
 	/**
@@ -167,9 +167,9 @@ 
 	 * @param array  $widget_options
 	 * @param array  $control_options
 	 */
-	public function WP_Widget( $id_base, $name, $widget_options = array(), $control_options = array() ) {
-		_deprecated_constructor( 'WP_Widget', '4.3.0', get_class( $this ) );
-		WP_Widget::__construct( $id_base, $name, $widget_options, $control_options );
+	public function WP_Widget($id_base, $name, $widget_options = array(), $control_options = array()) {
+		_deprecated_constructor('WP_Widget', '4.3.0', get_class($this));
+		WP_Widget::__construct($id_base, $name, $widget_options, $control_options);
 	}
 
 	/**
@@ -184,10 +184,10 @@ 
 	 * @return string Name attribute for $field_name
 	 */
 	public function get_field_name($field_name) {
-		if ( false === $pos = strpos( $field_name, '[' ) ) {
-			return 'widget-' . $this->id_base . '[' . $this->number . '][' . $field_name . ']';
+		if (false === $pos = strpos($field_name, '[')) {
+			return 'widget-'.$this->id_base.'['.$this->number.']['.$field_name.']';
 		} else {
-			return 'widget-' . $this->id_base . '[' . $this->number . '][' . substr_replace( $field_name, '][', $pos, strlen( '[' ) );
+			return 'widget-'.$this->id_base.'['.$this->number.']['.substr_replace($field_name, '][', $pos, strlen('['));
 		}
 	}
 
@@ -204,8 +204,8 @@ 
 	 * @param string $field_name Field name.
 	 * @return string ID attribute for `$field_name`.
 	 */
-	public function get_field_id( $field_name ) {
-		return 'widget-' . $this->id_base . '-' . $this->number . '-' . trim( str_replace( array( '[]', '[', ']' ), array( '', '-', '' ), $field_name ), '-' );
+	public function get_field_id($field_name) {
+		return 'widget-'.$this->id_base.'-'.$this->number.'-'.trim(str_replace(array('[]', '[', ']'), array('', '-', ''), $field_name), '-');
 	}
 
 	/**
@@ -219,23 +219,23 @@ 
 		$empty = true;
 
 		// When $settings is an array-like object, get an intrinsic array for use with array_keys().
-		if ( $settings instanceof ArrayObject || $settings instanceof ArrayIterator ) {
+		if ($settings instanceof ArrayObject || $settings instanceof ArrayIterator) {
 			$settings = $settings->getArrayCopy();
 		}
 
-		if ( is_array( $settings ) ) {
-			foreach ( array_keys( $settings ) as $number ) {
-				if ( is_numeric( $number ) ) {
-					$this->_set( $number );
-					$this->_register_one( $number );
+		if (is_array($settings)) {
+			foreach (array_keys($settings) as $number) {
+				if (is_numeric($number)) {
+					$this->_set($number);
+					$this->_register_one($number);
 					$empty = false;
 				}
 			}
 		}
 
-		if ( $empty ) {
+		if ($empty) {
 			// If there are none, we register the widget's existence with a generic template.
-			$this->_set( 1 );
+			$this->_set(1);
 			$this->_register_one();
 		}
 	}
@@ -251,7 +251,7 @@ 
 	 */
 	public function _set($number) {
 		$this->number = $number;
-		$this->id = $this->id_base . '-' . $number;
+		$this->id = $this->id_base.'-'.$number;
 	}
 
 	/**
@@ -304,7 +304,7 @@ 
 	 */
 	public function is_preview() {
 		global $wp_customize;
-		return ( isset( $wp_customize ) && $wp_customize->is_preview() ) ;
+		return (isset($wp_customize) && $wp_customize->is_preview());
 	}
 
 	/**
@@ -324,17 +324,17 @@ 
 	 *     @type int $number Number increment used for multiples of the same widget.
 	 * }
 	 */
-	public function display_callback( $args, $widget_args = 1 ) {
-		if ( is_numeric( $widget_args ) ) {
-			$widget_args = array( 'number' => $widget_args );
+	public function display_callback($args, $widget_args = 1) {
+		if (is_numeric($widget_args)) {
+			$widget_args = array('number' => $widget_args);
 		}
 
-		$widget_args = wp_parse_args( $widget_args, array( 'number' => -1 ) );
-		$this->_set( $widget_args['number'] );
+		$widget_args = wp_parse_args($widget_args, array('number' => -1));
+		$this->_set($widget_args['number']);
 		$instances = $this->get_settings();
 
-		if ( array_key_exists( $this->number, $instances ) ) {
-			$instance = $instances[ $this->number ];
+		if (array_key_exists($this->number, $instances)) {
+			$instance = $instances[$this->number];
 
 			/**
 			 * Filter the settings for a particular widget instance.
@@ -347,21 +347,21 @@ 
 			 * @param WP_Widget $this     The current widget instance.
 			 * @param array     $args     An array of default widget arguments.
 			 */
-			$instance = apply_filters( 'widget_display_callback', $instance, $this, $args );
+			$instance = apply_filters('widget_display_callback', $instance, $this, $args);
 
-			if ( false === $instance ) {
+			if (false === $instance) {
 				return;
 			}
 
 			$was_cache_addition_suspended = wp_suspend_cache_addition();
-			if ( $this->is_preview() && ! $was_cache_addition_suspended ) {
-				wp_suspend_cache_addition( true );
+			if ($this->is_preview() && ! $was_cache_addition_suspended) {
+				wp_suspend_cache_addition(true);
 			}
 
-			$this->widget( $args, $instance );
+			$this->widget($args, $instance);
 
-			if ( $this->is_preview() ) {
-				wp_suspend_cache_addition( $was_cache_addition_suspended );
+			if ($this->is_preview()) {
+				wp_suspend_cache_addition($was_cache_addition_suspended);
 			}
 		}
 	}
@@ -376,53 +376,53 @@ 
 	 *
 	 * @param int $deprecated Not used.
 	 */
-	public function update_callback( $deprecated = 1 ) {
+	public function update_callback($deprecated = 1) {
 		global $wp_registered_widgets;
 
 		$all_instances = $this->get_settings();
 
 		// We need to update the data
-		if ( $this->updated )
+		if ($this->updated)
 			return;
 
-		if ( isset($_POST['delete_widget']) && $_POST['delete_widget'] ) {
+		if (isset($_POST['delete_widget']) && $_POST['delete_widget']) {
 			// Delete the settings for this instance of the widget
-			if ( isset($_POST['the-widget-id']) )
+			if (isset($_POST['the-widget-id']))
 				$del_id = $_POST['the-widget-id'];
 			else
 				return;
 
-			if ( isset($wp_registered_widgets[$del_id]['params'][0]['number']) ) {
+			if (isset($wp_registered_widgets[$del_id]['params'][0]['number'])) {
 				$number = $wp_registered_widgets[$del_id]['params'][0]['number'];
 
-				if ( $this->id_base . '-' . $number == $del_id )
+				if ($this->id_base.'-'.$number == $del_id)
 					unset($all_instances[$number]);
 			}
 		} else {
-			if ( isset($_POST['widget-' . $this->id_base]) && is_array($_POST['widget-' . $this->id_base]) ) {
-				$settings = $_POST['widget-' . $this->id_base];
-			} elseif ( isset($_POST['id_base']) && $_POST['id_base'] == $this->id_base ) {
+			if (isset($_POST['widget-'.$this->id_base]) && is_array($_POST['widget-'.$this->id_base])) {
+				$settings = $_POST['widget-'.$this->id_base];
+			} elseif (isset($_POST['id_base']) && $_POST['id_base'] == $this->id_base) {
 				$num = $_POST['multi_number'] ? (int) $_POST['multi_number'] : (int) $_POST['widget_number'];
-				$settings = array( $num => array() );
+				$settings = array($num => array());
 			} else {
 				return;
 			}
 
-			foreach ( $settings as $number => $new_instance ) {
+			foreach ($settings as $number => $new_instance) {
 				$new_instance = stripslashes_deep($new_instance);
 				$this->_set($number);
 
 				$old_instance = isset($all_instances[$number]) ? $all_instances[$number] : array();
 
 				$was_cache_addition_suspended = wp_suspend_cache_addition();
-				if ( $this->is_preview() && ! $was_cache_addition_suspended ) {
-					wp_suspend_cache_addition( true );
+				if ($this->is_preview() && ! $was_cache_addition_suspended) {
+					wp_suspend_cache_addition(true);
 				}
 
-				$instance = $this->update( $new_instance, $old_instance );
+				$instance = $this->update($new_instance, $old_instance);
 
-				if ( $this->is_preview() ) {
-					wp_suspend_cache_addition( $was_cache_addition_suspended );
+				if ($this->is_preview()) {
+					wp_suspend_cache_addition($was_cache_addition_suspended);
 				}
 
 				/**
@@ -438,8 +438,8 @@ 
 				 * @param array     $old_instance Array of old widget settings.
 				 * @param WP_Widget $this         The current widget instance.
 				 */
-				$instance = apply_filters( 'widget_update_callback', $instance, $new_instance, $old_instance, $this );
-				if ( false !== $instance ) {
+				$instance = apply_filters('widget_update_callback', $instance, $new_instance, $old_instance, $this);
+				if (false !== $instance) {
 					$all_instances[$number] = $instance;
 				}
 
@@ -460,11 +460,11 @@ 
 	 * @param int|array $widget_args Widget instance number or array of widget arguments.
 	 * @return string|null
 	 */
-	public function form_callback( $widget_args = 1 ) {
-		if ( is_numeric($widget_args) )
-			$widget_args = array( 'number' => $widget_args );
+	public function form_callback($widget_args = 1) {
+		if (is_numeric($widget_args))
+			$widget_args = array('number' => $widget_args);
 
-		$widget_args = wp_parse_args( $widget_args, array( 'number' => -1 ) );
+		$widget_args = wp_parse_args($widget_args, array('number' => -1));
 		$all_instances = $this->get_settings();
 
 		if ( -1 == $widget_args['number'] ) {
@@ -473,7 +473,7 @@ 
 			$instance = array();
 		} else {
 			$this->_set($widget_args['number']);
-			$instance = $all_instances[ $widget_args['number'] ];
+			$instance = $all_instances[$widget_args['number']];
 		}
 
 		/**
@@ -486,10 +486,10 @@ 
 		 * @param array     $instance The current widget instance's settings.
 		 * @param WP_Widget $this     The current widget instance.
 		 */
-		$instance = apply_filters( 'widget_form_callback', $instance, $this );
+		$instance = apply_filters('widget_form_callback', $instance, $this);
 
 		$return = null;
-		if ( false !== $instance ) {
+		if (false !== $instance) {
 			$return = $this->form($instance);
 
 			/**
@@ -508,7 +508,7 @@ 
 			 * @param null      $return   Return null if new fields are added.
 			 * @param array     $instance An array of the widget's settings.
 			 */
-			do_action_ref_array( 'in_widget_form', array( &$this, &$return, $instance ) );
+			do_action_ref_array('in_widget_form', array(&$this, &$return, $instance));
 		}
 		return $return;
 	}
@@ -522,10 +522,10 @@ 
 	 * @param integer $number Optional. The unique order number of this widget instance
 	 *                        compared to other instances of the same class. Default -1.
 	 */
-	public function _register_one( $number = -1 ) {
-		wp_register_sidebar_widget(	$this->id, $this->name,	$this->_get_display_callback(), $this->widget_options, array( 'number' => $number ) );
-		_register_widget_update_callback( $this->id_base, $this->_get_update_callback(), $this->control_options, array( 'number' => -1 ) );
-		_register_widget_form_callback(	$this->id, $this->name,	$this->_get_form_callback(), $this->control_options, array( 'number' => $number ) );
+	public function _register_one($number = -1) {
+		wp_register_sidebar_widget($this->id, $this->name, $this->_get_display_callback(), $this->widget_options, array('number' => $number));
+		_register_widget_update_callback($this->id_base, $this->_get_update_callback(), $this->control_options, array('number' => -1));
+		_register_widget_form_callback($this->id, $this->name, $this->_get_form_callback(), $this->control_options, array('number' => $number));
 	}
 
 	/**
@@ -536,9 +536,9 @@ 
 	 *
 	 * @param array $settings Multi-dimensional array of widget instance settings.
 	 */
-	public function save_settings( $settings ) {
+	public function save_settings($settings) {
 		$settings['_multiwidget'] = 1;
-		update_option( $this->option_name, $settings );
+		update_option($this->option_name, $settings);
 	}
 
 	/**
@@ -551,27 +551,27 @@ 
 	 */
 	public function get_settings() {
 
-		$settings = get_option( $this->option_name );
+		$settings = get_option($this->option_name);
 
-		if ( false === $settings ) {
-			if ( isset( $this->alt_option_name ) ) {
-				$settings = get_option( $this->alt_option_name );
+		if (false === $settings) {
+			if (isset($this->alt_option_name)) {
+				$settings = get_option($this->alt_option_name);
 			} else {
 				// Save an option so it can be autoloaded next time.
-				$this->save_settings( array() );
+				$this->save_settings(array());
 			}
 		}
 
-		if ( ! is_array( $settings ) && ! ( $settings instanceof ArrayObject || $settings instanceof ArrayIterator ) ) {
+		if ( ! is_array($settings) && ! ($settings instanceof ArrayObject || $settings instanceof ArrayIterator)) {
 			$settings = array();
 		}
 
-		if ( ! empty( $settings ) && ! isset( $settings['_multiwidget'] ) ) {
+		if ( ! empty($settings) && ! isset($settings['_multiwidget'])) {
 			// Old format, convert if single widget.
-			$settings = wp_convert_widget_settings( $this->id_base, $this->option_name, $settings );
+			$settings = wp_convert_widget_settings($this->id_base, $this->option_name, $settings);
 		}
 
-		unset( $settings['_multiwidget'], $settings['__i__'] );
+		unset($settings['_multiwidget'], $settings['__i__']);
 		return $settings;
 	}
 }

Braces +14 added lines, -10 removed lines

@@ -382,21 +382,24 @@ 
 		$all_instances = $this->get_settings();
 
 		// We need to update the data
-		if ( $this->updated )
-			return;
+		if ( $this->updated ) {
+					return;
+		}
 
 		if ( isset($_POST['delete_widget']) && $_POST['delete_widget'] ) {
 			// Delete the settings for this instance of the widget
-			if ( isset($_POST['the-widget-id']) )
-				$del_id = $_POST['the-widget-id'];
-			else
-				return;
+			if ( isset($_POST['the-widget-id']) ) {
+							$del_id = $_POST['the-widget-id'];
+			} else {
+							return;
+			}
 
 			if ( isset($wp_registered_widgets[$del_id]['params'][0]['number']) ) {
 				$number = $wp_registered_widgets[$del_id]['params'][0]['number'];
 
-				if ( $this->id_base . '-' . $number == $del_id )
-					unset($all_instances[$number]);
+				if ( $this->id_base . '-' . $number == $del_id ) {
+									unset($all_instances[$number]);
+				}
 			}
 		} else {
 			if ( isset($_POST['widget-' . $this->id_base]) && is_array($_POST['widget-' . $this->id_base]) ) {
@@ -461,8 +464,9 @@ 
 	 * @return string|null
 	 */
 	public function form_callback( $widget_args = 1 ) {
-		if ( is_numeric($widget_args) )
-			$widget_args = array( 'number' => $widget_args );
+		if ( is_numeric($widget_args) ) {
+					$widget_args = array( 'number' => $widget_args );
+		}
 
 		$widget_args = wp_parse_args( $widget_args, array( 'number' => -1 ) );
 		$all_instances = $this->get_settings();

src/wp-includes/comment-template.php

Doc Comments +19 added lines, -19 removed lines

@@ -17,7 +17,7 @@ 
  * @since 1.5.0
  * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
  *
- * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to retrieve the author.
+ * @param integer $comment_ID Optional. WP_Comment or the ID of the comment for which to retrieve the author.
  *									 Default current comment.
  * @return string The comment author
  */
@@ -52,7 +52,7 @@ 
  * @since 0.71
  * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
  *
- * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to print the author.
+ * @param integer $comment_ID Optional. WP_Comment or the ID of the comment for which to print the author.
  *									 Default current comment.
  */
 function comment_author( $comment_ID = 0 ) {
@@ -77,7 +77,7 @@ 
  * @since 1.5.0
  * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
  *
- * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to get the author's email.
+ * @param integer $comment_ID Optional. WP_Comment or the ID of the comment for which to get the author's email.
  *									 Default current comment.
  * @return string The current comment author's email
  */
@@ -109,7 +109,7 @@ 
  * @since 0.71
  * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
  *
- * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to print the author's email.
+ * @param integer $comment_ID Optional. WP_Comment or the ID of the comment for which to print the author's email.
  *									 Default current comment.
  */
 function comment_author_email( $comment_ID = 0 ) {
@@ -201,7 +201,7 @@ 
  * @since 1.5.0
  * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
  *
- * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to get the author's link.
+ * @param integer $comment_ID Optional. WP_Comment or the ID of the comment for which to get the author's link.
  *									 Default current comment.
  * @return string The comment author name or HTML link for author's URL.
  */
@@ -235,7 +235,7 @@ 
  * @since 0.71
  * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
  *
- * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to print the author's link.
+ * @param integer $comment_ID Optional. WP_Comment or the ID of the comment for which to print the author's link.
  *									 Default current comment.
  */
 function comment_author_link( $comment_ID = 0 ) {
@@ -248,7 +248,7 @@ 
  * @since 1.5.0
  * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
  *
- * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to get the author's IP address.
+ * @param integer $comment_ID Optional. WP_Comment or the ID of the comment for which to get the author's IP address.
  *									 Default current comment.
  * @return string Comment author's IP address.
  */
@@ -274,7 +274,7 @@ 
  * @since 0.71
  * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
  *
- * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to print the author's IP address.
+ * @param integer $comment_ID Optional. WP_Comment or the ID of the comment for which to print the author's IP address.
  *									 Default current comment.
  */
 function comment_author_IP( $comment_ID = 0 ) {
@@ -287,7 +287,7 @@ 
  * @since 1.5.0
  * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
  *
- * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to get the author's URL.
+ * @param integer $comment_ID Optional. WP_Comment or the ID of the comment for which to get the author's URL.
  *									 Default current comment.
  * @return string Comment author URL.
  */
@@ -315,7 +315,7 @@ 
  * @since 0.71
  * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
  *
- * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to print the author's URL.
+ * @param integer $comment_ID Optional. WP_Comment or the ID of the comment for which to print the author's URL.
  *									 Default current comment.
  */
 function comment_author_url( $comment_ID = 0 ) {
@@ -513,7 +513,7 @@ 
  * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
  *
  * @param string          $d          Optional. The format of the date. Default user's setting.
- * @param int|WP_Comment  $comment_ID WP_Comment or ID of the comment for which to get the date.
+ * @param integer  $comment_ID WP_Comment or ID of the comment for which to get the date.
  *                                    Default current comment.
  * @return string The comment's date.
  */
@@ -542,7 +542,7 @@ 
  * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
  *
  * @param string         $d          Optional. The format of the date. Default user's settings.
- * @param int|WP_Comment $comment_ID WP_Comment or ID of the comment for which to print the date.
+ * @param integer $comment_ID WP_Comment or ID of the comment for which to print the date.
  *                                   Default current comment.
  */
 function comment_date( $d = '', $comment_ID = 0 ) {
@@ -559,7 +559,7 @@ 
  * @since 1.5.0
  * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
  *
- * @param int|WP_Comment $comment_ID  WP_Comment or ID of the comment for which to get the excerpt.
+ * @param integer $comment_ID  WP_Comment or ID of the comment for which to get the excerpt.
  *                                    Default current comment.
  * @return string The maybe truncated comment with 20 words or less.
  */
@@ -605,7 +605,7 @@ 
  * @since 1.2.0
  * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
  *
- * @param int|WP_Comment $comment_ID  WP_Comment or ID of the comment for which to print the excerpt.
+ * @param integer $comment_ID  WP_Comment or ID of the comment for which to print the excerpt.
  *                                    Default current comment.
  */
 function comment_excerpt( $comment_ID = 0 ) {
@@ -775,7 +775,7 @@ 
  *
  * @since 1.5.0
  *
- * @param int|WP_Post $post_id Optional. Post ID or WP_Post object. Default is global $post.
+ * @param integer $post_id Optional. Post ID or WP_Post object. Default is global $post.
  * @return string The link to the comments.
  */
 function get_comments_link( $post_id = 0 ) {
@@ -814,7 +814,7 @@ 
  *
  * @since 1.5.0
  *
- * @param int|WP_Post $post_id Optional. Post ID or WP_Post object. Default is global $post.
+ * @param integer $post_id Optional. Post ID or WP_Post object. Default is global $post.
  * @return int The number of comments a post has.
  */
 function get_comments_number( $post_id = 0 ) {
@@ -902,7 +902,7 @@ 
  *
  * @see Walker_Comment::comment()
  *
- * @param int|WP_Comment  $comment_ID WP_Comment or ID of the comment for which to get the text.
+ * @param integer  $comment_ID WP_Comment or ID of the comment for which to get the text.
  *                                    Default current comment.
  * @param array           $args       Optional. An array of arguments. Default empty.
  * @return string The comment content.
@@ -932,7 +932,7 @@ 
  *
  * @see Walker_Comment::comment()
  *
- * @param int|WP_Comment  $comment_ID WP_Comment or ID of the comment for which to print the text.
+ * @param integer  $comment_ID WP_Comment or ID of the comment for which to print the text.
  *                                    Default current comment.
  * @param array           $args       Optional. An array of arguments. Default empty array. Default empty.
  */
@@ -1005,7 +1005,7 @@ 
  * @since 1.5.0
  * @since 4.4.0 Added the ability for `$comment_ID` to also accept a WP_Comment object.
  *
- * @param int|WP_Comment $comment_ID Optional. WP_Comment or ID of the comment for which to get the type.
+ * @param integer $comment_ID Optional. WP_Comment or ID of the comment for which to get the type.
  *                                   Default current comment.
  * @return string The comment type.
  */

Indentation +15 added lines, -15 removed lines

@@ -2126,11 +2126,11 @@ 
 	$html5    = 'html5' === $args['format'];
 	$fields   =  array(
 		'author' => '<p class="comment-form-author">' . '<label for="author">' . __( 'Name' ) . ( $req ? ' <span class="required">*</span>' : '' ) . '</label> ' .
-		            '<input id="author" name="author" type="text" value="' . esc_attr( $commenter['comment_author'] ) . '" size="30" maxlength="245"' . $aria_req . $html_req . ' /></p>',
+					'<input id="author" name="author" type="text" value="' . esc_attr( $commenter['comment_author'] ) . '" size="30" maxlength="245"' . $aria_req . $html_req . ' /></p>',
 		'email'  => '<p class="comment-form-email"><label for="email">' . __( 'Email' ) . ( $req ? ' <span class="required">*</span>' : '' ) . '</label> ' .
-		            '<input id="email" name="email" ' . ( $html5 ? 'type="email"' : 'type="text"' ) . ' value="' . esc_attr(  $commenter['comment_author_email'] ) . '" size="30" maxlength="100" aria-describedby="email-notes"' . $aria_req . $html_req  . ' /></p>',
+					'<input id="email" name="email" ' . ( $html5 ? 'type="email"' : 'type="text"' ) . ' value="' . esc_attr(  $commenter['comment_author_email'] ) . '" size="30" maxlength="100" aria-describedby="email-notes"' . $aria_req . $html_req  . ' /></p>',
 		'url'    => '<p class="comment-form-url"><label for="url">' . __( 'Website' ) . '</label> ' .
-		            '<input id="url" name="url" ' . ( $html5 ? 'type="url"' : 'type="text"' ) . ' value="' . esc_attr( $commenter['comment_author_url'] ) . '" size="30" maxlength="200" /></p>',
+					'<input id="url" name="url" ' . ( $html5 ? 'type="url"' : 'type="text"' ) . ' value="' . esc_attr( $commenter['comment_author_url'] ) . '" size="30" maxlength="200" /></p>',
 	);
 
 	$required_text = sprintf( ' ' . __('Required fields are marked %s'), '<span class="required">*</span>' );
@@ -2148,20 +2148,20 @@ 
 		'comment_field'        => '<p class="comment-form-comment"><label for="comment">' . _x( 'Comment', 'noun' ) . '</label> <textarea id="comment" name="comment" cols="45" rows="8" maxlength="65525" aria-required="true" required="required"></textarea></p>',
 		/** This filter is documented in wp-includes/link-template.php */
 		'must_log_in'          => '<p class="must-log-in">' . sprintf(
-		                              /* translators: %s: login URL */
-		                              __( 'You must be <a href="%s">logged in</a> to post a comment.' ),
-		                              wp_login_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) )
-		                          ) . '</p>',
+									  /* translators: %s: login URL */
+									  __( 'You must be <a href="%s">logged in</a> to post a comment.' ),
+									  wp_login_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) )
+								  ) . '</p>',
 		/** This filter is documented in wp-includes/link-template.php */
 		'logged_in_as'         => '<p class="logged-in-as">' . sprintf(
-		                              /* translators: 1: edit user link, 2: accessibility text, 3: user name, 4: logout URL */
-		                              __( '<a href="%1$s" aria-label="%2$s">Logged in as %3$s</a>. <a href="%4$s">Log out?</a>' ),
-		                              get_edit_user_link(),
-		                              /* translators: %s: user name */
-		                              esc_attr( sprintf( __( 'Logged in as %s. Edit your profile.' ), $user_identity ) ),
-		                              $user_identity,
-		                              wp_logout_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) )
-		                          ) . '</p>',
+									  /* translators: 1: edit user link, 2: accessibility text, 3: user name, 4: logout URL */
+									  __( '<a href="%1$s" aria-label="%2$s">Logged in as %3$s</a>. <a href="%4$s">Log out?</a>' ),
+									  get_edit_user_link(),
+									  /* translators: %s: user name */
+									  esc_attr( sprintf( __( 'Logged in as %s. Edit your profile.' ), $user_identity ) ),
+									  $user_identity,
+									  wp_logout_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) )
+								  ) . '</p>',
 		'comment_notes_before' => '<p class="comment-notes"><span id="email-notes">' . __( 'Your email address will not be published.' ) . '</span>'. ( $req ? $required_text : '' ) . '</p>',
 		'comment_notes_after'  => '',
 		'id_form'              => 'commentform',

Spacing +402 added lines, -402 removed lines

@@ -21,11 +21,11 @@ 
  *									 Default current comment.
  * @return string The comment author
  */
-function get_comment_author( $comment_ID = 0 ) {
-	$comment = get_comment( $comment_ID );
+function get_comment_author($comment_ID = 0) {
+	$comment = get_comment($comment_ID);
 
-	if ( empty( $comment->comment_author ) ) {
-		if ( $comment->user_id && $user = get_userdata( $comment->user_id ) )
+	if (empty($comment->comment_author)) {
+		if ($comment->user_id && $user = get_userdata($comment->user_id))
 			$author = $user->display_name;
 		else
 			$author = __('Anonymous');
@@ -43,7 +43,7 @@ 
 	 * @param int        $comment_ID The comment ID.
 	 * @param WP_Comment $comment    The comment object.
 	 */
-	return apply_filters( 'get_comment_author', $author, $comment->comment_ID, $comment );
+	return apply_filters('get_comment_author', $author, $comment->comment_ID, $comment);
 }
 
 /**
@@ -55,9 +55,9 @@ 
  * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to print the author.
  *									 Default current comment.
  */
-function comment_author( $comment_ID = 0 ) {
-	$comment = get_comment( $comment_ID );
-	$author  = get_comment_author( $comment );
+function comment_author($comment_ID = 0) {
+	$comment = get_comment($comment_ID);
+	$author  = get_comment_author($comment);
 
 	/**
 	 * Filter the comment author's name for display.
@@ -68,7 +68,7 @@ 
 	 * @param string $author     The comment author's username.
 	 * @param int    $comment_ID The comment ID.
 	 */
-	echo apply_filters( 'comment_author', $author, $comment->comment_ID );
+	echo apply_filters('comment_author', $author, $comment->comment_ID);
 }
 
 /**
@@ -81,8 +81,8 @@ 
  *									 Default current comment.
  * @return string The current comment author's email
  */
-function get_comment_author_email( $comment_ID = 0 ) {
-	$comment = get_comment( $comment_ID );
+function get_comment_author_email($comment_ID = 0) {
+	$comment = get_comment($comment_ID);
 
 	/**
 	 * Filter the comment author's returned email address.
@@ -94,7 +94,7 @@ 
 	 * @param int        $comment_ID           The comment ID.
 	 * @param WP_Comment $comment              The comment object.
 	 */
-	return apply_filters( 'get_comment_author_email', $comment->comment_author_email, $comment->comment_ID, $comment );
+	return apply_filters('get_comment_author_email', $comment->comment_author_email, $comment->comment_ID, $comment);
 }
 
 /**
@@ -112,9 +112,9 @@ 
  * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to print the author's email.
  *									 Default current comment.
  */
-function comment_author_email( $comment_ID = 0 ) {
-	$comment      = get_comment( $comment_ID );
-	$author_email = get_comment_author_email( $comment );
+function comment_author_email($comment_ID = 0) {
+	$comment      = get_comment($comment_ID);
+	$author_email = get_comment_author_email($comment);
 
 	/**
 	 * Filter the comment author's email for display.
@@ -125,7 +125,7 @@ 
 	 * @param string $author_email The comment author's email address.
 	 * @param int    $comment_ID   The comment ID.
 	 */
-	echo apply_filters( 'author_email', $author_email, $comment->comment_ID );
+	echo apply_filters('author_email', $author_email, $comment->comment_ID);
 }
 
 /**
@@ -144,8 +144,8 @@ 
  * @param string $before   Optional. Text or HTML to display before the email link. Default empty.
  * @param string $after    Optional. Text or HTML to display after the email link. Default empty.
  */
-function comment_author_email_link( $linktext = '', $before = '', $after = '' ) {
-	if ( $link = get_comment_author_email_link( $linktext, $before, $after ) )
+function comment_author_email_link($linktext = '', $before = '', $after = '') {
+	if ($link = get_comment_author_email_link($linktext, $before, $after))
 		echo $link;
 }
 
@@ -166,7 +166,7 @@ 
  * @param string $after    Optional. Text or HTML to display after the email link. Default empty.
  * @return string
  */
-function get_comment_author_email_link( $linktext = '', $before = '', $after = '' ) {
+function get_comment_author_email_link($linktext = '', $before = '', $after = '') {
 	$comment = get_comment();
 	/**
 	 * Filter the comment author's email for display.
@@ -180,11 +180,11 @@ 
 	 * @param string     $comment_author_email The comment author's email address.
 	 * @param WP_Comment $comment              The comment object.
 	 */
-	$email = apply_filters( 'comment_email', $comment->comment_author_email, $comment );
-	if ((!empty($email)) && ($email != '@')) {
+	$email = apply_filters('comment_email', $comment->comment_author_email, $comment);
+	if (( ! empty($email)) && ($email != '@')) {
 	$display = ($linktext != '') ? $linktext : $email;
 		$return  = $before;
-		$return .= sprintf( '<a href="%1$s">%2$s</a>', esc_url( 'mailto:' . $email ), esc_html( $display ) );
+		$return .= sprintf('<a href="%1$s">%2$s</a>', esc_url('mailto:'.$email), esc_html($display));
 	 	$return .= $after;
 		return $return;
 	} else {
@@ -205,12 +205,12 @@ 
  *									 Default current comment.
  * @return string The comment author name or HTML link for author's URL.
  */
-function get_comment_author_link( $comment_ID = 0 ) {
-	$comment = get_comment( $comment_ID );
-	$url     = get_comment_author_url( $comment );
-	$author  = get_comment_author( $comment );
+function get_comment_author_link($comment_ID = 0) {
+	$comment = get_comment($comment_ID);
+	$url     = get_comment_author_url($comment);
+	$author  = get_comment_author($comment);
 
-	if ( empty( $url ) || 'http://' == $url )
+	if (empty($url) || 'http://' == $url)
 		$return = $author;
 	else
 		$return = "<a href='$url' rel='external nofollow' class='url'>$author</a>";
@@ -226,7 +226,7 @@ 
 	 * @param string $author     The comment author's username.
 	 * @param int    $comment_ID The comment ID.
 	 */
-	return apply_filters( 'get_comment_author_link', $return, $author, $comment->comment_ID );
+	return apply_filters('get_comment_author_link', $return, $author, $comment->comment_ID);
 }
 
 /**
@@ -238,8 +238,8 @@ 
  * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to print the author's link.
  *									 Default current comment.
  */
-function comment_author_link( $comment_ID = 0 ) {
-	echo get_comment_author_link( $comment_ID );
+function comment_author_link($comment_ID = 0) {
+	echo get_comment_author_link($comment_ID);
 }
 
 /**
@@ -252,8 +252,8 @@ 
  *									 Default current comment.
  * @return string Comment author's IP address.
  */
-function get_comment_author_IP( $comment_ID = 0 ) {
-	$comment = get_comment( $comment_ID );
+function get_comment_author_IP($comment_ID = 0) {
+	$comment = get_comment($comment_ID);
 
 	/**
 	 * Filter the comment author's returned IP address.
@@ -265,7 +265,7 @@ 
 	 * @param int        $comment_ID        The comment ID.
 	 * @param WP_Comment $comment           The comment object.
 	 */
-	return apply_filters( 'get_comment_author_IP', $comment->comment_author_IP, $comment->comment_ID, $comment );
+	return apply_filters('get_comment_author_IP', $comment->comment_author_IP, $comment->comment_ID, $comment);
 }
 
 /**
@@ -277,8 +277,8 @@ 
  * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to print the author's IP address.
  *									 Default current comment.
  */
-function comment_author_IP( $comment_ID = 0 ) {
-	echo esc_html( get_comment_author_IP( $comment_ID ) );
+function comment_author_IP($comment_ID = 0) {
+	echo esc_html(get_comment_author_IP($comment_ID));
 }
 
 /**
@@ -291,10 +291,10 @@ 
  *									 Default current comment.
  * @return string Comment author URL.
  */
-function get_comment_author_url( $comment_ID = 0 ) {
-	$comment = get_comment( $comment_ID );
+function get_comment_author_url($comment_ID = 0) {
+	$comment = get_comment($comment_ID);
 	$url = ('http://' == $comment->comment_author_url) ? '' : $comment->comment_author_url;
-	$url = esc_url( $url, array('http', 'https') );
+	$url = esc_url($url, array('http', 'https'));
 
 	/**
 	 * Filter the comment author's URL.
@@ -306,7 +306,7 @@ 
 	 * @param int        $comment_ID The comment ID.
 	 * @param WP_Comment $comment    The comment object.
 	 */
-	return apply_filters( 'get_comment_author_url', $url, $comment->comment_ID, $comment );
+	return apply_filters('get_comment_author_url', $url, $comment->comment_ID, $comment);
 }
 
 /**
@@ -318,9 +318,9 @@ 
  * @param int|WP_Comment $comment_ID Optional. WP_Comment or the ID of the comment for which to print the author's URL.
  *									 Default current comment.
  */
-function comment_author_url( $comment_ID = 0 ) {
-	$comment    = get_comment( $comment_ID );
-	$author_url = get_comment_author_url( $comment );
+function comment_author_url($comment_ID = 0) {
+	$comment    = get_comment($comment_ID);
+	$author_url = get_comment_author_url($comment);
 
 	/**
 	 * Filter the comment author's URL for display.
@@ -331,7 +331,7 @@ 
 	 * @param string $author_url The comment author's URL.
 	 * @param int    $comment_ID The comment ID.
 	 */
-	echo apply_filters( 'comment_url', $author_url, $comment->comment_ID );
+	echo apply_filters('comment_url', $author_url, $comment->comment_ID);
 }
 
 /**
@@ -354,13 +354,13 @@ 
  *                         Default empty.
  * @return string The HTML link between the $before and $after parameters.
  */
-function get_comment_author_url_link( $linktext = '', $before = '', $after = '' ) {
+function get_comment_author_url_link($linktext = '', $before = '', $after = '') {
 	$url = get_comment_author_url();
 	$display = ($linktext != '') ? $linktext : $url;
-	$display = str_replace( 'http://www.', '', $display );
-	$display = str_replace( 'http://', '', $display );
+	$display = str_replace('http://www.', '', $display);
+	$display = str_replace('http://', '', $display);
 
-	if ( '/' == substr($display, -1) ) {
+	if ('/' == substr($display, -1)) {
 		$display = substr($display, 0, -1);
 	}
 
@@ -373,7 +373,7 @@ 
 	 *
 	 * @param string $return The HTML-formatted comment author URL link.
 	 */
-	return apply_filters( 'get_comment_author_url_link', $return );
+	return apply_filters('get_comment_author_url_link', $return);
 }
 
 /**
@@ -388,8 +388,8 @@ 
  * @param string $after    Optional. Text or HTML to display after the email link.
  *                         Default empty.
  */
-function comment_author_url_link( $linktext = '', $before = '', $after = '' ) {
-	echo get_comment_author_url_link( $linktext, $before, $after );
+function comment_author_url_link($linktext = '', $before = '', $after = '') {
+	echo get_comment_author_url_link($linktext, $before, $after);
 }
 
 /**
@@ -406,10 +406,10 @@ 
  *                                 Default true.
  * @return string If `$echo` is false, the class will be returned. Void otherwise.
  */
-function comment_class( $class = '', $comment = null, $post_id = null, $echo = true ) {
+function comment_class($class = '', $comment = null, $post_id = null, $echo = true) {
 	// Separates classes with a single space, collates classes for comment DIV
-	$class = 'class="' . join( ' ', get_comment_class( $class, $comment, $post_id ) ) . '"';
-	if ( $echo)
+	$class = 'class="'.join(' ', get_comment_class($class, $comment, $post_id)).'"';
+	if ($echo)
 		echo $class;
 	else
 		return $class;
@@ -430,39 +430,39 @@ 
  * @param int|WP_Post    $post_id    Post ID or WP_Post object. Default current post.
  * @return array An array of classes.
  */
-function get_comment_class( $class = '', $comment_id = null, $post_id = null ) {
+function get_comment_class($class = '', $comment_id = null, $post_id = null) {
 	global $comment_alt, $comment_depth, $comment_thread_alt;
 
 	$classes = array();
 
-	$comment = get_comment( $comment_id );
-	if ( ! $comment ) {
+	$comment = get_comment($comment_id);
+	if ( ! $comment) {
 		return $classes;
 	}
 
 	// Get the comment type (comment, trackback),
-	$classes[] = ( empty( $comment->comment_type ) ) ? 'comment' : $comment->comment_type;
+	$classes[] = (empty($comment->comment_type)) ? 'comment' : $comment->comment_type;
 
 	// Add classes for comment authors that are registered users.
-	if ( $comment->user_id > 0 && $user = get_userdata( $comment->user_id ) ) {
+	if ($comment->user_id > 0 && $user = get_userdata($comment->user_id)) {
 		$classes[] = 'byuser';
-		$classes[] = 'comment-author-' . sanitize_html_class( $user->user_nicename, $comment->user_id );
+		$classes[] = 'comment-author-'.sanitize_html_class($user->user_nicename, $comment->user_id);
 		// For comment authors who are the author of the post
-		if ( $post = get_post($post_id) ) {
-			if ( $comment->user_id === $post->post_author ) {
+		if ($post = get_post($post_id)) {
+			if ($comment->user_id === $post->post_author) {
 				$classes[] = 'bypostauthor';
 			}
 		}
 	}
 
-	if ( empty($comment_alt) )
+	if (empty($comment_alt))
 		$comment_alt = 0;
-	if ( empty($comment_depth) )
+	if (empty($comment_depth))
 		$comment_depth = 1;
-	if ( empty($comment_thread_alt) )
+	if (empty($comment_thread_alt))
 		$comment_thread_alt = 0;
 
-	if ( $comment_alt % 2 ) {
+	if ($comment_alt % 2) {
 		$classes[] = 'odd';
 		$classes[] = 'alt';
 	} else {
@@ -472,8 +472,8 @@ 
 	$comment_alt++;
 
 	// Alt for top-level comments
-	if ( 1 == $comment_depth ) {
-		if ( $comment_thread_alt % 2 ) {
+	if (1 == $comment_depth) {
+		if ($comment_thread_alt % 2) {
 			$classes[] = 'thread-odd';
 			$classes[] = 'thread-alt';
 		} else {
@@ -484,8 +484,8 @@ 
 
 	$classes[] = "depth-$comment_depth";
 
-	if ( !empty($class) ) {
-		if ( !is_array( $class ) )
+	if ( ! empty($class)) {
+		if ( ! is_array($class))
 			$class = preg_split('#\s+#', $class);
 		$classes = array_merge($classes, $class);
 	}
@@ -503,7 +503,7 @@ 
 	 * @param WP_Comment  $comment    The comment object.
 	 * @param int|WP_Post $post_id    The post ID or WP_Post object.
 	 */
-	return apply_filters( 'comment_class', $classes, $class, $comment->comment_ID, $comment, $post_id );
+	return apply_filters('comment_class', $classes, $class, $comment->comment_ID, $comment, $post_id);
 }
 
 /**
@@ -517,9 +517,9 @@ 
  *                                    Default current comment.
  * @return string The comment's date.
  */
-function get_comment_date( $d = '', $comment_ID = 0 ) {
-	$comment = get_comment( $comment_ID );
-	if ( '' == $d )
+function get_comment_date($d = '', $comment_ID = 0) {
+	$comment = get_comment($comment_ID);
+	if ('' == $d)
 		$date = mysql2date(get_option('date_format'), $comment->comment_date);
 	else
 		$date = mysql2date($d, $comment->comment_date);
@@ -532,7 +532,7 @@ 
 	 * @param string     $d       The format of the date.
 	 * @param WP_Comment $comment The comment object.
 	 */
-	return apply_filters( 'get_comment_date', $date, $d, $comment );
+	return apply_filters('get_comment_date', $date, $d, $comment);
 }
 
 /**
@@ -545,8 +545,8 @@ 
  * @param int|WP_Comment $comment_ID WP_Comment or ID of the comment for which to print the date.
  *                                   Default current comment.
  */
-function comment_date( $d = '', $comment_ID = 0 ) {
-	echo get_comment_date( $d, $comment_ID );
+function comment_date($d = '', $comment_ID = 0) {
+	echo get_comment_date($d, $comment_ID);
 }
 
 /**
@@ -563,10 +563,10 @@ 
  *                                    Default current comment.
  * @return string The maybe truncated comment with 20 words or less.
  */
-function get_comment_excerpt( $comment_ID = 0 ) {
-	$comment = get_comment( $comment_ID );
-	$comment_text = strip_tags( str_replace( array( "\n", "\r" ), ' ', $comment->comment_content ) );
-	$words = explode( ' ', $comment_text );
+function get_comment_excerpt($comment_ID = 0) {
+	$comment = get_comment($comment_ID);
+	$comment_text = strip_tags(str_replace(array("\n", "\r"), ' ', $comment->comment_content));
+	$words = explode(' ', $comment_text);
 
 	/**
 	 * Filter the amount of words used in the comment excerpt.
@@ -575,15 +575,15 @@ 
 	 *
 	 * @param int $comment_excerpt_length The amount of words you want to display in the comment excerpt.
 	 */
-	$comment_excerpt_length = apply_filters( 'comment_excerpt_length', 20 );
+	$comment_excerpt_length = apply_filters('comment_excerpt_length', 20);
 
-	$use_ellipsis = count( $words ) > $comment_excerpt_length;
-	if ( $use_ellipsis ) {
-		$words = array_slice( $words, 0, $comment_excerpt_length );
+	$use_ellipsis = count($words) > $comment_excerpt_length;
+	if ($use_ellipsis) {
+		$words = array_slice($words, 0, $comment_excerpt_length);
 	}
 
-	$excerpt = trim( join( ' ', $words ) );
-	if ( $use_ellipsis ) {
+	$excerpt = trim(join(' ', $words));
+	if ($use_ellipsis) {
 		$excerpt .= '&hellip;';
 	}
 	/**
@@ -596,7 +596,7 @@ 
 	 * @param int        $comment_ID The comment ID.
 	 * @param WP_Comment $comment    The comment object.
 	 */
-	return apply_filters( 'get_comment_excerpt', $excerpt, $comment->comment_ID, $comment );
+	return apply_filters('get_comment_excerpt', $excerpt, $comment->comment_ID, $comment);
 }
 
 /**
@@ -608,9 +608,9 @@ 
  * @param int|WP_Comment $comment_ID  WP_Comment or ID of the comment for which to print the excerpt.
  *                                    Default current comment.
  */
-function comment_excerpt( $comment_ID = 0 ) {
-	$comment         = get_comment( $comment_ID );
-	$comment_excerpt = get_comment_excerpt( $comment );
+function comment_excerpt($comment_ID = 0) {
+	$comment         = get_comment($comment_ID);
+	$comment_excerpt = get_comment_excerpt($comment);
 
 	/**
 	 * Filter the comment excerpt for display.
@@ -621,7 +621,7 @@ 
 	 * @param string $comment_excerpt The comment excerpt text.
 	 * @param int    $comment_ID      The comment ID.
 	 */
-	echo apply_filters( 'comment_excerpt', $comment_excerpt, $comment->comment_ID );
+	echo apply_filters('comment_excerpt', $comment_excerpt, $comment->comment_ID);
 }
 
 /**
@@ -643,7 +643,7 @@ 
 	 * @param int        $comment_ID The current comment ID.
 	 * @param WP_Comment $comment    The comment object.
 	 */
-	return apply_filters( 'get_comment_ID', $comment->comment_ID, $comment );
+	return apply_filters('get_comment_ID', $comment->comment_ID, $comment);
 }
 
 /**
@@ -679,14 +679,14 @@ 
  * }
  * @return string The permalink to the given comment.
  */
-function get_comment_link( $comment = null, $args = array() ) {
+function get_comment_link($comment = null, $args = array()) {
 	global $wp_rewrite, $in_comment_loop;
 
 	$comment = get_comment($comment);
 
 	// Backwards compat
-	if ( ! is_array( $args ) ) {
-		$args = array( 'page' => $args );
+	if ( ! is_array($args)) {
+		$args = array('page' => $args);
 	}
 
 	$defaults = array(
@@ -696,33 +696,33 @@ 
 		'max_depth' => '',
 		'cpage'     => null,
 	);
-	$args = wp_parse_args( $args, $defaults );
+	$args = wp_parse_args($args, $defaults);
 
-	$link = get_permalink( $comment->comment_post_ID );
+	$link = get_permalink($comment->comment_post_ID);
 
 	// The 'cpage' param takes precedence.
-	if ( ! is_null( $args['cpage'] ) ) {
+	if ( ! is_null($args['cpage'])) {
 		$cpage = $args['cpage'];
 
 	// No 'cpage' is provided, so we calculate one.
 	} else {
-		if ( '' === $args['per_page'] && get_option( 'page_comments' ) ) {
+		if ('' === $args['per_page'] && get_option('page_comments')) {
 			$args['per_page'] = get_option('comments_per_page');
 		}
 
-		if ( empty( $args['per_page'] ) ) {
+		if (empty($args['per_page'])) {
 			$args['per_page'] = 0;
 			$args['page'] = 0;
 		}
 
 		$cpage = $args['page'];
 
-		if ( '' == $cpage ) {
-			if ( ! empty( $in_comment_loop ) ) {
-				$cpage = get_query_var( 'cpage' );
+		if ('' == $cpage) {
+			if ( ! empty($in_comment_loop)) {
+				$cpage = get_query_var('cpage');
 			} else {
 				// Requires a database hit, so we only do it when we can't figure out from context.
-				$cpage = get_page_of_comment( $comment->comment_ID, $args );
+				$cpage = get_page_of_comment($comment->comment_ID, $args);
 			}
 		}
 
@@ -730,29 +730,29 @@ 
 		 * If the default page displays the oldest comments, the permalinks for comments on the default page
 		 * do not need a 'cpage' query var.
 		 */
-		if ( 'oldest' === get_option( 'default_comments_page' ) && 1 === $cpage ) {
+		if ('oldest' === get_option('default_comments_page') && 1 === $cpage) {
 			$cpage = '';
 		}
 	}
 
-	if ( $cpage && get_option( 'page_comments' ) ) {
-		if ( $wp_rewrite->using_permalinks() ) {
-			if ( $cpage ) {
-				$link = trailingslashit( $link ) . $wp_rewrite->comments_pagination_base . '-' . $cpage;
+	if ($cpage && get_option('page_comments')) {
+		if ($wp_rewrite->using_permalinks()) {
+			if ($cpage) {
+				$link = trailingslashit($link).$wp_rewrite->comments_pagination_base.'-'.$cpage;
 			}
 
-			$link = user_trailingslashit( $link, 'comment' );
-		} elseif ( $cpage ) {
-			$link = add_query_arg( 'cpage', $cpage, $link );
+			$link = user_trailingslashit($link, 'comment');
+		} elseif ($cpage) {
+			$link = add_query_arg('cpage', $cpage, $link);
 		}
 
 	}
 
-	if ( $wp_rewrite->using_permalinks() ) {
-		$link = user_trailingslashit( $link, 'comment' );
+	if ($wp_rewrite->using_permalinks()) {
+		$link = user_trailingslashit($link, 'comment');
 	}
 
-	$link = $link . '#comment-' . $comment->comment_ID;
+	$link = $link.'#comment-'.$comment->comment_ID;
 
 	/**
 	 * Filter the returned single comment permalink.
@@ -767,7 +767,7 @@ 
 	 * @param array      $args    An array of arguments to override the defaults.
 	 * @param int        $cpage   The calculated 'cpage' value.
 	 */
-	return apply_filters( 'get_comment_link', $link, $comment, $args, $cpage );
+	return apply_filters('get_comment_link', $link, $comment, $args, $cpage);
 }
 
 /**
@@ -778,9 +778,9 @@ 
  * @param int|WP_Post $post_id Optional. Post ID or WP_Post object. Default is global $post.
  * @return string The link to the comments.
  */
-function get_comments_link( $post_id = 0 ) {
-	$hash = get_comments_number( $post_id ) ? '#comments' : '#respond';
-	$comments_link = get_permalink( $post_id ) . $hash;
+function get_comments_link($post_id = 0) {
+	$hash = get_comments_number($post_id) ? '#comments' : '#respond';
+	$comments_link = get_permalink($post_id).$hash;
 
 	/**
 	 * Filter the returned post comments permalink.
@@ -790,7 +790,7 @@ 
 	 * @param string      $comments_link Post comments permalink with '#comments' appended.
 	 * @param int|WP_Post $post_id       Post ID or WP_Post object.
 	 */
-	return apply_filters( 'get_comments_link', $comments_link, $post_id );
+	return apply_filters('get_comments_link', $comments_link, $post_id);
 }
 
 /**
@@ -801,12 +801,12 @@ 
  * @param string $deprecated   Not Used.
  * @param string $deprecated_2 Not Used.
  */
-function comments_link( $deprecated = '', $deprecated_2 = '' ) {
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '0.72' );
-	if ( !empty( $deprecated_2 ) )
-		_deprecated_argument( __FUNCTION__, '1.3' );
-	echo esc_url( get_comments_link() );
+function comments_link($deprecated = '', $deprecated_2 = '') {
+	if ( ! empty($deprecated))
+		_deprecated_argument(__FUNCTION__, '0.72');
+	if ( ! empty($deprecated_2))
+		_deprecated_argument(__FUNCTION__, '1.3');
+	echo esc_url(get_comments_link());
 }
 
 /**
@@ -817,10 +817,10 @@ 
  * @param int|WP_Post $post_id Optional. Post ID or WP_Post object. Default is global $post.
  * @return int The number of comments a post has.
  */
-function get_comments_number( $post_id = 0 ) {
-	$post = get_post( $post_id );
+function get_comments_number($post_id = 0) {
+	$post = get_post($post_id);
 
-	if ( ! $post ) {
+	if ( ! $post) {
 		$count = 0;
 	} else {
 		$count = $post->comment_count;
@@ -835,7 +835,7 @@ 
 	 * @param int $count   Number of comments a post has.
 	 * @param int $post_id Post ID.
 	 */
-	return apply_filters( 'get_comments_number', $count, $post_id );
+	return apply_filters('get_comments_number', $count, $post_id);
 }
 
 /**
@@ -848,11 +848,11 @@ 
  * @param string $more       Optional. Text for more than one comment. Default false.
  * @param string $deprecated Not used.
  */
-function comments_number( $zero = false, $one = false, $more = false, $deprecated = '' ) {
-	if ( ! empty( $deprecated ) ) {
-		_deprecated_argument( __FUNCTION__, '1.3' );
+function comments_number($zero = false, $one = false, $more = false, $deprecated = '') {
+	if ( ! empty($deprecated)) {
+		_deprecated_argument(__FUNCTION__, '1.3');
 	}
-	echo get_comments_number_text( $zero, $one, $more );
+	echo get_comments_number_text($zero, $one, $more);
 }
 
 /**
@@ -864,21 +864,21 @@ 
  * @param string $one  Optional. Text for one comment. Default false.
  * @param string $more Optional. Text for more than one comment. Default false.
  */
-function get_comments_number_text( $zero = false, $one = false, $more = false ) {
+function get_comments_number_text($zero = false, $one = false, $more = false) {
 	$number = get_comments_number();
 
-	if ( $number > 1 ) {
-		if ( false === $more ) {
+	if ($number > 1) {
+		if (false === $more) {
 			/* translators: %s: number of comments */
-			$output = sprintf( _n( '%s Comment', '%s Comments', $number ), number_format_i18n( $number ) );
+			$output = sprintf(_n('%s Comment', '%s Comments', $number), number_format_i18n($number));
 		} else {
 			// % Comments
-			$output = str_replace( '%', number_format_i18n( $number ), $more );
+			$output = str_replace('%', number_format_i18n($number), $more);
 		}
-	} elseif ( $number == 0 ) {
-		$output = ( false === $zero ) ? __( 'No Comments' ) : $zero;
+	} elseif ($number == 0) {
+		$output = (false === $zero) ? __('No Comments') : $zero;
 	} else { // must be one
-		$output = ( false === $one ) ? __( '1 Comment' ) : $one;
+		$output = (false === $one) ? __('1 Comment') : $one;
 	}
 	/**
 	 * Filter the comments count for display.
@@ -891,7 +891,7 @@ 
 	 *                       is equal to 0, 1, or 1+.
 	 * @param int    $number The number of post comments.
 	 */
-	return apply_filters( 'comments_number', $output, $number );
+	return apply_filters('comments_number', $output, $number);
 }
 
 /**
@@ -907,8 +907,8 @@ 
  * @param array           $args       Optional. An array of arguments. Default empty.
  * @return string The comment content.
  */
-function get_comment_text( $comment_ID = 0, $args = array() ) {
-	$comment = get_comment( $comment_ID );
+function get_comment_text($comment_ID = 0, $args = array()) {
+	$comment = get_comment($comment_ID);
 
 	/**
 	 * Filter the text of a comment.
@@ -921,7 +921,7 @@ 
 	 * @param WP_Comment $comment         The comment object.
 	 * @param array      $args            An array of arguments.
 	 */
-	return apply_filters( 'get_comment_text', $comment->comment_content, $comment, $args );
+	return apply_filters('get_comment_text', $comment->comment_content, $comment, $args);
 }
 
 /**
@@ -936,10 +936,10 @@ 
  *                                    Default current comment.
  * @param array           $args       Optional. An array of arguments. Default empty array. Default empty.
  */
-function comment_text( $comment_ID = 0, $args = array() ) {
-	$comment = get_comment( $comment_ID );
+function comment_text($comment_ID = 0, $args = array()) {
+	$comment = get_comment($comment_ID);
 
-	$comment_text = get_comment_text( $comment, $args );
+	$comment_text = get_comment_text($comment, $args);
 	/**
 	 * Filter the text of a comment to be displayed.
 	 *
@@ -951,7 +951,7 @@ 
 	 * @param WP_Comment $comment      The comment object.
 	 * @param array      $args         An array of arguments.
 	 */
-	echo apply_filters( 'comment_text', $comment_text, $comment, $args );
+	echo apply_filters('comment_text', $comment_text, $comment, $args);
 }
 
 /**
@@ -965,11 +965,11 @@ 
  *                          Default true.
  * @return string The formatted time.
  */
-function get_comment_time( $d = '', $gmt = false, $translate = true ) {
+function get_comment_time($d = '', $gmt = false, $translate = true) {
 	$comment = get_comment();
 
 	$comment_date = $gmt ? $comment->comment_date_gmt : $comment->comment_date;
-	if ( '' == $d )
+	if ('' == $d)
 		$date = mysql2date(get_option('time_format'), $comment_date, $translate);
 	else
 		$date = mysql2date($d, $comment_date, $translate);
@@ -985,7 +985,7 @@ 
 	 * @param bool       $translate Whether the time is translated.
 	 * @param WP_Comment $comment   The comment object.
 	 */
-	return apply_filters( 'get_comment_time', $date, $d, $gmt, $translate, $comment );
+	return apply_filters('get_comment_time', $date, $d, $gmt, $translate, $comment);
 }
 
 /**
@@ -995,7 +995,7 @@ 
  *
  * @param string $d Optional. The format of the time. Default user's settings.
  */
-function comment_time( $d = '' ) {
+function comment_time($d = '') {
 	echo get_comment_time($d);
 }
 
@@ -1009,9 +1009,9 @@ 
  *                                   Default current comment.
  * @return string The comment type.
  */
-function get_comment_type( $comment_ID = 0 ) {
-	$comment = get_comment( $comment_ID );
-	if ( '' == $comment->comment_type )
+function get_comment_type($comment_ID = 0) {
+	$comment = get_comment($comment_ID);
+	if ('' == $comment->comment_type)
 		$comment->comment_type = 'comment';
 
 	/**
@@ -1024,7 +1024,7 @@ 
 	 * @param int 	     $comment_ID   The comment ID.
 	 * @param WP_Comment $comment      The comment object.
 	 */
-	return apply_filters( 'get_comment_type', $comment->comment_type, $comment->comment_ID, $comment );
+	return apply_filters('get_comment_type', $comment->comment_type, $comment->comment_ID, $comment);
 }
 
 /**
@@ -1036,12 +1036,12 @@ 
  * @param string $trackbacktxt Optional. String to display for trackback type. Default false.
  * @param string $pingbacktxt  Optional. String to display for pingback type. Default false.
  */
-function comment_type( $commenttxt = false, $trackbacktxt = false, $pingbacktxt = false ) {
-	if ( false === $commenttxt ) $commenttxt = _x( 'Comment', 'noun' );
-	if ( false === $trackbacktxt ) $trackbacktxt = __( 'Trackback' );
-	if ( false === $pingbacktxt ) $pingbacktxt = __( 'Pingback' );
+function comment_type($commenttxt = false, $trackbacktxt = false, $pingbacktxt = false) {
+	if (false === $commenttxt) $commenttxt = _x('Comment', 'noun');
+	if (false === $trackbacktxt) $trackbacktxt = __('Trackback');
+	if (false === $pingbacktxt) $pingbacktxt = __('Pingback');
 	$type = get_comment_type();
-	switch( $type ) {
+	switch ($type) {
 		case 'trackback' :
 			echo $trackbacktxt;
 			break;
@@ -1065,10 +1065,10 @@ 
  * @return string The trackback URL after being filtered.
  */
 function get_trackback_url() {
-	if ( '' != get_option('permalink_structure') )
-		$tb_url = trailingslashit(get_permalink()) . user_trailingslashit('trackback', 'single_trackback');
+	if ('' != get_option('permalink_structure'))
+		$tb_url = trailingslashit(get_permalink()).user_trailingslashit('trackback', 'single_trackback');
 	else
-		$tb_url = get_option('siteurl') . '/wp-trackback.php?p=' . get_the_ID();
+		$tb_url = get_option('siteurl').'/wp-trackback.php?p='.get_the_ID();
 
 	/**
 	 * Filter the returned trackback URL.
@@ -1077,7 +1077,7 @@ 
 	 *
 	 * @param string $tb_url The trackback URL.
 	 */
-	return apply_filters( 'trackback_url', $tb_url );
+	return apply_filters('trackback_url', $tb_url);
 }
 
 /**
@@ -1089,17 +1089,17 @@ 
  * @return void|string Should only be used to echo the trackback URL, use get_trackback_url()
  *                     for the result instead.
  */
-function trackback_url( $deprecated_echo = true ) {
-	if ( true !== $deprecated_echo ) {
-		_deprecated_argument( __FUNCTION__, '2.5',
+function trackback_url($deprecated_echo = true) {
+	if (true !== $deprecated_echo) {
+		_deprecated_argument(__FUNCTION__, '2.5',
 			/* translators: %s: get_trackback_url() */
-			sprintf( __( 'Use %s instead if you do not want the value echoed.' ),
+			sprintf(__('Use %s instead if you do not want the value echoed.'),
 				'<code>get_trackback_url()</code>'
 			)
 		);
 	}
 
-	if ( $deprecated_echo ) {
+	if ($deprecated_echo) {
 		echo get_trackback_url();
 	} else {
 		return get_trackback_url();
@@ -1115,12 +1115,12 @@ 
  *
  * @param int $deprecated Not used (Was $timezone = 0).
  */
-function trackback_rdf( $deprecated = '' ) {
-	if ( ! empty( $deprecated ) ) {
-		_deprecated_argument( __FUNCTION__, '2.5' );
+function trackback_rdf($deprecated = '') {
+	if ( ! empty($deprecated)) {
+		_deprecated_argument(__FUNCTION__, '2.5');
 	}
 
-	if ( isset( $_SERVER['HTTP_USER_AGENT'] ) && false !== stripos( $_SERVER['HTTP_USER_AGENT'], 'W3C_Validator' ) ) {
+	if (isset($_SERVER['HTTP_USER_AGENT']) && false !== stripos($_SERVER['HTTP_USER_AGENT'], 'W3C_Validator')) {
 		return;
 	}
 
@@ -1146,11 +1146,11 @@ 
  * @param int|WP_Post $post_id Post ID or WP_Post object. Default current post.
  * @return bool True if the comments are open.
  */
-function comments_open( $post_id = null ) {
+function comments_open($post_id = null) {
 
 	$_post = get_post($post_id);
 
-	$open = ( 'open' == $_post->comment_status );
+	$open = ('open' == $_post->comment_status);
 
 	/**
 	 * Filter whether the current post is open for comments.
@@ -1160,7 +1160,7 @@ 
 	 * @param bool        $open    Whether the current post is open for comments.
 	 * @param int|WP_Post $post_id The post ID or WP_Post object.
 	 */
-	return apply_filters( 'comments_open', $open, $post_id );
+	return apply_filters('comments_open', $open, $post_id);
 }
 
 /**
@@ -1171,11 +1171,11 @@ 
  * @param int|WP_Post $post_id Post ID or WP_Post object. Default current post.
  * @return bool True if pings are accepted
  */
-function pings_open( $post_id = null ) {
+function pings_open($post_id = null) {
 
 	$_post = get_post($post_id);
 
-	$open = ( 'open' == $_post->ping_status );
+	$open = ('open' == $_post->ping_status);
 
 	/**
 	 * Filter whether the current post is open for pings.
@@ -1185,7 +1185,7 @@ 
 	 * @param bool        $open    Whether the current post is open for pings.
 	 * @param int|WP_Post $post_id The post ID or WP_Post object.
 	 */
-	return apply_filters( 'pings_open', $open, $post_id );
+	return apply_filters('pings_open', $open, $post_id);
 }
 
 /**
@@ -1206,8 +1206,8 @@ 
 	$post = get_post();
 	$post_id = $post ? $post->ID : 0;
 
-	if ( current_user_can( 'unfiltered_html' ) ) {
-		wp_nonce_field( 'unfiltered-html-comment_' . $post_id, '_wp_unfiltered_html_comment_disabled', false );
+	if (current_user_can('unfiltered_html')) {
+		wp_nonce_field('unfiltered-html-comment_'.$post_id, '_wp_unfiltered_html_comment_disabled', false);
 		echo "<script>(function(){if(window===window.parent){document.getElementById('_wp_unfiltered_html_comment_disabled').name='_wp_unfiltered_html_comment';}})();</script>\n";
 	}
 }
@@ -1247,13 +1247,13 @@ 
  * @param bool   $separate_comments Optional. Whether to separate the comments by comment type.
  *                                  Default false.
  */
-function comments_template( $file = '/comments.php', $separate_comments = false ) {
+function comments_template($file = '/comments.php', $separate_comments = false) {
 	global $wp_query, $withcomments, $post, $wpdb, $id, $comment, $user_login, $user_ID, $user_identity, $overridden_cpage;
 
-	if ( !(is_single() || is_page() || $withcomments) || empty($post) )
+	if ( ! (is_single() || is_page() || $withcomments) || empty($post))
 		return;
 
-	if ( empty($file) )
+	if (empty($file))
 		$file = '/comments.php';
 
 	$req = get_option('require_name_email');
@@ -1289,31 +1289,31 @@ 
 		'update_comment_meta_cache' => false, // We lazy-load comment meta for performance.
 	);
 
-	if ( get_option('thread_comments') ) {
+	if (get_option('thread_comments')) {
 		$comment_args['hierarchical'] = 'threaded';
 	} else {
 		$comment_args['hierarchical'] = false;
 	}
 
-	if ( $user_ID ) {
-		$comment_args['include_unapproved'] = array( $user_ID );
-	} elseif ( ! empty( $comment_author_email ) ) {
-		$comment_args['include_unapproved'] = array( $comment_author_email );
+	if ($user_ID) {
+		$comment_args['include_unapproved'] = array($user_ID);
+	} elseif ( ! empty($comment_author_email)) {
+		$comment_args['include_unapproved'] = array($comment_author_email);
 	}
 
 	$per_page = 0;
-	if ( get_option( 'page_comments' ) ) {
-		$per_page = (int) get_query_var( 'comments_per_page' );
-		if ( 0 === $per_page ) {
-			$per_page = (int) get_option( 'comments_per_page' );
+	if (get_option('page_comments')) {
+		$per_page = (int) get_query_var('comments_per_page');
+		if (0 === $per_page) {
+			$per_page = (int) get_option('comments_per_page');
 		}
 
 		$comment_args['number'] = $per_page;
-		$page = (int) get_query_var( 'cpage' );
+		$page = (int) get_query_var('cpage');
 
-		if ( $page ) {
-			$comment_args['offset'] = ( $page - 1 ) * $per_page;
-		} elseif ( 'oldest' === get_option( 'default_comments_page' ) ) {
+		if ($page) {
+			$comment_args['offset'] = ($page - 1) * $per_page;
+		} elseif ('oldest' === get_option('default_comments_page')) {
 			$comment_args['offset'] = 0;
 		} else {
 			// If fetching the first page of 'newest', we need a top-level comment count.
@@ -1325,17 +1325,17 @@ 
 				'status'  => 'approve',
 			);
 
-			if ( $comment_args['hierarchical'] ) {
+			if ($comment_args['hierarchical']) {
 				$top_level_args['parent'] = 0;
 			}
 
-			if ( isset( $comment_args['include_unapproved'] ) ) {
+			if (isset($comment_args['include_unapproved'])) {
 				$top_level_args['include_unapproved'] = $comment_args['include_unapproved'];
 			}
 
-			$top_level_count = $top_level_query->query( $top_level_args );
+			$top_level_count = $top_level_query->query($top_level_args);
 
-			$comment_args['offset'] = ( ceil( $top_level_count / $per_page ) - 1 ) * $per_page;
+			$comment_args['offset'] = (ceil($top_level_count / $per_page) - 1) * $per_page;
 		}
 	}
 
@@ -1362,22 +1362,22 @@ 
 	 *     @type int          $number                    Number of comments to fetch.
 	 * }
 	 */
-	$comment_args = apply_filters( 'comments_template_query_args', $comment_args );
-	$comment_query = new WP_Comment_Query( $comment_args );
+	$comment_args = apply_filters('comments_template_query_args', $comment_args);
+	$comment_query = new WP_Comment_Query($comment_args);
 	$_comments = $comment_query->comments;
 
 	// Trees must be flattened before they're passed to the walker.
-	if ( $comment_args['hierarchical'] ) {
+	if ($comment_args['hierarchical']) {
 		$comments_flat = array();
-		foreach ( $_comments as $_comment ) {
+		foreach ($_comments as $_comment) {
 			$comments_flat[]  = $_comment;
-			$comment_children = $_comment->get_children( array(
+			$comment_children = $_comment->get_children(array(
 				'format' => 'flat',
 				'status' => $comment_args['status'],
 				'orderby' => $comment_args['orderby']
-			) );
+			));
 
-			foreach ( $comment_children as $comment_child ) {
+			foreach ($comment_children as $comment_child) {
 				$comments_flat[] = $comment_child;
 			}
 		}
@@ -1393,13 +1393,13 @@ 
 	 * @param array $comments Array of comments supplied to the comments template.
 	 * @param int   $post_ID  Post ID.
 	 */
-	$wp_query->comments = apply_filters( 'comments_array', $comments_flat, $post->ID );
+	$wp_query->comments = apply_filters('comments_array', $comments_flat, $post->ID);
 
 	$comments = &$wp_query->comments;
 	$wp_query->comment_count = count($wp_query->comments);
 	$wp_query->max_num_comment_pages = $comment_query->max_num_pages;
 
-	if ( $separate_comments ) {
+	if ($separate_comments) {
 		$wp_query->comments_by_type = separate_comments($comments);
 		$comments_by_type = &$wp_query->comments_by_type;
 	} else {
@@ -1407,15 +1407,15 @@ 
 	}
 
 	$overridden_cpage = false;
-	if ( '' == get_query_var( 'cpage' ) && $wp_query->max_num_comment_pages > 1 ) {
-		set_query_var( 'cpage', 'newest' == get_option('default_comments_page') ? get_comment_pages_count() : 1 );
+	if ('' == get_query_var('cpage') && $wp_query->max_num_comment_pages > 1) {
+		set_query_var('cpage', 'newest' == get_option('default_comments_page') ? get_comment_pages_count() : 1);
 		$overridden_cpage = true;
 	}
 
-	if ( !defined('COMMENTS_TEMPLATE') )
+	if ( ! defined('COMMENTS_TEMPLATE'))
 		define('COMMENTS_TEMPLATE', true);
 
-	$theme_template = STYLESHEETPATH . $file;
+	$theme_template = STYLESHEETPATH.$file;
 	/**
 	 * Filter the path to the theme template file used for the comments template.
 	 *
@@ -1423,13 +1423,13 @@ 
 	 *
 	 * @param string $theme_template The path to the theme template file.
 	 */
-	$include = apply_filters( 'comments_template', $theme_template );
-	if ( file_exists( $include ) )
-		require( $include );
-	elseif ( file_exists( TEMPLATEPATH . $file ) )
-		require( TEMPLATEPATH . $file );
+	$include = apply_filters('comments_template', $theme_template);
+	if (file_exists($include))
+		require($include);
+	elseif (file_exists(TEMPLATEPATH.$file))
+		require(TEMPLATEPATH.$file);
 	else // Backward compat code will be removed in a future release
-		require( ABSPATH . WPINC . '/theme-compat/comments.php');
+		require(ABSPATH.WPINC.'/theme-compat/comments.php');
 }
 
 /**
@@ -1446,45 +1446,45 @@ 
  * @param string $none      Optional. String to display when comments have been turned off.
  *                          Default false.
  */
-function comments_popup_link( $zero = false, $one = false, $more = false, $css_class = '', $none = false ) {
+function comments_popup_link($zero = false, $one = false, $more = false, $css_class = '', $none = false) {
 	$id = get_the_ID();
 	$title = get_the_title();
-	$number = get_comments_number( $id );
+	$number = get_comments_number($id);
 
-	if ( false === $zero ) {
+	if (false === $zero) {
 		/* translators: %s: post title */
-		$zero = sprintf( __( 'No Comments<span class="screen-reader-text"> on %s</span>' ), $title );
+		$zero = sprintf(__('No Comments<span class="screen-reader-text"> on %s</span>'), $title);
 	}
 
-	if ( false === $one ) {
+	if (false === $one) {
 		/* translators: %s: post title */
-		$one = sprintf( __( '1 Comment<span class="screen-reader-text"> on %s</span>' ), $title );
+		$one = sprintf(__('1 Comment<span class="screen-reader-text"> on %s</span>'), $title);
 	}
 
-	if ( false === $more ) {
+	if (false === $more) {
 		/* translators: 1: Number of comments 2: post title */
-		$more = _n( '%1$s Comment<span class="screen-reader-text"> on %2$s</span>', '%1$s Comments<span class="screen-reader-text"> on %2$s</span>', $number );
-		$more = sprintf( $more, number_format_i18n( $number ), $title );
+		$more = _n('%1$s Comment<span class="screen-reader-text"> on %2$s</span>', '%1$s Comments<span class="screen-reader-text"> on %2$s</span>', $number);
+		$more = sprintf($more, number_format_i18n($number), $title);
 	}
 
-	if ( false === $none ) {
+	if (false === $none) {
 		/* translators: %s: post title */
-		$none = sprintf( __( 'Comments Off<span class="screen-reader-text"> on %s</span>' ), $title );
+		$none = sprintf(__('Comments Off<span class="screen-reader-text"> on %s</span>'), $title);
 	}
 
-	if ( 0 == $number && !comments_open() && !pings_open() ) {
-		echo '<span' . ((!empty($css_class)) ? ' class="' . esc_attr( $css_class ) . '"' : '') . '>' . $none . '</span>';
+	if (0 == $number && ! comments_open() && ! pings_open()) {
+		echo '<span'.(( ! empty($css_class)) ? ' class="'.esc_attr($css_class).'"' : '').'>'.$none.'</span>';
 		return;
 	}
 
-	if ( post_password_required() ) {
-		_e( 'Enter your password to view comments.' );
+	if (post_password_required()) {
+		_e('Enter your password to view comments.');
 		return;
 	}
 
 	echo '<a href="';
-	if ( 0 == $number ) {
-		$respond_link = get_permalink() . '#respond';
+	if (0 == $number) {
+		$respond_link = get_permalink().'#respond';
 		/**
 		 * Filter the respond link when a post has no comments.
 		 *
@@ -1493,13 +1493,13 @@ 
 		 * @param string $respond_link The default response link.
 		 * @param integer $id The post ID.
 		 */
-		echo apply_filters( 'respond_link', $respond_link, $id );
+		echo apply_filters('respond_link', $respond_link, $id);
 	} else {
 		comments_link();
 	}
 	echo '"';
 
-	if ( !empty( $css_class ) ) {
+	if ( ! empty($css_class)) {
 		echo ' class="'.$css_class.'" ';
 	}
 
@@ -1511,10 +1511,10 @@ 
 	 *
 	 * @param string $attributes The comments link attributes. Default empty.
 	 */
-	echo apply_filters( 'comments_popup_link_attributes', $attributes );
+	echo apply_filters('comments_popup_link_attributes', $attributes);
 
 	echo '>';
-	comments_number( $zero, $one, $more );
+	comments_number($zero, $one, $more);
 	echo '</a>';
 }
 
@@ -1545,33 +1545,33 @@ 
  *                                Default current post.
  * @return void|false|string Link to show comment form, if successful. False, if comments are closed.
  */
-function get_comment_reply_link( $args = array(), $comment = null, $post = null ) {
+function get_comment_reply_link($args = array(), $comment = null, $post = null) {
 	$defaults = array(
 		'add_below'     => 'comment',
 		'respond_id'    => 'respond',
-		'reply_text'    => __( 'Reply' ),
-		'reply_to_text' => __( 'Reply to %s' ),
-		'login_text'    => __( 'Log in to Reply' ),
+		'reply_text'    => __('Reply'),
+		'reply_to_text' => __('Reply to %s'),
+		'login_text'    => __('Log in to Reply'),
 		'depth'         => 0,
 		'before'        => '',
 		'after'         => ''
 	);
 
-	$args = wp_parse_args( $args, $defaults );
+	$args = wp_parse_args($args, $defaults);
 
-	if ( 0 == $args['depth'] || $args['max_depth'] <= $args['depth'] ) {
+	if (0 == $args['depth'] || $args['max_depth'] <= $args['depth']) {
 		return;
 	}
 
-	$comment = get_comment( $comment );
+	$comment = get_comment($comment);
 
-	if ( empty( $post ) ) {
+	if (empty($post)) {
 		$post = $comment->comment_post_ID;
 	}
 
-	$post = get_post( $post );
+	$post = get_post($post);
 
-	if ( ! comments_open( $post->ID ) ) {
+	if ( ! comments_open($post->ID)) {
 		return false;
 	}
 
@@ -1585,22 +1585,22 @@ 
 	 * @param WP_Comment $comment The object of the comment being replied to.
 	 * @param WP_Post    $post    The WP_Post object.
 	 */
-	$args = apply_filters( 'comment_reply_link_args', $args, $comment, $post );
+	$args = apply_filters('comment_reply_link_args', $args, $comment, $post);
 
-	if ( get_option( 'comment_registration' ) && ! is_user_logged_in() ) {
-		$link = sprintf( '<a rel="nofollow" class="comment-reply-login" href="%s">%s</a>',
-			esc_url( wp_login_url( get_permalink() ) ),
+	if (get_option('comment_registration') && ! is_user_logged_in()) {
+		$link = sprintf('<a rel="nofollow" class="comment-reply-login" href="%s">%s</a>',
+			esc_url(wp_login_url(get_permalink())),
 			$args['login_text']
 		);
 	} else {
-		$onclick = sprintf( 'return addComment.moveForm( "%1$s-%2$s", "%2$s", "%3$s", "%4$s" )',
+		$onclick = sprintf('return addComment.moveForm( "%1$s-%2$s", "%2$s", "%3$s", "%4$s" )',
 			$args['add_below'], $comment->comment_ID, $args['respond_id'], $post->ID
 		);
 
-		$link = sprintf( "<a rel='nofollow' class='comment-reply-link' href='%s' onclick='%s' aria-label='%s'>%s</a>",
-			esc_url( add_query_arg( 'replytocom', $comment->comment_ID, get_permalink( $post->ID ) ) ) . "#" . $args['respond_id'],
+		$link = sprintf("<a rel='nofollow' class='comment-reply-link' href='%s' onclick='%s' aria-label='%s'>%s</a>",
+			esc_url(add_query_arg('replytocom', $comment->comment_ID, get_permalink($post->ID)))."#".$args['respond_id'],
 			$onclick,
-			esc_attr( sprintf( $args['reply_to_text'], $comment->comment_author ) ),
+			esc_attr(sprintf($args['reply_to_text'], $comment->comment_author)),
 			$args['reply_text']
 		);
 	}
@@ -1615,7 +1615,7 @@ 
 	 * @param object  $comment The object of the comment being replied.
 	 * @param WP_Post $post    The WP_Post object.
 	 */
-	return apply_filters( 'comment_reply_link', $args['before'] . $link . $args['after'], $args, $comment, $post );
+	return apply_filters('comment_reply_link', $args['before'].$link.$args['after'], $args, $comment, $post);
 }
 
 /**
@@ -1672,27 +1672,27 @@ 
 
 	$post = get_post($post);
 
-	if ( ! comments_open( $post->ID ) ) {
+	if ( ! comments_open($post->ID)) {
 		return false;
 	}
 
-	if ( get_option('comment_registration') && ! is_user_logged_in() ) {
-		$link = sprintf( '<a rel="nofollow" class="comment-reply-login" href="%s">%s</a>',
-			wp_login_url( get_permalink() ),
+	if (get_option('comment_registration') && ! is_user_logged_in()) {
+		$link = sprintf('<a rel="nofollow" class="comment-reply-login" href="%s">%s</a>',
+			wp_login_url(get_permalink()),
 			$args['login_text']
 		);
 	} else {
-		$onclick = sprintf( 'return addComment.moveForm( "%1$s-%2$s", "0", "%3$s", "%2$s" )',
+		$onclick = sprintf('return addComment.moveForm( "%1$s-%2$s", "0", "%3$s", "%2$s" )',
 			$args['add_below'], $post->ID, $args['respond_id']
 		);
 
-		$link = sprintf( "<a rel='nofollow' class='comment-reply-link' href='%s' onclick='%s'>%s</a>",
-			get_permalink( $post->ID ) . '#' . $args['respond_id'],
+		$link = sprintf("<a rel='nofollow' class='comment-reply-link' href='%s' onclick='%s'>%s</a>",
+			get_permalink($post->ID).'#'.$args['respond_id'],
 			$onclick,
 			$args['reply_text']
 		);
 	}
-	$formatted_link = $args['before'] . $link . $args['after'];
+	$formatted_link = $args['before'].$link.$args['after'];
 
 	/**
 	 * Filter the formatted post comments link HTML.
@@ -1702,7 +1702,7 @@ 
 	 * @param string      $formatted The HTML-formatted post comments link.
 	 * @param int|WP_Post $post      The post ID or WP_Post object.
 	 */
-	return apply_filters( 'post_comments_link', $formatted_link, $post );
+	return apply_filters('post_comments_link', $formatted_link, $post);
 }
 
 /**
@@ -1729,14 +1729,14 @@ 
  * @param string $text Optional. Text to display for cancel reply link. Default empty.
  * @return string
  */
-function get_cancel_comment_reply_link( $text = '' ) {
-	if ( empty($text) )
+function get_cancel_comment_reply_link($text = '') {
+	if (empty($text))
 		$text = __('Click here to cancel reply.');
 
 	$style = isset($_GET['replytocom']) ? '' : ' style="display:none;"';
-	$link = esc_html( remove_query_arg('replytocom') ) . '#respond';
+	$link = esc_html(remove_query_arg('replytocom')).'#respond';
 
-	$formatted_link = '<a rel="nofollow" id="cancel-comment-reply-link" href="' . $link . '"' . $style . '>' . $text . '</a>';
+	$formatted_link = '<a rel="nofollow" id="cancel-comment-reply-link" href="'.$link.'"'.$style.'>'.$text.'</a>';
 
 	/**
 	 * Filter the cancel comment reply link HTML.
@@ -1747,7 +1747,7 @@ 
 	 * @param string $link           Cancel comment reply link URL.
 	 * @param string $text           Cancel comment reply link text.
 	 */
-	return apply_filters( 'cancel_comment_reply_link', $formatted_link, $link, $text );
+	return apply_filters('cancel_comment_reply_link', $formatted_link, $link, $text);
 }
 
 /**
@@ -1757,7 +1757,7 @@ 
  *
  * @param string $text Optional. Text to display for cancel reply link. Default empty.
  */
-function cancel_comment_reply_link( $text = '' ) {
+function cancel_comment_reply_link($text = '') {
 	echo get_cancel_comment_reply_link($text);
 }
 
@@ -1769,8 +1769,8 @@ 
  * @param int $id Optional. Post ID. Default current post ID.
  * @return string Hidden input HTML for replying to comments
  */
-function get_comment_id_fields( $id = 0 ) {
-	if ( empty( $id ) )
+function get_comment_id_fields($id = 0) {
+	if (empty($id))
 		$id = get_the_ID();
 
 	$replytoid = isset($_GET['replytocom']) ? (int) $_GET['replytocom'] : 0;
@@ -1786,7 +1786,7 @@ 
 	 * @param int    $id        The post ID.
 	 * @param int    $replytoid The id of the comment being replied to.
 	 */
-	return apply_filters( 'comment_id_fields', $result, $id, $replytoid );
+	return apply_filters('comment_id_fields', $result, $id, $replytoid);
 }
 
 /**
@@ -1796,8 +1796,8 @@ 
  *
  * @param int $id Optional. Post ID. Default current post ID.
  */
-function comment_id_fields( $id = 0 ) {
-	echo get_comment_id_fields( $id );
+function comment_id_fields($id = 0) {
+	echo get_comment_id_fields($id);
 }
 
 /**
@@ -1820,21 +1820,21 @@ 
  * @param string $linktoparent Optional. Boolean to control making the author's name a link
  *                             to their comment. Default true.
  */
-function comment_form_title( $noreplytext = false, $replytext = false, $linktoparent = true ) {
+function comment_form_title($noreplytext = false, $replytext = false, $linktoparent = true) {
 	global $comment;
 
-	if ( false === $noreplytext ) $noreplytext = __( 'Leave a Reply' );
-	if ( false === $replytext ) $replytext = __( 'Leave a Reply to %s' );
+	if (false === $noreplytext) $noreplytext = __('Leave a Reply');
+	if (false === $replytext) $replytext = __('Leave a Reply to %s');
 
 	$replytoid = isset($_GET['replytocom']) ? (int) $_GET['replytocom'] : 0;
 
-	if ( 0 == $replytoid )
+	if (0 == $replytoid)
 		echo $noreplytext;
 	else {
 		// Sets the global so that template tags can be used in the comment form.
 		$comment = get_comment($replytoid);
-		$author = ( $linktoparent ) ? '<a href="#comment-' . get_comment_ID() . '">' . get_comment_author( $comment ) . '</a>' : get_comment_author( $comment );
-		printf( $replytext, $author );
+		$author = ($linktoparent) ? '<a href="#comment-'.get_comment_ID().'">'.get_comment_author($comment).'</a>' : get_comment_author($comment);
+		printf($replytext, $author);
 	}
 }
 
@@ -1876,7 +1876,7 @@ 
  * }
  * @param array $comments Optional. Array of WP_Comment objects.
  */
-function wp_list_comments( $args = array(), $comments = null ) {
+function wp_list_comments($args = array(), $comments = null) {
 	global $wp_query, $comment_alt, $comment_depth, $comment_thread_alt, $overridden_cpage, $in_comment_loop;
 
 	$in_comment_loop = true;
@@ -1896,12 +1896,12 @@ 
 		'avatar_size'       => 32,
 		'reverse_top_level' => null,
 		'reverse_children'  => '',
-		'format'            => current_theme_supports( 'html5', 'comment-list' ) ? 'html5' : 'xhtml',
+		'format'            => current_theme_supports('html5', 'comment-list') ? 'html5' : 'xhtml',
 		'short_ping'        => false,
 		'echo'              => true,
 	);
 
-	$r = wp_parse_args( $args, $defaults );
+	$r = wp_parse_args($args, $defaults);
 
 	/**
 	 * Filter the arguments used in retrieving the comment list.
@@ -1912,16 +1912,16 @@ 
 	 *
 	 * @param array $r An array of arguments for displaying comments.
 	 */
-	$r = apply_filters( 'wp_list_comments_args', $r );
+	$r = apply_filters('wp_list_comments_args', $r);
 
 	// Figure out what comments we'll be looping through ($_comments)
-	if ( null !== $comments ) {
+	if (null !== $comments) {
 		$comments = (array) $comments;
-		if ( empty($comments) )
+		if (empty($comments))
 			return;
-		if ( 'all' != $r['type'] ) {
+		if ('all' != $r['type']) {
 			$comments_by_type = separate_comments($comments);
-			if ( empty($comments_by_type[$r['type']]) )
+			if (empty($comments_by_type[$r['type']]))
 				return;
 			$_comments = $comments_by_type[$r['type']];
 		} else {
@@ -1932,29 +1932,29 @@ 
 		 * If 'page' or 'per_page' has been passed, and does not match what's in $wp_query,
 		 * perform a separate comment query and allow Walker_Comment to paginate.
 		 */
-		if ( $r['page'] || $r['per_page'] ) {
-			$current_cpage = get_query_var( 'cpage' );
-			if ( ! $current_cpage ) {
-				$current_cpage = 'newest' === get_option( 'default_comments_page' ) ? 1 : $wp_query->max_num_comment_pages;
+		if ($r['page'] || $r['per_page']) {
+			$current_cpage = get_query_var('cpage');
+			if ( ! $current_cpage) {
+				$current_cpage = 'newest' === get_option('default_comments_page') ? 1 : $wp_query->max_num_comment_pages;
 			}
 
-			$current_per_page = get_query_var( 'comments_per_page' );
-			if ( $r['page'] != $current_cpage || $r['per_page'] != $current_per_page ) {
+			$current_per_page = get_query_var('comments_per_page');
+			if ($r['page'] != $current_cpage || $r['per_page'] != $current_per_page) {
 
-				$comments = get_comments( array(
+				$comments = get_comments(array(
 					'post_id' => get_the_ID(),
 					'orderby' => 'comment_date_gmt',
 					'order' => 'ASC',
 					'status' => 'all',
-				) );
+				));
 
-				if ( 'all' != $r['type'] ) {
-					$comments_by_type = separate_comments( $comments );
-					if ( empty( $comments_by_type[ $r['type'] ] ) ) {
+				if ('all' != $r['type']) {
+					$comments_by_type = separate_comments($comments);
+					if (empty($comments_by_type[$r['type']])) {
 						return;
 					}
 
-					$_comments = $comments_by_type[ $r['type'] ];
+					$_comments = $comments_by_type[$r['type']];
 				} else {
 					$_comments = $comments;
 				}
@@ -1962,29 +1962,29 @@ 
 
 		// Otherwise, fall back on the comments from `$wp_query->comments`.
 		} else {
-			if ( empty($wp_query->comments) )
+			if (empty($wp_query->comments))
 				return;
-			if ( 'all' != $r['type'] ) {
-				if ( empty($wp_query->comments_by_type) )
+			if ('all' != $r['type']) {
+				if (empty($wp_query->comments_by_type))
 					$wp_query->comments_by_type = separate_comments($wp_query->comments);
-				if ( empty($wp_query->comments_by_type[$r['type']]) )
+				if (empty($wp_query->comments_by_type[$r['type']]))
 					return;
 				$_comments = $wp_query->comments_by_type[$r['type']];
 			} else {
 				$_comments = $wp_query->comments;
 			}
 
-			if ( $wp_query->max_num_comment_pages ) {
-				$default_comments_page = get_option( 'default_comments_page' );
-				$cpage = get_query_var( 'cpage' );
-				if ( 'newest' === $default_comments_page ) {
+			if ($wp_query->max_num_comment_pages) {
+				$default_comments_page = get_option('default_comments_page');
+				$cpage = get_query_var('cpage');
+				if ('newest' === $default_comments_page) {
 					$r['cpage'] = $cpage;
 
 				/*
 				 * When first page shows oldest comments, post permalink is the same as
 				 * the comment permalink.
 				 */
-				} elseif ( $cpage == 1 ) {
+				} elseif ($cpage == 1) {
 					$r['cpage'] = '';
 				} else {
 					$r['cpage'] = $cpage;
@@ -1996,52 +1996,52 @@ 
 		}
 	}
 
-	if ( '' === $r['per_page'] && get_option( 'page_comments' ) ) {
+	if ('' === $r['per_page'] && get_option('page_comments')) {
 		$r['per_page'] = get_query_var('comments_per_page');
 	}
 
-	if ( empty($r['per_page']) ) {
+	if (empty($r['per_page'])) {
 		$r['per_page'] = 0;
 		$r['page'] = 0;
 	}
 
-	if ( '' === $r['max_depth'] ) {
-		if ( get_option('thread_comments') )
+	if ('' === $r['max_depth']) {
+		if (get_option('thread_comments'))
 			$r['max_depth'] = get_option('thread_comments_depth');
 		else
 			$r['max_depth'] = -1;
 	}
 
-	if ( '' === $r['page'] ) {
-		if ( empty($overridden_cpage) ) {
+	if ('' === $r['page']) {
+		if (empty($overridden_cpage)) {
 			$r['page'] = get_query_var('cpage');
 		} else {
 			$threaded = ( -1 != $r['max_depth'] );
-			$r['page'] = ( 'newest' == get_option('default_comments_page') ) ? get_comment_pages_count($_comments, $r['per_page'], $threaded) : 1;
-			set_query_var( 'cpage', $r['page'] );
+			$r['page'] = ('newest' == get_option('default_comments_page')) ? get_comment_pages_count($_comments, $r['per_page'], $threaded) : 1;
+			set_query_var('cpage', $r['page']);
 		}
 	}
 	// Validation check
 	$r['page'] = intval($r['page']);
-	if ( 0 == $r['page'] && 0 != $r['per_page'] )
+	if (0 == $r['page'] && 0 != $r['per_page'])
 		$r['page'] = 1;
 
-	if ( null === $r['reverse_top_level'] )
-		$r['reverse_top_level'] = ( 'desc' == get_option('comment_order') );
+	if (null === $r['reverse_top_level'])
+		$r['reverse_top_level'] = ('desc' == get_option('comment_order'));
 
-	wp_queue_comments_for_comment_meta_lazyload( $_comments );
+	wp_queue_comments_for_comment_meta_lazyload($_comments);
 
-	if ( empty( $r['walker'] ) ) {
+	if (empty($r['walker'])) {
 		$walker = new Walker_Comment;
 	} else {
 		$walker = $r['walker'];
 	}
 
-	$output = $walker->paged_walk( $_comments, $r['max_depth'], $r['page'], $r['per_page'], $r );
+	$output = $walker->paged_walk($_comments, $r['max_depth'], $r['page'], $r['per_page'], $r);
 
 	$in_comment_loop = false;
 
-	if ( $r['echo'] ) {
+	if ($r['echo']) {
 		echo $output;
 	} else {
 		return $output;
@@ -2108,32 +2108,32 @@ 
  * }
  * @param int|WP_Post $post_id Post ID or WP_Post object to generate the form for. Default current post.
  */
-function comment_form( $args = array(), $post_id = null ) {
-	if ( null === $post_id )
+function comment_form($args = array(), $post_id = null) {
+	if (null === $post_id)
 		$post_id = get_the_ID();
 
 	$commenter = wp_get_current_commenter();
 	$user = wp_get_current_user();
 	$user_identity = $user->exists() ? $user->display_name : '';
 
-	$args = wp_parse_args( $args );
-	if ( ! isset( $args['format'] ) )
-		$args['format'] = current_theme_supports( 'html5', 'comment-form' ) ? 'html5' : 'xhtml';
+	$args = wp_parse_args($args);
+	if ( ! isset($args['format']))
+		$args['format'] = current_theme_supports('html5', 'comment-form') ? 'html5' : 'xhtml';
 
-	$req      = get_option( 'require_name_email' );
-	$aria_req = ( $req ? " aria-required='true'" : '' );
-	$html_req = ( $req ? " required='required'" : '' );
+	$req      = get_option('require_name_email');
+	$aria_req = ($req ? " aria-required='true'" : '');
+	$html_req = ($req ? " required='required'" : '');
 	$html5    = 'html5' === $args['format'];
-	$fields   =  array(
-		'author' => '<p class="comment-form-author">' . '<label for="author">' . __( 'Name' ) . ( $req ? ' <span class="required">*</span>' : '' ) . '</label> ' .
-		            '<input id="author" name="author" type="text" value="' . esc_attr( $commenter['comment_author'] ) . '" size="30" maxlength="245"' . $aria_req . $html_req . ' /></p>',
-		'email'  => '<p class="comment-form-email"><label for="email">' . __( 'Email' ) . ( $req ? ' <span class="required">*</span>' : '' ) . '</label> ' .
-		            '<input id="email" name="email" ' . ( $html5 ? 'type="email"' : 'type="text"' ) . ' value="' . esc_attr(  $commenter['comment_author_email'] ) . '" size="30" maxlength="100" aria-describedby="email-notes"' . $aria_req . $html_req  . ' /></p>',
-		'url'    => '<p class="comment-form-url"><label for="url">' . __( 'Website' ) . '</label> ' .
-		            '<input id="url" name="url" ' . ( $html5 ? 'type="url"' : 'type="text"' ) . ' value="' . esc_attr( $commenter['comment_author_url'] ) . '" size="30" maxlength="200" /></p>',
+	$fields   = array(
+		'author' => '<p class="comment-form-author">'.'<label for="author">'.__('Name').($req ? ' <span class="required">*</span>' : '').'</label> '.
+		            '<input id="author" name="author" type="text" value="'.esc_attr($commenter['comment_author']).'" size="30" maxlength="245"'.$aria_req.$html_req.' /></p>',
+		'email'  => '<p class="comment-form-email"><label for="email">'.__('Email').($req ? ' <span class="required">*</span>' : '').'</label> '.
+		            '<input id="email" name="email" '.($html5 ? 'type="email"' : 'type="text"').' value="'.esc_attr($commenter['comment_author_email']).'" size="30" maxlength="100" aria-describedby="email-notes"'.$aria_req.$html_req.' /></p>',
+		'url'    => '<p class="comment-form-url"><label for="url">'.__('Website').'</label> '.
+		            '<input id="url" name="url" '.($html5 ? 'type="url"' : 'type="text"').' value="'.esc_attr($commenter['comment_author_url']).'" size="30" maxlength="200" /></p>',
 	);
 
-	$required_text = sprintf( ' ' . __('Required fields are marked %s'), '<span class="required">*</span>' );
+	$required_text = sprintf(' '.__('Required fields are marked %s'), '<span class="required">*</span>');
 
 	/**
 	 * Filter the default comment form fields.
@@ -2142,41 +2142,41 @@ 
 	 *
 	 * @param array $fields The default comment fields.
 	 */
-	$fields = apply_filters( 'comment_form_default_fields', $fields );
+	$fields = apply_filters('comment_form_default_fields', $fields);
 	$defaults = array(
 		'fields'               => $fields,
-		'comment_field'        => '<p class="comment-form-comment"><label for="comment">' . _x( 'Comment', 'noun' ) . '</label> <textarea id="comment" name="comment" cols="45" rows="8" maxlength="65525" aria-required="true" required="required"></textarea></p>',
+		'comment_field'        => '<p class="comment-form-comment"><label for="comment">'._x('Comment', 'noun').'</label> <textarea id="comment" name="comment" cols="45" rows="8" maxlength="65525" aria-required="true" required="required"></textarea></p>',
 		/** This filter is documented in wp-includes/link-template.php */
-		'must_log_in'          => '<p class="must-log-in">' . sprintf(
+		'must_log_in'          => '<p class="must-log-in">'.sprintf(
 		                              /* translators: %s: login URL */
-		                              __( 'You must be <a href="%s">logged in</a> to post a comment.' ),
-		                              wp_login_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) )
-		                          ) . '</p>',
+		                              __('You must be <a href="%s">logged in</a> to post a comment.'),
+		                              wp_login_url(apply_filters('the_permalink', get_permalink($post_id)))
+		                          ).'</p>',
 		/** This filter is documented in wp-includes/link-template.php */
-		'logged_in_as'         => '<p class="logged-in-as">' . sprintf(
+		'logged_in_as'         => '<p class="logged-in-as">'.sprintf(
 		                              /* translators: 1: edit user link, 2: accessibility text, 3: user name, 4: logout URL */
-		                              __( '<a href="%1$s" aria-label="%2$s">Logged in as %3$s</a>. <a href="%4$s">Log out?</a>' ),
+		                              __('<a href="%1$s" aria-label="%2$s">Logged in as %3$s</a>. <a href="%4$s">Log out?</a>'),
 		                              get_edit_user_link(),
 		                              /* translators: %s: user name */
-		                              esc_attr( sprintf( __( 'Logged in as %s. Edit your profile.' ), $user_identity ) ),
+		                              esc_attr(sprintf(__('Logged in as %s. Edit your profile.'), $user_identity)),
 		                              $user_identity,
-		                              wp_logout_url( apply_filters( 'the_permalink', get_permalink( $post_id ) ) )
-		                          ) . '</p>',
-		'comment_notes_before' => '<p class="comment-notes"><span id="email-notes">' . __( 'Your email address will not be published.' ) . '</span>'. ( $req ? $required_text : '' ) . '</p>',
+		                              wp_logout_url(apply_filters('the_permalink', get_permalink($post_id)))
+		                          ).'</p>',
+		'comment_notes_before' => '<p class="comment-notes"><span id="email-notes">'.__('Your email address will not be published.').'</span>'.($req ? $required_text : '').'</p>',
 		'comment_notes_after'  => '',
 		'id_form'              => 'commentform',
 		'id_submit'            => 'submit',
 		'class_form'           => 'comment-form',
 		'class_submit'         => 'submit',
 		'name_submit'          => 'submit',
-		'title_reply'          => __( 'Leave a Reply' ),
-		'title_reply_to'       => __( 'Leave a Reply to %s' ),
+		'title_reply'          => __('Leave a Reply'),
+		'title_reply_to'       => __('Leave a Reply to %s'),
 		'title_reply_before'   => '<h3 id="reply-title" class="comment-reply-title">',
 		'title_reply_after'    => '</h3>',
 		'cancel_reply_before'  => ' <small>',
 		'cancel_reply_after'   => '</small>',
-		'cancel_reply_link'    => __( 'Cancel reply' ),
-		'label_submit'         => __( 'Post Comment' ),
+		'cancel_reply_link'    => __('Cancel reply'),
+		'label_submit'         => __('Post Comment'),
 		'submit_button'        => '<input name="%1$s" type="submit" id="%2$s" class="%3$s" value="%4$s" />',
 		'submit_field'         => '<p class="form-submit">%1$s %2$s</p>',
 		'format'               => 'xhtml',
@@ -2191,53 +2191,53 @@ 
 	 *
 	 * @param array $defaults The default comment form arguments.
 	 */
-	$args = wp_parse_args( $args, apply_filters( 'comment_form_defaults', $defaults ) );
+	$args = wp_parse_args($args, apply_filters('comment_form_defaults', $defaults));
 
 	// Ensure that the filtered args contain all required default values.
-	$args = array_merge( $defaults, $args );
+	$args = array_merge($defaults, $args);
 
-	if ( comments_open( $post_id ) ) : ?>
+	if (comments_open($post_id)) : ?>
 		<?php
 		/**
 		 * Fires before the comment form.
 		 *
 		 * @since 3.0.0
 		 */
-		do_action( 'comment_form_before' );
+		do_action('comment_form_before');
 		?>
 		<div id="respond" class="comment-respond">
 			<?php
 			echo $args['title_reply_before'];
 
-			comment_form_title( $args['title_reply'], $args['title_reply_to'] );
+			comment_form_title($args['title_reply'], $args['title_reply_to']);
 
 			echo $args['cancel_reply_before'];
 
-			cancel_comment_reply_link( $args['cancel_reply_link'] );
+			cancel_comment_reply_link($args['cancel_reply_link']);
 
 			echo $args['cancel_reply_after'];
 
 			echo $args['title_reply_after'];
 
-			if ( get_option( 'comment_registration' ) && !is_user_logged_in() ) :
+			if (get_option('comment_registration') && ! is_user_logged_in()) :
 				echo $args['must_log_in'];
 				/**
 				 * Fires after the HTML-formatted 'must log in after' message in the comment form.
 				 *
 				 * @since 3.0.0
 				 */
-				do_action( 'comment_form_must_log_in_after' );
+				do_action('comment_form_must_log_in_after');
 			else : ?>
-				<form action="<?php echo site_url( '/wp-comments-post.php' ); ?>" method="post" id="<?php echo esc_attr( $args['id_form'] ); ?>" class="<?php echo esc_attr( $args['class_form'] ); ?>"<?php echo $html5 ? ' novalidate' : ''; ?>>
+				<form action="<?php echo site_url('/wp-comments-post.php'); ?>" method="post" id="<?php echo esc_attr($args['id_form']); ?>" class="<?php echo esc_attr($args['class_form']); ?>"<?php echo $html5 ? ' novalidate' : ''; ?>>
 					<?php
 					/**
 					 * Fires at the top of the comment form, inside the form tag.
 					 *
 					 * @since 3.0.0
 					 */
-					do_action( 'comment_form_top' );
+					do_action('comment_form_top');
 
-					if ( is_user_logged_in() ) :
+					if (is_user_logged_in()) :
 						/**
 						 * Filter the 'logged in' message for the comment form for display.
 						 *
@@ -2249,7 +2249,7 @@ 
 						 * @param string $user_identity  If the commenter is a registered user,
 						 *                               the display name, blank otherwise.
 						 */
-						echo apply_filters( 'comment_form_logged_in', $args['logged_in_as'], $commenter, $user_identity );
+						echo apply_filters('comment_form_logged_in', $args['logged_in_as'], $commenter, $user_identity);
 
 						/**
 						 * Fires after the is_user_logged_in() check in the comment form.
@@ -2261,7 +2261,7 @@ 
 						 * @param string $user_identity If the commenter is a registered user,
 						 *                              the display name, blank otherwise.
 						 */
-						do_action( 'comment_form_logged_in_after', $commenter, $user_identity );
+						do_action('comment_form_logged_in_after', $commenter, $user_identity);
 
 					else :
 
@@ -2270,7 +2270,7 @@ 
 					endif;
 
 					// Prepare an array of all fields, including the textarea
-					$comment_fields = array( 'comment' => $args['comment_field'] ) + (array) $args['fields'];
+					$comment_fields = array('comment' => $args['comment_field']) + (array) $args['fields'];
 
 					/**
 					 * Filter the comment form fields, including the textarea.
@@ -2279,18 +2279,18 @@ 
 					 *
 					 * @param array $comment_fields The comment fields.
 					 */
-					$comment_fields = apply_filters( 'comment_form_fields', $comment_fields );
+					$comment_fields = apply_filters('comment_form_fields', $comment_fields);
 
 					// Get an array of field names, excluding the textarea
-					$comment_field_keys = array_diff( array_keys( $comment_fields ), array( 'comment' ) );
+					$comment_field_keys = array_diff(array_keys($comment_fields), array('comment'));
 
 					// Get the first and the last field name, excluding the textarea
-					$first_field = reset( $comment_field_keys );
-					$last_field  = end( $comment_field_keys );
+					$first_field = reset($comment_field_keys);
+					$last_field  = end($comment_field_keys);
 
-					foreach ( $comment_fields as $name => $field ) {
+					foreach ($comment_fields as $name => $field) {
 
-						if ( 'comment' === $name ) {
+						if ('comment' === $name) {
 
 							/**
 							 * Filter the content of the comment textarea field for display.
@@ -2299,19 +2299,19 @@ 
 							 *
 							 * @param string $args_comment_field The content of the comment textarea field.
 							 */
-							echo apply_filters( 'comment_form_field_comment', $field );
+							echo apply_filters('comment_form_field_comment', $field);
 
 							echo $args['comment_notes_after'];
 
-						} elseif ( ! is_user_logged_in() ) {
+						} elseif ( ! is_user_logged_in()) {
 
-							if ( $first_field === $name ) {
+							if ($first_field === $name) {
 								/**
 								 * Fires before the comment fields in the comment form, excluding the textarea.
 								 *
 								 * @since 3.0.0
 								 */
-								do_action( 'comment_form_before_fields' );
+								do_action('comment_form_before_fields');
 							}
 
 							/**
@@ -2324,25 +2324,25 @@ 
 							 *
 							 * @param string $field The HTML-formatted output of the comment form field.
 							 */
-							echo apply_filters( "comment_form_field_{$name}", $field ) . "\n";
+							echo apply_filters("comment_form_field_{$name}", $field)."\n";
 
-							if ( $last_field === $name ) {
+							if ($last_field === $name) {
 								/**
 								 * Fires after the comment fields in the comment form, excluding the textarea.
 								 *
 								 * @since 3.0.0
 								 */
-								do_action( 'comment_form_after_fields' );
+								do_action('comment_form_after_fields');
 							}
 						}
 					}
 
 					$submit_button = sprintf(
 						$args['submit_button'],
-						esc_attr( $args['name_submit'] ),
-						esc_attr( $args['id_submit'] ),
-						esc_attr( $args['class_submit'] ),
-						esc_attr( $args['label_submit'] )
+						esc_attr($args['name_submit']),
+						esc_attr($args['id_submit']),
+						esc_attr($args['class_submit']),
+						esc_attr($args['label_submit'])
 					);
 
 					/**
@@ -2353,12 +2353,12 @@ 
 					 * @param string $submit_button HTML markup for the submit button.
 					 * @param array  $args          Arguments passed to `comment_form()`.
 					 */
-					$submit_button = apply_filters( 'comment_form_submit_button', $submit_button, $args );
+					$submit_button = apply_filters('comment_form_submit_button', $submit_button, $args);
 
 					$submit_field = sprintf(
 						$args['submit_field'],
 						$submit_button,
-						get_comment_id_fields( $post_id )
+						get_comment_id_fields($post_id)
 					);
 
 					/**
@@ -2372,7 +2372,7 @@ 
 					 * @param string $submit_field HTML markup for the submit field.
 					 * @param array  $args         Arguments passed to comment_form().
 					 */
-					echo apply_filters( 'comment_form_submit_field', $submit_field, $args );
+					echo apply_filters('comment_form_submit_field', $submit_field, $args);
 
 					/**
 					 * Fires at the bottom of the comment form, inside the closing </form> tag.
@@ -2381,7 +2381,7 @@ 
 					 *
 					 * @param int $post_id The post ID.
 					 */
-					do_action( 'comment_form', $post_id );
+					do_action('comment_form', $post_id);
 					?>
 				</form>
 			<?php endif; ?>
@@ -2392,13 +2392,13 @@ 
 		 *
 		 * @since 3.0.0
 		 */
-		do_action( 'comment_form_after' );
+		do_action('comment_form_after');
 	else :
 		/**
 		 * Fires after the comment form if comments are closed.
 		 *
 		 * @since 3.0.0
 		 */
-		do_action( 'comment_form_comments_closed' );
+		do_action('comment_form_comments_closed');
 	endif;
 }

Braces +140 added lines, -92 removed lines

@@ -25,10 +25,11 @@ 
 	$comment = get_comment( $comment_ID );
 
 	if ( empty( $comment->comment_author ) ) {
-		if ( $comment->user_id && $user = get_userdata( $comment->user_id ) )
-			$author = $user->display_name;
-		else
-			$author = __('Anonymous');
+		if ( $comment->user_id && $user = get_userdata( $comment->user_id ) ) {
+					$author = $user->display_name;
+		} else {
+					$author = __('Anonymous');
+		}
 	} else {
 		$author = $comment->comment_author;
 	}
@@ -145,9 +146,10 @@ 
  * @param string $after    Optional. Text or HTML to display after the email link. Default empty.
  */
 function comment_author_email_link( $linktext = '', $before = '', $after = '' ) {
-	if ( $link = get_comment_author_email_link( $linktext, $before, $after ) )
-		echo $link;
-}
+	if ( $link = get_comment_author_email_link( $linktext, $before, $after ) ) {
+			echo $link;
+	}
+	}
 
 /**
  * Return the html email link to the author of the current comment.
@@ -210,10 +212,11 @@ 
 	$url     = get_comment_author_url( $comment );
 	$author  = get_comment_author( $comment );
 
-	if ( empty( $url ) || 'http://' == $url )
-		$return = $author;
-	else
-		$return = "<a href='$url' rel='external nofollow' class='url'>$author</a>";
+	if ( empty( $url ) || 'http://' == $url ) {
+			$return = $author;
+	} else {
+			$return = "<a href='$url' rel='external nofollow' class='url'>$author</a>";
+	}
 
 	/**
 	 * Filter the comment author's link for display.
@@ -409,11 +412,12 @@ 
 function comment_class( $class = '', $comment = null, $post_id = null, $echo = true ) {
 	// Separates classes with a single space, collates classes for comment DIV
 	$class = 'class="' . join( ' ', get_comment_class( $class, $comment, $post_id ) ) . '"';
-	if ( $echo)
-		echo $class;
-	else
-		return $class;
-}
+	if ( $echo) {
+			echo $class;
+	} else {
+			return $class;
+	}
+	}
 
 /**
  * Returns the classes for the comment div as an array.
@@ -455,12 +459,15 @@ 
 		}
 	}
 
-	if ( empty($comment_alt) )
-		$comment_alt = 0;
-	if ( empty($comment_depth) )
-		$comment_depth = 1;
-	if ( empty($comment_thread_alt) )
-		$comment_thread_alt = 0;
+	if ( empty($comment_alt) ) {
+			$comment_alt = 0;
+	}
+	if ( empty($comment_depth) ) {
+			$comment_depth = 1;
+	}
+	if ( empty($comment_thread_alt) ) {
+			$comment_thread_alt = 0;
+	}
 
 	if ( $comment_alt % 2 ) {
 		$classes[] = 'odd';
@@ -485,8 +492,9 @@ 
 	$classes[] = "depth-$comment_depth";
 
 	if ( !empty($class) ) {
-		if ( !is_array( $class ) )
-			$class = preg_split('#\s+#', $class);
+		if ( !is_array( $class ) ) {
+					$class = preg_split('#\s+#', $class);
+		}
 		$classes = array_merge($classes, $class);
 	}
 
@@ -519,10 +527,11 @@ 
  */
 function get_comment_date( $d = '', $comment_ID = 0 ) {
 	$comment = get_comment( $comment_ID );
-	if ( '' == $d )
-		$date = mysql2date(get_option('date_format'), $comment->comment_date);
-	else
-		$date = mysql2date($d, $comment->comment_date);
+	if ( '' == $d ) {
+			$date = mysql2date(get_option('date_format'), $comment->comment_date);
+	} else {
+			$date = mysql2date($d, $comment->comment_date);
+	}
 	/**
 	 * Filter the returned comment date.
 	 *
@@ -802,10 +811,12 @@ 
  * @param string $deprecated_2 Not Used.
  */
 function comments_link( $deprecated = '', $deprecated_2 = '' ) {
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '0.72' );
-	if ( !empty( $deprecated_2 ) )
-		_deprecated_argument( __FUNCTION__, '1.3' );
+	if ( !empty( $deprecated ) ) {
+			_deprecated_argument( __FUNCTION__, '0.72' );
+	}
+	if ( !empty( $deprecated_2 ) ) {
+			_deprecated_argument( __FUNCTION__, '1.3' );
+	}
 	echo esc_url( get_comments_link() );
 }
 
@@ -969,10 +980,11 @@ 
 	$comment = get_comment();
 
 	$comment_date = $gmt ? $comment->comment_date_gmt : $comment->comment_date;
-	if ( '' == $d )
-		$date = mysql2date(get_option('time_format'), $comment_date, $translate);
-	else
-		$date = mysql2date($d, $comment_date, $translate);
+	if ( '' == $d ) {
+			$date = mysql2date(get_option('time_format'), $comment_date, $translate);
+	} else {
+			$date = mysql2date($d, $comment_date, $translate);
+	}
 
 	/**
 	 * Filter the returned comment time.
@@ -1011,8 +1023,9 @@ 
  */
 function get_comment_type( $comment_ID = 0 ) {
 	$comment = get_comment( $comment_ID );
-	if ( '' == $comment->comment_type )
-		$comment->comment_type = 'comment';
+	if ( '' == $comment->comment_type ) {
+			$comment->comment_type = 'comment';
+	}
 
 	/**
 	 * Filter the returned comment type.
@@ -1037,9 +1050,15 @@ 
  * @param string $pingbacktxt  Optional. String to display for pingback type. Default false.
  */
 function comment_type( $commenttxt = false, $trackbacktxt = false, $pingbacktxt = false ) {
-	if ( false === $commenttxt ) $commenttxt = _x( 'Comment', 'noun' );
-	if ( false === $trackbacktxt ) $trackbacktxt = __( 'Trackback' );
-	if ( false === $pingbacktxt ) $pingbacktxt = __( 'Pingback' );
+	if ( false === $commenttxt ) {
+		$commenttxt = _x( 'Comment', 'noun' );
+	}
+	if ( false === $trackbacktxt ) {
+		$trackbacktxt = __( 'Trackback' );
+	}
+	if ( false === $pingbacktxt ) {
+		$pingbacktxt = __( 'Pingback' );
+	}
 	$type = get_comment_type();
 	switch( $type ) {
 		case 'trackback' :
@@ -1065,10 +1084,11 @@ 
  * @return string The trackback URL after being filtered.
  */
 function get_trackback_url() {
-	if ( '' != get_option('permalink_structure') )
-		$tb_url = trailingslashit(get_permalink()) . user_trailingslashit('trackback', 'single_trackback');
-	else
-		$tb_url = get_option('siteurl') . '/wp-trackback.php?p=' . get_the_ID();
+	if ( '' != get_option('permalink_structure') ) {
+			$tb_url = trailingslashit(get_permalink()) . user_trailingslashit('trackback', 'single_trackback');
+	} else {
+			$tb_url = get_option('siteurl') . '/wp-trackback.php?p=' . get_the_ID();
+	}
 
 	/**
 	 * Filter the returned trackback URL.
@@ -1250,11 +1270,13 @@ 
 function comments_template( $file = '/comments.php', $separate_comments = false ) {
 	global $wp_query, $withcomments, $post, $wpdb, $id, $comment, $user_login, $user_ID, $user_identity, $overridden_cpage;
 
-	if ( !(is_single() || is_page() || $withcomments) || empty($post) )
-		return;
+	if ( !(is_single() || is_page() || $withcomments) || empty($post) ) {
+			return;
+	}
 
-	if ( empty($file) )
-		$file = '/comments.php';
+	if ( empty($file) ) {
+			$file = '/comments.php';
+	}
 
 	$req = get_option('require_name_email');
 
@@ -1412,8 +1434,9 @@ 
 		$overridden_cpage = true;
 	}
 
-	if ( !defined('COMMENTS_TEMPLATE') )
-		define('COMMENTS_TEMPLATE', true);
+	if ( !defined('COMMENTS_TEMPLATE') ) {
+			define('COMMENTS_TEMPLATE', true);
+	}
 
 	$theme_template = STYLESHEETPATH . $file;
 	/**
@@ -1424,13 +1447,15 @@ 
 	 * @param string $theme_template The path to the theme template file.
 	 */
 	$include = apply_filters( 'comments_template', $theme_template );
-	if ( file_exists( $include ) )
-		require( $include );
-	elseif ( file_exists( TEMPLATEPATH . $file ) )
-		require( TEMPLATEPATH . $file );
-	else // Backward compat code will be removed in a future release
+	if ( file_exists( $include ) ) {
+			require( $include );
+	} elseif ( file_exists( TEMPLATEPATH . $file ) ) {
+			require( TEMPLATEPATH . $file );
+	} else {
+		// Backward compat code will be removed in a future release
 		require( ABSPATH . WPINC . '/theme-compat/comments.php');
-}
+	}
+	}
 
 /**
  * Displays the link to the comments for the current post ID.
@@ -1730,8 +1755,9 @@ 
  * @return string
  */
 function get_cancel_comment_reply_link( $text = '' ) {
-	if ( empty($text) )
-		$text = __('Click here to cancel reply.');
+	if ( empty($text) ) {
+			$text = __('Click here to cancel reply.');
+	}
 
 	$style = isset($_GET['replytocom']) ? '' : ' style="display:none;"';
 	$link = esc_html( remove_query_arg('replytocom') ) . '#respond';
@@ -1770,8 +1796,9 @@ 
  * @return string Hidden input HTML for replying to comments
  */
 function get_comment_id_fields( $id = 0 ) {
-	if ( empty( $id ) )
-		$id = get_the_ID();
+	if ( empty( $id ) ) {
+			$id = get_the_ID();
+	}
 
 	$replytoid = isset($_GET['replytocom']) ? (int) $_GET['replytocom'] : 0;
 	$result  = "<input type='hidden' name='comment_post_ID' value='$id' id='comment_post_ID' />\n";
@@ -1823,14 +1850,18 @@ 
 function comment_form_title( $noreplytext = false, $replytext = false, $linktoparent = true ) {
 	global $comment;
 
-	if ( false === $noreplytext ) $noreplytext = __( 'Leave a Reply' );
-	if ( false === $replytext ) $replytext = __( 'Leave a Reply to %s' );
+	if ( false === $noreplytext ) {
+		$noreplytext = __( 'Leave a Reply' );
+	}
+	if ( false === $replytext ) {
+		$replytext = __( 'Leave a Reply to %s' );
+	}
 
 	$replytoid = isset($_GET['replytocom']) ? (int) $_GET['replytocom'] : 0;
 
-	if ( 0 == $replytoid )
-		echo $noreplytext;
-	else {
+	if ( 0 == $replytoid ) {
+			echo $noreplytext;
+	} else {
 		// Sets the global so that template tags can be used in the comment form.
 		$comment = get_comment($replytoid);
 		$author = ( $linktoparent ) ? '<a href="#comment-' . get_comment_ID() . '">' . get_comment_author( $comment ) . '</a>' : get_comment_author( $comment );
@@ -1917,12 +1948,14 @@ 
 	// Figure out what comments we'll be looping through ($_comments)
 	if ( null !== $comments ) {
 		$comments = (array) $comments;
-		if ( empty($comments) )
-			return;
+		if ( empty($comments) ) {
+					return;
+		}
 		if ( 'all' != $r['type'] ) {
 			$comments_by_type = separate_comments($comments);
-			if ( empty($comments_by_type[$r['type']]) )
-				return;
+			if ( empty($comments_by_type[$r['type']]) ) {
+							return;
+			}
 			$_comments = $comments_by_type[$r['type']];
 		} else {
 			$_comments = $comments;
@@ -1962,13 +1995,16 @@ 
 
 		// Otherwise, fall back on the comments from `$wp_query->comments`.
 		} else {
-			if ( empty($wp_query->comments) )
-				return;
+			if ( empty($wp_query->comments) ) {
+							return;
+			}
 			if ( 'all' != $r['type'] ) {
-				if ( empty($wp_query->comments_by_type) )
-					$wp_query->comments_by_type = separate_comments($wp_query->comments);
-				if ( empty($wp_query->comments_by_type[$r['type']]) )
-					return;
+				if ( empty($wp_query->comments_by_type) ) {
+									$wp_query->comments_by_type = separate_comments($wp_query->comments);
+				}
+				if ( empty($wp_query->comments_by_type[$r['type']]) ) {
+									return;
+				}
 				$_comments = $wp_query->comments_by_type[$r['type']];
 			} else {
 				$_comments = $wp_query->comments;
@@ -2006,10 +2042,11 @@ 
 	}
 
 	if ( '' === $r['max_depth'] ) {
-		if ( get_option('thread_comments') )
-			$r['max_depth'] = get_option('thread_comments_depth');
-		else
-			$r['max_depth'] = -1;
+		if ( get_option('thread_comments') ) {
+					$r['max_depth'] = get_option('thread_comments_depth');
+		} else {
+					$r['max_depth'] = -1;
+		}
 	}
 
 	if ( '' === $r['page'] ) {
@@ -2023,11 +2060,13 @@ 
 	}
 	// Validation check
 	$r['page'] = intval($r['page']);
-	if ( 0 == $r['page'] && 0 != $r['per_page'] )
-		$r['page'] = 1;
+	if ( 0 == $r['page'] && 0 != $r['per_page'] ) {
+			$r['page'] = 1;
+	}
 
-	if ( null === $r['reverse_top_level'] )
-		$r['reverse_top_level'] = ( 'desc' == get_option('comment_order') );
+	if ( null === $r['reverse_top_level'] ) {
+			$r['reverse_top_level'] = ( 'desc' == get_option('comment_order') );
+	}
 
 	wp_queue_comments_for_comment_meta_lazyload( $_comments );
 
@@ -2109,16 +2148,18 @@ 
  * @param int|WP_Post $post_id Post ID or WP_Post object to generate the form for. Default current post.
  */
 function comment_form( $args = array(), $post_id = null ) {
-	if ( null === $post_id )
-		$post_id = get_the_ID();
+	if ( null === $post_id ) {
+			$post_id = get_the_ID();
+	}
 
 	$commenter = wp_get_current_commenter();
 	$user = wp_get_current_user();
 	$user_identity = $user->exists() ? $user->display_name : '';
 
 	$args = wp_parse_args( $args );
-	if ( ! isset( $args['format'] ) )
-		$args['format'] = current_theme_supports( 'html5', 'comment-form' ) ? 'html5' : 'xhtml';
+	if ( ! isset( $args['format'] ) ) {
+			$args['format'] = current_theme_supports( 'html5', 'comment-form' ) ? 'html5' : 'xhtml';
+	}
 
 	$req      = get_option( 'require_name_email' );
 	$aria_req = ( $req ? " aria-required='true'" : '' );
@@ -2227,8 +2268,11 @@ 
 				 * @since 3.0.0
 				 */
 				do_action( 'comment_form_must_log_in_after' );
-			else : ?>
-				<form action="<?php echo site_url( '/wp-comments-post.php' ); ?>" method="post" id="<?php echo esc_attr( $args['id_form'] ); ?>" class="<?php echo esc_attr( $args['class_form'] ); ?>"<?php echo $html5 ? ' novalidate' : ''; ?>>
+			else {
+				: ?>
+				<form action="<?php echo site_url( '/wp-comments-post.php' );
+			}
+			?>" method="post" id="<?php echo esc_attr( $args['id_form'] ); ?>" class="<?php echo esc_attr( $args['class_form'] ); ?>"<?php echo $html5 ? ' novalidate' : ''; ?>>
 					<?php
 					/**
 					 * Fires at the top of the comment form, inside the form tag.
@@ -2263,9 +2307,11 @@ 
 						 */
 						do_action( 'comment_form_logged_in_after', $commenter, $user_identity );
 
-					else :
+					else {
+						:
 
 						echo $args['comment_notes_before'];
+					}
 
 					endif;
 
@@ -2393,12 +2439,14 @@ 
 		 * @since 3.0.0
 		 */
 		do_action( 'comment_form_after' );
-	else :
+	else {
+		:
 		/**
 		 * Fires after the comment form if comments are closed.
 		 *
 		 * @since 3.0.0
 		 */
 		do_action( 'comment_form_comments_closed' );
+	}
 	endif;
 }

src/wp-includes/comment.php

Doc Comments +4 added lines, -4 removed lines

@@ -978,7 +978,7 @@ 
  *
  * @global wpdb $wpdb WordPress database abstraction object.
  *
- * @return array Maximum character length for the comment form fields.
+ * @return string Maximum character length for the comment form fields.
  */
 function wp_get_comment_fields_max_lengths() {
 	global $wpdb;
@@ -1492,7 +1492,7 @@ 
  *
  * @since 2.0.4
  *
- * @return array Comment author, email, url respectively.
+ * @return string Comment author, email, url respectively.
  */
 function wp_get_current_commenter() {
 	// Cookies should already be sanitized.
@@ -1558,7 +1558,7 @@ 
  *                                            new comment.
  *     @type int        $user_id              ID of the user who submitted the comment. Default 0.
  * }
- * @return int|false The new comment's ID on success, false on failure.
+ * @return string The new comment's ID on success, false on failure.
  */
 function wp_insert_comment( $commentdata ) {
 	global $wpdb;
@@ -2644,7 +2644,7 @@ 
  *
  * @param WP_Post  $posts Post data object.
  * @param WP_Query $query Query object.
- * @return array
+ * @return WP_Post
  */
 function _close_comments_for_old_posts( $posts, $query ) {
 	if ( empty( $posts ) || ! $query->is_singular() || ! get_option( 'close_comments_for_old_posts' ) )

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * Core Comment API
- *
- * @package WordPress
- * @subpackage Comment
- */
+	 * Core Comment API
+	 *
+	 * @package WordPress
+	 * @subpackage Comment
+	 */
 
 /**
  * Check whether a comment passes internal checks to be allowed to add.

Spacing +518 added lines, -518 removed lines

@@ -40,15 +40,15 @@ 
 	global $wpdb;
 
 	// If manual moderation is enabled, skip all checks and return false.
-	if ( 1 == get_option('comment_moderation') )
+	if (1 == get_option('comment_moderation'))
 		return false;
 
 	/** This filter is documented in wp-includes/comment-template.php */
-	$comment = apply_filters( 'comment_text', $comment );
+	$comment = apply_filters('comment_text', $comment);
 
 	// Check for the number of external links if a max allowed number is set.
-	if ( $max_links = get_option( 'comment_max_links' ) ) {
-		$num_links = preg_match_all( '/<a [^>]*href/i', $comment, $out );
+	if ($max_links = get_option('comment_max_links')) {
+		$num_links = preg_match_all('/<a [^>]*href/i', $comment, $out);
 
 		/**
 		 * Filter the maximum number of links allowed in a comment.
@@ -58,27 +58,27 @@ 
 		 * @param int    $num_links The number of links allowed.
 		 * @param string $url       Comment author's URL. Included in allowed links total.
 		 */
-		$num_links = apply_filters( 'comment_max_links_url', $num_links, $url );
+		$num_links = apply_filters('comment_max_links_url', $num_links, $url);
 
 		/*
 		 * If the number of links in the comment exceeds the allowed amount,
 		 * fail the check by returning false.
 		 */
-		if ( $num_links >= $max_links )
+		if ($num_links >= $max_links)
 			return false;
 	}
 
 	$mod_keys = trim(get_option('moderation_keys'));
 
 	// If moderation 'keys' (keywords) are set, process them.
-	if ( !empty($mod_keys) ) {
-		$words = explode("\n", $mod_keys );
+	if ( ! empty($mod_keys)) {
+		$words = explode("\n", $mod_keys);
 
-		foreach ( (array) $words as $word) {
+		foreach ((array) $words as $word) {
 			$word = trim($word);
 
 			// Skip empty lines.
-			if ( empty($word) )
+			if (empty($word))
 				continue;
 
 			/*
@@ -92,12 +92,12 @@ 
 			 * fail the check for the given field by returning false.
 			 */
 			$pattern = "#$word#i";
-			if ( preg_match($pattern, $author) ) return false;
-			if ( preg_match($pattern, $email) ) return false;
-			if ( preg_match($pattern, $url) ) return false;
-			if ( preg_match($pattern, $comment) ) return false;
-			if ( preg_match($pattern, $user_ip) ) return false;
-			if ( preg_match($pattern, $user_agent) ) return false;
+			if (preg_match($pattern, $author)) return false;
+			if (preg_match($pattern, $email)) return false;
+			if (preg_match($pattern, $url)) return false;
+			if (preg_match($pattern, $comment)) return false;
+			if (preg_match($pattern, $user_ip)) return false;
+			if (preg_match($pattern, $user_agent)) return false;
 		}
 	}
 
@@ -108,12 +108,12 @@ 
 	 * as well as whether there are any moderation keywords (if set) present in the author
 	 * email address. If both checks pass, return true. Otherwise, return false.
 	 */
-	if ( 1 == get_option('comment_whitelist')) {
-		if ( 'trackback' != $comment_type && 'pingback' != $comment_type && $author != '' && $email != '' ) {
+	if (1 == get_option('comment_whitelist')) {
+		if ('trackback' != $comment_type && 'pingback' != $comment_type && $author != '' && $email != '') {
 			// expected_slashed ($author, $email)
 			$ok_to_comment = $wpdb->get_var("SELECT comment_approved FROM $wpdb->comments WHERE comment_author = '$author' AND comment_author_email = '$email' and comment_approved = '1' LIMIT 1");
-			if ( ( 1 == $ok_to_comment ) &&
-				( empty($mod_keys) || false === strpos( $email, $mod_keys) ) )
+			if ((1 == $ok_to_comment) &&
+				(empty($mod_keys) || false === strpos($email, $mod_keys)))
 					return true;
 			else
 				return false;
@@ -136,8 +136,8 @@ 
  * @return int|array $comments The approved comments, or number of comments if `$count`
  *                             argument is true.
  */
-function get_approved_comments( $post_id, $args = array() ) {
-	if ( ! $post_id ) {
+function get_approved_comments($post_id, $args = array()) {
+	if ( ! $post_id) {
 		return array();
 	}
 
@@ -146,10 +146,10 @@ 
 		'post_id' => $post_id,
 		'order'   => 'ASC',
 	);
-	$r = wp_parse_args( $args, $defaults );
+	$r = wp_parse_args($args, $defaults);
 
 	$query = new WP_Comment_Query;
-	return $query->query( $r );
+	return $query->query($r);
 }
 
 /**
@@ -167,20 +167,20 @@ 
  * @param string $output Optional. OBJECT or ARRAY_A or ARRAY_N constants.
  * @return WP_Comment|array|null Depends on $output value.
  */
-function get_comment( &$comment = null, $output = OBJECT ) {
-	if ( empty( $comment ) && isset( $GLOBALS['comment'] ) ) {
+function get_comment(&$comment = null, $output = OBJECT) {
+	if (empty($comment) && isset($GLOBALS['comment'])) {
 		$comment = $GLOBALS['comment'];
 	}
 
-	if ( $comment instanceof WP_Comment ) {
+	if ($comment instanceof WP_Comment) {
 		$_comment = $comment;
-	} elseif ( is_object( $comment ) ) {
-		$_comment = new WP_Comment( $comment );
+	} elseif (is_object($comment)) {
+		$_comment = new WP_Comment($comment);
 	} else {
-		$_comment = WP_Comment::get_instance( $comment );
+		$_comment = WP_Comment::get_instance($comment);
 	}
 
-	if ( ! $_comment ) {
+	if ( ! $_comment) {
 		return null;
 	}
 
@@ -191,14 +191,14 @@ 
 	 *
 	 * @param mixed $_comment Comment data.
 	 */
-	$_comment = apply_filters( 'get_comment', $_comment );
+	$_comment = apply_filters('get_comment', $_comment);
 
-	if ( $output == OBJECT ) {
+	if ($output == OBJECT) {
 		return $_comment;
-	} elseif ( $output == ARRAY_A ) {
+	} elseif ($output == ARRAY_A) {
 		return $_comment->to_array();
-	} elseif ( $output == ARRAY_N ) {
-		return array_values( $_comment->to_array() );
+	} elseif ($output == ARRAY_N) {
+		return array_values($_comment->to_array());
 	}
 	return $_comment;
 }
@@ -214,9 +214,9 @@ 
  *                           for information on accepted arguments. Default empty.
  * @return int|array List of comments or number of found comments if `$count` argument is true.
  */
-function get_comments( $args = '' ) {
+function get_comments($args = '') {
 	$query = new WP_Comment_Query;
-	return $query->query( $args );
+	return $query->query($args);
 }
 
 /**
@@ -231,10 +231,10 @@ 
  */
 function get_comment_statuses() {
 	$status = array(
-		'hold'		=> __( 'Unapproved' ),
-		'approve'	=> _x( 'Approved', 'comment status' ),
-		'spam'		=> _x( 'Spam', 'comment status' ),
-		'trash'		=> _x( 'Trash', 'comment status' ),
+		'hold'		=> __('Unapproved'),
+		'approve'	=> _x('Approved', 'comment status'),
+		'spam'		=> _x('Spam', 'comment status'),
+		'trash'		=> _x('Trash', 'comment status'),
 	);
 
 	return $status;
@@ -249,8 +249,8 @@ 
  * @param string $comment_type Optional. Comment type. Default 'comment'.
  * @return string Expected return value is 'open' or 'closed'.
  */
-function get_default_comment_status( $post_type = 'post', $comment_type = 'comment' ) {
-	switch ( $comment_type ) {
+function get_default_comment_status($post_type = 'post', $comment_type = 'comment') {
+	switch ($comment_type) {
 		case 'pingback' :
 		case 'trackback' :
 			$supports = 'trackbacks';
@@ -262,10 +262,10 @@ 
 	}
 
 	// Set the status.
-	if ( 'page' === $post_type ) {
+	if ('page' === $post_type) {
 		$status = 'closed';
-	} elseif ( post_type_supports( $post_type, $supports ) ) {
-		$status = get_option( "default_{$option}_status" );
+	} elseif (post_type_supports($post_type, $supports)) {
+		$status = get_option("default_{$option}_status");
 	} else {
 		$status = 'closed';
 	}
@@ -280,7 +280,7 @@ 
 	 * @param string $post_type    Post type. Default is `post`.
 	 * @param string $comment_type Type of comment. Default is `comment`.
 	 */
-	return apply_filters( 'get_default_comment_status' , $status, $post_type, $comment_type );
+	return apply_filters('get_default_comment_status', $status, $post_type, $comment_type);
 }
 
 /**
@@ -299,12 +299,12 @@ 
 	global $wpdb;
 	static $cache_lastcommentmodified = array();
 
-	if ( isset($cache_lastcommentmodified[$timezone]) )
+	if (isset($cache_lastcommentmodified[$timezone]))
 		return $cache_lastcommentmodified[$timezone];
 
 	$add_seconds_server = date('Z');
 
-	switch ( strtolower($timezone)) {
+	switch (strtolower($timezone)) {
 		case 'gmt':
 			$lastcommentmodified = $wpdb->get_var("SELECT comment_date_gmt FROM $wpdb->comments WHERE comment_approved = '1' ORDER BY comment_date_gmt DESC LIMIT 1");
 			break;
@@ -335,13 +335,13 @@ 
  * @param int $post_id Optional. Comment amount in post if > 0, else total comments blog wide.
  * @return array The amount of spam, approved, awaiting moderation, and total comments.
  */
-function get_comment_count( $post_id = 0 ) {
+function get_comment_count($post_id = 0) {
 	global $wpdb;
 
 	$post_id = (int) $post_id;
 
 	$where = '';
-	if ( $post_id > 0 ) {
+	if ($post_id > 0) {
 		$where = $wpdb->prepare("WHERE comment_post_ID = %d", $post_id);
 	}
 
@@ -362,8 +362,8 @@ 
 		'all'                 => 0,
 	);
 
-	foreach ( $totals as $row ) {
-		switch ( $row['comment_approved'] ) {
+	foreach ($totals as $row) {
+		switch ($row['comment_approved']) {
 			case 'trash':
 				$comment_count['trash'] = $row['total'];
 				break;
@@ -475,20 +475,20 @@ 
  *
  * @param array $comments Array of comment objects.
  */
-function wp_queue_comments_for_comment_meta_lazyload( $comments ) {
+function wp_queue_comments_for_comment_meta_lazyload($comments) {
 	// Don't use `wp_list_pluck()` to avoid by-reference manipulation.
 	$comment_ids = array();
-	if ( is_array( $comments ) ) {
-		foreach ( $comments as $comment ) {
-			if ( $comment instanceof WP_Comment ) {
+	if (is_array($comments)) {
+		foreach ($comments as $comment) {
+			if ($comment instanceof WP_Comment) {
 				$comment_ids[] = $comment->comment_ID;
 			}
 		}
 	}
 
-	if ( $comment_ids ) {
+	if ($comment_ids) {
 		$lazyloader = wp_metadata_lazyloader();
-		$lazyloader->queue_objects( 'comment', $comment_ids );
+		$lazyloader->queue_objects('comment', $comment_ids);
 	}
 }
 
@@ -502,7 +502,7 @@ 
  * @since 3.4.0
  */
 function wp_set_comment_cookies($comment, $user) {
-	if ( $user->exists() )
+	if ($user->exists())
 		return;
 
 	/**
@@ -512,11 +512,11 @@ 
 	 *
 	 * @param int $seconds Comment cookie lifetime. Default 30000000.
 	 */
-	$comment_cookie_lifetime = apply_filters( 'comment_cookie_lifetime', 30000000 );
-	$secure = ( 'https' === parse_url( home_url(), PHP_URL_SCHEME ) );
-	setcookie( 'comment_author_' . COOKIEHASH, $comment->comment_author, time() + $comment_cookie_lifetime, COOKIEPATH, COOKIE_DOMAIN, $secure );
-	setcookie( 'comment_author_email_' . COOKIEHASH, $comment->comment_author_email, time() + $comment_cookie_lifetime, COOKIEPATH, COOKIE_DOMAIN, $secure );
-	setcookie( 'comment_author_url_' . COOKIEHASH, esc_url($comment->comment_author_url), time() + $comment_cookie_lifetime, COOKIEPATH, COOKIE_DOMAIN, $secure );
+	$comment_cookie_lifetime = apply_filters('comment_cookie_lifetime', 30000000);
+	$secure = ('https' === parse_url(home_url(), PHP_URL_SCHEME));
+	setcookie('comment_author_'.COOKIEHASH, $comment->comment_author, time() + $comment_cookie_lifetime, COOKIEPATH, COOKIE_DOMAIN, $secure);
+	setcookie('comment_author_email_'.COOKIEHASH, $comment->comment_author_email, time() + $comment_cookie_lifetime, COOKIEPATH, COOKIE_DOMAIN, $secure);
+	setcookie('comment_author_url_'.COOKIEHASH, esc_url($comment->comment_author_url), time() + $comment_cookie_lifetime, COOKIEPATH, COOKIE_DOMAIN, $secure);
 }
 
 /**
@@ -528,7 +528,7 @@ 
  * @since 2.0.4
  */
 function sanitize_comment_cookies() {
-	if ( isset( $_COOKIE['comment_author_' . COOKIEHASH] ) ) {
+	if (isset($_COOKIE['comment_author_'.COOKIEHASH])) {
 		/**
 		 * Filter the comment author's name cookie before it is set.
 		 *
@@ -539,13 +539,13 @@ 
 		 *
 		 * @param string $author_cookie The comment author name cookie.
 		 */
-		$comment_author = apply_filters( 'pre_comment_author_name', $_COOKIE['comment_author_' . COOKIEHASH] );
+		$comment_author = apply_filters('pre_comment_author_name', $_COOKIE['comment_author_'.COOKIEHASH]);
 		$comment_author = wp_unslash($comment_author);
 		$comment_author = esc_attr($comment_author);
-		$_COOKIE['comment_author_' . COOKIEHASH] = $comment_author;
+		$_COOKIE['comment_author_'.COOKIEHASH] = $comment_author;
 	}
 
-	if ( isset( $_COOKIE['comment_author_email_' . COOKIEHASH] ) ) {
+	if (isset($_COOKIE['comment_author_email_'.COOKIEHASH])) {
 		/**
 		 * Filter the comment author's email cookie before it is set.
 		 *
@@ -556,13 +556,13 @@ 
 		 *
 		 * @param string $author_email_cookie The comment author email cookie.
 		 */
-		$comment_author_email = apply_filters( 'pre_comment_author_email', $_COOKIE['comment_author_email_' . COOKIEHASH] );
+		$comment_author_email = apply_filters('pre_comment_author_email', $_COOKIE['comment_author_email_'.COOKIEHASH]);
 		$comment_author_email = wp_unslash($comment_author_email);
 		$comment_author_email = esc_attr($comment_author_email);
 		$_COOKIE['comment_author_email_'.COOKIEHASH] = $comment_author_email;
 	}
 
-	if ( isset( $_COOKIE['comment_author_url_' . COOKIEHASH] ) ) {
+	if (isset($_COOKIE['comment_author_url_'.COOKIEHASH])) {
 		/**
 		 * Filter the comment author's URL cookie before it is set.
 		 *
@@ -573,7 +573,7 @@ 
 		 *
 		 * @param string $author_url_cookie The comment author URL cookie.
 		 */
-		$comment_author_url = apply_filters( 'pre_comment_author_url', $_COOKIE['comment_author_url_' . COOKIEHASH] );
+		$comment_author_url = apply_filters('pre_comment_author_url', $_COOKIE['comment_author_url_'.COOKIEHASH]);
 		$comment_author_url = wp_unslash($comment_author_url);
 		$_COOKIE['comment_author_url_'.COOKIEHASH] = $comment_author_url;
 	}
@@ -589,29 +589,29 @@ 
  * @param array $commentdata Contains information on the comment
  * @return int|string Signifies the approval status (0|1|'spam')
  */
-function wp_allow_comment( $commentdata ) {
+function wp_allow_comment($commentdata) {
 	global $wpdb;
 
 	// Simple duplicate check
 	// expected_slashed ($comment_post_ID, $comment_author, $comment_author_email, $comment_content)
 	$dupe = $wpdb->prepare(
 		"SELECT comment_ID FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_parent = %s AND comment_approved != 'trash' AND ( comment_author = %s ",
-		wp_unslash( $commentdata['comment_post_ID'] ),
-		wp_unslash( $commentdata['comment_parent'] ),
-		wp_unslash( $commentdata['comment_author'] )
+		wp_unslash($commentdata['comment_post_ID']),
+		wp_unslash($commentdata['comment_parent']),
+		wp_unslash($commentdata['comment_author'])
 	);
-	if ( $commentdata['comment_author_email'] ) {
+	if ($commentdata['comment_author_email']) {
 		$dupe .= $wpdb->prepare(
 			"OR comment_author_email = %s ",
-			wp_unslash( $commentdata['comment_author_email'] )
+			wp_unslash($commentdata['comment_author_email'])
 		);
 	}
 	$dupe .= $wpdb->prepare(
 		") AND comment_content = %s LIMIT 1",
-		wp_unslash( $commentdata['comment_content'] )
+		wp_unslash($commentdata['comment_content'])
 	);
 
-	$dupe_id = $wpdb->get_var( $dupe );
+	$dupe_id = $wpdb->get_var($dupe);
 
 	/**
 	 * Filters the ID, if any, of the duplicate comment found when creating a new comment.
@@ -623,9 +623,9 @@ 
 	 * @param int   $dupe_id     ID of the comment identified as a duplicate.
 	 * @param array $commentdata Data for the comment being created.
 	 */
-	$dupe_id = apply_filters( 'duplicate_comment_id', $dupe_id, $commentdata );
+	$dupe_id = apply_filters('duplicate_comment_id', $dupe_id, $commentdata);
 
-	if ( $dupe_id ) {
+	if ($dupe_id) {
 		/**
 		 * Fires immediately after a duplicate comment is detected.
 		 *
@@ -633,11 +633,11 @@ 
 		 *
 		 * @param array $commentdata Comment data.
 		 */
-		do_action( 'comment_duplicate_trigger', $commentdata );
-		if ( defined( 'DOING_AJAX' ) ) {
-			die( __('Duplicate comment detected; it looks as though you&#8217;ve already said that!') );
+		do_action('comment_duplicate_trigger', $commentdata);
+		if (defined('DOING_AJAX')) {
+			die(__('Duplicate comment detected; it looks as though you&#8217;ve already said that!'));
 		}
-		wp_die( __( 'Duplicate comment detected; it looks as though you&#8217;ve already said that!' ), 409 );
+		wp_die(__('Duplicate comment detected; it looks as though you&#8217;ve already said that!'), 409);
 	}
 
 	/**
@@ -658,20 +658,20 @@ 
 		$commentdata['comment_date_gmt']
 	);
 
-	if ( ! empty( $commentdata['user_id'] ) ) {
-		$user = get_userdata( $commentdata['user_id'] );
-		$post_author = $wpdb->get_var( $wpdb->prepare(
+	if ( ! empty($commentdata['user_id'])) {
+		$user = get_userdata($commentdata['user_id']);
+		$post_author = $wpdb->get_var($wpdb->prepare(
 			"SELECT post_author FROM $wpdb->posts WHERE ID = %d LIMIT 1",
 			$commentdata['comment_post_ID']
-		) );
+		));
 	}
 
-	if ( isset( $user ) && ( $commentdata['user_id'] == $post_author || $user->has_cap( 'moderate_comments' ) ) ) {
+	if (isset($user) && ($commentdata['user_id'] == $post_author || $user->has_cap('moderate_comments'))) {
 		// The author and the admins get respect.
 		$approved = 1;
 	} else {
 		// Everyone else's comments will be checked.
-		if ( check_comment(
+		if (check_comment(
 			$commentdata['comment_author'],
 			$commentdata['comment_author_email'],
 			$commentdata['comment_author_url'],
@@ -679,20 +679,20 @@ 
 			$commentdata['comment_author_IP'],
 			$commentdata['comment_agent'],
 			$commentdata['comment_type']
-		) ) {
+		)) {
 			$approved = 1;
 		} else {
 			$approved = 0;
 		}
 
-		if ( wp_blacklist_check(
+		if (wp_blacklist_check(
 			$commentdata['comment_author'],
 			$commentdata['comment_author_email'],
 			$commentdata['comment_author_url'],
 			$commentdata['comment_content'],
 			$commentdata['comment_author_IP'],
 			$commentdata['comment_agent']
-		) ) {
+		)) {
 			$approved = EMPTY_TRASH_DAYS ? 'trash' : 'spam';
 		}
 	}
@@ -705,7 +705,7 @@ 
 	 * @param bool|string $approved    The approval status. Accepts 1, 0, or 'spam'.
 	 * @param array       $commentdata Comment data.
 	 */
-	$approved = apply_filters( 'pre_comment_approved', $approved, $commentdata );
+	$approved = apply_filters('pre_comment_approved', $approved, $commentdata);
 	return $approved;
 }
 
@@ -723,15 +723,15 @@ 
  * @param string $email Comment author email address.
  * @param string $date MySQL time string.
  */
-function check_comment_flood_db( $ip, $email, $date ) {
+function check_comment_flood_db($ip, $email, $date) {
 	global $wpdb;
 	// don't throttle admins or moderators
-	if ( current_user_can( 'manage_options' ) || current_user_can( 'moderate_comments' ) ) {
+	if (current_user_can('manage_options') || current_user_can('moderate_comments')) {
 		return;
 	}
-	$hour_ago = gmdate( 'Y-m-d H:i:s', time() - HOUR_IN_SECONDS );
+	$hour_ago = gmdate('Y-m-d H:i:s', time() - HOUR_IN_SECONDS);
 
-	if ( is_user_logged_in() ) {
+	if (is_user_logged_in()) {
 		$user = get_current_user_id();
 		$check_column = '`user_id`';
 	} else {
@@ -745,8 +745,8 @@ 
 		$user,
 		$email
 	);
-	$lasttime = $wpdb->get_var( $sql );
-	if ( $lasttime ) {
+	$lasttime = $wpdb->get_var($sql);
+	if ($lasttime) {
 		$time_lastcomment = mysql2date('U', $lasttime, false);
 		$time_newcomment  = mysql2date('U', $date, false);
 		/**
@@ -758,8 +758,8 @@ 
 		 * @param int  $time_lastcomment Timestamp of when the last comment was posted.
 		 * @param int  $time_newcomment  Timestamp of when the new comment was posted.
 		 */
-		$flood_die = apply_filters( 'comment_flood_filter', false, $time_lastcomment, $time_newcomment );
-		if ( $flood_die ) {
+		$flood_die = apply_filters('comment_flood_filter', false, $time_lastcomment, $time_newcomment);
+		if ($flood_die) {
 			/**
 			 * Fires before the comment flood message is triggered.
 			 *
@@ -768,12 +768,12 @@ 
 			 * @param int $time_lastcomment Timestamp of when the last comment was posted.
 			 * @param int $time_newcomment  Timestamp of when the new comment was posted.
 			 */
-			do_action( 'comment_flood_trigger', $time_lastcomment, $time_newcomment );
+			do_action('comment_flood_trigger', $time_lastcomment, $time_newcomment);
 
-			if ( defined('DOING_AJAX') )
-				die( __('You are posting comments too quickly. Slow down.') );
+			if (defined('DOING_AJAX'))
+				die(__('You are posting comments too quickly. Slow down.'));
 
-			wp_die( __( 'You are posting comments too quickly. Slow down.' ), 429 );
+			wp_die(__('You are posting comments too quickly. Slow down.'), 429);
 		}
 	}
 }
@@ -789,12 +789,12 @@ 
 function separate_comments(&$comments) {
 	$comments_by_type = array('comment' => array(), 'trackback' => array(), 'pingback' => array(), 'pings' => array());
 	$count = count($comments);
-	for ( $i = 0; $i < $count; $i++ ) {
+	for ($i = 0; $i < $count; $i++) {
 		$type = $comments[$i]->comment_type;
-		if ( empty($type) )
+		if (empty($type))
 			$type = 'comment';
 		$comments_by_type[$type][] = &$comments[$i];
-		if ( 'trackback' == $type || 'pingback' == $type )
+		if ('trackback' == $type || 'pingback' == $type)
 			$comments_by_type['pings'][] = &$comments[$i];
 	}
 
@@ -815,37 +815,37 @@ 
  * @param bool  $threaded Optional control over flat or threaded comments.
  * @return int Number of comment pages.
  */
-function get_comment_pages_count( $comments = null, $per_page = null, $threaded = null ) {
+function get_comment_pages_count($comments = null, $per_page = null, $threaded = null) {
 	global $wp_query;
 
-	if ( null === $comments && null === $per_page && null === $threaded && !empty($wp_query->max_num_comment_pages) )
+	if (null === $comments && null === $per_page && null === $threaded && ! empty($wp_query->max_num_comment_pages))
 		return $wp_query->max_num_comment_pages;
 
-	if ( ( ! $comments || ! is_array( $comments ) ) && ! empty( $wp_query->comments )  )
+	if (( ! $comments || ! is_array($comments)) && ! empty($wp_query->comments))
 		$comments = $wp_query->comments;
 
-	if ( empty($comments) )
+	if (empty($comments))
 		return 0;
 
-	if ( ! get_option( 'page_comments' ) ) {
+	if ( ! get_option('page_comments')) {
 		return 1;
 	}
 
-	if ( !isset($per_page) )
+	if ( ! isset($per_page))
 		$per_page = (int) get_query_var('comments_per_page');
-	if ( 0 === $per_page )
+	if (0 === $per_page)
 		$per_page = (int) get_option('comments_per_page');
-	if ( 0 === $per_page )
+	if (0 === $per_page)
 		return 1;
 
-	if ( !isset($threaded) )
+	if ( ! isset($threaded))
 		$threaded = get_option('thread_comments');
 
-	if ( $threaded ) {
+	if ($threaded) {
 		$walker = new Walker_Comment;
-		$count = ceil( $walker->get_number_of_root_elements( $comments ) / $per_page );
+		$count = ceil($walker->get_number_of_root_elements($comments) / $per_page);
 	} else {
-		$count = ceil( count( $comments ) / $per_page );
+		$count = ceil(count($comments) / $per_page);
 	}
 
 	return $count;
@@ -871,49 +871,49 @@ 
  * } *
  * @return int|null Comment page number or null on error.
  */
-function get_page_of_comment( $comment_ID, $args = array() ) {
+function get_page_of_comment($comment_ID, $args = array()) {
 	global $wpdb;
 
 	$page = null;
 
-	if ( !$comment = get_comment( $comment_ID ) )
+	if ( ! $comment = get_comment($comment_ID))
 		return;
 
-	$defaults = array( 'type' => 'all', 'page' => '', 'per_page' => '', 'max_depth' => '' );
-	$args = wp_parse_args( $args, $defaults );
+	$defaults = array('type' => 'all', 'page' => '', 'per_page' => '', 'max_depth' => '');
+	$args = wp_parse_args($args, $defaults);
 	$original_args = $args;
 
 	// Order of precedence: 1. `$args['per_page']`, 2. 'comments_per_page' query_var, 3. 'comments_per_page' option.
-	if ( get_option( 'page_comments' ) ) {
-		if ( '' === $args['per_page'] ) {
-			$args['per_page'] = get_query_var( 'comments_per_page' );
+	if (get_option('page_comments')) {
+		if ('' === $args['per_page']) {
+			$args['per_page'] = get_query_var('comments_per_page');
 		}
 
-		if ( '' === $args['per_page'] ) {
-			$args['per_page'] = get_option( 'comments_per_page' );
+		if ('' === $args['per_page']) {
+			$args['per_page'] = get_option('comments_per_page');
 		}
 	}
 
-	if ( empty($args['per_page']) ) {
+	if (empty($args['per_page'])) {
 		$args['per_page'] = 0;
 		$args['page'] = 0;
 	}
 
-	if ( $args['per_page'] < 1 ) {
+	if ($args['per_page'] < 1) {
 		$page = 1;
 	}
 
-	if ( null === $page ) {
-		if ( '' === $args['max_depth'] ) {
-			if ( get_option('thread_comments') )
+	if (null === $page) {
+		if ('' === $args['max_depth']) {
+			if (get_option('thread_comments'))
 				$args['max_depth'] = get_option('thread_comments_depth');
 			else
 				$args['max_depth'] = -1;
 		}
 
 		// Find this comment's top level parent if threading is enabled
-		if ( $args['max_depth'] > 1 && 0 != $comment->comment_parent )
-			return get_page_of_comment( $comment->comment_parent, $args );
+		if ($args['max_depth'] > 1 && 0 != $comment->comment_parent)
+			return get_page_of_comment($comment->comment_parent, $args);
 
 		$comment_args = array(
 			'type'       => $args['type'],
@@ -931,15 +931,15 @@ 
 		);
 
 		$comment_query = new WP_Comment_Query();
-		$older_comment_count = $comment_query->query( $comment_args );
+		$older_comment_count = $comment_query->query($comment_args);
 
 		// No older comments? Then it's page #1.
-		if ( 0 == $older_comment_count ) {
+		if (0 == $older_comment_count) {
 			$page = 1;
 
 		// Divide comments older than this one by comments per page to get this comment's page number
 		} else {
-			$page = ceil( ( $older_comment_count + 1 ) / $args['per_page'] );
+			$page = ceil(($older_comment_count + 1) / $args['per_page']);
 		}
 	}
 
@@ -968,7 +968,7 @@ 
 	 *     @type int    $max_depth Maximum comment threading depth allowed.
 	 * }
 	 */
-	return apply_filters( 'get_page_of_comment', (int) $page, $args, $original_args );
+	return apply_filters('get_page_of_comment', (int) $page, $args, $original_args);
 }
 
 /**
@@ -990,28 +990,28 @@ 
 		'comment_content'      => 65525,
 	);
 
-	if ( $wpdb->is_mysql ) {
-		foreach ( $lengths as $column => $length ) {
-			$col_length = $wpdb->get_col_length( $wpdb->comments, $column );
+	if ($wpdb->is_mysql) {
+		foreach ($lengths as $column => $length) {
+			$col_length = $wpdb->get_col_length($wpdb->comments, $column);
 			$max_length = 0;
 
 			// No point if we can't get the DB column lengths
-			if ( is_wp_error( $col_length ) ) {
+			if (is_wp_error($col_length)) {
 				break;
 			}
 
-			if ( ! is_array( $col_length ) && (int) $col_length > 0 ) {
+			if ( ! is_array($col_length) && (int) $col_length > 0) {
 				$max_length = (int) $col_length;
-			} elseif ( is_array( $col_length ) && isset( $col_length['length'] ) && intval( $col_length['length'] ) > 0 ) {
+			} elseif (is_array($col_length) && isset($col_length['length']) && intval($col_length['length']) > 0) {
 				$max_length = (int) $col_length['length'];
 
-				if ( ! empty( $col_length['type'] ) && 'byte' === $col_length['type'] ) {
+				if ( ! empty($col_length['type']) && 'byte' === $col_length['type']) {
 					$max_length = $max_length - 10;
 				}
 			}
 
-			if ( $max_length > 0 ) {
-				$lengths[ $column ] = $max_length;
+			if ($max_length > 0) {
+				$lengths[$column] = $max_length;
 			}
 		}
 	}
@@ -1023,7 +1023,7 @@ 
 	 *
 	 * @param array $lengths Associative array `'field_name' => 'maximum length'`.
 	 */
-	return apply_filters( 'wp_get_comment_fields_max_lengths', $lengths );
+	return apply_filters('wp_get_comment_fields_max_lengths', $lengths);
 }
 
 /**
@@ -1052,18 +1052,18 @@ 
 	 * @param string $user_ip    Comment author's IP address.
 	 * @param string $user_agent Comment author's browser user agent.
 	 */
-	do_action( 'wp_blacklist_check', $author, $email, $url, $comment, $user_ip, $user_agent );
+	do_action('wp_blacklist_check', $author, $email, $url, $comment, $user_ip, $user_agent);
 
-	$mod_keys = trim( get_option('blacklist_keys') );
-	if ( '' == $mod_keys )
+	$mod_keys = trim(get_option('blacklist_keys'));
+	if ('' == $mod_keys)
 		return false; // If moderation keys are empty
-	$words = explode("\n", $mod_keys );
+	$words = explode("\n", $mod_keys);
 
-	foreach ( (array) $words as $word ) {
+	foreach ((array) $words as $word) {
 		$word = trim($word);
 
 		// Skip empty lines
-		if ( empty($word) ) { continue; }
+		if (empty($word)) { continue; }
 
 		// Do some escaping magic so that '#' chars in the
 		// spam words don't break things:
@@ -1099,7 +1099,7 @@ 
  * @param int $post_id Optional. Post ID.
  * @return object|array Comment stats.
  */
-function wp_count_comments( $post_id = 0 ) {
+function wp_count_comments($post_id = 0) {
 	$post_id = (int) $post_id;
 
 	/**
@@ -1110,22 +1110,22 @@ 
 	 * @param array $count   An empty array.
 	 * @param int   $post_id The post ID.
 	 */
-	$filtered = apply_filters( 'wp_count_comments', array(), $post_id );
-	if ( ! empty( $filtered ) ) {
+	$filtered = apply_filters('wp_count_comments', array(), $post_id);
+	if ( ! empty($filtered)) {
 		return $filtered;
 	}
 
-	$count = wp_cache_get( "comments-{$post_id}", 'counts' );
-	if ( false !== $count ) {
+	$count = wp_cache_get("comments-{$post_id}", 'counts');
+	if (false !== $count) {
 		return $count;
 	}
 
-	$stats = get_comment_count( $post_id );
+	$stats = get_comment_count($post_id);
 	$stats['moderated'] = $stats['awaiting_moderation'];
-	unset( $stats['awaiting_moderation'] );
+	unset($stats['awaiting_moderation']);
 
 	$stats_object = (object) $stats;
-	wp_cache_set( "comments-{$post_id}", $stats_object, 'counts' );
+	wp_cache_set("comments-{$post_id}", $stats_object, 'counts');
 
 	return $stats_object;
 }
@@ -1149,10 +1149,10 @@ 
  */
 function wp_delete_comment($comment_id, $force_delete = false) {
 	global $wpdb;
-	if (!$comment = get_comment($comment_id))
+	if ( ! $comment = get_comment($comment_id))
 		return false;
 
-	if ( !$force_delete && EMPTY_TRASH_DAYS && !in_array( wp_get_comment_status( $comment ), array( 'trash', 'spam' ) ) )
+	if ( ! $force_delete && EMPTY_TRASH_DAYS && ! in_array(wp_get_comment_status($comment), array('trash', 'spam')))
 		return wp_trash_comment($comment_id);
 
 	/**
@@ -1162,21 +1162,21 @@ 
 	 *
 	 * @param int $comment_id The comment ID.
 	 */
-	do_action( 'delete_comment', $comment->comment_ID );
+	do_action('delete_comment', $comment->comment_ID);
 
 	// Move children up a level.
-	$children = $wpdb->get_col( $wpdb->prepare("SELECT comment_ID FROM $wpdb->comments WHERE comment_parent = %d", $comment->comment_ID) );
-	if ( !empty($children) ) {
+	$children = $wpdb->get_col($wpdb->prepare("SELECT comment_ID FROM $wpdb->comments WHERE comment_parent = %d", $comment->comment_ID));
+	if ( ! empty($children)) {
 		$wpdb->update($wpdb->comments, array('comment_parent' => $comment->comment_parent), array('comment_parent' => $comment->comment_ID));
 		clean_comment_cache($children);
 	}
 
 	// Delete metadata
-	$meta_ids = $wpdb->get_col( $wpdb->prepare( "SELECT meta_id FROM $wpdb->commentmeta WHERE comment_id = %d", $comment->comment_ID ) );
-	foreach ( $meta_ids as $mid )
-		delete_metadata_by_mid( 'comment', $mid );
+	$meta_ids = $wpdb->get_col($wpdb->prepare("SELECT meta_id FROM $wpdb->commentmeta WHERE comment_id = %d", $comment->comment_ID));
+	foreach ($meta_ids as $mid)
+		delete_metadata_by_mid('comment', $mid);
 
-	if ( ! $wpdb->delete( $wpdb->comments, array( 'comment_ID' => $comment->comment_ID ) ) )
+	if ( ! $wpdb->delete($wpdb->comments, array('comment_ID' => $comment->comment_ID)))
 		return false;
 
 	/**
@@ -1186,16 +1186,16 @@ 
 	 *
 	 * @param int $comment_id The comment ID.
 	 */
-	do_action( 'deleted_comment', $comment->comment_ID );
+	do_action('deleted_comment', $comment->comment_ID);
 
 	$post_id = $comment->comment_post_ID;
-	if ( $post_id && $comment->comment_approved == 1 )
+	if ($post_id && $comment->comment_approved == 1)
 		wp_update_comment_count($post_id);
 
-	clean_comment_cache( $comment->comment_ID );
+	clean_comment_cache($comment->comment_ID);
 
 	/** This action is documented in wp-includes/comment.php */
-	do_action( 'wp_set_comment_status', $comment->comment_ID, 'delete' );
+	do_action('wp_set_comment_status', $comment->comment_ID, 'delete');
 
 	wp_transition_comment_status('delete', $comment->comment_approved, $comment);
 	return true;
@@ -1212,10 +1212,10 @@ 
  * @return bool True on success, false on failure.
  */
 function wp_trash_comment($comment_id) {
-	if ( !EMPTY_TRASH_DAYS )
+	if ( ! EMPTY_TRASH_DAYS)
 		return wp_delete_comment($comment_id, true);
 
-	if ( !$comment = get_comment($comment_id) )
+	if ( ! $comment = get_comment($comment_id))
 		return false;
 
 	/**
@@ -1225,13 +1225,13 @@ 
 	 *
 	 * @param int $comment_id The comment ID.
 	 */
-	do_action( 'trash_comment', $comment->comment_ID );
+	do_action('trash_comment', $comment->comment_ID);
 
-	if ( wp_set_comment_status( $comment, 'trash' ) ) {
-		delete_comment_meta( $comment->comment_ID, '_wp_trash_meta_status' );
-		delete_comment_meta( $comment->comment_ID, '_wp_trash_meta_time' );
-		add_comment_meta( $comment->comment_ID, '_wp_trash_meta_status', $comment->comment_approved );
-		add_comment_meta( $comment->comment_ID, '_wp_trash_meta_time', time() );
+	if (wp_set_comment_status($comment, 'trash')) {
+		delete_comment_meta($comment->comment_ID, '_wp_trash_meta_status');
+		delete_comment_meta($comment->comment_ID, '_wp_trash_meta_time');
+		add_comment_meta($comment->comment_ID, '_wp_trash_meta_status', $comment->comment_approved);
+		add_comment_meta($comment->comment_ID, '_wp_trash_meta_time', time());
 
 		/**
 		 * Fires immediately after a comment is sent to Trash.
@@ -1240,7 +1240,7 @@ 
 		 *
 		 * @param int $comment_id The comment ID.
 		 */
-		do_action( 'trashed_comment', $comment->comment_ID );
+		do_action('trashed_comment', $comment->comment_ID);
 		return true;
 	}
 
@@ -1256,8 +1256,8 @@ 
  * @return bool True on success, false on failure.
  */
 function wp_untrash_comment($comment_id) {
-	$comment = get_comment( $comment_id );
-	if ( ! $comment ) {
+	$comment = get_comment($comment_id);
+	if ( ! $comment) {
 		return false;
 	}
 
@@ -1268,15 +1268,15 @@ 
 	 *
 	 * @param int $comment_id The comment ID.
 	 */
-	do_action( 'untrash_comment', $comment->comment_ID );
+	do_action('untrash_comment', $comment->comment_ID);
 
-	$status = (string) get_comment_meta( $comment->comment_ID, '_wp_trash_meta_status', true );
-	if ( empty($status) )
+	$status = (string) get_comment_meta($comment->comment_ID, '_wp_trash_meta_status', true);
+	if (empty($status))
 		$status = '0';
 
-	if ( wp_set_comment_status( $comment, $status ) ) {
-		delete_comment_meta( $comment->comment_ID, '_wp_trash_meta_time' );
-		delete_comment_meta( $comment->comment_ID, '_wp_trash_meta_status' );
+	if (wp_set_comment_status($comment, $status)) {
+		delete_comment_meta($comment->comment_ID, '_wp_trash_meta_time');
+		delete_comment_meta($comment->comment_ID, '_wp_trash_meta_status');
 		/**
 		 * Fires immediately after a comment is restored from the Trash.
 		 *
@@ -1284,7 +1284,7 @@ 
 		 *
 		 * @param int $comment_id The comment ID.
 		 */
-		do_action( 'untrashed_comment', $comment->comment_ID );
+		do_action('untrashed_comment', $comment->comment_ID);
 		return true;
 	}
 
@@ -1299,9 +1299,9 @@ 
  * @param int|WP_Comment $comment_id Comment ID or WP_Comment object.
  * @return bool True on success, false on failure.
  */
-function wp_spam_comment( $comment_id ) {
-	$comment = get_comment( $comment_id );
-	if ( ! $comment ) {
+function wp_spam_comment($comment_id) {
+	$comment = get_comment($comment_id);
+	if ( ! $comment) {
 		return false;
 	}
 
@@ -1312,13 +1312,13 @@ 
 	 *
 	 * @param int $comment_id The comment ID.
 	 */
-	do_action( 'spam_comment', $comment->comment_ID );
+	do_action('spam_comment', $comment->comment_ID);
 
-	if ( wp_set_comment_status( $comment, 'spam' ) ) {
-		delete_comment_meta( $comment->comment_ID, '_wp_trash_meta_status' );
-		delete_comment_meta( $comment->comment_ID, '_wp_trash_meta_time' );
-		add_comment_meta( $comment->comment_ID, '_wp_trash_meta_status', $comment->comment_approved );
-		add_comment_meta( $comment->comment_ID, '_wp_trash_meta_time', time() );
+	if (wp_set_comment_status($comment, 'spam')) {
+		delete_comment_meta($comment->comment_ID, '_wp_trash_meta_status');
+		delete_comment_meta($comment->comment_ID, '_wp_trash_meta_time');
+		add_comment_meta($comment->comment_ID, '_wp_trash_meta_status', $comment->comment_approved);
+		add_comment_meta($comment->comment_ID, '_wp_trash_meta_time', time());
 		/**
 		 * Fires immediately after a comment is marked as Spam.
 		 *
@@ -1326,7 +1326,7 @@ 
 		 *
 		 * @param int $comment_id The comment ID.
 		 */
-		do_action( 'spammed_comment', $comment->comment_ID );
+		do_action('spammed_comment', $comment->comment_ID);
 		return true;
 	}
 
@@ -1341,9 +1341,9 @@ 
  * @param int|WP_Comment $comment_id Comment ID or WP_Comment object.
  * @return bool True on success, false on failure.
  */
-function wp_unspam_comment( $comment_id ) {
-	$comment = get_comment( $comment_id );
-	if ( ! $comment ) {
+function wp_unspam_comment($comment_id) {
+	$comment = get_comment($comment_id);
+	if ( ! $comment) {
 		return false;
 	}
 
@@ -1354,15 +1354,15 @@ 
 	 *
 	 * @param int $comment_id The comment ID.
 	 */
-	do_action( 'unspam_comment', $comment->comment_ID );
+	do_action('unspam_comment', $comment->comment_ID);
 
-	$status = (string) get_comment_meta( $comment->comment_ID, '_wp_trash_meta_status', true );
-	if ( empty($status) )
+	$status = (string) get_comment_meta($comment->comment_ID, '_wp_trash_meta_status', true);
+	if (empty($status))
 		$status = '0';
 
-	if ( wp_set_comment_status( $comment, $status ) ) {
-		delete_comment_meta( $comment->comment_ID, '_wp_trash_meta_status' );
-		delete_comment_meta( $comment->comment_ID, '_wp_trash_meta_time' );
+	if (wp_set_comment_status($comment, $status)) {
+		delete_comment_meta($comment->comment_ID, '_wp_trash_meta_status');
+		delete_comment_meta($comment->comment_ID, '_wp_trash_meta_time');
 		/**
 		 * Fires immediately after a comment is unmarked as Spam.
 		 *
@@ -1370,7 +1370,7 @@ 
 		 *
 		 * @param int $comment_id The comment ID.
 		 */
-		do_action( 'unspammed_comment', $comment->comment_ID );
+		do_action('unspammed_comment', $comment->comment_ID);
 		return true;
 	}
 
@@ -1387,20 +1387,20 @@ 
  */
 function wp_get_comment_status($comment_id) {
 	$comment = get_comment($comment_id);
-	if ( !$comment )
+	if ( ! $comment)
 		return false;
 
 	$approved = $comment->comment_approved;
 
-	if ( $approved == null )
+	if ($approved == null)
 		return false;
-	elseif ( $approved == '1' )
+	elseif ($approved == '1')
 		return 'approved';
-	elseif ( $approved == '0' )
+	elseif ($approved == '0')
 		return 'unapproved';
-	elseif ( $approved == 'spam' )
+	elseif ($approved == 'spam')
 		return 'spam';
-	elseif ( $approved == 'trash' )
+	elseif ($approved == 'trash')
 		return 'trash';
 	else
 		return false;
@@ -1438,11 +1438,11 @@ 
 		1         => 'approved',
 		'approve' => 'approved', // wp_set_comment_status() uses "approve"
 	);
-	if ( isset($comment_statuses[$new_status]) ) $new_status = $comment_statuses[$new_status];
-	if ( isset($comment_statuses[$old_status]) ) $old_status = $comment_statuses[$old_status];
+	if (isset($comment_statuses[$new_status])) $new_status = $comment_statuses[$new_status];
+	if (isset($comment_statuses[$old_status])) $old_status = $comment_statuses[$old_status];
 
 	// Call the hooks
-	if ( $new_status != $old_status ) {
+	if ($new_status != $old_status) {
 		/**
 		 * Fires when the comment status is in transition.
 		 *
@@ -1452,7 +1452,7 @@ 
 		 * @param int|string $old_status The old comment status.
 		 * @param object     $comment    The comment data.
 		 */
-		do_action( 'transition_comment_status', $new_status, $old_status, $comment );
+		do_action('transition_comment_status', $new_status, $old_status, $comment);
 		/**
 		 * Fires when the comment status is in transition from one specific status to another.
 		 *
@@ -1463,7 +1463,7 @@ 
 		 *
 		 * @param WP_Comment $comment Comment object.
 		 */
-		do_action( "comment_{$old_status}_to_{$new_status}", $comment );
+		do_action("comment_{$old_status}_to_{$new_status}", $comment);
 	}
 	/**
 	 * Fires when the status of a specific comment type is in transition.
@@ -1479,7 +1479,7 @@ 
 	 * @param int        $comment_ID The comment ID.
 	 * @param WP_Comment $comment    Comment object.
 	 */
-	do_action( "comment_{$new_status}_{$comment->comment_type}", $comment->comment_ID, $comment );
+	do_action("comment_{$new_status}_{$comment->comment_type}", $comment->comment_ID, $comment);
 }
 
 /**
@@ -1498,15 +1498,15 @@ 
 	// Cookies should already be sanitized.
 
 	$comment_author = '';
-	if ( isset($_COOKIE['comment_author_'.COOKIEHASH]) )
+	if (isset($_COOKIE['comment_author_'.COOKIEHASH]))
 		$comment_author = $_COOKIE['comment_author_'.COOKIEHASH];
 
 	$comment_author_email = '';
-	if ( isset($_COOKIE['comment_author_email_'.COOKIEHASH]) )
+	if (isset($_COOKIE['comment_author_email_'.COOKIEHASH]))
 		$comment_author_email = $_COOKIE['comment_author_email_'.COOKIEHASH];
 
 	$comment_author_url = '';
-	if ( isset($_COOKIE['comment_author_url_'.COOKIEHASH]) )
+	if (isset($_COOKIE['comment_author_url_'.COOKIEHASH]))
 		$comment_author_url = $_COOKIE['comment_author_url_'.COOKIEHASH];
 
 	/**
@@ -1522,7 +1522,7 @@ 
 	 *     @type string $comment_author_url   The URL address of the `$comment_author`. Default empty.
 	 * }
 	 */
-	return apply_filters( 'wp_get_current_commenter', compact('comment_author', 'comment_author_email', 'comment_author_url') );
+	return apply_filters('wp_get_current_commenter', compact('comment_author', 'comment_author_email', 'comment_author_url'));
 }
 
 /**
@@ -1560,44 +1560,44 @@ 
  * }
  * @return int|false The new comment's ID on success, false on failure.
  */
-function wp_insert_comment( $commentdata ) {
+function wp_insert_comment($commentdata) {
 	global $wpdb;
-	$data = wp_unslash( $commentdata );
+	$data = wp_unslash($commentdata);
 
-	$comment_author       = ! isset( $data['comment_author'] )       ? '' : $data['comment_author'];
-	$comment_author_email = ! isset( $data['comment_author_email'] ) ? '' : $data['comment_author_email'];
-	$comment_author_url   = ! isset( $data['comment_author_url'] )   ? '' : $data['comment_author_url'];
-	$comment_author_IP    = ! isset( $data['comment_author_IP'] )    ? '' : $data['comment_author_IP'];
+	$comment_author       = ! isset($data['comment_author']) ? '' : $data['comment_author'];
+	$comment_author_email = ! isset($data['comment_author_email']) ? '' : $data['comment_author_email'];
+	$comment_author_url   = ! isset($data['comment_author_url']) ? '' : $data['comment_author_url'];
+	$comment_author_IP    = ! isset($data['comment_author_IP']) ? '' : $data['comment_author_IP'];
 
-	$comment_date     = ! isset( $data['comment_date'] )     ? current_time( 'mysql' )            : $data['comment_date'];
-	$comment_date_gmt = ! isset( $data['comment_date_gmt'] ) ? get_gmt_from_date( $comment_date ) : $data['comment_date_gmt'];
+	$comment_date     = ! isset($data['comment_date']) ? current_time('mysql') : $data['comment_date'];
+	$comment_date_gmt = ! isset($data['comment_date_gmt']) ? get_gmt_from_date($comment_date) : $data['comment_date_gmt'];
 
-	$comment_post_ID  = ! isset( $data['comment_post_ID'] )  ? 0  : $data['comment_post_ID'];
-	$comment_content  = ! isset( $data['comment_content'] )  ? '' : $data['comment_content'];
-	$comment_karma    = ! isset( $data['comment_karma'] )    ? 0  : $data['comment_karma'];
-	$comment_approved = ! isset( $data['comment_approved'] ) ? 1  : $data['comment_approved'];
-	$comment_agent    = ! isset( $data['comment_agent'] )    ? '' : $data['comment_agent'];
-	$comment_type     = ! isset( $data['comment_type'] )     ? '' : $data['comment_type'];
-	$comment_parent   = ! isset( $data['comment_parent'] )   ? 0  : $data['comment_parent'];
+	$comment_post_ID  = ! isset($data['comment_post_ID']) ? 0 : $data['comment_post_ID'];
+	$comment_content  = ! isset($data['comment_content']) ? '' : $data['comment_content'];
+	$comment_karma    = ! isset($data['comment_karma']) ? 0 : $data['comment_karma'];
+	$comment_approved = ! isset($data['comment_approved']) ? 1 : $data['comment_approved'];
+	$comment_agent    = ! isset($data['comment_agent']) ? '' : $data['comment_agent'];
+	$comment_type     = ! isset($data['comment_type']) ? '' : $data['comment_type'];
+	$comment_parent   = ! isset($data['comment_parent']) ? 0 : $data['comment_parent'];
 
-	$user_id  = ! isset( $data['user_id'] ) ? 0 : $data['user_id'];
+	$user_id = ! isset($data['user_id']) ? 0 : $data['user_id'];
 
-	$compacted = compact( 'comment_post_ID', 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_author_IP', 'comment_date', 'comment_date_gmt', 'comment_content', 'comment_karma', 'comment_approved', 'comment_agent', 'comment_type', 'comment_parent', 'user_id' );
-	if ( ! $wpdb->insert( $wpdb->comments, $compacted ) ) {
+	$compacted = compact('comment_post_ID', 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_author_IP', 'comment_date', 'comment_date_gmt', 'comment_content', 'comment_karma', 'comment_approved', 'comment_agent', 'comment_type', 'comment_parent', 'user_id');
+	if ( ! $wpdb->insert($wpdb->comments, $compacted)) {
 		return false;
 	}
 
 	$id = (int) $wpdb->insert_id;
 
-	if ( $comment_approved == 1 ) {
-		wp_update_comment_count( $comment_post_ID );
+	if ($comment_approved == 1) {
+		wp_update_comment_count($comment_post_ID);
 	}
-	$comment = get_comment( $id );
+	$comment = get_comment($id);
 
 	// If metadata is provided, store it.
-	if ( isset( $commentdata['comment_meta'] ) && is_array( $commentdata['comment_meta'] ) ) {
-		foreach ( $commentdata['comment_meta'] as $meta_key => $meta_value ) {
-			add_comment_meta( $comment->comment_ID, $meta_key, $meta_value, true );
+	if (isset($commentdata['comment_meta']) && is_array($commentdata['comment_meta'])) {
+		foreach ($commentdata['comment_meta'] as $meta_key => $meta_value) {
+			add_comment_meta($comment->comment_ID, $meta_key, $meta_value, true);
 		}
 	}
 
@@ -1609,9 +1609,9 @@ 
 	 * @param int        $id      The comment ID.
 	 * @param WP_Comment $comment Comment object.
 	 */
-	do_action( 'wp_insert_comment', $id, $comment );
+	do_action('wp_insert_comment', $id, $comment);
 
-	wp_cache_set( 'last_changed', microtime(), 'comment' );
+	wp_cache_set('last_changed', microtime(), 'comment');
 
 	return $id;
 }
@@ -1629,7 +1629,7 @@ 
  * @return array Parsed comment information.
  */
 function wp_filter_comment($commentdata) {
-	if ( isset( $commentdata['user_ID'] ) ) {
+	if (isset($commentdata['user_ID'])) {
 		/**
 		 * Filter the comment author's user id before it is set.
 		 *
@@ -1640,10 +1640,10 @@ 
 		 *
 		 * @param int $user_ID The comment author's user ID.
 		 */
-		$commentdata['user_id'] = apply_filters( 'pre_user_id', $commentdata['user_ID'] );
-	} elseif ( isset( $commentdata['user_id'] ) ) {
+		$commentdata['user_id'] = apply_filters('pre_user_id', $commentdata['user_ID']);
+	} elseif (isset($commentdata['user_id'])) {
 		/** This filter is documented in wp-includes/comment.php */
-		$commentdata['user_id'] = apply_filters( 'pre_user_id', $commentdata['user_id'] );
+		$commentdata['user_id'] = apply_filters('pre_user_id', $commentdata['user_id']);
 	}
 
 	/**
@@ -1653,9 +1653,9 @@ 
 	 *
 	 * @param string $comment_agent The comment author's browser user agent.
 	 */
-	$commentdata['comment_agent'] = apply_filters( 'pre_comment_user_agent', ( isset( $commentdata['comment_agent'] ) ? $commentdata['comment_agent'] : '' ) );
+	$commentdata['comment_agent'] = apply_filters('pre_comment_user_agent', (isset($commentdata['comment_agent']) ? $commentdata['comment_agent'] : ''));
 	/** This filter is documented in wp-includes/comment.php */
-	$commentdata['comment_author'] = apply_filters( 'pre_comment_author_name', $commentdata['comment_author'] );
+	$commentdata['comment_author'] = apply_filters('pre_comment_author_name', $commentdata['comment_author']);
 	/**
 	 * Filter the comment content before it is set.
 	 *
@@ -1663,7 +1663,7 @@ 
 	 *
 	 * @param string $comment_content The comment content.
 	 */
-	$commentdata['comment_content'] = apply_filters( 'pre_comment_content', $commentdata['comment_content'] );
+	$commentdata['comment_content'] = apply_filters('pre_comment_content', $commentdata['comment_content']);
 	/**
 	 * Filter the comment author's IP before it is set.
 	 *
@@ -1671,11 +1671,11 @@ 
 	 *
 	 * @param string $comment_author_ip The comment author's IP.
 	 */
-	$commentdata['comment_author_IP'] = apply_filters( 'pre_comment_user_ip', $commentdata['comment_author_IP'] );
+	$commentdata['comment_author_IP'] = apply_filters('pre_comment_user_ip', $commentdata['comment_author_IP']);
 	/** This filter is documented in wp-includes/comment.php */
-	$commentdata['comment_author_url'] = apply_filters( 'pre_comment_author_url', $commentdata['comment_author_url'] );
+	$commentdata['comment_author_url'] = apply_filters('pre_comment_author_url', $commentdata['comment_author_url']);
 	/** This filter is documented in wp-includes/comment.php */
-	$commentdata['comment_author_email'] = apply_filters( 'pre_comment_author_email', $commentdata['comment_author_email'] );
+	$commentdata['comment_author_email'] = apply_filters('pre_comment_author_email', $commentdata['comment_author_email']);
 	$commentdata['filtered'] = true;
 	return $commentdata;
 }
@@ -1691,9 +1691,9 @@ 
  * @return bool Whether comment should be blocked.
  */
 function wp_throttle_comment_flood($block, $time_lastcomment, $time_newcomment) {
-	if ( $block ) // a plugin has already blocked... we'll let that decision stand
+	if ($block) // a plugin has already blocked... we'll let that decision stand
 		return $block;
-	if ( ($time_newcomment - $time_lastcomment) < 15 )
+	if (($time_newcomment - $time_lastcomment) < 15)
 		return true;
 	return false;
 }
@@ -1737,14 +1737,14 @@ 
  * }
  * @return int|false The ID of the comment on success, false on failure.
  */
-function wp_new_comment( $commentdata ) {
+function wp_new_comment($commentdata) {
 	global $wpdb;
 
-	if ( isset( $commentdata['user_ID'] ) ) {
+	if (isset($commentdata['user_ID'])) {
 		$commentdata['user_id'] = $commentdata['user_ID'] = (int) $commentdata['user_ID'];
 	}
 
-	$prefiltered_user_id = ( isset( $commentdata['user_id'] ) ) ? (int) $commentdata['user_id'] : 0;
+	$prefiltered_user_id = (isset($commentdata['user_id'])) ? (int) $commentdata['user_id'] : 0;
 
 	/**
 	 * Filter a comment's data before it is sanitized and inserted into the database.
@@ -1753,35 +1753,35 @@ 
 	 *
 	 * @param array $commentdata Comment data.
 	 */
-	$commentdata = apply_filters( 'preprocess_comment', $commentdata );
+	$commentdata = apply_filters('preprocess_comment', $commentdata);
 
 	$commentdata['comment_post_ID'] = (int) $commentdata['comment_post_ID'];
-	if ( isset( $commentdata['user_ID'] ) && $prefiltered_user_id !== (int) $commentdata['user_ID'] ) {
+	if (isset($commentdata['user_ID']) && $prefiltered_user_id !== (int) $commentdata['user_ID']) {
 		$commentdata['user_id'] = $commentdata['user_ID'] = (int) $commentdata['user_ID'];
-	} elseif ( isset( $commentdata['user_id'] ) ) {
+	} elseif (isset($commentdata['user_id'])) {
 		$commentdata['user_id'] = (int) $commentdata['user_id'];
 	}
 
 	$commentdata['comment_parent'] = isset($commentdata['comment_parent']) ? absint($commentdata['comment_parent']) : 0;
-	$parent_status = ( 0 < $commentdata['comment_parent'] ) ? wp_get_comment_status($commentdata['comment_parent']) : '';
-	$commentdata['comment_parent'] = ( 'approved' == $parent_status || 'unapproved' == $parent_status ) ? $commentdata['comment_parent'] : 0;
+	$parent_status = (0 < $commentdata['comment_parent']) ? wp_get_comment_status($commentdata['comment_parent']) : '';
+	$commentdata['comment_parent'] = ('approved' == $parent_status || 'unapproved' == $parent_status) ? $commentdata['comment_parent'] : 0;
 
-	if ( ! isset( $commentdata['comment_author_IP'] ) ) {
+	if ( ! isset($commentdata['comment_author_IP'])) {
 		$commentdata['comment_author_IP'] = $_SERVER['REMOTE_ADDR'];
 	}
-	$commentdata['comment_author_IP'] = preg_replace( '/[^0-9a-fA-F:., ]/', '', $commentdata['comment_author_IP'] );
+	$commentdata['comment_author_IP'] = preg_replace('/[^0-9a-fA-F:., ]/', '', $commentdata['comment_author_IP']);
 
-	if ( ! isset( $commentdata['comment_agent'] ) ) {
-		$commentdata['comment_agent'] = isset( $_SERVER['HTTP_USER_AGENT'] ) ? $_SERVER['HTTP_USER_AGENT']: '';
+	if ( ! isset($commentdata['comment_agent'])) {
+		$commentdata['comment_agent'] = isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : '';
 	}
-	$commentdata['comment_agent'] = substr( $commentdata['comment_agent'], 0, 254 );
+	$commentdata['comment_agent'] = substr($commentdata['comment_agent'], 0, 254);
 
-	if ( empty( $commentdata['comment_date'] ) ) {
+	if (empty($commentdata['comment_date'])) {
 		$commentdata['comment_date'] = current_time('mysql');
 	}
 
-	if ( empty( $commentdata['comment_date_gmt'] ) ) {
-		$commentdata['comment_date_gmt'] = current_time( 'mysql', 1 );
+	if (empty($commentdata['comment_date_gmt'])) {
+		$commentdata['comment_date_gmt'] = current_time('mysql', 1);
 	}
 
 	$commentdata = wp_filter_comment($commentdata);
@@ -1789,21 +1789,21 @@ 
 	$commentdata['comment_approved'] = wp_allow_comment($commentdata);
 
 	$comment_ID = wp_insert_comment($commentdata);
-	if ( ! $comment_ID ) {
-		$fields = array( 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_content' );
+	if ( ! $comment_ID) {
+		$fields = array('comment_author', 'comment_author_email', 'comment_author_url', 'comment_content');
 
-		foreach ( $fields as $field ) {
-			if ( isset( $commentdata[ $field ] ) ) {
-				$commentdata[ $field ] = $wpdb->strip_invalid_text_for_column( $wpdb->comments, $field, $commentdata[ $field ] );
+		foreach ($fields as $field) {
+			if (isset($commentdata[$field])) {
+				$commentdata[$field] = $wpdb->strip_invalid_text_for_column($wpdb->comments, $field, $commentdata[$field]);
 			}
 		}
 
-		$commentdata = wp_filter_comment( $commentdata );
+		$commentdata = wp_filter_comment($commentdata);
 
-		$commentdata['comment_approved'] = wp_allow_comment( $commentdata );
+		$commentdata['comment_approved'] = wp_allow_comment($commentdata);
 
-		$comment_ID = wp_insert_comment( $commentdata );
-		if ( ! $comment_ID ) {
+		$comment_ID = wp_insert_comment($commentdata);
+		if ( ! $comment_ID) {
 			return false;
 		}
 	}
@@ -1818,7 +1818,7 @@ 
 	 * @param int|string $comment_approved 1 if the comment is approved, 0 if not, 'spam' if spam.
 	 * @param array      $commentdata      Comment data.
 	 */
-	do_action( 'comment_post', $comment_ID, $commentdata['comment_approved'], $commentdata );
+	do_action('comment_post', $comment_ID, $commentdata['comment_approved'], $commentdata);
 
 	return $comment_ID;
 }
@@ -1831,20 +1831,20 @@ 
  * @param int $comment_ID ID of the comment.
  * @return bool True on success, false on failure.
  */
-function wp_new_comment_notify_moderator( $comment_ID ) {
-	$comment = get_comment( $comment_ID );
+function wp_new_comment_notify_moderator($comment_ID) {
+	$comment = get_comment($comment_ID);
 
 	// Only send notifications for pending comments.
-	$maybe_notify = ( '0' == $comment->comment_approved );
+	$maybe_notify = ('0' == $comment->comment_approved);
 
 	/** This filter is documented in wp-includes/comment.php */
-	$maybe_notify = apply_filters( 'notify_moderator', $maybe_notify, $comment_ID );
+	$maybe_notify = apply_filters('notify_moderator', $maybe_notify, $comment_ID);
 
-	if ( ! $maybe_notify ) {
+	if ( ! $maybe_notify) {
 		return false;
 	}
 
-	return wp_notify_moderator( $comment_ID );
+	return wp_notify_moderator($comment_ID);
 }
 
 /**
@@ -1858,10 +1858,10 @@ 
  * @param int $comment_ID Comment ID.
  * @return bool True on success, false on failure.
  */
-function wp_new_comment_notify_postauthor( $comment_ID ) {
-	$comment = get_comment( $comment_ID );
+function wp_new_comment_notify_postauthor($comment_ID) {
+	$comment = get_comment($comment_ID);
 
-	$maybe_notify = get_option( 'comments_notify' );
+	$maybe_notify = get_option('comments_notify');
 
 	/**
 	 * Filter whether to send the post author new comment notification emails,
@@ -1872,22 +1872,22 @@ 
 	 * @param bool $maybe_notify Whether to notify the post author about the new comment.
 	 * @param int  $comment_ID   The ID of the comment for the notification.
 	 */
-	$maybe_notify = apply_filters( 'notify_post_author', $maybe_notify, $comment_ID );
+	$maybe_notify = apply_filters('notify_post_author', $maybe_notify, $comment_ID);
 
 	/*
 	 * wp_notify_postauthor() checks if notifying the author of their own comment.
 	 * By default, it won't, but filters can override this.
 	 */
-	if ( ! $maybe_notify ) {
+	if ( ! $maybe_notify) {
 		return false;
 	}
 
 	// Only send notifications for approved comments.
-	if ( ! isset( $comment->comment_approved ) || '1' != $comment->comment_approved ) {
+	if ( ! isset($comment->comment_approved) || '1' != $comment->comment_approved) {
 		return false;
 	}
 
-	return wp_notify_postauthor( $comment_ID );
+	return wp_notify_postauthor($comment_ID);
 }
 
 /**
@@ -1908,7 +1908,7 @@ 
 function wp_set_comment_status($comment_id, $comment_status, $wp_error = false) {
 	global $wpdb;
 
-	switch ( $comment_status ) {
+	switch ($comment_status) {
 		case 'hold':
 		case '0':
 			$status = '0';
@@ -1916,7 +1916,7 @@ 
 		case 'approve':
 		case '1':
 			$status = '1';
-			add_action( 'wp_set_comment_status', 'wp_new_comment_notify_postauthor' );
+			add_action('wp_set_comment_status', 'wp_new_comment_notify_postauthor');
 			break;
 		case 'spam':
 			$status = 'spam';
@@ -1930,16 +1930,16 @@ 
 
 	$comment_old = clone get_comment($comment_id);
 
-	if ( !$wpdb->update( $wpdb->comments, array('comment_approved' => $status), array( 'comment_ID' => $comment_old->comment_ID ) ) ) {
-		if ( $wp_error )
+	if ( ! $wpdb->update($wpdb->comments, array('comment_approved' => $status), array('comment_ID' => $comment_old->comment_ID))) {
+		if ($wp_error)
 			return new WP_Error('db_update_error', __('Could not update comment status'), $wpdb->last_error);
 		else
 			return false;
 	}
 
-	clean_comment_cache( $comment_old->comment_ID );
+	clean_comment_cache($comment_old->comment_ID);
 
-	$comment = get_comment( $comment_old->comment_ID );
+	$comment = get_comment($comment_old->comment_ID);
 
 	/**
 	 * Fires immediately before transitioning a comment's status from one to another
@@ -1951,7 +1951,7 @@ 
 	 * @param string|bool $comment_status Current comment status. Possible values include
 	 *                                    'hold', 'approve', 'spam', 'trash', or false.
 	 */
-	do_action( 'wp_set_comment_status', $comment->comment_ID, $comment_status );
+	do_action('wp_set_comment_status', $comment->comment_ID, $comment_status);
 
 	wp_transition_comment_status($comment_status, $comment_old->comment_approved, $comment);
 
@@ -1977,12 +1977,12 @@ 
 
 	// First, get all of the original fields
 	$comment = get_comment($commentarr['comment_ID'], ARRAY_A);
-	if ( empty( $comment ) ) {
+	if (empty($comment)) {
 		return 0;
 	}
 
 	// Make sure that the comment post ID is valid (if specified).
-	if ( ! empty( $commentarr['comment_post_ID'] ) && ! get_post( $commentarr['comment_post_ID'] ) ) {
+	if ( ! empty($commentarr['comment_post_ID']) && ! get_post($commentarr['comment_post_ID'])) {
 		return 0;
 	}
 
@@ -1994,10 +1994,10 @@ 
 	// Merge old and new fields with new fields overwriting old ones.
 	$commentarr = array_merge($comment, $commentarr);
 
-	$commentarr = wp_filter_comment( $commentarr );
+	$commentarr = wp_filter_comment($commentarr);
 
 	// Now extract the merged array.
-	$data = wp_unslash( $commentarr );
+	$data = wp_unslash($commentarr);
 
 	/**
 	 * Filter the comment content before it is updated in the database.
@@ -2006,26 +2006,26 @@ 
 	 *
 	 * @param string $comment_content The comment data.
 	 */
-	$data['comment_content'] = apply_filters( 'comment_save_pre', $data['comment_content'] );
+	$data['comment_content'] = apply_filters('comment_save_pre', $data['comment_content']);
 
-	$data['comment_date_gmt'] = get_gmt_from_date( $data['comment_date'] );
+	$data['comment_date_gmt'] = get_gmt_from_date($data['comment_date']);
 
-	if ( ! isset( $data['comment_approved'] ) ) {
+	if ( ! isset($data['comment_approved'])) {
 		$data['comment_approved'] = 1;
-	} elseif ( 'hold' == $data['comment_approved'] ) {
+	} elseif ('hold' == $data['comment_approved']) {
 		$data['comment_approved'] = 0;
-	} elseif ( 'approve' == $data['comment_approved'] ) {
+	} elseif ('approve' == $data['comment_approved']) {
 		$data['comment_approved'] = 1;
 	}
 
 	$comment_ID = $data['comment_ID'];
 	$comment_post_ID = $data['comment_post_ID'];
-	$keys = array( 'comment_post_ID', 'comment_content', 'comment_author', 'comment_author_email', 'comment_approved', 'comment_karma', 'comment_author_url', 'comment_date', 'comment_date_gmt', 'comment_type', 'comment_parent', 'user_id', 'comment_agent', 'comment_author_IP' );
-	$data = wp_array_slice_assoc( $data, $keys );
-	$rval = $wpdb->update( $wpdb->comments, $data, compact( 'comment_ID' ) );
+	$keys = array('comment_post_ID', 'comment_content', 'comment_author', 'comment_author_email', 'comment_approved', 'comment_karma', 'comment_author_url', 'comment_date', 'comment_date_gmt', 'comment_type', 'comment_parent', 'user_id', 'comment_agent', 'comment_author_IP');
+	$data = wp_array_slice_assoc($data, $keys);
+	$rval = $wpdb->update($wpdb->comments, $data, compact('comment_ID'));
 
-	clean_comment_cache( $comment_ID );
-	wp_update_comment_count( $comment_post_ID );
+	clean_comment_cache($comment_ID);
+	wp_update_comment_count($comment_post_ID);
 	/**
 	 * Fires immediately after a comment is updated in the database.
 	 *
@@ -2035,7 +2035,7 @@ 
 	 *
 	 * @param int $comment_ID The comment ID.
 	 */
-	do_action( 'edit_comment', $comment_ID );
+	do_action('edit_comment', $comment_ID);
 	$comment = get_comment($comment_ID);
 	wp_transition_comment_status($comment->comment_approved, $old_status, $comment);
 	return $rval;
@@ -2055,14 +2055,14 @@ 
  * @param bool $defer
  * @return bool
  */
-function wp_defer_comment_counting($defer=null) {
+function wp_defer_comment_counting($defer = null) {
 	static $_defer = false;
 
-	if ( is_bool($defer) ) {
+	if (is_bool($defer)) {
 		$_defer = $defer;
 		// flush any deferred counts
-		if ( !$defer )
-			wp_update_comment_count( null, true );
+		if ( ! $defer)
+			wp_update_comment_count(null, true);
 	}
 
 	return $_defer;
@@ -2090,26 +2090,26 @@ 
  * @return bool|void True on success, false on failure or if post with ID does
  *                   not exist.
  */
-function wp_update_comment_count($post_id, $do_deferred=false) {
+function wp_update_comment_count($post_id, $do_deferred = false) {
 	static $_deferred = array();
 
-	if ( empty( $post_id ) && ! $do_deferred ) {
+	if (empty($post_id) && ! $do_deferred) {
 		return false;
 	}
 
-	if ( $do_deferred ) {
+	if ($do_deferred) {
 		$_deferred = array_unique($_deferred);
-		foreach ( $_deferred as $i => $_post_id ) {
+		foreach ($_deferred as $i => $_post_id) {
 			wp_update_comment_count_now($_post_id);
-			unset( $_deferred[$i] ); /** @todo Move this outside of the foreach and reset $_deferred to an array instead */
+			unset($_deferred[$i]); /** @todo Move this outside of the foreach and reset $_deferred to an array instead */
 		}
 	}
 
-	if ( wp_defer_comment_counting() ) {
+	if (wp_defer_comment_counting()) {
 		$_deferred[] = $post_id;
 		return true;
 	}
-	elseif ( $post_id ) {
+	elseif ($post_id) {
 		return wp_update_comment_count_now($post_id);
 	}
 
@@ -2128,13 +2128,13 @@ 
 function wp_update_comment_count_now($post_id) {
 	global $wpdb;
 	$post_id = (int) $post_id;
-	if ( !$post_id )
+	if ( ! $post_id)
 		return false;
 
-	wp_cache_delete( 'comments-0', 'counts' );
-	wp_cache_delete( "comments-{$post_id}", 'counts' );
+	wp_cache_delete('comments-0', 'counts');
+	wp_cache_delete("comments-{$post_id}", 'counts');
 
-	if ( !$post = get_post($post_id) )
+	if ( ! $post = get_post($post_id))
 		return false;
 
 	$old = (int) $post->comment_count;
@@ -2148,17 +2148,17 @@ 
 	 * @param int $old     The old comment count.
 	 * @param int $post_id Post ID.
 	 */
-	$new = apply_filters( 'pre_wp_update_comment_count_now', null, $old, $post_id );
+	$new = apply_filters('pre_wp_update_comment_count_now', null, $old, $post_id);
 
-	if ( is_null( $new ) ) {
-		$new = (int) $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_approved = '1'", $post_id ) );
+	if (is_null($new)) {
+		$new = (int) $wpdb->get_var($wpdb->prepare("SELECT COUNT(*) FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_approved = '1'", $post_id));
 	} else {
 		$new = (int) $new;
 	}
 
-	$wpdb->update( $wpdb->posts, array('comment_count' => $new), array('ID' => $post_id) );
+	$wpdb->update($wpdb->posts, array('comment_count' => $new), array('ID' => $post_id));
 
-	clean_post_cache( $post );
+	clean_post_cache($post);
 
 	/**
 	 * Fires immediately after a post's comment count is updated in the database.
@@ -2169,9 +2169,9 @@ 
 	 * @param int $new     The new comment count.
 	 * @param int $old     The old comment count.
 	 */
-	do_action( 'wp_update_comment_count', $post_id, $new, $old );
+	do_action('wp_update_comment_count', $post_id, $new, $old);
 	/** This action is documented in wp-includes/post.php */
-	do_action( 'edit_post', $post_id, $post );
+	do_action('edit_post', $post_id, $post);
 
 	return true;
 }
@@ -2193,9 +2193,9 @@ 
  * @param int $deprecated Not Used.
  * @return false|string False on failure, string containing URI on success.
  */
-function discover_pingback_server_uri( $url, $deprecated = '' ) {
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '2.7' );
+function discover_pingback_server_uri($url, $deprecated = '') {
+	if ( ! empty($deprecated))
+		_deprecated_argument(__FUNCTION__, '2.7');
 
 	$pingback_str_dquote = 'rel="pingback"';
 	$pingback_str_squote = 'rel=\'pingback\'';
@@ -2203,47 +2203,47 @@ 
 	/** @todo Should use Filter Extension or custom preg_match instead. */
 	$parsed_url = parse_url($url);
 
-	if ( ! isset( $parsed_url['host'] ) ) // Not a URL. This should never happen.
+	if ( ! isset($parsed_url['host'])) // Not a URL. This should never happen.
 		return false;
 
 	//Do not search for a pingback server on our own uploads
 	$uploads_dir = wp_get_upload_dir();
-	if ( 0 === strpos($url, $uploads_dir['baseurl']) )
+	if (0 === strpos($url, $uploads_dir['baseurl']))
 		return false;
 
-	$response = wp_safe_remote_head( $url, array( 'timeout' => 2, 'httpversion' => '1.0' ) );
+	$response = wp_safe_remote_head($url, array('timeout' => 2, 'httpversion' => '1.0'));
 
-	if ( is_wp_error( $response ) )
+	if (is_wp_error($response))
 		return false;
 
-	if ( wp_remote_retrieve_header( $response, 'x-pingback' ) )
-		return wp_remote_retrieve_header( $response, 'x-pingback' );
+	if (wp_remote_retrieve_header($response, 'x-pingback'))
+		return wp_remote_retrieve_header($response, 'x-pingback');
 
 	// Not an (x)html, sgml, or xml page, no use going further.
-	if ( preg_match('#(image|audio|video|model)/#is', wp_remote_retrieve_header( $response, 'content-type' )) )
+	if (preg_match('#(image|audio|video|model)/#is', wp_remote_retrieve_header($response, 'content-type')))
 		return false;
 
 	// Now do a GET since we're going to look in the html headers (and we're sure it's not a binary file)
-	$response = wp_safe_remote_get( $url, array( 'timeout' => 2, 'httpversion' => '1.0' ) );
+	$response = wp_safe_remote_get($url, array('timeout' => 2, 'httpversion' => '1.0'));
 
-	if ( is_wp_error( $response ) )
+	if (is_wp_error($response))
 		return false;
 
-	$contents = wp_remote_retrieve_body( $response );
+	$contents = wp_remote_retrieve_body($response);
 
 	$pingback_link_offset_dquote = strpos($contents, $pingback_str_dquote);
 	$pingback_link_offset_squote = strpos($contents, $pingback_str_squote);
-	if ( $pingback_link_offset_dquote || $pingback_link_offset_squote ) {
+	if ($pingback_link_offset_dquote || $pingback_link_offset_squote) {
 		$quote = ($pingback_link_offset_dquote) ? '"' : '\'';
-		$pingback_link_offset = ($quote=='"') ? $pingback_link_offset_dquote : $pingback_link_offset_squote;
+		$pingback_link_offset = ($quote == '"') ? $pingback_link_offset_dquote : $pingback_link_offset_squote;
 		$pingback_href_pos = @strpos($contents, 'href=', $pingback_link_offset);
-		$pingback_href_start = $pingback_href_pos+6;
+		$pingback_href_start = $pingback_href_pos + 6;
 		$pingback_href_end = @strpos($contents, $quote, $pingback_href_start);
 		$pingback_server_url_len = $pingback_href_end - $pingback_href_start;
 		$pingback_server_url = substr($contents, $pingback_href_start, $pingback_server_url_len);
 
 		// We may find rel="pingback" but an incomplete pingback URL
-		if ( $pingback_server_url_len > 0 ) { // We got it!
+		if ($pingback_server_url_len > 0) { // We got it!
 			return $pingback_server_url;
 		}
 	}
@@ -2263,20 +2263,20 @@ 
 
 	// Do pingbacks
 	while ($ping = $wpdb->get_row("SELECT ID, post_content, meta_id FROM {$wpdb->posts}, {$wpdb->postmeta} WHERE {$wpdb->posts}.ID = {$wpdb->postmeta}.post_id AND {$wpdb->postmeta}.meta_key = '_pingme' LIMIT 1")) {
-		delete_metadata_by_mid( 'post', $ping->meta_id );
-		pingback( $ping->post_content, $ping->ID );
+		delete_metadata_by_mid('post', $ping->meta_id);
+		pingback($ping->post_content, $ping->ID);
 	}
 
 	// Do Enclosures
 	while ($enclosure = $wpdb->get_row("SELECT ID, post_content, meta_id FROM {$wpdb->posts}, {$wpdb->postmeta} WHERE {$wpdb->posts}.ID = {$wpdb->postmeta}.post_id AND {$wpdb->postmeta}.meta_key = '_encloseme' LIMIT 1")) {
-		delete_metadata_by_mid( 'post', $enclosure->meta_id );
-		do_enclose( $enclosure->post_content, $enclosure->ID );
+		delete_metadata_by_mid('post', $enclosure->meta_id);
+		do_enclose($enclosure->post_content, $enclosure->ID);
 	}
 
 	// Do Trackbacks
 	$trackbacks = $wpdb->get_col("SELECT ID FROM $wpdb->posts WHERE to_ping <> '' AND post_status = 'publish'");
-	if ( is_array($trackbacks) )
-		foreach ( $trackbacks as $trackback )
+	if (is_array($trackbacks))
+		foreach ($trackbacks as $trackback)
 			do_trackbacks($trackback);
 
 	//Do Update Services/Generic Pings
@@ -2295,37 +2295,37 @@ 
 function do_trackbacks($post_id) {
 	global $wpdb;
 
-	$post = get_post( $post_id );
+	$post = get_post($post_id);
 	$to_ping = get_to_ping($post_id);
 	$pinged  = get_pung($post_id);
-	if ( empty($to_ping) ) {
-		$wpdb->update($wpdb->posts, array('to_ping' => ''), array('ID' => $post_id) );
+	if (empty($to_ping)) {
+		$wpdb->update($wpdb->posts, array('to_ping' => ''), array('ID' => $post_id));
 		return;
 	}
 
-	if ( empty($post->post_excerpt) ) {
+	if (empty($post->post_excerpt)) {
 		/** This filter is documented in wp-includes/post-template.php */
-		$excerpt = apply_filters( 'the_content', $post->post_content, $post->ID );
+		$excerpt = apply_filters('the_content', $post->post_content, $post->ID);
 	} else {
 		/** This filter is documented in wp-includes/post-template.php */
-		$excerpt = apply_filters( 'the_excerpt', $post->post_excerpt );
+		$excerpt = apply_filters('the_excerpt', $post->post_excerpt);
 	}
 
 	$excerpt = str_replace(']]>', ']]&gt;', $excerpt);
 	$excerpt = wp_html_excerpt($excerpt, 252, '&#8230;');
 
 	/** This filter is documented in wp-includes/post-template.php */
-	$post_title = apply_filters( 'the_title', $post->post_title, $post->ID );
+	$post_title = apply_filters('the_title', $post->post_title, $post->ID);
 	$post_title = strip_tags($post_title);
 
-	if ( $to_ping ) {
-		foreach ( (array) $to_ping as $tb_ping ) {
+	if ($to_ping) {
+		foreach ((array) $to_ping as $tb_ping) {
 			$tb_ping = trim($tb_ping);
-			if ( !in_array($tb_ping, $pinged) ) {
+			if ( ! in_array($tb_ping, $pinged)) {
 				trackback($tb_ping, $post_title, $excerpt, $post_id);
 				$pinged[] = $tb_ping;
 			} else {
-				$wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET to_ping = TRIM(REPLACE(to_ping, %s, '')) WHERE ID = %d", $tb_ping, $post_id) );
+				$wpdb->query($wpdb->prepare("UPDATE $wpdb->posts SET to_ping = TRIM(REPLACE(to_ping, %s, '')) WHERE ID = %d", $tb_ping, $post_id));
 			}
 		}
 	}
@@ -2339,13 +2339,13 @@ 
  * @param int $post_id Post ID.
  * @return int Same as Post ID from parameter
  */
-function generic_ping( $post_id = 0 ) {
+function generic_ping($post_id = 0) {
 	$services = get_option('ping_sites');
 
 	$services = explode("\n", $services);
-	foreach ( (array) $services as $service ) {
+	foreach ((array) $services as $service) {
 		$service = trim($service);
-		if ( '' != $service )
+		if ('' != $service)
 			weblog_ping($service);
 	}
 
@@ -2364,8 +2364,8 @@ 
  */
 function pingback($content, $post_ID) {
 	global $wp_version;
-	include_once(ABSPATH . WPINC . '/class-IXR.php');
-	include_once(ABSPATH . WPINC . '/class-wp-http-ixr-client.php');
+	include_once(ABSPATH.WPINC.'/class-IXR.php');
+	include_once(ABSPATH.WPINC.'/class-wp-http-ixr-client.php');
 
 	// original code by Mort (http://mort.mine.nu:8080)
 	$post_links = array();
@@ -2374,7 +2374,7 @@ 
 
 	// Step 1
 	// Parsing the post, external links (if any) are stored in the $post_links array
-	$post_links_temp = wp_extract_urls( $content );
+	$post_links_temp = wp_extract_urls($content);
 
 	// Step 2.
 	// Walking thru the links array
@@ -2385,19 +2385,19 @@ 
 	// http://dummy-weblog.org/post.php
 	// We don't wanna ping first and second types, even if they have a valid <link/>
 
-	foreach ( (array) $post_links_temp as $link_test ) :
-		if ( !in_array($link_test, $pung) && (url_to_postid($link_test) != $post_ID) // If we haven't pung it already and it isn't a link to itself
-				&& !is_local_attachment($link_test) ) : // Also, let's never ping local attachments.
-			if ( $test = @parse_url($link_test) ) {
-				if ( isset($test['query']) )
+	foreach ((array) $post_links_temp as $link_test) :
+		if ( ! in_array($link_test, $pung) && (url_to_postid($link_test) != $post_ID) // If we haven't pung it already and it isn't a link to itself
+				&& ! is_local_attachment($link_test)) : // Also, let's never ping local attachments.
+			if ($test = @parse_url($link_test)) {
+				if (isset($test['query']))
 					$post_links[] = $link_test;
-				elseif ( isset( $test['path'] ) && ( $test['path'] != '/' ) && ( $test['path'] != '' ) )
+				elseif (isset($test['path']) && ($test['path'] != '/') && ($test['path'] != ''))
 					$post_links[] = $link_test;
 			}
 		endif;
 	endforeach;
 
-	$post_links = array_unique( $post_links );
+	$post_links = array_unique($post_links);
 	/**
 	 * Fires just before pinging back links found in a post.
 	 *
@@ -2407,13 +2407,13 @@ 
 	 * @param array &$pung       Whether a link has already been pinged, passed by reference.
 	 * @param int   $post_ID     The post ID.
 	 */
-	do_action_ref_array( 'pre_ping', array( &$post_links, &$pung, $post_ID ) );
+	do_action_ref_array('pre_ping', array(&$post_links, &$pung, $post_ID));
 
-	foreach ( (array) $post_links as $pagelinkedto ) {
-		$pingback_server_url = discover_pingback_server_uri( $pagelinkedto );
+	foreach ((array) $post_links as $pagelinkedto) {
+		$pingback_server_url = discover_pingback_server_uri($pagelinkedto);
 
-		if ( $pingback_server_url ) {
-			@ set_time_limit( 60 );
+		if ($pingback_server_url) {
+			@ set_time_limit(60);
 			// Now, the RPC call
 			$pagelinkedfrom = get_permalink($post_ID);
 
@@ -2432,12 +2432,12 @@ 
 			 * @param string $pagelinkedto        URL of page linked to.
 			 * @param string $pagelinkedfrom      URL of page linked from.
 			 */
-			$client->useragent = apply_filters( 'pingback_useragent', $client->useragent . ' -- WordPress/' . $wp_version, $client->useragent, $pingback_server_url, $pagelinkedto, $pagelinkedfrom );
+			$client->useragent = apply_filters('pingback_useragent', $client->useragent.' -- WordPress/'.$wp_version, $client->useragent, $pingback_server_url, $pagelinkedto, $pagelinkedfrom);
 			// when set to true, this outputs debug messages by itself
 			$client->debug = false;
 
-			if ( $client->query('pingback.ping', $pagelinkedfrom, $pagelinkedto) || ( isset($client->error->code) && 48 == $client->error->code ) ) // Already registered
-				add_ping( $post_ID, $pagelinkedto );
+			if ($client->query('pingback.ping', $pagelinkedfrom, $pagelinkedto) || (isset($client->error->code) && 48 == $client->error->code)) // Already registered
+				add_ping($post_ID, $pagelinkedto);
 		}
 	}
 }
@@ -2451,7 +2451,7 @@ 
  * @return mixed Empty string if blog is not public, returns $sites, if site is public.
  */
 function privacy_ping_filter($sites) {
-	if ( '0' != get_option('blog_public') )
+	if ('0' != get_option('blog_public'))
 		return $sites;
 	else
 		return '';
@@ -2475,7 +2475,7 @@ 
 function trackback($trackback_url, $title, $excerpt, $ID) {
 	global $wpdb;
 
-	if ( empty($trackback_url) )
+	if (empty($trackback_url))
 		return;
 
 	$options = array();
@@ -2487,13 +2487,13 @@ 
 		'excerpt' => $excerpt
 	);
 
-	$response = wp_safe_remote_post( $trackback_url, $options );
+	$response = wp_safe_remote_post($trackback_url, $options);
 
-	if ( is_wp_error( $response ) )
+	if (is_wp_error($response))
 		return;
 
-	$wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET pinged = CONCAT(pinged, '\n', %s) WHERE ID = %d", $trackback_url, $ID) );
-	return $wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET to_ping = TRIM(REPLACE(to_ping, %s, '')) WHERE ID = %d", $trackback_url, $ID) );
+	$wpdb->query($wpdb->prepare("UPDATE $wpdb->posts SET pinged = CONCAT(pinged, '\n', %s) WHERE ID = %d", $trackback_url, $ID));
+	return $wpdb->query($wpdb->prepare("UPDATE $wpdb->posts SET to_ping = TRIM(REPLACE(to_ping, %s, '')) WHERE ID = %d", $trackback_url, $ID));
 }
 
 /**
@@ -2508,18 +2508,18 @@ 
  */
 function weblog_ping($server = '', $path = '') {
 	global $wp_version;
-	include_once(ABSPATH . WPINC . '/class-IXR.php');
-	include_once(ABSPATH . WPINC . '/class-wp-http-ixr-client.php');
+	include_once(ABSPATH.WPINC.'/class-IXR.php');
+	include_once(ABSPATH.WPINC.'/class-wp-http-ixr-client.php');
 
 	// using a timeout of 3 seconds should be enough to cover slow servers
-	$client = new WP_HTTP_IXR_Client($server, ((!strlen(trim($path)) || ('/' == $path)) ? false : $path));
+	$client = new WP_HTTP_IXR_Client($server, (( ! strlen(trim($path)) || ('/' == $path)) ? false : $path));
 	$client->timeout = 3;
 	$client->useragent .= ' -- WordPress/'.$wp_version;
 
 	// when set to true, this outputs debug messages by itself
 	$client->debug = false;
-	$home = trailingslashit( home_url() );
-	if ( !$client->query('weblogUpdates.extendedPing', get_option('blogname'), $home, get_bloginfo('rss2_url') ) ) // then try a normal ping
+	$home = trailingslashit(home_url());
+	if ( ! $client->query('weblogUpdates.extendedPing', get_option('blogname'), $home, get_bloginfo('rss2_url'))) // then try a normal ping
 		$client->query('weblogUpdates.ping', get_option('blogname'), $home);
 }
 
@@ -2532,8 +2532,8 @@ 
  * @param string $source_uri
  * @return string
  */
-function pingback_ping_source_uri( $source_uri ) {
-	return (string) wp_http_validate_url( $source_uri );
+function pingback_ping_source_uri($source_uri) {
+	return (string) wp_http_validate_url($source_uri);
 }
 
 /**
@@ -2548,10 +2548,10 @@ 
  * @param IXR_Error $ixr_error
  * @return IXR_Error
  */
-function xmlrpc_pingback_error( $ixr_error ) {
-	if ( $ixr_error->code === 48 )
+function xmlrpc_pingback_error($ixr_error) {
+	if ($ixr_error->code === 48)
 		return $ixr_error;
-	return new IXR_Error( 0, '' );
+	return new IXR_Error(0, '');
 }
 
 //
@@ -2566,8 +2566,8 @@ 
  * @param int|array $ids Comment ID or an array of comment IDs to remove from cache.
  */
 function clean_comment_cache($ids) {
-	foreach ( (array) $ids as $id ) {
-		wp_cache_delete( $id, 'comment' );
+	foreach ((array) $ids as $id) {
+		wp_cache_delete($id, 'comment');
 
 		/**
 		 * Fires immediately after a comment has been removed from the object cache.
@@ -2576,10 +2576,10 @@ 
 		 *
 		 * @param int $id Comment ID.
 		 */
-		do_action( 'clean_comment_cache', $id );
+		do_action('clean_comment_cache', $id);
 	}
 
-	wp_cache_set( 'last_changed', microtime(), 'comment' );
+	wp_cache_set('last_changed', microtime(), 'comment');
 }
 
 /**
@@ -2595,17 +2595,17 @@ 
  * @param array $comments          Array of comment row objects
  * @param bool  $update_meta_cache Whether to update commentmeta cache. Default true.
  */
-function update_comment_cache( $comments, $update_meta_cache = true ) {
-	foreach ( (array) $comments as $comment )
+function update_comment_cache($comments, $update_meta_cache = true) {
+	foreach ((array) $comments as $comment)
 		wp_cache_add($comment->comment_ID, $comment, 'comment');
 
-	if ( $update_meta_cache ) {
+	if ($update_meta_cache) {
 		// Avoid `wp_list_pluck()` in case `$comments` is passed by reference.
 		$comment_ids = array();
-		foreach ( $comments as $comment ) {
+		foreach ($comments as $comment) {
 			$comment_ids[] = $comment->comment_ID;
 		}
-		update_meta_cache( 'comment', $comment_ids );
+		update_meta_cache('comment', $comment_ids);
 	}
 }
 
@@ -2621,14 +2621,14 @@ 
  * @param array $comment_ids       Array of comment IDs.
  * @param bool  $update_meta_cache Optional. Whether to update the meta cache. Default true.
  */
-function _prime_comment_caches( $comment_ids, $update_meta_cache = true ) {
+function _prime_comment_caches($comment_ids, $update_meta_cache = true) {
 	global $wpdb;
 
-	$non_cached_ids = _get_non_cached_ids( $comment_ids, 'comment' );
-	if ( !empty( $non_cached_ids ) ) {
-		$fresh_comments = $wpdb->get_results( sprintf( "SELECT $wpdb->comments.* FROM $wpdb->comments WHERE comment_ID IN (%s)", join( ",", array_map( 'intval', $non_cached_ids ) ) ) );
+	$non_cached_ids = _get_non_cached_ids($comment_ids, 'comment');
+	if ( ! empty($non_cached_ids)) {
+		$fresh_comments = $wpdb->get_results(sprintf("SELECT $wpdb->comments.* FROM $wpdb->comments WHERE comment_ID IN (%s)", join(",", array_map('intval', $non_cached_ids))));
 
-		update_comment_cache( $fresh_comments, $update_meta_cache );
+		update_comment_cache($fresh_comments, $update_meta_cache);
 	}
 }
 
@@ -2646,8 +2646,8 @@ 
  * @param WP_Query $query Query object.
  * @return array
  */
-function _close_comments_for_old_posts( $posts, $query ) {
-	if ( empty( $posts ) || ! $query->is_singular() || ! get_option( 'close_comments_for_old_posts' ) )
+function _close_comments_for_old_posts($posts, $query) {
+	if (empty($posts) || ! $query->is_singular() || ! get_option('close_comments_for_old_posts'))
 		return $posts;
 
 	/**
@@ -2657,15 +2657,15 @@ 
 	 *
 	 * @param array $post_types An array of registered post types. Default array with 'post'.
 	 */
-	$post_types = apply_filters( 'close_comments_for_post_types', array( 'post' ) );
-	if ( ! in_array( $posts[0]->post_type, $post_types ) )
+	$post_types = apply_filters('close_comments_for_post_types', array('post'));
+	if ( ! in_array($posts[0]->post_type, $post_types))
 		return $posts;
 
-	$days_old = (int) get_option( 'close_comments_days_old' );
-	if ( ! $days_old )
+	$days_old = (int) get_option('close_comments_days_old');
+	if ( ! $days_old)
 		return $posts;
 
-	if ( time() - strtotime( $posts[0]->post_date_gmt ) > ( $days_old * DAY_IN_SECONDS ) ) {
+	if (time() - strtotime($posts[0]->post_date_gmt) > ($days_old * DAY_IN_SECONDS)) {
 		$posts[0]->comment_status = 'closed';
 		$posts[0]->ping_status = 'closed';
 	}
@@ -2683,30 +2683,30 @@ 
  * @param int $post_id Post ID
  * @return bool $open
  */
-function _close_comments_for_old_post( $open, $post_id ) {
-	if ( ! $open )
+function _close_comments_for_old_post($open, $post_id) {
+	if ( ! $open)
 		return $open;
 
-	if ( !get_option('close_comments_for_old_posts') )
+	if ( ! get_option('close_comments_for_old_posts'))
 		return $open;
 
 	$days_old = (int) get_option('close_comments_days_old');
-	if ( !$days_old )
+	if ( ! $days_old)
 		return $open;
 
 	$post = get_post($post_id);
 
 	/** This filter is documented in wp-includes/comment.php */
-	$post_types = apply_filters( 'close_comments_for_post_types', array( 'post' ) );
-	if ( ! in_array( $post->post_type, $post_types ) )
+	$post_types = apply_filters('close_comments_for_post_types', array('post'));
+	if ( ! in_array($post->post_type, $post_types))
 		return $open;
 
 	// Undated drafts should not show up as comments closed.
-	if ( '0000-00-00 00:00:00' === $post->post_date_gmt ) {
+	if ('0000-00-00 00:00:00' === $post->post_date_gmt) {
 		return $open;
 	}
 
-	if ( time() - strtotime( $post->post_date_gmt ) > ( $days_old * DAY_IN_SECONDS ) )
+	if (time() - strtotime($post->post_date_gmt) > ($days_old * DAY_IN_SECONDS))
 		return false;
 
 	return $open;
@@ -2733,36 +2733,36 @@ 
  * }
  * @return WP_Comment|WP_Error A WP_Comment object on success, a WP_Error object on failure.
  */
-function wp_handle_comment_submission( $comment_data ) {
+function wp_handle_comment_submission($comment_data) {
 
 	$comment_post_ID = $comment_parent = 0;
 	$comment_author = $comment_author_email = $comment_author_url = $comment_content = $_wp_unfiltered_html_comment = null;
 
-	if ( isset( $comment_data['comment_post_ID'] ) ) {
+	if (isset($comment_data['comment_post_ID'])) {
 		$comment_post_ID = (int) $comment_data['comment_post_ID'];
 	}
-	if ( isset( $comment_data['author'] ) && is_string( $comment_data['author'] ) ) {
-		$comment_author = trim( strip_tags( $comment_data['author'] ) );
+	if (isset($comment_data['author']) && is_string($comment_data['author'])) {
+		$comment_author = trim(strip_tags($comment_data['author']));
 	}
-	if ( isset( $comment_data['email'] ) && is_string( $comment_data['email'] ) ) {
-		$comment_author_email = trim( $comment_data['email'] );
+	if (isset($comment_data['email']) && is_string($comment_data['email'])) {
+		$comment_author_email = trim($comment_data['email']);
 	}
-	if ( isset( $comment_data['url'] ) && is_string( $comment_data['url'] ) ) {
-		$comment_author_url = trim( $comment_data['url'] );
+	if (isset($comment_data['url']) && is_string($comment_data['url'])) {
+		$comment_author_url = trim($comment_data['url']);
 	}
-	if ( isset( $comment_data['comment'] ) && is_string( $comment_data['comment'] ) ) {
-		$comment_content = trim( $comment_data['comment'] );
+	if (isset($comment_data['comment']) && is_string($comment_data['comment'])) {
+		$comment_content = trim($comment_data['comment']);
 	}
-	if ( isset( $comment_data['comment_parent'] ) ) {
-		$comment_parent = absint( $comment_data['comment_parent'] );
+	if (isset($comment_data['comment_parent'])) {
+		$comment_parent = absint($comment_data['comment_parent']);
 	}
-	if ( isset( $comment_data['_wp_unfiltered_html_comment'] ) && is_string( $comment_data['_wp_unfiltered_html_comment'] ) ) {
-		$_wp_unfiltered_html_comment = trim( $comment_data['_wp_unfiltered_html_comment'] );
+	if (isset($comment_data['_wp_unfiltered_html_comment']) && is_string($comment_data['_wp_unfiltered_html_comment'])) {
+		$_wp_unfiltered_html_comment = trim($comment_data['_wp_unfiltered_html_comment']);
 	}
 
-	$post = get_post( $comment_post_ID );
+	$post = get_post($comment_post_ID);
 
-	if ( empty( $post->comment_status ) ) {
+	if (empty($post->comment_status)) {
 
 		/**
 		 * Fires when a comment is attempted on a post that does not exist.
@@ -2771,22 +2771,22 @@ 
 		 *
 		 * @param int $comment_post_ID Post ID.
 		 */
-		do_action( 'comment_id_not_found', $comment_post_ID );
+		do_action('comment_id_not_found', $comment_post_ID);
 
-		return new WP_Error( 'comment_id_not_found' );
+		return new WP_Error('comment_id_not_found');
 
 	}
 
 	// get_post_status() will get the parent status for attachments.
-	$status = get_post_status( $post );
+	$status = get_post_status($post);
 
-	if ( ( 'private' == $status ) && ! current_user_can( 'read_post', $comment_post_ID ) ) {
-		return new WP_Error( 'comment_id_not_found' );
+	if (('private' == $status) && ! current_user_can('read_post', $comment_post_ID)) {
+		return new WP_Error('comment_id_not_found');
 	}
 
-	$status_obj = get_post_status_object( $status );
+	$status_obj = get_post_status_object($status);
 
-	if ( ! comments_open( $comment_post_ID ) ) {
+	if ( ! comments_open($comment_post_ID)) {
 
 		/**
 		 * Fires when a comment is attempted on a post that has comments closed.
@@ -2795,11 +2795,11 @@ 
 		 *
 		 * @param int $comment_post_ID Post ID.
 		 */
-		do_action( 'comment_closed', $comment_post_ID );
+		do_action('comment_closed', $comment_post_ID);
 
-		return new WP_Error( 'comment_closed', __( 'Sorry, comments are closed for this item.' ), 403 );
+		return new WP_Error('comment_closed', __('Sorry, comments are closed for this item.'), 403);
 
-	} elseif ( 'trash' == $status ) {
+	} elseif ('trash' == $status) {
 
 		/**
 		 * Fires when a comment is attempted on a trashed post.
@@ -2808,11 +2808,11 @@ 
 		 *
 		 * @param int $comment_post_ID Post ID.
 		 */
-		do_action( 'comment_on_trash', $comment_post_ID );
+		do_action('comment_on_trash', $comment_post_ID);
 
-		return new WP_Error( 'comment_on_trash' );
+		return new WP_Error('comment_on_trash');
 
-	} elseif ( ! $status_obj->public && ! $status_obj->private ) {
+	} elseif ( ! $status_obj->public && ! $status_obj->private) {
 
 		/**
 		 * Fires when a comment is attempted on a post in draft mode.
@@ -2821,11 +2821,11 @@ 
 		 *
 		 * @param int $comment_post_ID Post ID.
 		 */
-		do_action( 'comment_on_draft', $comment_post_ID );
+		do_action('comment_on_draft', $comment_post_ID);
 
-		return new WP_Error( 'comment_on_draft' );
+		return new WP_Error('comment_on_draft');
 
-	} elseif ( post_password_required( $comment_post_ID ) ) {
+	} elseif (post_password_required($comment_post_ID)) {
 
 		/**
 		 * Fires when a comment is attempted on a password-protected post.
@@ -2834,9 +2834,9 @@ 
 		 *
 		 * @param int $comment_post_ID Post ID.
 		 */
-		do_action( 'comment_on_password_protected', $comment_post_ID );
+		do_action('comment_on_password_protected', $comment_post_ID);
 
-		return new WP_Error( 'comment_on_password_protected' );
+		return new WP_Error('comment_on_password_protected');
 
 	} else {
 
@@ -2847,61 +2847,61 @@ 
 		 *
 		 * @param int $comment_post_ID Post ID.
 		 */
-		do_action( 'pre_comment_on_post', $comment_post_ID );
+		do_action('pre_comment_on_post', $comment_post_ID);
 
 	}
 
 	// If the user is logged in
 	$user = wp_get_current_user();
-	if ( $user->exists() ) {
-		if ( empty( $user->display_name ) ) {
-			$user->display_name=$user->user_login;
+	if ($user->exists()) {
+		if (empty($user->display_name)) {
+			$user->display_name = $user->user_login;
 		}
 		$comment_author       = $user->display_name;
 		$comment_author_email = $user->user_email;
 		$comment_author_url   = $user->user_url;
 		$user_ID              = $user->ID;
-		if ( current_user_can( 'unfiltered_html' ) ) {
-			if ( ! isset( $comment_data['_wp_unfiltered_html_comment'] )
-				|| ! wp_verify_nonce( $comment_data['_wp_unfiltered_html_comment'], 'unfiltered-html-comment_' . $comment_post_ID )
+		if (current_user_can('unfiltered_html')) {
+			if ( ! isset($comment_data['_wp_unfiltered_html_comment'])
+				|| ! wp_verify_nonce($comment_data['_wp_unfiltered_html_comment'], 'unfiltered-html-comment_'.$comment_post_ID)
 			) {
 				kses_remove_filters(); // start with a clean slate
 				kses_init_filters(); // set up the filters
 			}
 		}
 	} else {
-		if ( get_option( 'comment_registration' ) ) {
-			return new WP_Error( 'not_logged_in', __( 'Sorry, you must be logged in to post a comment.' ), 403 );
+		if (get_option('comment_registration')) {
+			return new WP_Error('not_logged_in', __('Sorry, you must be logged in to post a comment.'), 403);
 		}
 	}
 
 	$comment_type = '';
 	$max_lengths = wp_get_comment_fields_max_lengths();
 
-	if ( get_option( 'require_name_email' ) && ! $user->exists() ) {
-		if ( 6 > strlen( $comment_author_email ) || '' == $comment_author ) {
-			return new WP_Error( 'require_name_email', __( '<strong>ERROR</strong>: please fill the required fields (name, email).' ), 200 );
-		} elseif ( ! is_email( $comment_author_email ) ) {
-			return new WP_Error( 'require_valid_email', __( '<strong>ERROR</strong>: please enter a valid email address.' ), 200 );
+	if (get_option('require_name_email') && ! $user->exists()) {
+		if (6 > strlen($comment_author_email) || '' == $comment_author) {
+			return new WP_Error('require_name_email', __('<strong>ERROR</strong>: please fill the required fields (name, email).'), 200);
+		} elseif ( ! is_email($comment_author_email)) {
+			return new WP_Error('require_valid_email', __('<strong>ERROR</strong>: please enter a valid email address.'), 200);
 		}
 	}
 
-	if ( isset( $comment_author ) && $max_lengths['comment_author'] < mb_strlen( $comment_author, '8bit' ) ) {
-		return new WP_Error( 'comment_author_column_length', __( '<strong>ERROR</strong>: your name is too long.' ), 200 );
+	if (isset($comment_author) && $max_lengths['comment_author'] < mb_strlen($comment_author, '8bit')) {
+		return new WP_Error('comment_author_column_length', __('<strong>ERROR</strong>: your name is too long.'), 200);
 	}
 
-	if ( isset( $comment_author_email ) && $max_lengths['comment_author_email'] < strlen( $comment_author_email ) ) {
-		return new WP_Error( 'comment_author_email_column_length', __( '<strong>ERROR</strong>: your email address is too long.' ), 200 );
+	if (isset($comment_author_email) && $max_lengths['comment_author_email'] < strlen($comment_author_email)) {
+		return new WP_Error('comment_author_email_column_length', __('<strong>ERROR</strong>: your email address is too long.'), 200);
 	}
 
-	if ( isset( $comment_author_url ) && $max_lengths['comment_author_url'] < strlen( $comment_author_url ) ) {
-		return new WP_Error( 'comment_author_url_column_length', __( '<strong>ERROR</strong>: your url is too long.' ), 200 );
+	if (isset($comment_author_url) && $max_lengths['comment_author_url'] < strlen($comment_author_url)) {
+		return new WP_Error('comment_author_url_column_length', __('<strong>ERROR</strong>: your url is too long.'), 200);
 	}
 
-	if ( '' == $comment_content ) {
-		return new WP_Error( 'require_valid_comment', __( '<strong>ERROR</strong>: please type a comment.' ), 200 );
-	} elseif ( $max_lengths['comment_content'] < mb_strlen( $comment_content, '8bit' ) ) {
-		return new WP_Error( 'comment_content_column_length', __( '<strong>ERROR</strong>: your comment is too long.' ), 200 );
+	if ('' == $comment_content) {
+		return new WP_Error('require_valid_comment', __('<strong>ERROR</strong>: please type a comment.'), 200);
+	} elseif ($max_lengths['comment_content'] < mb_strlen($comment_content, '8bit')) {
+		return new WP_Error('comment_content_column_length', __('<strong>ERROR</strong>: your comment is too long.'), 200);
 	}
 
 	$commentdata = compact(
@@ -2915,11 +2915,11 @@ 
 		'user_ID'
 	);
 
-	$comment_id = wp_new_comment( wp_slash( $commentdata ) );
-	if ( ! $comment_id ) {
-		return new WP_Error( 'comment_save_error', __( '<strong>ERROR</strong>: The comment could not be saved. Please try again later.' ), 500 );
+	$comment_id = wp_new_comment(wp_slash($commentdata));
+	if ( ! $comment_id) {
+		return new WP_Error('comment_save_error', __('<strong>ERROR</strong>: The comment could not be saved. Please try again later.'), 500);
 	}
 
-	return get_comment( $comment_id );
+	return get_comment($comment_id);
 
 }

Braces +247 added lines, -161 removed lines

@@ -40,8 +40,9 @@ 
 	global $wpdb;
 
 	// If manual moderation is enabled, skip all checks and return false.
-	if ( 1 == get_option('comment_moderation') )
-		return false;
+	if ( 1 == get_option('comment_moderation') ) {
+			return false;
+	}
 
 	/** This filter is documented in wp-includes/comment-template.php */
 	$comment = apply_filters( 'comment_text', $comment );
@@ -64,8 +65,9 @@ 
 		 * If the number of links in the comment exceeds the allowed amount,
 		 * fail the check by returning false.
 		 */
-		if ( $num_links >= $max_links )
-			return false;
+		if ( $num_links >= $max_links ) {
+					return false;
+		}
 	}
 
 	$mod_keys = trim(get_option('moderation_keys'));
@@ -78,8 +80,9 @@ 
 			$word = trim($word);
 
 			// Skip empty lines.
-			if ( empty($word) )
-				continue;
+			if ( empty($word) ) {
+							continue;
+			}
 
 			/*
 			 * Do some escaping magic so that '#' (number of) characters in the spam
@@ -92,12 +95,24 @@ 
 			 * fail the check for the given field by returning false.
 			 */
 			$pattern = "#$word#i";
-			if ( preg_match($pattern, $author) ) return false;
-			if ( preg_match($pattern, $email) ) return false;
-			if ( preg_match($pattern, $url) ) return false;
-			if ( preg_match($pattern, $comment) ) return false;
-			if ( preg_match($pattern, $user_ip) ) return false;
-			if ( preg_match($pattern, $user_agent) ) return false;
+			if ( preg_match($pattern, $author) ) {
+				return false;
+			}
+			if ( preg_match($pattern, $email) ) {
+				return false;
+			}
+			if ( preg_match($pattern, $url) ) {
+				return false;
+			}
+			if ( preg_match($pattern, $comment) ) {
+				return false;
+			}
+			if ( preg_match($pattern, $user_ip) ) {
+				return false;
+			}
+			if ( preg_match($pattern, $user_agent) ) {
+				return false;
+			}
 		}
 	}
 
@@ -113,10 +128,11 @@ 
 			// expected_slashed ($author, $email)
 			$ok_to_comment = $wpdb->get_var("SELECT comment_approved FROM $wpdb->comments WHERE comment_author = '$author' AND comment_author_email = '$email' and comment_approved = '1' LIMIT 1");
 			if ( ( 1 == $ok_to_comment ) &&
-				( empty($mod_keys) || false === strpos( $email, $mod_keys) ) )
-					return true;
-			else
-				return false;
+				( empty($mod_keys) || false === strpos( $email, $mod_keys) ) ) {
+								return true;
+			} else {
+							return false;
+			}
 		} else {
 			return false;
 		}
@@ -299,8 +315,9 @@ 
 	global $wpdb;
 	static $cache_lastcommentmodified = array();
 
-	if ( isset($cache_lastcommentmodified[$timezone]) )
-		return $cache_lastcommentmodified[$timezone];
+	if ( isset($cache_lastcommentmodified[$timezone]) ) {
+			return $cache_lastcommentmodified[$timezone];
+	}
 
 	$add_seconds_server = date('Z');
 
@@ -502,8 +519,9 @@ 
  * @since 3.4.0
  */
 function wp_set_comment_cookies($comment, $user) {
-	if ( $user->exists() )
-		return;
+	if ( $user->exists() ) {
+			return;
+	}
 
 	/**
 	 * Filter the lifetime of the comment cookie in seconds.
@@ -770,8 +788,9 @@ 
 			 */
 			do_action( 'comment_flood_trigger', $time_lastcomment, $time_newcomment );
 
-			if ( defined('DOING_AJAX') )
-				die( __('You are posting comments too quickly. Slow down.') );
+			if ( defined('DOING_AJAX') ) {
+							die( __('You are posting comments too quickly. Slow down.') );
+			}
 
 			wp_die( __( 'You are posting comments too quickly. Slow down.' ), 429 );
 		}
@@ -791,11 +810,13 @@ 
 	$count = count($comments);
 	for ( $i = 0; $i < $count; $i++ ) {
 		$type = $comments[$i]->comment_type;
-		if ( empty($type) )
-			$type = 'comment';
+		if ( empty($type) ) {
+					$type = 'comment';
+		}
 		$comments_by_type[$type][] = &$comments[$i];
-		if ( 'trackback' == $type || 'pingback' == $type )
-			$comments_by_type['pings'][] = &$comments[$i];
+		if ( 'trackback' == $type || 'pingback' == $type ) {
+					$comments_by_type['pings'][] = &$comments[$i];
+		}
 	}
 
 	return $comments_by_type;
@@ -818,28 +839,35 @@ 
 function get_comment_pages_count( $comments = null, $per_page = null, $threaded = null ) {
 	global $wp_query;
 
-	if ( null === $comments && null === $per_page && null === $threaded && !empty($wp_query->max_num_comment_pages) )
-		return $wp_query->max_num_comment_pages;
+	if ( null === $comments && null === $per_page && null === $threaded && !empty($wp_query->max_num_comment_pages) ) {
+			return $wp_query->max_num_comment_pages;
+	}
 
-	if ( ( ! $comments || ! is_array( $comments ) ) && ! empty( $wp_query->comments )  )
-		$comments = $wp_query->comments;
+	if ( ( ! $comments || ! is_array( $comments ) ) && ! empty( $wp_query->comments )  ) {
+			$comments = $wp_query->comments;
+	}
 
-	if ( empty($comments) )
-		return 0;
+	if ( empty($comments) ) {
+			return 0;
+	}
 
 	if ( ! get_option( 'page_comments' ) ) {
 		return 1;
 	}
 
-	if ( !isset($per_page) )
-		$per_page = (int) get_query_var('comments_per_page');
-	if ( 0 === $per_page )
-		$per_page = (int) get_option('comments_per_page');
-	if ( 0 === $per_page )
-		return 1;
+	if ( !isset($per_page) ) {
+			$per_page = (int) get_query_var('comments_per_page');
+	}
+	if ( 0 === $per_page ) {
+			$per_page = (int) get_option('comments_per_page');
+	}
+	if ( 0 === $per_page ) {
+			return 1;
+	}
 
-	if ( !isset($threaded) )
-		$threaded = get_option('thread_comments');
+	if ( !isset($threaded) ) {
+			$threaded = get_option('thread_comments');
+	}
 
 	if ( $threaded ) {
 		$walker = new Walker_Comment;
@@ -876,8 +904,9 @@ 
 
 	$page = null;
 
-	if ( !$comment = get_comment( $comment_ID ) )
-		return;
+	if ( !$comment = get_comment( $comment_ID ) ) {
+			return;
+	}
 
 	$defaults = array( 'type' => 'all', 'page' => '', 'per_page' => '', 'max_depth' => '' );
 	$args = wp_parse_args( $args, $defaults );
@@ -905,15 +934,17 @@ 
 
 	if ( null === $page ) {
 		if ( '' === $args['max_depth'] ) {
-			if ( get_option('thread_comments') )
-				$args['max_depth'] = get_option('thread_comments_depth');
-			else
-				$args['max_depth'] = -1;
+			if ( get_option('thread_comments') ) {
+							$args['max_depth'] = get_option('thread_comments_depth');
+			} else {
+							$args['max_depth'] = -1;
+			}
 		}
 
 		// Find this comment's top level parent if threading is enabled
-		if ( $args['max_depth'] > 1 && 0 != $comment->comment_parent )
-			return get_page_of_comment( $comment->comment_parent, $args );
+		if ( $args['max_depth'] > 1 && 0 != $comment->comment_parent ) {
+					return get_page_of_comment( $comment->comment_parent, $args );
+		}
 
 		$comment_args = array(
 			'type'       => $args['type'],
@@ -1055,8 +1086,10 @@ 
 	do_action( 'wp_blacklist_check', $author, $email, $url, $comment, $user_ip, $user_agent );
 
 	$mod_keys = trim( get_option('blacklist_keys') );
-	if ( '' == $mod_keys )
-		return false; // If moderation keys are empty
+	if ( '' == $mod_keys ) {
+			return false;
+	}
+	// If moderation keys are empty
 	$words = explode("\n", $mod_keys );
 
 	foreach ( (array) $words as $word ) {
@@ -1077,8 +1110,9 @@ 
 			|| preg_match($pattern, $comment)
 			|| preg_match($pattern, $user_ip)
 			|| preg_match($pattern, $user_agent)
-		 )
-			return true;
+		 ) {
+					return true;
+		}
 	}
 	return false;
 }
@@ -1149,11 +1183,13 @@ 
  */
 function wp_delete_comment($comment_id, $force_delete = false) {
 	global $wpdb;
-	if (!$comment = get_comment($comment_id))
-		return false;
+	if (!$comment = get_comment($comment_id)) {
+			return false;
+	}
 
-	if ( !$force_delete && EMPTY_TRASH_DAYS && !in_array( wp_get_comment_status( $comment ), array( 'trash', 'spam' ) ) )
-		return wp_trash_comment($comment_id);
+	if ( !$force_delete && EMPTY_TRASH_DAYS && !in_array( wp_get_comment_status( $comment ), array( 'trash', 'spam' ) ) ) {
+			return wp_trash_comment($comment_id);
+	}
 
 	/**
 	 * Fires immediately before a comment is deleted from the database.
@@ -1173,11 +1209,13 @@ 
 
 	// Delete metadata
 	$meta_ids = $wpdb->get_col( $wpdb->prepare( "SELECT meta_id FROM $wpdb->commentmeta WHERE comment_id = %d", $comment->comment_ID ) );
-	foreach ( $meta_ids as $mid )
-		delete_metadata_by_mid( 'comment', $mid );
+	foreach ( $meta_ids as $mid ) {
+			delete_metadata_by_mid( 'comment', $mid );
+	}
 
-	if ( ! $wpdb->delete( $wpdb->comments, array( 'comment_ID' => $comment->comment_ID ) ) )
-		return false;
+	if ( ! $wpdb->delete( $wpdb->comments, array( 'comment_ID' => $comment->comment_ID ) ) ) {
+			return false;
+	}
 
 	/**
 	 * Fires immediately after a comment is deleted from the database.
@@ -1189,8 +1227,9 @@ 
 	do_action( 'deleted_comment', $comment->comment_ID );
 
 	$post_id = $comment->comment_post_ID;
-	if ( $post_id && $comment->comment_approved == 1 )
-		wp_update_comment_count($post_id);
+	if ( $post_id && $comment->comment_approved == 1 ) {
+			wp_update_comment_count($post_id);
+	}
 
 	clean_comment_cache( $comment->comment_ID );
 
@@ -1212,11 +1251,13 @@ 
  * @return bool True on success, false on failure.
  */
 function wp_trash_comment($comment_id) {
-	if ( !EMPTY_TRASH_DAYS )
-		return wp_delete_comment($comment_id, true);
+	if ( !EMPTY_TRASH_DAYS ) {
+			return wp_delete_comment($comment_id, true);
+	}
 
-	if ( !$comment = get_comment($comment_id) )
-		return false;
+	if ( !$comment = get_comment($comment_id) ) {
+			return false;
+	}
 
 	/**
 	 * Fires immediately before a comment is sent to the Trash.
@@ -1271,8 +1312,9 @@ 
 	do_action( 'untrash_comment', $comment->comment_ID );
 
 	$status = (string) get_comment_meta( $comment->comment_ID, '_wp_trash_meta_status', true );
-	if ( empty($status) )
-		$status = '0';
+	if ( empty($status) ) {
+			$status = '0';
+	}
 
 	if ( wp_set_comment_status( $comment, $status ) ) {
 		delete_comment_meta( $comment->comment_ID, '_wp_trash_meta_time' );
@@ -1357,8 +1399,9 @@ 
 	do_action( 'unspam_comment', $comment->comment_ID );
 
 	$status = (string) get_comment_meta( $comment->comment_ID, '_wp_trash_meta_status', true );
-	if ( empty($status) )
-		$status = '0';
+	if ( empty($status) ) {
+			$status = '0';
+	}
 
 	if ( wp_set_comment_status( $comment, $status ) ) {
 		delete_comment_meta( $comment->comment_ID, '_wp_trash_meta_status' );
@@ -1387,24 +1430,26 @@ 
  */
 function wp_get_comment_status($comment_id) {
 	$comment = get_comment($comment_id);
-	if ( !$comment )
-		return false;
+	if ( !$comment ) {
+			return false;
+	}
 
 	$approved = $comment->comment_approved;
 
-	if ( $approved == null )
-		return false;
-	elseif ( $approved == '1' )
-		return 'approved';
-	elseif ( $approved == '0' )
-		return 'unapproved';
-	elseif ( $approved == 'spam' )
-		return 'spam';
-	elseif ( $approved == 'trash' )
-		return 'trash';
-	else
-		return false;
-}
+	if ( $approved == null ) {
+			return false;
+	} elseif ( $approved == '1' ) {
+			return 'approved';
+	} elseif ( $approved == '0' ) {
+			return 'unapproved';
+	} elseif ( $approved == 'spam' ) {
+			return 'spam';
+	} elseif ( $approved == 'trash' ) {
+			return 'trash';
+	} else {
+			return false;
+	}
+	}
 
 /**
  * Call hooks for when a comment status transition occurs.
@@ -1438,8 +1483,12 @@ 
 		1         => 'approved',
 		'approve' => 'approved', // wp_set_comment_status() uses "approve"
 	);
-	if ( isset($comment_statuses[$new_status]) ) $new_status = $comment_statuses[$new_status];
-	if ( isset($comment_statuses[$old_status]) ) $old_status = $comment_statuses[$old_status];
+	if ( isset($comment_statuses[$new_status]) ) {
+		$new_status = $comment_statuses[$new_status];
+	}
+	if ( isset($comment_statuses[$old_status]) ) {
+		$old_status = $comment_statuses[$old_status];
+	}
 
 	// Call the hooks
 	if ( $new_status != $old_status ) {
@@ -1498,16 +1547,19 @@ 
 	// Cookies should already be sanitized.
 
 	$comment_author = '';
-	if ( isset($_COOKIE['comment_author_'.COOKIEHASH]) )
-		$comment_author = $_COOKIE['comment_author_'.COOKIEHASH];
+	if ( isset($_COOKIE['comment_author_'.COOKIEHASH]) ) {
+			$comment_author = $_COOKIE['comment_author_'.COOKIEHASH];
+	}
 
 	$comment_author_email = '';
-	if ( isset($_COOKIE['comment_author_email_'.COOKIEHASH]) )
-		$comment_author_email = $_COOKIE['comment_author_email_'.COOKIEHASH];
+	if ( isset($_COOKIE['comment_author_email_'.COOKIEHASH]) ) {
+			$comment_author_email = $_COOKIE['comment_author_email_'.COOKIEHASH];
+	}
 
 	$comment_author_url = '';
-	if ( isset($_COOKIE['comment_author_url_'.COOKIEHASH]) )
-		$comment_author_url = $_COOKIE['comment_author_url_'.COOKIEHASH];
+	if ( isset($_COOKIE['comment_author_url_'.COOKIEHASH]) ) {
+			$comment_author_url = $_COOKIE['comment_author_url_'.COOKIEHASH];
+	}
 
 	/**
 	 * Filter the current commenter's name, email, and URL.
@@ -1691,10 +1743,13 @@ 
  * @return bool Whether comment should be blocked.
  */
 function wp_throttle_comment_flood($block, $time_lastcomment, $time_newcomment) {
-	if ( $block ) // a plugin has already blocked... we'll let that decision stand
+	if ( $block ) {
+		// a plugin has already blocked... we'll let that decision stand
 		return $block;
-	if ( ($time_newcomment - $time_lastcomment) < 15 )
-		return true;
+	}
+	if ( ($time_newcomment - $time_lastcomment) < 15 ) {
+			return true;
+	}
 	return false;
 }
 
@@ -1931,10 +1986,11 @@ 
 	$comment_old = clone get_comment($comment_id);
 
 	if ( !$wpdb->update( $wpdb->comments, array('comment_approved' => $status), array( 'comment_ID' => $comment_old->comment_ID ) ) ) {
-		if ( $wp_error )
-			return new WP_Error('db_update_error', __('Could not update comment status'), $wpdb->last_error);
-		else
-			return false;
+		if ( $wp_error ) {
+					return new WP_Error('db_update_error', __('Could not update comment status'), $wpdb->last_error);
+		} else {
+					return false;
+		}
 	}
 
 	clean_comment_cache( $comment_old->comment_ID );
@@ -2061,8 +2117,9 @@ 
 	if ( is_bool($defer) ) {
 		$_defer = $defer;
 		// flush any deferred counts
-		if ( !$defer )
-			wp_update_comment_count( null, true );
+		if ( !$defer ) {
+					wp_update_comment_count( null, true );
+		}
 	}
 
 	return $_defer;
@@ -2108,8 +2165,7 @@ 
 	if ( wp_defer_comment_counting() ) {
 		$_deferred[] = $post_id;
 		return true;
-	}
-	elseif ( $post_id ) {
+	} elseif ( $post_id ) {
 		return wp_update_comment_count_now($post_id);
 	}
 
@@ -2128,14 +2184,16 @@ 
 function wp_update_comment_count_now($post_id) {
 	global $wpdb;
 	$post_id = (int) $post_id;
-	if ( !$post_id )
-		return false;
+	if ( !$post_id ) {
+			return false;
+	}
 
 	wp_cache_delete( 'comments-0', 'counts' );
 	wp_cache_delete( "comments-{$post_id}", 'counts' );
 
-	if ( !$post = get_post($post_id) )
-		return false;
+	if ( !$post = get_post($post_id) ) {
+			return false;
+	}
 
 	$old = (int) $post->comment_count;
 
@@ -2194,8 +2252,9 @@ 
  * @return false|string False on failure, string containing URI on success.
  */
 function discover_pingback_server_uri( $url, $deprecated = '' ) {
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '2.7' );
+	if ( !empty( $deprecated ) ) {
+			_deprecated_argument( __FUNCTION__, '2.7' );
+	}
 
 	$pingback_str_dquote = 'rel="pingback"';
 	$pingback_str_squote = 'rel=\'pingback\'';
@@ -2203,31 +2262,38 @@ 
 	/** @todo Should use Filter Extension or custom preg_match instead. */
 	$parsed_url = parse_url($url);
 
-	if ( ! isset( $parsed_url['host'] ) ) // Not a URL. This should never happen.
+	if ( ! isset( $parsed_url['host'] ) ) {
+		// Not a URL. This should never happen.
 		return false;
+	}
 
 	//Do not search for a pingback server on our own uploads
 	$uploads_dir = wp_get_upload_dir();
-	if ( 0 === strpos($url, $uploads_dir['baseurl']) )
-		return false;
+	if ( 0 === strpos($url, $uploads_dir['baseurl']) ) {
+			return false;
+	}
 
 	$response = wp_safe_remote_head( $url, array( 'timeout' => 2, 'httpversion' => '1.0' ) );
 
-	if ( is_wp_error( $response ) )
-		return false;
+	if ( is_wp_error( $response ) ) {
+			return false;
+	}
 
-	if ( wp_remote_retrieve_header( $response, 'x-pingback' ) )
-		return wp_remote_retrieve_header( $response, 'x-pingback' );
+	if ( wp_remote_retrieve_header( $response, 'x-pingback' ) ) {
+			return wp_remote_retrieve_header( $response, 'x-pingback' );
+	}
 
 	// Not an (x)html, sgml, or xml page, no use going further.
-	if ( preg_match('#(image|audio|video|model)/#is', wp_remote_retrieve_header( $response, 'content-type' )) )
-		return false;
+	if ( preg_match('#(image|audio|video|model)/#is', wp_remote_retrieve_header( $response, 'content-type' )) ) {
+			return false;
+	}
 
 	// Now do a GET since we're going to look in the html headers (and we're sure it's not a binary file)
 	$response = wp_safe_remote_get( $url, array( 'timeout' => 2, 'httpversion' => '1.0' ) );
 
-	if ( is_wp_error( $response ) )
-		return false;
+	if ( is_wp_error( $response ) ) {
+			return false;
+	}
 
 	$contents = wp_remote_retrieve_body( $response );
 
@@ -2275,9 +2341,10 @@ 
 
 	// Do Trackbacks
 	$trackbacks = $wpdb->get_col("SELECT ID FROM $wpdb->posts WHERE to_ping <> '' AND post_status = 'publish'");
-	if ( is_array($trackbacks) )
-		foreach ( $trackbacks as $trackback )
+	if ( is_array($trackbacks) ) {
+			foreach ( $trackbacks as $trackback )
 			do_trackbacks($trackback);
+	}
 
 	//Do Update Services/Generic Pings
 	generic_ping();
@@ -2345,8 +2412,9 @@ 
 	$services = explode("\n", $services);
 	foreach ( (array) $services as $service ) {
 		$service = trim($service);
-		if ( '' != $service )
-			weblog_ping($service);
+		if ( '' != $service ) {
+					weblog_ping($service);
+		}
 	}
 
 	return $post_id;
@@ -2389,10 +2457,11 @@ 
 		if ( !in_array($link_test, $pung) && (url_to_postid($link_test) != $post_ID) // If we haven't pung it already and it isn't a link to itself
 				&& !is_local_attachment($link_test) ) : // Also, let's never ping local attachments.
 			if ( $test = @parse_url($link_test) ) {
-				if ( isset($test['query']) )
-					$post_links[] = $link_test;
-				elseif ( isset( $test['path'] ) && ( $test['path'] != '/' ) && ( $test['path'] != '' ) )
-					$post_links[] = $link_test;
+				if ( isset($test['query']) ) {
+									$post_links[] = $link_test;
+				} elseif ( isset( $test['path'] ) && ( $test['path'] != '/' ) && ( $test['path'] != '' ) ) {
+									$post_links[] = $link_test;
+				}
 			}
 		endif;
 	endforeach;
@@ -2436,8 +2505,10 @@ 
 			// when set to true, this outputs debug messages by itself
 			$client->debug = false;
 
-			if ( $client->query('pingback.ping', $pagelinkedfrom, $pagelinkedto) || ( isset($client->error->code) && 48 == $client->error->code ) ) // Already registered
+			if ( $client->query('pingback.ping', $pagelinkedfrom, $pagelinkedto) || ( isset($client->error->code) && 48 == $client->error->code ) ) {
+				// Already registered
 				add_ping( $post_ID, $pagelinkedto );
+			}
 		}
 	}
 }
@@ -2451,11 +2522,12 @@ 
  * @return mixed Empty string if blog is not public, returns $sites, if site is public.
  */
 function privacy_ping_filter($sites) {
-	if ( '0' != get_option('blog_public') )
-		return $sites;
-	else
-		return '';
-}
+	if ( '0' != get_option('blog_public') ) {
+			return $sites;
+	} else {
+			return '';
+	}
+	}
 
 /**
  * Send a Trackback.
@@ -2475,8 +2547,9 @@ 
 function trackback($trackback_url, $title, $excerpt, $ID) {
 	global $wpdb;
 
-	if ( empty($trackback_url) )
-		return;
+	if ( empty($trackback_url) ) {
+			return;
+	}
 
 	$options = array();
 	$options['timeout'] = 10;
@@ -2489,8 +2562,9 @@ 
 
 	$response = wp_safe_remote_post( $trackback_url, $options );
 
-	if ( is_wp_error( $response ) )
-		return;
+	if ( is_wp_error( $response ) ) {
+			return;
+	}
 
 	$wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET pinged = CONCAT(pinged, '\n', %s) WHERE ID = %d", $trackback_url, $ID) );
 	return $wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET to_ping = TRIM(REPLACE(to_ping, %s, '')) WHERE ID = %d", $trackback_url, $ID) );
@@ -2519,9 +2593,11 @@ 
 	// when set to true, this outputs debug messages by itself
 	$client->debug = false;
 	$home = trailingslashit( home_url() );
-	if ( !$client->query('weblogUpdates.extendedPing', get_option('blogname'), $home, get_bloginfo('rss2_url') ) ) // then try a normal ping
+	if ( !$client->query('weblogUpdates.extendedPing', get_option('blogname'), $home, get_bloginfo('rss2_url') ) ) {
+		// then try a normal ping
 		$client->query('weblogUpdates.ping', get_option('blogname'), $home);
-}
+	}
+	}
 
 /**
  * Default filter attached to pingback_ping_source_uri to validate the pingback's Source URI
@@ -2549,8 +2625,9 @@ 
  * @return IXR_Error
  */
 function xmlrpc_pingback_error( $ixr_error ) {
-	if ( $ixr_error->code === 48 )
-		return $ixr_error;
+	if ( $ixr_error->code === 48 ) {
+			return $ixr_error;
+	}
 	return new IXR_Error( 0, '' );
 }
 
@@ -2596,8 +2673,9 @@ 
  * @param bool  $update_meta_cache Whether to update commentmeta cache. Default true.
  */
 function update_comment_cache( $comments, $update_meta_cache = true ) {
-	foreach ( (array) $comments as $comment )
-		wp_cache_add($comment->comment_ID, $comment, 'comment');
+	foreach ( (array) $comments as $comment ) {
+			wp_cache_add($comment->comment_ID, $comment, 'comment');
+	}
 
 	if ( $update_meta_cache ) {
 		// Avoid `wp_list_pluck()` in case `$comments` is passed by reference.
@@ -2647,8 +2725,9 @@ 
  * @return array
  */
 function _close_comments_for_old_posts( $posts, $query ) {
-	if ( empty( $posts ) || ! $query->is_singular() || ! get_option( 'close_comments_for_old_posts' ) )
-		return $posts;
+	if ( empty( $posts ) || ! $query->is_singular() || ! get_option( 'close_comments_for_old_posts' ) ) {
+			return $posts;
+	}
 
 	/**
 	 * Filter the list of post types to automatically close comments for.
@@ -2658,12 +2737,14 @@ 
 	 * @param array $post_types An array of registered post types. Default array with 'post'.
 	 */
 	$post_types = apply_filters( 'close_comments_for_post_types', array( 'post' ) );
-	if ( ! in_array( $posts[0]->post_type, $post_types ) )
-		return $posts;
+	if ( ! in_array( $posts[0]->post_type, $post_types ) ) {
+			return $posts;
+	}
 
 	$days_old = (int) get_option( 'close_comments_days_old' );
-	if ( ! $days_old )
-		return $posts;
+	if ( ! $days_old ) {
+			return $posts;
+	}
 
 	if ( time() - strtotime( $posts[0]->post_date_gmt ) > ( $days_old * DAY_IN_SECONDS ) ) {
 		$posts[0]->comment_status = 'closed';
@@ -2684,30 +2765,35 @@ 
  * @return bool $open
  */
 function _close_comments_for_old_post( $open, $post_id ) {
-	if ( ! $open )
-		return $open;
+	if ( ! $open ) {
+			return $open;
+	}
 
-	if ( !get_option('close_comments_for_old_posts') )
-		return $open;
+	if ( !get_option('close_comments_for_old_posts') ) {
+			return $open;
+	}
 
 	$days_old = (int) get_option('close_comments_days_old');
-	if ( !$days_old )
-		return $open;
+	if ( !$days_old ) {
+			return $open;
+	}
 
 	$post = get_post($post_id);
 
 	/** This filter is documented in wp-includes/comment.php */
 	$post_types = apply_filters( 'close_comments_for_post_types', array( 'post' ) );
-	if ( ! in_array( $post->post_type, $post_types ) )
-		return $open;
+	if ( ! in_array( $post->post_type, $post_types ) ) {
+			return $open;
+	}
 
 	// Undated drafts should not show up as comments closed.
 	if ( '0000-00-00 00:00:00' === $post->post_date_gmt ) {
 		return $open;
 	}
 
-	if ( time() - strtotime( $post->post_date_gmt ) > ( $days_old * DAY_IN_SECONDS ) )
-		return false;
+	if ( time() - strtotime( $post->post_date_gmt ) > ( $days_old * DAY_IN_SECONDS ) ) {
+			return false;
+	}
 
 	return $open;
 }