ntwb / wordpress

src/wp-includes/theme-compat/embed-content.php

Spacing +18 added lines, -18 removed lines

@@ -10,29 +10,29 @@ 
  * @since 4.5.0
  */
 ?>
-	<div <?php post_class( 'wp-embed' ); ?>>
+	<div <?php post_class('wp-embed'); ?>>
 		<?php
 		$thumbnail_id = 0;
 
-		if ( has_post_thumbnail() ) {
+		if (has_post_thumbnail()) {
 			$thumbnail_id = get_post_thumbnail_id();
 		}
 
-		if ( 'attachment' === get_post_type() && wp_attachment_is_image() ) {
+		if ('attachment' === get_post_type() && wp_attachment_is_image()) {
 			$thumbnail_id = get_the_ID();
 		}
 
-		if ( $thumbnail_id ) {
+		if ($thumbnail_id) {
 			$aspect_ratio = 1;
-			$measurements = array( 1, 1 );
+			$measurements = array(1, 1);
 			$image_size   = 'full'; // Fallback.
 
-			$meta = wp_get_attachment_metadata( $thumbnail_id );
-			if ( ! empty( $meta['sizes'] ) ) {
-				foreach ( $meta['sizes'] as $size => $data ) {
-					if ( $data['width'] / $data['height'] > $aspect_ratio ) {
+			$meta = wp_get_attachment_metadata($thumbnail_id);
+			if ( ! empty($meta['sizes'])) {
+				foreach ($meta['sizes'] as $size => $data) {
+					if ($data['width'] / $data['height'] > $aspect_ratio) {
 						$aspect_ratio = $data['width'] / $data['height'];
-						$measurements = array( $data['width'], $data['height'] );
+						$measurements = array($data['width'], $data['height']);
 						$image_size   = $size;
 					}
 				}
@@ -47,7 +47,7 @@ 
 			 * @param string $image_size   Thumbnail image size.
 			 * @param int    $thumbnail_id Attachment ID.
 			 */
-			$image_size = apply_filters( 'embed_thumbnail_image_size', $image_size, $thumbnail_id );
+			$image_size = apply_filters('embed_thumbnail_image_size', $image_size, $thumbnail_id);
 
 			$shape = $measurements[0] / $measurements[1] >= 1.75 ? 'rectangular' : 'square';
 
@@ -63,13 +63,13 @@ 
 			 * @param string $shape        Thumbnail image shape. Either 'rectangular' or 'square'.
 			 * @param int    $thumbnail_id Attachment ID.
 			 */
-			$shape = apply_filters( 'embed_thumbnail_image_shape', $shape, $thumbnail_id );
+			$shape = apply_filters('embed_thumbnail_image_shape', $shape, $thumbnail_id);
 		}
 
-		if ( $thumbnail_id && 'rectangular' === $shape ) : ?>
+		if ($thumbnail_id && 'rectangular' === $shape) : ?>
 			<div class="wp-embed-featured-image rectangular">
 				<a href="<?php the_permalink(); ?>" target="_top">
-					<?php echo wp_get_attachment_image( $thumbnail_id, $image_size ); ?>
+					<?php echo wp_get_attachment_image($thumbnail_id, $image_size); ?>
 				</a>
 			</div>
 		<?php endif; ?>
@@ -80,10 +80,10 @@ 
 			</a>
 		</p>
 
-		<?php if ( $thumbnail_id && 'square' === $shape ) : ?>
+		<?php if ($thumbnail_id && 'square' === $shape) : ?>
 			<div class="wp-embed-featured-image square">
 				<a href="<?php the_permalink(); ?>" target="_top">
-					<?php echo wp_get_attachment_image( $thumbnail_id, $image_size ); ?>
+					<?php echo wp_get_attachment_image($thumbnail_id, $image_size); ?>
 				</a>
 			</div>
 		<?php endif; ?>
@@ -96,7 +96,7 @@ 
 		 *
 		 * @since 4.4.0
 		 */
-		do_action( 'embed_content' );
+		do_action('embed_content');
 		?>
 
 		<div class="wp-embed-footer">
@@ -109,7 +109,7 @@ 
 				 *
 				 * @since 4.4.0
 				 */
-				do_action( 'embed_content_meta');
+				do_action('embed_content_meta');
 				?>
 			</div>
 		</div>

src/wp-includes/category-template.php

Doc Comments +1 added lines, -1 removed lines

@@ -723,7 +723,7 @@
  * @since 2.9.0
  *
  * @param int $count Number of posts with that tag.
- * @return int Scaled count.
+ * @return double Scaled count.
  */
 function default_topic_count_scale( $count ) {
 	return round(log10($count + 1) * 100);

Spacing +265 added lines, -265 removed lines

@@ -16,13 +16,13 @@ 
  * @param int|object $category Category ID or object.
  * @return string Link on success, empty string if category does not exist.
  */
-function get_category_link( $category ) {
-	if ( ! is_object( $category ) )
+function get_category_link($category) {
+	if ( ! is_object($category))
 		$category = (int) $category;
 
-	$category = get_term_link( $category, 'category' );
+	$category = get_term_link($category, 'category');
 
-	if ( is_wp_error( $category ) )
+	if (is_wp_error($category))
 		return '';
 
 	return $category;
@@ -41,10 +41,10 @@ 
  * @param array $deprecated Not used.
  * @return string|WP_Error A list of category parents on success, WP_Error on failure.
  */
-function get_category_parents( $id, $link = false, $separator = '/', $nicename = false, $deprecated = array() ) {
+function get_category_parents($id, $link = false, $separator = '/', $nicename = false, $deprecated = array()) {
 
-	if ( ! empty( $deprecated ) ) {
-		_deprecated_argument( __FUNCTION__, '4.8.0' );
+	if ( ! empty($deprecated)) {
+		_deprecated_argument(__FUNCTION__, '4.8.0');
 	}
 
 	$format = $nicename ? 'slug' : 'name';
@@ -55,7 +55,7 @@ 
 		'format'    => $format,
 	);
 
-	return get_term_parents_list( $id, 'category', $args );
+	return get_term_parents_list($id, 'category', $args);
 }
 
 /**
@@ -71,15 +71,15 @@ 
  * @param int $id Optional, default to current post ID. The post ID.
  * @return array Array of WP_Term objects, one for each category assigned to the post.
  */
-function get_the_category( $id = false ) {
-	$categories = get_the_terms( $id, 'category' );
-	if ( ! $categories || is_wp_error( $categories ) )
+function get_the_category($id = false) {
+	$categories = get_the_terms($id, 'category');
+	if ( ! $categories || is_wp_error($categories))
 		$categories = array();
 
-	$categories = array_values( $categories );
+	$categories = array_values($categories);
 
-	foreach ( array_keys( $categories ) as $key ) {
-		_make_cat_compat( $categories[$key] );
+	foreach (array_keys($categories) as $key) {
+		_make_cat_compat($categories[$key]);
 	}
 
 	/**
@@ -91,7 +91,7 @@ 
 	 * @param array $categories An array of categories to return for the post.
 	 * @param int   $id         ID of the post.
 	 */
-	return apply_filters( 'get_the_categories', $categories, $id );
+	return apply_filters('get_the_categories', $categories, $id);
 }
 
 /**
@@ -102,14 +102,14 @@ 
  * @param int $cat_ID Category ID.
  * @return string|WP_Error Category name on success, WP_Error on failure.
  */
-function get_the_category_by_ID( $cat_ID ) {
+function get_the_category_by_ID($cat_ID) {
 	$cat_ID = (int) $cat_ID;
-	$category = get_term( $cat_ID, 'category' );
+	$category = get_term($cat_ID, 'category');
 
-	if ( is_wp_error( $category ) )
+	if (is_wp_error($category))
 		return $category;
 
-	return ( $category ) ? $category->name : '';
+	return ($category) ? $category->name : '';
 }
 
 /**
@@ -124,11 +124,11 @@ 
  * @param int $post_id Optional. Post ID to retrieve categories.
  * @return string
  */
-function get_the_category_list( $separator = '', $parents='', $post_id = false ) {
+function get_the_category_list($separator = '', $parents = '', $post_id = false) {
 	global $wp_rewrite;
-	if ( ! is_object_in_taxonomy( get_post_type( $post_id ), 'category' ) ) {
+	if ( ! is_object_in_taxonomy(get_post_type($post_id), 'category')) {
 		/** This filter is documented in wp-includes/category-template.php */
-		return apply_filters( 'the_category', '', $separator, $parents );
+		return apply_filters('the_category', '', $separator, $parents);
 	}
 
 	/**
@@ -140,58 +140,58 @@ 
 	 * @param int|bool $post_id    ID of the post we're retrieving categories for. When `false`, we assume the
 	 *                             current post in the loop.
 	 */
-	$categories = apply_filters( 'the_category_list', get_the_category( $post_id ), $post_id );
+	$categories = apply_filters('the_category_list', get_the_category($post_id), $post_id);
 
-	if ( empty( $categories ) ) {
+	if (empty($categories)) {
 		/** This filter is documented in wp-includes/category-template.php */
-		return apply_filters( 'the_category', __( 'Uncategorized' ), $separator, $parents );
+		return apply_filters('the_category', __('Uncategorized'), $separator, $parents);
 	}
 
-	$rel = ( is_object( $wp_rewrite ) && $wp_rewrite->using_permalinks() ) ? 'rel="category tag"' : 'rel="category"';
+	$rel = (is_object($wp_rewrite) && $wp_rewrite->using_permalinks()) ? 'rel="category tag"' : 'rel="category"';
 
 	$thelist = '';
-	if ( '' == $separator ) {
+	if ('' == $separator) {
 		$thelist .= '<ul class="post-categories">';
-		foreach ( $categories as $category ) {
+		foreach ($categories as $category) {
 			$thelist .= "\n\t<li>";
-			switch ( strtolower( $parents ) ) {
+			switch (strtolower($parents)) {
 				case 'multiple':
-					if ( $category->parent )
-						$thelist .= get_category_parents( $category->parent, true, $separator );
-					$thelist .= '<a href="' . esc_url( get_category_link( $category->term_id ) ) . '" ' . $rel . '>' . $category->name.'</a></li>';
+					if ($category->parent)
+						$thelist .= get_category_parents($category->parent, true, $separator);
+					$thelist .= '<a href="'.esc_url(get_category_link($category->term_id)).'" '.$rel.'>'.$category->name.'</a></li>';
 					break;
 				case 'single':
-					$thelist .= '<a href="' . esc_url( get_category_link( $category->term_id ) ) . '"  ' . $rel . '>';
-					if ( $category->parent )
-						$thelist .= get_category_parents( $category->parent, false, $separator );
+					$thelist .= '<a href="'.esc_url(get_category_link($category->term_id)).'"  '.$rel.'>';
+					if ($category->parent)
+						$thelist .= get_category_parents($category->parent, false, $separator);
 					$thelist .= $category->name.'</a></li>';
 					break;
 				case '':
 				default:
-					$thelist .= '<a href="' . esc_url( get_category_link( $category->term_id ) ) . '" ' . $rel . '>' . $category->name.'</a></li>';
+					$thelist .= '<a href="'.esc_url(get_category_link($category->term_id)).'" '.$rel.'>'.$category->name.'</a></li>';
 			}
 		}
 		$thelist .= '</ul>';
 	} else {
 		$i = 0;
-		foreach ( $categories as $category ) {
-			if ( 0 < $i )
+		foreach ($categories as $category) {
+			if (0 < $i)
 				$thelist .= $separator;
-			switch ( strtolower( $parents ) ) {
+			switch (strtolower($parents)) {
 				case 'multiple':
-					if ( $category->parent )
-						$thelist .= get_category_parents( $category->parent, true, $separator );
-					$thelist .= '<a href="' . esc_url( get_category_link( $category->term_id ) ) . '" ' . $rel . '>' . $category->name.'</a>';
+					if ($category->parent)
+						$thelist .= get_category_parents($category->parent, true, $separator);
+					$thelist .= '<a href="'.esc_url(get_category_link($category->term_id)).'" '.$rel.'>'.$category->name.'</a>';
 					break;
 				case 'single':
-					$thelist .= '<a href="' . esc_url( get_category_link( $category->term_id ) ) . '" ' . $rel . '>';
-					if ( $category->parent )
-						$thelist .= get_category_parents( $category->parent, false, $separator );
+					$thelist .= '<a href="'.esc_url(get_category_link($category->term_id)).'" '.$rel.'>';
+					if ($category->parent)
+						$thelist .= get_category_parents($category->parent, false, $separator);
 					$thelist .= "$category->name</a>";
 					break;
 				case '':
 				default:
-					$thelist .= '<a href="' . esc_url( get_category_link( $category->term_id ) ) . '" ' . $rel . '>' . $category->name.'</a>';
+					$thelist .= '<a href="'.esc_url(get_category_link($category->term_id)).'" '.$rel.'>'.$category->name.'</a>';
 			}
 			++$i;
 		}
@@ -207,7 +207,7 @@ 
 	 * @param string $parents   How to display the category parents. Accepts 'multiple',
 	 *                          'single', or empty.
 	 */
-	return apply_filters( 'the_category', $thelist, $separator, $parents );
+	return apply_filters('the_category', $thelist, $separator, $parents);
 }
 
 /**
@@ -228,11 +228,11 @@ 
  * @param int|object $post Optional. Post to check instead of the current post. (since 2.7.0)
  * @return bool True if the current post is in any of the given categories.
  */
-function in_category( $category, $post = null ) {
-	if ( empty( $category ) )
+function in_category($category, $post = null) {
+	if (empty($category))
 		return false;
 
-	return has_category( $category, $post );
+	return has_category($category, $post);
 }
 
 /**
@@ -244,8 +244,8 @@ 
  * @param string $parents Optional. How to display the parents.
  * @param int $post_id Optional. Post ID to retrieve categories.
  */
-function the_category( $separator = '', $parents='', $post_id = false ) {
-	echo get_the_category_list( $separator, $parents, $post_id );
+function the_category($separator = '', $parents = '', $post_id = false) {
+	echo get_the_category_list($separator, $parents, $post_id);
 }
 
 /**
@@ -256,8 +256,8 @@ 
  * @param int $category Optional. Category ID. Will use global category ID by default.
  * @return string Category description, available.
  */
-function category_description( $category = 0 ) {
-	return term_description( $category, 'category' );
+function category_description($category = 0) {
+	return term_description($category, 'category');
 }
 
 /**
@@ -313,7 +313,7 @@ 
  * }
  * @return string HTML content only if 'echo' argument is 0.
  */
-function wp_dropdown_categories( $args = '' ) {
+function wp_dropdown_categories($args = '') {
 	$defaults = array(
 		'show_option_all'   => '',
 		'show_option_none'  => '',
@@ -338,13 +338,13 @@ 
 		'required'          => false,
 	);
 
-	$defaults['selected'] = ( is_category() ) ? get_query_var( 'cat' ) : 0;
+	$defaults['selected'] = (is_category()) ? get_query_var('cat') : 0;
 
 	// Back compat.
-	if ( isset( $args['type'] ) && 'link' == $args['type'] ) {
+	if (isset($args['type']) && 'link' == $args['type']) {
 		/* translators: 1: "type => link", 2: "taxonomy => link_category" alternative */
-		_deprecated_argument( __FUNCTION__, '3.0.0',
-			sprintf( __( '%1$s is deprecated. Use %2$s instead.' ),
+		_deprecated_argument(__FUNCTION__, '3.0.0',
+			sprintf(__('%1$s is deprecated. Use %2$s instead.'),
 				'<code>type => link</code>',
 				'<code>taxonomy => link_category</code>'
 			)
@@ -352,36 +352,36 @@ 
 		$args['taxonomy'] = 'link_category';
 	}
 
-	$r = wp_parse_args( $args, $defaults );
+	$r = wp_parse_args($args, $defaults);
 	$option_none_value = $r['option_none_value'];
 
-	if ( ! isset( $r['pad_counts'] ) && $r['show_count'] && $r['hierarchical'] ) {
+	if ( ! isset($r['pad_counts']) && $r['show_count'] && $r['hierarchical']) {
 		$r['pad_counts'] = true;
 	}
 
 	$tab_index = $r['tab_index'];
 
 	$tab_index_attribute = '';
-	if ( (int) $tab_index > 0 ) {
+	if ((int) $tab_index > 0) {
 		$tab_index_attribute = " tabindex=\"$tab_index\"";
 	}
 
 	// Avoid clashes with the 'name' param of get_terms().
 	$get_terms_args = $r;
-	unset( $get_terms_args['name'] );
-	$categories = get_terms( $r['taxonomy'], $get_terms_args );
+	unset($get_terms_args['name']);
+	$categories = get_terms($r['taxonomy'], $get_terms_args);
 
-	$name = esc_attr( $r['name'] );
-	$class = esc_attr( $r['class'] );
-	$id = $r['id'] ? esc_attr( $r['id'] ) : $name;
+	$name = esc_attr($r['name']);
+	$class = esc_attr($r['class']);
+	$id = $r['id'] ? esc_attr($r['id']) : $name;
 	$required = $r['required'] ? 'required' : '';
 
-	if ( ! $r['hide_if_empty'] || ! empty( $categories ) ) {
+	if ( ! $r['hide_if_empty'] || ! empty($categories)) {
 		$output = "<select $required name='$name' id='$id' class='$class' $tab_index_attribute>\n";
 	} else {
 		$output = '';
 	}
-	if ( empty( $categories ) && ! $r['hide_if_empty'] && ! empty( $r['show_option_none'] ) ) {
+	if (empty($categories) && ! $r['hide_if_empty'] && ! empty($r['show_option_none'])) {
 
 		/**
 		 * Filters a taxonomy drop-down display element.
@@ -397,37 +397,37 @@ 
 		 *
 		 * @param string $element Taxonomy element to list.
 		 */
-		$show_option_none = apply_filters( 'list_cats', $r['show_option_none'] );
-		$output .= "\t<option value='" . esc_attr( $option_none_value ) . "' selected='selected'>$show_option_none</option>\n";
+		$show_option_none = apply_filters('list_cats', $r['show_option_none']);
+		$output .= "\t<option value='".esc_attr($option_none_value)."' selected='selected'>$show_option_none</option>\n";
 	}
 
-	if ( ! empty( $categories ) ) {
+	if ( ! empty($categories)) {
 
-		if ( $r['show_option_all'] ) {
+		if ($r['show_option_all']) {
 
 			/** This filter is documented in wp-includes/category-template.php */
-			$show_option_all = apply_filters( 'list_cats', $r['show_option_all'] );
-			$selected = ( '0' === strval($r['selected']) ) ? " selected='selected'" : '';
+			$show_option_all = apply_filters('list_cats', $r['show_option_all']);
+			$selected = ('0' === strval($r['selected'])) ? " selected='selected'" : '';
 			$output .= "\t<option value='0'$selected>$show_option_all</option>\n";
 		}
 
-		if ( $r['show_option_none'] ) {
+		if ($r['show_option_none']) {
 
 			/** This filter is documented in wp-includes/category-template.php */
-			$show_option_none = apply_filters( 'list_cats', $r['show_option_none'] );
-			$selected = selected( $option_none_value, $r['selected'], false );
-			$output .= "\t<option value='" . esc_attr( $option_none_value ) . "'$selected>$show_option_none</option>\n";
+			$show_option_none = apply_filters('list_cats', $r['show_option_none']);
+			$selected = selected($option_none_value, $r['selected'], false);
+			$output .= "\t<option value='".esc_attr($option_none_value)."'$selected>$show_option_none</option>\n";
 		}
 
-		if ( $r['hierarchical'] ) {
-			$depth = $r['depth'];  // Walk the full depth.
+		if ($r['hierarchical']) {
+			$depth = $r['depth']; // Walk the full depth.
 		} else {
 			$depth = -1; // Flat.
 		}
-		$output .= walk_category_dropdown_tree( $categories, $depth, $r );
+		$output .= walk_category_dropdown_tree($categories, $depth, $r);
 	}
 
-	if ( ! $r['hide_if_empty'] || ! empty( $categories ) ) {
+	if ( ! $r['hide_if_empty'] || ! empty($categories)) {
 		$output .= "</select>\n";
 	}
 	/**
@@ -438,9 +438,9 @@ 
 	 * @param string $output HTML output.
 	 * @param array  $r      Arguments used to build the drop-down.
 	 */
-	$output = apply_filters( 'wp_dropdown_cats', $output, $r );
+	$output = apply_filters('wp_dropdown_cats', $output, $r);
 
-	if ( $r['echo'] ) {
+	if ($r['echo']) {
 		echo $output;
 	}
 	return $output;
@@ -497,7 +497,7 @@ 
  * }
  * @return false|string HTML content only if 'echo' argument is 0.
  */
-function wp_list_categories( $args = '' ) {
+function wp_list_categories($args = '') {
 	$defaults = array(
 		'child_of'            => 0,
 		'current_category'    => 0,
@@ -516,110 +516,110 @@ 
 		'separator'           => '<br />',
 		'show_count'          => 0,
 		'show_option_all'     => '',
-		'show_option_none'    => __( 'No categories' ),
+		'show_option_none'    => __('No categories'),
 		'style'               => 'list',
 		'taxonomy'            => 'category',
-		'title_li'            => __( 'Categories' ),
+		'title_li'            => __('Categories'),
 		'use_desc_for_title'  => 1,
 	);
 
-	$r = wp_parse_args( $args, $defaults );
+	$r = wp_parse_args($args, $defaults);
 
-	if ( !isset( $r['pad_counts'] ) && $r['show_count'] && $r['hierarchical'] )
+	if ( ! isset($r['pad_counts']) && $r['show_count'] && $r['hierarchical'])
 		$r['pad_counts'] = true;
 
 	// Descendants of exclusions should be excluded too.
-	if ( true == $r['hierarchical'] ) {
+	if (true == $r['hierarchical']) {
 		$exclude_tree = array();
 
-		if ( $r['exclude_tree'] ) {
-			$exclude_tree = array_merge( $exclude_tree, wp_parse_id_list( $r['exclude_tree'] ) );
+		if ($r['exclude_tree']) {
+			$exclude_tree = array_merge($exclude_tree, wp_parse_id_list($r['exclude_tree']));
 		}
 
-		if ( $r['exclude'] ) {
-			$exclude_tree = array_merge( $exclude_tree, wp_parse_id_list( $r['exclude'] ) );
+		if ($r['exclude']) {
+			$exclude_tree = array_merge($exclude_tree, wp_parse_id_list($r['exclude']));
 		}
 
 		$r['exclude_tree'] = $exclude_tree;
 		$r['exclude'] = '';
 	}
 
-	if ( ! isset( $r['class'] ) )
-		$r['class'] = ( 'category' == $r['taxonomy'] ) ? 'categories' : $r['taxonomy'];
+	if ( ! isset($r['class']))
+		$r['class'] = ('category' == $r['taxonomy']) ? 'categories' : $r['taxonomy'];
 
-	if ( ! taxonomy_exists( $r['taxonomy'] ) ) {
+	if ( ! taxonomy_exists($r['taxonomy'])) {
 		return false;
 	}
 
 	$show_option_all = $r['show_option_all'];
 	$show_option_none = $r['show_option_none'];
 
-	$categories = get_categories( $r );
+	$categories = get_categories($r);
 
 	$output = '';
-	if ( $r['title_li'] && 'list' == $r['style'] && ( ! empty( $categories ) || ! $r['hide_title_if_empty'] ) ) {
-		$output = '<li class="' . esc_attr( $r['class'] ) . '">' . $r['title_li'] . '<ul>';
+	if ($r['title_li'] && 'list' == $r['style'] && ( ! empty($categories) || ! $r['hide_title_if_empty'])) {
+		$output = '<li class="'.esc_attr($r['class']).'">'.$r['title_li'].'<ul>';
 	}
-	if ( empty( $categories ) ) {
-		if ( ! empty( $show_option_none ) ) {
-			if ( 'list' == $r['style'] ) {
-				$output .= '<li class="cat-item-none">' . $show_option_none . '</li>';
+	if (empty($categories)) {
+		if ( ! empty($show_option_none)) {
+			if ('list' == $r['style']) {
+				$output .= '<li class="cat-item-none">'.$show_option_none.'</li>';
 			} else {
 				$output .= $show_option_none;
 			}
 		}
 	} else {
-		if ( ! empty( $show_option_all ) ) {
+		if ( ! empty($show_option_all)) {
 
 			$posts_page = '';
 
 			// For taxonomies that belong only to custom post types, point to a valid archive.
-			$taxonomy_object = get_taxonomy( $r['taxonomy'] );
-			if ( ! in_array( 'post', $taxonomy_object->object_type ) && ! in_array( 'page', $taxonomy_object->object_type ) ) {
-				foreach ( $taxonomy_object->object_type as $object_type ) {
-					$_object_type = get_post_type_object( $object_type );
+			$taxonomy_object = get_taxonomy($r['taxonomy']);
+			if ( ! in_array('post', $taxonomy_object->object_type) && ! in_array('page', $taxonomy_object->object_type)) {
+				foreach ($taxonomy_object->object_type as $object_type) {
+					$_object_type = get_post_type_object($object_type);
 
 					// Grab the first one.
-					if ( ! empty( $_object_type->has_archive ) ) {
-						$posts_page = get_post_type_archive_link( $object_type );
+					if ( ! empty($_object_type->has_archive)) {
+						$posts_page = get_post_type_archive_link($object_type);
 						break;
 					}
 				}
 			}
 
 			// Fallback for the 'All' link is the posts page.
-			if ( ! $posts_page ) {
-				if ( 'page' == get_option( 'show_on_front' ) && get_option( 'page_for_posts' ) ) {
-					$posts_page = get_permalink( get_option( 'page_for_posts' ) );
+			if ( ! $posts_page) {
+				if ('page' == get_option('show_on_front') && get_option('page_for_posts')) {
+					$posts_page = get_permalink(get_option('page_for_posts'));
 				} else {
-					$posts_page = home_url( '/' );
+					$posts_page = home_url('/');
 				}
 			}
 
-			$posts_page = esc_url( $posts_page );
-			if ( 'list' == $r['style'] ) {
+			$posts_page = esc_url($posts_page);
+			if ('list' == $r['style']) {
 				$output .= "<li class='cat-item-all'><a href='$posts_page'>$show_option_all</a></li>";
 			} else {
 				$output .= "<a href='$posts_page'>$show_option_all</a>";
 			}
 		}
 
-		if ( empty( $r['current_category'] ) && ( is_category() || is_tax() || is_tag() ) ) {
+		if (empty($r['current_category']) && (is_category() || is_tax() || is_tag())) {
 			$current_term_object = get_queried_object();
-			if ( $current_term_object && $r['taxonomy'] === $current_term_object->taxonomy ) {
+			if ($current_term_object && $r['taxonomy'] === $current_term_object->taxonomy) {
 				$r['current_category'] = get_queried_object_id();
 			}
 		}
 
-		if ( $r['hierarchical'] ) {
+		if ($r['hierarchical']) {
 			$depth = $r['depth'];
 		} else {
 			$depth = -1; // Flat.
 		}
-		$output .= walk_category_tree( $categories, $depth, $r );
+		$output .= walk_category_tree($categories, $depth, $r);
 	}
 
-	if ( $r['title_li'] && 'list' == $r['style'] && ( ! empty( $categories ) || ! $r['hide_title_if_empty'] ) ) {
+	if ($r['title_li'] && 'list' == $r['style'] && ( ! empty($categories) || ! $r['hide_title_if_empty'])) {
 		$output .= '</ul></li>';
 	}
 
@@ -631,9 +631,9 @@ 
 	 * @param string $output HTML output.
 	 * @param array  $args   An array of taxonomy-listing arguments.
 	 */
-	$html = apply_filters( 'wp_list_categories', $output, $args );
+	$html = apply_filters('wp_list_categories', $output, $args);
 
-	if ( $r['echo'] ) {
+	if ($r['echo']) {
 		echo $html;
 	} else {
 		return $html;
@@ -674,32 +674,32 @@ 
  * @return void|array Generated tag cloud, only if no failures and 'array' is set for the 'format' argument.
  *                    Otherwise, this function outputs the tag cloud.
  */
-function wp_tag_cloud( $args = '' ) {
+function wp_tag_cloud($args = '') {
 	$defaults = array(
 		'smallest' => 8, 'largest' => 22, 'unit' => 'pt', 'number' => 45,
 		'format' => 'flat', 'separator' => "\n", 'orderby' => 'name', 'order' => 'ASC',
 		'exclude' => '', 'include' => '', 'link' => 'view', 'taxonomy' => 'post_tag', 'post_type' => '', 'echo' => true
 	);
-	$args = wp_parse_args( $args, $defaults );
+	$args = wp_parse_args($args, $defaults);
 
-	$tags = get_terms( $args['taxonomy'], array_merge( $args, array( 'orderby' => 'count', 'order' => 'DESC' ) ) ); // Always query top tags
+	$tags = get_terms($args['taxonomy'], array_merge($args, array('orderby' => 'count', 'order' => 'DESC'))); // Always query top tags
 
-	if ( empty( $tags ) || is_wp_error( $tags ) )
+	if (empty($tags) || is_wp_error($tags))
 		return;
 
-	foreach ( $tags as $key => $tag ) {
-		if ( 'edit' == $args['link'] )
-			$link = get_edit_term_link( $tag->term_id, $tag->taxonomy, $args['post_type'] );
+	foreach ($tags as $key => $tag) {
+		if ('edit' == $args['link'])
+			$link = get_edit_term_link($tag->term_id, $tag->taxonomy, $args['post_type']);
 		else
-			$link = get_term_link( intval($tag->term_id), $tag->taxonomy );
-		if ( is_wp_error( $link ) )
+			$link = get_term_link(intval($tag->term_id), $tag->taxonomy);
+		if (is_wp_error($link))
 			return;
 
-		$tags[ $key ]->link = $link;
-		$tags[ $key ]->id = $tag->term_id;
+		$tags[$key]->link = $link;
+		$tags[$key]->id = $tag->term_id;
 	}
 
-	$return = wp_generate_tag_cloud( $tags, $args ); // Here's where those top tags get sorted according to $args
+	$return = wp_generate_tag_cloud($tags, $args); // Here's where those top tags get sorted according to $args
 
 	/**
 	 * Filters the tag cloud output.
@@ -709,9 +709,9 @@ 
 	 * @param string $return HTML output of the tag cloud.
 	 * @param array  $args   An array of tag cloud arguments.
 	 */
-	$return = apply_filters( 'wp_tag_cloud', $return, $args );
+	$return = apply_filters('wp_tag_cloud', $return, $args);
 
-	if ( 'array' == $args['format'] || empty($args['echo']) )
+	if ('array' == $args['format'] || empty($args['echo']))
 		return $return;
 
 	echo $return;
@@ -725,7 +725,7 @@ 
  * @param int $count Number of posts with that tag.
  * @return int Scaled count.
  */
-function default_topic_count_scale( $count ) {
+function default_topic_count_scale($count) {
 	return round(log10($count + 1) * 100);
 }
 
@@ -772,7 +772,7 @@ 
  * }
  * @return string|array Tag cloud as a string or an array, depending on 'format' argument.
  */
-function wp_generate_tag_cloud( $tags, $args = '' ) {
+function wp_generate_tag_cloud($tags, $args = '') {
 	$defaults = array(
 		'smallest' => 8, 'largest' => 22, 'unit' => 'pt', 'number' => 0,
 		'format' => 'flat', 'separator' => "\n", 'orderby' => 'name', 'order' => 'ASC',
@@ -780,31 +780,31 @@ 
 		'topic_count_scale_callback' => 'default_topic_count_scale', 'filter' => 1,
 	);
 
-	$args = wp_parse_args( $args, $defaults );
+	$args = wp_parse_args($args, $defaults);
 
-	$return = ( 'array' === $args['format'] ) ? array() : '';
+	$return = ('array' === $args['format']) ? array() : '';
 
-	if ( empty( $tags ) ) {
+	if (empty($tags)) {
 		return $return;
 	}
 
 	// Juggle topic count tooltips:
-	if ( isset( $args['topic_count_text'] ) ) {
+	if (isset($args['topic_count_text'])) {
 		// First look for nooped plural support via topic_count_text.
 		$translate_nooped_plural = $args['topic_count_text'];
-	} elseif ( ! empty( $args['topic_count_text_callback'] ) ) {
+	} elseif ( ! empty($args['topic_count_text_callback'])) {
 		// Look for the alternative callback style. Ignore the previous default.
-		if ( $args['topic_count_text_callback'] === 'default_topic_count_text' ) {
-			$translate_nooped_plural = _n_noop( '%s topic', '%s topics' );
+		if ($args['topic_count_text_callback'] === 'default_topic_count_text') {
+			$translate_nooped_plural = _n_noop('%s topic', '%s topics');
 		} else {
 			$translate_nooped_plural = false;
 		}
-	} elseif ( isset( $args['single_text'] ) && isset( $args['multiple_text'] ) ) {
+	} elseif (isset($args['single_text']) && isset($args['multiple_text'])) {
 		// If no callback exists, look for the old-style single_text and multiple_text arguments.
-		$translate_nooped_plural = _n_noop( $args['single_text'], $args['multiple_text'] );
+		$translate_nooped_plural = _n_noop($args['single_text'], $args['multiple_text']);
 	} else {
 		// This is the default for when no callback, plural, or argument is passed in.
-		$translate_nooped_plural = _n_noop( '%s topic', '%s topics' );
+		$translate_nooped_plural = _n_noop('%s topic', '%s topics');
 	}
 
 	/**
@@ -815,62 +815,62 @@ 
 	 * @param array $tags Ordered array of terms.
 	 * @param array $args An array of tag cloud arguments.
 	 */
-	$tags_sorted = apply_filters( 'tag_cloud_sort', $tags, $args );
-	if ( empty( $tags_sorted ) ) {
+	$tags_sorted = apply_filters('tag_cloud_sort', $tags, $args);
+	if (empty($tags_sorted)) {
 		return $return;
 	}
 
-	if ( $tags_sorted !== $tags ) {
+	if ($tags_sorted !== $tags) {
 		$tags = $tags_sorted;
-		unset( $tags_sorted );
+		unset($tags_sorted);
 	} else {
-		if ( 'RAND' === $args['order'] ) {
-			shuffle( $tags );
+		if ('RAND' === $args['order']) {
+			shuffle($tags);
 		} else {
 			// SQL cannot save you; this is a second (potentially different) sort on a subset of data.
-			if ( 'name' === $args['orderby'] ) {
-				uasort( $tags, '_wp_object_name_sort_cb' );
+			if ('name' === $args['orderby']) {
+				uasort($tags, '_wp_object_name_sort_cb');
 			} else {
-				uasort( $tags, '_wp_object_count_sort_cb' );
+				uasort($tags, '_wp_object_count_sort_cb');
 			}
 
-			if ( 'DESC' === $args['order'] ) {
-				$tags = array_reverse( $tags, true );
+			if ('DESC' === $args['order']) {
+				$tags = array_reverse($tags, true);
 			}
 		}
 	}
 
-	if ( $args['number'] > 0 )
-		$tags = array_slice( $tags, 0, $args['number'] );
+	if ($args['number'] > 0)
+		$tags = array_slice($tags, 0, $args['number']);
 
 	$counts = array();
 	$real_counts = array(); // For the alt tag
-	foreach ( (array) $tags as $key => $tag ) {
-		$real_counts[ $key ] = $tag->count;
-		$counts[ $key ] = call_user_func( $args['topic_count_scale_callback'], $tag->count );
+	foreach ((array) $tags as $key => $tag) {
+		$real_counts[$key] = $tag->count;
+		$counts[$key] = call_user_func($args['topic_count_scale_callback'], $tag->count);
 	}
 
-	$min_count = min( $counts );
-	$spread = max( $counts ) - $min_count;
-	if ( $spread <= 0 )
+	$min_count = min($counts);
+	$spread = max($counts) - $min_count;
+	if ($spread <= 0)
 		$spread = 1;
 	$font_spread = $args['largest'] - $args['smallest'];
-	if ( $font_spread < 0 )
+	if ($font_spread < 0)
 		$font_spread = 1;
 	$font_step = $font_spread / $spread;
 
 	// Assemble the data that will be used to generate the tag cloud markup.
 	$tags_data = array();
-	foreach ( $tags as $key => $tag ) {
-		$tag_id = isset( $tag->id ) ? $tag->id : $key;
+	foreach ($tags as $key => $tag) {
+		$tag_id = isset($tag->id) ? $tag->id : $key;
 
-		$count = $counts[ $key ];
-		$real_count = $real_counts[ $key ];
+		$count = $counts[$key];
+		$real_count = $real_counts[$key];
 
-		if ( $translate_nooped_plural ) {
-			$title = sprintf( translate_nooped_plural( $translate_nooped_plural, $real_count ), number_format_i18n( $real_count ) );
+		if ($translate_nooped_plural) {
+			$title = sprintf(translate_nooped_plural($translate_nooped_plural, $real_count), number_format_i18n($real_count));
 		} else {
-			$title = call_user_func( $args['topic_count_text_callback'], $real_count, $tag, $args );
+			$title = call_user_func($args['topic_count_text_callback'], $real_count, $tag, $args);
 		}
 
 		$tags_data[] = array(
@@ -881,8 +881,8 @@ 
 			'title'      => $title,
 			'slug'       => $tag->slug,
 			'real_count' => $real_count,
-			'class'	     => 'tag-link-' . $tag_id,
-			'font_size'  => $args['smallest'] + ( $count - $min_count ) * $font_step,
+			'class'	     => 'tag-link-'.$tag_id,
+			'font_size'  => $args['smallest'] + ($count - $min_count) * $font_step,
 		);
 	}
 
@@ -893,31 +893,31 @@ 
 	 *
 	 * @param array $tags_data An array of term data for term used to generate the tag cloud.
 	 */
-	$tags_data = apply_filters( 'wp_generate_tag_cloud_data', $tags_data );
+	$tags_data = apply_filters('wp_generate_tag_cloud_data', $tags_data);
 
 	$a = array();
 
 	// generate the output links array
-	foreach ( $tags_data as $key => $tag_data ) {
-		$class = $tag_data['class'] . ' tag-link-position-' . ( $key + 1 );
-		$a[] = "<a href='" . esc_url( $tag_data['url'] ) . "'" . $tag_data['role'] . " class='" . esc_attr( $class ) . "' title='" . esc_attr( $tag_data['title'] ) . "' style='font-size: " . esc_attr( str_replace( ',', '.', $tag_data['font_size'] ) . $args['unit'] ) . ";'>" . esc_html( $tag_data['name'] ) . "</a>";
+	foreach ($tags_data as $key => $tag_data) {
+		$class = $tag_data['class'].' tag-link-position-'.($key + 1);
+		$a[] = "<a href='".esc_url($tag_data['url'])."'".$tag_data['role']." class='".esc_attr($class)."' title='".esc_attr($tag_data['title'])."' style='font-size: ".esc_attr(str_replace(',', '.', $tag_data['font_size']).$args['unit']).";'>".esc_html($tag_data['name'])."</a>";
 	}
 
-	switch ( $args['format'] ) {
+	switch ($args['format']) {
 		case 'array' :
-			$return =& $a;
+			$return = & $a;
 			break;
 		case 'list' :
 			$return = "<ul class='wp-tag-cloud'>\n\t<li>";
-			$return .= join( "</li>\n\t<li>", $a );
+			$return .= join("</li>\n\t<li>", $a);
 			$return .= "</li>\n</ul>\n";
 			break;
 		default :
-			$return = join( $args['separator'], $a );
+			$return = join($args['separator'], $a);
 			break;
 	}
 
-	if ( $args['filter'] ) {
+	if ($args['filter']) {
 		/**
 		 * Filters the generated output of a tag cloud.
 		 *
@@ -934,7 +934,7 @@ 
 		 * @param array        $tags   An array of terms used in the tag cloud.
 		 * @param array        $args   An array of wp_generate_tag_cloud() arguments.
 		 */
-		return apply_filters( 'wp_generate_tag_cloud', $return, $tags, $args );
+		return apply_filters('wp_generate_tag_cloud', $return, $tags, $args);
 	}
 
 	else
@@ -954,8 +954,8 @@ 
  * @return int Negative number if `$a->name` is less than `$b->name`, zero if they are equal,
  *             or greater than zero if `$a->name` is greater than `$b->name`.
  */
-function _wp_object_name_sort_cb( $a, $b ) {
-	return strnatcasecmp( $a->name, $b->name );
+function _wp_object_name_sort_cb($a, $b) {
+	return strnatcasecmp($a->name, $b->name);
 }
 
 /**
@@ -970,8 +970,8 @@ 
  * @param object $b The second object to compare.
  * @return bool Whether the count value for `$a` is greater than the count value for `$b`.
  */
-function _wp_object_count_sort_cb( $a, $b ) {
-	return ( $a->count > $b->count );
+function _wp_object_count_sort_cb($a, $b) {
+	return ($a->count > $b->count);
 }
 
 //
@@ -989,12 +989,12 @@ 
 function walk_category_tree() {
 	$args = func_get_args();
 	// the user's options are the third parameter
-	if ( empty( $args[2]['walker'] ) || ! ( $args[2]['walker'] instanceof Walker ) ) {
+	if (empty($args[2]['walker']) || ! ($args[2]['walker'] instanceof Walker)) {
 		$walker = new Walker_Category;
 	} else {
 		$walker = $args[2]['walker'];
 	}
-	return call_user_func_array( array( $walker, 'walk' ), $args );
+	return call_user_func_array(array($walker, 'walk'), $args);
 }
 
 /**
@@ -1008,12 +1008,12 @@ 
 function walk_category_dropdown_tree() {
 	$args = func_get_args();
 	// the user's options are the third parameter
-	if ( empty( $args[2]['walker'] ) || ! ( $args[2]['walker'] instanceof Walker ) ) {
+	if (empty($args[2]['walker']) || ! ($args[2]['walker'] instanceof Walker)) {
 		$walker = new Walker_CategoryDropdown;
 	} else {
 		$walker = $args[2]['walker'];
 	}
-	return call_user_func_array( array( $walker, 'walk' ), $args );
+	return call_user_func_array(array($walker, 'walk'), $args);
 }
 
 //
@@ -1029,13 +1029,13 @@ 
  * @param int|object $tag Tag ID or object.
  * @return string Link on success, empty string if tag does not exist.
  */
-function get_tag_link( $tag ) {
-	if ( ! is_object( $tag ) )
+function get_tag_link($tag) {
+	if ( ! is_object($tag))
 		$tag = (int) $tag;
 
-	$tag = get_term_link( $tag, 'post_tag' );
+	$tag = get_term_link($tag, 'post_tag');
 
-	if ( is_wp_error( $tag ) )
+	if (is_wp_error($tag))
 		return '';
 
 	return $tag;
@@ -1049,7 +1049,7 @@ 
  * @param int $id Post ID.
  * @return array|false|WP_Error Array of tag objects on success, false on failure.
  */
-function get_the_tags( $id = 0 ) {
+function get_the_tags($id = 0) {
 
 	/**
 	 * Filters the array of tags for the given post.
@@ -1060,7 +1060,7 @@ 
 	 *
 	 * @param array $terms An array of tags for the given post.
 	 */
-	return apply_filters( 'get_the_tags', get_the_terms( $id, 'post_tag' ) );
+	return apply_filters('get_the_tags', get_the_terms($id, 'post_tag'));
 }
 
 /**
@@ -1074,7 +1074,7 @@ 
  * @param int $id Optional. Post ID. Defaults to the current post.
  * @return string|false|WP_Error A list of tags on success, false if there are no terms, WP_Error on failure.
  */
-function get_the_tag_list( $before = '', $sep = '', $after = '', $id = 0 ) {
+function get_the_tag_list($before = '', $sep = '', $after = '', $id = 0) {
 
 	/**
 	 * Filters the tags list for a given post.
@@ -1087,7 +1087,7 @@ 
 	 * @param string $after    String to use after tags.
 	 * @param int    $id       Post ID.
 	 */
-	return apply_filters( 'the_tags', get_the_term_list( $id, 'post_tag', $before, $sep, $after ), $before, $sep, $after, $id );
+	return apply_filters('the_tags', get_the_term_list($id, 'post_tag', $before, $sep, $after), $before, $sep, $after, $id);
 }
 
 /**
@@ -1099,13 +1099,13 @@ 
  * @param string $sep Optional. Separate items using this.
  * @param string $after Optional. After list.
  */
-function the_tags( $before = null, $sep = ', ', $after = '' ) {
-	if ( null === $before )
+function the_tags($before = null, $sep = ', ', $after = '') {
+	if (null === $before)
 		$before = __('Tags: ');
 
-	$the_tags = get_the_tag_list( $before, $sep, $after );
+	$the_tags = get_the_tag_list($before, $sep, $after);
 
-	if ( ! is_wp_error( $the_tags ) ) {
+	if ( ! is_wp_error($the_tags)) {
 		echo $the_tags;
 	}
 }
@@ -1118,8 +1118,8 @@ 
  * @param int $tag Optional. Tag ID. Will use global tag ID by default.
  * @return string Tag description, available.
  */
-function tag_description( $tag = 0 ) {
-	return term_description( $tag );
+function tag_description($tag = 0) {
+	return term_description($tag);
 }
 
 /**
@@ -1131,16 +1131,16 @@ 
  * @param string $taxonomy Optional taxonomy name. Defaults to 'post_tag'.
  * @return string Term description, available.
  */
-function term_description( $term = 0, $taxonomy = 'post_tag' ) {
-	if ( ! $term && ( is_tax() || is_tag() || is_category() ) ) {
+function term_description($term = 0, $taxonomy = 'post_tag') {
+	if ( ! $term && (is_tax() || is_tag() || is_category())) {
 		$term = get_queried_object();
-		if ( $term ) {
+		if ($term) {
 			$taxonomy = $term->taxonomy;
 			$term = $term->term_id;
 		}
 	}
-	$description = get_term_field( 'description', $term, $taxonomy );
-	return is_wp_error( $description ) ? '' : $description;
+	$description = get_term_field('description', $term, $taxonomy);
+	return is_wp_error($description) ? '' : $description;
 }
 
 /**
@@ -1153,16 +1153,16 @@ 
  * @return array|false|WP_Error Array of WP_Term objects on success, false if there are no terms
  *                              or the post does not exist, WP_Error on failure.
  */
-function get_the_terms( $post, $taxonomy ) {
-	if ( ! $post = get_post( $post ) )
+function get_the_terms($post, $taxonomy) {
+	if ( ! $post = get_post($post))
 		return false;
 
-	$terms = get_object_term_cache( $post->ID, $taxonomy );
-	if ( false === $terms ) {
-		$terms = wp_get_object_terms( $post->ID, $taxonomy );
-		if ( ! is_wp_error( $terms ) ) {
-			$term_ids = wp_list_pluck( $terms, 'term_id' );
-			wp_cache_add( $post->ID, $term_ids, $taxonomy . '_relationships' );
+	$terms = get_object_term_cache($post->ID, $taxonomy);
+	if (false === $terms) {
+		$terms = wp_get_object_terms($post->ID, $taxonomy);
+		if ( ! is_wp_error($terms)) {
+			$term_ids = wp_list_pluck($terms, 'term_id');
+			wp_cache_add($post->ID, $term_ids, $taxonomy.'_relationships');
 		}
 	}
 
@@ -1175,9 +1175,9 @@ 
 	 * @param int            $post_id  Post ID.
 	 * @param string         $taxonomy Name of the taxonomy.
 	 */
-	$terms = apply_filters( 'get_the_terms', $terms, $post->ID, $taxonomy );
+	$terms = apply_filters('get_the_terms', $terms, $post->ID, $taxonomy);
 
-	if ( empty( $terms ) )
+	if (empty($terms))
 		return false;
 
 	return $terms;
@@ -1195,23 +1195,23 @@ 
  * @param string $after Optional. After list.
  * @return string|false|WP_Error A list of terms on success, false if there are no terms, WP_Error on failure.
  */
-function get_the_term_list( $id, $taxonomy, $before = '', $sep = '', $after = '' ) {
-	$terms = get_the_terms( $id, $taxonomy );
+function get_the_term_list($id, $taxonomy, $before = '', $sep = '', $after = '') {
+	$terms = get_the_terms($id, $taxonomy);
 
-	if ( is_wp_error( $terms ) )
+	if (is_wp_error($terms))
 		return $terms;
 
-	if ( empty( $terms ) )
+	if (empty($terms))
 		return false;
 
 	$links = array();
 
-	foreach ( $terms as $term ) {
-		$link = get_term_link( $term, $taxonomy );
-		if ( is_wp_error( $link ) ) {
+	foreach ($terms as $term) {
+		$link = get_term_link($term, $taxonomy);
+		if (is_wp_error($link)) {
 			return $link;
 		}
-		$links[] = '<a href="' . esc_url( $link ) . '" rel="tag">' . $term->name . '</a>';
+		$links[] = '<a href="'.esc_url($link).'" rel="tag">'.$term->name.'</a>';
 	}
 
 	/**
@@ -1224,9 +1224,9 @@ 
 	 *
 	 * @param array $links An array of term links.
 	 */
-	$term_links = apply_filters( "term_links-{$taxonomy}", $links );
+	$term_links = apply_filters("term_links-{$taxonomy}", $links);
 
-	return $before . join( $sep, $term_links ) . $after;
+	return $before.join($sep, $term_links).$after;
 }
 
 /**
@@ -1247,15 +1247,15 @@ 
  * }
  * @return string|WP_Error A list of term parents on success, WP_Error or empty string on failure.
  */
-function get_term_parents_list( $term_id, $taxonomy, $args = array() ) {
+function get_term_parents_list($term_id, $taxonomy, $args = array()) {
 	$list = '';
-	$term = get_term( $term_id, $taxonomy );
+	$term = get_term($term_id, $taxonomy);
 
-	if ( is_wp_error( $term ) ) {
+	if (is_wp_error($term)) {
 		return $term;
 	}
 
-	if ( ! $term ) {
+	if ( ! $term) {
 		return $list;
 	}
 
@@ -1268,26 +1268,26 @@ 
 		'inclusive' => true,
 	);
 
-	$args = wp_parse_args( $args, $defaults );
+	$args = wp_parse_args($args, $defaults);
 
-	foreach ( array( 'link', 'inclusive' ) as $bool ) {
-		$args[ $bool ] = wp_validate_boolean( $args[ $bool ] );
+	foreach (array('link', 'inclusive') as $bool) {
+		$args[$bool] = wp_validate_boolean($args[$bool]);
 	}
 
-	$parents = get_ancestors( $term_id, $taxonomy, 'taxonomy' );
+	$parents = get_ancestors($term_id, $taxonomy, 'taxonomy');
 
-	if ( $args['inclusive'] ) {
-		array_unshift( $parents, $term_id );
+	if ($args['inclusive']) {
+		array_unshift($parents, $term_id);
 	}
 
-	foreach ( array_reverse( $parents ) as $term_id ) {
-		$parent = get_term( $term_id, $taxonomy );
-		$name   = ( 'slug' === $args['format'] ) ? $parent->slug : $parent->name;
+	foreach (array_reverse($parents) as $term_id) {
+		$parent = get_term($term_id, $taxonomy);
+		$name   = ('slug' === $args['format']) ? $parent->slug : $parent->name;
 
-		if ( $args['link'] ) {
-			$list .= '<a href="' . esc_url( get_term_link( $parent->term_id, $taxonomy ) ) . '">' . $name . '</a>' . $args['separator'];
+		if ($args['link']) {
+			$list .= '<a href="'.esc_url(get_term_link($parent->term_id, $taxonomy)).'">'.$name.'</a>'.$args['separator'];
 		} else {
-			$list .= $name . $args['separator'];
+			$list .= $name.$args['separator'];
 		}
 	}
 
@@ -1306,10 +1306,10 @@ 
  * @param string $after Optional. After list.
  * @return false|void False on WordPress error.
  */
-function the_terms( $id, $taxonomy, $before = '', $sep = ', ', $after = '' ) {
-	$term_list = get_the_term_list( $id, $taxonomy, $before, $sep, $after );
+function the_terms($id, $taxonomy, $before = '', $sep = ', ', $after = '') {
+	$term_list = get_the_term_list($id, $taxonomy, $before, $sep, $after);
 
-	if ( is_wp_error( $term_list ) )
+	if (is_wp_error($term_list))
 		return false;
 
 	/**
@@ -1323,7 +1323,7 @@ 
 	 * @param string $sep       String to use between the terms.
 	 * @param string $after     String to use after the terms.
 	 */
-	echo apply_filters( 'the_terms', $term_list, $taxonomy, $before, $sep, $after );
+	echo apply_filters('the_terms', $term_list, $taxonomy, $before, $sep, $after);
 }
 
 /**
@@ -1335,8 +1335,8 @@ 
  * @param int|object $post Optional. Post to check instead of the current post.
  * @return bool True if the current post has any of the given categories (or any category, if no category specified).
  */
-function has_category( $category = '', $post = null ) {
-	return has_term( $category, 'category', $post );
+function has_category($category = '', $post = null) {
+	return has_term($category, 'category', $post);
 }
 
 /**
@@ -1356,8 +1356,8 @@ 
  * @param int|object $post Optional. Post to check instead of the current post. (since 2.7.0)
  * @return bool True if the current post has any of the given tags (or any tag, if no tag specified).
  */
-function has_tag( $tag = '', $post = null ) {
-	return has_term( $tag, 'post_tag', $post );
+function has_tag($tag = '', $post = null) {
+	return has_term($tag, 'post_tag', $post);
 }
 
 /**
@@ -1374,14 +1374,14 @@ 
  * @param int|object $post Optional. Post to check instead of the current post.
  * @return bool True if the current post has any of the given tags (or any tag, if no tag specified).
  */
-function has_term( $term = '', $taxonomy = '', $post = null ) {
+function has_term($term = '', $taxonomy = '', $post = null) {
 	$post = get_post($post);
 
-	if ( !$post )
+	if ( ! $post)
 		return false;
 
-	$r = is_object_in_term( $post->ID, $taxonomy, $term );
-	if ( is_wp_error( $r ) )
+	$r = is_object_in_term($post->ID, $taxonomy, $term);
+	if (is_wp_error($r))
 		return false;
 
 	return $r;

Braces +92 added lines, -64 removed lines

@@ -17,13 +17,15 @@ 
  * @return string Link on success, empty string if category does not exist.
  */
 function get_category_link( $category ) {
-	if ( ! is_object( $category ) )
-		$category = (int) $category;
+	if ( ! is_object( $category ) ) {
+			$category = (int) $category;
+	}
 
 	$category = get_term_link( $category, 'category' );
 
-	if ( is_wp_error( $category ) )
-		return '';
+	if ( is_wp_error( $category ) ) {
+			return '';
+	}
 
 	return $category;
 }
@@ -73,8 +75,9 @@ 
  */
 function get_the_category( $id = false ) {
 	$categories = get_the_terms( $id, 'category' );
-	if ( ! $categories || is_wp_error( $categories ) )
-		$categories = array();
+	if ( ! $categories || is_wp_error( $categories ) ) {
+			$categories = array();
+	}
 
 	$categories = array_values( $categories );
 
@@ -106,8 +109,9 @@ 
 	$cat_ID = (int) $cat_ID;
 	$category = get_term( $cat_ID, 'category' );
 
-	if ( is_wp_error( $category ) )
-		return $category;
+	if ( is_wp_error( $category ) ) {
+			return $category;
+	}
 
 	return ( $category ) ? $category->name : '';
 }
@@ -156,14 +160,16 @@ 
 			$thelist .= "\n\t<li>";
 			switch ( strtolower( $parents ) ) {
 				case 'multiple':
-					if ( $category->parent )
-						$thelist .= get_category_parents( $category->parent, true, $separator );
+					if ( $category->parent ) {
+											$thelist .= get_category_parents( $category->parent, true, $separator );
+					}
 					$thelist .= '<a href="' . esc_url( get_category_link( $category->term_id ) ) . '" ' . $rel . '>' . $category->name.'</a></li>';
 					break;
 				case 'single':
 					$thelist .= '<a href="' . esc_url( get_category_link( $category->term_id ) ) . '"  ' . $rel . '>';
-					if ( $category->parent )
-						$thelist .= get_category_parents( $category->parent, false, $separator );
+					if ( $category->parent ) {
+											$thelist .= get_category_parents( $category->parent, false, $separator );
+					}
 					$thelist .= $category->name.'</a></li>';
 					break;
 				case '':
@@ -175,18 +181,21 @@ 
 	} else {
 		$i = 0;
 		foreach ( $categories as $category ) {
-			if ( 0 < $i )
-				$thelist .= $separator;
+			if ( 0 < $i ) {
+							$thelist .= $separator;
+			}
 			switch ( strtolower( $parents ) ) {
 				case 'multiple':
-					if ( $category->parent )
-						$thelist .= get_category_parents( $category->parent, true, $separator );
+					if ( $category->parent ) {
+											$thelist .= get_category_parents( $category->parent, true, $separator );
+					}
 					$thelist .= '<a href="' . esc_url( get_category_link( $category->term_id ) ) . '" ' . $rel . '>' . $category->name.'</a>';
 					break;
 				case 'single':
 					$thelist .= '<a href="' . esc_url( get_category_link( $category->term_id ) ) . '" ' . $rel . '>';
-					if ( $category->parent )
-						$thelist .= get_category_parents( $category->parent, false, $separator );
+					if ( $category->parent ) {
+											$thelist .= get_category_parents( $category->parent, false, $separator );
+					}
 					$thelist .= "$category->name</a>";
 					break;
 				case '':
@@ -229,8 +238,9 @@ 
  * @return bool True if the current post is in any of the given categories.
  */
 function in_category( $category, $post = null ) {
-	if ( empty( $category ) )
-		return false;
+	if ( empty( $category ) ) {
+			return false;
+	}
 
 	return has_category( $category, $post );
 }
@@ -525,8 +535,9 @@ 
 
 	$r = wp_parse_args( $args, $defaults );
 
-	if ( !isset( $r['pad_counts'] ) && $r['show_count'] && $r['hierarchical'] )
-		$r['pad_counts'] = true;
+	if ( !isset( $r['pad_counts'] ) && $r['show_count'] && $r['hierarchical'] ) {
+			$r['pad_counts'] = true;
+	}
 
 	// Descendants of exclusions should be excluded too.
 	if ( true == $r['hierarchical'] ) {
@@ -544,8 +555,9 @@ 
 		$r['exclude'] = '';
 	}
 
-	if ( ! isset( $r['class'] ) )
-		$r['class'] = ( 'category' == $r['taxonomy'] ) ? 'categories' : $r['taxonomy'];
+	if ( ! isset( $r['class'] ) ) {
+			$r['class'] = ( 'category' == $r['taxonomy'] ) ? 'categories' : $r['taxonomy'];
+	}
 
 	if ( ! taxonomy_exists( $r['taxonomy'] ) ) {
 		return false;
@@ -684,16 +696,19 @@ 
 
 	$tags = get_terms( $args['taxonomy'], array_merge( $args, array( 'orderby' => 'count', 'order' => 'DESC' ) ) ); // Always query top tags
 
-	if ( empty( $tags ) || is_wp_error( $tags ) )
-		return;
+	if ( empty( $tags ) || is_wp_error( $tags ) ) {
+			return;
+	}
 
 	foreach ( $tags as $key => $tag ) {
-		if ( 'edit' == $args['link'] )
-			$link = get_edit_term_link( $tag->term_id, $tag->taxonomy, $args['post_type'] );
-		else
-			$link = get_term_link( intval($tag->term_id), $tag->taxonomy );
-		if ( is_wp_error( $link ) )
-			return;
+		if ( 'edit' == $args['link'] ) {
+					$link = get_edit_term_link( $tag->term_id, $tag->taxonomy, $args['post_type'] );
+		} else {
+					$link = get_term_link( intval($tag->term_id), $tag->taxonomy );
+		}
+		if ( is_wp_error( $link ) ) {
+					return;
+		}
 
 		$tags[ $key ]->link = $link;
 		$tags[ $key ]->id = $tag->term_id;
@@ -711,8 +726,9 @@ 
 	 */
 	$return = apply_filters( 'wp_tag_cloud', $return, $args );
 
-	if ( 'array' == $args['format'] || empty($args['echo']) )
-		return $return;
+	if ( 'array' == $args['format'] || empty($args['echo']) ) {
+			return $return;
+	}
 
 	echo $return;
 }
@@ -840,8 +856,9 @@ 
 		}
 	}
 
-	if ( $args['number'] > 0 )
-		$tags = array_slice( $tags, 0, $args['number'] );
+	if ( $args['number'] > 0 ) {
+			$tags = array_slice( $tags, 0, $args['number'] );
+	}
 
 	$counts = array();
 	$real_counts = array(); // For the alt tag
@@ -852,11 +869,13 @@ 
 
 	$min_count = min( $counts );
 	$spread = max( $counts ) - $min_count;
-	if ( $spread <= 0 )
-		$spread = 1;
+	if ( $spread <= 0 ) {
+			$spread = 1;
+	}
 	$font_spread = $args['largest'] - $args['smallest'];
-	if ( $font_spread < 0 )
-		$font_spread = 1;
+	if ( $font_spread < 0 ) {
+			$font_spread = 1;
+	}
 	$font_step = $font_spread / $spread;
 
 	// Assemble the data that will be used to generate the tag cloud markup.
@@ -935,11 +954,10 @@ 
 		 * @param array        $args   An array of wp_generate_tag_cloud() arguments.
 		 */
 		return apply_filters( 'wp_generate_tag_cloud', $return, $tags, $args );
+	} else {
+			return $return;
+	}
 	}
-
-	else
-		return $return;
-}
 
 /**
  * Serves as a callback for comparing objects based on name.
@@ -1030,13 +1048,15 @@ 
  * @return string Link on success, empty string if tag does not exist.
  */
 function get_tag_link( $tag ) {
-	if ( ! is_object( $tag ) )
-		$tag = (int) $tag;
+	if ( ! is_object( $tag ) ) {
+			$tag = (int) $tag;
+	}
 
 	$tag = get_term_link( $tag, 'post_tag' );
 
-	if ( is_wp_error( $tag ) )
-		return '';
+	if ( is_wp_error( $tag ) ) {
+			return '';
+	}
 
 	return $tag;
 }
@@ -1100,8 +1120,9 @@ 
  * @param string $after Optional. After list.
  */
 function the_tags( $before = null, $sep = ', ', $after = '' ) {
-	if ( null === $before )
-		$before = __('Tags: ');
+	if ( null === $before ) {
+			$before = __('Tags: ');
+	}
 
 	$the_tags = get_the_tag_list( $before, $sep, $after );
 
@@ -1154,8 +1175,9 @@ 
  *                              or the post does not exist, WP_Error on failure.
  */
 function get_the_terms( $post, $taxonomy ) {
-	if ( ! $post = get_post( $post ) )
-		return false;
+	if ( ! $post = get_post( $post ) ) {
+			return false;
+	}
 
 	$terms = get_object_term_cache( $post->ID, $taxonomy );
 	if ( false === $terms ) {
@@ -1177,8 +1199,9 @@ 
 	 */
 	$terms = apply_filters( 'get_the_terms', $terms, $post->ID, $taxonomy );
 
-	if ( empty( $terms ) )
-		return false;
+	if ( empty( $terms ) ) {
+			return false;
+	}
 
 	return $terms;
 }
@@ -1198,11 +1221,13 @@ 
 function get_the_term_list( $id, $taxonomy, $before = '', $sep = '', $after = '' ) {
 	$terms = get_the_terms( $id, $taxonomy );
 
-	if ( is_wp_error( $terms ) )
-		return $terms;
+	if ( is_wp_error( $terms ) ) {
+			return $terms;
+	}
 
-	if ( empty( $terms ) )
-		return false;
+	if ( empty( $terms ) ) {
+			return false;
+	}
 
 	$links = array();
 
@@ -1309,8 +1334,9 @@ 
 function the_terms( $id, $taxonomy, $before = '', $sep = ', ', $after = '' ) {
 	$term_list = get_the_term_list( $id, $taxonomy, $before, $sep, $after );
 
-	if ( is_wp_error( $term_list ) )
-		return false;
+	if ( is_wp_error( $term_list ) ) {
+			return false;
+	}
 
 	/**
 	 * Filters the list of terms to display.
@@ -1377,12 +1403,14 @@ 
 function has_term( $term = '', $taxonomy = '', $post = null ) {
 	$post = get_post($post);
 
-	if ( !$post )
-		return false;
+	if ( !$post ) {
+			return false;
+	}
 
 	$r = is_object_in_term( $post->ID, $taxonomy, $term );
-	if ( is_wp_error( $r ) )
-		return false;
+	if ( is_wp_error( $r ) ) {
+			return false;
+	}
 
 	return $r;
 }

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

Doc Comments +5 added lines, -5 removed lines

@@ -400,8 +400,8 @@ 
 	 *
 	 * @since 3.4.0
 	 *
-	 * @param mixed $ajax_message Ajax return
-	 * @param mixed $message UI message
+	 * @param integer $ajax_message Ajax return
+	 * @param string $message UI message
 	 */
 	protected function wp_die( $ajax_message, $message = null ) {
 		if ( $this->doing_ajax() ) {
@@ -444,7 +444,7 @@ 
 	 * @since 3.4.0
 	 * @deprecated 4.7.0
 	 *
-	 * @return callable Die handler.
+	 * @return string Die handler.
 	 */
 	public function wp_die_handler() {
 		_deprecated_function( __METHOD__, '4.7.0' );
@@ -4275,7 +4275,7 @@ 
 	 *
 	 * @param WP_Error $validity
 	 * @param mixed $value
-	 * @return mixed
+	 * @return WP_Error
 	 */
 	public function _validate_header_video( $validity, $value ) {
 		$video = get_attached_file( absint( $value ) );
@@ -4307,7 +4307,7 @@ 
 	 *
 	 * @param WP_Error $validity
 	 * @param mixed $value
-	 * @return mixed
+	 * @return WP_Error
 	 */
 	public function _validate_external_header_video( $validity, $value ) {
 		$video = esc_url_raw( $value );

Spacing +1132 added lines, -1132 removed lines

@@ -109,7 +109,7 @@ 
 	 * @access protected
 	 * @var array
 	 */
-	protected $components = array( 'widgets', 'nav_menus' );
+	protected $components = array('widgets', 'nav_menus');
 
 	/**
 	 * Registered instances of WP_Customize_Section.
@@ -240,72 +240,72 @@ 
 	 *     @type string $messenger_channel Messenger channel. Defaults to customize_messenger_channel query param.
 	 * }
 	 */
-	public function __construct( $args = array() ) {
+	public function __construct($args = array()) {
 
 		$args = array_merge(
-			array_fill_keys( array( 'changeset_uuid', 'theme', 'messenger_channel' ), null ),
+			array_fill_keys(array('changeset_uuid', 'theme', 'messenger_channel'), null),
 			$args
 		);
 
 		// Note that the UUID format will be validated in the setup_theme() method.
-		if ( ! isset( $args['changeset_uuid'] ) ) {
+		if ( ! isset($args['changeset_uuid'])) {
 			$args['changeset_uuid'] = wp_generate_uuid4();
 		}
 
 		// The theme and messenger_channel should be supplied via $args, but they are also looked at in the $_REQUEST global here for back-compat.
-		if ( ! isset( $args['theme'] ) ) {
-			if ( isset( $_REQUEST['customize_theme'] ) ) {
-				$args['theme'] = wp_unslash( $_REQUEST['customize_theme'] );
-			} elseif ( isset( $_REQUEST['theme'] ) ) { // Deprecated.
-				$args['theme'] = wp_unslash( $_REQUEST['theme'] );
+		if ( ! isset($args['theme'])) {
+			if (isset($_REQUEST['customize_theme'])) {
+				$args['theme'] = wp_unslash($_REQUEST['customize_theme']);
+			} elseif (isset($_REQUEST['theme'])) { // Deprecated.
+				$args['theme'] = wp_unslash($_REQUEST['theme']);
 			}
 		}
-		if ( ! isset( $args['messenger_channel'] ) && isset( $_REQUEST['customize_messenger_channel'] ) ) {
-			$args['messenger_channel'] = sanitize_key( wp_unslash( $_REQUEST['customize_messenger_channel'] ) );
+		if ( ! isset($args['messenger_channel']) && isset($_REQUEST['customize_messenger_channel'])) {
+			$args['messenger_channel'] = sanitize_key(wp_unslash($_REQUEST['customize_messenger_channel']));
 		}
 
 		$this->original_stylesheet = get_stylesheet();
-		$this->theme = wp_get_theme( $args['theme'] );
+		$this->theme = wp_get_theme($args['theme']);
 		$this->messenger_channel = $args['messenger_channel'];
 		$this->_changeset_uuid = $args['changeset_uuid'];
 
-		require_once( ABSPATH . WPINC . '/class-wp-customize-setting.php' );
-		require_once( ABSPATH . WPINC . '/class-wp-customize-panel.php' );
-		require_once( ABSPATH . WPINC . '/class-wp-customize-section.php' );
-		require_once( ABSPATH . WPINC . '/class-wp-customize-control.php' );
-
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-color-control.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-media-control.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-upload-control.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-image-control.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-background-image-control.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-background-position-control.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-cropped-image-control.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-site-icon-control.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-header-image-control.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-theme-control.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-widget-area-customize-control.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-widget-form-customize-control.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-control.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-item-control.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-location-control.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-name-control.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-auto-add-control.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-new-menu-control.php' );
-
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menus-panel.php' );
-
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-themes-section.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-sidebar-section.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-section.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-new-menu-section.php' );
-
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-custom-css-setting.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-filter-setting.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-header-image-setting.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-background-image-setting.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-item-setting.php' );
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-nav-menu-setting.php' );
+		require_once(ABSPATH.WPINC.'/class-wp-customize-setting.php');
+		require_once(ABSPATH.WPINC.'/class-wp-customize-panel.php');
+		require_once(ABSPATH.WPINC.'/class-wp-customize-section.php');
+		require_once(ABSPATH.WPINC.'/class-wp-customize-control.php');
+
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-color-control.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-media-control.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-upload-control.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-image-control.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-background-image-control.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-background-position-control.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-cropped-image-control.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-site-icon-control.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-header-image-control.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-theme-control.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-widget-area-customize-control.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-widget-form-customize-control.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-nav-menu-control.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-nav-menu-item-control.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-nav-menu-location-control.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-nav-menu-name-control.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-nav-menu-auto-add-control.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-new-menu-control.php');
+
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-nav-menus-panel.php');
+
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-themes-section.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-sidebar-section.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-nav-menu-section.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-new-menu-section.php');
+
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-custom-css-setting.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-filter-setting.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-header-image-setting.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-background-image-setting.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-nav-menu-item-setting.php');
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-nav-menu-setting.php');
 
 		/**
 		 * Filters the core Customizer components to load.
@@ -322,50 +322,50 @@ 
 		 * @param array                $components List of core components to load.
 		 * @param WP_Customize_Manager $this       WP_Customize_Manager instance.
 		 */
-		$components = apply_filters( 'customize_loaded_components', $this->components, $this );
+		$components = apply_filters('customize_loaded_components', $this->components, $this);
 
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-selective-refresh.php' );
-		$this->selective_refresh = new WP_Customize_Selective_Refresh( $this );
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-selective-refresh.php');
+		$this->selective_refresh = new WP_Customize_Selective_Refresh($this);
 
-		if ( in_array( 'widgets', $components, true ) ) {
-			require_once( ABSPATH . WPINC . '/class-wp-customize-widgets.php' );
-			$this->widgets = new WP_Customize_Widgets( $this );
+		if (in_array('widgets', $components, true)) {
+			require_once(ABSPATH.WPINC.'/class-wp-customize-widgets.php');
+			$this->widgets = new WP_Customize_Widgets($this);
 		}
 
-		if ( in_array( 'nav_menus', $components, true ) ) {
-			require_once( ABSPATH . WPINC . '/class-wp-customize-nav-menus.php' );
-			$this->nav_menus = new WP_Customize_Nav_Menus( $this );
+		if (in_array('nav_menus', $components, true)) {
+			require_once(ABSPATH.WPINC.'/class-wp-customize-nav-menus.php');
+			$this->nav_menus = new WP_Customize_Nav_Menus($this);
 		}
 
-		add_action( 'setup_theme', array( $this, 'setup_theme' ) );
-		add_action( 'wp_loaded',   array( $this, 'wp_loaded' ) );
+		add_action('setup_theme', array($this, 'setup_theme'));
+		add_action('wp_loaded', array($this, 'wp_loaded'));
 
 		// Do not spawn cron (especially the alternate cron) while running the Customizer.
-		remove_action( 'init', 'wp_cron' );
+		remove_action('init', 'wp_cron');
 
 		// Do not run update checks when rendering the controls.
-		remove_action( 'admin_init', '_maybe_update_core' );
-		remove_action( 'admin_init', '_maybe_update_plugins' );
-		remove_action( 'admin_init', '_maybe_update_themes' );
+		remove_action('admin_init', '_maybe_update_core');
+		remove_action('admin_init', '_maybe_update_plugins');
+		remove_action('admin_init', '_maybe_update_themes');
 
-		add_action( 'wp_ajax_customize_save',           array( $this, 'save' ) );
-		add_action( 'wp_ajax_customize_refresh_nonces', array( $this, 'refresh_nonces' ) );
+		add_action('wp_ajax_customize_save', array($this, 'save'));
+		add_action('wp_ajax_customize_refresh_nonces', array($this, 'refresh_nonces'));
 
-		add_action( 'customize_register',                 array( $this, 'register_controls' ) );
-		add_action( 'customize_register',                 array( $this, 'register_dynamic_settings' ), 11 ); // allow code to create settings first
-		add_action( 'customize_controls_init',            array( $this, 'prepare_controls' ) );
-		add_action( 'customize_controls_enqueue_scripts', array( $this, 'enqueue_control_scripts' ) );
+		add_action('customize_register', array($this, 'register_controls'));
+		add_action('customize_register', array($this, 'register_dynamic_settings'), 11); // allow code to create settings first
+		add_action('customize_controls_init', array($this, 'prepare_controls'));
+		add_action('customize_controls_enqueue_scripts', array($this, 'enqueue_control_scripts'));
 
 		// Render Panel, Section, and Control templates.
-		add_action( 'customize_controls_print_footer_scripts', array( $this, 'render_panel_templates' ), 1 );
-		add_action( 'customize_controls_print_footer_scripts', array( $this, 'render_section_templates' ), 1 );
-		add_action( 'customize_controls_print_footer_scripts', array( $this, 'render_control_templates' ), 1 );
+		add_action('customize_controls_print_footer_scripts', array($this, 'render_panel_templates'), 1);
+		add_action('customize_controls_print_footer_scripts', array($this, 'render_section_templates'), 1);
+		add_action('customize_controls_print_footer_scripts', array($this, 'render_control_templates'), 1);
 
 		// Export header video settings with the partial response.
-		add_filter( 'customize_render_partials_response', array( $this, 'export_header_video_settings' ), 10, 3 );
+		add_filter('customize_render_partials_response', array($this, 'export_header_video_settings'), 10, 3);
 
 		// Export the settings to JS via the _wpCustomizeSettings variable.
-		add_action( 'customize_controls_print_footer_scripts', array( $this, 'customize_pane_settings' ), 1000 );
+		add_action('customize_controls_print_footer_scripts', array($this, 'customize_pane_settings'), 1000);
 	}
 
 	/**
@@ -378,19 +378,19 @@ 
 	 * @param string|null $action Whether the supplied Ajax action is being run.
 	 * @return bool True if it's an Ajax request, false otherwise.
 	 */
-	public function doing_ajax( $action = null ) {
-		if ( ! wp_doing_ajax() ) {
+	public function doing_ajax($action = null) {
+		if ( ! wp_doing_ajax()) {
 			return false;
 		}
 
-		if ( ! $action ) {
+		if ( ! $action) {
 			return true;
 		} else {
 			/*
 			 * Note: we can't just use doing_action( "wp_ajax_{$action}" ) because we need
 			 * to check before admin-ajax.php gets to that point.
 			 */
-			return isset( $_REQUEST['action'] ) && wp_unslash( $_REQUEST['action'] ) === $action;
+			return isset($_REQUEST['action']) && wp_unslash($_REQUEST['action']) === $action;
 		}
 	}
 
@@ -403,19 +403,19 @@ 
 	 * @param mixed $ajax_message Ajax return
 	 * @param mixed $message UI message
 	 */
-	protected function wp_die( $ajax_message, $message = null ) {
-		if ( $this->doing_ajax() ) {
-			wp_die( $ajax_message );
+	protected function wp_die($ajax_message, $message = null) {
+		if ($this->doing_ajax()) {
+			wp_die($ajax_message);
 		}
 
-		if ( ! $message ) {
-			$message = __( 'Cheatin’ uh?' );
+		if ( ! $message) {
+			$message = __('Cheatin’ uh?');
 		}
 
-		if ( $this->messenger_channel ) {
+		if ($this->messenger_channel) {
 			ob_start();
 			wp_enqueue_scripts();
-			wp_print_scripts( array( 'customize-base' ) );
+			wp_print_scripts(array('customize-base'));
 
 			$settings = array(
 				'messengerArgs' => array(
@@ -429,13 +429,13 @@ 
 			( function( api, settings ) {
 				var preview = new api.Messenger( settings.messengerArgs );
 				preview.send( 'iframe-loading-error', settings.error );
-			} )( wp.customize, <?php echo wp_json_encode( $settings ) ?> );
+			} )( wp.customize, <?php echo wp_json_encode($settings) ?> );
 			</script>
 			<?php
 			$message .= ob_get_clean();
 		}
 
-		wp_die( $message );
+		wp_die($message);
 	}
 
 	/**
@@ -447,9 +447,9 @@ 
 	 * @return callable Die handler.
 	 */
 	public function wp_die_handler() {
-		_deprecated_function( __METHOD__, '4.7.0' );
+		_deprecated_function(__METHOD__, '4.7.0');
 
-		if ( $this->doing_ajax() || isset( $_POST['customized'] ) ) {
+		if ($this->doing_ajax() || isset($_POST['customized'])) {
 			return '_ajax_wp_die_handler';
 		}
 
@@ -467,21 +467,21 @@ 
 		global $pagenow;
 
 		// Check permissions for customize.php access since this method is called before customize.php can run any code,
-		if ( 'customize.php' === $pagenow && ! current_user_can( 'customize' ) ) {
-			if ( ! is_user_logged_in() ) {
+		if ('customize.php' === $pagenow && ! current_user_can('customize')) {
+			if ( ! is_user_logged_in()) {
 				auth_redirect();
 			} else {
 				wp_die(
-					'<h1>' . __( 'Cheatin&#8217; uh?' ) . '</h1>' .
-					'<p>' . __( 'Sorry, you are not allowed to customize this site.' ) . '</p>',
+					'<h1>'.__('Cheatin&#8217; uh?').'</h1>'.
+					'<p>'.__('Sorry, you are not allowed to customize this site.').'</p>',
 					403
 				);
 			}
 			return;
 		}
 
-		if ( ! preg_match( '/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/', $this->_changeset_uuid ) ) {
-			$this->wp_die( -1, __( 'Invalid changeset UUID' ) );
+		if ( ! preg_match('/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/', $this->_changeset_uuid)) {
+			$this->wp_die( -1, __('Invalid changeset UUID') );
 		}
 
 		/*
@@ -489,37 +489,37 @@ 
 		 * In this way, the UUID serves as a secret key. If the messenger channel is present,
 		 * then send unauthenticated code to prompt re-auth.
 		 */
-		if ( ! current_user_can( 'customize' ) && ! $this->changeset_post_id() ) {
-			$this->wp_die( $this->messenger_channel ? 0 : -1, __( 'Non-existent changeset UUID.' ) );
+		if ( ! current_user_can('customize') && ! $this->changeset_post_id()) {
+			$this->wp_die($this->messenger_channel ? 0 : -1, __('Non-existent changeset UUID.'));
 		}
 
-		if ( ! headers_sent() ) {
+		if ( ! headers_sent()) {
 			send_origin_headers();
 		}
 
 		// Hide the admin bar if we're embedded in the customizer iframe.
-		if ( $this->messenger_channel ) {
-			show_admin_bar( false );
+		if ($this->messenger_channel) {
+			show_admin_bar(false);
 		}
 
-		if ( $this->is_theme_active() ) {
+		if ($this->is_theme_active()) {
 			// Once the theme is loaded, we'll validate it.
-			add_action( 'after_setup_theme', array( $this, 'after_setup_theme' ) );
+			add_action('after_setup_theme', array($this, 'after_setup_theme'));
 		} else {
 			// If the requested theme is not the active theme and the user doesn't have the
 			// switch_themes cap, bail.
-			if ( ! current_user_can( 'switch_themes' ) ) {
-				$this->wp_die( -1, __( 'Sorry, you are not allowed to edit theme options on this site.' ) );
+			if ( ! current_user_can('switch_themes')) {
+				$this->wp_die( -1, __('Sorry, you are not allowed to edit theme options on this site.') );
 			}
 
 			// If the theme has errors while loading, bail.
-			if ( $this->theme()->errors() ) {
+			if ($this->theme()->errors()) {
 				$this->wp_die( -1, $this->theme()->errors()->get_error_message() );
 			}
 
 			// If the theme isn't allowed per multisite settings, bail.
-			if ( ! $this->theme()->is_allowed() ) {
-				$this->wp_die( -1, __( 'The requested theme does not exist.' ) );
+			if ( ! $this->theme()->is_allowed()) {
+				$this->wp_die( -1, __('The requested theme does not exist.') );
 			}
 		}
 
@@ -528,8 +528,8 @@ 
 		 * Import starter content at after_setup_theme:100 so that any
 		 * add_theme_support( 'starter-content' ) calls will have been made.
 		 */
-		if ( get_option( 'fresh_site' ) && 'customize.php' === $pagenow ) {
-			add_action( 'after_setup_theme', array( $this, 'import_theme_starter_content' ), 100 );
+		if (get_option('fresh_site') && 'customize.php' === $pagenow) {
+			add_action('after_setup_theme', array($this, 'import_theme_starter_content'), 100);
 		}
 
 		$this->start_previewing_theme();
@@ -541,9 +541,9 @@ 
 	 * @since 3.4.0
 	 */
 	public function after_setup_theme() {
-		$doing_ajax_or_is_customized = ( $this->doing_ajax() || isset( $_POST['customized'] ) );
-		if ( ! $doing_ajax_or_is_customized && ! validate_current_theme() ) {
-			wp_redirect( 'themes.php?broken=true' );
+		$doing_ajax_or_is_customized = ($this->doing_ajax() || isset($_POST['customized']));
+		if ( ! $doing_ajax_or_is_customized && ! validate_current_theme()) {
+			wp_redirect('themes.php?broken=true');
 			exit;
 		}
 	}
@@ -556,24 +556,24 @@ 
 	 */
 	public function start_previewing_theme() {
 		// Bail if we're already previewing.
-		if ( $this->is_preview() ) {
+		if ($this->is_preview()) {
 			return;
 		}
 
 		$this->previewing = true;
 
-		if ( ! $this->is_theme_active() ) {
-			add_filter( 'template', array( $this, 'get_template' ) );
-			add_filter( 'stylesheet', array( $this, 'get_stylesheet' ) );
-			add_filter( 'pre_option_current_theme', array( $this, 'current_theme' ) );
+		if ( ! $this->is_theme_active()) {
+			add_filter('template', array($this, 'get_template'));
+			add_filter('stylesheet', array($this, 'get_stylesheet'));
+			add_filter('pre_option_current_theme', array($this, 'current_theme'));
 
 			// @link: https://core.trac.wordpress.org/ticket/20027
-			add_filter( 'pre_option_stylesheet', array( $this, 'get_stylesheet' ) );
-			add_filter( 'pre_option_template', array( $this, 'get_template' ) );
+			add_filter('pre_option_stylesheet', array($this, 'get_stylesheet'));
+			add_filter('pre_option_template', array($this, 'get_template'));
 
 			// Handle custom theme roots.
-			add_filter( 'pre_option_stylesheet_root', array( $this, 'get_stylesheet_root' ) );
-			add_filter( 'pre_option_template_root', array( $this, 'get_template_root' ) );
+			add_filter('pre_option_stylesheet_root', array($this, 'get_stylesheet_root'));
+			add_filter('pre_option_template_root', array($this, 'get_template_root'));
 		}
 
 		/**
@@ -583,7 +583,7 @@ 
 		 *
 		 * @param WP_Customize_Manager $this WP_Customize_Manager instance.
 		 */
-		do_action( 'start_previewing_theme', $this );
+		do_action('start_previewing_theme', $this);
 	}
 
 	/**
@@ -594,24 +594,24 @@ 
 	 * @since 3.4.0
 	 */
 	public function stop_previewing_theme() {
-		if ( ! $this->is_preview() ) {
+		if ( ! $this->is_preview()) {
 			return;
 		}
 
 		$this->previewing = false;
 
-		if ( ! $this->is_theme_active() ) {
-			remove_filter( 'template', array( $this, 'get_template' ) );
-			remove_filter( 'stylesheet', array( $this, 'get_stylesheet' ) );
-			remove_filter( 'pre_option_current_theme', array( $this, 'current_theme' ) );
+		if ( ! $this->is_theme_active()) {
+			remove_filter('template', array($this, 'get_template'));
+			remove_filter('stylesheet', array($this, 'get_stylesheet'));
+			remove_filter('pre_option_current_theme', array($this, 'current_theme'));
 
 			// @link: https://core.trac.wordpress.org/ticket/20027
-			remove_filter( 'pre_option_stylesheet', array( $this, 'get_stylesheet' ) );
-			remove_filter( 'pre_option_template', array( $this, 'get_template' ) );
+			remove_filter('pre_option_stylesheet', array($this, 'get_stylesheet'));
+			remove_filter('pre_option_template', array($this, 'get_template'));
 
 			// Handle custom theme roots.
-			remove_filter( 'pre_option_stylesheet_root', array( $this, 'get_stylesheet_root' ) );
-			remove_filter( 'pre_option_template_root', array( $this, 'get_template_root' ) );
+			remove_filter('pre_option_stylesheet_root', array($this, 'get_stylesheet_root'));
+			remove_filter('pre_option_template_root', array($this, 'get_template_root'));
 		}
 
 		/**
@@ -621,7 +621,7 @@ 
 		 *
 		 * @param WP_Customize_Manager $this WP_Customize_Manager instance.
 		 */
-		do_action( 'stop_previewing_theme', $this );
+		do_action('stop_previewing_theme', $this);
 	}
 
 	/**
@@ -644,7 +644,7 @@ 
 	 * @return WP_Theme
 	 */
 	public function theme() {
-		if ( ! $this->theme ) {
+		if ( ! $this->theme) {
 			$this->theme = wp_get_theme();
 		}
 		return $this->theme;
@@ -731,7 +731,7 @@ 
 		 *
 		 * @param WP_Customize_Manager $this WP_Customize_Manager instance.
 		 */
-		do_action( 'customize_register', $this );
+		do_action('customize_register', $this);
 
 		/*
 		 * Note that settings must be previewed here even outside the customizer preview
@@ -741,13 +741,13 @@ 
 		 * may short-circuit because it will detect that there are no changes to
 		 * make.
 		 */
-		if ( ! $this->doing_ajax( 'customize_save' ) ) {
-			foreach ( $this->settings as $setting ) {
+		if ( ! $this->doing_ajax('customize_save')) {
+			foreach ($this->settings as $setting) {
 				$setting->preview();
 			}
 		}
 
-		if ( $this->is_preview() && ! is_admin() ) {
+		if ($this->is_preview() && ! is_admin()) {
 			$this->customize_preview_init();
 		}
 	}
@@ -764,10 +764,10 @@ 
 	 * @param int $status Status.
 	 * @return int
 	 */
-	public function wp_redirect_status( $status ) {
-		_deprecated_function( __FUNCTION__, '4.7.0' );
+	public function wp_redirect_status($status) {
+		_deprecated_function(__FUNCTION__, '4.7.0');
 
-		if ( $this->is_preview() && ! is_admin() ) {
+		if ($this->is_preview() && ! is_admin()) {
 			return 200;
 		}
 
@@ -783,14 +783,14 @@ 
 	 * @param string $uuid Changeset UUID.
 	 * @return int|null Returns post ID on success and null on failure.
 	 */
-	public function find_changeset_post_id( $uuid ) {
+	public function find_changeset_post_id($uuid) {
 		$cache_group = 'customize_changeset_post';
-		$changeset_post_id = wp_cache_get( $uuid, $cache_group );
-		if ( $changeset_post_id && 'customize_changeset' === get_post_type( $changeset_post_id ) ) {
+		$changeset_post_id = wp_cache_get($uuid, $cache_group);
+		if ($changeset_post_id && 'customize_changeset' === get_post_type($changeset_post_id)) {
 			return $changeset_post_id;
 		}
 
-		$changeset_post_query = new WP_Query( array(
+		$changeset_post_query = new WP_Query(array(
 			'post_type' => 'customize_changeset',
 			'post_status' => get_post_stati(),
 			'name' => $uuid,
@@ -800,11 +800,11 @@ 
 			'update_post_meta_cache' => false,
 			'update_post_term_cache' => false,
 			'lazy_load_term_meta' => false,
-		) );
-		if ( ! empty( $changeset_post_query->posts ) ) {
+		));
+		if ( ! empty($changeset_post_query->posts)) {
 			// Note: 'fields'=>'ids' is not being used in order to cache the post object as it will be needed.
 			$changeset_post_id = $changeset_post_query->posts[0]->ID;
-			wp_cache_set( $this->_changeset_uuid, $changeset_post_id, $cache_group );
+			wp_cache_set($this->_changeset_uuid, $changeset_post_id, $cache_group);
 			return $changeset_post_id;
 		}
 
@@ -820,14 +820,14 @@ 
 	 * @return int|null Post ID on success or null if there is no post yet saved.
 	 */
 	public function changeset_post_id() {
-		if ( ! isset( $this->_changeset_post_id ) ) {
-			$post_id = $this->find_changeset_post_id( $this->_changeset_uuid );
-			if ( ! $post_id ) {
+		if ( ! isset($this->_changeset_post_id)) {
+			$post_id = $this->find_changeset_post_id($this->_changeset_uuid);
+			if ( ! $post_id) {
 				$post_id = false;
 			}
 			$this->_changeset_post_id = $post_id;
 		}
-		if ( false === $this->_changeset_post_id ) {
+		if (false === $this->_changeset_post_id) {
 			return null;
 		}
 		return $this->_changeset_post_id;
@@ -842,23 +842,23 @@ 
 	 * @param int $post_id Changeset post ID.
 	 * @return array|WP_Error Changeset data or WP_Error on error.
 	 */
-	protected function get_changeset_post_data( $post_id ) {
-		if ( ! $post_id ) {
-			return new WP_Error( 'empty_post_id' );
+	protected function get_changeset_post_data($post_id) {
+		if ( ! $post_id) {
+			return new WP_Error('empty_post_id');
 		}
-		$changeset_post = get_post( $post_id );
-		if ( ! $changeset_post ) {
-			return new WP_Error( 'missing_post' );
+		$changeset_post = get_post($post_id);
+		if ( ! $changeset_post) {
+			return new WP_Error('missing_post');
 		}
-		if ( 'customize_changeset' !== $changeset_post->post_type ) {
-			return new WP_Error( 'wrong_post_type' );
+		if ('customize_changeset' !== $changeset_post->post_type) {
+			return new WP_Error('wrong_post_type');
 		}
-		$changeset_data = json_decode( $changeset_post->post_content, true );
-		if ( function_exists( 'json_last_error' ) && json_last_error() ) {
-			return new WP_Error( 'json_parse_error', '', json_last_error() );
+		$changeset_data = json_decode($changeset_post->post_content, true);
+		if (function_exists('json_last_error') && json_last_error()) {
+			return new WP_Error('json_parse_error', '', json_last_error());
 		}
-		if ( ! is_array( $changeset_data ) ) {
-			return new WP_Error( 'expected_array' );
+		if ( ! is_array($changeset_data)) {
+			return new WP_Error('expected_array');
 		}
 		return $changeset_data;
 	}
@@ -872,15 +872,15 @@ 
 	 * @return array Changeset data.
 	 */
 	public function changeset_data() {
-		if ( isset( $this->_changeset_data ) ) {
+		if (isset($this->_changeset_data)) {
 			return $this->_changeset_data;
 		}
 		$changeset_post_id = $this->changeset_post_id();
-		if ( ! $changeset_post_id ) {
+		if ( ! $changeset_post_id) {
 			$this->_changeset_data = array();
 		} else {
-			$data = $this->get_changeset_post_data( $changeset_post_id );
-			if ( ! is_wp_error( $data ) ) {
+			$data = $this->get_changeset_post_data($changeset_post_id);
+			if ( ! is_wp_error($data)) {
 				$this->_changeset_data = $data;
 			} else {
 				$this->_changeset_data = array();
@@ -906,173 +906,173 @@ 
 	 *
 	 * @param array $starter_content Starter content. Defaults to `get_theme_starter_content()`.
 	 */
-	function import_theme_starter_content( $starter_content = array() ) {
-		if ( empty( $starter_content ) ) {
+	function import_theme_starter_content($starter_content = array()) {
+		if (empty($starter_content)) {
 			$starter_content = get_theme_starter_content();
 		}
 
 		$changeset_data = array();
-		if ( $this->changeset_post_id() ) {
-			$changeset_data = $this->get_changeset_post_data( $this->changeset_post_id() );
+		if ($this->changeset_post_id()) {
+			$changeset_data = $this->get_changeset_post_data($this->changeset_post_id());
 		}
 
-		$sidebars_widgets = isset( $starter_content['widgets'] ) && ! empty( $this->widgets ) ? $starter_content['widgets'] : array();
-		$attachments = isset( $starter_content['attachments'] ) && ! empty( $this->nav_menus ) ? $starter_content['attachments'] : array();
-		$posts = isset( $starter_content['posts'] ) && ! empty( $this->nav_menus ) ? $starter_content['posts'] : array();
-		$options = isset( $starter_content['options'] ) ? $starter_content['options'] : array();
-		$nav_menus = isset( $starter_content['nav_menus'] ) && ! empty( $this->nav_menus ) ? $starter_content['nav_menus'] : array();
-		$theme_mods = isset( $starter_content['theme_mods'] ) ? $starter_content['theme_mods'] : array();
+		$sidebars_widgets = isset($starter_content['widgets']) && ! empty($this->widgets) ? $starter_content['widgets'] : array();
+		$attachments = isset($starter_content['attachments']) && ! empty($this->nav_menus) ? $starter_content['attachments'] : array();
+		$posts = isset($starter_content['posts']) && ! empty($this->nav_menus) ? $starter_content['posts'] : array();
+		$options = isset($starter_content['options']) ? $starter_content['options'] : array();
+		$nav_menus = isset($starter_content['nav_menus']) && ! empty($this->nav_menus) ? $starter_content['nav_menus'] : array();
+		$theme_mods = isset($starter_content['theme_mods']) ? $starter_content['theme_mods'] : array();
 
 		// Widgets.
 		$max_widget_numbers = array();
-		foreach ( $sidebars_widgets as $sidebar_id => $widgets ) {
+		foreach ($sidebars_widgets as $sidebar_id => $widgets) {
 			$sidebar_widget_ids = array();
-			foreach ( $widgets as $widget ) {
-				list( $id_base, $instance ) = $widget;
+			foreach ($widgets as $widget) {
+				list($id_base, $instance) = $widget;
 
-				if ( ! isset( $max_widget_numbers[ $id_base ] ) ) {
+				if ( ! isset($max_widget_numbers[$id_base])) {
 
 					// When $settings is an array-like object, get an intrinsic array for use with array_keys().
-					$settings = get_option( "widget_{$id_base}", array() );
-					if ( $settings instanceof ArrayObject || $settings instanceof ArrayIterator ) {
+					$settings = get_option("widget_{$id_base}", array());
+					if ($settings instanceof ArrayObject || $settings instanceof ArrayIterator) {
 						$settings = $settings->getArrayCopy();
 					}
 
 					// Find the max widget number for this type.
-					$widget_numbers = array_keys( $settings );
-					if ( count( $widget_numbers ) > 0 ) {
+					$widget_numbers = array_keys($settings);
+					if (count($widget_numbers) > 0) {
 						$widget_numbers[] = 1;
-						$max_widget_numbers[ $id_base ] = call_user_func_array( 'max', $widget_numbers );
+						$max_widget_numbers[$id_base] = call_user_func_array('max', $widget_numbers);
 					} else {
-						$max_widget_numbers[ $id_base ] = 1;
+						$max_widget_numbers[$id_base] = 1;
 					}
 				}
-				$max_widget_numbers[ $id_base ] += 1;
+				$max_widget_numbers[$id_base] += 1;
 
-				$widget_id = sprintf( '%s-%d', $id_base, $max_widget_numbers[ $id_base ] );
-				$setting_id = sprintf( 'widget_%s[%d]', $id_base, $max_widget_numbers[ $id_base ] );
+				$widget_id = sprintf('%s-%d', $id_base, $max_widget_numbers[$id_base]);
+				$setting_id = sprintf('widget_%s[%d]', $id_base, $max_widget_numbers[$id_base]);
 
-				$setting_value = $this->widgets->sanitize_widget_js_instance( $instance );
-				if ( empty( $changeset_data[ $setting_id ] ) || ! empty( $changeset_data[ $setting_id ]['starter_content'] ) ) {
-					$this->set_post_value( $setting_id, $setting_value );
+				$setting_value = $this->widgets->sanitize_widget_js_instance($instance);
+				if (empty($changeset_data[$setting_id]) || ! empty($changeset_data[$setting_id]['starter_content'])) {
+					$this->set_post_value($setting_id, $setting_value);
 					$this->pending_starter_content_settings_ids[] = $setting_id;
 				}
 				$sidebar_widget_ids[] = $widget_id;
 			}
 
-			$setting_id = sprintf( 'sidebars_widgets[%s]', $sidebar_id );
-			if ( empty( $changeset_data[ $setting_id ] ) || ! empty( $changeset_data[ $setting_id ]['starter_content'] ) ) {
-				$this->set_post_value( $setting_id, $sidebar_widget_ids );
+			$setting_id = sprintf('sidebars_widgets[%s]', $sidebar_id);
+			if (empty($changeset_data[$setting_id]) || ! empty($changeset_data[$setting_id]['starter_content'])) {
+				$this->set_post_value($setting_id, $sidebar_widget_ids);
 				$this->pending_starter_content_settings_ids[] = $setting_id;
 			}
 		}
 
 		$starter_content_auto_draft_post_ids = array();
-		if ( ! empty( $changeset_data['nav_menus_created_posts']['value'] ) ) {
-			$starter_content_auto_draft_post_ids = array_merge( $starter_content_auto_draft_post_ids, $changeset_data['nav_menus_created_posts']['value'] );
+		if ( ! empty($changeset_data['nav_menus_created_posts']['value'])) {
+			$starter_content_auto_draft_post_ids = array_merge($starter_content_auto_draft_post_ids, $changeset_data['nav_menus_created_posts']['value']);
 		}
 
 		// Make an index of all the posts needed and what their slugs are.
 		$needed_posts = array();
-		$attachments = $this->prepare_starter_content_attachments( $attachments );
-		foreach ( $attachments as $attachment ) {
-			$key = 'attachment:' . $attachment['post_name'];
-			$needed_posts[ $key ] = true;
-		}
-		foreach ( array_keys( $posts ) as $post_symbol ) {
-			if ( empty( $posts[ $post_symbol ]['post_name'] ) && empty( $posts[ $post_symbol ]['post_title'] ) ) {
-				unset( $posts[ $post_symbol ] );
+		$attachments = $this->prepare_starter_content_attachments($attachments);
+		foreach ($attachments as $attachment) {
+			$key = 'attachment:'.$attachment['post_name'];
+			$needed_posts[$key] = true;
+		}
+		foreach (array_keys($posts) as $post_symbol) {
+			if (empty($posts[$post_symbol]['post_name']) && empty($posts[$post_symbol]['post_title'])) {
+				unset($posts[$post_symbol]);
 				continue;
 			}
-			if ( empty( $posts[ $post_symbol ]['post_name'] ) ) {
-				$posts[ $post_symbol ]['post_name'] = sanitize_title( $posts[ $post_symbol ]['post_title'] );
+			if (empty($posts[$post_symbol]['post_name'])) {
+				$posts[$post_symbol]['post_name'] = sanitize_title($posts[$post_symbol]['post_title']);
 			}
-			if ( empty( $posts[ $post_symbol ]['post_type'] ) ) {
-				$posts[ $post_symbol ]['post_type'] = 'post';
+			if (empty($posts[$post_symbol]['post_type'])) {
+				$posts[$post_symbol]['post_type'] = 'post';
 			}
-			$needed_posts[ $posts[ $post_symbol ]['post_type'] . ':' . $posts[ $post_symbol ]['post_name'] ] = true;
+			$needed_posts[$posts[$post_symbol]['post_type'].':'.$posts[$post_symbol]['post_name']] = true;
 		}
 		$all_post_slugs = array_merge(
-			wp_list_pluck( $attachments, 'post_name' ),
-			wp_list_pluck( $posts, 'post_name' )
+			wp_list_pluck($attachments, 'post_name'),
+			wp_list_pluck($posts, 'post_name')
 		);
 
 		// Re-use auto-draft starter content posts referenced in the current customized state.
 		$existing_starter_content_posts = array();
-		if ( ! empty( $starter_content_auto_draft_post_ids ) ) {
-			$existing_posts_query = new WP_Query( array(
+		if ( ! empty($starter_content_auto_draft_post_ids)) {
+			$existing_posts_query = new WP_Query(array(
 				'post__in' => $starter_content_auto_draft_post_ids,
 				'post_status' => 'auto-draft',
 				'post_type' => 'any',
 				'posts_per_page' => -1,
-			) );
-			foreach ( $existing_posts_query->posts as $existing_post ) {
+			));
+			foreach ($existing_posts_query->posts as $existing_post) {
 				$post_name = $existing_post->post_name;
-				if ( empty( $post_name ) ) {
-					$post_name = get_post_meta( $existing_post->ID, '_customize_draft_post_name', true );
+				if (empty($post_name)) {
+					$post_name = get_post_meta($existing_post->ID, '_customize_draft_post_name', true);
 				}
-				$existing_starter_content_posts[ $existing_post->post_type . ':' . $post_name ] = $existing_post;
+				$existing_starter_content_posts[$existing_post->post_type.':'.$post_name] = $existing_post;
 			}
 		}
 
 		// Re-use non-auto-draft posts.
-		if ( ! empty( $all_post_slugs ) ) {
-			$existing_posts_query = new WP_Query( array(
+		if ( ! empty($all_post_slugs)) {
+			$existing_posts_query = new WP_Query(array(
 				'post_name__in' => $all_post_slugs,
-				'post_status' => array_diff( get_post_stati(), array( 'auto-draft' ) ),
+				'post_status' => array_diff(get_post_stati(), array('auto-draft')),
 				'post_type' => 'any',
 				'posts_per_page' => -1,
-			) );
-			foreach ( $existing_posts_query->posts as $existing_post ) {
-				$key = $existing_post->post_type . ':' . $existing_post->post_name;
-				if ( isset( $needed_posts[ $key ] ) && ! isset( $existing_starter_content_posts[ $key ] ) ) {
-					$existing_starter_content_posts[ $key ] = $existing_post;
+			));
+			foreach ($existing_posts_query->posts as $existing_post) {
+				$key = $existing_post->post_type.':'.$existing_post->post_name;
+				if (isset($needed_posts[$key]) && ! isset($existing_starter_content_posts[$key])) {
+					$existing_starter_content_posts[$key] = $existing_post;
 				}
 			}
 		}
 
 		// Attachments are technically posts but handled differently.
-		if ( ! empty( $attachments ) ) {
+		if ( ! empty($attachments)) {
 
 			$attachment_ids = array();
 
-			foreach ( $attachments as $symbol => $attachment ) {
+			foreach ($attachments as $symbol => $attachment) {
 				$file_array = array(
 					'name' => $attachment['file_name'],
 				);
 				$file_path = $attachment['file_path'];
 				$attachment_id = null;
 				$attached_file = null;
-				if ( isset( $existing_starter_content_posts[ 'attachment:' . $attachment['post_name'] ] ) ) {
-					$attachment_post = $existing_starter_content_posts[ 'attachment:' . $attachment['post_name'] ];
+				if (isset($existing_starter_content_posts['attachment:'.$attachment['post_name']])) {
+					$attachment_post = $existing_starter_content_posts['attachment:'.$attachment['post_name']];
 					$attachment_id = $attachment_post->ID;
-					$attached_file = get_attached_file( $attachment_id );
-					if ( empty( $attached_file ) || ! file_exists( $attached_file ) ) {
+					$attached_file = get_attached_file($attachment_id);
+					if (empty($attached_file) || ! file_exists($attached_file)) {
 						$attachment_id = null;
 						$attached_file = null;
-					} elseif ( $this->get_stylesheet() !== get_post_meta( $attachment_post->ID, '_starter_content_theme', true ) ) {
+					} elseif ($this->get_stylesheet() !== get_post_meta($attachment_post->ID, '_starter_content_theme', true)) {
 
 						// Re-generate attachment metadata since it was previously generated for a different theme.
-						$metadata = wp_generate_attachment_metadata( $attachment_post->ID, $attached_file );
-						wp_update_attachment_metadata( $attachment_id, $metadata );
-						update_post_meta( $attachment_id, '_starter_content_theme', $this->get_stylesheet() );
+						$metadata = wp_generate_attachment_metadata($attachment_post->ID, $attached_file);
+						wp_update_attachment_metadata($attachment_id, $metadata);
+						update_post_meta($attachment_id, '_starter_content_theme', $this->get_stylesheet());
 					}
 				}
 
 				// Insert the attachment auto-draft because it doesn't yet exist or the attached file is gone.
-				if ( ! $attachment_id ) {
+				if ( ! $attachment_id) {
 
 					// Copy file to temp location so that original file won't get deleted from theme after sideloading.
-					$temp_file_name = wp_tempnam( basename( $file_path ) );
-					if ( $temp_file_name && copy( $file_path, $temp_file_name ) ) {
+					$temp_file_name = wp_tempnam(basename($file_path));
+					if ($temp_file_name && copy($file_path, $temp_file_name)) {
 						$file_array['tmp_name'] = $temp_file_name;
 					}
-					if ( empty( $file_array['tmp_name'] ) ) {
+					if (empty($file_array['tmp_name'])) {
 						continue;
 					}
 
 					$attachment_post_data = array_merge(
-						wp_array_slice_assoc( $attachment, array( 'post_title', 'post_content', 'post_excerpt' ) ),
+						wp_array_slice_assoc($attachment, array('post_title', 'post_content', 'post_excerpt')),
 						array(
 							'post_status' => 'auto-draft', // So attachment will be garbage collected in a week if changeset is never published.
 						)
@@ -1081,124 +1081,124 @@ 
 					// In PHP < 5.6 filesize() returns 0 for the temp files unless we clear the file status cache.
 					// Technically, PHP < 5.6.0 || < 5.5.13 || < 5.4.29 but no need to be so targeted.
 					// See https://bugs.php.net/bug.php?id=65701
-					if ( version_compare( PHP_VERSION, '5.6', '<' ) ) {
+					if (version_compare(PHP_VERSION, '5.6', '<')) {
 						clearstatcache();
 					}
 
-					$attachment_id = media_handle_sideload( $file_array, 0, null, $attachment_post_data );
-					if ( is_wp_error( $attachment_id ) ) {
+					$attachment_id = media_handle_sideload($file_array, 0, null, $attachment_post_data);
+					if (is_wp_error($attachment_id)) {
 						continue;
 					}
-					update_post_meta( $attachment_id, '_starter_content_theme', $this->get_stylesheet() );
-					update_post_meta( $attachment_id, '_customize_draft_post_name', $attachment['post_name'] );
+					update_post_meta($attachment_id, '_starter_content_theme', $this->get_stylesheet());
+					update_post_meta($attachment_id, '_customize_draft_post_name', $attachment['post_name']);
 				}
 
-				$attachment_ids[ $symbol ] = $attachment_id;
+				$attachment_ids[$symbol] = $attachment_id;
 			}
-			$starter_content_auto_draft_post_ids = array_merge( $starter_content_auto_draft_post_ids, array_values( $attachment_ids ) );
+			$starter_content_auto_draft_post_ids = array_merge($starter_content_auto_draft_post_ids, array_values($attachment_ids));
 		}
 
 		// Posts & pages.
-		if ( ! empty( $posts ) ) {
-			foreach ( array_keys( $posts ) as $post_symbol ) {
-				if ( empty( $posts[ $post_symbol ]['post_type'] ) || empty( $posts[ $post_symbol ]['post_name'] ) ) {
+		if ( ! empty($posts)) {
+			foreach (array_keys($posts) as $post_symbol) {
+				if (empty($posts[$post_symbol]['post_type']) || empty($posts[$post_symbol]['post_name'])) {
 					continue;
 				}
-				$post_type = $posts[ $post_symbol ]['post_type'];
-				if ( ! empty( $posts[ $post_symbol ]['post_name'] ) ) {
-					$post_name = $posts[ $post_symbol ]['post_name'];
-				} elseif ( ! empty( $posts[ $post_symbol ]['post_title'] ) ) {
-					$post_name = sanitize_title( $posts[ $post_symbol ]['post_title'] );
+				$post_type = $posts[$post_symbol]['post_type'];
+				if ( ! empty($posts[$post_symbol]['post_name'])) {
+					$post_name = $posts[$post_symbol]['post_name'];
+				} elseif ( ! empty($posts[$post_symbol]['post_title'])) {
+					$post_name = sanitize_title($posts[$post_symbol]['post_title']);
 				} else {
 					continue;
 				}
 
 				// Use existing auto-draft post if one already exists with the same type and name.
-				if ( isset( $existing_starter_content_posts[ $post_type . ':' . $post_name ] ) ) {
-					$posts[ $post_symbol ]['ID'] = $existing_starter_content_posts[ $post_type . ':' . $post_name ]->ID;
+				if (isset($existing_starter_content_posts[$post_type.':'.$post_name])) {
+					$posts[$post_symbol]['ID'] = $existing_starter_content_posts[$post_type.':'.$post_name]->ID;
 					continue;
 				}
 
 				// Translate the featured image symbol.
-				if ( ! empty( $posts[ $post_symbol ]['thumbnail'] )
-					&& preg_match( '/^{{(?P<symbol>.+)}}$/', $posts[ $post_symbol ]['thumbnail'], $matches )
-					&& isset( $attachment_ids[ $matches['symbol'] ] ) ) {
-					$posts[ $post_symbol ]['meta_input']['_thumbnail_id'] = $attachment_ids[ $matches['symbol'] ];
+				if ( ! empty($posts[$post_symbol]['thumbnail'])
+					&& preg_match('/^{{(?P<symbol>.+)}}$/', $posts[$post_symbol]['thumbnail'], $matches)
+					&& isset($attachment_ids[$matches['symbol']])) {
+					$posts[$post_symbol]['meta_input']['_thumbnail_id'] = $attachment_ids[$matches['symbol']];
 				}
 
-				if ( ! empty( $posts[ $post_symbol ]['template'] ) ) {
-					$posts[ $post_symbol ]['meta_input']['_wp_page_template'] = $posts[ $post_symbol ]['template'];
+				if ( ! empty($posts[$post_symbol]['template'])) {
+					$posts[$post_symbol]['meta_input']['_wp_page_template'] = $posts[$post_symbol]['template'];
 				}
 
-				$r = $this->nav_menus->insert_auto_draft_post( $posts[ $post_symbol ] );
-				if ( $r instanceof WP_Post ) {
-					$posts[ $post_symbol ]['ID'] = $r->ID;
+				$r = $this->nav_menus->insert_auto_draft_post($posts[$post_symbol]);
+				if ($r instanceof WP_Post) {
+					$posts[$post_symbol]['ID'] = $r->ID;
 				}
 			}
 
-			$starter_content_auto_draft_post_ids = array_merge( $starter_content_auto_draft_post_ids, wp_list_pluck( $posts, 'ID' ) );
+			$starter_content_auto_draft_post_ids = array_merge($starter_content_auto_draft_post_ids, wp_list_pluck($posts, 'ID'));
 		}
 
 		// The nav_menus_created_posts setting is why nav_menus component is dependency for adding posts.
-		if ( ! empty( $this->nav_menus ) && ! empty( $starter_content_auto_draft_post_ids ) ) {
+		if ( ! empty($this->nav_menus) && ! empty($starter_content_auto_draft_post_ids)) {
 			$setting_id = 'nav_menus_created_posts';
-			$this->set_post_value( $setting_id, array_unique( array_values( $starter_content_auto_draft_post_ids ) ) );
+			$this->set_post_value($setting_id, array_unique(array_values($starter_content_auto_draft_post_ids)));
 			$this->pending_starter_content_settings_ids[] = $setting_id;
 		}
 
 		// Nav menus.
 		$placeholder_id = -1;
 		$reused_nav_menu_setting_ids = array();
-		foreach ( $nav_menus as $nav_menu_location => $nav_menu ) {
+		foreach ($nav_menus as $nav_menu_location => $nav_menu) {
 
 			$nav_menu_term_id = null;
 			$nav_menu_setting_id = null;
 			$matches = array();
 
 			// Look for an existing placeholder menu with starter content to re-use.
-			foreach ( $changeset_data as $setting_id => $setting_params ) {
+			foreach ($changeset_data as $setting_id => $setting_params) {
 				$can_reuse = (
-					! empty( $setting_params['starter_content'] )
+					! empty($setting_params['starter_content'])
 					&&
-					! in_array( $setting_id, $reused_nav_menu_setting_ids, true )
+					! in_array($setting_id, $reused_nav_menu_setting_ids, true)
 					&&
-					preg_match( '#^nav_menu\[(?P<nav_menu_id>-?\d+)\]$#', $setting_id, $matches )
+					preg_match('#^nav_menu\[(?P<nav_menu_id>-?\d+)\]$#', $setting_id, $matches)
 				);
-				if ( $can_reuse ) {
-					$nav_menu_term_id = intval( $matches['nav_menu_id'] );
+				if ($can_reuse) {
+					$nav_menu_term_id = intval($matches['nav_menu_id']);
 					$nav_menu_setting_id = $setting_id;
 					$reused_nav_menu_setting_ids[] = $setting_id;
 					break;
 				}
 			}
 
-			if ( ! $nav_menu_term_id ) {
-				while ( isset( $changeset_data[ sprintf( 'nav_menu[%d]', $placeholder_id ) ] ) ) {
+			if ( ! $nav_menu_term_id) {
+				while (isset($changeset_data[sprintf('nav_menu[%d]', $placeholder_id)])) {
 					$placeholder_id--;
 				}
 				$nav_menu_term_id = $placeholder_id;
-				$nav_menu_setting_id = sprintf( 'nav_menu[%d]', $placeholder_id );
+				$nav_menu_setting_id = sprintf('nav_menu[%d]', $placeholder_id);
 			}
 
-			$this->set_post_value( $nav_menu_setting_id, array(
-				'name' => isset( $nav_menu['name'] ) ? $nav_menu['name'] : $nav_menu_location,
-			) );
+			$this->set_post_value($nav_menu_setting_id, array(
+				'name' => isset($nav_menu['name']) ? $nav_menu['name'] : $nav_menu_location,
+			));
 			$this->pending_starter_content_settings_ids[] = $nav_menu_setting_id;
 
 			// @todo Add support for menu_item_parent.
 			$position = 0;
-			foreach ( $nav_menu['items'] as $nav_menu_item ) {
-				$nav_menu_item_setting_id = sprintf( 'nav_menu_item[%d]', $placeholder_id-- );
-				if ( ! isset( $nav_menu_item['position'] ) ) {
+			foreach ($nav_menu['items'] as $nav_menu_item) {
+				$nav_menu_item_setting_id = sprintf('nav_menu_item[%d]', $placeholder_id--);
+				if ( ! isset($nav_menu_item['position'])) {
 					$nav_menu_item['position'] = $position++;
 				}
 				$nav_menu_item['nav_menu_term_id'] = $nav_menu_term_id;
 
-				if ( isset( $nav_menu_item['object_id'] ) ) {
-					if ( 'post_type' === $nav_menu_item['type'] && preg_match( '/^{{(?P<symbol>.+)}}$/', $nav_menu_item['object_id'], $matches ) && isset( $posts[ $matches['symbol'] ] ) ) {
-						$nav_menu_item['object_id'] = $posts[ $matches['symbol'] ]['ID'];
-						if ( empty( $nav_menu_item['title'] ) ) {
-							$original_object = get_post( $nav_menu_item['object_id'] );
+				if (isset($nav_menu_item['object_id'])) {
+					if ('post_type' === $nav_menu_item['type'] && preg_match('/^{{(?P<symbol>.+)}}$/', $nav_menu_item['object_id'], $matches) && isset($posts[$matches['symbol']])) {
+						$nav_menu_item['object_id'] = $posts[$matches['symbol']]['ID'];
+						if (empty($nav_menu_item['title'])) {
+							$original_object = get_post($nav_menu_item['object_id']);
 							$nav_menu_item['title'] = $original_object->post_title;
 						}
 					} else {
@@ -1208,77 +1208,77 @@ 
 					$nav_menu_item['object_id'] = 0;
 				}
 
-				if ( empty( $changeset_data[ $nav_menu_item_setting_id ] ) || ! empty( $changeset_data[ $nav_menu_item_setting_id ]['starter_content'] ) ) {
-					$this->set_post_value( $nav_menu_item_setting_id, $nav_menu_item );
+				if (empty($changeset_data[$nav_menu_item_setting_id]) || ! empty($changeset_data[$nav_menu_item_setting_id]['starter_content'])) {
+					$this->set_post_value($nav_menu_item_setting_id, $nav_menu_item);
 					$this->pending_starter_content_settings_ids[] = $nav_menu_item_setting_id;
 				}
 			}
 
-			$setting_id = sprintf( 'nav_menu_locations[%s]', $nav_menu_location );
-			if ( empty( $changeset_data[ $setting_id ] ) || ! empty( $changeset_data[ $setting_id ]['starter_content'] ) ) {
-				$this->set_post_value( $setting_id, $nav_menu_term_id );
+			$setting_id = sprintf('nav_menu_locations[%s]', $nav_menu_location);
+			if (empty($changeset_data[$setting_id]) || ! empty($changeset_data[$setting_id]['starter_content'])) {
+				$this->set_post_value($setting_id, $nav_menu_term_id);
 				$this->pending_starter_content_settings_ids[] = $setting_id;
 			}
 		}
 
 		// Options.
-		foreach ( $options as $name => $value ) {
-			if ( preg_match( '/^{{(?P<symbol>.+)}}$/', $value, $matches ) ) {
-				if ( isset( $posts[ $matches['symbol'] ] ) ) {
-					$value = $posts[ $matches['symbol'] ]['ID'];
-				} elseif ( isset( $attachment_ids[ $matches['symbol'] ] ) ) {
-					$value = $attachment_ids[ $matches['symbol'] ];
+		foreach ($options as $name => $value) {
+			if (preg_match('/^{{(?P<symbol>.+)}}$/', $value, $matches)) {
+				if (isset($posts[$matches['symbol']])) {
+					$value = $posts[$matches['symbol']]['ID'];
+				} elseif (isset($attachment_ids[$matches['symbol']])) {
+					$value = $attachment_ids[$matches['symbol']];
 				} else {
 					continue;
 				}
 			}
 
-			if ( empty( $changeset_data[ $name ] ) || ! empty( $changeset_data[ $name ]['starter_content'] ) ) {
-				$this->set_post_value( $name, $value );
+			if (empty($changeset_data[$name]) || ! empty($changeset_data[$name]['starter_content'])) {
+				$this->set_post_value($name, $value);
 				$this->pending_starter_content_settings_ids[] = $name;
 			}
 		}
 
 		// Theme mods.
-		foreach ( $theme_mods as $name => $value ) {
-			if ( preg_match( '/^{{(?P<symbol>.+)}}$/', $value, $matches ) ) {
-				if ( isset( $posts[ $matches['symbol'] ] ) ) {
-					$value = $posts[ $matches['symbol'] ]['ID'];
-				} elseif ( isset( $attachment_ids[ $matches['symbol'] ] ) ) {
-					$value = $attachment_ids[ $matches['symbol'] ];
+		foreach ($theme_mods as $name => $value) {
+			if (preg_match('/^{{(?P<symbol>.+)}}$/', $value, $matches)) {
+				if (isset($posts[$matches['symbol']])) {
+					$value = $posts[$matches['symbol']]['ID'];
+				} elseif (isset($attachment_ids[$matches['symbol']])) {
+					$value = $attachment_ids[$matches['symbol']];
 				} else {
 					continue;
 				}
 			}
 
 			// Handle header image as special case since setting has a legacy format.
-			if ( 'header_image' === $name ) {
+			if ('header_image' === $name) {
 				$name = 'header_image_data';
-				$metadata = wp_get_attachment_metadata( $value );
-				if ( empty( $metadata ) ) {
+				$metadata = wp_get_attachment_metadata($value);
+				if (empty($metadata)) {
 					continue;
 				}
 				$value = array(
 					'attachment_id' => $value,
-					'url' => wp_get_attachment_url( $value ),
+					'url' => wp_get_attachment_url($value),
 					'height' => $metadata['height'],
 					'width' => $metadata['width'],
 				);
-			} elseif ( 'background_image' === $name ) {
-				$value = wp_get_attachment_url( $value );
+			} elseif ('background_image' === $name) {
+				$value = wp_get_attachment_url($value);
 			}
 
-			if ( empty( $changeset_data[ $name ] ) || ! empty( $changeset_data[ $name ]['starter_content'] ) ) {
-				$this->set_post_value( $name, $value );
+			if (empty($changeset_data[$name]) || ! empty($changeset_data[$name]['starter_content'])) {
+				$this->set_post_value($name, $value);
 				$this->pending_starter_content_settings_ids[] = $name;
 			}
 		}
 
-		if ( ! empty( $this->pending_starter_content_settings_ids ) ) {
-			if ( did_action( 'customize_register' ) ) {
+		if ( ! empty($this->pending_starter_content_settings_ids)) {
+			if (did_action('customize_register')) {
 				$this->_save_starter_content_changeset();
 			} else {
-				add_action( 'customize_register', array( $this, '_save_starter_content_changeset' ), 1000 );
+				add_action('customize_register', array($this, '_save_starter_content_changeset'), 1000);
 			}
 		}
 	}
@@ -1294,54 +1294,54 @@ 
 	 * @param array $attachments Attachments.
 	 * @return array Prepared attachments.
 	 */
-	protected function prepare_starter_content_attachments( $attachments ) {
+	protected function prepare_starter_content_attachments($attachments) {
 		$prepared_attachments = array();
-		if ( empty( $attachments ) ) {
+		if (empty($attachments)) {
 			return $prepared_attachments;
 		}
 
 		// Such is The WordPress Way.
-		require_once( ABSPATH . 'wp-admin/includes/file.php' );
-		require_once( ABSPATH . 'wp-admin/includes/media.php' );
-		require_once( ABSPATH . 'wp-admin/includes/image.php' );
+		require_once(ABSPATH.'wp-admin/includes/file.php');
+		require_once(ABSPATH.'wp-admin/includes/media.php');
+		require_once(ABSPATH.'wp-admin/includes/image.php');
 
-		foreach ( $attachments as $symbol => $attachment ) {
+		foreach ($attachments as $symbol => $attachment) {
 
 			// A file is required and URLs to files are not currently allowed.
-			if ( empty( $attachment['file'] ) || preg_match( '#^https?://$#', $attachment['file'] ) ) {
+			if (empty($attachment['file']) || preg_match('#^https?://$#', $attachment['file'])) {
 				continue;
 			}
 
 			$file_path = null;
-			if ( file_exists( $attachment['file'] ) ) {
+			if (file_exists($attachment['file'])) {
 				$file_path = $attachment['file']; // Could be absolute path to file in plugin.
-			} elseif ( is_child_theme() && file_exists( get_stylesheet_directory() . '/' . $attachment['file'] ) ) {
-				$file_path = get_stylesheet_directory() . '/' . $attachment['file'];
-			} elseif ( file_exists( get_template_directory() . '/' . $attachment['file'] ) ) {
-				$file_path = get_template_directory() . '/' . $attachment['file'];
+			} elseif (is_child_theme() && file_exists(get_stylesheet_directory().'/'.$attachment['file'])) {
+				$file_path = get_stylesheet_directory().'/'.$attachment['file'];
+			} elseif (file_exists(get_template_directory().'/'.$attachment['file'])) {
+				$file_path = get_template_directory().'/'.$attachment['file'];
 			} else {
 				continue;
 			}
-			$file_name = basename( $attachment['file'] );
+			$file_name = basename($attachment['file']);
 
 			// Skip file types that are not recognized.
-			$checked_filetype = wp_check_filetype( $file_name );
-			if ( empty( $checked_filetype['type'] ) ) {
+			$checked_filetype = wp_check_filetype($file_name);
+			if (empty($checked_filetype['type'])) {
 				continue;
 			}
 
 			// Ensure post_name is set since not automatically derived from post_title for new auto-draft posts.
-			if ( empty( $attachment['post_name'] ) ) {
-				if ( ! empty( $attachment['post_title'] ) ) {
-					$attachment['post_name'] = sanitize_title( $attachment['post_title'] );
+			if (empty($attachment['post_name'])) {
+				if ( ! empty($attachment['post_title'])) {
+					$attachment['post_name'] = sanitize_title($attachment['post_title']);
 				} else {
-					$attachment['post_name'] = sanitize_title( preg_replace( '/\.\w+$/', '', $file_name ) );
+					$attachment['post_name'] = sanitize_title(preg_replace('/\.\w+$/', '', $file_name));
 				}
 			}
 
 			$attachment['file_name'] = $file_name;
 			$attachment['file_path'] = $file_path;
-			$prepared_attachments[ $symbol ] = $attachment;
+			$prepared_attachments[$symbol] = $attachment;
 		}
 		return $prepared_attachments;
 	}
@@ -1354,14 +1354,14 @@ 
 	 */
 	public function _save_starter_content_changeset() {
 
-		if ( empty( $this->pending_starter_content_settings_ids ) ) {
+		if (empty($this->pending_starter_content_settings_ids)) {
 			return;
 		}
 
-		$this->save_changeset_post( array(
-			'data' => array_fill_keys( $this->pending_starter_content_settings_ids, array( 'starter_content' => true ) ),
+		$this->save_changeset_post(array(
+			'data' => array_fill_keys($this->pending_starter_content_settings_ids, array('starter_content' => true)),
 			'starter_content' => true,
-		) );
+		));
 
 		$this->pending_starter_content_settings_ids = array();
 	}
@@ -1393,11 +1393,11 @@ 
 	 * }
 	 * @return array
 	 */
-	public function unsanitized_post_values( $args = array() ) {
+	public function unsanitized_post_values($args = array()) {
 		$args = array_merge(
 			array(
 				'exclude_changeset' => false,
-				'exclude_post_data' => ! current_user_can( 'customize' ),
+				'exclude_post_data' => ! current_user_can('customize'),
 			),
 			$args
 		);
@@ -1405,46 +1405,46 @@ 
 		$values = array();
 
 		// Let default values be from the stashed theme mods if doing a theme switch and if no changeset is present.
-		if ( ! $this->is_theme_active() ) {
-			$stashed_theme_mods = get_option( 'customize_stashed_theme_mods' );
+		if ( ! $this->is_theme_active()) {
+			$stashed_theme_mods = get_option('customize_stashed_theme_mods');
 			$stylesheet = $this->get_stylesheet();
-			if ( isset( $stashed_theme_mods[ $stylesheet ] ) ) {
-				$values = array_merge( $values, wp_list_pluck( $stashed_theme_mods[ $stylesheet ], 'value' ) );
+			if (isset($stashed_theme_mods[$stylesheet])) {
+				$values = array_merge($values, wp_list_pluck($stashed_theme_mods[$stylesheet], 'value'));
 			}
 		}
 
-		if ( ! $args['exclude_changeset'] ) {
-			foreach ( $this->changeset_data() as $setting_id => $setting_params ) {
-				if ( ! array_key_exists( 'value', $setting_params ) ) {
+		if ( ! $args['exclude_changeset']) {
+			foreach ($this->changeset_data() as $setting_id => $setting_params) {
+				if ( ! array_key_exists('value', $setting_params)) {
 					continue;
 				}
-				if ( isset( $setting_params['type'] ) && 'theme_mod' === $setting_params['type'] ) {
+				if (isset($setting_params['type']) && 'theme_mod' === $setting_params['type']) {
 
 					// Ensure that theme mods values are only used if they were saved under the current theme.
 					$namespace_pattern = '/^(?P<stylesheet>.+?)::(?P<setting_id>.+)$/';
-					if ( preg_match( $namespace_pattern, $setting_id, $matches ) && $this->get_stylesheet() === $matches['stylesheet'] ) {
-						$values[ $matches['setting_id'] ] = $setting_params['value'];
+					if (preg_match($namespace_pattern, $setting_id, $matches) && $this->get_stylesheet() === $matches['stylesheet']) {
+						$values[$matches['setting_id']] = $setting_params['value'];
 					}
 				} else {
-					$values[ $setting_id ] = $setting_params['value'];
+					$values[$setting_id] = $setting_params['value'];
 				}
 			}
 		}
 
-		if ( ! $args['exclude_post_data'] ) {
-			if ( ! isset( $this->_post_values ) ) {
-				if ( isset( $_POST['customized'] ) ) {
-					$post_values = json_decode( wp_unslash( $_POST['customized'] ), true );
+		if ( ! $args['exclude_post_data']) {
+			if ( ! isset($this->_post_values)) {
+				if (isset($_POST['customized'])) {
+					$post_values = json_decode(wp_unslash($_POST['customized']), true);
 				} else {
 					$post_values = array();
 				}
-				if ( is_array( $post_values ) ) {
+				if (is_array($post_values)) {
 					$this->_post_values = $post_values;
 				} else {
 					$this->_post_values = array();
 				}
 			}
-			$values = array_merge( $values, $this->_post_values );
+			$values = array_merge($values, $this->_post_values);
 		}
 		return $values;
 	}
@@ -1470,18 +1470,18 @@ 
 	 *                                      or the post value is invalid (added in 4.6.0).
 	 * @return string|mixed $post_value Sanitized value or the $default provided.
 	 */
-	public function post_value( $setting, $default = null ) {
+	public function post_value($setting, $default = null) {
 		$post_values = $this->unsanitized_post_values();
-		if ( ! array_key_exists( $setting->id, $post_values ) ) {
+		if ( ! array_key_exists($setting->id, $post_values)) {
 			return $default;
 		}
-		$value = $post_values[ $setting->id ];
-		$valid = $setting->validate( $value );
-		if ( is_wp_error( $valid ) ) {
+		$value = $post_values[$setting->id];
+		$valid = $setting->validate($value);
+		if (is_wp_error($valid)) {
 			return $default;
 		}
-		$value = $setting->sanitize( $value );
-		if ( is_null( $value ) || is_wp_error( $value ) ) {
+		$value = $setting->sanitize($value);
+		if (is_null($value) || is_wp_error($value)) {
 			return $default;
 		}
 		return $value;
@@ -1499,9 +1499,9 @@ 
 	 * @param string $setting_id ID for the WP_Customize_Setting instance.
 	 * @param mixed  $value      Post value.
 	 */
-	public function set_post_value( $setting_id, $value ) {
+	public function set_post_value($setting_id, $value) {
 		$this->unsanitized_post_values(); // Populate _post_values from $_POST['customized'].
-		$this->_post_values[ $setting_id ] = $value;
+		$this->_post_values[$setting_id] = $value;
 
 		/**
 		 * Announce when a specific setting's unsanitized post value has been set.
@@ -1515,7 +1515,7 @@ 
 		 * @param mixed                $value Unsanitized setting post value.
 		 * @param WP_Customize_Manager $this  WP_Customize_Manager instance.
 		 */
-		do_action( "customize_post_value_set_{$setting_id}", $value, $this );
+		do_action("customize_post_value_set_{$setting_id}", $value, $this);
 
 		/**
 		 * Announce when any setting's unsanitized post value has been set.
@@ -1531,7 +1531,7 @@ 
 		 * @param mixed                $value      Unsanitized setting post value.
 		 * @param WP_Customize_Manager $this       WP_Customize_Manager instance.
 		 */
-		do_action( 'customize_post_value_set', $setting_id, $value, $this );
+		do_action('customize_post_value_set', $setting_id, $value, $this);
 	}
 
 	/**
@@ -1549,32 +1549,32 @@ 
 		 * allowed then the auth cookies would not be sent and WordPress would
 		 * not send no-cache headers by default.
 		 */
-		if ( ! headers_sent() ) {
+		if ( ! headers_sent()) {
 			nocache_headers();
-			header( 'X-Robots: noindex, nofollow, noarchive' );
+			header('X-Robots: noindex, nofollow, noarchive');
 		}
-		add_action( 'wp_head', 'wp_no_robots' );
-		add_filter( 'wp_headers', array( $this, 'filter_iframe_security_headers' ) );
+		add_action('wp_head', 'wp_no_robots');
+		add_filter('wp_headers', array($this, 'filter_iframe_security_headers'));
 
 		/*
 		 * If preview is being served inside the customizer preview iframe, and
 		 * if the user doesn't have customize capability, then it is assumed
 		 * that the user's session has expired and they need to re-authenticate.
 		 */
-		if ( $this->messenger_channel && ! current_user_can( 'customize' ) ) {
-			$this->wp_die( -1, __( 'Unauthorized. You may remove the customize_messenger_channel param to preview as frontend.' ) );
+		if ($this->messenger_channel && ! current_user_can('customize')) {
+			$this->wp_die( -1, __('Unauthorized. You may remove the customize_messenger_channel param to preview as frontend.') );
 			return;
 		}
 
 		$this->prepare_controls();
 
-		add_filter( 'wp_redirect', array( $this, 'add_state_query_params' ) );
+		add_filter('wp_redirect', array($this, 'add_state_query_params'));
 
-		wp_enqueue_script( 'customize-preview' );
-		add_action( 'wp_head', array( $this, 'customize_preview_loading_style' ) );
-		add_action( 'wp_head', array( $this, 'remove_frameless_preview_messenger_channel' ) );
-		add_action( 'wp_footer', array( $this, 'customize_preview_settings' ), 20 );
-		add_filter( 'get_edit_post_link', '__return_empty_string' );
+		wp_enqueue_script('customize-preview');
+		add_action('wp_head', array($this, 'customize_preview_loading_style'));
+		add_action('wp_head', array($this, 'remove_frameless_preview_messenger_channel'));
+		add_action('wp_footer', array($this, 'customize_preview_settings'), 20);
+		add_filter('get_edit_post_link', '__return_empty_string');
 
 		/**
 		 * Fires once the Customizer preview has initialized and JavaScript
@@ -1584,7 +1584,7 @@ 
 		 *
 		 * @param WP_Customize_Manager $this WP_Customize_Manager instance.
 		 */
-		do_action( 'customize_preview_init', $this );
+		do_action('customize_preview_init', $this);
 	}
 
 	/**
@@ -1596,10 +1596,10 @@ 
 	 * @param array $headers Headers.
 	 * @return array Headers.
 	 */
-	public function filter_iframe_security_headers( $headers ) {
-		$customize_url = admin_url( 'customize.php' );
-		$headers['X-Frame-Options'] = 'ALLOW-FROM ' . $customize_url;
-		$headers['Content-Security-Policy'] = 'frame-ancestors ' . preg_replace( '#^(\w+://[^/]+).+?$#', '$1', $customize_url );
+	public function filter_iframe_security_headers($headers) {
+		$customize_url = admin_url('customize.php');
+		$headers['X-Frame-Options'] = 'ALLOW-FROM '.$customize_url;
+		$headers['Content-Security-Policy'] = 'frame-ancestors '.preg_replace('#^(\w+://[^/]+).+?$#', '$1', $customize_url);
 		return $headers;
 	}
 
@@ -1614,34 +1614,34 @@ 
 	 * @param string $url URL.
 	 * @return string URL.
 	 */
-	public function add_state_query_params( $url ) {
-		$parsed_original_url = wp_parse_url( $url );
+	public function add_state_query_params($url) {
+		$parsed_original_url = wp_parse_url($url);
 		$is_allowed = false;
-		foreach ( $this->get_allowed_urls() as $allowed_url ) {
-			$parsed_allowed_url = wp_parse_url( $allowed_url );
+		foreach ($this->get_allowed_urls() as $allowed_url) {
+			$parsed_allowed_url = wp_parse_url($allowed_url);
 			$is_allowed = (
 				$parsed_allowed_url['scheme'] === $parsed_original_url['scheme']
 				&&
 				$parsed_allowed_url['host'] === $parsed_original_url['host']
 				&&
-				0 === strpos( $parsed_original_url['path'], $parsed_allowed_url['path'] )
+				0 === strpos($parsed_original_url['path'], $parsed_allowed_url['path'])
 			);
-			if ( $is_allowed ) {
+			if ($is_allowed) {
 				break;
 			}
 		}
 
-		if ( $is_allowed ) {
+		if ($is_allowed) {
 			$query_params = array(
 				'customize_changeset_uuid' => $this->changeset_uuid(),
 			);
-			if ( ! $this->is_theme_active() ) {
+			if ( ! $this->is_theme_active()) {
 				$query_params['customize_theme'] = $this->get_stylesheet();
 			}
-			if ( $this->messenger_channel ) {
+			if ($this->messenger_channel) {
 				$query_params['customize_messenger_channel'] = $this->messenger_channel;
 			}
-			$url = add_query_arg( $query_params, $url );
+			$url = add_query_arg($query_params, $url);
 		}
 
 		return $url;
@@ -1656,7 +1656,7 @@ 
 	 * @access public
 	 */
 	public function customize_preview_override_404_status() {
-		_deprecated_function( __METHOD__, '4.7.0' );
+		_deprecated_function(__METHOD__, '4.7.0');
 	}
 
 	/**
@@ -1666,7 +1666,7 @@ 
 	 * @deprecated 4.7.0
 	 */
 	public function customize_preview_base() {
-		_deprecated_function( __METHOD__, '4.7.0' );
+		_deprecated_function(__METHOD__, '4.7.0');
 	}
 
 	/**
@@ -1676,7 +1676,7 @@ 
 	 * @deprecated 4.7.0 Customizer no longer supports IE8, so all supported browsers recognize HTML5.
 	 */
 	public function customize_preview_html5() {
-		_deprecated_function( __FUNCTION__, '4.7.0' );
+		_deprecated_function(__FUNCTION__, '4.7.0');
 	}
 
 	/**
@@ -1717,7 +1717,7 @@ 
 	 * @access public
 	 */
 	public function remove_frameless_preview_messenger_channel() {
-		if ( ! $this->messenger_channel ) {
+		if ( ! $this->messenger_channel) {
 			return;
 		}
 		?>
@@ -1751,40 +1751,40 @@ 
 	 * @since 3.4.0
 	 */
 	public function customize_preview_settings() {
-		$post_values = $this->unsanitized_post_values( array( 'exclude_changeset' => true ) );
-		$setting_validities = $this->validate_setting_values( $post_values );
-		$exported_setting_validities = array_map( array( $this, 'prepare_setting_validity_for_js' ), $setting_validities );
+		$post_values = $this->unsanitized_post_values(array('exclude_changeset' => true));
+		$setting_validities = $this->validate_setting_values($post_values);
+		$exported_setting_validities = array_map(array($this, 'prepare_setting_validity_for_js'), $setting_validities);
 
 		// Note that the REQUEST_URI is not passed into home_url() since this breaks subdirectory installs.
-		$self_url = empty( $_SERVER['REQUEST_URI'] ) ? home_url( '/' ) : esc_url_raw( wp_unslash( $_SERVER['REQUEST_URI'] ) );
+		$self_url = empty($_SERVER['REQUEST_URI']) ? home_url('/') : esc_url_raw(wp_unslash($_SERVER['REQUEST_URI']));
 		$state_query_params = array(
 			'customize_theme',
 			'customize_changeset_uuid',
 			'customize_messenger_channel',
 		);
-		$self_url = remove_query_arg( $state_query_params, $self_url );
+		$self_url = remove_query_arg($state_query_params, $self_url);
 
 		$allowed_urls = $this->get_allowed_urls();
 		$allowed_hosts = array();
-		foreach ( $allowed_urls as $allowed_url ) {
-			$parsed = wp_parse_url( $allowed_url );
-			if ( empty( $parsed['host'] ) ) {
+		foreach ($allowed_urls as $allowed_url) {
+			$parsed = wp_parse_url($allowed_url);
+			if (empty($parsed['host'])) {
 				continue;
 			}
 			$host = $parsed['host'];
-			if ( ! empty( $parsed['port'] ) ) {
-				$host .= ':' . $parsed['port'];
+			if ( ! empty($parsed['port'])) {
+				$host .= ':'.$parsed['port'];
 			}
 			$allowed_hosts[] = $host;
 		}
 
-		$switched_locale = switch_to_locale( get_user_locale() );
+		$switched_locale = switch_to_locale(get_user_locale());
 		$l10n = array(
-			'shiftClickToEdit' => __( 'Shift-click to edit this element.' ),
-			'linkUnpreviewable' => __( 'This link is not live-previewable.' ),
-			'formUnpreviewable' => __( 'This form is not live-previewable.' ),
+			'shiftClickToEdit' => __('Shift-click to edit this element.'),
+			'linkUnpreviewable' => __('This link is not live-previewable.'),
+			'formUnpreviewable' => __('This form is not live-previewable.'),
 		);
-		if ( $switched_locale ) {
+		if ($switched_locale) {
 			restore_previous_locale();
 		}
 
@@ -1802,8 +1802,8 @@ 
 			),
 			'url' => array(
 				'self' => $self_url,
-				'allowed' => array_map( 'esc_url_raw', $this->get_allowed_urls() ),
-				'allowedHosts' => array_unique( $allowed_hosts ),
+				'allowed' => array_map('esc_url_raw', $this->get_allowed_urls()),
+				'allowedHosts' => array_unique($allowed_hosts),
 				'isCrossDomain' => $this->is_cross_domain(),
 			),
 			'channel' => $this->messenger_channel,
@@ -1811,35 +1811,35 @@ 
 			'activeSections' => array(),
 			'activeControls' => array(),
 			'settingValidities' => $exported_setting_validities,
-			'nonce' => current_user_can( 'customize' ) ? $this->get_nonces() : array(),
+			'nonce' => current_user_can('customize') ? $this->get_nonces() : array(),
 			'l10n' => $l10n,
-			'_dirty' => array_keys( $post_values ),
+			'_dirty' => array_keys($post_values),
 		);
 
-		foreach ( $this->panels as $panel_id => $panel ) {
-			if ( $panel->check_capabilities() ) {
-				$settings['activePanels'][ $panel_id ] = $panel->active();
-				foreach ( $panel->sections as $section_id => $section ) {
-					if ( $section->check_capabilities() ) {
-						$settings['activeSections'][ $section_id ] = $section->active();
+		foreach ($this->panels as $panel_id => $panel) {
+			if ($panel->check_capabilities()) {
+				$settings['activePanels'][$panel_id] = $panel->active();
+				foreach ($panel->sections as $section_id => $section) {
+					if ($section->check_capabilities()) {
+						$settings['activeSections'][$section_id] = $section->active();
 					}
 				}
 			}
 		}
-		foreach ( $this->sections as $id => $section ) {
-			if ( $section->check_capabilities() ) {
-				$settings['activeSections'][ $id ] = $section->active();
+		foreach ($this->sections as $id => $section) {
+			if ($section->check_capabilities()) {
+				$settings['activeSections'][$id] = $section->active();
 			}
 		}
-		foreach ( $this->controls as $id => $control ) {
-			if ( $control->check_capabilities() ) {
-				$settings['activeControls'][ $id ] = $control->active();
+		foreach ($this->controls as $id => $control) {
+			if ($control->check_capabilities()) {
+				$settings['activeControls'][$id] = $control->active();
 			}
 		}
 
 		?>
 		<script type="text/javascript">
-			var _wpCustomizeSettings = <?php echo wp_json_encode( $settings ); ?>;
+			var _wpCustomizeSettings = <?php echo wp_json_encode($settings); ?>;
 			_wpCustomizeSettings.values = {};
 			(function( v ) {
 				<?php
@@ -1848,12 +1848,12 @@ 
 				 * serialization in order to avoid a peak memory usage spike.
 				 * @todo We may not even need to export the values at all since the pane syncs them anyway.
 				 */
-				foreach ( $this->settings as $id => $setting ) {
-					if ( $setting->check_capabilities() ) {
+				foreach ($this->settings as $id => $setting) {
+					if ($setting->check_capabilities()) {
 						printf(
 							"v[%s] = %s;\n",
-							wp_json_encode( $id ),
-							wp_json_encode( $setting->js_value() )
+							wp_json_encode($id),
+							wp_json_encode($setting->js_value())
 						);
 					}
 				}
@@ -1870,7 +1870,7 @@ 
 	 * @deprecated 4.7.0
 	 */
 	public function customize_preview_signature() {
-		_deprecated_function( __METHOD__, '4.7.0' );
+		_deprecated_function(__METHOD__, '4.7.0');
 	}
 
 	/**
@@ -1882,8 +1882,8 @@ 
 	 * @param mixed $return Value passed through for {@see 'wp_die_handler'} filter.
 	 * @return mixed Value passed through for {@see 'wp_die_handler'} filter.
 	 */
-	public function remove_preview_signature( $return = null ) {
-		_deprecated_function( __METHOD__, '4.7.0' );
+	public function remove_preview_signature($return = null) {
+		_deprecated_function(__METHOD__, '4.7.0');
 
 		return $return;
 	}
@@ -1929,7 +1929,7 @@ 
 	 * @return string Theme root.
 	 */
 	public function get_template_root() {
-		return get_raw_theme_root( $this->get_template(), true );
+		return get_raw_theme_root($this->get_template(), true);
 	}
 
 	/**
@@ -1940,7 +1940,7 @@ 
 	 * @return string Theme root.
 	 */
 	public function get_stylesheet_root() {
-		return get_raw_theme_root( $this->get_stylesheet(), true );
+		return get_raw_theme_root($this->get_stylesheet(), true);
 	}
 
 	/**
@@ -1951,7 +1951,7 @@ 
 	 * @param $current_theme {@internal Parameter is not used}
 	 * @return string Theme name.
 	 */
-	public function current_theme( $current_theme ) {
+	public function current_theme($current_theme) {
 		return $this->theme()->display('Name');
 	}
 
@@ -1978,48 +1978,48 @@ 
 	 * }
 	 * @return array Mapping of setting IDs to return value of validate method calls, either `true` or `WP_Error`.
 	 */
-	public function validate_setting_values( $setting_values, $options = array() ) {
-		$options = wp_parse_args( $options, array(
+	public function validate_setting_values($setting_values, $options = array()) {
+		$options = wp_parse_args($options, array(
 			'validate_capability' => false,
 			'validate_existence' => false,
-		) );
+		));
 
 		$validities = array();
-		foreach ( $setting_values as $setting_id => $unsanitized_value ) {
-			$setting = $this->get_setting( $setting_id );
-			if ( ! $setting ) {
-				if ( $options['validate_existence'] ) {
-					$validities[ $setting_id ] = new WP_Error( 'unrecognized', __( 'Setting does not exist or is unrecognized.' ) );
+		foreach ($setting_values as $setting_id => $unsanitized_value) {
+			$setting = $this->get_setting($setting_id);
+			if ( ! $setting) {
+				if ($options['validate_existence']) {
+					$validities[$setting_id] = new WP_Error('unrecognized', __('Setting does not exist or is unrecognized.'));
 				}
 				continue;
 			}
-			if ( $options['validate_capability'] && ! current_user_can( $setting->capability ) ) {
-				$validity = new WP_Error( 'unauthorized', __( 'Unauthorized to modify setting due to capability.' ) );
+			if ($options['validate_capability'] && ! current_user_can($setting->capability)) {
+				$validity = new WP_Error('unauthorized', __('Unauthorized to modify setting due to capability.'));
 			} else {
-				if ( is_null( $unsanitized_value ) ) {
+				if (is_null($unsanitized_value)) {
 					continue;
 				}
-				$validity = $setting->validate( $unsanitized_value );
+				$validity = $setting->validate($unsanitized_value);
 			}
-			if ( ! is_wp_error( $validity ) ) {
+			if ( ! is_wp_error($validity)) {
 				/** This filter is documented in wp-includes/class-wp-customize-setting.php */
-				$late_validity = apply_filters( "customize_validate_{$setting->id}", new WP_Error(), $unsanitized_value, $setting );
-				if ( ! empty( $late_validity->errors ) ) {
+				$late_validity = apply_filters("customize_validate_{$setting->id}", new WP_Error(), $unsanitized_value, $setting);
+				if ( ! empty($late_validity->errors)) {
 					$validity = $late_validity;
 				}
 			}
-			if ( ! is_wp_error( $validity ) ) {
-				$value = $setting->sanitize( $unsanitized_value );
-				if ( is_null( $value ) ) {
+			if ( ! is_wp_error($validity)) {
+				$value = $setting->sanitize($unsanitized_value);
+				if (is_null($value)) {
 					$validity = false;
-				} elseif ( is_wp_error( $value ) ) {
+				} elseif (is_wp_error($value)) {
 					$validity = $value;
 				}
 			}
-			if ( false === $validity ) {
-				$validity = new WP_Error( 'invalid_value', __( 'Invalid value.' ) );
+			if (false === $validity) {
+				$validity = new WP_Error('invalid_value', __('Invalid value.'));
 			}
-			$validities[ $setting_id ] = $validity;
+			$validities[$setting_id] = $validity;
 		}
 		return $validities;
 	}
@@ -2038,13 +2038,13 @@ 
 	 *                    to their respective `message` and `data` to pass into the
 	 *                    `wp.customize.Notification` JS model.
 	 */
-	public function prepare_setting_validity_for_js( $validity ) {
-		if ( is_wp_error( $validity ) ) {
+	public function prepare_setting_validity_for_js($validity) {
+		if (is_wp_error($validity)) {
 			$notification = array();
-			foreach ( $validity->errors as $error_code => $error_messages ) {
-				$notification[ $error_code ] = array(
-					'message' => join( ' ', $error_messages ),
-					'data' => $validity->get_error_data( $error_code ),
+			foreach ($validity->errors as $error_code => $error_messages) {
+				$notification[$error_code] = array(
+					'message' => join(' ', $error_messages),
+					'data' => $validity->get_error_data($error_code),
 				);
 			}
 			return $notification;
@@ -2060,34 +2060,34 @@ 
 	 * @since 4.7.0 The semantics of this method have changed to update a changeset, optionally to also change the status and other attributes.
 	 */
 	public function save() {
-		if ( ! is_user_logged_in() ) {
-			wp_send_json_error( 'unauthenticated' );
+		if ( ! is_user_logged_in()) {
+			wp_send_json_error('unauthenticated');
 		}
 
-		if ( ! $this->is_preview() ) {
-			wp_send_json_error( 'not_preview' );
+		if ( ! $this->is_preview()) {
+			wp_send_json_error('not_preview');
 		}
 
-		$action = 'save-customize_' . $this->get_stylesheet();
-		if ( ! check_ajax_referer( $action, 'nonce', false ) ) {
-			wp_send_json_error( 'invalid_nonce' );
+		$action = 'save-customize_'.$this->get_stylesheet();
+		if ( ! check_ajax_referer($action, 'nonce', false)) {
+			wp_send_json_error('invalid_nonce');
 		}
 
 		$changeset_post_id = $this->changeset_post_id();
-		if ( empty( $changeset_post_id ) ) {
-			if ( ! current_user_can( get_post_type_object( 'customize_changeset' )->cap->create_posts ) ) {
-				wp_send_json_error( 'cannot_create_changeset_post' );
+		if (empty($changeset_post_id)) {
+			if ( ! current_user_can(get_post_type_object('customize_changeset')->cap->create_posts)) {
+				wp_send_json_error('cannot_create_changeset_post');
 			}
 		} else {
-			if ( ! current_user_can( get_post_type_object( 'customize_changeset' )->cap->edit_post, $changeset_post_id ) ) {
-				wp_send_json_error( 'cannot_edit_changeset_post' );
+			if ( ! current_user_can(get_post_type_object('customize_changeset')->cap->edit_post, $changeset_post_id)) {
+				wp_send_json_error('cannot_edit_changeset_post');
 			}
 		}
 
-		if ( ! empty( $_POST['customize_changeset_data'] ) ) {
-			$input_changeset_data = json_decode( wp_unslash( $_POST['customize_changeset_data'] ), true );
-			if ( ! is_array( $input_changeset_data ) ) {
-				wp_send_json_error( 'invalid_customize_changeset_data' );
+		if ( ! empty($_POST['customize_changeset_data'])) {
+			$input_changeset_data = json_decode(wp_unslash($_POST['customize_changeset_data']), true);
+			if ( ! is_array($input_changeset_data)) {
+				wp_send_json_error('invalid_customize_changeset_data');
 			}
 		} else {
 			$input_changeset_data = array();
@@ -2095,21 +2095,21 @@ 
 
 		// Validate title.
 		$changeset_title = null;
-		if ( isset( $_POST['customize_changeset_title'] ) ) {
-			$changeset_title = sanitize_text_field( wp_unslash( $_POST['customize_changeset_title'] ) );
+		if (isset($_POST['customize_changeset_title'])) {
+			$changeset_title = sanitize_text_field(wp_unslash($_POST['customize_changeset_title']));
 		}
 
 		// Validate changeset status param.
 		$is_publish = null;
 		$changeset_status = null;
-		if ( isset( $_POST['customize_changeset_status'] ) ) {
-			$changeset_status = wp_unslash( $_POST['customize_changeset_status'] );
-			if ( ! get_post_status_object( $changeset_status ) || ! in_array( $changeset_status, array( 'draft', 'pending', 'publish', 'future' ), true ) ) {
-				wp_send_json_error( 'bad_customize_changeset_status', 400 );
+		if (isset($_POST['customize_changeset_status'])) {
+			$changeset_status = wp_unslash($_POST['customize_changeset_status']);
+			if ( ! get_post_status_object($changeset_status) || ! in_array($changeset_status, array('draft', 'pending', 'publish', 'future'), true)) {
+				wp_send_json_error('bad_customize_changeset_status', 400);
 			}
-			$is_publish = ( 'publish' === $changeset_status || 'future' === $changeset_status );
-			if ( $is_publish && ! current_user_can( get_post_type_object( 'customize_changeset' )->cap->publish_posts ) ) {
-				wp_send_json_error( 'changeset_publish_unauthorized', 403 );
+			$is_publish = ('publish' === $changeset_status || 'future' === $changeset_status);
+			if ($is_publish && ! current_user_can(get_post_type_object('customize_changeset')->cap->publish_posts)) {
+				wp_send_json_error('changeset_publish_unauthorized', 403);
 			}
 		}
 
@@ -2120,39 +2120,39 @@ 
 		 * or a string like "+10 minutes".
 		 */
 		$changeset_date_gmt = null;
-		if ( isset( $_POST['customize_changeset_date'] ) ) {
-			$changeset_date = wp_unslash( $_POST['customize_changeset_date'] );
-			if ( preg_match( '/^\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d$/', $changeset_date ) ) {
-				$mm = substr( $changeset_date, 5, 2 );
-				$jj = substr( $changeset_date, 8, 2 );
-				$aa = substr( $changeset_date, 0, 4 );
-				$valid_date = wp_checkdate( $mm, $jj, $aa, $changeset_date );
-				if ( ! $valid_date ) {
-					wp_send_json_error( 'bad_customize_changeset_date', 400 );
+		if (isset($_POST['customize_changeset_date'])) {
+			$changeset_date = wp_unslash($_POST['customize_changeset_date']);
+			if (preg_match('/^\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d$/', $changeset_date)) {
+				$mm = substr($changeset_date, 5, 2);
+				$jj = substr($changeset_date, 8, 2);
+				$aa = substr($changeset_date, 0, 4);
+				$valid_date = wp_checkdate($mm, $jj, $aa, $changeset_date);
+				if ( ! $valid_date) {
+					wp_send_json_error('bad_customize_changeset_date', 400);
 				}
-				$changeset_date_gmt = get_gmt_from_date( $changeset_date );
+				$changeset_date_gmt = get_gmt_from_date($changeset_date);
 			} else {
-				$timestamp = strtotime( $changeset_date );
-				if ( ! $timestamp ) {
-					wp_send_json_error( 'bad_customize_changeset_date', 400 );
+				$timestamp = strtotime($changeset_date);
+				if ( ! $timestamp) {
+					wp_send_json_error('bad_customize_changeset_date', 400);
 				}
-				$changeset_date_gmt = gmdate( 'Y-m-d H:i:s', $timestamp );
+				$changeset_date_gmt = gmdate('Y-m-d H:i:s', $timestamp);
 			}
 		}
 
-		$r = $this->save_changeset_post( array(
+		$r = $this->save_changeset_post(array(
 			'status' => $changeset_status,
 			'title' => $changeset_title,
 			'date_gmt' => $changeset_date_gmt,
 			'data' => $input_changeset_data,
-		) );
-		if ( is_wp_error( $r ) ) {
+		));
+		if (is_wp_error($r)) {
 			$response = array(
 				'message' => $r->get_error_message(),
 				'code' => $r->get_error_code(),
 			);
-			if ( is_array( $r->get_error_data() ) ) {
-				$response = array_merge( $response, $r->get_error_data() );
+			if (is_array($r->get_error_data())) {
+				$response = array_merge($response, $r->get_error_data());
 			} else {
 				$response['data'] = $r->get_error_data();
 			}
@@ -2160,18 +2160,18 @@ 
 			$response = $r;
 
 			// Note that if the changeset status was publish, then it will get set to trash if revisions are not supported.
-			$response['changeset_status'] = get_post_status( $this->changeset_post_id() );
-			if ( $is_publish && 'trash' === $response['changeset_status'] ) {
+			$response['changeset_status'] = get_post_status($this->changeset_post_id());
+			if ($is_publish && 'trash' === $response['changeset_status']) {
 				$response['changeset_status'] = 'publish';
 			}
 
-			if ( 'publish' === $response['changeset_status'] ) {
+			if ('publish' === $response['changeset_status']) {
 				$response['next_changeset_uuid'] = wp_generate_uuid4();
 			}
 		}
 
-		if ( isset( $response['setting_validities'] ) ) {
-			$response['setting_validities'] = array_map( array( $this, 'prepare_setting_validity_for_js' ), $response['setting_validities'] );
+		if (isset($response['setting_validities'])) {
+			$response['setting_validities'] = array_map(array($this, 'prepare_setting_validity_for_js'), $response['setting_validities']);
 		}
 
 		/**
@@ -2185,12 +2185,12 @@ 
 		 *                                       event on `wp.customize`.
 		 * @param WP_Customize_Manager $this     WP_Customize_Manager instance.
 		 */
-		$response = apply_filters( 'customize_save_response', $response, $this );
+		$response = apply_filters('customize_save_response', $response, $this);
 
-		if ( is_wp_error( $r ) ) {
-			wp_send_json_error( $response );
+		if (is_wp_error($r)) {
+			wp_send_json_error($response);
 		} else {
-			wp_send_json_success( $response );
+			wp_send_json_success($response);
 		}
 	}
 
@@ -2213,7 +2213,7 @@ 
 	 *
 	 * @return array|WP_Error Returns array on success and WP_Error with array data on error.
 	 */
-	function save_changeset_post( $args = array() ) {
+	function save_changeset_post($args = array()) {
 
 		$args = array_merge(
 			array(
@@ -2229,41 +2229,41 @@ 
 
 		$changeset_post_id = $this->changeset_post_id();
 		$existing_changeset_data = array();
-		if ( $changeset_post_id ) {
-			$existing_status = get_post_status( $changeset_post_id );
-			if ( 'publish' === $existing_status || 'trash' === $existing_status ) {
-				return new WP_Error( 'changeset_already_published' );
+		if ($changeset_post_id) {
+			$existing_status = get_post_status($changeset_post_id);
+			if ('publish' === $existing_status || 'trash' === $existing_status) {
+				return new WP_Error('changeset_already_published');
 			}
 
-			$existing_changeset_data = $this->get_changeset_post_data( $changeset_post_id );
+			$existing_changeset_data = $this->get_changeset_post_data($changeset_post_id);
 		}
 
 		// Fail if attempting to publish but publish hook is missing.
-		if ( 'publish' === $args['status'] && false === has_action( 'transition_post_status', '_wp_customize_publish_changeset' ) ) {
-			return new WP_Error( 'missing_publish_callback' );
+		if ('publish' === $args['status'] && false === has_action('transition_post_status', '_wp_customize_publish_changeset')) {
+			return new WP_Error('missing_publish_callback');
 		}
 
 		// Validate date.
-		$now = gmdate( 'Y-m-d H:i:59' );
-		if ( $args['date_gmt'] ) {
-			$is_future_dated = ( mysql2date( 'U', $args['date_gmt'], false ) > mysql2date( 'U', $now, false ) );
-			if ( ! $is_future_dated ) {
-				return new WP_Error( 'not_future_date' ); // Only future dates are allowed.
+		$now = gmdate('Y-m-d H:i:59');
+		if ($args['date_gmt']) {
+			$is_future_dated = (mysql2date('U', $args['date_gmt'], false) > mysql2date('U', $now, false));
+			if ( ! $is_future_dated) {
+				return new WP_Error('not_future_date'); // Only future dates are allowed.
 			}
 
-			if ( ! $this->is_theme_active() && ( 'future' === $args['status'] || $is_future_dated ) ) {
-				return new WP_Error( 'cannot_schedule_theme_switches' ); // This should be allowed in the future, when theme is a regular setting.
+			if ( ! $this->is_theme_active() && ('future' === $args['status'] || $is_future_dated)) {
+				return new WP_Error('cannot_schedule_theme_switches'); // This should be allowed in the future, when theme is a regular setting.
 			}
-			$will_remain_auto_draft = ( ! $args['status'] && ( ! $changeset_post_id || 'auto-draft' === get_post_status( $changeset_post_id ) ) );
-			if ( $will_remain_auto_draft ) {
-				return new WP_Error( 'cannot_supply_date_for_auto_draft_changeset' );
+			$will_remain_auto_draft = ( ! $args['status'] && ( ! $changeset_post_id || 'auto-draft' === get_post_status($changeset_post_id)));
+			if ($will_remain_auto_draft) {
+				return new WP_Error('cannot_supply_date_for_auto_draft_changeset');
 			}
-		} elseif ( $changeset_post_id && 'future' === $args['status'] ) {
+		} elseif ($changeset_post_id && 'future' === $args['status']) {
 
 			// Fail if the new status is future but the existing post's date is not in the future.
-			$changeset_post = get_post( $changeset_post_id );
-			if ( mysql2date( 'U', $changeset_post->post_date_gmt, false ) <= mysql2date( 'U', $now, false ) ) {
-				return new WP_Error( 'not_future_date' );
+			$changeset_post = get_post($changeset_post_id);
+			if (mysql2date('U', $changeset_post->post_date_gmt, false) <= mysql2date('U', $now, false)) {
+				return new WP_Error('not_future_date');
 			}
 		}
 
@@ -2272,18 +2272,18 @@ 
 		$allow_revision = (bool) $args['status'];
 
 		// Amend post values with any supplied data.
-		foreach ( $args['data'] as $setting_id => $setting_params ) {
-			if ( array_key_exists( 'value', $setting_params ) ) {
-				$this->set_post_value( $setting_id, $setting_params['value'] ); // Add to post values so that they can be validated and sanitized.
+		foreach ($args['data'] as $setting_id => $setting_params) {
+			if (array_key_exists('value', $setting_params)) {
+				$this->set_post_value($setting_id, $setting_params['value']); // Add to post values so that they can be validated and sanitized.
 			}
 		}
 
 		// Note that in addition to post data, this will include any stashed theme mods.
-		$post_values = $this->unsanitized_post_values( array(
+		$post_values = $this->unsanitized_post_values(array(
 			'exclude_changeset' => true,
 			'exclude_post_data' => false,
-		) );
-		$this->add_dynamic_settings( array_keys( $post_values ) ); // Ensure settings get created even if they lack an input value.
+		));
+		$this->add_dynamic_settings(array_keys($post_values)); // Ensure settings get created even if they lack an input value.
 
 		/*
 		 * Get list of IDs for settings that have values different from what is currently
@@ -2294,23 +2294,23 @@ 
 		 * previous saved settings and overriding the associated user_id if they made no change.
 		 */
 		$changed_setting_ids = array();
-		foreach ( $post_values as $setting_id => $setting_value ) {
-			$setting = $this->get_setting( $setting_id );
+		foreach ($post_values as $setting_id => $setting_value) {
+			$setting = $this->get_setting($setting_id);
 
-			if ( $setting && 'theme_mod' === $setting->type ) {
-				$prefixed_setting_id = $this->get_stylesheet() . '::' . $setting->id;
+			if ($setting && 'theme_mod' === $setting->type) {
+				$prefixed_setting_id = $this->get_stylesheet().'::'.$setting->id;
 			} else {
 				$prefixed_setting_id = $setting_id;
 			}
 
 			$is_value_changed = (
-				! isset( $existing_changeset_data[ $prefixed_setting_id ] )
+				! isset($existing_changeset_data[$prefixed_setting_id])
 				||
-				! array_key_exists( 'value', $existing_changeset_data[ $prefixed_setting_id ] )
+				! array_key_exists('value', $existing_changeset_data[$prefixed_setting_id])
 				||
-				$existing_changeset_data[ $prefixed_setting_id ]['value'] !== $setting_value
+				$existing_changeset_data[$prefixed_setting_id]['value'] !== $setting_value
 			);
-			if ( $is_value_changed ) {
+			if ($is_value_changed) {
 				$changed_setting_ids[] = $setting_id;
 			}
 		}
@@ -2326,82 +2326,82 @@ 
 		 *
 		 * @param WP_Customize_Manager $this WP_Customize_Manager instance.
 		 */
-		do_action( 'customize_save_validation_before', $this );
+		do_action('customize_save_validation_before', $this);
 
 		// Validate settings.
 		$validated_values = array_merge(
-			array_fill_keys( array_keys( $args['data'] ), null ), // Make sure existence/capability checks are done on value-less setting updates.
+			array_fill_keys(array_keys($args['data']), null), // Make sure existence/capability checks are done on value-less setting updates.
 			$post_values
 		);
-		$setting_validities = $this->validate_setting_values( $validated_values, array(
+		$setting_validities = $this->validate_setting_values($validated_values, array(
 			'validate_capability' => true,
 			'validate_existence' => true,
-		) );
-		$invalid_setting_count = count( array_filter( $setting_validities, 'is_wp_error' ) );
+		));
+		$invalid_setting_count = count(array_filter($setting_validities, 'is_wp_error'));
 
 		/*
 		 * Short-circuit if there are invalid settings the update is transactional.
 		 * A changeset update is transactional when a status is supplied in the request.
 		 */
-		if ( $update_transactionally && $invalid_setting_count > 0 ) {
+		if ($update_transactionally && $invalid_setting_count > 0) {
 			$response = array(
 				'setting_validities' => $setting_validities,
-				'message' => sprintf( _n( 'There is %s invalid setting.', 'There are %s invalid settings.', $invalid_setting_count ), number_format_i18n( $invalid_setting_count ) ),
+				'message' => sprintf(_n('There is %s invalid setting.', 'There are %s invalid settings.', $invalid_setting_count), number_format_i18n($invalid_setting_count)),
 			);
-			return new WP_Error( 'transaction_fail', '', $response );
+			return new WP_Error('transaction_fail', '', $response);
 		}
 
 		// Obtain/merge data for changeset.
-		$original_changeset_data = $this->get_changeset_post_data( $changeset_post_id );
+		$original_changeset_data = $this->get_changeset_post_data($changeset_post_id);
 		$data = $original_changeset_data;
-		if ( is_wp_error( $data ) ) {
+		if (is_wp_error($data)) {
 			$data = array();
 		}
 
 		// Ensure that all post values are included in the changeset data.
-		foreach ( $post_values as $setting_id => $post_value ) {
-			if ( ! isset( $args['data'][ $setting_id ] ) ) {
-				$args['data'][ $setting_id ] = array();
+		foreach ($post_values as $setting_id => $post_value) {
+			if ( ! isset($args['data'][$setting_id])) {
+				$args['data'][$setting_id] = array();
 			}
-			if ( ! isset( $args['data'][ $setting_id ]['value'] ) ) {
-				$args['data'][ $setting_id ]['value'] = $post_value;
+			if ( ! isset($args['data'][$setting_id]['value'])) {
+				$args['data'][$setting_id]['value'] = $post_value;
 			}
 		}
 
-		foreach ( $args['data'] as $setting_id => $setting_params ) {
-			$setting = $this->get_setting( $setting_id );
-			if ( ! $setting || ! $setting->check_capabilities() ) {
+		foreach ($args['data'] as $setting_id => $setting_params) {
+			$setting = $this->get_setting($setting_id);
+			if ( ! $setting || ! $setting->check_capabilities()) {
 				continue;
 			}
 
 			// Skip updating changeset for invalid setting values.
-			if ( isset( $setting_validities[ $setting_id ] ) && is_wp_error( $setting_validities[ $setting_id ] ) ) {
+			if (isset($setting_validities[$setting_id]) && is_wp_error($setting_validities[$setting_id])) {
 				continue;
 			}
 
 			$changeset_setting_id = $setting_id;
-			if ( 'theme_mod' === $setting->type ) {
-				$changeset_setting_id = sprintf( '%s::%s', $this->get_stylesheet(), $setting_id );
+			if ('theme_mod' === $setting->type) {
+				$changeset_setting_id = sprintf('%s::%s', $this->get_stylesheet(), $setting_id);
 			}
 
-			if ( null === $setting_params ) {
+			if (null === $setting_params) {
 				// Remove setting from changeset entirely.
-				unset( $data[ $changeset_setting_id ] );
+				unset($data[$changeset_setting_id]);
 			} else {
 
-				if ( ! isset( $data[ $changeset_setting_id ] ) ) {
-					$data[ $changeset_setting_id ] = array();
+				if ( ! isset($data[$changeset_setting_id])) {
+					$data[$changeset_setting_id] = array();
 				}
 
 				// Merge any additional setting params that have been supplied with the existing params.
-				$merged_setting_params = array_merge( $data[ $changeset_setting_id ], $setting_params );
+				$merged_setting_params = array_merge($data[$changeset_setting_id], $setting_params);
 
 				// Skip updating setting params if unchanged (ensuring the user_id is not overwritten).
-				if ( $data[ $changeset_setting_id ] === $merged_setting_params ) {
+				if ($data[$changeset_setting_id] === $merged_setting_params) {
 					continue;
 				}
 
-				$data[ $changeset_setting_id ] = array_merge(
+				$data[$changeset_setting_id] = array_merge(
 					$merged_setting_params,
 					array(
 						'type' => $setting->type,
@@ -2410,8 +2410,8 @@ 
 				);
 
 				// Clear starter_content flag in data if changeset is not explicitly being updated for starter content.
-				if ( empty( $args['starter_content'] ) ) {
-					unset( $data[ $changeset_setting_id ]['starter_content'] );
+				if (empty($args['starter_content'])) {
+					unset($data[$changeset_setting_id]['starter_content']);
 				}
 			}
 		}
@@ -2422,7 +2422,7 @@ 
 			'status' => $args['status'],
 			'date_gmt' => $args['date_gmt'],
 			'post_id' => $changeset_post_id,
-			'previous_data' => is_wp_error( $original_changeset_data ) ? array() : $original_changeset_data,
+			'previous_data' => is_wp_error($original_changeset_data) ? array() : $original_changeset_data,
 			'manager' => $this,
 		);
 
@@ -2446,82 +2446,82 @@ 
 		 *     @type WP_Customize_Manager $manager       Manager instance.
 		 * }
 		 */
-		$data = apply_filters( 'customize_changeset_save_data', $data, $filter_context );
+		$data = apply_filters('customize_changeset_save_data', $data, $filter_context);
 
 		// Switch theme if publishing changes now.
-		if ( 'publish' === $args['status'] && ! $this->is_theme_active() ) {
+		if ('publish' === $args['status'] && ! $this->is_theme_active()) {
 			// Temporarily stop previewing the theme to allow switch_themes() to operate properly.
 			$this->stop_previewing_theme();
-			switch_theme( $this->get_stylesheet() );
-			update_option( 'theme_switched_via_customizer', true );
+			switch_theme($this->get_stylesheet());
+			update_option('theme_switched_via_customizer', true);
 			$this->start_previewing_theme();
 		}
 
 		// Gather the data for wp_insert_post()/wp_update_post().
 		$json_options = 0;
-		if ( defined( 'JSON_UNESCAPED_SLASHES' ) ) {
+		if (defined('JSON_UNESCAPED_SLASHES')) {
 			$json_options |= JSON_UNESCAPED_SLASHES; // Introduced in PHP 5.4. This is only to improve readability as slashes needn't be escaped in storage.
 		}
 		$json_options |= JSON_PRETTY_PRINT; // Also introduced in PHP 5.4, but WP defines constant for back compat. See WP Trac #30139.
 		$post_array = array(
-			'post_content' => wp_json_encode( $data, $json_options ),
+			'post_content' => wp_json_encode($data, $json_options),
 		);
-		if ( $args['title'] ) {
+		if ($args['title']) {
 			$post_array['post_title'] = $args['title'];
 		}
-		if ( $changeset_post_id ) {
+		if ($changeset_post_id) {
 			$post_array['ID'] = $changeset_post_id;
 		} else {
 			$post_array['post_type'] = 'customize_changeset';
 			$post_array['post_name'] = $this->changeset_uuid();
 			$post_array['post_status'] = 'auto-draft';
 		}
-		if ( $args['status'] ) {
+		if ($args['status']) {
 			$post_array['post_status'] = $args['status'];
 		}
 
 		// Reset post date to now if we are publishing, otherwise pass post_date_gmt and translate for post_date.
-		if ( 'publish' === $args['status'] ) {
+		if ('publish' === $args['status']) {
 			$post_array['post_date_gmt'] = '0000-00-00 00:00:00';
 			$post_array['post_date'] = '0000-00-00 00:00:00';
-		} elseif ( $args['date_gmt'] ) {
+		} elseif ($args['date_gmt']) {
 			$post_array['post_date_gmt'] = $args['date_gmt'];
-			$post_array['post_date'] = get_date_from_gmt( $args['date_gmt'] );
+			$post_array['post_date'] = get_date_from_gmt($args['date_gmt']);
 		}
 
 		$this->store_changeset_revision = $allow_revision;
-		add_filter( 'wp_save_post_revision_post_has_changed', array( $this, '_filter_revision_post_has_changed' ), 5, 3 );
+		add_filter('wp_save_post_revision_post_has_changed', array($this, '_filter_revision_post_has_changed'), 5, 3);
 
 		// Update the changeset post. The publish_customize_changeset action will cause the settings in the changeset to be saved via WP_Customize_Setting::save().
-		$has_kses = ( false !== has_filter( 'content_save_pre', 'wp_filter_post_kses' ) );
-		if ( $has_kses ) {
+		$has_kses = (false !== has_filter('content_save_pre', 'wp_filter_post_kses'));
+		if ($has_kses) {
 			kses_remove_filters(); // Prevent KSES from corrupting JSON in post_content.
 		}
 
 		// Note that updating a post with publish status will trigger WP_Customize_Manager::publish_changeset_values().
-		if ( $changeset_post_id ) {
+		if ($changeset_post_id) {
 			$post_array['edit_date'] = true; // Prevent date clearing.
-			$r = wp_update_post( wp_slash( $post_array ), true );
+			$r = wp_update_post(wp_slash($post_array), true);
 		} else {
-			$r = wp_insert_post( wp_slash( $post_array ), true );
-			if ( ! is_wp_error( $r ) ) {
+			$r = wp_insert_post(wp_slash($post_array), true);
+			if ( ! is_wp_error($r)) {
 				$this->_changeset_post_id = $r; // Update cached post ID for the loaded changeset.
 			}
 		}
-		if ( $has_kses ) {
+		if ($has_kses) {
 			kses_init_filters();
 		}
 		$this->_changeset_data = null; // Reset so WP_Customize_Manager::changeset_data() will re-populate with updated contents.
 
-		remove_filter( 'wp_save_post_revision_post_has_changed', array( $this, '_filter_revision_post_has_changed' ) );
+		remove_filter('wp_save_post_revision_post_has_changed', array($this, '_filter_revision_post_has_changed'));
 
 		$response = array(
 			'setting_validities' => $setting_validities,
 		);
 
-		if ( is_wp_error( $r ) ) {
+		if (is_wp_error($r)) {
 			$response['changeset_post_save_failure'] = $r->get_error_code();
-			return new WP_Error( 'changeset_post_save_failure', '', $response );
+			return new WP_Error('changeset_post_save_failure', '', $response);
 		}
 
 		return $response;
@@ -2550,9 +2550,9 @@ 
 	 *
 	 * @return bool Whether a revision should be made.
 	 */
-	public function _filter_revision_post_has_changed( $post_has_changed, $last_revision, $post ) {
-		unset( $last_revision );
-		if ( 'customize_changeset' === $post->post_type ) {
+	public function _filter_revision_post_has_changed($post_has_changed, $last_revision, $post) {
+		unset($last_revision);
+		if ('customize_changeset' === $post->post_type) {
 			$post_has_changed = $this->store_changeset_revision;
 		}
 		return $post_has_changed;
@@ -2578,13 +2578,13 @@ 
 	 * @param int $changeset_post_id ID for customize_changeset post. Defaults to the changeset for the current manager instance.
 	 * @return true|WP_Error True or error info.
 	 */
-	public function _publish_changeset_values( $changeset_post_id ) {
-		$publishing_changeset_data = $this->get_changeset_post_data( $changeset_post_id );
-		if ( is_wp_error( $publishing_changeset_data ) ) {
+	public function _publish_changeset_values($changeset_post_id) {
+		$publishing_changeset_data = $this->get_changeset_post_data($changeset_post_id);
+		if (is_wp_error($publishing_changeset_data)) {
 			return $publishing_changeset_data;
 		}
 
-		$changeset_post = get_post( $changeset_post_id );
+		$changeset_post = get_post($changeset_post_id);
 
 		/*
 		 * Temporarily override the changeset context so that it will be read
@@ -2603,24 +2603,24 @@ 
 		$theme_mod_settings = array();
 		$namespace_pattern = '/^(?P<stylesheet>.+?)::(?P<setting_id>.+)$/';
 		$matches = array();
-		foreach ( $this->_changeset_data as $raw_setting_id => $setting_params ) {
+		foreach ($this->_changeset_data as $raw_setting_id => $setting_params) {
 			$actual_setting_id = null;
 			$is_theme_mod_setting = (
-				isset( $setting_params['value'] )
+				isset($setting_params['value'])
 				&&
-				isset( $setting_params['type'] )
+				isset($setting_params['type'])
 				&&
 				'theme_mod' === $setting_params['type']
 				&&
-				preg_match( $namespace_pattern, $raw_setting_id, $matches )
+				preg_match($namespace_pattern, $raw_setting_id, $matches)
 			);
-			if ( $is_theme_mod_setting ) {
-				if ( ! isset( $theme_mod_settings[ $matches['stylesheet'] ] ) ) {
-					$theme_mod_settings[ $matches['stylesheet'] ] = array();
+			if ($is_theme_mod_setting) {
+				if ( ! isset($theme_mod_settings[$matches['stylesheet']])) {
+					$theme_mod_settings[$matches['stylesheet']] = array();
 				}
-				$theme_mod_settings[ $matches['stylesheet'] ][ $matches['setting_id'] ] = $setting_params;
+				$theme_mod_settings[$matches['stylesheet']][$matches['setting_id']] = $setting_params;
 
-				if ( $this->get_stylesheet() === $matches['stylesheet'] ) {
+				if ($this->get_stylesheet() === $matches['stylesheet']) {
 					$actual_setting_id = $matches['setting_id'];
 				}
 			} else {
@@ -2628,17 +2628,17 @@ 
 			}
 
 			// Keep track of the user IDs for settings actually for this theme.
-			if ( $actual_setting_id && isset( $setting_params['user_id'] ) ) {
-				$setting_user_ids[ $actual_setting_id ] = $setting_params['user_id'];
+			if ($actual_setting_id && isset($setting_params['user_id'])) {
+				$setting_user_ids[$actual_setting_id] = $setting_params['user_id'];
 			}
 		}
 
-		$changeset_setting_values = $this->unsanitized_post_values( array(
+		$changeset_setting_values = $this->unsanitized_post_values(array(
 			'exclude_post_data' => true,
 			'exclude_changeset' => false,
-		) );
-		$changeset_setting_ids = array_keys( $changeset_setting_values );
-		$this->add_dynamic_settings( $changeset_setting_ids );
+		));
+		$changeset_setting_ids = array_keys($changeset_setting_values);
+		$this->add_dynamic_settings($changeset_setting_ids);
 
 		/**
 		 * Fires once the theme has switched in the Customizer, but before settings
@@ -2648,7 +2648,7 @@ 
 		 *
 		 * @param WP_Customize_Manager $manager WP_Customize_Manager instance.
 		 */
-		do_action( 'customize_save', $this );
+		do_action('customize_save', $this);
 
 		/*
 		 * Ensure that all settings will allow themselves to be saved. Note that
@@ -2657,18 +2657,18 @@ 
 		 * an additional capability check is not required here.
 		 */
 		$original_setting_capabilities = array();
-		foreach ( $changeset_setting_ids as $setting_id ) {
-			$setting = $this->get_setting( $setting_id );
-			if ( $setting && ! isset( $setting_user_ids[ $setting_id ] ) ) {
-				$original_setting_capabilities[ $setting->id ] = $setting->capability;
+		foreach ($changeset_setting_ids as $setting_id) {
+			$setting = $this->get_setting($setting_id);
+			if ($setting && ! isset($setting_user_ids[$setting_id])) {
+				$original_setting_capabilities[$setting->id] = $setting->capability;
 				$setting->capability = 'exist';
 			}
 		}
 
 		$original_user_id = get_current_user_id();
-		foreach ( $changeset_setting_ids as $setting_id ) {
-			$setting = $this->get_setting( $setting_id );
-			if ( $setting ) {
+		foreach ($changeset_setting_ids as $setting_id) {
+			$setting = $this->get_setting($setting_id);
+			if ($setting) {
 				/*
 				 * Set the current user to match the user who saved the value into
 				 * the changeset so that any filters that apply during the save
@@ -2676,22 +2676,22 @@ 
 				 * will ensure, for example, that KSES won't strip unsafe HTML
 				 * when a scheduled changeset publishes via WP Cron.
 				 */
-				if ( isset( $setting_user_ids[ $setting_id ] ) ) {
-					wp_set_current_user( $setting_user_ids[ $setting_id ] );
+				if (isset($setting_user_ids[$setting_id])) {
+					wp_set_current_user($setting_user_ids[$setting_id]);
 				} else {
-					wp_set_current_user( $original_user_id );
+					wp_set_current_user($original_user_id);
 				}
 
 				$setting->save();
 			}
 		}
-		wp_set_current_user( $original_user_id );
+		wp_set_current_user($original_user_id);
 
 		// Update the stashed theme mod settings, removing the active theme's stashed settings, if activated.
-		if ( did_action( 'switch_theme' ) ) {
+		if (did_action('switch_theme')) {
 			$other_theme_mod_settings = $theme_mod_settings;
-			unset( $other_theme_mod_settings[ $this->get_stylesheet() ] );
-			$this->update_stashed_theme_mod_settings( $other_theme_mod_settings );
+			unset($other_theme_mod_settings[$this->get_stylesheet()]);
+			$this->update_stashed_theme_mod_settings($other_theme_mod_settings);
 		}
 
 		/**
@@ -2701,12 +2701,12 @@ 
 		 *
 		 * @param WP_Customize_Manager $manager WP_Customize_Manager instance.
 		 */
-		do_action( 'customize_save_after', $this );
+		do_action('customize_save_after', $this);
 
 		// Restore original capabilities.
-		foreach ( $original_setting_capabilities as $setting_id => $capability ) {
-			$setting = $this->get_setting( $setting_id );
-			if ( $setting ) {
+		foreach ($original_setting_capabilities as $setting_id => $capability) {
+			$setting = $this->get_setting($setting_id);
+			if ($setting) {
 				$setting->capability = $capability;
 			}
 		}
@@ -2728,30 +2728,30 @@ 
 	 * @param array $inactive_theme_mod_settings Mapping of stylesheet to arrays of theme mod settings.
 	 * @return array|false Returns array of updated stashed theme mods or false if the update failed or there were no changes.
 	 */
-	protected function update_stashed_theme_mod_settings( $inactive_theme_mod_settings ) {
-		$stashed_theme_mod_settings = get_option( 'customize_stashed_theme_mods' );
-		if ( empty( $stashed_theme_mod_settings ) ) {
+	protected function update_stashed_theme_mod_settings($inactive_theme_mod_settings) {
+		$stashed_theme_mod_settings = get_option('customize_stashed_theme_mods');
+		if (empty($stashed_theme_mod_settings)) {
 			$stashed_theme_mod_settings = array();
 		}
 
 		// Delete any stashed theme mods for the active theme since since they would have been loaded and saved upon activation.
-		unset( $stashed_theme_mod_settings[ $this->get_stylesheet() ] );
+		unset($stashed_theme_mod_settings[$this->get_stylesheet()]);
 
 		// Merge inactive theme mods with the stashed theme mod settings.
-		foreach ( $inactive_theme_mod_settings as $stylesheet => $theme_mod_settings ) {
-			if ( ! isset( $stashed_theme_mod_settings[ $stylesheet ] ) ) {
-				$stashed_theme_mod_settings[ $stylesheet ] = array();
+		foreach ($inactive_theme_mod_settings as $stylesheet => $theme_mod_settings) {
+			if ( ! isset($stashed_theme_mod_settings[$stylesheet])) {
+				$stashed_theme_mod_settings[$stylesheet] = array();
 			}
 
-			$stashed_theme_mod_settings[ $stylesheet ] = array_merge(
-				$stashed_theme_mod_settings[ $stylesheet ],
+			$stashed_theme_mod_settings[$stylesheet] = array_merge(
+				$stashed_theme_mod_settings[$stylesheet],
 				$theme_mod_settings
 			);
 		}
 
 		$autoload = false;
-		$result = update_option( 'customize_stashed_theme_mods', $stashed_theme_mod_settings, $autoload );
-		if ( ! $result ) {
+		$result = update_option('customize_stashed_theme_mods', $stashed_theme_mod_settings, $autoload);
+		if ( ! $result) {
 			return false;
 		}
 		return $stashed_theme_mod_settings;
@@ -2763,11 +2763,11 @@ 
 	 * @since 4.2.0
 	 */
 	public function refresh_nonces() {
-		if ( ! $this->is_preview() ) {
-			wp_send_json_error( 'not_preview' );
+		if ( ! $this->is_preview()) {
+			wp_send_json_error('not_preview');
 		}
 
-		wp_send_json_success( $this->get_nonces() );
+		wp_send_json_success($this->get_nonces());
 	}
 
 	/**
@@ -2782,22 +2782,22 @@ 
 	 *                                          constructor.
 	 * @return WP_Customize_Setting             The instance of the setting that was added.
 	 */
-	public function add_setting( $id, $args = array() ) {
-		if ( $id instanceof WP_Customize_Setting ) {
+	public function add_setting($id, $args = array()) {
+		if ($id instanceof WP_Customize_Setting) {
 			$setting = $id;
 		} else {
 			$class = 'WP_Customize_Setting';
 
 			/** This filter is documented in wp-includes/class-wp-customize-manager.php */
-			$args = apply_filters( 'customize_dynamic_setting_args', $args, $id );
+			$args = apply_filters('customize_dynamic_setting_args', $args, $id);
 
 			/** This filter is documented in wp-includes/class-wp-customize-manager.php */
-			$class = apply_filters( 'customize_dynamic_setting_class', $class, $id, $args );
+			$class = apply_filters('customize_dynamic_setting_class', $class, $id, $args);
 
-			$setting = new $class( $this, $id, $args );
+			$setting = new $class($this, $id, $args);
 		}
 
-		$this->settings[ $setting->id ] = $setting;
+		$this->settings[$setting->id] = $setting;
 		return $setting;
 	}
 
@@ -2816,11 +2816,11 @@ 
 	 * @param array $setting_ids The setting IDs to add.
 	 * @return array The WP_Customize_Setting objects added.
 	 */
-	public function add_dynamic_settings( $setting_ids ) {
+	public function add_dynamic_settings($setting_ids) {
 		$new_settings = array();
-		foreach ( $setting_ids as $setting_id ) {
+		foreach ($setting_ids as $setting_id) {
 			// Skip settings already created
-			if ( $this->get_setting( $setting_id ) ) {
+			if ($this->get_setting($setting_id)) {
 				continue;
 			}
 
@@ -2839,8 +2839,8 @@ 
 			 * @param false|array $setting_args The arguments to the WP_Customize_Setting constructor.
 			 * @param string      $setting_id   ID for dynamic setting, usually coming from `$_POST['customized']`.
 			 */
-			$setting_args = apply_filters( 'customize_dynamic_setting_args', $setting_args, $setting_id );
-			if ( false === $setting_args ) {
+			$setting_args = apply_filters('customize_dynamic_setting_args', $setting_args, $setting_id);
+			if (false === $setting_args) {
 				continue;
 			}
 
@@ -2853,11 +2853,11 @@ 
 			 * @param string $setting_id    ID for dynamic setting, usually coming from `$_POST['customized']`.
 			 * @param array  $setting_args  WP_Customize_Setting or a subclass.
 			 */
-			$setting_class = apply_filters( 'customize_dynamic_setting_class', $setting_class, $setting_id, $setting_args );
+			$setting_class = apply_filters('customize_dynamic_setting_class', $setting_class, $setting_id, $setting_args);
 
-			$setting = new $setting_class( $this, $setting_id, $setting_args );
+			$setting = new $setting_class($this, $setting_id, $setting_args);
 
-			$this->add_setting( $setting );
+			$this->add_setting($setting);
 			$new_settings[] = $setting;
 		}
 		return $new_settings;
@@ -2871,9 +2871,9 @@ 
 	 * @param string $id Customize Setting ID.
 	 * @return WP_Customize_Setting|void The setting, if set.
 	 */
-	public function get_setting( $id ) {
-		if ( isset( $this->settings[ $id ] ) ) {
-			return $this->settings[ $id ];
+	public function get_setting($id) {
+		if (isset($this->settings[$id])) {
+			return $this->settings[$id];
 		}
 	}
 
@@ -2884,8 +2884,8 @@ 
 	 *
 	 * @param string $id Customize Setting ID.
 	 */
-	public function remove_setting( $id ) {
-		unset( $this->settings[ $id ] );
+	public function remove_setting($id) {
+		unset($this->settings[$id]);
 	}
 
 	/**
@@ -2900,14 +2900,14 @@ 
 	 *
 	 * @return WP_Customize_Panel             The instance of the panel that was added.
 	 */
-	public function add_panel( $id, $args = array() ) {
-		if ( $id instanceof WP_Customize_Panel ) {
+	public function add_panel($id, $args = array()) {
+		if ($id instanceof WP_Customize_Panel) {
 			$panel = $id;
 		} else {
-			$panel = new WP_Customize_Panel( $this, $id, $args );
+			$panel = new WP_Customize_Panel($this, $id, $args);
 		}
 
-		$this->panels[ $panel->id ] = $panel;
+		$this->panels[$panel->id] = $panel;
 		return $panel;
 	}
 
@@ -2920,9 +2920,9 @@ 
 	 * @param string $id Panel ID to get.
 	 * @return WP_Customize_Panel|void Requested panel instance, if set.
 	 */
-	public function get_panel( $id ) {
-		if ( isset( $this->panels[ $id ] ) ) {
-			return $this->panels[ $id ];
+	public function get_panel($id) {
+		if (isset($this->panels[$id])) {
+			return $this->panels[$id];
 		}
 	}
 
@@ -2934,18 +2934,18 @@ 
 	 *
 	 * @param string $id Panel ID to remove.
 	 */
-	public function remove_panel( $id ) {
+	public function remove_panel($id) {
 		// Removing core components this way is _doing_it_wrong().
-		if ( in_array( $id, $this->components, true ) ) {
+		if (in_array($id, $this->components, true)) {
 			/* translators: 1: panel id, 2: link to 'customize_loaded_components' filter reference */
-			$message = sprintf( __( 'Removing %1$s manually will cause PHP warnings. Use the %2$s filter instead.' ),
+			$message = sprintf(__('Removing %1$s manually will cause PHP warnings. Use the %2$s filter instead.'),
 				$id,
-				'<a href="' . esc_url( 'https://developer.wordpress.org/reference/hooks/customize_loaded_components/' ) . '"><code>customize_loaded_components</code></a>'
+				'<a href="'.esc_url('https://developer.wordpress.org/reference/hooks/customize_loaded_components/').'"><code>customize_loaded_components</code></a>'
 			);
 
-			_doing_it_wrong( __METHOD__, $message, '4.5.0' );
+			_doing_it_wrong(__METHOD__, $message, '4.5.0');
 		}
-		unset( $this->panels[ $id ] );
+		unset($this->panels[$id]);
 	}
 
 	/**
@@ -2960,7 +2960,7 @@ 
 	 *
 	 * @param string $panel Name of a custom panel which is a subclass of WP_Customize_Panel.
 	 */
-	public function register_panel_type( $panel ) {
+	public function register_panel_type($panel) {
 		$this->registered_panel_types[] = $panel;
 	}
 
@@ -2971,8 +2971,8 @@ 
 	 * @access public
 	 */
 	public function render_panel_templates() {
-		foreach ( $this->registered_panel_types as $panel_type ) {
-			$panel = new $panel_type( $this, 'temp', array() );
+		foreach ($this->registered_panel_types as $panel_type) {
+			$panel = new $panel_type($this, 'temp', array());
 			$panel->print_template();
 		}
 	}
@@ -2989,14 +2989,14 @@ 
 	 *
 	 * @return WP_Customize_Section             The instance of the section that was added.
 	 */
-	public function add_section( $id, $args = array() ) {
-		if ( $id instanceof WP_Customize_Section ) {
+	public function add_section($id, $args = array()) {
+		if ($id instanceof WP_Customize_Section) {
 			$section = $id;
 		} else {
-			$section = new WP_Customize_Section( $this, $id, $args );
+			$section = new WP_Customize_Section($this, $id, $args);
 		}
 
-		$this->sections[ $section->id ] = $section;
+		$this->sections[$section->id] = $section;
 		return $section;
 	}
 
@@ -3008,9 +3008,9 @@ 
 	 * @param string $id Section ID.
 	 * @return WP_Customize_Section|void The section, if set.
 	 */
-	public function get_section( $id ) {
-		if ( isset( $this->sections[ $id ] ) )
-			return $this->sections[ $id ];
+	public function get_section($id) {
+		if (isset($this->sections[$id]))
+			return $this->sections[$id];
 	}
 
 	/**
@@ -3020,8 +3020,8 @@ 
 	 *
 	 * @param string $id Section ID.
 	 */
-	public function remove_section( $id ) {
-		unset( $this->sections[ $id ] );
+	public function remove_section($id) {
+		unset($this->sections[$id]);
 	}
 
 	/**
@@ -3036,7 +3036,7 @@ 
 	 *
 	 * @param string $section Name of a custom section which is a subclass of WP_Customize_Section.
 	 */
-	public function register_section_type( $section ) {
+	public function register_section_type($section) {
 		$this->registered_section_types[] = $section;
 	}
 
@@ -3047,8 +3047,8 @@ 
 	 * @access public
 	 */
 	public function render_section_templates() {
-		foreach ( $this->registered_section_types as $section_type ) {
-			$section = new $section_type( $this, 'temp', array() );
+		foreach ($this->registered_section_types as $section_type) {
+			$section = new $section_type($this, 'temp', array());
 			$section->print_template();
 		}
 	}
@@ -3065,14 +3065,14 @@ 
 	 *                                          constructor.
 	 * @return WP_Customize_Control             The instance of the control that was added.
 	 */
-	public function add_control( $id, $args = array() ) {
-		if ( $id instanceof WP_Customize_Control ) {
+	public function add_control($id, $args = array()) {
+		if ($id instanceof WP_Customize_Control) {
 			$control = $id;
 		} else {
-			$control = new WP_Customize_Control( $this, $id, $args );
+			$control = new WP_Customize_Control($this, $id, $args);
 		}
 
-		$this->controls[ $control->id ] = $control;
+		$this->controls[$control->id] = $control;
 		return $control;
 	}
 
@@ -3084,9 +3084,9 @@ 
 	 * @param string $id ID of the control.
 	 * @return WP_Customize_Control|void The control object, if set.
 	 */
-	public function get_control( $id ) {
-		if ( isset( $this->controls[ $id ] ) )
-			return $this->controls[ $id ];
+	public function get_control($id) {
+		if (isset($this->controls[$id]))
+			return $this->controls[$id];
 	}
 
 	/**
@@ -3096,8 +3096,8 @@ 
 	 *
 	 * @param string $id ID of the control.
 	 */
-	public function remove_control( $id ) {
-		unset( $this->controls[ $id ] );
+	public function remove_control($id) {
+		unset($this->controls[$id]);
 	}
 
 	/**
@@ -3111,7 +3111,7 @@ 
 	 * @param string $control Name of a custom control which is a subclass of
 	 *                        WP_Customize_Control.
 	 */
-	public function register_control_type( $control ) {
+	public function register_control_type($control) {
 		$this->registered_control_types[] = $control;
 	}
 
@@ -3122,10 +3122,10 @@ 
 	 * @access public
 	 */
 	public function render_control_templates() {
-		foreach ( $this->registered_control_types as $control_type ) {
-			$control = new $control_type( $this, 'temp', array(
+		foreach ($this->registered_control_types as $control_type) {
+			$control = new $control_type($this, 'temp', array(
 				'settings' => array(),
-			) );
+			));
 			$control->print_template();
 		}
 		?>
@@ -3149,10 +3149,10 @@ 
 	 * @param WP_Customize_Panel|WP_Customize_Section|WP_Customize_Control $b Object B.
 	 * @return int
 	 */
-	protected function _cmp_priority( $a, $b ) {
-		_deprecated_function( __METHOD__, '4.7.0', 'wp_list_sort' );
+	protected function _cmp_priority($a, $b) {
+		_deprecated_function(__METHOD__, '4.7.0', 'wp_list_sort');
 
-		if ( $a->priority === $b->priority ) {
+		if ($a->priority === $b->priority) {
 			return $a->instance_number - $b->instance_number;
 		} else {
 			return $a->priority - $b->priority;
@@ -3171,77 +3171,77 @@ 
 	public function prepare_controls() {
 
 		$controls = array();
-		$this->controls = wp_list_sort( $this->controls, array(
+		$this->controls = wp_list_sort($this->controls, array(
 			'priority'        => 'ASC',
 			'instance_number' => 'ASC',
-		), 'ASC', true );
+		), 'ASC', true);
 
-		foreach ( $this->controls as $id => $control ) {
-			if ( ! isset( $this->sections[ $control->section ] ) || ! $control->check_capabilities() ) {
+		foreach ($this->controls as $id => $control) {
+			if ( ! isset($this->sections[$control->section]) || ! $control->check_capabilities()) {
 				continue;
 			}
 
-			$this->sections[ $control->section ]->controls[] = $control;
-			$controls[ $id ] = $control;
+			$this->sections[$control->section]->controls[] = $control;
+			$controls[$id] = $control;
 		}
 		$this->controls = $controls;
 
 		// Prepare sections.
-		$this->sections = wp_list_sort( $this->sections, array(
+		$this->sections = wp_list_sort($this->sections, array(
 			'priority'        => 'ASC',
 			'instance_number' => 'ASC',
-		), 'ASC', true );
+		), 'ASC', true);
 		$sections = array();
 
-		foreach ( $this->sections as $section ) {
-			if ( ! $section->check_capabilities() ) {
+		foreach ($this->sections as $section) {
+			if ( ! $section->check_capabilities()) {
 				continue;
 			}
 
 
-			$section->controls = wp_list_sort( $section->controls, array(
+			$section->controls = wp_list_sort($section->controls, array(
 				'priority'        => 'ASC',
 				'instance_number' => 'ASC',
-			) );
+			));
 
-			if ( ! $section->panel ) {
+			if ( ! $section->panel) {
 				// Top-level section.
-				$sections[ $section->id ] = $section;
+				$sections[$section->id] = $section;
 			} else {
 				// This section belongs to a panel.
-				if ( isset( $this->panels [ $section->panel ] ) ) {
-					$this->panels[ $section->panel ]->sections[ $section->id ] = $section;
+				if (isset($this->panels [$section->panel])) {
+					$this->panels[$section->panel]->sections[$section->id] = $section;
 				}
 			}
 		}
 		$this->sections = $sections;
 
 		// Prepare panels.
-		$this->panels = wp_list_sort( $this->panels, array(
+		$this->panels = wp_list_sort($this->panels, array(
 			'priority'        => 'ASC',
 			'instance_number' => 'ASC',
-		), 'ASC', true );
+		), 'ASC', true);
 		$panels = array();
 
-		foreach ( $this->panels as $panel ) {
-			if ( ! $panel->check_capabilities() ) {
+		foreach ($this->panels as $panel) {
+			if ( ! $panel->check_capabilities()) {
 				continue;
 			}
 
-			$panel->sections = wp_list_sort( $panel->sections, array(
+			$panel->sections = wp_list_sort($panel->sections, array(
 				'priority'        => 'ASC',
 				'instance_number' => 'ASC',
-			), 'ASC', true );
-			$panels[ $panel->id ] = $panel;
+			), 'ASC', true);
+			$panels[$panel->id] = $panel;
 		}
 		$this->panels = $panels;
 
 		// Sort panels and top-level sections together.
-		$this->containers = array_merge( $this->panels, $this->sections );
-		$this->containers = wp_list_sort( $this->containers, array(
+		$this->containers = array_merge($this->panels, $this->sections);
+		$this->containers = wp_list_sort($this->containers, array(
 			'priority'        => 'ASC',
 			'instance_number' => 'ASC',
-		), 'ASC', true );
+		), 'ASC', true);
 	}
 
 	/**
@@ -3250,7 +3250,7 @@ 
 	 * @since 3.4.0
 	 */
 	public function enqueue_control_scripts() {
-		foreach ( $this->controls as $control ) {
+		foreach ($this->controls as $control) {
 			$control->enqueue();
 		}
 	}
@@ -3264,7 +3264,7 @@ 
 	 * @return bool Whether the user agent is iOS.
 	 */
 	public function is_ios() {
-		return wp_is_mobile() && preg_match( '/iPad|iPod|iPhone/', $_SERVER['HTTP_USER_AGENT'] );
+		return wp_is_mobile() && preg_match('/iPad|iPod|iPhone/', $_SERVER['HTTP_USER_AGENT']);
 	}
 
 	/**
@@ -3276,14 +3276,14 @@ 
 	 * @return string The template string for the document title.
 	 */
 	public function get_document_title_template() {
-		if ( $this->is_theme_active() ) {
+		if ($this->is_theme_active()) {
 			/* translators: %s: document title from the preview */
-			$document_title_tmpl = __( 'Customize: %s' );
+			$document_title_tmpl = __('Customize: %s');
 		} else {
 			/* translators: %s: document title from the preview */
-			$document_title_tmpl = __( 'Live Preview: %s' );
+			$document_title_tmpl = __('Live Preview: %s');
 		}
-		$document_title_tmpl = html_entity_decode( $document_title_tmpl, ENT_QUOTES, 'UTF-8' ); // Because exported to JS and assigned to document.title.
+		$document_title_tmpl = html_entity_decode($document_title_tmpl, ENT_QUOTES, 'UTF-8'); // Because exported to JS and assigned to document.title.
 		return $document_title_tmpl;
 	}
 
@@ -3297,9 +3297,9 @@ 
 	 *
 	 * @param string $preview_url URL to be previewed.
 	 */
-	public function set_preview_url( $preview_url ) {
-		$preview_url = esc_url_raw( $preview_url );
-		$this->preview_url = wp_validate_redirect( $preview_url, home_url( '/' ) );
+	public function set_preview_url($preview_url) {
+		$preview_url = esc_url_raw($preview_url);
+		$this->preview_url = wp_validate_redirect($preview_url, home_url('/'));
 	}
 
 	/**
@@ -3311,8 +3311,8 @@ 
 	 * @return string URL being previewed.
 	 */
 	public function get_preview_url() {
-		if ( empty( $this->preview_url ) ) {
-			$preview_url = home_url( '/' );
+		if (empty($this->preview_url)) {
+			$preview_url = home_url('/');
 		} else {
 			$preview_url = $this->preview_url;
 		}
@@ -3328,9 +3328,9 @@ 
 	 * @return bool Whether cross-domain.
 	 */
 	public function is_cross_domain() {
-		$admin_origin = wp_parse_url( admin_url() );
-		$home_origin = wp_parse_url( home_url() );
-		$cross_domain = ( strtolower( $admin_origin['host'] ) !== strtolower( $home_origin['host'] ) );
+		$admin_origin = wp_parse_url(admin_url());
+		$home_origin = wp_parse_url(home_url());
+		$cross_domain = (strtolower($admin_origin['host']) !== strtolower($home_origin['host']));
 		return $cross_domain;
 	}
 
@@ -3350,10 +3350,10 @@ 
 	 * @returns array Allowed URLs.
 	 */
 	public function get_allowed_urls() {
-		$allowed_urls = array( home_url( '/' ) );
+		$allowed_urls = array(home_url('/'));
 
-		if ( is_ssl() && ! $this->is_cross_domain() ) {
-			$allowed_urls[] = home_url( '/', 'https' );
+		if (is_ssl() && ! $this->is_cross_domain()) {
+			$allowed_urls[] = home_url('/', 'https');
 		}
 
 		/**
@@ -3363,7 +3363,7 @@ 
 		 *
 		 * @param array $allowed_urls An array of allowed URLs.
 		 */
-		$allowed_urls = array_unique( apply_filters( 'customize_allowed_urls', $allowed_urls ) );
+		$allowed_urls = array_unique(apply_filters('customize_allowed_urls', $allowed_urls));
 
 		return $allowed_urls;
 	}
@@ -3390,10 +3390,10 @@ 
 	 *
 	 * @param string $return_url URL for return link.
 	 */
-	public function set_return_url( $return_url ) {
-		$return_url = esc_url_raw( $return_url );
-		$return_url = remove_query_arg( wp_removable_query_args(), $return_url );
-		$return_url = wp_validate_redirect( $return_url );
+	public function set_return_url($return_url) {
+		$return_url = esc_url_raw($return_url);
+		$return_url = remove_query_arg(wp_removable_query_args(), $return_url);
+		$return_url = wp_validate_redirect($return_url);
 		$this->return_url = $return_url;
 	}
 
@@ -3407,16 +3407,16 @@ 
 	 */
 	public function get_return_url() {
 		$referer = wp_get_referer();
-		$excluded_referer_basenames = array( 'customize.php', 'wp-login.php' );
+		$excluded_referer_basenames = array('customize.php', 'wp-login.php');
 
-		if ( $this->return_url ) {
+		if ($this->return_url) {
 			$return_url = $this->return_url;
-		} else if ( $referer && ! in_array( basename( parse_url( $referer, PHP_URL_PATH ) ), $excluded_referer_basenames, true ) ) {
+		} else if ($referer && ! in_array(basename(parse_url($referer, PHP_URL_PATH)), $excluded_referer_basenames, true)) {
 			$return_url = $referer;
-		} else if ( $this->preview_url ) {
+		} else if ($this->preview_url) {
 			$return_url = $this->preview_url;
 		} else {
-			$return_url = home_url( '/' );
+			$return_url = home_url('/');
 		}
 		return $return_url;
 	}
@@ -3435,8 +3435,8 @@ 
 	 *     @type string [$panel]    ID for panel to be autofocused.
 	 * }
 	 */
-	public function set_autofocus( $autofocus ) {
-		$this->autofocus = array_filter( wp_array_slice_assoc( $autofocus, array( 'panel', 'section', 'control' ) ), 'is_string' );
+	public function set_autofocus($autofocus) {
+		$this->autofocus = array_filter(wp_array_slice_assoc($autofocus, array('panel', 'section', 'control')), 'is_string');
 	}
 
 	/**
@@ -3465,8 +3465,8 @@ 
 	 */
 	public function get_nonces() {
 		$nonces = array(
-			'save' => wp_create_nonce( 'save-customize_' . $this->get_stylesheet() ),
-			'preview' => wp_create_nonce( 'preview-customize_' . $this->get_stylesheet() ),
+			'save' => wp_create_nonce('save-customize_'.$this->get_stylesheet()),
+			'preview' => wp_create_nonce('preview-customize_'.$this->get_stylesheet()),
 		);
 
 		/**
@@ -3478,7 +3478,7 @@ 
 		 *                                     preview actions.
 		 * @param WP_Customize_Manager $this   WP_Customize_Manager instance.
 		 */
-		$nonces = apply_filters( 'customize_refresh_nonces', $nonces, $this );
+		$nonces = apply_filters('customize_refresh_nonces', $nonces, $this);
 
 		return $nonces;
 	}
@@ -3490,15 +3490,15 @@ 
 	 */
 	public function customize_pane_settings() {
 
-		$login_url = add_query_arg( array(
+		$login_url = add_query_arg(array(
 			'interim-login' => 1,
 			'customize-login' => 1,
-		), wp_login_url() );
+		), wp_login_url());
 
 		// Ensure dirty flags are set for modified settings.
-		foreach ( array_keys( $this->unsanitized_post_values() ) as $setting_id ) {
-			$setting = $this->get_setting( $setting_id );
-			if ( $setting ) {
+		foreach (array_keys($this->unsanitized_post_values()) as $setting_id) {
+			$setting = $this->get_setting($setting_id);
+			if ($setting) {
 				$setting->dirty = true;
 			}
 		}
@@ -3507,7 +3507,7 @@ 
 		$settings = array(
 			'changeset' => array(
 				'uuid' => $this->changeset_uuid(),
-				'status' => $this->changeset_post_id() ? get_post_status( $this->changeset_post_id() ) : '',
+				'status' => $this->changeset_post_id() ? get_post_status($this->changeset_post_id()) : '',
 			),
 			'timeouts' => array(
 				'windowRefresh' => 250,
@@ -3521,14 +3521,14 @@ 
 				'active'     => $this->is_theme_active(),
 			),
 			'url'      => array(
-				'preview'       => esc_url_raw( $this->get_preview_url() ),
-				'parent'        => esc_url_raw( admin_url() ),
-				'activated'     => esc_url_raw( home_url( '/' ) ),
-				'ajax'          => esc_url_raw( admin_url( 'admin-ajax.php', 'relative' ) ),
-				'allowed'       => array_map( 'esc_url_raw', $this->get_allowed_urls() ),
+				'preview'       => esc_url_raw($this->get_preview_url()),
+				'parent'        => esc_url_raw(admin_url()),
+				'activated'     => esc_url_raw(home_url('/')),
+				'ajax'          => esc_url_raw(admin_url('admin-ajax.php', 'relative')),
+				'allowed'       => array_map('esc_url_raw', $this->get_allowed_urls()),
 				'isCrossDomain' => $this->is_cross_domain(),
-				'home'          => esc_url_raw( home_url( '/' ) ),
-				'login'         => esc_url_raw( $login_url ),
+				'home'          => esc_url_raw(home_url('/')),
+				'login'         => esc_url_raw($login_url),
 			),
 			'browser'  => array(
 				'mobile' => wp_is_mobile(),
@@ -3543,19 +3543,19 @@ 
 		);
 
 		// Prepare Customize Section objects to pass to JavaScript.
-		foreach ( $this->sections() as $id => $section ) {
-			if ( $section->check_capabilities() ) {
-				$settings['sections'][ $id ] = $section->json();
+		foreach ($this->sections() as $id => $section) {
+			if ($section->check_capabilities()) {
+				$settings['sections'][$id] = $section->json();
 			}
 		}
 
 		// Prepare Customize Panel objects to pass to JavaScript.
-		foreach ( $this->panels() as $panel_id => $panel ) {
-			if ( $panel->check_capabilities() ) {
-				$settings['panels'][ $panel_id ] = $panel->json();
-				foreach ( $panel->sections as $section_id => $section ) {
-					if ( $section->check_capabilities() ) {
-						$settings['sections'][ $section_id ] = $section->json();
+		foreach ($this->panels() as $panel_id => $panel) {
+			if ($panel->check_capabilities()) {
+				$settings['panels'][$panel_id] = $panel->json();
+				foreach ($panel->sections as $section_id => $section) {
+					if ($section->check_capabilities()) {
+						$settings['sections'][$section_id] = $section->json();
 					}
 				}
 			}
@@ -3563,19 +3563,19 @@ 
 
 		?>
 		<script type="text/javascript">
-			var _wpCustomizeSettings = <?php echo wp_json_encode( $settings ); ?>;
+			var _wpCustomizeSettings = <?php echo wp_json_encode($settings); ?>;
 			_wpCustomizeSettings.controls = {};
 			_wpCustomizeSettings.settings = {};
 			<?php
 
 			// Serialize settings one by one to improve memory usage.
 			echo "(function ( s ){\n";
-			foreach ( $this->settings() as $setting ) {
-				if ( $setting->check_capabilities() ) {
+			foreach ($this->settings() as $setting) {
+				if ($setting->check_capabilities()) {
 					printf(
 						"s[%s] = %s;\n",
-						wp_json_encode( $setting->id ),
-						wp_json_encode( $setting->json() )
+						wp_json_encode($setting->id),
+						wp_json_encode($setting->json())
 					);
 				}
 			}
@@ -3583,12 +3583,12 @@ 
 
 			// Serialize controls one by one to improve memory usage.
 			echo "(function ( c ){\n";
-			foreach ( $this->controls() as $control ) {
-				if ( $control->check_capabilities() ) {
+			foreach ($this->controls() as $control) {
+				if ($control->check_capabilities()) {
 					printf(
 						"c[%s] = %s;\n",
-						wp_json_encode( $control->id ),
-						wp_json_encode( $control->json() )
+						wp_json_encode($control->id),
+						wp_json_encode($control->json())
 					);
 				}
 			}
@@ -3609,14 +3609,14 @@ 
 	public function get_previewable_devices() {
 		$devices = array(
 			'desktop' => array(
-				'label' => __( 'Enter desktop preview mode' ),
+				'label' => __('Enter desktop preview mode'),
 				'default' => true,
 			),
 			'tablet' => array(
-				'label' => __( 'Enter tablet preview mode' ),
+				'label' => __('Enter tablet preview mode'),
 			),
 			'mobile' => array(
-				'label' => __( 'Enter mobile preview mode' ),
+				'label' => __('Enter mobile preview mode'),
 			),
 		);
 
@@ -3629,7 +3629,7 @@ 
 		 *
 		 * @param array $devices List of devices with labels and default setting.
 		 */
-		$devices = apply_filters( 'customize_previewable_devices', $devices );
+		$devices = apply_filters('customize_previewable_devices', $devices);
 
 		return $devices;
 	}
@@ -3642,135 +3642,135 @@ 
 	public function register_controls() {
 
 		/* Panel, Section, and Control Types */
-		$this->register_panel_type( 'WP_Customize_Panel' );
-		$this->register_section_type( 'WP_Customize_Section' );
-		$this->register_section_type( 'WP_Customize_Sidebar_Section' );
-		$this->register_control_type( 'WP_Customize_Color_Control' );
-		$this->register_control_type( 'WP_Customize_Media_Control' );
-		$this->register_control_type( 'WP_Customize_Upload_Control' );
-		$this->register_control_type( 'WP_Customize_Image_Control' );
-		$this->register_control_type( 'WP_Customize_Background_Image_Control' );
-		$this->register_control_type( 'WP_Customize_Background_Position_Control' );
-		$this->register_control_type( 'WP_Customize_Cropped_Image_Control' );
-		$this->register_control_type( 'WP_Customize_Site_Icon_Control' );
-		$this->register_control_type( 'WP_Customize_Theme_Control' );
+		$this->register_panel_type('WP_Customize_Panel');
+		$this->register_section_type('WP_Customize_Section');
+		$this->register_section_type('WP_Customize_Sidebar_Section');
+		$this->register_control_type('WP_Customize_Color_Control');
+		$this->register_control_type('WP_Customize_Media_Control');
+		$this->register_control_type('WP_Customize_Upload_Control');
+		$this->register_control_type('WP_Customize_Image_Control');
+		$this->register_control_type('WP_Customize_Background_Image_Control');
+		$this->register_control_type('WP_Customize_Background_Position_Control');
+		$this->register_control_type('WP_Customize_Cropped_Image_Control');
+		$this->register_control_type('WP_Customize_Site_Icon_Control');
+		$this->register_control_type('WP_Customize_Theme_Control');
 
 		/* Themes */
 
-		$this->add_section( new WP_Customize_Themes_Section( $this, 'themes', array(
-			'title'      => $this->theme()->display( 'Name' ),
+		$this->add_section(new WP_Customize_Themes_Section($this, 'themes', array(
+			'title'      => $this->theme()->display('Name'),
 			'capability' => 'switch_themes',
 			'priority'   => 0,
-		) ) );
+		)));
 
 		// Themes Setting (unused - the theme is considerably more fundamental to the Customizer experience).
-		$this->add_setting( new WP_Customize_Filter_Setting( $this, 'active_theme', array(
+		$this->add_setting(new WP_Customize_Filter_Setting($this, 'active_theme', array(
 			'capability' => 'switch_themes',
-		) ) );
+		)));
 
-		require_once( ABSPATH . 'wp-admin/includes/theme.php' );
+		require_once(ABSPATH.'wp-admin/includes/theme.php');
 
 		// Theme Controls.
 
 		// Add a control for the active/original theme.
-		if ( ! $this->is_theme_active() ) {
-			$themes = wp_prepare_themes_for_js( array( wp_get_theme( $this->original_stylesheet ) ) );
-			$active_theme = current( $themes );
+		if ( ! $this->is_theme_active()) {
+			$themes = wp_prepare_themes_for_js(array(wp_get_theme($this->original_stylesheet)));
+			$active_theme = current($themes);
 			$active_theme['isActiveTheme'] = true;
-			$this->add_control( new WP_Customize_Theme_Control( $this, $active_theme['id'], array(
+			$this->add_control(new WP_Customize_Theme_Control($this, $active_theme['id'], array(
 				'theme'    => $active_theme,
 				'section'  => 'themes',
 				'settings' => 'active_theme',
-			) ) );
+			)));
 		}
 
 		$themes = wp_prepare_themes_for_js();
-		foreach ( $themes as $theme ) {
-			if ( $theme['active'] || $theme['id'] === $this->original_stylesheet ) {
+		foreach ($themes as $theme) {
+			if ($theme['active'] || $theme['id'] === $this->original_stylesheet) {
 				continue;
 			}
 
-			$theme_id = 'theme_' . $theme['id'];
+			$theme_id = 'theme_'.$theme['id'];
 			$theme['isActiveTheme'] = false;
-			$this->add_control( new WP_Customize_Theme_Control( $this, $theme_id, array(
+			$this->add_control(new WP_Customize_Theme_Control($this, $theme_id, array(
 				'theme'    => $theme,
 				'section'  => 'themes',
 				'settings' => 'active_theme',
-			) ) );
+			)));
 		}
 
 		/* Site Identity */
 
-		$this->add_section( 'title_tagline', array(
-			'title'    => __( 'Site Identity' ),
+		$this->add_section('title_tagline', array(
+			'title'    => __('Site Identity'),
 			'priority' => 20,
-		) );
+		));
 
-		$this->add_setting( 'blogname', array(
-			'default'    => get_option( 'blogname' ),
+		$this->add_setting('blogname', array(
+			'default'    => get_option('blogname'),
 			'type'       => 'option',
 			'capability' => 'manage_options',
-		) );
+		));
 
-		$this->add_control( 'blogname', array(
-			'label'      => __( 'Site Title' ),
+		$this->add_control('blogname', array(
+			'label'      => __('Site Title'),
 			'section'    => 'title_tagline',
-		) );
+		));
 
-		$this->add_setting( 'blogdescription', array(
-			'default'    => get_option( 'blogdescription' ),
+		$this->add_setting('blogdescription', array(
+			'default'    => get_option('blogdescription'),
 			'type'       => 'option',
 			'capability' => 'manage_options',
-		) );
+		));
 
-		$this->add_control( 'blogdescription', array(
-			'label'      => __( 'Tagline' ),
+		$this->add_control('blogdescription', array(
+			'label'      => __('Tagline'),
 			'section'    => 'title_tagline',
-		) );
+		));
 
 		// Add a setting to hide header text if the theme doesn't support custom headers.
-		if ( ! current_theme_supports( 'custom-header', 'header-text' ) ) {
-			$this->add_setting( 'header_text', array(
-				'theme_supports'    => array( 'custom-logo', 'header-text' ),
+		if ( ! current_theme_supports('custom-header', 'header-text')) {
+			$this->add_setting('header_text', array(
+				'theme_supports'    => array('custom-logo', 'header-text'),
 				'default'           => 1,
 				'sanitize_callback' => 'absint',
-			) );
+			));
 
-			$this->add_control( 'header_text', array(
-				'label'    => __( 'Display Site Title and Tagline' ),
+			$this->add_control('header_text', array(
+				'label'    => __('Display Site Title and Tagline'),
 				'section'  => 'title_tagline',
 				'settings' => 'header_text',
 				'type'     => 'checkbox',
-			) );
+			));
 		}
 
-		$this->add_setting( 'site_icon', array(
+		$this->add_setting('site_icon', array(
 			'type'       => 'option',
 			'capability' => 'manage_options',
 			'transport'  => 'postMessage', // Previewed with JS in the Customizer controls window.
-		) );
+		));
 
-		$this->add_control( new WP_Customize_Site_Icon_Control( $this, 'site_icon', array(
-			'label'       => __( 'Site Icon' ),
+		$this->add_control(new WP_Customize_Site_Icon_Control($this, 'site_icon', array(
+			'label'       => __('Site Icon'),
 			'description' => sprintf(
 				/* translators: %s: site icon size in pixels */
-				__( 'The Site Icon is used as a browser and app icon for your site. Icons must be square, and at least %s pixels wide and tall.' ),
+				__('The Site Icon is used as a browser and app icon for your site. Icons must be square, and at least %s pixels wide and tall.'),
 				'<strong>512</strong>'
 			),
 			'section'     => 'title_tagline',
 			'priority'    => 60,
 			'height'      => 512,
 			'width'       => 512,
-		) ) );
+		)));
 
-		$this->add_setting( 'custom_logo', array(
-			'theme_supports' => array( 'custom-logo' ),
+		$this->add_setting('custom_logo', array(
+			'theme_supports' => array('custom-logo'),
 			'transport'      => 'postMessage',
-		) );
+		));
 
-		$custom_logo_args = get_theme_support( 'custom-logo' );
-		$this->add_control( new WP_Customize_Cropped_Image_Control( $this, 'custom_logo', array(
-			'label'         => __( 'Logo' ),
+		$custom_logo_args = get_theme_support('custom-logo');
+		$this->add_control(new WP_Customize_Cropped_Image_Control($this, 'custom_logo', array(
+			'label'         => __('Logo'),
 			'section'       => 'title_tagline',
 			'priority'      => 8,
 			'height'        => $custom_logo_args[0]['height'],
@@ -3778,290 +3778,290 @@ 
 			'flex_height'   => $custom_logo_args[0]['flex-height'],
 			'flex_width'    => $custom_logo_args[0]['flex-width'],
 			'button_labels' => array(
-				'select'       => __( 'Select logo' ),
-				'change'       => __( 'Change logo' ),
-				'remove'       => __( 'Remove' ),
-				'default'      => __( 'Default' ),
-				'placeholder'  => __( 'No logo selected' ),
-				'frame_title'  => __( 'Select logo' ),
-				'frame_button' => __( 'Choose logo' ),
+				'select'       => __('Select logo'),
+				'change'       => __('Change logo'),
+				'remove'       => __('Remove'),
+				'default'      => __('Default'),
+				'placeholder'  => __('No logo selected'),
+				'frame_title'  => __('Select logo'),
+				'frame_button' => __('Choose logo'),
 			),
-		) ) );
+		)));
 
-		$this->selective_refresh->add_partial( 'custom_logo', array(
-			'settings'            => array( 'custom_logo' ),
+		$this->selective_refresh->add_partial('custom_logo', array(
+			'settings'            => array('custom_logo'),
 			'selector'            => '.custom-logo-link',
-			'render_callback'     => array( $this, '_render_custom_logo_partial' ),
+			'render_callback'     => array($this, '_render_custom_logo_partial'),
 			'container_inclusive' => true,
-		) );
+		));
 
 		/* Colors */
 
-		$this->add_section( 'colors', array(
-			'title'          => __( 'Colors' ),
+		$this->add_section('colors', array(
+			'title'          => __('Colors'),
 			'priority'       => 40,
-		) );
+		));
 
-		$this->add_setting( 'header_textcolor', array(
-			'theme_supports' => array( 'custom-header', 'header-text' ),
-			'default'        => get_theme_support( 'custom-header', 'default-text-color' ),
+		$this->add_setting('header_textcolor', array(
+			'theme_supports' => array('custom-header', 'header-text'),
+			'default'        => get_theme_support('custom-header', 'default-text-color'),
 
-			'sanitize_callback'    => array( $this, '_sanitize_header_textcolor' ),
+			'sanitize_callback'    => array($this, '_sanitize_header_textcolor'),
 			'sanitize_js_callback' => 'maybe_hash_hex_color',
-		) );
+		));
 
 		// Input type: checkbox
 		// With custom value
-		$this->add_control( 'display_header_text', array(
+		$this->add_control('display_header_text', array(
 			'settings' => 'header_textcolor',
-			'label'    => __( 'Display Site Title and Tagline' ),
+			'label'    => __('Display Site Title and Tagline'),
 			'section'  => 'title_tagline',
 			'type'     => 'checkbox',
 			'priority' => 40,
-		) );
+		));
 
-		$this->add_control( new WP_Customize_Color_Control( $this, 'header_textcolor', array(
-			'label'   => __( 'Header Text Color' ),
+		$this->add_control(new WP_Customize_Color_Control($this, 'header_textcolor', array(
+			'label'   => __('Header Text Color'),
 			'section' => 'colors',
-		) ) );
+		)));
 
 		// Input type: Color
 		// With sanitize_callback
-		$this->add_setting( 'background_color', array(
-			'default'        => get_theme_support( 'custom-background', 'default-color' ),
+		$this->add_setting('background_color', array(
+			'default'        => get_theme_support('custom-background', 'default-color'),
 			'theme_supports' => 'custom-background',
 
 			'sanitize_callback'    => 'sanitize_hex_color_no_hash',
 			'sanitize_js_callback' => 'maybe_hash_hex_color',
-		) );
+		));
 
-		$this->add_control( new WP_Customize_Color_Control( $this, 'background_color', array(
-			'label'   => __( 'Background Color' ),
+		$this->add_control(new WP_Customize_Color_Control($this, 'background_color', array(
+			'label'   => __('Background Color'),
 			'section' => 'colors',
-		) ) );
+		)));
 
 		/* Custom Header */
 
-		if ( current_theme_supports( 'custom-header', 'video' ) ) {
-			$title = __( 'Header Media' );
-			$description = '<p>' . __( 'If you add a video, the image will be used as a fallback while the video loads.' ) . '</p>';
+		if (current_theme_supports('custom-header', 'video')) {
+			$title = __('Header Media');
+			$description = '<p>'.__('If you add a video, the image will be used as a fallback while the video loads.').'</p>';
 
 			// @todo Customizer sections should support having notifications just like controls do. See <https://core.trac.wordpress.org/ticket/38794>.
 			$description .= '<div class="customize-control-notifications-container header-video-not-currently-previewable" style="display: none"><ul>';
-			$description .= '<li class="notice notice-info">' . __( 'This theme doesn\'t support video headers on this page. Navigate to the front page or another page that supports video headers.' ) . '</li>';
+			$description .= '<li class="notice notice-info">'.__('This theme doesn\'t support video headers on this page. Navigate to the front page or another page that supports video headers.').'</li>';
 			$description .= '</ul></div>';
-			$width = absint( get_theme_support( 'custom-header', 'width' ) );
-			$height = absint( get_theme_support( 'custom-header', 'height' ) );
-			if ( $width && $height ) {
+			$width = absint(get_theme_support('custom-header', 'width'));
+			$height = absint(get_theme_support('custom-header', 'height'));
+			if ($width && $height) {
 				$control_description = sprintf(
 					/* translators: 1: .mp4, 2: header size in pixels */
-					__( 'Upload your video in %1$s format and minimize its file size for best results. Your theme recommends dimensions of %2$s pixels.' ),
+					__('Upload your video in %1$s format and minimize its file size for best results. Your theme recommends dimensions of %2$s pixels.'),
 					'<code>.mp4</code>',
-					sprintf( '<strong>%s &times; %s</strong>', $width, $height )
+					sprintf('<strong>%s &times; %s</strong>', $width, $height)
 				);
-			} elseif ( $width ) {
+			} elseif ($width) {
 				$control_description = sprintf(
 					/* translators: 1: .mp4, 2: header width in pixels */
-					__( 'Upload your video in %1$s format and minimize its file size for best results. Your theme recommends a width of %2$s pixels.' ),
+					__('Upload your video in %1$s format and minimize its file size for best results. Your theme recommends a width of %2$s pixels.'),
 					'<code>.mp4</code>',
-					sprintf( '<strong>%s</strong>', $width )
+					sprintf('<strong>%s</strong>', $width)
 				);
 			} else {
 				$control_description = sprintf(
 					/* translators: 1: .mp4, 2: header height in pixels */
-					__( 'Upload your video in %1$s format and minimize its file size for best results. Your theme recommends a height of %2$s pixels.' ),
+					__('Upload your video in %1$s format and minimize its file size for best results. Your theme recommends a height of %2$s pixels.'),
 					'<code>.mp4</code>',
-					sprintf( '<strong>%s</strong>', $height )
+					sprintf('<strong>%s</strong>', $height)
 				);
 			}
 		} else {
-			$title = __( 'Header Image' );
+			$title = __('Header Image');
 			$description = '';
 			$control_description = '';
 		}
 
-		$this->add_section( 'header_image', array(
+		$this->add_section('header_image', array(
 			'title'          => $title,
 			'description'    => $description,
 			'theme_supports' => 'custom-header',
 			'priority'       => 60,
-		) );
+		));
 
-		$this->add_setting( 'header_video', array(
-			'theme_supports'    => array( 'custom-header', 'video' ),
+		$this->add_setting('header_video', array(
+			'theme_supports'    => array('custom-header', 'video'),
 			'transport'         => 'postMessage',
 			'sanitize_callback' => 'absint',
-			'validate_callback' => array( $this, '_validate_header_video' ),
-		) );
+			'validate_callback' => array($this, '_validate_header_video'),
+		));
 
-		$this->add_setting( 'external_header_video', array(
-			'theme_supports'    => array( 'custom-header', 'video' ),
+		$this->add_setting('external_header_video', array(
+			'theme_supports'    => array('custom-header', 'video'),
 			'transport'         => 'postMessage',
-			'sanitize_callback' => array( $this, '_sanitize_external_header_video' ),
-			'validate_callback' => array( $this, '_validate_external_header_video' ),
-		) );
+			'sanitize_callback' => array($this, '_sanitize_external_header_video'),
+			'validate_callback' => array($this, '_validate_external_header_video'),
+		));
 
-		$this->add_setting( new WP_Customize_Filter_Setting( $this, 'header_image', array(
-			'default'        => sprintf( get_theme_support( 'custom-header', 'default-image' ), get_template_directory_uri(), get_stylesheet_directory_uri() ),
+		$this->add_setting(new WP_Customize_Filter_Setting($this, 'header_image', array(
+			'default'        => sprintf(get_theme_support('custom-header', 'default-image'), get_template_directory_uri(), get_stylesheet_directory_uri()),
 			'theme_supports' => 'custom-header',
-		) ) );
+		)));
 
-		$this->add_setting( new WP_Customize_Header_Image_Setting( $this, 'header_image_data', array(
+		$this->add_setting(new WP_Customize_Header_Image_Setting($this, 'header_image_data', array(
 			'theme_supports' => 'custom-header',
-		) ) );
+		)));
 
 		/*
 		 * Switch image settings to postMessage when video support is enabled since
 		 * it entails that the_custom_header_markup() will be used, and thus selective
 		 * refresh can be utilized.
 		 */
-		if ( current_theme_supports( 'custom-header', 'video' ) ) {
-			$this->get_setting( 'header_image' )->transport = 'postMessage';
-			$this->get_setting( 'header_image_data' )->transport = 'postMessage';
+		if (current_theme_supports('custom-header', 'video')) {
+			$this->get_setting('header_image')->transport = 'postMessage';
+			$this->get_setting('header_image_data')->transport = 'postMessage';
 		}
 
-		$this->add_control( new WP_Customize_Media_Control( $this, 'header_video', array(
-			'theme_supports' => array( 'custom-header', 'video' ),
-			'label'          => __( 'Header Video' ),
+		$this->add_control(new WP_Customize_Media_Control($this, 'header_video', array(
+			'theme_supports' => array('custom-header', 'video'),
+			'label'          => __('Header Video'),
 			'description'    => $control_description,
 			'section'        => 'header_image',
 			'mime_type'      => 'video',
 			// @todo These button_labels can be removed once WP_Customize_Media_Control provides mime_type-specific labels automatically. See <https://core.trac.wordpress.org/ticket/38796>.
 			'button_labels'  => array(
-				'select'       => __( 'Select Video' ),
-				'change'       => __( 'Change Video' ),
-				'placeholder'  => __( 'No video selected' ),
-				'frame_title'  => __( 'Select Video' ),
-				'frame_button' => __( 'Choose Video' ),
+				'select'       => __('Select Video'),
+				'change'       => __('Change Video'),
+				'placeholder'  => __('No video selected'),
+				'frame_title'  => __('Select Video'),
+				'frame_button' => __('Choose Video'),
 			),
 			'active_callback' => 'is_header_video_active',
-		) ) );
+		)));
 
-		$this->add_control( 'external_header_video', array(
-			'theme_supports' => array( 'custom-header', 'video' ),
+		$this->add_control('external_header_video', array(
+			'theme_supports' => array('custom-header', 'video'),
 			'type'           => 'url',
-			'description'    => __( 'Or, enter a YouTube URL:' ),
+			'description'    => __('Or, enter a YouTube URL:'),
 			'section'        => 'header_image',
 			'active_callback'=> 'is_front_page',
-		) );
+		));
 
-		$this->add_control( new WP_Customize_Header_Image_Control( $this ) );
+		$this->add_control(new WP_Customize_Header_Image_Control($this));
 
-		$this->selective_refresh->add_partial( 'custom_header', array(
+		$this->selective_refresh->add_partial('custom_header', array(
 			'selector'            => '#wp-custom-header',
 			'render_callback'     => 'the_custom_header_markup',
-			'settings'            => array( 'header_video', 'external_header_video', 'header_image' ), // The image is used as a video fallback here.
+			'settings'            => array('header_video', 'external_header_video', 'header_image'), // The image is used as a video fallback here.
 			'container_inclusive' => true,
-		) );
+		));
 
 		/* Custom Background */
 
-		$this->add_section( 'background_image', array(
-			'title'          => __( 'Background Image' ),
+		$this->add_section('background_image', array(
+			'title'          => __('Background Image'),
 			'theme_supports' => 'custom-background',
 			'priority'       => 80,
-		) );
+		));
 
-		$this->add_setting( 'background_image', array(
-			'default'        => get_theme_support( 'custom-background', 'default-image' ),
+		$this->add_setting('background_image', array(
+			'default'        => get_theme_support('custom-background', 'default-image'),
 			'theme_supports' => 'custom-background',
-			'sanitize_callback' => array( $this, '_sanitize_background_setting' ),
-		) );
+			'sanitize_callback' => array($this, '_sanitize_background_setting'),
+		));
 
-		$this->add_setting( new WP_Customize_Background_Image_Setting( $this, 'background_image_thumb', array(
+		$this->add_setting(new WP_Customize_Background_Image_Setting($this, 'background_image_thumb', array(
 			'theme_supports' => 'custom-background',
-			'sanitize_callback' => array( $this, '_sanitize_background_setting' ),
-		) ) );
+			'sanitize_callback' => array($this, '_sanitize_background_setting'),
+		)));
 
-		$this->add_control( new WP_Customize_Background_Image_Control( $this ) );
+		$this->add_control(new WP_Customize_Background_Image_Control($this));
 
-		$this->add_setting( 'background_preset', array(
-			'default'        => get_theme_support( 'custom-background', 'default-preset' ),
+		$this->add_setting('background_preset', array(
+			'default'        => get_theme_support('custom-background', 'default-preset'),
 			'theme_supports' => 'custom-background',
-			'sanitize_callback' => array( $this, '_sanitize_background_setting' ),
-		) );
+			'sanitize_callback' => array($this, '_sanitize_background_setting'),
+		));
 
-		$this->add_control( 'background_preset', array(
-			'label'      => _x( 'Preset', 'Background Preset' ),
+		$this->add_control('background_preset', array(
+			'label'      => _x('Preset', 'Background Preset'),
 			'section'    => 'background_image',
 			'type'       => 'select',
 			'choices'    => array(
-				'default' => _x( 'Default', 'Default Preset' ),
-				'fill'    => __( 'Fill Screen' ),
-				'fit'     => __( 'Fit to Screen' ),
-				'repeat'  => _x( 'Repeat', 'Repeat Image' ),
-				'custom'  => _x( 'Custom', 'Custom Preset' ),
+				'default' => _x('Default', 'Default Preset'),
+				'fill'    => __('Fill Screen'),
+				'fit'     => __('Fit to Screen'),
+				'repeat'  => _x('Repeat', 'Repeat Image'),
+				'custom'  => _x('Custom', 'Custom Preset'),
 			),
-		) );
+		));
 
-		$this->add_setting( 'background_position_x', array(
-			'default'        => get_theme_support( 'custom-background', 'default-position-x' ),
+		$this->add_setting('background_position_x', array(
+			'default'        => get_theme_support('custom-background', 'default-position-x'),
 			'theme_supports' => 'custom-background',
-			'sanitize_callback' => array( $this, '_sanitize_background_setting' ),
-		) );
+			'sanitize_callback' => array($this, '_sanitize_background_setting'),
+		));
 
-		$this->add_setting( 'background_position_y', array(
-			'default'        => get_theme_support( 'custom-background', 'default-position-y' ),
+		$this->add_setting('background_position_y', array(
+			'default'        => get_theme_support('custom-background', 'default-position-y'),
 			'theme_supports' => 'custom-background',
-			'sanitize_callback' => array( $this, '_sanitize_background_setting' ),
-		) );
+			'sanitize_callback' => array($this, '_sanitize_background_setting'),
+		));
 
-		$this->add_control( new WP_Customize_Background_Position_Control( $this, 'background_position', array(
-			'label'    => __( 'Image Position' ),
+		$this->add_control(new WP_Customize_Background_Position_Control($this, 'background_position', array(
+			'label'    => __('Image Position'),
 			'section'  => 'background_image',
 			'settings' => array(
 				'x' => 'background_position_x',
 				'y' => 'background_position_y',
 			),
-		) ) );
+		)));
 
-		$this->add_setting( 'background_size', array(
-			'default'        => get_theme_support( 'custom-background', 'default-size' ),
+		$this->add_setting('background_size', array(
+			'default'        => get_theme_support('custom-background', 'default-size'),
 			'theme_supports' => 'custom-background',
-			'sanitize_callback' => array( $this, '_sanitize_background_setting' ),
-		) );
+			'sanitize_callback' => array($this, '_sanitize_background_setting'),
+		));
 
-		$this->add_control( 'background_size', array(
-			'label'      => __( 'Image Size' ),
+		$this->add_control('background_size', array(
+			'label'      => __('Image Size'),
 			'section'    => 'background_image',
 			'type'       => 'select',
 			'choices'    => array(
-				'auto'    => __( 'Original' ),
-				'contain' => __( 'Fit to Screen' ),
-				'cover'   => __( 'Fill Screen' ),
+				'auto'    => __('Original'),
+				'contain' => __('Fit to Screen'),
+				'cover'   => __('Fill Screen'),
 			),
-		) );
+		));
 
-		$this->add_setting( 'background_repeat', array(
-			'default'           => get_theme_support( 'custom-background', 'default-repeat' ),
-			'sanitize_callback' => array( $this, '_sanitize_background_setting' ),
+		$this->add_setting('background_repeat', array(
+			'default'           => get_theme_support('custom-background', 'default-repeat'),
+			'sanitize_callback' => array($this, '_sanitize_background_setting'),
 			'theme_supports'    => 'custom-background',
-		) );
+		));
 
-		$this->add_control( 'background_repeat', array(
-			'label'    => __( 'Repeat Background Image' ),
+		$this->add_control('background_repeat', array(
+			'label'    => __('Repeat Background Image'),
 			'section'  => 'background_image',
 			'type'     => 'checkbox',
-		) );
+		));
 
-		$this->add_setting( 'background_attachment', array(
-			'default'           => get_theme_support( 'custom-background', 'default-attachment' ),
-			'sanitize_callback' => array( $this, '_sanitize_background_setting' ),
+		$this->add_setting('background_attachment', array(
+			'default'           => get_theme_support('custom-background', 'default-attachment'),
+			'sanitize_callback' => array($this, '_sanitize_background_setting'),
 			'theme_supports'    => 'custom-background',
-		) );
+		));
 
-		$this->add_control( 'background_attachment', array(
-			'label'    => __( 'Scroll with Page' ),
+		$this->add_control('background_attachment', array(
+			'label'    => __('Scroll with Page'),
 			'section'  => 'background_image',
 			'type'     => 'checkbox',
-		) );
+		));
 
 
 		// If the theme is using the default background callback, we can update
 		// the background CSS using postMessage.
-		if ( get_theme_support( 'custom-background', 'wp-head-callback' ) === '_custom_background_cb' ) {
-			foreach ( array( 'color', 'image', 'preset', 'position_x', 'position_y', 'size', 'repeat', 'attachment' ) as $prop ) {
-				$this->get_setting( 'background_' . $prop )->transport = 'postMessage';
+		if (get_theme_support('custom-background', 'wp-head-callback') === '_custom_background_cb') {
+			foreach (array('color', 'image', 'preset', 'position_x', 'position_y', 'size', 'repeat', 'attachment') as $prop) {
+				$this->get_setting('background_'.$prop)->transport = 'postMessage';
 			}
 		}
 
@@ -4071,80 +4071,80 @@ 
 		 * The following replicates behavior from options-reading.php.
 		 */
 
-		$this->add_section( 'static_front_page', array(
-			'title' => __( 'Static Front Page' ),
+		$this->add_section('static_front_page', array(
+			'title' => __('Static Front Page'),
 			'priority' => 120,
-			'description' => __( 'Your theme supports a static front page.' ),
-			'active_callback' => array( $this, 'has_published_pages' ),
-		) );
+			'description' => __('Your theme supports a static front page.'),
+			'active_callback' => array($this, 'has_published_pages'),
+		));
 
-		$this->add_setting( 'show_on_front', array(
-			'default' => get_option( 'show_on_front' ),
+		$this->add_setting('show_on_front', array(
+			'default' => get_option('show_on_front'),
 			'capability' => 'manage_options',
 			'type' => 'option',
-		) );
+		));
 
-		$this->add_control( 'show_on_front', array(
-			'label' => __( 'Front page displays' ),
+		$this->add_control('show_on_front', array(
+			'label' => __('Front page displays'),
 			'section' => 'static_front_page',
 			'type' => 'radio',
 			'choices' => array(
-				'posts' => __( 'Your latest posts' ),
-				'page'  => __( 'A static page' ),
+				'posts' => __('Your latest posts'),
+				'page'  => __('A static page'),
 			),
-		) );
+		));
 
-		$this->add_setting( 'page_on_front', array(
+		$this->add_setting('page_on_front', array(
 			'type'       => 'option',
 			'capability' => 'manage_options',
-		) );
+		));
 
-		$this->add_control( 'page_on_front', array(
-			'label' => __( 'Front page' ),
+		$this->add_control('page_on_front', array(
+			'label' => __('Front page'),
 			'section' => 'static_front_page',
 			'type' => 'dropdown-pages',
 			'allow_addition' => true,
-		) );
+		));
 
-		$this->add_setting( 'page_for_posts', array(
+		$this->add_setting('page_for_posts', array(
 			'type' => 'option',
 			'capability' => 'manage_options',
-		) );
+		));
 
-		$this->add_control( 'page_for_posts', array(
-			'label' => __( 'Posts page' ),
+		$this->add_control('page_for_posts', array(
+			'label' => __('Posts page'),
 			'section' => 'static_front_page',
 			'type' => 'dropdown-pages',
 			'allow_addition' => true,
-		) );
+		));
 
 		/* Custom CSS */
-		$this->add_section( 'custom_css', array(
-			'title'              => __( 'Additional CSS' ),
+		$this->add_section('custom_css', array(
+			'title'              => __('Additional CSS'),
 			'priority'           => 200,
 			'description_hidden' => true,
-			'description'        => sprintf( '%s<br /><a href="%s" class="external-link" target="_blank">%s<span class="screen-reader-text">%s</span></a>',
-				__( 'CSS allows you to customize the appearance and layout of your site with code. Separate CSS is saved for each of your themes. In the editing area the Tab key enters a tab character. To move below this area by pressing Tab, press the Esc key followed by the Tab key.' ),
-				esc_url( __( 'https://codex.wordpress.org/CSS' ) ),
-				__( 'Learn more about CSS' ),
-				__( '(link opens in a new window)' )
+			'description'        => sprintf('%s<br /><a href="%s" class="external-link" target="_blank">%s<span class="screen-reader-text">%s</span></a>',
+				__('CSS allows you to customize the appearance and layout of your site with code. Separate CSS is saved for each of your themes. In the editing area the Tab key enters a tab character. To move below this area by pressing Tab, press the Esc key followed by the Tab key.'),
+				esc_url(__('https://codex.wordpress.org/CSS')),
+				__('Learn more about CSS'),
+				__('(link opens in a new window)')
 			),
-		) );
+		));
 
-		$custom_css_setting = new WP_Customize_Custom_CSS_Setting( $this, sprintf( 'custom_css[%s]', get_stylesheet() ), array(
+		$custom_css_setting = new WP_Customize_Custom_CSS_Setting($this, sprintf('custom_css[%s]', get_stylesheet()), array(
 			'capability' => 'edit_css',
-			'default' => sprintf( "/*\n%s\n*/", __( "You can add your own CSS here.\n\nClick the help icon above to learn more." ) ),
-		) );
-		$this->add_setting( $custom_css_setting );
+			'default' => sprintf("/*\n%s\n*/", __("You can add your own CSS here.\n\nClick the help icon above to learn more.")),
+		));
+		$this->add_setting($custom_css_setting);
 
-		$this->add_control( 'custom_css', array(
+		$this->add_control('custom_css', array(
 			'type'     => 'textarea',
 			'section'  => 'custom_css',
-			'settings' => array( 'default' => $custom_css_setting->id ),
+			'settings' => array('default' => $custom_css_setting->id),
 			'input_attrs' => array(
 				'class' => 'code', // Ensures contents displayed as LTR instead of RTL.
 			),
-		) );
+		));
 	}
 
 	/**
@@ -4159,15 +4159,15 @@ 
 	 */
 	public function has_published_pages() {
 
-		$setting = $this->get_setting( 'nav_menus_created_posts' );
-		if ( $setting ) {
-			foreach ( $setting->value() as $post_id ) {
-				if ( 'page' === get_post_type( $post_id ) ) {
+		$setting = $this->get_setting('nav_menus_created_posts');
+		if ($setting) {
+			foreach ($setting->value() as $post_id) {
+				if ('page' === get_post_type($post_id)) {
 					return true;
 				}
 			}
 		}
-		return 0 !== count( get_pages() );
+		return 0 !== count(get_pages());
 	}
 
 	/**
@@ -4179,8 +4179,8 @@ 
 	 * @see add_dynamic_settings()
 	 */
 	public function register_dynamic_settings() {
-		$setting_ids = array_keys( $this->unsanitized_post_values() );
-		$this->add_dynamic_settings( $setting_ids );
+		$setting_ids = array_keys($this->unsanitized_post_values());
+		$this->add_dynamic_settings($setting_ids);
 	}
 
 	/**
@@ -4194,13 +4194,13 @@ 
 	 * @param string $color
 	 * @return mixed
 	 */
-	public function _sanitize_header_textcolor( $color ) {
-		if ( 'blank' === $color )
+	public function _sanitize_header_textcolor($color) {
+		if ('blank' === $color)
 			return 'blank';
 
-		$color = sanitize_hex_color_no_hash( $color );
-		if ( empty( $color ) )
-			$color = get_theme_support( 'custom-header', 'default-text-color' );
+		$color = sanitize_hex_color_no_hash($color);
+		if (empty($color))
+			$color = get_theme_support('custom-header', 'default-text-color');
 
 		return $color;
 	}
@@ -4215,35 +4215,35 @@ 
 	 * @param WP_Customize_Setting $setting Setting.
 	 * @return string|WP_Error Background value or validation error.
 	 */
-	public function _sanitize_background_setting( $value, $setting ) {
-		if ( 'background_repeat' === $setting->id ) {
-			if ( ! in_array( $value, array( 'repeat-x', 'repeat-y', 'repeat', 'no-repeat' ) ) ) {
-				return new WP_Error( 'invalid_value', __( 'Invalid value for background repeat.' ) );
+	public function _sanitize_background_setting($value, $setting) {
+		if ('background_repeat' === $setting->id) {
+			if ( ! in_array($value, array('repeat-x', 'repeat-y', 'repeat', 'no-repeat'))) {
+				return new WP_Error('invalid_value', __('Invalid value for background repeat.'));
 			}
-		} elseif ( 'background_attachment' === $setting->id ) {
-			if ( ! in_array( $value, array( 'fixed', 'scroll' ) ) ) {
-				return new WP_Error( 'invalid_value', __( 'Invalid value for background attachment.' ) );
+		} elseif ('background_attachment' === $setting->id) {
+			if ( ! in_array($value, array('fixed', 'scroll'))) {
+				return new WP_Error('invalid_value', __('Invalid value for background attachment.'));
 			}
-		} elseif ( 'background_position_x' === $setting->id ) {
-			if ( ! in_array( $value, array( 'left', 'center', 'right' ), true ) ) {
-				return new WP_Error( 'invalid_value', __( 'Invalid value for background position X.' ) );
+		} elseif ('background_position_x' === $setting->id) {
+			if ( ! in_array($value, array('left', 'center', 'right'), true)) {
+				return new WP_Error('invalid_value', __('Invalid value for background position X.'));
 			}
-		} elseif ( 'background_position_y' === $setting->id ) {
-			if ( ! in_array( $value, array( 'top', 'center', 'bottom' ), true ) ) {
-				return new WP_Error( 'invalid_value', __( 'Invalid value for background position Y.' ) );
+		} elseif ('background_position_y' === $setting->id) {
+			if ( ! in_array($value, array('top', 'center', 'bottom'), true)) {
+				return new WP_Error('invalid_value', __('Invalid value for background position Y.'));
 			}
-		} elseif ( 'background_size' === $setting->id ) {
-			if ( ! in_array( $value, array( 'auto', 'contain', 'cover' ), true ) ) {
-				return new WP_Error( 'invalid_value', __( 'Invalid value for background size.' ) );
+		} elseif ('background_size' === $setting->id) {
+			if ( ! in_array($value, array('auto', 'contain', 'cover'), true)) {
+				return new WP_Error('invalid_value', __('Invalid value for background size.'));
 			}
-		} elseif ( 'background_preset' === $setting->id ) {
-			if ( ! in_array( $value, array( 'default', 'fill', 'fit', 'repeat', 'custom' ), true ) ) {
-				return new WP_Error( 'invalid_value', __( 'Invalid value for background size.' ) );
+		} elseif ('background_preset' === $setting->id) {
+			if ( ! in_array($value, array('default', 'fill', 'fit', 'repeat', 'custom'), true)) {
+				return new WP_Error('invalid_value', __('Invalid value for background size.'));
 			}
-		} elseif ( 'background_image' === $setting->id || 'background_image_thumb' === $setting->id ) {
-			$value = empty( $value ) ? '' : esc_url_raw( $value );
+		} elseif ('background_image' === $setting->id || 'background_image_thumb' === $setting->id) {
+			$value = empty($value) ? '' : esc_url_raw($value);
 		} else {
-			return new WP_Error( 'unrecognized_setting', __( 'Unrecognized background setting.' ) );
+			return new WP_Error('unrecognized_setting', __('Unrecognized background setting.'));
 		}
 		return $value;
 	}
@@ -4258,8 +4258,8 @@ 
 	 * @param array $partials Array of partials.
 	 * @return array
 	 */
-	public function export_header_video_settings( $response, $selective_refresh, $partials ) {
-		if ( isset( $partials['custom_header'] ) ) {
+	public function export_header_video_settings($response, $selective_refresh, $partials) {
+		if (isset($partials['custom_header'])) {
 			$response['custom_header_settings'] = get_header_video_settings();
 		}
 
@@ -4277,22 +4277,22 @@ 
 	 * @param mixed $value
 	 * @return mixed
 	 */
-	public function _validate_header_video( $validity, $value ) {
-		$video = get_attached_file( absint( $value ) );
-		if ( $video ) {
-			$size = filesize( $video );
-			if ( 8 < $size / pow( 1024, 2 ) ) { // Check whether the size is larger than 8MB.
-				$validity->add( 'size_too_large',
-					__( 'This video file is too large to use as a header video. Try a shorter video or optimize the compression settings and re-upload a file that is less than 8MB. Or, upload your video to YouTube and link it with the option below.' )
+	public function _validate_header_video($validity, $value) {
+		$video = get_attached_file(absint($value));
+		if ($video) {
+			$size = filesize($video);
+			if (8 < $size / pow(1024, 2)) { // Check whether the size is larger than 8MB.
+				$validity->add('size_too_large',
+					__('This video file is too large to use as a header video. Try a shorter video or optimize the compression settings and re-upload a file that is less than 8MB. Or, upload your video to YouTube and link it with the option below.')
 				);
 			}
-			if ( '.mp4' !== substr( $video, -4 ) && '.mov' !== substr( $video, -4 ) ) { // Check for .mp4 or .mov format, which (assuming h.264 encoding) are the only cross-browser-supported formats.
-				$validity->add( 'invalid_file_type', sprintf(
+			if ('.mp4' !== substr($video, -4) && '.mov' !== substr($video, -4)) { // Check for .mp4 or .mov format, which (assuming h.264 encoding) are the only cross-browser-supported formats.
+				$validity->add('invalid_file_type', sprintf(
 					/* translators: 1: .mp4, 2: .mov */
-					__( 'Only %1$s or %2$s files may be used for header video. Please convert your video file and try again, or, upload your video to YouTube and link it with the option below.' ),
+					__('Only %1$s or %2$s files may be used for header video. Please convert your video file and try again, or, upload your video to YouTube and link it with the option below.'),
 					'<code>.mp4</code>',
 					'<code>.mov</code>'
-				) );
+				));
 			}
 		}
 		return $validity;
@@ -4309,11 +4309,11 @@ 
 	 * @param mixed $value
 	 * @return mixed
 	 */
-	public function _validate_external_header_video( $validity, $value ) {
-		$video = esc_url_raw( $value );
-		if ( $video ) {
-			if ( ! preg_match( '#^https?://(?:www\.)?(?:youtube\.com/watch|youtu\.be/)#', $video ) ) {
-				$validity->add( 'invalid_url', __( 'Please enter a valid YouTube URL.' ) );
+	public function _validate_external_header_video($validity, $value) {
+		$video = esc_url_raw($value);
+		if ($video) {
+			if ( ! preg_match('#^https?://(?:www\.)?(?:youtube\.com/watch|youtu\.be/)#', $video)) {
+				$validity->add('invalid_url', __('Please enter a valid YouTube URL.'));
 			}
 		}
 		return $validity;
@@ -4327,8 +4327,8 @@ 
 	 * @param string $value URL.
 	 * @return string Sanitized URL.
 	 */
-	public function _sanitize_external_header_video( $value ) {
-		return esc_url_raw( trim( $value ) );
+	public function _sanitize_external_header_video($value) {
+		return esc_url_raw(trim($value));
 	}
 
 	/**

Braces +12 added lines, -8 removed lines

@@ -3009,8 +3009,9 @@ 
 	 * @return WP_Customize_Section|void The section, if set.
 	 */
 	public function get_section( $id ) {
-		if ( isset( $this->sections[ $id ] ) )
-			return $this->sections[ $id ];
+		if ( isset( $this->sections[ $id ] ) ) {
+					return $this->sections[ $id ];
+		}
 	}
 
 	/**
@@ -3085,8 +3086,9 @@ 
 	 * @return WP_Customize_Control|void The control object, if set.
 	 */
 	public function get_control( $id ) {
-		if ( isset( $this->controls[ $id ] ) )
-			return $this->controls[ $id ];
+		if ( isset( $this->controls[ $id ] ) ) {
+					return $this->controls[ $id ];
+		}
 	}
 
 	/**
@@ -4195,12 +4197,14 @@ 
 	 * @return mixed
 	 */
 	public function _sanitize_header_textcolor( $color ) {
-		if ( 'blank' === $color )
-			return 'blank';
+		if ( 'blank' === $color ) {
+					return 'blank';
+		}
 
 		$color = sanitize_hex_color_no_hash( $color );
-		if ( empty( $color ) )
-			$color = get_theme_support( 'custom-header', 'default-text-color' );
+		if ( empty( $color ) ) {
+					$color = get_theme_support( 'custom-header', 'default-text-color' );
+		}
 
 		return $color;
 	}

src/wp-includes/class-wp-feed-cache-transient.php

Doc Comments +2 added lines, -2 removed lines

@@ -98,7 +98,7 @@ 
 	 * @access public
 	 *
 	 * @param SimplePie $data Data to save.
-	 * @return true Always true.
+	 * @return boolean Always true.
 	 */
 	public function save($data) {
 		if ( $data instanceof SimplePie ) {
@@ -152,7 +152,7 @@ 
 	 * @since 2.8.0
 	 * @access public
 	 *
-	 * @return true Always true.
+	 * @return boolean Always true.
 	 */
 	public function unlink() {
 		delete_transient($this->name);

Spacing +4 added lines, -4 removed lines

@@ -55,8 +55,8 @@ 
 	 * @param string $extension 'spi' or 'spc'.
 	 */
 	public function __construct($location, $filename, $extension) {
-		$this->name = 'feed_' . $filename;
-		$this->mod_name = 'feed_mod_' . $filename;
+		$this->name = 'feed_'.$filename;
+		$this->mod_name = 'feed_mod_'.$filename;
 
 		$lifetime = $this->lifetime;
 		/**
@@ -67,7 +67,7 @@ 
 		 * @param int    $lifetime Cache duration in seconds. Default is 43200 seconds (12 hours).
 		 * @param string $filename Unique identifier for the cache object.
 		 */
-		$this->lifetime = apply_filters( 'wp_feed_cache_transient_lifetime', $lifetime, $filename);
+		$this->lifetime = apply_filters('wp_feed_cache_transient_lifetime', $lifetime, $filename);
 	}
 
 	/**
@@ -80,7 +80,7 @@ 
 	 * @return true Always true.
 	 */
 	public function save($data) {
-		if ( $data instanceof SimplePie ) {
+		if ($data instanceof SimplePie) {
 			$data = $data->data;
 		}
 

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

Doc Comments +2 added lines, -2 removed lines

@@ -101,7 +101,7 @@ 
 	 * @since 4.7.0
 	 * @access private
 	 *
-	 * @param bool|int $new_priority     Optional. The priority of the new filter being added. Default false,
+	 * @param integer $new_priority     Optional. The priority of the new filter being added. Default false,
 	 *                                   for no priority being added.
 	 * @param bool     $priority_existed Optional. Flag for whether the priority already existed before the new
 	 *                                   filter was added. Default false.
@@ -269,7 +269,7 @@ 
 	 * @since 4.7.0
 	 * @access public
 	 *
-	 * @param mixed $value The value to filter.
+	 * @param string $value The value to filter.
 	 * @param array $args  Arguments to pass to callbacks.
 	 * @return mixed The filtered value after all hooked functions are applied to it.
 	 */

Spacing +103 added lines, -103 removed lines

@@ -76,22 +76,22 @@ 
 	 *                                  in the order in which they were added to the action.
 	 * @param int      $accepted_args   The number of arguments the function accepts.
 	 */
-	public function add_filter( $tag, $function_to_add, $priority, $accepted_args ) {
-		$idx = _wp_filter_build_unique_id( $tag, $function_to_add, $priority );
-		$priority_existed = isset( $this->callbacks[ $priority ] );
+	public function add_filter($tag, $function_to_add, $priority, $accepted_args) {
+		$idx = _wp_filter_build_unique_id($tag, $function_to_add, $priority);
+		$priority_existed = isset($this->callbacks[$priority]);
 
-		$this->callbacks[ $priority ][ $idx ] = array(
+		$this->callbacks[$priority][$idx] = array(
 			'function' => $function_to_add,
 			'accepted_args' => $accepted_args
 		);
 
 		// if we're adding a new priority to the list, put them back in sorted order
-		if ( ! $priority_existed && count( $this->callbacks ) > 1 ) {
-			ksort( $this->callbacks, SORT_NUMERIC );
+		if ( ! $priority_existed && count($this->callbacks) > 1) {
+			ksort($this->callbacks, SORT_NUMERIC);
 		}
 
-		if ( $this->nesting_level > 0 ) {
-			$this->resort_active_iterations( $priority, $priority_existed );
+		if ($this->nesting_level > 0) {
+			$this->resort_active_iterations($priority, $priority_existed);
 		}
 	}
 
@@ -106,62 +106,62 @@ 
 	 * @param bool     $priority_existed Optional. Flag for whether the priority already existed before the new
 	 *                                   filter was added. Default false.
 	 */
-	private function resort_active_iterations( $new_priority = false, $priority_existed = false ) {
-		$new_priorities = array_keys( $this->callbacks );
+	private function resort_active_iterations($new_priority = false, $priority_existed = false) {
+		$new_priorities = array_keys($this->callbacks);
 
 		// If there are no remaining hooks, clear out all running iterations.
-		if ( ! $new_priorities ) {
-			foreach ( $this->iterations as $index => $iteration ) {
-				$this->iterations[ $index ] = $new_priorities;
+		if ( ! $new_priorities) {
+			foreach ($this->iterations as $index => $iteration) {
+				$this->iterations[$index] = $new_priorities;
 			}
 			return;
 		}
 
-		$min = min( $new_priorities );
-		foreach ( $this->iterations as $index => &$iteration ) {
-			$current = current( $iteration );
+		$min = min($new_priorities);
+		foreach ($this->iterations as $index => &$iteration) {
+			$current = current($iteration);
 			// If we're already at the end of this iteration, just leave the array pointer where it is.
-			if ( false === $current ) {
+			if (false === $current) {
 				continue;
 			}
 
 			$iteration = $new_priorities;
 
-			if ( $current < $min ) {
-				array_unshift( $iteration, $current );
+			if ($current < $min) {
+				array_unshift($iteration, $current);
 				continue;
 			}
 
-			while ( current( $iteration ) < $current ) {
-				if ( false === next( $iteration ) ) {
+			while (current($iteration) < $current) {
+				if (false === next($iteration)) {
 					break;
 				}
 			}
 
 			// If we have a new priority that didn't exist, but ::apply_filters() or ::do_action() thinks it's the current priority...
-			if ( $new_priority === $this->current_priority[ $index ] && ! $priority_existed ) {
+			if ($new_priority === $this->current_priority[$index] && ! $priority_existed) {
 				/*
 				 * ... and the new priority is the same as what $this->iterations thinks is the previous
 				 * priority, we need to move back to it.
 				 */
 
-				if ( false === current( $iteration ) ) {
+				if (false === current($iteration)) {
 					// If we've already moved off the end of the array, go back to the last element.
-					$prev = end( $iteration );
+					$prev = end($iteration);
 				} else {
 					// Otherwise, just go back to the previous element.
-					$prev = prev( $iteration );
+					$prev = prev($iteration);
 				}
-				if ( false === $prev ) {
+				if (false === $prev) {
 					// Start of the array. Reset, and go about our day.
-					reset( $iteration );
-				} elseif ( $new_priority !== $prev ) {
+					reset($iteration);
+				} elseif ($new_priority !== $prev) {
 					// Previous wasn't the same. Move forward again.
-					next( $iteration );
+					next($iteration);
 				}
 			}
 		}
-		unset( $iteration );
+		unset($iteration);
 	}
 
 	/**
@@ -176,15 +176,15 @@ 
 	 * @param int      $priority           The exact priority used when adding the original filter callback.
 	 * @return bool Whether the callback existed before it was removed.
 	 */
-	public function remove_filter( $tag, $function_to_remove, $priority ) {
-		$function_key = _wp_filter_build_unique_id( $tag, $function_to_remove, $priority );
-
-		$exists = isset( $this->callbacks[ $priority ][ $function_key ] );
-		if ( $exists ) {
-			unset( $this->callbacks[ $priority ][ $function_key ] );
-			if ( ! $this->callbacks[ $priority ] ) {
-				unset( $this->callbacks[ $priority ] );
-				if ( $this->nesting_level > 0 ) {
+	public function remove_filter($tag, $function_to_remove, $priority) {
+		$function_key = _wp_filter_build_unique_id($tag, $function_to_remove, $priority);
+
+		$exists = isset($this->callbacks[$priority][$function_key]);
+		if ($exists) {
+			unset($this->callbacks[$priority][$function_key]);
+			if ( ! $this->callbacks[$priority]) {
+				unset($this->callbacks[$priority]);
+				if ($this->nesting_level > 0) {
 					$this->resort_active_iterations();
 				}
 			}
@@ -203,18 +203,18 @@ 
 	 *                                         the callback ID when SPL is not available. Default empty.
 	 * @return bool|int The priority of that hook is returned, or false if the function is not attached.
 	 */
-	public function has_filter( $tag = '', $function_to_check = false ) {
-		if ( false === $function_to_check ) {
+	public function has_filter($tag = '', $function_to_check = false) {
+		if (false === $function_to_check) {
 			return $this->has_filters();
 		}
 
-		$function_key = _wp_filter_build_unique_id( $tag, $function_to_check, false );
-		if ( ! $function_key ) {
+		$function_key = _wp_filter_build_unique_id($tag, $function_to_check, false);
+		if ( ! $function_key) {
 			return false;
 		}
 
-		foreach ( $this->callbacks as $priority => $callbacks ) {
-			if ( isset( $callbacks[ $function_key ] ) ) {
+		foreach ($this->callbacks as $priority => $callbacks) {
+			if (isset($callbacks[$function_key])) {
 				return $priority;
 			}
 		}
@@ -231,8 +231,8 @@ 
 	 * @return bool True if callbacks have been registered for the current hook, otherwise false.
 	 */
 	public function has_filters() {
-		foreach ( $this->callbacks as $callbacks ) {
-			if ( $callbacks ) {
+		foreach ($this->callbacks as $callbacks) {
+			if ($callbacks) {
 				return true;
 			}
 		}
@@ -247,18 +247,18 @@ 
 	 *
 	 * @param int|bool $priority Optional. The priority number to remove. Default false.
 	 */
-	public function remove_all_filters( $priority = false ) {
-		if ( ! $this->callbacks ) {
+	public function remove_all_filters($priority = false) {
+		if ( ! $this->callbacks) {
 			return;
 		}
 
-		if ( false === $priority ) {
+		if (false === $priority) {
 			$this->callbacks = array();
-		} else if ( isset( $this->callbacks[ $priority ] ) ) {
-			unset( $this->callbacks[ $priority ] );
+		} else if (isset($this->callbacks[$priority])) {
+			unset($this->callbacks[$priority]);
 		}
 
-		if ( $this->nesting_level > 0 ) {
+		if ($this->nesting_level > 0) {
 			$this->resort_active_iterations();
 		}
 	}
@@ -273,37 +273,37 @@ 
 	 * @param array $args  Arguments to pass to callbacks.
 	 * @return mixed The filtered value after all hooked functions are applied to it.
 	 */
-	public function apply_filters( $value, $args ) {
-		if ( ! $this->callbacks ) {
+	public function apply_filters($value, $args) {
+		if ( ! $this->callbacks) {
 			return $value;
 		}
 
 		$nesting_level = $this->nesting_level++;
 
-		$this->iterations[ $nesting_level ] = array_keys( $this->callbacks );
-		$num_args = count( $args );
+		$this->iterations[$nesting_level] = array_keys($this->callbacks);
+		$num_args = count($args);
 
 		do {
-			$this->current_priority[ $nesting_level ] = $priority = current( $this->iterations[ $nesting_level ] );
+			$this->current_priority[$nesting_level] = $priority = current($this->iterations[$nesting_level]);
 
-			foreach ( $this->callbacks[ $priority ] as $the_ ) {
-				if( ! $this->doing_action ) {
-					$args[ 0 ] = $value;
+			foreach ($this->callbacks[$priority] as $the_) {
+				if ( ! $this->doing_action) {
+					$args[0] = $value;
 				}
 
 				// Avoid the array_slice if possible.
-				if ( $the_['accepted_args'] == 0 ) {
-					$value = call_user_func_array( $the_['function'], array() );
-				} elseif ( $the_['accepted_args'] >= $num_args ) {
-					$value = call_user_func_array( $the_['function'], $args );
+				if ($the_['accepted_args'] == 0) {
+					$value = call_user_func_array($the_['function'], array());
+				} elseif ($the_['accepted_args'] >= $num_args) {
+					$value = call_user_func_array($the_['function'], $args);
 				} else {
-					$value = call_user_func_array( $the_['function'], array_slice( $args, 0, (int)$the_['accepted_args'] ) );
+					$value = call_user_func_array($the_['function'], array_slice($args, 0, (int) $the_['accepted_args']));
 				}
 			}
-		} while ( false !== next( $this->iterations[ $nesting_level ] ) );
+		} while (false !== next($this->iterations[$nesting_level]));
 
-		unset( $this->iterations[ $nesting_level ] );
-		unset( $this->current_priority[ $nesting_level ] );
+		unset($this->iterations[$nesting_level]);
+		unset($this->current_priority[$nesting_level]);
 
 		$this->nesting_level--;
 
@@ -318,12 +318,12 @@ 
 	 *
 	 * @param mixed $args Arguments to pass to the hook callbacks.
 	 */
-	public function do_action( $args ) {
+	public function do_action($args) {
 		$this->doing_action = true;
-		$this->apply_filters( '', $args );
+		$this->apply_filters('', $args);
 
 		// If there are recursive calls to the current action, we haven't finished it until we get to the last one.
-		if ( ! $this->nesting_level ) {
+		if ( ! $this->nesting_level) {
 			$this->doing_action = false;
 		}
 	}
@@ -336,18 +336,18 @@ 
 	 *
 	 * @param array $args Arguments to pass to the hook callbacks. Passed by reference.
 	 */
-	public function do_all_hook( &$args ) {
+	public function do_all_hook(&$args) {
 		$nesting_level = $this->nesting_level++;
-		$this->iterations[ $nesting_level ] = array_keys( $this->callbacks );
+		$this->iterations[$nesting_level] = array_keys($this->callbacks);
 
 		do {
-			$priority = current( $this->iterations[ $nesting_level ] );
-			foreach ( $this->callbacks[ $priority ] as $the_ ) {
-				call_user_func_array( $the_['function'], $args );
+			$priority = current($this->iterations[$nesting_level]);
+			foreach ($this->callbacks[$priority] as $the_) {
+				call_user_func_array($the_['function'], $args);
 			}
-		} while ( false !== next( $this->iterations[ $nesting_level ] ) );
+		} while (false !== next($this->iterations[$nesting_level]));
 
-		unset( $this->iterations[ $nesting_level ] );
+		unset($this->iterations[$nesting_level]);
 		$this->nesting_level--;
 	}
 
@@ -360,11 +360,11 @@ 
 	 * @return int|false If the hook is running, return the current priority level. If it isn't running, return false.
 	 */
 	public function current_priority() {
-		if ( false === current( $this->iterations ) ) {
+		if (false === current($this->iterations)) {
 			return false;
 		}
 
-		return current( current( $this->iterations ) );
+		return current(current($this->iterations));
 	}
 
 	/**
@@ -377,26 +377,26 @@ 
 	 * @param array $filters Filters to normalize.
 	 * @return WP_Hook[] Array of normalized filters.
 	 */
-	public static function build_preinitialized_hooks( $filters ) {
+	public static function build_preinitialized_hooks($filters) {
 		/** @var WP_Hook[] $normalized */
 		$normalized = array();
 
-		foreach ( $filters as $tag => $callback_groups ) {
-			if ( is_object( $callback_groups ) && $callback_groups instanceof WP_Hook ) {
-				$normalized[ $tag ] = $callback_groups;
+		foreach ($filters as $tag => $callback_groups) {
+			if (is_object($callback_groups) && $callback_groups instanceof WP_Hook) {
+				$normalized[$tag] = $callback_groups;
 				continue;
 			}
 			$hook = new WP_Hook();
 
 			// Loop through callback groups.
-			foreach ( $callback_groups as $priority => $callbacks ) {
+			foreach ($callback_groups as $priority => $callbacks) {
 
 				// Loop through callbacks.
-				foreach ( $callbacks as $cb ) {
-					$hook->add_filter( $tag, $cb['function'], $priority, $cb['accepted_args'] );
+				foreach ($callbacks as $cb) {
+					$hook->add_filter($tag, $cb['function'], $priority, $cb['accepted_args']);
 				}
 			}
-			$normalized[ $tag ] = $hook;
+			$normalized[$tag] = $hook;
 		}
 		return $normalized;
 	}
@@ -412,8 +412,8 @@ 
 	 * @param mixed $offset An offset to check for.
 	 * @return bool True if the offset exists, false otherwise.
 	 */
-	public function offsetExists( $offset ) {
-		return isset( $this->callbacks[ $offset ] );
+	public function offsetExists($offset) {
+		return isset($this->callbacks[$offset]);
 	}
 
 	/**
@@ -427,8 +427,8 @@ 
 	 * @param mixed $offset The offset to retrieve.
 	 * @return mixed If set, the value at the specified offset, null otherwise.
 	 */
-	public function offsetGet( $offset ) {
-		return isset( $this->callbacks[ $offset ] ) ? $this->callbacks[ $offset ] : null;
+	public function offsetGet($offset) {
+		return isset($this->callbacks[$offset]) ? $this->callbacks[$offset] : null;
 	}
 
 	/**
@@ -442,11 +442,11 @@ 
 	 * @param mixed $offset The offset to assign the value to.
 	 * @param mixed $value The value to set.
 	 */
-	public function offsetSet( $offset, $value ) {
-		if ( is_null( $offset ) ) {
+	public function offsetSet($offset, $value) {
+		if (is_null($offset)) {
 			$this->callbacks[] = $value;
 		} else {
-			$this->callbacks[ $offset ] = $value;
+			$this->callbacks[$offset] = $value;
 		}
 	}
 
@@ -460,8 +460,8 @@ 
 	 *
 	 * @param mixed $offset The offset to unset.
 	 */
-	public function offsetUnset( $offset ) {
-		unset( $this->callbacks[ $offset ] );
+	public function offsetUnset($offset) {
+		unset($this->callbacks[$offset]);
 	}
 
 	/**
@@ -475,7 +475,7 @@ 
 	 * @return array Of callbacks at current priority.
 	 */
 	public function current() {
-		return current( $this->callbacks );
+		return current($this->callbacks);
 	}
 
 	/**
@@ -489,7 +489,7 @@ 
 	 * @return array Of callbacks at next priority.
 	 */
 	public function next() {
-		return next( $this->callbacks );
+		return next($this->callbacks);
 	}
 
 	/**
@@ -503,7 +503,7 @@ 
 	 * @return mixed Returns current priority on success, or NULL on failure
 	 */
 	public function key() {
-		return key( $this->callbacks );
+		return key($this->callbacks);
 	}
 
 	/**
@@ -517,7 +517,7 @@ 
 	 * @return boolean
 	 */
 	public function valid() {
-		return key( $this->callbacks ) !== null;
+		return key($this->callbacks) !== null;
 	}
 
 	/**
@@ -529,7 +529,7 @@ 
 	 * @link http://php.net/manual/en/iterator.rewind.php
 	 */
 	public function rewind() {
-		reset( $this->callbacks );
+		reset($this->callbacks);
 	}
 
 }

src/wp-includes/class-wp-image-editor-imagick.php

Doc Comments +2 added lines, -2 removed lines

@@ -292,7 +292,7 @@ 
 	 * @param int    $dst_h       The destination height.
 	 * @param string $filter_name Optional. The Imagick filter to use when resizing. Default 'FILTER_TRIANGLE'.
 	 * @param bool   $strip_meta  Optional. Strip all profiles, excluding color profiles, from the image. Default true.
-	 * @return bool|WP_Error
+	 * @return null|WP_Error
 	 */
 	protected function thumbnail_image( $dst_w, $dst_h, $filter_name = 'FILTER_TRIANGLE', $strip_meta = true ) {
 		$allowed_filters = array(
@@ -745,7 +745,7 @@ 
 	 * @since 4.7.0
 	 * @access protected
 	 *
-	 * @return string|WP_Error File to load or WP_Error on failure.
+	 * @return string File to load or WP_Error on failure.
 	 */
 	protected function pdf_setup() {
 		try {

Spacing +163 added lines, -163 removed lines

@@ -24,7 +24,7 @@ 
 	protected $image;
 
 	public function __destruct() {
-		if ( $this->image instanceof Imagick ) {
+		if ($this->image instanceof Imagick) {
 			// we don't need the original in memory anymore
 			$this->image->clear();
 			$this->image->destroy();
@@ -45,13 +45,13 @@ 
 	 * @param array $args
 	 * @return bool
 	 */
-	public static function test( $args = array() ) {
+	public static function test($args = array()) {
 
 		// First, test Imagick's extension and classes.
-		if ( ! extension_loaded( 'imagick' ) || ! class_exists( 'Imagick', false ) || ! class_exists( 'ImagickPixel', false ) )
+		if ( ! extension_loaded('imagick') || ! class_exists('Imagick', false) || ! class_exists('ImagickPixel', false))
 			return false;
 
-		if ( version_compare( phpversion( 'imagick' ), '2.2.0', '<' ) )
+		if (version_compare(phpversion('imagick'), '2.2.0', '<'))
 			return false;
 
 		$required_methods = array(
@@ -77,16 +77,16 @@ 
 		);
 
 		// Now, test for deep requirements within Imagick.
-		if ( ! defined( 'imagick::COMPRESSION_JPEG' ) )
+		if ( ! defined('imagick::COMPRESSION_JPEG'))
 			return false;
 
-		$class_methods = array_map( 'strtolower', get_class_methods( 'Imagick' ) );
-		if ( array_diff( $required_methods, $class_methods ) ) {
+		$class_methods = array_map('strtolower', get_class_methods('Imagick'));
+		if (array_diff($required_methods, $class_methods)) {
 			return false;
 		}
 
 		// HHVM Imagick does not support loading from URL, so fail to allow fallback to GD.
-		if ( defined( 'HHVM_VERSION' ) && isset( $args['path'] ) && preg_match( '|^https?://|', $args['path'] ) ) {
+		if (defined('HHVM_VERSION') && isset($args['path']) && preg_match('|^https?://|', $args['path'])) {
 			return false;
 		}
 
@@ -104,21 +104,21 @@ 
 	 * @param string $mime_type
 	 * @return bool
 	 */
-	public static function supports_mime_type( $mime_type ) {
-		$imagick_extension = strtoupper( self::get_extension( $mime_type ) );
+	public static function supports_mime_type($mime_type) {
+		$imagick_extension = strtoupper(self::get_extension($mime_type));
 
-		if ( ! $imagick_extension )
+		if ( ! $imagick_extension)
 			return false;
 
 		// setIteratorIndex is optional unless mime is an animated format.
 		// Here, we just say no if you are missing it and aren't loading a jpeg.
-		if ( ! method_exists( 'Imagick', 'setIteratorIndex' ) && $mime_type != 'image/jpeg' )
+		if ( ! method_exists('Imagick', 'setIteratorIndex') && $mime_type != 'image/jpeg')
 				return false;
 
 		try {
-			return ( (bool) @Imagick::queryFormats( $imagick_extension ) );
+			return ((bool) @Imagick::queryFormats($imagick_extension));
 		}
-		catch ( Exception $e ) {
+		catch (Exception $e) {
 			return false;
 		}
 	}
@@ -132,46 +132,46 @@ 
 	 * @return true|WP_Error True if loaded; WP_Error on failure.
 	 */
 	public function load() {
-		if ( $this->image instanceof Imagick )
+		if ($this->image instanceof Imagick)
 			return true;
 
-		if ( ! is_file( $this->file ) && ! preg_match( '|^https?://|', $this->file ) )
-			return new WP_Error( 'error_loading_image', __('File doesn&#8217;t exist?'), $this->file );
+		if ( ! is_file($this->file) && ! preg_match('|^https?://|', $this->file))
+			return new WP_Error('error_loading_image', __('File doesn&#8217;t exist?'), $this->file);
 
 		/*
 		 * Even though Imagick uses less PHP memory than GD, set higher limit
 		 * for users that have low PHP.ini limits.
 		 */
-		wp_raise_memory_limit( 'image' );
+		wp_raise_memory_limit('image');
 
 		try {
 			$this->image = new Imagick();
-			$file_extension = strtolower( pathinfo( $this->file, PATHINFO_EXTENSION ) );
+			$file_extension = strtolower(pathinfo($this->file, PATHINFO_EXTENSION));
 			$filename = $this->file;
 
-			if ( 'pdf' == $file_extension ) {
+			if ('pdf' == $file_extension) {
 				$filename = $this->pdf_setup();
 			}
 
 			// Reading image after Imagick instantiation because `setResolution`
 			// only applies correctly before the image is read.
-			$this->image->readImage( $filename );
+			$this->image->readImage($filename);
 
-			if ( ! $this->image->valid() )
-				return new WP_Error( 'invalid_image', __('File is not an image.'), $this->file);
+			if ( ! $this->image->valid())
+				return new WP_Error('invalid_image', __('File is not an image.'), $this->file);
 
 			// Select the first frame to handle animated images properly
-			if ( is_callable( array( $this->image, 'setIteratorIndex' ) ) )
+			if (is_callable(array($this->image, 'setIteratorIndex')))
 				$this->image->setIteratorIndex(0);
 
-			$this->mime_type = $this->get_mime_type( $this->image->getImageFormat() );
+			$this->mime_type = $this->get_mime_type($this->image->getImageFormat());
 		}
-		catch ( Exception $e ) {
-			return new WP_Error( 'invalid_image', $e->getMessage(), $this->file );
+		catch (Exception $e) {
+			return new WP_Error('invalid_image', $e->getMessage(), $this->file);
 		}
 
 		$updated_size = $this->update_size();
-		if ( is_wp_error( $updated_size ) ) {
+		if (is_wp_error($updated_size)) {
 			return $updated_size;
 		}
 
@@ -187,25 +187,25 @@ 
 	 * @param int $quality Compression Quality. Range: [1,100]
 	 * @return true|WP_Error True if set successfully; WP_Error on failure.
 	 */
-	public function set_quality( $quality = null ) {
-		$quality_result = parent::set_quality( $quality );
-		if ( is_wp_error( $quality_result ) ) {
+	public function set_quality($quality = null) {
+		$quality_result = parent::set_quality($quality);
+		if (is_wp_error($quality_result)) {
 			return $quality_result;
 		} else {
 			$quality = $this->get_quality();
 		}
 
 		try {
-			if ( 'image/jpeg' == $this->mime_type ) {
-				$this->image->setImageCompressionQuality( $quality );
-				$this->image->setImageCompression( imagick::COMPRESSION_JPEG );
+			if ('image/jpeg' == $this->mime_type) {
+				$this->image->setImageCompressionQuality($quality);
+				$this->image->setImageCompression(imagick::COMPRESSION_JPEG);
 			}
 			else {
-				$this->image->setImageCompressionQuality( $quality );
+				$this->image->setImageCompressionQuality($quality);
 			}
 		}
-		catch ( Exception $e ) {
-			return new WP_Error( 'image_quality_error', $e->getMessage() );
+		catch (Exception $e) {
+			return new WP_Error('image_quality_error', $e->getMessage());
 		}
 
 		return true;
@@ -222,24 +222,24 @@ 
 	 *
 	 * @return true|WP_Error
 	 */
-	protected function update_size( $width = null, $height = null ) {
+	protected function update_size($width = null, $height = null) {
 		$size = null;
-		if ( !$width || !$height ) {
+		if ( ! $width || ! $height) {
 			try {
 				$size = $this->image->getImageGeometry();
 			}
-			catch ( Exception $e ) {
-				return new WP_Error( 'invalid_image', __( 'Could not read image size.' ), $this->file );
+			catch (Exception $e) {
+				return new WP_Error('invalid_image', __('Could not read image size.'), $this->file);
 			}
 		}
 
-		if ( ! $width )
+		if ( ! $width)
 			$width = $size['width'];
 
-		if ( ! $height )
+		if ( ! $height)
 			$height = $size['height'];
 
-		return parent::update_size( $width, $height );
+		return parent::update_size($width, $height);
 	}
 
 	/**
@@ -257,26 +257,26 @@ 
 	 * @param  bool     $crop
 	 * @return bool|WP_Error
 	 */
-	public function resize( $max_w, $max_h, $crop = false ) {
-		if ( ( $this->size['width'] == $max_w ) && ( $this->size['height'] == $max_h ) )
+	public function resize($max_w, $max_h, $crop = false) {
+		if (($this->size['width'] == $max_w) && ($this->size['height'] == $max_h))
 			return true;
 
-		$dims = image_resize_dimensions( $this->size['width'], $this->size['height'], $max_w, $max_h, $crop );
-		if ( ! $dims )
-			return new WP_Error( 'error_getting_dimensions', __('Could not calculate resized image dimensions') );
-		list( $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h ) = $dims;
+		$dims = image_resize_dimensions($this->size['width'], $this->size['height'], $max_w, $max_h, $crop);
+		if ( ! $dims)
+			return new WP_Error('error_getting_dimensions', __('Could not calculate resized image dimensions'));
+		list($dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h) = $dims;
 
-		if ( $crop ) {
-			return $this->crop( $src_x, $src_y, $src_w, $src_h, $dst_w, $dst_h );
+		if ($crop) {
+			return $this->crop($src_x, $src_y, $src_w, $src_h, $dst_w, $dst_h);
 		}
 
 		// Execute the resize
-		$thumb_result = $this->thumbnail_image( $dst_w, $dst_h );
-		if ( is_wp_error( $thumb_result ) ) {
+		$thumb_result = $this->thumbnail_image($dst_w, $dst_h);
+		if (is_wp_error($thumb_result)) {
 			return $thumb_result;
 		}
 
-		return $this->update_size( $dst_w, $dst_h );
+		return $this->update_size($dst_w, $dst_h);
 	}
 
 	/**
@@ -294,7 +294,7 @@ 
 	 * @param bool   $strip_meta  Optional. Strip all profiles, excluding color profiles, from the image. Default true.
 	 * @return bool|WP_Error
 	 */
-	protected function thumbnail_image( $dst_w, $dst_h, $filter_name = 'FILTER_TRIANGLE', $strip_meta = true ) {
+	protected function thumbnail_image($dst_w, $dst_h, $filter_name = 'FILTER_TRIANGLE', $strip_meta = true) {
 		$allowed_filters = array(
 			'FILTER_POINT',
 			'FILTER_BOX',
@@ -317,10 +317,10 @@ 
 		 * Set the filter value if '$filter_name' name is in our whitelist and the related
 		 * Imagick constant is defined or fall back to our default filter.
 		 */
-		if ( in_array( $filter_name, $allowed_filters ) && defined( 'Imagick::' . $filter_name ) ) {
-			$filter = constant( 'Imagick::' . $filter_name );
+		if (in_array($filter_name, $allowed_filters) && defined('Imagick::'.$filter_name)) {
+			$filter = constant('Imagick::'.$filter_name);
 		} else {
-			$filter = defined( 'Imagick::FILTER_TRIANGLE' ) ? Imagick::FILTER_TRIANGLE : false;
+			$filter = defined('Imagick::FILTER_TRIANGLE') ? Imagick::FILTER_TRIANGLE : false;
 		}
 
 		/**
@@ -333,7 +333,7 @@ 
 		 *
 		 * @param bool $strip_meta Whether to strip image metadata during resizing. Default true.
 		 */
-		if ( apply_filters( 'image_strip_meta', $strip_meta ) ) {
+		if (apply_filters('image_strip_meta', $strip_meta)) {
 			$this->strip_meta(); // Fail silently if not supported.
 		}
 
@@ -343,12 +343,12 @@ 
 			 * whenever the output size is less that 1/3 of the original image size (1/3^2 ~= .111),
 			 * unless we would be resampling to a scale smaller than 128x128.
 			 */
-			if ( is_callable( array( $this->image, 'sampleImage' ) ) ) {
-				$resize_ratio = ( $dst_w / $this->size['width'] ) * ( $dst_h / $this->size['height'] );
+			if (is_callable(array($this->image, 'sampleImage'))) {
+				$resize_ratio = ($dst_w / $this->size['width']) * ($dst_h / $this->size['height']);
 				$sample_factor = 5;
 
-				if ( $resize_ratio < .111 && ( $dst_w * $sample_factor > 128 && $dst_h * $sample_factor > 128 ) ) {
-					$this->image->sampleImage( $dst_w * $sample_factor, $dst_h * $sample_factor );
+				if ($resize_ratio < .111 && ($dst_w * $sample_factor > 128 && $dst_h * $sample_factor > 128)) {
+					$this->image->sampleImage($dst_w * $sample_factor, $dst_h * $sample_factor);
 				}
 			}
 
@@ -358,27 +358,27 @@ 
 			 * results in better image quality over resizeImage() with default filter
 			 * settings and retains backward compatibility with pre 4.5 functionality.
 			 */
-			if ( is_callable( array( $this->image, 'resizeImage' ) ) && $filter ) {
-				$this->image->setOption( 'filter:support', '2.0' );
-				$this->image->resizeImage( $dst_w, $dst_h, $filter, 1 );
+			if (is_callable(array($this->image, 'resizeImage')) && $filter) {
+				$this->image->setOption('filter:support', '2.0');
+				$this->image->resizeImage($dst_w, $dst_h, $filter, 1);
 			} else {
-				$this->image->scaleImage( $dst_w, $dst_h );
+				$this->image->scaleImage($dst_w, $dst_h);
 			}
 
 			// Set appropriate quality settings after resizing.
-			if ( 'image/jpeg' == $this->mime_type ) {
-				if ( is_callable( array( $this->image, 'unsharpMaskImage' ) ) ) {
-					$this->image->unsharpMaskImage( 0.25, 0.25, 8, 0.065 );
+			if ('image/jpeg' == $this->mime_type) {
+				if (is_callable(array($this->image, 'unsharpMaskImage'))) {
+					$this->image->unsharpMaskImage(0.25, 0.25, 8, 0.065);
 				}
 
-				$this->image->setOption( 'jpeg:fancy-upsampling', 'off' );
+				$this->image->setOption('jpeg:fancy-upsampling', 'off');
 			}
 
-			if ( 'image/png' === $this->mime_type ) {
-				$this->image->setOption( 'png:compression-filter', '5' );
-				$this->image->setOption( 'png:compression-level', '9' );
-				$this->image->setOption( 'png:compression-strategy', '1' );
-				$this->image->setOption( 'png:exclude-chunk', 'all' );
+			if ('image/png' === $this->mime_type) {
+				$this->image->setOption('png:compression-filter', '5');
+				$this->image->setOption('png:compression-level', '9');
+				$this->image->setOption('png:compression-strategy', '1');
+				$this->image->setOption('png:exclude-chunk', 'all');
 			}
 
 			/*
@@ -387,30 +387,30 @@ 
 			 * Note that Imagick::getImageAlphaChannel() is only available if Imagick
 			 * has been compiled against ImageMagick version 6.4.0 or newer.
 			 */
-			if ( is_callable( array( $this->image, 'getImageAlphaChannel' ) )
-				&& is_callable( array( $this->image, 'setImageAlphaChannel' ) )
-				&& defined( 'Imagick::ALPHACHANNEL_UNDEFINED' )
-				&& defined( 'Imagick::ALPHACHANNEL_OPAQUE' )
+			if (is_callable(array($this->image, 'getImageAlphaChannel'))
+				&& is_callable(array($this->image, 'setImageAlphaChannel'))
+				&& defined('Imagick::ALPHACHANNEL_UNDEFINED')
+				&& defined('Imagick::ALPHACHANNEL_OPAQUE')
 			) {
-				if ( $this->image->getImageAlphaChannel() === Imagick::ALPHACHANNEL_UNDEFINED ) {
-					$this->image->setImageAlphaChannel( Imagick::ALPHACHANNEL_OPAQUE );
+				if ($this->image->getImageAlphaChannel() === Imagick::ALPHACHANNEL_UNDEFINED) {
+					$this->image->setImageAlphaChannel(Imagick::ALPHACHANNEL_OPAQUE);
 				}
 			}
 
 			// Limit the bit depth of resized images to 8 bits per channel.
-			if ( is_callable( array( $this->image, 'getImageDepth' ) ) && is_callable( array( $this->image, 'setImageDepth' ) ) ) {
-				if ( 8 < $this->image->getImageDepth() ) {
-					$this->image->setImageDepth( 8 );
+			if (is_callable(array($this->image, 'getImageDepth')) && is_callable(array($this->image, 'setImageDepth'))) {
+				if (8 < $this->image->getImageDepth()) {
+					$this->image->setImageDepth(8);
 				}
 			}
 
-			if ( is_callable( array( $this->image, 'setInterlaceScheme' ) ) && defined( 'Imagick::INTERLACE_NO' ) ) {
-				$this->image->setInterlaceScheme( Imagick::INTERLACE_NO );
+			if (is_callable(array($this->image, 'setInterlaceScheme')) && defined('Imagick::INTERLACE_NO')) {
+				$this->image->setInterlaceScheme(Imagick::INTERLACE_NO);
 			}
 
 		}
-		catch ( Exception $e ) {
-			return new WP_Error( 'image_resize_error', $e->getMessage() );
+		catch (Exception $e) {
+			return new WP_Error('image_resize_error', $e->getMessage());
 		}
 	}
 
@@ -437,42 +437,42 @@ 
 	 * }
 	 * @return array An array of resized images' metadata by size.
 	 */
-	public function multi_resize( $sizes ) {
+	public function multi_resize($sizes) {
 		$metadata = array();
 		$orig_size = $this->size;
 		$orig_image = $this->image->getImage();
 
-		foreach ( $sizes as $size => $size_data ) {
-			if ( ! $this->image )
+		foreach ($sizes as $size => $size_data) {
+			if ( ! $this->image)
 				$this->image = $orig_image->getImage();
 
-			if ( ! isset( $size_data['width'] ) && ! isset( $size_data['height'] ) ) {
+			if ( ! isset($size_data['width']) && ! isset($size_data['height'])) {
 				continue;
 			}
 
-			if ( ! isset( $size_data['width'] ) ) {
+			if ( ! isset($size_data['width'])) {
 				$size_data['width'] = null;
 			}
-			if ( ! isset( $size_data['height'] ) ) {
+			if ( ! isset($size_data['height'])) {
 				$size_data['height'] = null;
 			}
 
-			if ( ! isset( $size_data['crop'] ) ) {
+			if ( ! isset($size_data['crop'])) {
 				$size_data['crop'] = false;
 			}
 
-			$resize_result = $this->resize( $size_data['width'], $size_data['height'], $size_data['crop'] );
-			$duplicate = ( ( $orig_size['width'] == $size_data['width'] ) && ( $orig_size['height'] == $size_data['height'] ) );
+			$resize_result = $this->resize($size_data['width'], $size_data['height'], $size_data['crop']);
+			$duplicate = (($orig_size['width'] == $size_data['width']) && ($orig_size['height'] == $size_data['height']));
 
-			if ( ! is_wp_error( $resize_result ) && ! $duplicate ) {
-				$resized = $this->_save( $this->image );
+			if ( ! is_wp_error($resize_result) && ! $duplicate) {
+				$resized = $this->_save($this->image);
 
 				$this->image->clear();
 				$this->image->destroy();
 				$this->image = null;
 
-				if ( ! is_wp_error( $resized ) && $resized ) {
-					unset( $resized['path'] );
+				if ( ! is_wp_error($resized) && $resized) {
+					unset($resized['path']);
 					$metadata[$size] = $resized;
 				}
 			}
@@ -500,34 +500,34 @@ 
 	 * @param bool $src_abs Optional. If the source crop points are absolute.
 	 * @return bool|WP_Error
 	 */
-	public function crop( $src_x, $src_y, $src_w, $src_h, $dst_w = null, $dst_h = null, $src_abs = false ) {
-		if ( $src_abs ) {
+	public function crop($src_x, $src_y, $src_w, $src_h, $dst_w = null, $dst_h = null, $src_abs = false) {
+		if ($src_abs) {
 			$src_w -= $src_x;
 			$src_h -= $src_y;
 		}
 
 		try {
-			$this->image->cropImage( $src_w, $src_h, $src_x, $src_y );
-			$this->image->setImagePage( $src_w, $src_h, 0, 0);
+			$this->image->cropImage($src_w, $src_h, $src_x, $src_y);
+			$this->image->setImagePage($src_w, $src_h, 0, 0);
 
-			if ( $dst_w || $dst_h ) {
+			if ($dst_w || $dst_h) {
 				// If destination width/height isn't specified, use same as
 				// width/height from source.
-				if ( ! $dst_w )
+				if ( ! $dst_w)
 					$dst_w = $src_w;
-				if ( ! $dst_h )
+				if ( ! $dst_h)
 					$dst_h = $src_h;
 
-				$thumb_result = $this->thumbnail_image( $dst_w, $dst_h );
-				if ( is_wp_error( $thumb_result ) ) {
+				$thumb_result = $this->thumbnail_image($dst_w, $dst_h);
+				if (is_wp_error($thumb_result)) {
 					return $thumb_result;
 				}
 
 				return $this->update_size();
 			}
 		}
-		catch ( Exception $e ) {
-			return new WP_Error( 'image_crop_error', $e->getMessage() );
+		catch (Exception $e) {
+			return new WP_Error('image_crop_error', $e->getMessage());
 		}
 		return $this->update_size();
 	}
@@ -541,23 +541,23 @@ 
 	 * @param float $angle
 	 * @return true|WP_Error
 	 */
-	public function rotate( $angle ) {
+	public function rotate($angle) {
 		/**
 		 * $angle is 360-$angle because Imagick rotates clockwise
 		 * (GD rotates counter-clockwise)
 		 */
 		try {
-			$this->image->rotateImage( new ImagickPixel('none'), 360-$angle );
+			$this->image->rotateImage(new ImagickPixel('none'), 360 - $angle);
 
 			// Since this changes the dimensions of the image, update the size.
 			$result = $this->update_size();
-			if ( is_wp_error( $result ) )
+			if (is_wp_error($result))
 				return $result;
 
-			$this->image->setImagePage( $this->size['width'], $this->size['height'], 0, 0 );
+			$this->image->setImagePage($this->size['width'], $this->size['height'], 0, 0);
 		}
-		catch ( Exception $e ) {
-			return new WP_Error( 'image_rotate_error', $e->getMessage() );
+		catch (Exception $e) {
+			return new WP_Error('image_rotate_error', $e->getMessage());
 		}
 		return true;
 	}
@@ -572,16 +572,16 @@ 
 	 * @param bool $vert Flip along Vertical Axis
 	 * @return true|WP_Error
 	 */
-	public function flip( $horz, $vert ) {
+	public function flip($horz, $vert) {
 		try {
-			if ( $horz )
+			if ($horz)
 				$this->image->flipImage();
 
-			if ( $vert )
+			if ($vert)
 				$this->image->flopImage();
 		}
-		catch ( Exception $e ) {
-			return new WP_Error( 'image_flip_error', $e->getMessage() );
+		catch (Exception $e) {
+			return new WP_Error('image_flip_error', $e->getMessage());
 		}
 		return true;
 	}
@@ -596,18 +596,18 @@ 
 	 * @param string $mime_type
 	 * @return array|WP_Error {'path'=>string, 'file'=>string, 'width'=>int, 'height'=>int, 'mime-type'=>string}
 	 */
-	public function save( $destfilename = null, $mime_type = null ) {
-		$saved = $this->_save( $this->image, $destfilename, $mime_type );
+	public function save($destfilename = null, $mime_type = null) {
+		$saved = $this->_save($this->image, $destfilename, $mime_type);
 
-		if ( ! is_wp_error( $saved ) ) {
+		if ( ! is_wp_error($saved)) {
 			$this->file = $saved['path'];
 			$this->mime_type = $saved['mime-type'];
 
 			try {
-				$this->image->setImageFormat( strtoupper( $this->get_extension( $this->mime_type ) ) );
+				$this->image->setImageFormat(strtoupper($this->get_extension($this->mime_type)));
 			}
-			catch ( Exception $e ) {
-				return new WP_Error( 'image_save_error', $e->getMessage(), $this->file );
+			catch (Exception $e) {
+				return new WP_Error('image_save_error', $e->getMessage(), $this->file);
 			}
 		}
 
@@ -621,35 +621,35 @@ 
 	 * @param string $mime_type
 	 * @return array|WP_Error
 	 */
-	protected function _save( $image, $filename = null, $mime_type = null ) {
-		list( $filename, $extension, $mime_type ) = $this->get_output_format( $filename, $mime_type );
+	protected function _save($image, $filename = null, $mime_type = null) {
+		list($filename, $extension, $mime_type) = $this->get_output_format($filename, $mime_type);
 
-		if ( ! $filename )
-			$filename = $this->generate_filename( null, null, $extension );
+		if ( ! $filename)
+			$filename = $this->generate_filename(null, null, $extension);
 
 		try {
 			// Store initial Format
 			$orig_format = $this->image->getImageFormat();
 
-			$this->image->setImageFormat( strtoupper( $this->get_extension( $mime_type ) ) );
-			$this->make_image( $filename, array( $image, 'writeImage' ), array( $filename ) );
+			$this->image->setImageFormat(strtoupper($this->get_extension($mime_type)));
+			$this->make_image($filename, array($image, 'writeImage'), array($filename));
 
 			// Reset original Format
-			$this->image->setImageFormat( $orig_format );
+			$this->image->setImageFormat($orig_format);
 		}
-		catch ( Exception $e ) {
-			return new WP_Error( 'image_save_error', $e->getMessage(), $filename );
+		catch (Exception $e) {
+			return new WP_Error('image_save_error', $e->getMessage(), $filename);
 		}
 
 		// Set correct file permissions
-		$stat = stat( dirname( $filename ) );
+		$stat = stat(dirname($filename));
 		$perms = $stat['mode'] & 0000666; //same permissions as parent folder, strip off the executable bits
-		@ chmod( $filename, $perms );
+		@ chmod($filename, $perms);
 
 		/** This filter is documented in wp-includes/class-wp-image-editor-gd.php */
 		return array(
 			'path'      => $filename,
-			'file'      => wp_basename( apply_filters( 'image_make_intermediate_size', $filename ) ),
+			'file'      => wp_basename(apply_filters('image_make_intermediate_size', $filename)),
 			'width'     => $this->size['width'],
 			'height'    => $this->size['height'],
 			'mime-type' => $mime_type,
@@ -665,22 +665,22 @@ 
 	 * @param string $mime_type
 	 * @return true|WP_Error
 	 */
-	public function stream( $mime_type = null ) {
-		list( $filename, $extension, $mime_type ) = $this->get_output_format( null, $mime_type );
+	public function stream($mime_type = null) {
+		list($filename, $extension, $mime_type) = $this->get_output_format(null, $mime_type);
 
 		try {
 			// Temporarily change format for stream
-			$this->image->setImageFormat( strtoupper( $extension ) );
+			$this->image->setImageFormat(strtoupper($extension));
 
 			// Output stream of image content
-			header( "Content-Type: $mime_type" );
+			header("Content-Type: $mime_type");
 			print $this->image->getImageBlob();
 
 			// Reset Image to original Format
-			$this->image->setImageFormat( $this->get_extension( $this->mime_type ) );
+			$this->image->setImageFormat($this->get_extension($this->mime_type));
 		}
-		catch ( Exception $e ) {
-			return new WP_Error( 'image_stream_error', $e->getMessage() );
+		catch (Exception $e) {
+			return new WP_Error('image_stream_error', $e->getMessage());
 		}
 
 		return true;
@@ -696,14 +696,14 @@ 
 	 */
 	protected function strip_meta() {
 
-		if ( ! is_callable( array( $this->image, 'getImageProfiles' ) ) ) {
+		if ( ! is_callable(array($this->image, 'getImageProfiles'))) {
 			/* translators: %s: ImageMagick method name */
-			return new WP_Error( 'image_strip_meta_error', sprintf( __( '%s is required to strip image meta.' ), '<code>Imagick::getImageProfiles()</code>' ) );
+			return new WP_Error('image_strip_meta_error', sprintf(__('%s is required to strip image meta.'), '<code>Imagick::getImageProfiles()</code>'));
 		}
 
-		if ( ! is_callable( array( $this->image, 'removeImageProfile' ) ) ) {
+		if ( ! is_callable(array($this->image, 'removeImageProfile'))) {
 			/* translators: %s: ImageMagick method name */
-			return new WP_Error( 'image_strip_meta_error', sprintf( __( '%s is required to strip image meta.' ), '<code>Imagick::removeImageProfile()</code>' ) );
+			return new WP_Error('image_strip_meta_error', sprintf(__('%s is required to strip image meta.'), '<code>Imagick::removeImageProfile()</code>'));
 		}
 
 		/*
@@ -725,14 +725,14 @@ 
 
 		try {
 			// Strip profiles.
-			foreach ( $this->image->getImageProfiles( '*', true ) as $key => $value ) {
-				if ( ! in_array( $key, $protected_profiles ) ) {
-					$this->image->removeImageProfile( $key );
+			foreach ($this->image->getImageProfiles('*', true) as $key => $value) {
+				if ( ! in_array($key, $protected_profiles)) {
+					$this->image->removeImageProfile($key);
 				}
 			}
 
-		} catch ( Exception $e ) {
-			return new WP_Error( 'image_strip_meta_error', $e->getMessage() );
+		} catch (Exception $e) {
+			return new WP_Error('image_strip_meta_error', $e->getMessage());
 		}
 
 		return true;
@@ -751,13 +751,13 @@ 
 		try {
 			// By default, PDFs are rendered in a very low resolution.
 			// We want the thumbnail to be readable, so increase the rendering DPI.
-			$this->image->setResolution( 128, 128 );
+			$this->image->setResolution(128, 128);
 
 			// Only load the first page.
-			return $this->file . '[0]';
+			return $this->file.'[0]';
 		}
-		catch ( Exception $e ) {
-			return new WP_Error( 'pdf_setup_failed', $e->getMessage(), $this->file );
+		catch (Exception $e) {
+			return new WP_Error('pdf_setup_failed', $e->getMessage(), $this->file);
 		}
 	}
 

Braces +73 added lines, -66 removed lines

@@ -48,11 +48,13 @@ 
 	public static function test( $args = array() ) {
 
 		// First, test Imagick's extension and classes.
-		if ( ! extension_loaded( 'imagick' ) || ! class_exists( 'Imagick', false ) || ! class_exists( 'ImagickPixel', false ) )
-			return false;
+		if ( ! extension_loaded( 'imagick' ) || ! class_exists( 'Imagick', false ) || ! class_exists( 'ImagickPixel', false ) ) {
+					return false;
+		}
 
-		if ( version_compare( phpversion( 'imagick' ), '2.2.0', '<' ) )
-			return false;
+		if ( version_compare( phpversion( 'imagick' ), '2.2.0', '<' ) ) {
+					return false;
+		}
 
 		$required_methods = array(
 			'clear',
@@ -77,8 +79,9 @@ 
 		);
 
 		// Now, test for deep requirements within Imagick.
-		if ( ! defined( 'imagick::COMPRESSION_JPEG' ) )
-			return false;
+		if ( ! defined( 'imagick::COMPRESSION_JPEG' ) ) {
+					return false;
+		}
 
 		$class_methods = array_map( 'strtolower', get_class_methods( 'Imagick' ) );
 		if ( array_diff( $required_methods, $class_methods ) ) {
@@ -107,18 +110,19 @@ 
 	public static function supports_mime_type( $mime_type ) {
 		$imagick_extension = strtoupper( self::get_extension( $mime_type ) );
 
-		if ( ! $imagick_extension )
-			return false;
+		if ( ! $imagick_extension ) {
+					return false;
+		}
 
 		// setIteratorIndex is optional unless mime is an animated format.
 		// Here, we just say no if you are missing it and aren't loading a jpeg.
-		if ( ! method_exists( 'Imagick', 'setIteratorIndex' ) && $mime_type != 'image/jpeg' )
-				return false;
+		if ( ! method_exists( 'Imagick', 'setIteratorIndex' ) && $mime_type != 'image/jpeg' ) {
+						return false;
+		}
 
 		try {
 			return ( (bool) @Imagick::queryFormats( $imagick_extension ) );
-		}
-		catch ( Exception $e ) {
+		} catch ( Exception $e ) {
 			return false;
 		}
 	}
@@ -132,11 +136,13 @@ 
 	 * @return true|WP_Error True if loaded; WP_Error on failure.
 	 */
 	public function load() {
-		if ( $this->image instanceof Imagick )
-			return true;
+		if ( $this->image instanceof Imagick ) {
+					return true;
+		}
 
-		if ( ! is_file( $this->file ) && ! preg_match( '|^https?://|', $this->file ) )
-			return new WP_Error( 'error_loading_image', __('File doesn&#8217;t exist?'), $this->file );
+		if ( ! is_file( $this->file ) && ! preg_match( '|^https?://|', $this->file ) ) {
+					return new WP_Error( 'error_loading_image', __('File doesn&#8217;t exist?'), $this->file );
+		}
 
 		/*
 		 * Even though Imagick uses less PHP memory than GD, set higher limit
@@ -157,16 +163,17 @@ 
 			// only applies correctly before the image is read.
 			$this->image->readImage( $filename );
 
-			if ( ! $this->image->valid() )
-				return new WP_Error( 'invalid_image', __('File is not an image.'), $this->file);
+			if ( ! $this->image->valid() ) {
+							return new WP_Error( 'invalid_image', __('File is not an image.'), $this->file);
+			}
 
 			// Select the first frame to handle animated images properly
-			if ( is_callable( array( $this->image, 'setIteratorIndex' ) ) )
-				$this->image->setIteratorIndex(0);
+			if ( is_callable( array( $this->image, 'setIteratorIndex' ) ) ) {
+							$this->image->setIteratorIndex(0);
+			}
 
 			$this->mime_type = $this->get_mime_type( $this->image->getImageFormat() );
-		}
-		catch ( Exception $e ) {
+		} catch ( Exception $e ) {
 			return new WP_Error( 'invalid_image', $e->getMessage(), $this->file );
 		}
 
@@ -199,12 +206,10 @@ 
 			if ( 'image/jpeg' == $this->mime_type ) {
 				$this->image->setImageCompressionQuality( $quality );
 				$this->image->setImageCompression( imagick::COMPRESSION_JPEG );
-			}
-			else {
+			} else {
 				$this->image->setImageCompressionQuality( $quality );
 			}
-		}
-		catch ( Exception $e ) {
+		} catch ( Exception $e ) {
 			return new WP_Error( 'image_quality_error', $e->getMessage() );
 		}
 
@@ -227,17 +232,18 @@ 
 		if ( !$width || !$height ) {
 			try {
 				$size = $this->image->getImageGeometry();
-			}
-			catch ( Exception $e ) {
+			} catch ( Exception $e ) {
 				return new WP_Error( 'invalid_image', __( 'Could not read image size.' ), $this->file );
 			}
 		}
 
-		if ( ! $width )
-			$width = $size['width'];
+		if ( ! $width ) {
+					$width = $size['width'];
+		}
 
-		if ( ! $height )
-			$height = $size['height'];
+		if ( ! $height ) {
+					$height = $size['height'];
+		}
 
 		return parent::update_size( $width, $height );
 	}
@@ -258,12 +264,14 @@ 
 	 * @return bool|WP_Error
 	 */
 	public function resize( $max_w, $max_h, $crop = false ) {
-		if ( ( $this->size['width'] == $max_w ) && ( $this->size['height'] == $max_h ) )
-			return true;
+		if ( ( $this->size['width'] == $max_w ) && ( $this->size['height'] == $max_h ) ) {
+					return true;
+		}
 
 		$dims = image_resize_dimensions( $this->size['width'], $this->size['height'], $max_w, $max_h, $crop );
-		if ( ! $dims )
-			return new WP_Error( 'error_getting_dimensions', __('Could not calculate resized image dimensions') );
+		if ( ! $dims ) {
+					return new WP_Error( 'error_getting_dimensions', __('Could not calculate resized image dimensions') );
+		}
 		list( $dst_x, $dst_y, $src_x, $src_y, $dst_w, $dst_h, $src_w, $src_h ) = $dims;
 
 		if ( $crop ) {
@@ -408,8 +416,7 @@ 
 				$this->image->setInterlaceScheme( Imagick::INTERLACE_NO );
 			}
 
-		}
-		catch ( Exception $e ) {
+		} catch ( Exception $e ) {
 			return new WP_Error( 'image_resize_error', $e->getMessage() );
 		}
 	}
@@ -443,8 +450,9 @@ 
 		$orig_image = $this->image->getImage();
 
 		foreach ( $sizes as $size => $size_data ) {
-			if ( ! $this->image )
-				$this->image = $orig_image->getImage();
+			if ( ! $this->image ) {
+							$this->image = $orig_image->getImage();
+			}
 
 			if ( ! isset( $size_data['width'] ) && ! isset( $size_data['height'] ) ) {
 				continue;
@@ -513,10 +521,12 @@ 
 			if ( $dst_w || $dst_h ) {
 				// If destination width/height isn't specified, use same as
 				// width/height from source.
-				if ( ! $dst_w )
-					$dst_w = $src_w;
-				if ( ! $dst_h )
-					$dst_h = $src_h;
+				if ( ! $dst_w ) {
+									$dst_w = $src_w;
+				}
+				if ( ! $dst_h ) {
+									$dst_h = $src_h;
+				}
 
 				$thumb_result = $this->thumbnail_image( $dst_w, $dst_h );
 				if ( is_wp_error( $thumb_result ) ) {
@@ -525,8 +535,7 @@ 
 
 				return $this->update_size();
 			}
-		}
-		catch ( Exception $e ) {
+		} catch ( Exception $e ) {
 			return new WP_Error( 'image_crop_error', $e->getMessage() );
 		}
 		return $this->update_size();
@@ -551,12 +560,12 @@ 
 
 			// Since this changes the dimensions of the image, update the size.
 			$result = $this->update_size();
-			if ( is_wp_error( $result ) )
-				return $result;
+			if ( is_wp_error( $result ) ) {
+							return $result;
+			}
 
 			$this->image->setImagePage( $this->size['width'], $this->size['height'], 0, 0 );
-		}
-		catch ( Exception $e ) {
+		} catch ( Exception $e ) {
 			return new WP_Error( 'image_rotate_error', $e->getMessage() );
 		}
 		return true;
@@ -574,13 +583,14 @@ 
 	 */
 	public function flip( $horz, $vert ) {
 		try {
-			if ( $horz )
-				$this->image->flipImage();
+			if ( $horz ) {
+							$this->image->flipImage();
+			}
 
-			if ( $vert )
-				$this->image->flopImage();
-		}
-		catch ( Exception $e ) {
+			if ( $vert ) {
+							$this->image->flopImage();
+			}
+		} catch ( Exception $e ) {
 			return new WP_Error( 'image_flip_error', $e->getMessage() );
 		}
 		return true;
@@ -605,8 +615,7 @@ 
 
 			try {
 				$this->image->setImageFormat( strtoupper( $this->get_extension( $this->mime_type ) ) );
-			}
-			catch ( Exception $e ) {
+			} catch ( Exception $e ) {
 				return new WP_Error( 'image_save_error', $e->getMessage(), $this->file );
 			}
 		}
@@ -624,8 +633,9 @@ 
 	protected function _save( $image, $filename = null, $mime_type = null ) {
 		list( $filename, $extension, $mime_type ) = $this->get_output_format( $filename, $mime_type );
 
-		if ( ! $filename )
-			$filename = $this->generate_filename( null, null, $extension );
+		if ( ! $filename ) {
+					$filename = $this->generate_filename( null, null, $extension );
+		}
 
 		try {
 			// Store initial Format
@@ -636,8 +646,7 @@ 
 
 			// Reset original Format
 			$this->image->setImageFormat( $orig_format );
-		}
-		catch ( Exception $e ) {
+		} catch ( Exception $e ) {
 			return new WP_Error( 'image_save_error', $e->getMessage(), $filename );
 		}
 
@@ -678,8 +687,7 @@ 
 
 			// Reset Image to original Format
 			$this->image->setImageFormat( $this->get_extension( $this->mime_type ) );
-		}
-		catch ( Exception $e ) {
+		} catch ( Exception $e ) {
 			return new WP_Error( 'image_stream_error', $e->getMessage() );
 		}
 
@@ -755,8 +763,7 @@ 
 
 			// Only load the first page.
 			return $this->file . '[0]';
-		}
-		catch ( Exception $e ) {
+		} catch ( Exception $e ) {
 			return new WP_Error( 'pdf_setup_failed', $e->getMessage(), $this->file );
 		}
 	}

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

Doc Comments +4 added lines, -4 removed lines

@@ -1374,7 +1374,7 @@ 
 	 *
 	 * @since 3.7.0
 	 *
-	 * @param array $terms Terms to check.
+	 * @param string[] $terms Terms to check.
 	 * @return array Terms that are not stopwords.
 	 */
 	protected function parse_search_terms( $terms ) {
@@ -3372,7 +3372,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 ) ) {
@@ -3971,8 +3971,8 @@ 
 	 * @global int             $more
 	 * @global int             $numpages
 	 *
-	 * @param WP_Post|object|int $post WP_Post instance or Post ID/object.
-	 * @return true True when finished.
+	 * @param WP_Post $post WP_Post instance or Post ID/object.
+	 * @return null|boolean True when finished.
 	 */
 	public function setup_postdata( $post ) {
 		global $id, $authordata, $currentday, $currentmonth, $page, $pages, $multipage, $more, $numpages;

Indentation +8 added lines, -8 removed lines

@@ -4210,14 +4210,14 @@
 	}
 
 	/**
- 	 * Is the query for an existing archive page?
- 	 *
- 	 * Month, Year, Category, Author, Post Type archive...
-	 *
- 	 * @since 3.1.0
- 	 *
- 	 * @return bool
- 	 */
+	 * Is the query for an existing archive page?
+	 *
+	 * Month, Year, Category, Author, Post Type archive...
+	 *
+	 * @since 3.1.0
+	 *
+	 * @return bool
+	 */
 	public function is_archive() {
 		return (bool) $this->is_archive;
 	}

Spacing +814 added lines, -814 removed lines

@@ -482,9 +482,9 @@ 
 	 */
 	private $stopwords;
 
-	private $compat_fields = array( 'query_vars_hash', 'query_vars_changed' );
+	private $compat_fields = array('query_vars_hash', 'query_vars_changed');
 
-	private $compat_methods = array( 'init_query_flags', 'parse_tax_query' );
+	private $compat_methods = array('init_query_flags', 'parse_tax_query');
 
 	/**
 	 * Resets query flags to false.
@@ -538,10 +538,10 @@ 
 		$this->post_count = 0;
 		$this->current_post = -1;
 		$this->in_the_loop = false;
-		unset( $this->request );
-		unset( $this->post );
-		unset( $this->comments );
-		unset( $this->comment );
+		unset($this->request);
+		unset($this->post);
+		unset($this->comments);
+		unset($this->comment);
 		$this->comment_count = 0;
 		$this->current_comment = -1;
 		$this->found_posts = 0;
@@ -612,17 +612,17 @@ 
 			, 'embed'
 		);
 
-		foreach ( $keys as $key ) {
-			if ( !isset($array[$key]) )
+		foreach ($keys as $key) {
+			if ( ! isset($array[$key]))
 				$array[$key] = '';
 		}
 
-		$array_keys = array( 'category__in', 'category__not_in', 'category__and', 'post__in', 'post__not_in', 'post_name__in',
+		$array_keys = array('category__in', 'category__not_in', 'category__and', 'post__in', 'post__not_in', 'post_name__in',
 			'tag__in', 'tag__not_in', 'tag__and', 'tag_slug__in', 'tag_slug__and', 'post_parent__in', 'post_parent__not_in',
-			'author__in', 'author__not_in' );
+			'author__in', 'author__not_in');
 
-		foreach ( $array_keys as $key ) {
-			if ( !isset($array[$key]) )
+		foreach ($array_keys as $key) {
+			if ( ! isset($array[$key]))
 				$array[$key] = array();
 		}
 		return $array;
@@ -750,11 +750,11 @@ 
 	 *     @type int          $year                    The four-digit year. Default empty. Accepts any four-digit year.
 	 * }
 	 */
-	public function parse_query( $query =  '' ) {
-		if ( ! empty( $query ) ) {
+	public function parse_query($query = '') {
+		if ( ! empty($query)) {
 			$this->init();
-			$this->query = $this->query_vars = wp_parse_args( $query );
-		} elseif ( ! isset( $this->query ) ) {
+			$this->query = $this->query_vars = wp_parse_args($query);
+		} elseif ( ! isset($this->query)) {
 			$this->query = $this->query_vars;
 		}
 
@@ -762,86 +762,86 @@ 
 		$qv = &$this->query_vars;
 		$this->query_vars_changed = true;
 
-		if ( ! empty($qv['robots']) )
+		if ( ! empty($qv['robots']))
 			$this->is_robots = true;
 
-		if ( ! is_scalar( $qv['p'] ) || $qv['p'] < 0 ) {
+		if ( ! is_scalar($qv['p']) || $qv['p'] < 0) {
 			$qv['p'] = 0;
 			$qv['error'] = '404';
 		} else {
-			$qv['p'] = intval( $qv['p'] );
+			$qv['p'] = intval($qv['p']);
 		}
 
-		$qv['page_id'] =  absint($qv['page_id']);
+		$qv['page_id'] = absint($qv['page_id']);
 		$qv['year'] = absint($qv['year']);
 		$qv['monthnum'] = absint($qv['monthnum']);
 		$qv['day'] = absint($qv['day']);
 		$qv['w'] = absint($qv['w']);
-		$qv['m'] = is_scalar( $qv['m'] ) ? preg_replace( '|[^0-9]|', '', $qv['m'] ) : '';
+		$qv['m'] = is_scalar($qv['m']) ? preg_replace('|[^0-9]|', '', $qv['m']) : '';
 		$qv['paged'] = absint($qv['paged']);
-		$qv['cat'] = preg_replace( '|[^0-9,-]|', '', $qv['cat'] ); // comma separated list of positive or negative integers
-		$qv['author'] = preg_replace( '|[^0-9,-]|', '', $qv['author'] ); // comma separated list of positive or negative integers
-		$qv['pagename'] = trim( $qv['pagename'] );
-		$qv['name'] = trim( $qv['name'] );
-		$qv['title'] = trim( $qv['title'] );
-		if ( '' !== $qv['hour'] ) $qv['hour'] = absint($qv['hour']);
-		if ( '' !== $qv['minute'] ) $qv['minute'] = absint($qv['minute']);
-		if ( '' !== $qv['second'] ) $qv['second'] = absint($qv['second']);
-		if ( '' !== $qv['menu_order'] ) $qv['menu_order'] = absint($qv['menu_order']);
+		$qv['cat'] = preg_replace('|[^0-9,-]|', '', $qv['cat']); // comma separated list of positive or negative integers
+		$qv['author'] = preg_replace('|[^0-9,-]|', '', $qv['author']); // comma separated list of positive or negative integers
+		$qv['pagename'] = trim($qv['pagename']);
+		$qv['name'] = trim($qv['name']);
+		$qv['title'] = trim($qv['title']);
+		if ('' !== $qv['hour']) $qv['hour'] = absint($qv['hour']);
+		if ('' !== $qv['minute']) $qv['minute'] = absint($qv['minute']);
+		if ('' !== $qv['second']) $qv['second'] = absint($qv['second']);
+		if ('' !== $qv['menu_order']) $qv['menu_order'] = absint($qv['menu_order']);
 
 		// Fairly insane upper bound for search string lengths.
-		if ( ! is_scalar( $qv['s'] ) || ( ! empty( $qv['s'] ) && strlen( $qv['s'] ) > 1600 ) ) {
+		if ( ! is_scalar($qv['s']) || ( ! empty($qv['s']) && strlen($qv['s']) > 1600)) {
 			$qv['s'] = '';
 		}
 
 		// Compat. Map subpost to attachment.
-		if ( '' != $qv['subpost'] )
+		if ('' != $qv['subpost'])
 			$qv['attachment'] = $qv['subpost'];
-		if ( '' != $qv['subpost_id'] )
+		if ('' != $qv['subpost_id'])
 			$qv['attachment_id'] = $qv['subpost_id'];
 
 		$qv['attachment_id'] = absint($qv['attachment_id']);
 
-		if ( ('' != $qv['attachment']) || !empty($qv['attachment_id']) ) {
+		if (('' != $qv['attachment']) || ! empty($qv['attachment_id'])) {
 			$this->is_single = true;
 			$this->is_attachment = true;
-		} elseif ( '' != $qv['name'] ) {
+		} elseif ('' != $qv['name']) {
 			$this->is_single = true;
-		} elseif ( $qv['p'] ) {
+		} elseif ($qv['p']) {
 			$this->is_single = true;
-		} elseif ( ('' !== $qv['hour']) && ('' !== $qv['minute']) &&('' !== $qv['second']) && ('' != $qv['year']) && ('' != $qv['monthnum']) && ('' != $qv['day']) ) {
+		} elseif (('' !== $qv['hour']) && ('' !== $qv['minute']) && ('' !== $qv['second']) && ('' != $qv['year']) && ('' != $qv['monthnum']) && ('' != $qv['day'])) {
 			// If year, month, day, hour, minute, and second are set, a single
 			// post is being queried.
 			$this->is_single = true;
-		} elseif ( '' != $qv['static'] || '' != $qv['pagename'] || !empty($qv['page_id']) ) {
+		} elseif ('' != $qv['static'] || '' != $qv['pagename'] || ! empty($qv['page_id'])) {
 			$this->is_page = true;
 			$this->is_single = false;
 		} else {
 			// Look for archive queries. Dates, categories, authors, search, post type archives.
 
-			if ( isset( $this->query['s'] ) ) {
+			if (isset($this->query['s'])) {
 				$this->is_search = true;
 			}
 
-			if ( '' !== $qv['second'] ) {
+			if ('' !== $qv['second']) {
 				$this->is_time = true;
 				$this->is_date = true;
 			}
 
-			if ( '' !== $qv['minute'] ) {
+			if ('' !== $qv['minute']) {
 				$this->is_time = true;
 				$this->is_date = true;
 			}
 
-			if ( '' !== $qv['hour'] ) {
+			if ('' !== $qv['hour']) {
 				$this->is_time = true;
 				$this->is_date = true;
 			}
 
-			if ( $qv['day'] ) {
-				if ( ! $this->is_date ) {
-					$date = sprintf( '%04d-%02d-%02d', $qv['year'], $qv['monthnum'], $qv['day'] );
-					if ( $qv['monthnum'] && $qv['year'] && ! wp_checkdate( $qv['monthnum'], $qv['day'], $qv['year'], $date ) ) {
+			if ($qv['day']) {
+				if ( ! $this->is_date) {
+					$date = sprintf('%04d-%02d-%02d', $qv['year'], $qv['monthnum'], $qv['day']);
+					if ($qv['monthnum'] && $qv['year'] && ! wp_checkdate($qv['monthnum'], $qv['day'], $qv['year'], $date)) {
 						$qv['error'] = '404';
 					} else {
 						$this->is_day = true;
@@ -850,9 +850,9 @@ 
 				}
 			}
 
-			if ( $qv['monthnum'] ) {
-				if ( ! $this->is_date ) {
-					if ( 12 < $qv['monthnum'] ) {
+			if ($qv['monthnum']) {
+				if ( ! $this->is_date) {
+					if (12 < $qv['monthnum']) {
 						$qv['error'] = '404';
 					} else {
 						$this->is_month = true;
@@ -861,40 +861,40 @@ 
 				}
 			}
 
-			if ( $qv['year'] ) {
-				if ( ! $this->is_date ) {
+			if ($qv['year']) {
+				if ( ! $this->is_date) {
 					$this->is_year = true;
 					$this->is_date = true;
 				}
 			}
 
-			if ( $qv['m'] ) {
+			if ($qv['m']) {
 				$this->is_date = true;
-				if ( strlen($qv['m']) > 9 ) {
+				if (strlen($qv['m']) > 9) {
 					$this->is_time = true;
-				} elseif ( strlen( $qv['m'] ) > 7 ) {
+				} elseif (strlen($qv['m']) > 7) {
 					$this->is_day = true;
-				} elseif ( strlen( $qv['m'] ) > 5 ) {
+				} elseif (strlen($qv['m']) > 5) {
 					$this->is_month = true;
 				} else {
 					$this->is_year = true;
 				}
 			}
 
-			if ( '' != $qv['w'] ) {
+			if ('' != $qv['w']) {
 				$this->is_date = true;
 			}
 
 			$this->query_vars_hash = false;
-			$this->parse_tax_query( $qv );
+			$this->parse_tax_query($qv);
 
-			foreach ( $this->tax_query->queries as $tax_query ) {
-				if ( ! is_array( $tax_query ) ) {
+			foreach ($this->tax_query->queries as $tax_query) {
+				if ( ! is_array($tax_query)) {
 					continue;
 				}
 
-				if ( isset( $tax_query['operator'] ) && 'NOT IN' != $tax_query['operator'] ) {
-					switch ( $tax_query['taxonomy'] ) {
+				if (isset($tax_query['operator']) && 'NOT IN' != $tax_query['operator']) {
+					switch ($tax_query['taxonomy']) {
 						case 'category':
 							$this->is_category = true;
 							break;
@@ -906,89 +906,89 @@ 
 					}
 				}
 			}
-			unset( $tax_query );
+			unset($tax_query);
 
-			if ( empty($qv['author']) || ($qv['author'] == '0') ) {
+			if (empty($qv['author']) || ($qv['author'] == '0')) {
 				$this->is_author = false;
 			} else {
 				$this->is_author = true;
 			}
 
-			if ( '' != $qv['author_name'] )
+			if ('' != $qv['author_name'])
 				$this->is_author = true;
 
-			if ( !empty( $qv['post_type'] ) && ! is_array( $qv['post_type'] ) ) {
-				$post_type_obj = get_post_type_object( $qv['post_type'] );
-				if ( ! empty( $post_type_obj->has_archive ) )
+			if ( ! empty($qv['post_type']) && ! is_array($qv['post_type'])) {
+				$post_type_obj = get_post_type_object($qv['post_type']);
+				if ( ! empty($post_type_obj->has_archive))
 					$this->is_post_type_archive = true;
 			}
 
-			if ( $this->is_post_type_archive || $this->is_date || $this->is_author || $this->is_category || $this->is_tag || $this->is_tax )
+			if ($this->is_post_type_archive || $this->is_date || $this->is_author || $this->is_category || $this->is_tag || $this->is_tax)
 				$this->is_archive = true;
 		}
 
-		if ( '' != $qv['feed'] )
+		if ('' != $qv['feed'])
 			$this->is_feed = true;
 
-		if ( '' != $qv['embed'] ) {
+		if ('' != $qv['embed']) {
 			$this->is_embed = true;
 		}
 
-		if ( '' != $qv['tb'] )
+		if ('' != $qv['tb'])
 			$this->is_trackback = true;
 
-		if ( '' != $qv['paged'] && ( intval($qv['paged']) > 1 ) )
+		if ('' != $qv['paged'] && (intval($qv['paged']) > 1))
 			$this->is_paged = true;
 
 		// if we're previewing inside the write screen
-		if ( '' != $qv['preview'] )
+		if ('' != $qv['preview'])
 			$this->is_preview = true;
 
-		if ( is_admin() )
+		if (is_admin())
 			$this->is_admin = true;
 
-		if ( false !== strpos($qv['feed'], 'comments-') ) {
+		if (false !== strpos($qv['feed'], 'comments-')) {
 			$qv['feed'] = str_replace('comments-', '', $qv['feed']);
 			$qv['withcomments'] = 1;
 		}
 
 		$this->is_singular = $this->is_single || $this->is_page || $this->is_attachment;
 
-		if ( $this->is_feed && ( !empty($qv['withcomments']) || ( empty($qv['withoutcomments']) && $this->is_singular ) ) )
+		if ($this->is_feed && ( ! empty($qv['withcomments']) || (empty($qv['withoutcomments']) && $this->is_singular)))
 			$this->is_comment_feed = true;
 
-		if ( !( $this->is_singular || $this->is_archive || $this->is_search || $this->is_feed || ( defined( 'REST_REQUEST' ) && REST_REQUEST ) || $this->is_trackback || $this->is_404 || $this->is_admin || $this->is_robots ) )
+		if ( ! ($this->is_singular || $this->is_archive || $this->is_search || $this->is_feed || (defined('REST_REQUEST') && REST_REQUEST) || $this->is_trackback || $this->is_404 || $this->is_admin || $this->is_robots))
 			$this->is_home = true;
 
 		// Correct is_* for page_on_front and page_for_posts
-		if ( $this->is_home && 'page' == get_option('show_on_front') && get_option('page_on_front') ) {
+		if ($this->is_home && 'page' == get_option('show_on_front') && get_option('page_on_front')) {
 			$_query = wp_parse_args($this->query);
 			// pagename can be set and empty depending on matched rewrite rules. Ignore an empty pagename.
-			if ( isset($_query['pagename']) && '' == $_query['pagename'] )
+			if (isset($_query['pagename']) && '' == $_query['pagename'])
 				unset($_query['pagename']);
 
-			unset( $_query['embed'] );
+			unset($_query['embed']);
 
-			if ( empty($_query) || !array_diff( array_keys($_query), array('preview', 'page', 'paged', 'cpage') ) ) {
+			if (empty($_query) || ! array_diff(array_keys($_query), array('preview', 'page', 'paged', 'cpage'))) {
 				$this->is_page = true;
 				$this->is_home = false;
 				$qv['page_id'] = get_option('page_on_front');
 				// Correct <!--nextpage--> for page_on_front
-				if ( !empty($qv['paged']) ) {
+				if ( ! empty($qv['paged'])) {
 					$qv['page'] = $qv['paged'];
 					unset($qv['paged']);
 				}
 			}
 		}
 
-		if ( '' != $qv['pagename'] ) {
-			$this->queried_object = get_page_by_path( $qv['pagename'] );
+		if ('' != $qv['pagename']) {
+			$this->queried_object = get_page_by_path($qv['pagename']);
 
-			if ( $this->queried_object && 'attachment' == $this->queried_object->post_type ) {
-				if ( preg_match( "/^[^%]*%(?:postname)%/", get_option( 'permalink_structure' ) ) ) {
+			if ($this->queried_object && 'attachment' == $this->queried_object->post_type) {
+				if (preg_match("/^[^%]*%(?:postname)%/", get_option('permalink_structure'))) {
 					// See if we also have a post with the same slug
-					$post = get_page_by_path( $qv['pagename'], OBJECT, 'post' );
-					if ( $post ) {
+					$post = get_page_by_path($qv['pagename'], OBJECT, 'post');
+					if ($post) {
 						$this->queried_object = $post;
 						$this->is_page = false;
 						$this->is_single = true;
@@ -996,53 +996,53 @@ 
 				}
 			}
 
-			if ( ! empty( $this->queried_object ) ) {
+			if ( ! empty($this->queried_object)) {
 				$this->queried_object_id = (int) $this->queried_object->ID;
 			} else {
-				unset( $this->queried_object );
+				unset($this->queried_object);
 			}
 
-			if  ( 'page' == get_option('show_on_front') && isset($this->queried_object_id) && $this->queried_object_id == get_option('page_for_posts') ) {
+			if ('page' == get_option('show_on_front') && isset($this->queried_object_id) && $this->queried_object_id == get_option('page_for_posts')) {
 				$this->is_page = false;
 				$this->is_home = true;
 				$this->is_posts_page = true;
 			}
 		}
 
-		if ( $qv['page_id'] ) {
-			if  ( 'page' == get_option('show_on_front') && $qv['page_id'] == get_option('page_for_posts') ) {
+		if ($qv['page_id']) {
+			if ('page' == get_option('show_on_front') && $qv['page_id'] == get_option('page_for_posts')) {
 				$this->is_page = false;
 				$this->is_home = true;
 				$this->is_posts_page = true;
 			}
 		}
 
-		if ( !empty($qv['post_type']) ) {
-			if ( is_array($qv['post_type']) )
+		if ( ! empty($qv['post_type'])) {
+			if (is_array($qv['post_type']))
 				$qv['post_type'] = array_map('sanitize_key', $qv['post_type']);
 			else
 				$qv['post_type'] = sanitize_key($qv['post_type']);
 		}
 
-		if ( ! empty( $qv['post_status'] ) ) {
-			if ( is_array( $qv['post_status'] ) )
+		if ( ! empty($qv['post_status'])) {
+			if (is_array($qv['post_status']))
 				$qv['post_status'] = array_map('sanitize_key', $qv['post_status']);
 			else
 				$qv['post_status'] = preg_replace('|[^a-z0-9_,-]|', '', $qv['post_status']);
 		}
 
-		if ( $this->is_posts_page && ( ! isset($qv['withcomments']) || ! $qv['withcomments'] ) )
+		if ($this->is_posts_page && ( ! isset($qv['withcomments']) || ! $qv['withcomments']))
 			$this->is_comment_feed = false;
 
 		$this->is_singular = $this->is_single || $this->is_page || $this->is_attachment;
 		// Done correcting is_* for page_on_front and page_for_posts
 
-		if ( '404' == $qv['error'] )
+		if ('404' == $qv['error'])
 			$this->set_404();
 
-		$this->is_embed = $this->is_embed && ( $this->is_singular || $this->is_404 );
+		$this->is_embed = $this->is_embed && ($this->is_singular || $this->is_404);
 
-		$this->query_vars_hash = md5( serialize( $this->query_vars ) );
+		$this->query_vars_hash = md5(serialize($this->query_vars));
 		$this->query_vars_changed = false;
 
 		/**
@@ -1052,7 +1052,7 @@ 
 		 *
 		 * @param WP_Query &$this The WP_Query instance (passed by reference).
 		 */
-		do_action_ref_array( 'parse_query', array( &$this ) );
+		do_action_ref_array('parse_query', array(&$this));
 	}
 
 	/**
@@ -1065,77 +1065,77 @@ 
 	 *
 	 * @param array $q The query variables. Passed by reference.
 	 */
-	public function parse_tax_query( &$q ) {
-		if ( ! empty( $q['tax_query'] ) && is_array( $q['tax_query'] ) ) {
+	public function parse_tax_query(&$q) {
+		if ( ! empty($q['tax_query']) && is_array($q['tax_query'])) {
 			$tax_query = $q['tax_query'];
 		} else {
 			$tax_query = array();
 		}
 
-		if ( !empty($q['taxonomy']) && !empty($q['term']) ) {
+		if ( ! empty($q['taxonomy']) && ! empty($q['term'])) {
 			$tax_query[] = array(
 				'taxonomy' => $q['taxonomy'],
-				'terms' => array( $q['term'] ),
+				'terms' => array($q['term']),
 				'field' => 'slug',
 			);
 		}
 
-		foreach ( get_taxonomies( array() , 'objects' ) as $taxonomy => $t ) {
-			if ( 'post_tag' == $taxonomy )
-				continue;	// Handled further down in the $q['tag'] block
+		foreach (get_taxonomies(array(), 'objects') as $taxonomy => $t) {
+			if ('post_tag' == $taxonomy)
+				continue; // Handled further down in the $q['tag'] block
 
-			if ( $t->query_var && !empty( $q[$t->query_var] ) ) {
+			if ($t->query_var && ! empty($q[$t->query_var])) {
 				$tax_query_defaults = array(
 					'taxonomy' => $taxonomy,
 					'field' => 'slug',
 				);
 
- 				if ( isset( $t->rewrite['hierarchical'] ) && $t->rewrite['hierarchical'] ) {
-					$q[$t->query_var] = wp_basename( $q[$t->query_var] );
+ 				if (isset($t->rewrite['hierarchical']) && $t->rewrite['hierarchical']) {
+					$q[$t->query_var] = wp_basename($q[$t->query_var]);
 				}
 
 				$term = $q[$t->query_var];
 
-				if ( is_array( $term ) ) {
-					$term = implode( ',', $term );
+				if (is_array($term)) {
+					$term = implode(',', $term);
 				}
 
-				if ( strpos($term, '+') !== false ) {
-					$terms = preg_split( '/[+]+/', $term );
-					foreach ( $terms as $term ) {
-						$tax_query[] = array_merge( $tax_query_defaults, array(
-							'terms' => array( $term )
-						) );
+				if (strpos($term, '+') !== false) {
+					$terms = preg_split('/[+]+/', $term);
+					foreach ($terms as $term) {
+						$tax_query[] = array_merge($tax_query_defaults, array(
+							'terms' => array($term)
+						));
 					}
 				} else {
-					$tax_query[] = array_merge( $tax_query_defaults, array(
-						'terms' => preg_split( '/[,]+/', $term )
-					) );
+					$tax_query[] = array_merge($tax_query_defaults, array(
+						'terms' => preg_split('/[,]+/', $term)
+					));
 				}
 			}
 		}
 
 		// If querystring 'cat' is an array, implode it.
-		if ( is_array( $q['cat'] ) ) {
-			$q['cat'] = implode( ',', $q['cat'] );
+		if (is_array($q['cat'])) {
+			$q['cat'] = implode(',', $q['cat']);
 		}
 
 		// Category stuff
-		if ( ! empty( $q['cat'] ) && ! $this->is_singular ) {
+		if ( ! empty($q['cat']) && ! $this->is_singular) {
 			$cat_in = $cat_not_in = array();
 
-			$cat_array = preg_split( '/[,\s]+/', urldecode( $q['cat'] ) );
-			$cat_array = array_map( 'intval', $cat_array );
-			$q['cat'] = implode( ',', $cat_array );
+			$cat_array = preg_split('/[,\s]+/', urldecode($q['cat']));
+			$cat_array = array_map('intval', $cat_array);
+			$q['cat'] = implode(',', $cat_array);
 
-			foreach ( $cat_array as $cat ) {
-				if ( $cat > 0 )
+			foreach ($cat_array as $cat) {
+				if ($cat > 0)
 					$cat_in[] = $cat;
-				elseif ( $cat < 0 )
-					$cat_not_in[] = abs( $cat );
+				elseif ($cat < 0)
+					$cat_not_in[] = abs($cat);
 			}
 
-			if ( ! empty( $cat_in ) ) {
+			if ( ! empty($cat_in)) {
 				$tax_query[] = array(
 					'taxonomy' => 'category',
 					'terms' => $cat_in,
@@ -1144,7 +1144,7 @@ 
 				);
 			}
 
-			if ( ! empty( $cat_not_in ) ) {
+			if ( ! empty($cat_not_in)) {
 				$tax_query[] = array(
 					'taxonomy' => 'category',
 					'terms' => $cat_not_in,
@@ -1153,19 +1153,19 @@ 
 					'include_children' => true
 				);
 			}
-			unset( $cat_array, $cat_in, $cat_not_in );
+			unset($cat_array, $cat_in, $cat_not_in);
 		}
 
-		if ( ! empty( $q['category__and'] ) && 1 === count( (array) $q['category__and'] ) ) {
+		if ( ! empty($q['category__and']) && 1 === count((array) $q['category__and'])) {
 			$q['category__and'] = (array) $q['category__and'];
-			if ( ! isset( $q['category__in'] ) )
+			if ( ! isset($q['category__in']))
 				$q['category__in'] = array();
-			$q['category__in'][] = absint( reset( $q['category__and'] ) );
-			unset( $q['category__and'] );
+			$q['category__in'][] = absint(reset($q['category__and']));
+			unset($q['category__and']);
 		}
 
-		if ( ! empty( $q['category__in'] ) ) {
-			$q['category__in'] = array_map( 'absint', array_unique( (array) $q['category__in'] ) );
+		if ( ! empty($q['category__in'])) {
+			$q['category__in'] = array_map('absint', array_unique((array) $q['category__in']));
 			$tax_query[] = array(
 				'taxonomy' => 'category',
 				'terms' => $q['category__in'],
@@ -1174,8 +1174,8 @@ 
 			);
 		}
 
-		if ( ! empty($q['category__not_in']) ) {
-			$q['category__not_in'] = array_map( 'absint', array_unique( (array) $q['category__not_in'] ) );
+		if ( ! empty($q['category__not_in'])) {
+			$q['category__not_in'] = array_map('absint', array_unique((array) $q['category__not_in']));
 			$tax_query[] = array(
 				'taxonomy' => 'category',
 				'terms' => $q['category__not_in'],
@@ -1184,8 +1184,8 @@ 
 			);
 		}
 
-		if ( ! empty($q['category__and']) ) {
-			$q['category__and'] = array_map( 'absint', array_unique( (array) $q['category__and'] ) );
+		if ( ! empty($q['category__and'])) {
+			$q['category__and'] = array_map('absint', array_unique((array) $q['category__and']));
 			$tax_query[] = array(
 				'taxonomy' => 'category',
 				'terms' => $q['category__and'],
@@ -1196,21 +1196,21 @@ 
 		}
 
 		// If querystring 'tag' is array, implode it.
-		if ( is_array( $q['tag'] ) ) {
-			$q['tag'] = implode( ',', $q['tag'] );
+		if (is_array($q['tag'])) {
+			$q['tag'] = implode(',', $q['tag']);
 		}
 
 		// Tag stuff
-		if ( '' != $q['tag'] && !$this->is_singular && $this->query_vars_changed ) {
-			if ( strpos($q['tag'], ',') !== false ) {
+		if ('' != $q['tag'] && ! $this->is_singular && $this->query_vars_changed) {
+			if (strpos($q['tag'], ',') !== false) {
 				$tags = preg_split('/[,\r\n\t ]+/', $q['tag']);
-				foreach ( (array) $tags as $tag ) {
+				foreach ((array) $tags as $tag) {
 					$tag = sanitize_term_field('slug', $tag, 0, 'post_tag', 'db');
 					$q['tag_slug__in'][] = $tag;
 				}
-			} elseif ( preg_match('/[+\r\n\t ]+/', $q['tag'] ) || ! empty( $q['cat'] ) ) {
+			} elseif (preg_match('/[+\r\n\t ]+/', $q['tag']) || ! empty($q['cat'])) {
 				$tags = preg_split('/[+\r\n\t ]+/', $q['tag']);
-				foreach ( (array) $tags as $tag ) {
+				foreach ((array) $tags as $tag) {
 					$tag = sanitize_term_field('slug', $tag, 0, 'post_tag', 'db');
 					$q['tag_slug__and'][] = $tag;
 				}
@@ -1220,24 +1220,24 @@ 
 			}
 		}
 
-		if ( !empty($q['tag_id']) ) {
-			$q['tag_id'] = absint( $q['tag_id'] );
+		if ( ! empty($q['tag_id'])) {
+			$q['tag_id'] = absint($q['tag_id']);
 			$tax_query[] = array(
 				'taxonomy' => 'post_tag',
 				'terms' => $q['tag_id']
 			);
 		}
 
-		if ( !empty($q['tag__in']) ) {
-			$q['tag__in'] = array_map('absint', array_unique( (array) $q['tag__in'] ) );
+		if ( ! empty($q['tag__in'])) {
+			$q['tag__in'] = array_map('absint', array_unique((array) $q['tag__in']));
 			$tax_query[] = array(
 				'taxonomy' => 'post_tag',
 				'terms' => $q['tag__in']
 			);
 		}
 
-		if ( !empty($q['tag__not_in']) ) {
-			$q['tag__not_in'] = array_map('absint', array_unique( (array) $q['tag__not_in'] ) );
+		if ( ! empty($q['tag__not_in'])) {
+			$q['tag__not_in'] = array_map('absint', array_unique((array) $q['tag__not_in']));
 			$tax_query[] = array(
 				'taxonomy' => 'post_tag',
 				'terms' => $q['tag__not_in'],
@@ -1245,8 +1245,8 @@ 
 			);
 		}
 
-		if ( !empty($q['tag__and']) ) {
-			$q['tag__and'] = array_map('absint', array_unique( (array) $q['tag__and'] ) );
+		if ( ! empty($q['tag__and'])) {
+			$q['tag__and'] = array_map('absint', array_unique((array) $q['tag__and']));
 			$tax_query[] = array(
 				'taxonomy' => 'post_tag',
 				'terms' => $q['tag__and'],
@@ -1254,8 +1254,8 @@ 
 			);
 		}
 
-		if ( !empty($q['tag_slug__in']) ) {
-			$q['tag_slug__in'] = array_map('sanitize_title_for_query', array_unique( (array) $q['tag_slug__in'] ) );
+		if ( ! empty($q['tag_slug__in'])) {
+			$q['tag_slug__in'] = array_map('sanitize_title_for_query', array_unique((array) $q['tag_slug__in']));
 			$tax_query[] = array(
 				'taxonomy' => 'post_tag',
 				'terms' => $q['tag_slug__in'],
@@ -1263,8 +1263,8 @@ 
 			);
 		}
 
-		if ( !empty($q['tag_slug__and']) ) {
-			$q['tag_slug__and'] = array_map('sanitize_title_for_query', array_unique( (array) $q['tag_slug__and'] ) );
+		if ( ! empty($q['tag_slug__and'])) {
+			$q['tag_slug__and'] = array_map('sanitize_title_for_query', array_unique((array) $q['tag_slug__and']));
 			$tax_query[] = array(
 				'taxonomy' => 'post_tag',
 				'terms' => $q['tag_slug__and'],
@@ -1273,7 +1273,7 @@ 
 			);
 		}
 
-		$this->tax_query = new WP_Tax_Query( $tax_query );
+		$this->tax_query = new WP_Tax_Query($tax_query);
 
 		/**
 		 * Fires after taxonomy-related query vars have been parsed.
@@ -1282,7 +1282,7 @@ 
 		 *
 		 * @param WP_Query $this The WP_Query instance.
 		 */
-		do_action( 'parse_tax_query', $this );
+		do_action('parse_tax_query', $this);
 	}
 
 	/**
@@ -1293,33 +1293,33 @@ 
 	 * @param array $q Query variables.
 	 * @return string WHERE clause.
 	 */
-	protected function parse_search( &$q ) {
+	protected function parse_search(&$q) {
 		global $wpdb;
 
 		$search = '';
 
 		// added slashes screw with quote grouping when done early, so done later
-		$q['s'] = stripslashes( $q['s'] );
-		if ( empty( $_GET['s'] ) && $this->is_main_query() )
-			$q['s'] = urldecode( $q['s'] );
+		$q['s'] = stripslashes($q['s']);
+		if (empty($_GET['s']) && $this->is_main_query())
+			$q['s'] = urldecode($q['s']);
 		// there are no line breaks in <input /> fields
-		$q['s'] = str_replace( array( "\r", "\n" ), '', $q['s'] );
+		$q['s'] = str_replace(array("\r", "\n"), '', $q['s']);
 		$q['search_terms_count'] = 1;
-		if ( ! empty( $q['sentence'] ) ) {
-			$q['search_terms'] = array( $q['s'] );
+		if ( ! empty($q['sentence'])) {
+			$q['search_terms'] = array($q['s']);
 		} else {
-			if ( preg_match_all( '/".*?("|$)|((?<=[\t ",+])|^)[^\t ",+]+/', $q['s'], $matches ) ) {
-				$q['search_terms_count'] = count( $matches[0] );
-				$q['search_terms'] = $this->parse_search_terms( $matches[0] );
+			if (preg_match_all('/".*?("|$)|((?<=[\t ",+])|^)[^\t ",+]+/', $q['s'], $matches)) {
+				$q['search_terms_count'] = count($matches[0]);
+				$q['search_terms'] = $this->parse_search_terms($matches[0]);
 				// if the search string has only short terms or stopwords, or is 10+ terms long, match it as sentence
-				if ( empty( $q['search_terms'] ) || count( $q['search_terms'] ) > 9 )
-					$q['search_terms'] = array( $q['s'] );
+				if (empty($q['search_terms']) || count($q['search_terms']) > 9)
+					$q['search_terms'] = array($q['s']);
 			} else {
-				$q['search_terms'] = array( $q['s'] );
+				$q['search_terms'] = array($q['s']);
 			}
 		}
 
-		$n = ! empty( $q['exact'] ) ? '' : '%';
+		$n = ! empty($q['exact']) ? '' : '%';
 		$searchand = '';
 		$q['search_orderby_title'] = array();
 
@@ -1331,33 +1331,33 @@ 
 		 * @param string $exclusion_prefix The prefix. Default '-'. Returning
 		 *                                 an empty value disables exclusions.
 		 */
-		$exclusion_prefix = apply_filters( 'wp_query_search_exclusion_prefix', '-' );
+		$exclusion_prefix = apply_filters('wp_query_search_exclusion_prefix', '-');
 
-		foreach ( $q['search_terms'] as $term ) {
+		foreach ($q['search_terms'] as $term) {
 			// If there is an $exclusion_prefix, terms prefixed with it should be excluded.
-			$exclude = $exclusion_prefix && ( $exclusion_prefix === substr( $term, 0, 1 ) );
-			if ( $exclude ) {
+			$exclude = $exclusion_prefix && ($exclusion_prefix === substr($term, 0, 1));
+			if ($exclude) {
 				$like_op  = 'NOT LIKE';
 				$andor_op = 'AND';
-				$term     = substr( $term, 1 );
+				$term     = substr($term, 1);
 			} else {
 				$like_op  = 'LIKE';
 				$andor_op = 'OR';
 			}
 
-			if ( $n && ! $exclude ) {
-				$like = '%' . $wpdb->esc_like( $term ) . '%';
-				$q['search_orderby_title'][] = $wpdb->prepare( "{$wpdb->posts}.post_title LIKE %s", $like );
+			if ($n && ! $exclude) {
+				$like = '%'.$wpdb->esc_like($term).'%';
+				$q['search_orderby_title'][] = $wpdb->prepare("{$wpdb->posts}.post_title LIKE %s", $like);
 			}
 
-			$like = $n . $wpdb->esc_like( $term ) . $n;
-			$search .= $wpdb->prepare( "{$searchand}(({$wpdb->posts}.post_title $like_op %s) $andor_op ({$wpdb->posts}.post_excerpt $like_op %s) $andor_op ({$wpdb->posts}.post_content $like_op %s))", $like, $like, $like );
+			$like = $n.$wpdb->esc_like($term).$n;
+			$search .= $wpdb->prepare("{$searchand}(({$wpdb->posts}.post_title $like_op %s) $andor_op ({$wpdb->posts}.post_excerpt $like_op %s) $andor_op ({$wpdb->posts}.post_content $like_op %s))", $like, $like, $like);
 			$searchand = ' AND ';
 		}
 
-		if ( ! empty( $search ) ) {
+		if ( ! empty($search)) {
 			$search = " AND ({$search}) ";
-			if ( ! is_user_logged_in() ) {
+			if ( ! is_user_logged_in()) {
 				$search .= " AND ({$wpdb->posts}.post_password = '') ";
 			}
 		}
@@ -1377,24 +1377,24 @@ 
 	 * @param array $terms Terms to check.
 	 * @return array Terms that are not stopwords.
 	 */
-	protected function parse_search_terms( $terms ) {
-		$strtolower = function_exists( 'mb_strtolower' ) ? 'mb_strtolower' : 'strtolower';
+	protected function parse_search_terms($terms) {
+		$strtolower = function_exists('mb_strtolower') ? 'mb_strtolower' : 'strtolower';
 		$checked = array();
 
 		$stopwords = $this->get_search_stopwords();
 
-		foreach ( $terms as $term ) {
+		foreach ($terms as $term) {
 			// keep before/after spaces when term is for exact match
-			if ( preg_match( '/^".+"$/', $term ) )
-				$term = trim( $term, "\"'" );
+			if (preg_match('/^".+"$/', $term))
+				$term = trim($term, "\"'");
 			else
-				$term = trim( $term, "\"' " );
+				$term = trim($term, "\"' ");
 
 			// Avoid single A-Z and single dashes.
-			if ( ! $term || ( 1 === strlen( $term ) && preg_match( '/^[a-z\-]$/i', $term ) ) )
+			if ( ! $term || (1 === strlen($term) && preg_match('/^[a-z\-]$/i', $term)))
 				continue;
 
-			if ( in_array( call_user_func( $strtolower, $term ), $stopwords, true ) )
+			if (in_array(call_user_func($strtolower, $term), $stopwords, true))
 				continue;
 
 			$checked[] = $term;
@@ -1411,20 +1411,20 @@ 
 	 * @return array Stopwords.
 	 */
 	protected function get_search_stopwords() {
-		if ( isset( $this->stopwords ) )
+		if (isset($this->stopwords))
 			return $this->stopwords;
 
 		/* translators: This is a comma-separated list of very common words that should be excluded from a search,
 		 * like a, an, and the. These are usually called "stopwords". You should not simply translate these individual
 		 * words into your language. Instead, look for and provide commonly accepted stopwords in your language.
 		 */
-		$words = explode( ',', _x( 'about,an,are,as,at,be,by,com,for,from,how,in,is,it,of,on,or,that,the,this,to,was,what,when,where,who,will,with,www',
-			'Comma-separated list of search stopwords in your language' ) );
+		$words = explode(',', _x('about,an,are,as,at,be,by,com,for,from,how,in,is,it,of,on,or,that,the,this,to,was,what,when,where,who,will,with,www',
+			'Comma-separated list of search stopwords in your language'));
 
 		$stopwords = array();
-		foreach ( $words as $word ) {
-			$word = trim( $word, "\r\n\t " );
-			if ( $word )
+		foreach ($words as $word) {
+			$word = trim($word, "\r\n\t ");
+			if ($word)
 				$stopwords[] = $word;
 		}
 
@@ -1435,7 +1435,7 @@ 
 		 *
 		 * @param array $stopwords Stopwords.
 		 */
-		$this->stopwords = apply_filters( 'wp_search_stopwords', $stopwords );
+		$this->stopwords = apply_filters('wp_search_stopwords', $stopwords);
 		return $this->stopwords;
 	}
 
@@ -1445,47 +1445,47 @@ 
 	 * @param array $q Query variables.
 	 * @return string ORDER BY clause.
 	 */
-	protected function parse_search_order( &$q ) {
+	protected function parse_search_order(&$q) {
 		global $wpdb;
 
-		if ( $q['search_terms_count'] > 1 ) {
-			$num_terms = count( $q['search_orderby_title'] );
+		if ($q['search_terms_count'] > 1) {
+			$num_terms = count($q['search_orderby_title']);
 
 			// If the search terms contain negative queries, don't bother ordering by sentence matches.
 			$like = '';
-			if ( ! preg_match( '/(?:\s|^)\-/', $q['s'] ) ) {
-				$like = '%' . $wpdb->esc_like( $q['s'] ) . '%';
+			if ( ! preg_match('/(?:\s|^)\-/', $q['s'])) {
+				$like = '%'.$wpdb->esc_like($q['s']).'%';
 			}
 
 			$search_orderby = '';
 
 			// sentence match in 'post_title'
-			if ( $like ) {
-				$search_orderby .= $wpdb->prepare( "WHEN {$wpdb->posts}.post_title LIKE %s THEN 1 ", $like );
+			if ($like) {
+				$search_orderby .= $wpdb->prepare("WHEN {$wpdb->posts}.post_title LIKE %s THEN 1 ", $like);
 			}
 
 			// sanity limit, sort as sentence when more than 6 terms
 			// (few searches are longer than 6 terms and most titles are not)
-			if ( $num_terms < 7 ) {
+			if ($num_terms < 7) {
 				// all words in title
-				$search_orderby .= 'WHEN ' . implode( ' AND ', $q['search_orderby_title'] ) . ' THEN 2 ';
+				$search_orderby .= 'WHEN '.implode(' AND ', $q['search_orderby_title']).' THEN 2 ';
 				// any word in title, not needed when $num_terms == 1
-				if ( $num_terms > 1 )
-					$search_orderby .= 'WHEN ' . implode( ' OR ', $q['search_orderby_title'] ) . ' THEN 3 ';
+				if ($num_terms > 1)
+					$search_orderby .= 'WHEN '.implode(' OR ', $q['search_orderby_title']).' THEN 3 ';
 			}
 
 			// Sentence match in 'post_content' and 'post_excerpt'.
-			if ( $like ) {
-				$search_orderby .= $wpdb->prepare( "WHEN {$wpdb->posts}.post_excerpt LIKE %s THEN 4 ", $like );
-				$search_orderby .= $wpdb->prepare( "WHEN {$wpdb->posts}.post_content LIKE %s THEN 5 ", $like );
+			if ($like) {
+				$search_orderby .= $wpdb->prepare("WHEN {$wpdb->posts}.post_excerpt LIKE %s THEN 4 ", $like);
+				$search_orderby .= $wpdb->prepare("WHEN {$wpdb->posts}.post_content LIKE %s THEN 5 ", $like);
 			}
 
-			if ( $search_orderby ) {
-				$search_orderby = '(CASE ' . $search_orderby . 'ELSE 6 END)';
+			if ($search_orderby) {
+				$search_orderby = '(CASE '.$search_orderby.'ELSE 6 END)';
 			}
 		} else {
 			// single word or sentence search
-			$search_orderby = reset( $q['search_orderby_title'] ) . ' DESC';
+			$search_orderby = reset($q['search_orderby_title']).' DESC';
 		}
 
 		return $search_orderby;
@@ -1501,7 +1501,7 @@ 
 	 * @param string $orderby Alias for the field to order by.
 	 * @return string|false Table-prefixed value to used in the ORDER clause. False otherwise.
 	 */
-	protected function parse_orderby( $orderby ) {
+	protected function parse_orderby($orderby) {
 		global $wpdb;
 
 		// Used to filter values.
@@ -1514,32 +1514,32 @@ 
 		$primary_meta_key = '';
 		$primary_meta_query = false;
 		$meta_clauses = $this->meta_query->get_clauses();
-		if ( ! empty( $meta_clauses ) ) {
-			$primary_meta_query = reset( $meta_clauses );
+		if ( ! empty($meta_clauses)) {
+			$primary_meta_query = reset($meta_clauses);
 
-			if ( ! empty( $primary_meta_query['key'] ) ) {
+			if ( ! empty($primary_meta_query['key'])) {
 				$primary_meta_key = $primary_meta_query['key'];
 				$allowed_keys[] = $primary_meta_key;
 			}
 
 			$allowed_keys[] = 'meta_value';
 			$allowed_keys[] = 'meta_value_num';
-			$allowed_keys   = array_merge( $allowed_keys, array_keys( $meta_clauses ) );
+			$allowed_keys   = array_merge($allowed_keys, array_keys($meta_clauses));
 		}
 
 		// If RAND() contains a seed value, sanitize and add to allowed keys.
 		$rand_with_seed = false;
-		if ( preg_match( '/RAND\(([0-9]+)\)/i', $orderby, $matches ) ) {
-			$orderby = sprintf( 'RAND(%s)', intval( $matches[1] ) );
+		if (preg_match('/RAND\(([0-9]+)\)/i', $orderby, $matches)) {
+			$orderby = sprintf('RAND(%s)', intval($matches[1]));
 			$allowed_keys[] = $orderby;
 			$rand_with_seed = true;
 		}
 
-		if ( ! in_array( $orderby, $allowed_keys, true ) ) {
+		if ( ! in_array($orderby, $allowed_keys, true)) {
 			return false;
 		}
 
-		switch ( $orderby ) {
+		switch ($orderby) {
 			case 'post_name':
 			case 'post_author':
 			case 'post_date':
@@ -1557,7 +1557,7 @@ 
 				break;
 			case $primary_meta_key:
 			case 'meta_value':
-				if ( ! empty( $primary_meta_query['type'] ) ) {
+				if ( ! empty($primary_meta_query['type'])) {
 					$orderby_clause = "CAST({$primary_meta_query['alias']}.meta_value AS {$primary_meta_query['cast']})";
 				} else {
 					$orderby_clause = "{$primary_meta_query['alias']}.meta_value";
@@ -1567,15 +1567,15 @@ 
 				$orderby_clause = "{$primary_meta_query['alias']}.meta_value+0";
 				break;
 			default:
-				if ( array_key_exists( $orderby, $meta_clauses ) ) {
+				if (array_key_exists($orderby, $meta_clauses)) {
 					// $orderby corresponds to a meta_query clause.
-					$meta_clause = $meta_clauses[ $orderby ];
+					$meta_clause = $meta_clauses[$orderby];
 					$orderby_clause = "CAST({$meta_clause['alias']}.meta_value AS {$meta_clause['cast']})";
-				} elseif ( $rand_with_seed ) {
+				} elseif ($rand_with_seed) {
 					$orderby_clause = $orderby;
 				} else {
 					// Default: order by post field.
-					$orderby_clause = "{$wpdb->posts}.post_" . sanitize_key( $orderby );
+					$orderby_clause = "{$wpdb->posts}.post_".sanitize_key($orderby);
 				}
 
 				break;
@@ -1593,12 +1593,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';
@@ -1632,9 +1632,9 @@ 
 	 * @param mixed  $default   Optional. Value to return if the query variable is not set. Default empty.
 	 * @return mixed Contents of the query variable.
 	 */
-	public function get( $query_var, $default = '' ) {
-		if ( isset( $this->query_vars[ $query_var ] ) ) {
-			return $this->query_vars[ $query_var ];
+	public function get($query_var, $default = '') {
+		if (isset($this->query_vars[$query_var])) {
+			return $this->query_vars[$query_var];
 		}
 
 		return $default;
@@ -1680,7 +1680,7 @@ 
 		 *
 		 * @param WP_Query &$this The WP_Query instance (passed by reference).
 		 */
-		do_action_ref_array( 'pre_get_posts', array( &$this ) );
+		do_action_ref_array('pre_get_posts', array(&$this));
 
 		// Shorthand.
 		$q = &$this->query_vars;
@@ -1690,11 +1690,11 @@ 
 
 		// Parse meta query
 		$this->meta_query = new WP_Meta_Query();
-		$this->meta_query->parse_query_vars( $q );
+		$this->meta_query->parse_query_vars($q);
 
 		// Set a flag if a pre_get_posts hook changed the query vars.
-		$hash = md5( serialize( $this->query_vars ) );
-		if ( $hash != $this->query_vars_hash ) {
+		$hash = md5(serialize($this->query_vars));
+		if ($hash != $this->query_vars_hash) {
 			$this->query_vars_changed = true;
 			$this->query_vars_hash = $hash;
 		}
@@ -1712,95 +1712,95 @@ 
 		$post_status_join = false;
 		$page = 1;
 
-		if ( isset( $q['caller_get_posts'] ) ) {
-			_deprecated_argument( 'WP_Query', '3.1.0', __( '"caller_get_posts" is deprecated. Use "ignore_sticky_posts" instead.' ) );
-			if ( !isset( $q['ignore_sticky_posts'] ) )
+		if (isset($q['caller_get_posts'])) {
+			_deprecated_argument('WP_Query', '3.1.0', __('"caller_get_posts" is deprecated. Use "ignore_sticky_posts" instead.'));
+			if ( ! isset($q['ignore_sticky_posts']))
 				$q['ignore_sticky_posts'] = $q['caller_get_posts'];
 		}
 
-		if ( !isset( $q['ignore_sticky_posts'] ) )
+		if ( ! isset($q['ignore_sticky_posts']))
 			$q['ignore_sticky_posts'] = false;
 
-		if ( !isset($q['suppress_filters']) )
+		if ( ! isset($q['suppress_filters']))
 			$q['suppress_filters'] = false;
 
-		if ( !isset($q['cache_results']) ) {
-			if ( wp_using_ext_object_cache() )
+		if ( ! isset($q['cache_results'])) {
+			if (wp_using_ext_object_cache())
 				$q['cache_results'] = false;
 			else
 				$q['cache_results'] = true;
 		}
 
-		if ( !isset($q['update_post_term_cache']) )
+		if ( ! isset($q['update_post_term_cache']))
 			$q['update_post_term_cache'] = true;
 
-		if ( ! isset( $q['lazy_load_term_meta'] ) ) {
+		if ( ! isset($q['lazy_load_term_meta'])) {
 			$q['lazy_load_term_meta'] = $q['update_post_term_cache'];
 		}
 
-		if ( !isset($q['update_post_meta_cache']) )
+		if ( ! isset($q['update_post_meta_cache']))
 			$q['update_post_meta_cache'] = true;
 
-		if ( !isset($q['post_type']) ) {
-			if ( $this->is_search )
+		if ( ! isset($q['post_type'])) {
+			if ($this->is_search)
 				$q['post_type'] = 'any';
 			else
 				$q['post_type'] = '';
 		}
 		$post_type = $q['post_type'];
-		if ( empty( $q['posts_per_page'] ) ) {
-			$q['posts_per_page'] = get_option( 'posts_per_page' );
+		if (empty($q['posts_per_page'])) {
+			$q['posts_per_page'] = get_option('posts_per_page');
 		}
-		if ( isset($q['showposts']) && $q['showposts'] ) {
+		if (isset($q['showposts']) && $q['showposts']) {
 			$q['showposts'] = (int) $q['showposts'];
 			$q['posts_per_page'] = $q['showposts'];
 		}
-		if ( (isset($q['posts_per_archive_page']) && $q['posts_per_archive_page'] != 0) && ($this->is_archive || $this->is_search) )
+		if ((isset($q['posts_per_archive_page']) && $q['posts_per_archive_page'] != 0) && ($this->is_archive || $this->is_search))
 			$q['posts_per_page'] = $q['posts_per_archive_page'];
-		if ( !isset($q['nopaging']) ) {
-			if ( $q['posts_per_page'] == -1 ) {
+		if ( ! isset($q['nopaging'])) {
+			if ($q['posts_per_page'] == -1) {
 				$q['nopaging'] = true;
 			} else {
 				$q['nopaging'] = false;
 			}
 		}
 
-		if ( $this->is_feed ) {
+		if ($this->is_feed) {
 			// This overrides posts_per_page.
-			if ( ! empty( $q['posts_per_rss'] ) ) {
+			if ( ! empty($q['posts_per_rss'])) {
 				$q['posts_per_page'] = $q['posts_per_rss'];
 			} else {
-				$q['posts_per_page'] = get_option( 'posts_per_rss' );
+				$q['posts_per_page'] = get_option('posts_per_rss');
 			}
 			$q['nopaging'] = false;
 		}
 		$q['posts_per_page'] = (int) $q['posts_per_page'];
-		if ( $q['posts_per_page'] < -1 )
+		if ($q['posts_per_page'] < -1)
 			$q['posts_per_page'] = abs($q['posts_per_page']);
-		elseif ( $q['posts_per_page'] == 0 )
+		elseif ($q['posts_per_page'] == 0)
 			$q['posts_per_page'] = 1;
 
-		if ( !isset($q['comments_per_page']) || $q['comments_per_page'] == 0 )
+		if ( ! isset($q['comments_per_page']) || $q['comments_per_page'] == 0)
 			$q['comments_per_page'] = get_option('comments_per_page');
 
-		if ( $this->is_home && (empty($this->query) || $q['preview'] == 'true') && ( 'page' == get_option('show_on_front') ) && get_option('page_on_front') ) {
+		if ($this->is_home && (empty($this->query) || $q['preview'] == 'true') && ('page' == get_option('show_on_front')) && get_option('page_on_front')) {
 			$this->is_page = true;
 			$this->is_home = false;
 			$q['page_id'] = get_option('page_on_front');
 		}
 
-		if ( isset($q['page']) ) {
+		if (isset($q['page'])) {
 			$q['page'] = trim($q['page'], '/');
 			$q['page'] = absint($q['page']);
 		}
 
 		// If true, forcibly turns off SQL_CALC_FOUND_ROWS even when limits are present.
-		if ( isset($q['no_found_rows']) )
+		if (isset($q['no_found_rows']))
 			$q['no_found_rows'] = (bool) $q['no_found_rows'];
 		else
 			$q['no_found_rows'] = false;
 
-		switch ( $q['fields'] ) {
+		switch ($q['fields']) {
 			case 'ids':
 				$fields = "{$wpdb->posts}.ID";
 				break;
@@ -1811,79 +1811,79 @@ 
 				$fields = "{$wpdb->posts}.*";
 		}
 
-		if ( '' !== $q['menu_order'] ) {
-			$where .= " AND {$wpdb->posts}.menu_order = " . $q['menu_order'];
+		if ('' !== $q['menu_order']) {
+			$where .= " AND {$wpdb->posts}.menu_order = ".$q['menu_order'];
 		}
 		// The "m" parameter is meant for months but accepts datetimes of varying specificity
-		if ( $q['m'] ) {
-			$where .= " AND YEAR({$wpdb->posts}.post_date)=" . substr($q['m'], 0, 4);
-			if ( strlen($q['m']) > 5 ) {
-				$where .= " AND MONTH({$wpdb->posts}.post_date)=" . substr($q['m'], 4, 2);
+		if ($q['m']) {
+			$where .= " AND YEAR({$wpdb->posts}.post_date)=".substr($q['m'], 0, 4);
+			if (strlen($q['m']) > 5) {
+				$where .= " AND MONTH({$wpdb->posts}.post_date)=".substr($q['m'], 4, 2);
 			}
-			if ( strlen($q['m']) > 7 ) {
-				$where .= " AND DAYOFMONTH({$wpdb->posts}.post_date)=" . substr($q['m'], 6, 2);
+			if (strlen($q['m']) > 7) {
+				$where .= " AND DAYOFMONTH({$wpdb->posts}.post_date)=".substr($q['m'], 6, 2);
 			}
-			if ( strlen($q['m']) > 9 ) {
-				$where .= " AND HOUR({$wpdb->posts}.post_date)=" . substr($q['m'], 8, 2);
+			if (strlen($q['m']) > 9) {
+				$where .= " AND HOUR({$wpdb->posts}.post_date)=".substr($q['m'], 8, 2);
 			}
-			if ( strlen($q['m']) > 11 ) {
-				$where .= " AND MINUTE({$wpdb->posts}.post_date)=" . substr($q['m'], 10, 2);
+			if (strlen($q['m']) > 11) {
+				$where .= " AND MINUTE({$wpdb->posts}.post_date)=".substr($q['m'], 10, 2);
 			}
-			if ( strlen($q['m']) > 13 ) {
-				$where .= " AND SECOND({$wpdb->posts}.post_date)=" . substr($q['m'], 12, 2);
+			if (strlen($q['m']) > 13) {
+				$where .= " AND SECOND({$wpdb->posts}.post_date)=".substr($q['m'], 12, 2);
 			}
 		}
 
 		// Handle the other individual date parameters
 		$date_parameters = array();
 
-		if ( '' !== $q['hour'] )
+		if ('' !== $q['hour'])
 			$date_parameters['hour'] = $q['hour'];
 
-		if ( '' !== $q['minute'] )
+		if ('' !== $q['minute'])
 			$date_parameters['minute'] = $q['minute'];
 
-		if ( '' !== $q['second'] )
+		if ('' !== $q['second'])
 			$date_parameters['second'] = $q['second'];
 
-		if ( $q['year'] )
+		if ($q['year'])
 			$date_parameters['year'] = $q['year'];
 
-		if ( $q['monthnum'] )
+		if ($q['monthnum'])
 			$date_parameters['monthnum'] = $q['monthnum'];
 
-		if ( $q['w'] )
+		if ($q['w'])
 			$date_parameters['week'] = $q['w'];
 
-		if ( $q['day'] )
+		if ($q['day'])
 			$date_parameters['day'] = $q['day'];
 
-		if ( $date_parameters ) {
-			$date_query = new WP_Date_Query( array( $date_parameters ) );
+		if ($date_parameters) {
+			$date_query = new WP_Date_Query(array($date_parameters));
 			$where .= $date_query->get_sql();
 		}
-		unset( $date_parameters, $date_query );
+		unset($date_parameters, $date_query);
 
 		// Handle complex date queries
-		if ( ! empty( $q['date_query'] ) ) {
-			$this->date_query = new WP_Date_Query( $q['date_query'] );
+		if ( ! empty($q['date_query'])) {
+			$this->date_query = new WP_Date_Query($q['date_query']);
 			$where .= $this->date_query->get_sql();
 		}
 
 
 		// If we've got a post_type AND it's not "any" post_type.
-		if ( !empty($q['post_type']) && 'any' != $q['post_type'] ) {
-			foreach ( (array)$q['post_type'] as $_post_type ) {
+		if ( ! empty($q['post_type']) && 'any' != $q['post_type']) {
+			foreach ((array) $q['post_type'] as $_post_type) {
 				$ptype_obj = get_post_type_object($_post_type);
-				if ( !$ptype_obj || !$ptype_obj->query_var || empty($q[ $ptype_obj->query_var ]) )
+				if ( ! $ptype_obj || ! $ptype_obj->query_var || empty($q[$ptype_obj->query_var]))
 					continue;
 
-				if ( ! $ptype_obj->hierarchical ) {
+				if ( ! $ptype_obj->hierarchical) {
 					// Non-hierarchical post types can directly use 'name'.
-					$q['name'] = $q[ $ptype_obj->query_var ];
+					$q['name'] = $q[$ptype_obj->query_var];
 				} else {
 					// Hierarchical post types will operate through 'pagename'.
-					$q['pagename'] = $q[ $ptype_obj->query_var ];
+					$q['pagename'] = $q[$ptype_obj->query_var];
 					$q['name'] = '';
 				}
 
@@ -1893,99 +1893,99 @@ 
 			unset($ptype_obj);
 		}
 
-		if ( '' !== $q['title'] ) {
-			$where .= $wpdb->prepare( " AND {$wpdb->posts}.post_title = %s", stripslashes( $q['title'] ) );
+		if ('' !== $q['title']) {
+			$where .= $wpdb->prepare(" AND {$wpdb->posts}.post_title = %s", stripslashes($q['title']));
 		}
 
 		// Parameters related to 'post_name'.
-		if ( '' != $q['name'] ) {
-			$q['name'] = sanitize_title_for_query( $q['name'] );
-			$where .= " AND {$wpdb->posts}.post_name = '" . $q['name'] . "'";
-		} elseif ( '' != $q['pagename'] ) {
-			if ( isset($this->queried_object_id) ) {
+		if ('' != $q['name']) {
+			$q['name'] = sanitize_title_for_query($q['name']);
+			$where .= " AND {$wpdb->posts}.post_name = '".$q['name']."'";
+		} elseif ('' != $q['pagename']) {
+			if (isset($this->queried_object_id)) {
 				$reqpage = $this->queried_object_id;
 			} else {
-				if ( 'page' != $q['post_type'] ) {
-					foreach ( (array)$q['post_type'] as $_post_type ) {
+				if ('page' != $q['post_type']) {
+					foreach ((array) $q['post_type'] as $_post_type) {
 						$ptype_obj = get_post_type_object($_post_type);
-						if ( !$ptype_obj || !$ptype_obj->hierarchical )
+						if ( ! $ptype_obj || ! $ptype_obj->hierarchical)
 							continue;
 
 						$reqpage = get_page_by_path($q['pagename'], OBJECT, $_post_type);
-						if ( $reqpage )
+						if ($reqpage)
 							break;
 					}
 					unset($ptype_obj);
 				} else {
 					$reqpage = get_page_by_path($q['pagename']);
 				}
-				if ( !empty($reqpage) )
+				if ( ! empty($reqpage))
 					$reqpage = $reqpage->ID;
 				else
 					$reqpage = 0;
 			}
 
 			$page_for_posts = get_option('page_for_posts');
-			if  ( ('page' != get_option('show_on_front') ) || empty($page_for_posts) || ( $reqpage != $page_for_posts ) ) {
-				$q['pagename'] = sanitize_title_for_query( wp_basename( $q['pagename'] ) );
+			if (('page' != get_option('show_on_front')) || empty($page_for_posts) || ($reqpage != $page_for_posts)) {
+				$q['pagename'] = sanitize_title_for_query(wp_basename($q['pagename']));
 				$q['name'] = $q['pagename'];
 				$where .= " AND ({$wpdb->posts}.ID = '$reqpage')";
-				$reqpage_obj = get_post( $reqpage );
-				if ( is_object($reqpage_obj) && 'attachment' == $reqpage_obj->post_type ) {
+				$reqpage_obj = get_post($reqpage);
+				if (is_object($reqpage_obj) && 'attachment' == $reqpage_obj->post_type) {
 					$this->is_attachment = true;
 					$post_type = $q['post_type'] = 'attachment';
 					$this->is_page = true;
 					$q['attachment_id'] = $reqpage;
 				}
 			}
-		} elseif ( '' != $q['attachment'] ) {
-			$q['attachment'] = sanitize_title_for_query( wp_basename( $q['attachment'] ) );
+		} elseif ('' != $q['attachment']) {
+			$q['attachment'] = sanitize_title_for_query(wp_basename($q['attachment']));
 			$q['name'] = $q['attachment'];
-			$where .= " AND {$wpdb->posts}.post_name = '" . $q['attachment'] . "'";
-		} elseif ( is_array( $q['post_name__in'] ) && ! empty( $q['post_name__in'] ) ) {
-			$q['post_name__in'] = array_map( 'sanitize_title_for_query', $q['post_name__in'] );
-			$post_name__in = "'" . implode( "','", $q['post_name__in'] ) . "'";
+			$where .= " AND {$wpdb->posts}.post_name = '".$q['attachment']."'";
+		} elseif (is_array($q['post_name__in']) && ! empty($q['post_name__in'])) {
+			$q['post_name__in'] = array_map('sanitize_title_for_query', $q['post_name__in']);
+			$post_name__in = "'".implode("','", $q['post_name__in'])."'";
 			$where .= " AND {$wpdb->posts}.post_name IN ($post_name__in)";
 		}
 
 		// If an attachment is requested by number, let it supersede any post number.
-		if ( $q['attachment_id'] )
+		if ($q['attachment_id'])
 			$q['p'] = absint($q['attachment_id']);
 
 		// If a post number is specified, load that post
-		if ( $q['p'] ) {
-			$where .= " AND {$wpdb->posts}.ID = " . $q['p'];
-		} elseif ( $q['post__in'] ) {
-			$post__in = implode(',', array_map( 'absint', $q['post__in'] ));
+		if ($q['p']) {
+			$where .= " AND {$wpdb->posts}.ID = ".$q['p'];
+		} elseif ($q['post__in']) {
+			$post__in = implode(',', array_map('absint', $q['post__in']));
 			$where .= " AND {$wpdb->posts}.ID IN ($post__in)";
-		} elseif ( $q['post__not_in'] ) {
-			$post__not_in = implode(',',  array_map( 'absint', $q['post__not_in'] ));
+		} elseif ($q['post__not_in']) {
+			$post__not_in = implode(',', array_map('absint', $q['post__not_in']));
 			$where .= " AND {$wpdb->posts}.ID NOT IN ($post__not_in)";
 		}
 
-		if ( is_numeric( $q['post_parent'] ) ) {
-			$where .= $wpdb->prepare( " AND {$wpdb->posts}.post_parent = %d ", $q['post_parent'] );
-		} elseif ( $q['post_parent__in'] ) {
-			$post_parent__in = implode( ',', array_map( 'absint', $q['post_parent__in'] ) );
+		if (is_numeric($q['post_parent'])) {
+			$where .= $wpdb->prepare(" AND {$wpdb->posts}.post_parent = %d ", $q['post_parent']);
+		} elseif ($q['post_parent__in']) {
+			$post_parent__in = implode(',', array_map('absint', $q['post_parent__in']));
 			$where .= " AND {$wpdb->posts}.post_parent IN ($post_parent__in)";
-		} elseif ( $q['post_parent__not_in'] ) {
-			$post_parent__not_in = implode( ',',  array_map( 'absint', $q['post_parent__not_in'] ) );
+		} elseif ($q['post_parent__not_in']) {
+			$post_parent__not_in = implode(',', array_map('absint', $q['post_parent__not_in']));
 			$where .= " AND {$wpdb->posts}.post_parent NOT IN ($post_parent__not_in)";
 		}
 
-		if ( $q['page_id'] ) {
-			if  ( ('page' != get_option('show_on_front') ) || ( $q['page_id'] != get_option('page_for_posts') ) ) {
+		if ($q['page_id']) {
+			if (('page' != get_option('show_on_front')) || ($q['page_id'] != get_option('page_for_posts'))) {
 				$q['p'] = $q['page_id'];
-				$where = " AND {$wpdb->posts}.ID = " . $q['page_id'];
+				$where = " AND {$wpdb->posts}.ID = ".$q['page_id'];
 			}
 		}
 
 		// If a search pattern is specified, load the posts that match.
-		if ( strlen( $q['s'] ) ) {
-			$search = $this->parse_search( $q );
+		if (strlen($q['s'])) {
+			$search = $this->parse_search($q);
 		}
 
-		if ( ! $q['suppress_filters'] ) {
+		if ( ! $q['suppress_filters']) {
 			/**
 			 * Filters the search SQL that is used in the WHERE clause of WP_Query.
 			 *
@@ -1994,36 +1994,36 @@ 
 			 * @param string   $search Search SQL for WHERE clause.
 			 * @param WP_Query $this   The current WP_Query object.
 			 */
-			$search = apply_filters_ref_array( 'posts_search', array( $search, &$this ) );
+			$search = apply_filters_ref_array('posts_search', array($search, &$this));
 		}
 
 		// Taxonomies
-		if ( !$this->is_singular ) {
-			$this->parse_tax_query( $q );
+		if ( ! $this->is_singular) {
+			$this->parse_tax_query($q);
 
-			$clauses = $this->tax_query->get_sql( $wpdb->posts, 'ID' );
+			$clauses = $this->tax_query->get_sql($wpdb->posts, 'ID');
 
 			$join .= $clauses['join'];
 			$where .= $clauses['where'];
 		}
 
-		if ( $this->is_tax ) {
-			if ( empty($post_type) ) {
+		if ($this->is_tax) {
+			if (empty($post_type)) {
 				// Do a fully inclusive search for currently registered post types of queried taxonomies
 				$post_type = array();
-				$taxonomies = array_keys( $this->tax_query->queried_terms );
-				foreach ( get_post_types( array( 'exclude_from_search' => false ) ) as $pt ) {
-					$object_taxonomies = $pt === 'attachment' ? get_taxonomies_for_attachments() : get_object_taxonomies( $pt );
-					if ( array_intersect( $taxonomies, $object_taxonomies ) )
+				$taxonomies = array_keys($this->tax_query->queried_terms);
+				foreach (get_post_types(array('exclude_from_search' => false)) as $pt) {
+					$object_taxonomies = $pt === 'attachment' ? get_taxonomies_for_attachments() : get_object_taxonomies($pt);
+					if (array_intersect($taxonomies, $object_taxonomies))
 						$post_type[] = $pt;
 				}
-				if ( ! $post_type )
+				if ( ! $post_type)
 					$post_type = 'any';
-				elseif ( count( $post_type ) == 1 )
+				elseif (count($post_type) == 1)
 					$post_type = $post_type[0];
 
 				$post_status_join = true;
-			} elseif ( in_array('attachment', (array) $post_type) ) {
+			} elseif (in_array('attachment', (array) $post_type)) {
 				$post_status_join = true;
 			}
 		}
@@ -2032,22 +2032,22 @@ 
 		 * Ensure that 'taxonomy', 'term', 'term_id', 'cat', and
 		 * 'category_name' vars are set for backward compatibility.
 		 */
-		if ( ! empty( $this->tax_query->queried_terms ) ) {
+		if ( ! empty($this->tax_query->queried_terms)) {
 
 			/*
 			 * Set 'taxonomy', 'term', and 'term_id' to the
 			 * first taxonomy other than 'post_tag' or 'category'.
 			 */
-			if ( ! isset( $q['taxonomy'] ) ) {
-				foreach ( $this->tax_query->queried_terms as $queried_taxonomy => $queried_items ) {
-					if ( empty( $queried_items['terms'][0] ) ) {
+			if ( ! isset($q['taxonomy'])) {
+				foreach ($this->tax_query->queried_terms as $queried_taxonomy => $queried_items) {
+					if (empty($queried_items['terms'][0])) {
 						continue;
 					}
 
-					if ( ! in_array( $queried_taxonomy, array( 'category', 'post_tag' ) ) ) {
+					if ( ! in_array($queried_taxonomy, array('category', 'post_tag'))) {
 						$q['taxonomy'] = $queried_taxonomy;
 
-						if ( 'slug' === $queried_items['field'] ) {
+						if ('slug' === $queried_items['field']) {
 							$q['term'] = $queried_items['terms'][0];
 						} else {
 							$q['term_id'] = $queried_items['terms'][0];
@@ -2060,156 +2060,156 @@ 
 			}
 
 			// 'cat', 'category_name', 'tag_id'
-			foreach ( $this->tax_query->queried_terms as $queried_taxonomy => $queried_items ) {
-				if ( empty( $queried_items['terms'][0] ) ) {
+			foreach ($this->tax_query->queried_terms as $queried_taxonomy => $queried_items) {
+				if (empty($queried_items['terms'][0])) {
 					continue;
 				}
 
-				if ( 'category' === $queried_taxonomy ) {
-					$the_cat = get_term_by( $queried_items['field'], $queried_items['terms'][0], 'category' );
-					if ( $the_cat ) {
-						$this->set( 'cat', $the_cat->term_id );
-						$this->set( 'category_name', $the_cat->slug );
+				if ('category' === $queried_taxonomy) {
+					$the_cat = get_term_by($queried_items['field'], $queried_items['terms'][0], 'category');
+					if ($the_cat) {
+						$this->set('cat', $the_cat->term_id);
+						$this->set('category_name', $the_cat->slug);
 					}
-					unset( $the_cat );
+					unset($the_cat);
 				}
 
-				if ( 'post_tag' === $queried_taxonomy ) {
-					$the_tag = get_term_by( $queried_items['field'], $queried_items['terms'][0], 'post_tag' );
-					if ( $the_tag ) {
-						$this->set( 'tag_id', $the_tag->term_id );
+				if ('post_tag' === $queried_taxonomy) {
+					$the_tag = get_term_by($queried_items['field'], $queried_items['terms'][0], 'post_tag');
+					if ($the_tag) {
+						$this->set('tag_id', $the_tag->term_id);
 					}
-					unset( $the_tag );
+					unset($the_tag);
 				}
 			}
 		}
 
-		if ( !empty( $this->tax_query->queries ) || !empty( $this->meta_query->queries ) ) {
+		if ( ! empty($this->tax_query->queries) || ! empty($this->meta_query->queries)) {
 			$groupby = "{$wpdb->posts}.ID";
 		}
 
 		// Author/user stuff
 
-		if ( ! empty( $q['author'] ) && $q['author'] != '0' ) {
-			$q['author'] = addslashes_gpc( '' . urldecode( $q['author'] ) );
-			$authors = array_unique( array_map( 'intval', preg_split( '/[,\s]+/', $q['author'] ) ) );
-			foreach ( $authors as $author ) {
+		if ( ! empty($q['author']) && $q['author'] != '0') {
+			$q['author'] = addslashes_gpc(''.urldecode($q['author']));
+			$authors = array_unique(array_map('intval', preg_split('/[,\s]+/', $q['author'])));
+			foreach ($authors as $author) {
 				$key = $author > 0 ? 'author__in' : 'author__not_in';
-				$q[$key][] = abs( $author );
+				$q[$key][] = abs($author);
 			}
-			$q['author'] = implode( ',', $authors );
+			$q['author'] = implode(',', $authors);
 		}
 
-		if ( ! empty( $q['author__not_in'] ) ) {
-			$author__not_in = implode( ',', array_map( 'absint', array_unique( (array) $q['author__not_in'] ) ) );
+		if ( ! empty($q['author__not_in'])) {
+			$author__not_in = implode(',', array_map('absint', array_unique((array) $q['author__not_in'])));
 			$where .= " AND {$wpdb->posts}.post_author NOT IN ($author__not_in) ";
-		} elseif ( ! empty( $q['author__in'] ) ) {
-			$author__in = implode( ',', array_map( 'absint', array_unique( (array) $q['author__in'] ) ) );
+		} elseif ( ! empty($q['author__in'])) {
+			$author__in = implode(',', array_map('absint', array_unique((array) $q['author__in'])));
 			$where .= " AND {$wpdb->posts}.post_author IN ($author__in) ";
 		}
 
 		// Author stuff for nice URLs
 
-		if ( '' != $q['author_name'] ) {
-			if ( strpos($q['author_name'], '/') !== false ) {
+		if ('' != $q['author_name']) {
+			if (strpos($q['author_name'], '/') !== false) {
 				$q['author_name'] = explode('/', $q['author_name']);
-				if ( $q['author_name'][ count($q['author_name'])-1 ] ) {
-					$q['author_name'] = $q['author_name'][count($q['author_name'])-1]; // no trailing slash
+				if ($q['author_name'][count($q['author_name']) - 1]) {
+					$q['author_name'] = $q['author_name'][count($q['author_name']) - 1]; // no trailing slash
 				} else {
-					$q['author_name'] = $q['author_name'][count($q['author_name'])-2]; // there was a trailing slash
+					$q['author_name'] = $q['author_name'][count($q['author_name']) - 2]; // there was a trailing slash
 				}
 			}
-			$q['author_name'] = sanitize_title_for_query( $q['author_name'] );
+			$q['author_name'] = sanitize_title_for_query($q['author_name']);
 			$q['author'] = get_user_by('slug', $q['author_name']);
-			if ( $q['author'] )
+			if ($q['author'])
 				$q['author'] = $q['author']->ID;
-			$whichauthor .= " AND ({$wpdb->posts}.post_author = " . absint($q['author']) . ')';
+			$whichauthor .= " AND ({$wpdb->posts}.post_author = ".absint($q['author']).')';
 		}
 
 		// MIME-Type stuff for attachment browsing
 
-		if ( isset( $q['post_mime_type'] ) && '' != $q['post_mime_type'] ) {
-			$whichmimetype = wp_post_mime_type_where( $q['post_mime_type'], $wpdb->posts );
+		if (isset($q['post_mime_type']) && '' != $q['post_mime_type']) {
+			$whichmimetype = wp_post_mime_type_where($q['post_mime_type'], $wpdb->posts);
 		}
-		$where .= $search . $whichauthor . $whichmimetype;
+		$where .= $search.$whichauthor.$whichmimetype;
 
-		if ( ! empty( $this->meta_query->queries ) ) {
-			$clauses = $this->meta_query->get_sql( 'post', $wpdb->posts, 'ID', $this );
+		if ( ! empty($this->meta_query->queries)) {
+			$clauses = $this->meta_query->get_sql('post', $wpdb->posts, 'ID', $this);
 			$join   .= $clauses['join'];
 			$where  .= $clauses['where'];
 		}
 
-		$rand = ( isset( $q['orderby'] ) && 'rand' === $q['orderby'] );
-		if ( ! isset( $q['order'] ) ) {
+		$rand = (isset($q['orderby']) && 'rand' === $q['orderby']);
+		if ( ! isset($q['order'])) {
 			$q['order'] = $rand ? '' : 'DESC';
 		} else {
-			$q['order'] = $rand ? '' : $this->parse_order( $q['order'] );
+			$q['order'] = $rand ? '' : $this->parse_order($q['order']);
 		}
 
 		// Order by.
-		if ( empty( $q['orderby'] ) ) {
+		if (empty($q['orderby'])) {
 			/*
 			 * Boolean false or empty array blanks out ORDER BY,
 			 * while leaving the value unset or otherwise empty sets the default.
 			 */
-			if ( isset( $q['orderby'] ) && ( is_array( $q['orderby'] ) || false === $q['orderby'] ) ) {
+			if (isset($q['orderby']) && (is_array($q['orderby']) || false === $q['orderby'])) {
 				$orderby = '';
 			} else {
-				$orderby = "{$wpdb->posts}.post_date " . $q['order'];
+				$orderby = "{$wpdb->posts}.post_date ".$q['order'];
 			}
-		} elseif ( 'none' == $q['orderby'] ) {
+		} elseif ('none' == $q['orderby']) {
 			$orderby = '';
-		} elseif ( $q['orderby'] == 'post__in' && ! empty( $post__in ) ) {
+		} elseif ($q['orderby'] == 'post__in' && ! empty($post__in)) {
 			$orderby = "FIELD( {$wpdb->posts}.ID, $post__in )";
-		} elseif ( $q['orderby'] == 'post_parent__in' && ! empty( $post_parent__in ) ) {
+		} elseif ($q['orderby'] == 'post_parent__in' && ! empty($post_parent__in)) {
 			$orderby = "FIELD( {$wpdb->posts}.post_parent, $post_parent__in )";
-		} elseif ( $q['orderby'] == 'post_name__in' && ! empty( $post_name__in ) ) {
+		} elseif ($q['orderby'] == 'post_name__in' && ! empty($post_name__in)) {
 			$orderby = "FIELD( {$wpdb->posts}.post_name, $post_name__in )";
 		} else {
 			$orderby_array = array();
-			if ( is_array( $q['orderby'] ) ) {
-				foreach ( $q['orderby'] as $_orderby => $order ) {
-					$orderby = addslashes_gpc( urldecode( $_orderby ) );
-					$parsed  = $this->parse_orderby( $orderby );
+			if (is_array($q['orderby'])) {
+				foreach ($q['orderby'] as $_orderby => $order) {
+					$orderby = addslashes_gpc(urldecode($_orderby));
+					$parsed  = $this->parse_orderby($orderby);
 
-					if ( ! $parsed ) {
+					if ( ! $parsed) {
 						continue;
 					}
 
-					$orderby_array[] = $parsed . ' ' . $this->parse_order( $order );
+					$orderby_array[] = $parsed.' '.$this->parse_order($order);
 				}
-				$orderby = implode( ', ', $orderby_array );
+				$orderby = implode(', ', $orderby_array);
 
 			} else {
-				$q['orderby'] = urldecode( $q['orderby'] );
-				$q['orderby'] = addslashes_gpc( $q['orderby'] );
+				$q['orderby'] = urldecode($q['orderby']);
+				$q['orderby'] = addslashes_gpc($q['orderby']);
 
-				foreach ( explode( ' ', $q['orderby'] ) as $i => $orderby ) {
-					$parsed = $this->parse_orderby( $orderby );
+				foreach (explode(' ', $q['orderby']) as $i => $orderby) {
+					$parsed = $this->parse_orderby($orderby);
 					// Only allow certain values for safety.
-					if ( ! $parsed ) {
+					if ( ! $parsed) {
 						continue;
 					}
 
 					$orderby_array[] = $parsed;
 				}
-				$orderby = implode( ' ' . $q['order'] . ', ', $orderby_array );
+				$orderby = implode(' '.$q['order'].', ', $orderby_array);
 
-				if ( empty( $orderby ) ) {
-					$orderby = "{$wpdb->posts}.post_date " . $q['order'];
-				} elseif ( ! empty( $q['order'] ) ) {
+				if (empty($orderby)) {
+					$orderby = "{$wpdb->posts}.post_date ".$q['order'];
+				} elseif ( ! empty($q['order'])) {
 					$orderby .= " {$q['order']}";
 				}
 			}
 		}
 
 		// Order search results by relevance only when another "orderby" is not specified in the query.
-		if ( ! empty( $q['s'] ) ) {
+		if ( ! empty($q['s'])) {
 			$search_orderby = '';
-			if ( ! empty( $q['search_orderby_title'] ) && ( empty( $q['orderby'] ) && ! $this->is_feed ) || ( isset( $q['orderby'] ) && 'relevance' === $q['orderby'] ) )
-				$search_orderby = $this->parse_search_order( $q );
+			if ( ! empty($q['search_orderby_title']) && (empty($q['orderby']) && ! $this->is_feed) || (isset($q['orderby']) && 'relevance' === $q['orderby']))
+				$search_orderby = $this->parse_search_order($q);
 
-			if ( ! $q['suppress_filters'] ) {
+			if ( ! $q['suppress_filters']) {
 				/**
 				 * Filters the ORDER BY used when ordering search results.
 				 *
@@ -2218,95 +2218,95 @@ 
 				 * @param string   $search_orderby The ORDER BY clause.
 				 * @param WP_Query $this           The current WP_Query instance.
 				 */
-				$search_orderby = apply_filters( 'posts_search_orderby', $search_orderby, $this );
+				$search_orderby = apply_filters('posts_search_orderby', $search_orderby, $this);
 			}
 
-			if ( $search_orderby )
-				$orderby = $orderby ? $search_orderby . ', ' . $orderby : $search_orderby;
+			if ($search_orderby)
+				$orderby = $orderby ? $search_orderby.', '.$orderby : $search_orderby;
 		}
 
-		if ( is_array( $post_type ) && count( $post_type ) > 1 ) {
+		if (is_array($post_type) && count($post_type) > 1) {
 			$post_type_cap = 'multiple_post_type';
 		} else {
-			if ( is_array( $post_type ) )
-				$post_type = reset( $post_type );
-			$post_type_object = get_post_type_object( $post_type );
-			if ( empty( $post_type_object ) )
+			if (is_array($post_type))
+				$post_type = reset($post_type);
+			$post_type_object = get_post_type_object($post_type);
+			if (empty($post_type_object))
 				$post_type_cap = $post_type;
 		}
 
-		if ( isset( $q['post_password'] ) ) {
-			$where .= $wpdb->prepare( " AND {$wpdb->posts}.post_password = %s", $q['post_password'] );
-			if ( empty( $q['perm'] ) ) {
+		if (isset($q['post_password'])) {
+			$where .= $wpdb->prepare(" AND {$wpdb->posts}.post_password = %s", $q['post_password']);
+			if (empty($q['perm'])) {
 				$q['perm'] = 'readable';
 			}
-		} elseif ( isset( $q['has_password'] ) ) {
-			$where .= sprintf( " AND {$wpdb->posts}.post_password %s ''", $q['has_password'] ? '!=' : '=' );
+		} elseif (isset($q['has_password'])) {
+			$where .= sprintf(" AND {$wpdb->posts}.post_password %s ''", $q['has_password'] ? '!=' : '=');
 		}
 
-		if ( ! empty( $q['comment_status'] ) ) {
-			$where .= $wpdb->prepare( " AND {$wpdb->posts}.comment_status = %s ", $q['comment_status'] );
+		if ( ! empty($q['comment_status'])) {
+			$where .= $wpdb->prepare(" AND {$wpdb->posts}.comment_status = %s ", $q['comment_status']);
 		}
 
-		if ( ! empty( $q['ping_status'] ) )  {
-			$where .= $wpdb->prepare( " AND {$wpdb->posts}.ping_status = %s ", $q['ping_status'] );
+		if ( ! empty($q['ping_status'])) {
+			$where .= $wpdb->prepare(" AND {$wpdb->posts}.ping_status = %s ", $q['ping_status']);
 		}
 
-		if ( 'any' == $post_type ) {
-			$in_search_post_types = get_post_types( array('exclude_from_search' => false) );
-			if ( empty( $in_search_post_types ) ) {
+		if ('any' == $post_type) {
+			$in_search_post_types = get_post_types(array('exclude_from_search' => false));
+			if (empty($in_search_post_types)) {
 				$where .= ' AND 1=0 ';
 			} else {
-				$where .= " AND {$wpdb->posts}.post_type IN ('" . join("', '", $in_search_post_types ) . "')";
+				$where .= " AND {$wpdb->posts}.post_type IN ('".join("', '", $in_search_post_types)."')";
 			}
-		} elseif ( !empty( $post_type ) && is_array( $post_type ) ) {
-			$where .= " AND {$wpdb->posts}.post_type IN ('" . join("', '", $post_type) . "')";
-		} elseif ( ! empty( $post_type ) ) {
+		} elseif ( ! empty($post_type) && is_array($post_type)) {
+			$where .= " AND {$wpdb->posts}.post_type IN ('".join("', '", $post_type)."')";
+		} elseif ( ! empty($post_type)) {
 			$where .= " AND {$wpdb->posts}.post_type = '$post_type'";
-			$post_type_object = get_post_type_object ( $post_type );
-		} elseif ( $this->is_attachment ) {
+			$post_type_object = get_post_type_object($post_type);
+		} elseif ($this->is_attachment) {
 			$where .= " AND {$wpdb->posts}.post_type = 'attachment'";
-			$post_type_object = get_post_type_object ( 'attachment' );
-		} elseif ( $this->is_page ) {
+			$post_type_object = get_post_type_object('attachment');
+		} elseif ($this->is_page) {
 			$where .= " AND {$wpdb->posts}.post_type = 'page'";
-			$post_type_object = get_post_type_object ( 'page' );
+			$post_type_object = get_post_type_object('page');
 		} else {
 			$where .= " AND {$wpdb->posts}.post_type = 'post'";
-			$post_type_object = get_post_type_object ( 'post' );
+			$post_type_object = get_post_type_object('post');
 		}
 
 		$edit_cap = 'edit_post';
 		$read_cap = 'read_post';
 
-		if ( ! empty( $post_type_object ) ) {
+		if ( ! empty($post_type_object)) {
 			$edit_others_cap = $post_type_object->cap->edit_others_posts;
 			$read_private_cap = $post_type_object->cap->read_private_posts;
 		} else {
-			$edit_others_cap = 'edit_others_' . $post_type_cap . 's';
-			$read_private_cap = 'read_private_' . $post_type_cap . 's';
+			$edit_others_cap = 'edit_others_'.$post_type_cap.'s';
+			$read_private_cap = 'read_private_'.$post_type_cap.'s';
 		}
 
 		$user_id = get_current_user_id();
 
 		$q_status = array();
-		if ( ! empty( $q['post_status'] ) ) {
+		if ( ! empty($q['post_status'])) {
 			$statuswheres = array();
 			$q_status = $q['post_status'];
-			if ( ! is_array( $q_status ) )
+			if ( ! is_array($q_status))
 				$q_status = explode(',', $q_status);
 			$r_status = array();
 			$p_status = array();
 			$e_status = array();
-			if ( in_array( 'any', $q_status ) ) {
-				foreach ( get_post_stati( array( 'exclude_from_search' => true ) ) as $status ) {
-					if ( ! in_array( $status, $q_status ) ) {
+			if (in_array('any', $q_status)) {
+				foreach (get_post_stati(array('exclude_from_search' => true)) as $status) {
+					if ( ! in_array($status, $q_status)) {
 						$e_status[] = "{$wpdb->posts}.post_status <> '$status'";
 					}
 				}
 			} else {
-				foreach ( get_post_stati() as $status ) {
-					if ( in_array( $status, $q_status ) ) {
-						if ( 'private' == $status ) {
+				foreach (get_post_stati() as $status) {
+					if (in_array($status, $q_status)) {
+						if ('private' == $status) {
 							$p_status[] = "{$wpdb->posts}.post_status = '$status'";
 						} else {
 							$r_status[] = "{$wpdb->posts}.post_status = '$status'";
@@ -2315,62 +2315,62 @@ 
 				}
 			}
 
-			if ( empty($q['perm'] ) || 'readable' != $q['perm'] ) {
+			if (empty($q['perm']) || 'readable' != $q['perm']) {
 				$r_status = array_merge($r_status, $p_status);
 				unset($p_status);
 			}
 
-			if ( !empty($e_status) ) {
-				$statuswheres[] = "(" . join( ' AND ', $e_status ) . ")";
+			if ( ! empty($e_status)) {
+				$statuswheres[] = "(".join(' AND ', $e_status).")";
 			}
-			if ( !empty($r_status) ) {
-				if ( !empty($q['perm'] ) && 'editable' == $q['perm'] && !current_user_can($edit_others_cap) ) {
-					$statuswheres[] = "({$wpdb->posts}.post_author = $user_id " . "AND (" . join( ' OR ', $r_status ) . "))";
+			if ( ! empty($r_status)) {
+				if ( ! empty($q['perm']) && 'editable' == $q['perm'] && ! current_user_can($edit_others_cap)) {
+					$statuswheres[] = "({$wpdb->posts}.post_author = $user_id "."AND (".join(' OR ', $r_status)."))";
 				} else {
-					$statuswheres[] = "(" . join( ' OR ', $r_status ) . ")";
+					$statuswheres[] = "(".join(' OR ', $r_status).")";
 				}
 			}
-			if ( !empty($p_status) ) {
-				if ( !empty($q['perm'] ) && 'readable' == $q['perm'] && !current_user_can($read_private_cap) ) {
-					$statuswheres[] = "({$wpdb->posts}.post_author = $user_id " . "AND (" . join( ' OR ', $p_status ) . "))";
+			if ( ! empty($p_status)) {
+				if ( ! empty($q['perm']) && 'readable' == $q['perm'] && ! current_user_can($read_private_cap)) {
+					$statuswheres[] = "({$wpdb->posts}.post_author = $user_id "."AND (".join(' OR ', $p_status)."))";
 				} else {
-					$statuswheres[] = "(" . join( ' OR ', $p_status ) . ")";
+					$statuswheres[] = "(".join(' OR ', $p_status).")";
 				}
 			}
-			if ( $post_status_join ) {
+			if ($post_status_join) {
 				$join .= " LEFT JOIN {$wpdb->posts} AS p2 ON ({$wpdb->posts}.post_parent = p2.ID) ";
-				foreach ( $statuswheres as $index => $statuswhere ) {
-					$statuswheres[$index] = "($statuswhere OR ({$wpdb->posts}.post_status = 'inherit' AND " . str_replace( $wpdb->posts, 'p2', $statuswhere ) . "))";
+				foreach ($statuswheres as $index => $statuswhere) {
+					$statuswheres[$index] = "($statuswhere OR ({$wpdb->posts}.post_status = 'inherit' AND ".str_replace($wpdb->posts, 'p2', $statuswhere)."))";
 				}
 			}
-			$where_status = implode( ' OR ', $statuswheres );
-			if ( ! empty( $where_status ) ) {
+			$where_status = implode(' OR ', $statuswheres);
+			if ( ! empty($where_status)) {
 				$where .= " AND ($where_status)";
 			}
-		} elseif ( !$this->is_singular ) {
+		} elseif ( ! $this->is_singular) {
 			$where .= " AND ({$wpdb->posts}.post_status = 'publish'";
 
 			// Add public states.
-			$public_states = get_post_stati( array('public' => true) );
-			foreach ( (array) $public_states as $state ) {
-				if ( 'publish' == $state ) // Publish is hard-coded above.
+			$public_states = get_post_stati(array('public' => true));
+			foreach ((array) $public_states as $state) {
+				if ('publish' == $state) // Publish is hard-coded above.
 					continue;
 				$where .= " OR {$wpdb->posts}.post_status = '$state'";
 			}
 
-			if ( $this->is_admin ) {
+			if ($this->is_admin) {
 				// Add protected states that should show in the admin all list.
-				$admin_all_states = get_post_stati( array('protected' => true, 'show_in_admin_all_list' => true) );
-				foreach ( (array) $admin_all_states as $state ) {
+				$admin_all_states = get_post_stati(array('protected' => true, 'show_in_admin_all_list' => true));
+				foreach ((array) $admin_all_states as $state) {
 					$where .= " OR {$wpdb->posts}.post_status = '$state'";
 				}
 			}
 
-			if ( is_user_logged_in() ) {
+			if (is_user_logged_in()) {
 				// Add private states that are limited to viewing by the author of a post or someone who has caps to read private states.
-				$private_states = get_post_stati( array('private' => true) );
-				foreach ( (array) $private_states as $state ) {
-					$where .= current_user_can( $read_private_cap ) ? " OR {$wpdb->posts}.post_status = '$state'" : " OR {$wpdb->posts}.post_author = $user_id AND {$wpdb->posts}.post_status = '$state'";
+				$private_states = get_post_stati(array('private' => true));
+				foreach ((array) $private_states as $state) {
+					$where .= current_user_can($read_private_cap) ? " OR {$wpdb->posts}.post_status = '$state'" : " OR {$wpdb->posts}.post_author = $user_id AND {$wpdb->posts}.post_status = '$state'";
 				}
 			}
 
@@ -2381,7 +2381,7 @@ 
 		 * Apply filters on where and join prior to paging so that any
 		 * manipulations to them are reflected in the paging by day queries.
 		 */
-		if ( !$q['suppress_filters'] ) {
+		if ( ! $q['suppress_filters']) {
 			/**
 			 * Filters the WHERE clause of the query.
 			 *
@@ -2390,7 +2390,7 @@ 
 			 * @param string   $where The WHERE clause of the query.
 			 * @param WP_Query &$this The WP_Query instance (passed by reference).
 			 */
-			$where = apply_filters_ref_array( 'posts_where', array( $where, &$this ) );
+			$where = apply_filters_ref_array('posts_where', array($where, &$this));
 
 			/**
 			 * Filters the JOIN clause of the query.
@@ -2400,28 +2400,28 @@ 
 			 * @param string   $where The JOIN clause of the query.
 			 * @param WP_Query &$this The WP_Query instance (passed by reference).
 			 */
-			$join = apply_filters_ref_array( 'posts_join', array( $join, &$this ) );
+			$join = apply_filters_ref_array('posts_join', array($join, &$this));
 		}
 
 		// Paging
-		if ( empty($q['nopaging']) && !$this->is_singular ) {
+		if (empty($q['nopaging']) && ! $this->is_singular) {
 			$page = absint($q['paged']);
-			if ( !$page )
+			if ( ! $page)
 				$page = 1;
 
 			// If 'offset' is provided, it takes precedence over 'paged'.
-			if ( isset( $q['offset'] ) && is_numeric( $q['offset'] ) ) {
-				$q['offset'] = absint( $q['offset'] );
-				$pgstrt = $q['offset'] . ', ';
+			if (isset($q['offset']) && is_numeric($q['offset'])) {
+				$q['offset'] = absint($q['offset']);
+				$pgstrt = $q['offset'].', ';
 			} else {
-				$pgstrt = absint( ( $page - 1 ) * $q['posts_per_page'] ) . ', ';
+				$pgstrt = absint(($page - 1) * $q['posts_per_page']).', ';
 			}
-			$limits = 'LIMIT ' . $pgstrt . $q['posts_per_page'];
+			$limits = 'LIMIT '.$pgstrt.$q['posts_per_page'];
 		}
 
 		// Comments feeds
-		if ( $this->is_comment_feed && ! $this->is_singular ) {
-			if ( $this->is_archive || $this->is_search ) {
+		if ($this->is_comment_feed && ! $this->is_singular) {
+			if ($this->is_archive || $this->is_search) {
 				$cjoin = "JOIN {$wpdb->posts} ON ({$wpdb->comments}.comment_post_ID = {$wpdb->posts}.ID) $join ";
 				$cwhere = "WHERE comment_approved = '1' $where";
 				$cgroupby = "{$wpdb->comments}.comment_id";
@@ -2431,7 +2431,7 @@ 
 				$cgroupby = '';
 			}
 
-			if ( !$q['suppress_filters'] ) {
+			if ( ! $q['suppress_filters']) {
 				/**
 				 * Filters the JOIN clause of the comments feed query before sending.
 				 *
@@ -2440,7 +2440,7 @@ 
 				 * @param string   $cjoin The JOIN clause of the query.
 				 * @param WP_Query &$this The WP_Query instance (passed by reference).
 				 */
-				$cjoin = apply_filters_ref_array( 'comment_feed_join', array( $cjoin, &$this ) );
+				$cjoin = apply_filters_ref_array('comment_feed_join', array($cjoin, &$this));
 
 				/**
 				 * Filters the WHERE clause of the comments feed query before sending.
@@ -2450,7 +2450,7 @@ 
 				 * @param string   $cwhere The WHERE clause of the query.
 				 * @param WP_Query &$this  The WP_Query instance (passed by reference).
 				 */
-				$cwhere = apply_filters_ref_array( 'comment_feed_where', array( $cwhere, &$this ) );
+				$cwhere = apply_filters_ref_array('comment_feed_where', array($cwhere, &$this));
 
 				/**
 				 * Filters the GROUP BY clause of the comments feed query before sending.
@@ -2460,7 +2460,7 @@ 
 				 * @param string   $cgroupby The GROUP BY clause of the query.
 				 * @param WP_Query &$this    The WP_Query instance (passed by reference).
 				 */
-				$cgroupby = apply_filters_ref_array( 'comment_feed_groupby', array( $cgroupby, &$this ) );
+				$cgroupby = apply_filters_ref_array('comment_feed_groupby', array($cgroupby, &$this));
 
 				/**
 				 * Filters the ORDER BY clause of the comments feed query before sending.
@@ -2470,7 +2470,7 @@ 
 				 * @param string   $corderby The ORDER BY clause of the query.
 				 * @param WP_Query &$this    The WP_Query instance (passed by reference).
 				 */
-				$corderby = apply_filters_ref_array( 'comment_feed_orderby', array( 'comment_date_gmt DESC', &$this ) );
+				$corderby = apply_filters_ref_array('comment_feed_orderby', array('comment_date_gmt DESC', &$this));
 
 				/**
 				 * Filters the LIMIT clause of the comments feed query before sending.
@@ -2480,37 +2480,37 @@ 
 				 * @param string   $climits The JOIN clause of the query.
 				 * @param WP_Query &$this   The WP_Query instance (passed by reference).
 				 */
-				$climits = apply_filters_ref_array( 'comment_feed_limits', array( 'LIMIT ' . get_option('posts_per_rss'), &$this ) );
+				$climits = apply_filters_ref_array('comment_feed_limits', array('LIMIT '.get_option('posts_per_rss'), &$this));
 			}
-			$cgroupby = ( ! empty( $cgroupby ) ) ? 'GROUP BY ' . $cgroupby : '';
-			$corderby = ( ! empty( $corderby ) ) ? 'ORDER BY ' . $corderby : '';
+			$cgroupby = ( ! empty($cgroupby)) ? 'GROUP BY '.$cgroupby : '';
+			$corderby = ( ! empty($corderby)) ? 'ORDER BY '.$corderby : '';
 
 			$comments = (array) $wpdb->get_results("SELECT $distinct {$wpdb->comments}.* FROM {$wpdb->comments} $cjoin $cwhere $cgroupby $corderby $climits");
 			// Convert to WP_Comment
-			$this->comments = array_map( 'get_comment', $comments );
+			$this->comments = array_map('get_comment', $comments);
 			$this->comment_count = count($this->comments);
 
 			$post_ids = array();
 
-			foreach ( $this->comments as $comment )
+			foreach ($this->comments as $comment)
 				$post_ids[] = (int) $comment->comment_post_ID;
 
 			$post_ids = join(',', $post_ids);
 			$join = '';
-			if ( $post_ids ) {
+			if ($post_ids) {
 				$where = "AND {$wpdb->posts}.ID IN ($post_ids) ";
 			} else {
 				$where = "AND 0";
 			}
 		}
 
-		$pieces = array( 'where', 'groupby', 'join', 'orderby', 'distinct', 'fields', 'limits' );
+		$pieces = array('where', 'groupby', 'join', 'orderby', 'distinct', 'fields', 'limits');
 
 		/*
 		 * Apply post-paging filters on where and join. Only plugins that
 		 * manipulate paging queries should use these hooks.
 		 */
-		if ( !$q['suppress_filters'] ) {
+		if ( ! $q['suppress_filters']) {
 			/**
 			 * Filters the WHERE clause of the query.
 			 *
@@ -2521,7 +2521,7 @@ 
 			 * @param string   $where The WHERE clause of the query.
 			 * @param WP_Query &$this The WP_Query instance (passed by reference).
 			 */
-			$where = apply_filters_ref_array( 'posts_where_paged', array( $where, &$this ) );
+			$where = apply_filters_ref_array('posts_where_paged', array($where, &$this));
 
 			/**
 			 * Filters the GROUP BY clause of the query.
@@ -2531,7 +2531,7 @@ 
 			 * @param string   $groupby The GROUP BY clause of the query.
 			 * @param WP_Query &$this   The WP_Query instance (passed by reference).
 			 */
-			$groupby = apply_filters_ref_array( 'posts_groupby', array( $groupby, &$this ) );
+			$groupby = apply_filters_ref_array('posts_groupby', array($groupby, &$this));
 
 			/**
 			 * Filters the JOIN clause of the query.
@@ -2543,7 +2543,7 @@ 
 			 * @param string   $join  The JOIN clause of the query.
 			 * @param WP_Query &$this The WP_Query instance (passed by reference).
 			 */
-			$join = apply_filters_ref_array( 'posts_join_paged', array( $join, &$this ) );
+			$join = apply_filters_ref_array('posts_join_paged', array($join, &$this));
 
 			/**
 			 * Filters the ORDER BY clause of the query.
@@ -2553,7 +2553,7 @@ 
 			 * @param string   $orderby The ORDER BY clause of the query.
 			 * @param WP_Query &$this   The WP_Query instance (passed by reference).
 			 */
-			$orderby = apply_filters_ref_array( 'posts_orderby', array( $orderby, &$this ) );
+			$orderby = apply_filters_ref_array('posts_orderby', array($orderby, &$this));
 
 			/**
 			 * Filters the DISTINCT clause of the query.
@@ -2563,7 +2563,7 @@ 
 			 * @param string   $distinct The DISTINCT clause of the query.
 			 * @param WP_Query &$this    The WP_Query instance (passed by reference).
 			 */
-			$distinct = apply_filters_ref_array( 'posts_distinct', array( $distinct, &$this ) );
+			$distinct = apply_filters_ref_array('posts_distinct', array($distinct, &$this));
 
 			/**
 			 * Filters the LIMIT clause of the query.
@@ -2573,7 +2573,7 @@ 
 			 * @param string   $limits The LIMIT clause of the query.
 			 * @param WP_Query &$this  The WP_Query instance (passed by reference).
 			 */
-			$limits = apply_filters_ref_array( 'post_limits', array( $limits, &$this ) );
+			$limits = apply_filters_ref_array('post_limits', array($limits, &$this));
 
 			/**
 			 * Filters the SELECT clause of the query.
@@ -2583,7 +2583,7 @@ 
 			 * @param string   $fields The SELECT clause of the query.
 			 * @param WP_Query &$this  The WP_Query instance (passed by reference).
 			 */
-			$fields = apply_filters_ref_array( 'posts_fields', array( $fields, &$this ) );
+			$fields = apply_filters_ref_array('posts_fields', array($fields, &$this));
 
 			/**
 			 * Filters all query clauses at once, for convenience.
@@ -2596,15 +2596,15 @@ 
 			 * @param array    $clauses The list of clauses for the query.
 			 * @param WP_Query &$this   The WP_Query instance (passed by reference).
 			 */
-			$clauses = (array) apply_filters_ref_array( 'posts_clauses', array( compact( $pieces ), &$this ) );
-
-			$where = isset( $clauses[ 'where' ] ) ? $clauses[ 'where' ] : '';
-			$groupby = isset( $clauses[ 'groupby' ] ) ? $clauses[ 'groupby' ] : '';
-			$join = isset( $clauses[ 'join' ] ) ? $clauses[ 'join' ] : '';
-			$orderby = isset( $clauses[ 'orderby' ] ) ? $clauses[ 'orderby' ] : '';
-			$distinct = isset( $clauses[ 'distinct' ] ) ? $clauses[ 'distinct' ] : '';
-			$fields = isset( $clauses[ 'fields' ] ) ? $clauses[ 'fields' ] : '';
-			$limits = isset( $clauses[ 'limits' ] ) ? $clauses[ 'limits' ] : '';
+			$clauses = (array) apply_filters_ref_array('posts_clauses', array(compact($pieces), &$this));
+
+			$where = isset($clauses['where']) ? $clauses['where'] : '';
+			$groupby = isset($clauses['groupby']) ? $clauses['groupby'] : '';
+			$join = isset($clauses['join']) ? $clauses['join'] : '';
+			$orderby = isset($clauses['orderby']) ? $clauses['orderby'] : '';
+			$distinct = isset($clauses['distinct']) ? $clauses['distinct'] : '';
+			$fields = isset($clauses['fields']) ? $clauses['fields'] : '';
+			$limits = isset($clauses['limits']) ? $clauses['limits'] : '';
 		}
 
 		/**
@@ -2616,13 +2616,13 @@ 
 		 *
 		 * @param string $selection The assembled selection query.
 		 */
-		do_action( 'posts_selection', $where . $groupby . $orderby . $limits . $join );
+		do_action('posts_selection', $where.$groupby.$orderby.$limits.$join);
 
 		/*
 		 * Filters again for the benefit of caching plugins.
 		 * Regular plugins should use the hooks above.
 		 */
-		if ( !$q['suppress_filters'] ) {
+		if ( ! $q['suppress_filters']) {
 			/**
 			 * Filters the WHERE clause of the query.
 			 *
@@ -2633,7 +2633,7 @@ 
 			 * @param string   $where The WHERE clause of the query.
 			 * @param WP_Query &$this The WP_Query instance (passed by reference).
 			 */
-			$where = apply_filters_ref_array( 'posts_where_request', array( $where, &$this ) );
+			$where = apply_filters_ref_array('posts_where_request', array($where, &$this));
 
 			/**
 			 * Filters the GROUP BY clause of the query.
@@ -2645,7 +2645,7 @@ 
 			 * @param string   $groupby The GROUP BY clause of the query.
 			 * @param WP_Query &$this   The WP_Query instance (passed by reference).
 			 */
-			$groupby = apply_filters_ref_array( 'posts_groupby_request', array( $groupby, &$this ) );
+			$groupby = apply_filters_ref_array('posts_groupby_request', array($groupby, &$this));
 
 			/**
 			 * Filters the JOIN clause of the query.
@@ -2657,7 +2657,7 @@ 
 			 * @param string   $join  The JOIN clause of the query.
 			 * @param WP_Query &$this The WP_Query instance (passed by reference).
 			 */
-			$join = apply_filters_ref_array( 'posts_join_request', array( $join, &$this ) );
+			$join = apply_filters_ref_array('posts_join_request', array($join, &$this));
 
 			/**
 			 * Filters the ORDER BY clause of the query.
@@ -2669,7 +2669,7 @@ 
 			 * @param string   $orderby The ORDER BY clause of the query.
 			 * @param WP_Query &$this   The WP_Query instance (passed by reference).
 			 */
-			$orderby = apply_filters_ref_array( 'posts_orderby_request', array( $orderby, &$this ) );
+			$orderby = apply_filters_ref_array('posts_orderby_request', array($orderby, &$this));
 
 			/**
 			 * Filters the DISTINCT clause of the query.
@@ -2681,7 +2681,7 @@ 
 			 * @param string   $distinct The DISTINCT clause of the query.
 			 * @param WP_Query &$this    The WP_Query instance (passed by reference).
 			 */
-			$distinct = apply_filters_ref_array( 'posts_distinct_request', array( $distinct, &$this ) );
+			$distinct = apply_filters_ref_array('posts_distinct_request', array($distinct, &$this));
 
 			/**
 			 * Filters the SELECT clause of the query.
@@ -2693,7 +2693,7 @@ 
 			 * @param string   $fields The SELECT clause of the query.
 			 * @param WP_Query &$this  The WP_Query instance (passed by reference).
 			 */
-			$fields = apply_filters_ref_array( 'posts_fields_request', array( $fields, &$this ) );
+			$fields = apply_filters_ref_array('posts_fields_request', array($fields, &$this));
 
 			/**
 			 * Filters the LIMIT clause of the query.
@@ -2705,7 +2705,7 @@ 
 			 * @param string   $limits The LIMIT clause of the query.
 			 * @param WP_Query &$this  The WP_Query instance (passed by reference).
 			 */
-			$limits = apply_filters_ref_array( 'post_limits_request', array( $limits, &$this ) );
+			$limits = apply_filters_ref_array('post_limits_request', array($limits, &$this));
 
 			/**
 			 * Filters all query clauses at once, for convenience.
@@ -2720,29 +2720,29 @@ 
 			 * @param array    $pieces The pieces of the query.
 			 * @param WP_Query &$this  The WP_Query instance (passed by reference).
 			 */
-			$clauses = (array) apply_filters_ref_array( 'posts_clauses_request', array( compact( $pieces ), &$this ) );
-
-			$where = isset( $clauses[ 'where' ] ) ? $clauses[ 'where' ] : '';
-			$groupby = isset( $clauses[ 'groupby' ] ) ? $clauses[ 'groupby' ] : '';
-			$join = isset( $clauses[ 'join' ] ) ? $clauses[ 'join' ] : '';
-			$orderby = isset( $clauses[ 'orderby' ] ) ? $clauses[ 'orderby' ] : '';
-			$distinct = isset( $clauses[ 'distinct' ] ) ? $clauses[ 'distinct' ] : '';
-			$fields = isset( $clauses[ 'fields' ] ) ? $clauses[ 'fields' ] : '';
-			$limits = isset( $clauses[ 'limits' ] ) ? $clauses[ 'limits' ] : '';
+			$clauses = (array) apply_filters_ref_array('posts_clauses_request', array(compact($pieces), &$this));
+
+			$where = isset($clauses['where']) ? $clauses['where'] : '';
+			$groupby = isset($clauses['groupby']) ? $clauses['groupby'] : '';
+			$join = isset($clauses['join']) ? $clauses['join'] : '';
+			$orderby = isset($clauses['orderby']) ? $clauses['orderby'] : '';
+			$distinct = isset($clauses['distinct']) ? $clauses['distinct'] : '';
+			$fields = isset($clauses['fields']) ? $clauses['fields'] : '';
+			$limits = isset($clauses['limits']) ? $clauses['limits'] : '';
 		}
 
-		if ( ! empty($groupby) )
-			$groupby = 'GROUP BY ' . $groupby;
-		if ( !empty( $orderby ) )
-			$orderby = 'ORDER BY ' . $orderby;
+		if ( ! empty($groupby))
+			$groupby = 'GROUP BY '.$groupby;
+		if ( ! empty($orderby))
+			$orderby = 'ORDER BY '.$orderby;
 
 		$found_rows = '';
-		if ( !$q['no_found_rows'] && !empty($limits) )
+		if ( ! $q['no_found_rows'] && ! empty($limits))
 			$found_rows = 'SQL_CALC_FOUND_ROWS';
 
 		$this->request = $old_request = "SELECT $found_rows $distinct $fields FROM {$wpdb->posts} $join WHERE 1=1 $where $groupby $orderby $limits";
 
-		if ( !$q['suppress_filters'] ) {
+		if ( ! $q['suppress_filters']) {
 			/**
 			 * Filters the completed SQL query before sending.
 			 *
@@ -2751,7 +2751,7 @@ 
 			 * @param string   $request The complete SQL query.
 			 * @param WP_Query &$this   The WP_Query instance (passed by reference).
 			 */
-			$this->request = apply_filters_ref_array( 'posts_request', array( $this->request, &$this ) );
+			$this->request = apply_filters_ref_array('posts_request', array($this->request, &$this));
 		}
 
 		/**
@@ -2770,41 +2770,41 @@ 
 		 *                          or null to allow WP to run its normal queries.
 		 * @param WP_Query   $this  The WP_Query instance, passed by reference.
 		 */
-		$this->posts = apply_filters_ref_array( 'posts_pre_query', array( null, &$this ) );
+		$this->posts = apply_filters_ref_array('posts_pre_query', array(null, &$this));
 
-		if ( 'ids' == $q['fields'] ) {
-			if ( null === $this->posts ) {
-				$this->posts = $wpdb->get_col( $this->request );
+		if ('ids' == $q['fields']) {
+			if (null === $this->posts) {
+				$this->posts = $wpdb->get_col($this->request);
 			}
 
-			$this->posts = array_map( 'intval', $this->posts );
-			$this->post_count = count( $this->posts );
-			$this->set_found_posts( $q, $limits );
+			$this->posts = array_map('intval', $this->posts);
+			$this->post_count = count($this->posts);
+			$this->set_found_posts($q, $limits);
 
 			return $this->posts;
 		}
 
-		if ( 'id=>parent' == $q['fields'] ) {
-			if ( null === $this->posts ) {
-				$this->posts = $wpdb->get_results( $this->request );
+		if ('id=>parent' == $q['fields']) {
+			if (null === $this->posts) {
+				$this->posts = $wpdb->get_results($this->request);
 			}
 
-			$this->post_count = count( $this->posts );
-			$this->set_found_posts( $q, $limits );
+			$this->post_count = count($this->posts);
+			$this->set_found_posts($q, $limits);
 
 			$r = array();
-			foreach ( $this->posts as $key => $post ) {
-				$this->posts[ $key ]->ID = (int) $post->ID;
-				$this->posts[ $key ]->post_parent = (int) $post->post_parent;
+			foreach ($this->posts as $key => $post) {
+				$this->posts[$key]->ID = (int) $post->ID;
+				$this->posts[$key]->post_parent = (int) $post->post_parent;
 
-				$r[ (int) $post->ID ] = (int) $post->post_parent;
+				$r[(int) $post->ID] = (int) $post->post_parent;
 			}
 
 			return $r;
 		}
 
-		if ( null === $this->posts ) {
-			$split_the_query = ( $old_request == $this->request && "{$wpdb->posts}.*" == $fields && !empty( $limits ) && $q['posts_per_page'] < 500 );
+		if (null === $this->posts) {
+			$split_the_query = ($old_request == $this->request && "{$wpdb->posts}.*" == $fields && ! empty($limits) && $q['posts_per_page'] < 500);
 
 			/**
 			 * Filters whether to split the query.
@@ -2818,9 +2818,9 @@ 
 			 * @param bool     $split_the_query Whether or not to split the query.
 			 * @param WP_Query $this            The WP_Query instance.
 			 */
-			$split_the_query = apply_filters( 'split_the_query', $split_the_query, $this );
+			$split_the_query = apply_filters('split_the_query', $split_the_query, $this);
 
-			if ( $split_the_query ) {
+			if ($split_the_query) {
 				// First get the IDs and then fill in the objects
 
 				$this->request = "SELECT $found_rows $distinct {$wpdb->posts}.ID FROM {$wpdb->posts} $join WHERE 1=1 $where $groupby $orderby $limits";
@@ -2833,29 +2833,29 @@ 
 				 * @param string   $request The post ID request.
 				 * @param WP_Query $this    The WP_Query instance.
 				 */
-				$this->request = apply_filters( 'posts_request_ids', $this->request, $this );
+				$this->request = apply_filters('posts_request_ids', $this->request, $this);
 
-				$ids = $wpdb->get_col( $this->request );
+				$ids = $wpdb->get_col($this->request);
 
-				if ( $ids ) {
+				if ($ids) {
 					$this->posts = $ids;
-					$this->set_found_posts( $q, $limits );
-					_prime_post_caches( $ids, $q['update_post_term_cache'], $q['update_post_meta_cache'] );
+					$this->set_found_posts($q, $limits);
+					_prime_post_caches($ids, $q['update_post_term_cache'], $q['update_post_meta_cache']);
 				} else {
 					$this->posts = array();
 				}
 			} else {
-				$this->posts = $wpdb->get_results( $this->request );
-				$this->set_found_posts( $q, $limits );
+				$this->posts = $wpdb->get_results($this->request);
+				$this->set_found_posts($q, $limits);
 			}
 		}
 
 		// Convert to WP_Post objects.
-		if ( $this->posts ) {
-			$this->posts = array_map( 'get_post', $this->posts );
+		if ($this->posts) {
+			$this->posts = array_map('get_post', $this->posts);
 		}
 
-		if ( ! $q['suppress_filters'] ) {
+		if ( ! $q['suppress_filters']) {
 			/**
 			 * Filters the raw post results array, prior to status checks.
 			 *
@@ -2864,38 +2864,38 @@ 
 			 * @param array    $posts The post results array.
 			 * @param WP_Query &$this The WP_Query instance (passed by reference).
 			 */
-			$this->posts = apply_filters_ref_array( 'posts_results', array( $this->posts, &$this ) );
+			$this->posts = apply_filters_ref_array('posts_results', array($this->posts, &$this));
 		}
 
-		if ( !empty($this->posts) && $this->is_comment_feed && $this->is_singular ) {
+		if ( ! empty($this->posts) && $this->is_comment_feed && $this->is_singular) {
 			/** This filter is documented in wp-includes/query.php */
-			$cjoin = apply_filters_ref_array( 'comment_feed_join', array( '', &$this ) );
+			$cjoin = apply_filters_ref_array('comment_feed_join', array('', &$this));
 
 			/** This filter is documented in wp-includes/query.php */
-			$cwhere = apply_filters_ref_array( 'comment_feed_where', array( "WHERE comment_post_ID = '{$this->posts[0]->ID}' AND comment_approved = '1'", &$this ) );
+			$cwhere = apply_filters_ref_array('comment_feed_where', array("WHERE comment_post_ID = '{$this->posts[0]->ID}' AND comment_approved = '1'", &$this));
 
 			/** This filter is documented in wp-includes/query.php */
-			$cgroupby = apply_filters_ref_array( 'comment_feed_groupby', array( '', &$this ) );
-			$cgroupby = ( ! empty( $cgroupby ) ) ? 'GROUP BY ' . $cgroupby : '';
+			$cgroupby = apply_filters_ref_array('comment_feed_groupby', array('', &$this));
+			$cgroupby = ( ! empty($cgroupby)) ? 'GROUP BY '.$cgroupby : '';
 
 			/** This filter is documented in wp-includes/query.php */
-			$corderby = apply_filters_ref_array( 'comment_feed_orderby', array( 'comment_date_gmt DESC', &$this ) );
-			$corderby = ( ! empty( $corderby ) ) ? 'ORDER BY ' . $corderby : '';
+			$corderby = apply_filters_ref_array('comment_feed_orderby', array('comment_date_gmt DESC', &$this));
+			$corderby = ( ! empty($corderby)) ? 'ORDER BY '.$corderby : '';
 
 			/** This filter is documented in wp-includes/query.php */
-			$climits = apply_filters_ref_array( 'comment_feed_limits', array( 'LIMIT ' . get_option('posts_per_rss'), &$this ) );
+			$climits = apply_filters_ref_array('comment_feed_limits', array('LIMIT '.get_option('posts_per_rss'), &$this));
 
 			$comments_request = "SELECT {$wpdb->comments}.* FROM {$wpdb->comments} $cjoin $cwhere $cgroupby $corderby $climits";
 			$comments = $wpdb->get_results($comments_request);
 			// Convert to WP_Comment
-			$this->comments = array_map( 'get_comment', $comments );
+			$this->comments = array_map('get_comment', $comments);
 			$this->comment_count = count($this->comments);
 		}
 
 		// Check post status to determine if post should be displayed.
-		if ( !empty($this->posts) && ($this->is_single || $this->is_page) ) {
+		if ( ! empty($this->posts) && ($this->is_single || $this->is_page)) {
 			$status = get_post_status($this->posts[0]);
-			if ( 'attachment' === $this->posts[0]->post_type && 0 === (int) $this->posts[0]->post_parent ) {
+			if ('attachment' === $this->posts[0]->post_type && 0 === (int) $this->posts[0]->post_parent) {
 				$this->is_page = false;
 				$this->is_single = true;
 				$this->is_attachment = true;
@@ -2903,23 +2903,23 @@ 
 			$post_status_obj = get_post_status_object($status);
 
 			// If the post_status was specifically requested, let it pass through.
-			if ( !$post_status_obj->public && ! in_array( $status, $q_status ) ) {
+			if ( ! $post_status_obj->public && ! in_array($status, $q_status)) {
 
-				if ( ! is_user_logged_in() ) {
+				if ( ! is_user_logged_in()) {
 					// User must be logged in to view unpublished posts.
 					$this->posts = array();
 				} else {
-					if  ( $post_status_obj->protected ) {
+					if ($post_status_obj->protected) {
 						// User must have edit permissions on the draft to preview.
-						if ( ! current_user_can($edit_cap, $this->posts[0]->ID) ) {
+						if ( ! current_user_can($edit_cap, $this->posts[0]->ID)) {
 							$this->posts = array();
 						} else {
 							$this->is_preview = true;
-							if ( 'future' != $status )
+							if ('future' != $status)
 								$this->posts[0]->post_date = current_time('mysql');
 						}
-					} elseif ( $post_status_obj->private ) {
-						if ( ! current_user_can($read_cap, $this->posts[0]->ID) )
+					} elseif ($post_status_obj->private) {
+						if ( ! current_user_can($read_cap, $this->posts[0]->ID))
 							$this->posts = array();
 					} else {
 						$this->posts = array();
@@ -2927,7 +2927,7 @@ 
 				}
 			}
 
-			if ( $this->is_preview && $this->posts && current_user_can( $edit_cap, $this->posts[0]->ID ) ) {
+			if ($this->is_preview && $this->posts && current_user_can($edit_cap, $this->posts[0]->ID)) {
 				/**
 				 * Filters the single post for preview mode.
 				 *
@@ -2936,18 +2936,18 @@ 
 				 * @param WP_Post  $post_preview  The Post object.
 				 * @param WP_Query &$this         The WP_Query instance (passed by reference).
 				 */
-				$this->posts[0] = get_post( apply_filters_ref_array( 'the_preview', array( $this->posts[0], &$this ) ) );
+				$this->posts[0] = get_post(apply_filters_ref_array('the_preview', array($this->posts[0], &$this)));
 			}
 		}
 
 		// Put sticky posts at the top of the posts array
 		$sticky_posts = get_option('sticky_posts');
-		if ( $this->is_home && $page <= 1 && is_array($sticky_posts) && !empty($sticky_posts) && !$q['ignore_sticky_posts'] ) {
+		if ($this->is_home && $page <= 1 && is_array($sticky_posts) && ! empty($sticky_posts) && ! $q['ignore_sticky_posts']) {
 			$num_posts = count($this->posts);
 			$sticky_offset = 0;
 			// Loop over posts and relocate stickies to the front.
-			for ( $i = 0; $i < $num_posts; $i++ ) {
-				if ( in_array($this->posts[$i]->ID, $sticky_posts) ) {
+			for ($i = 0; $i < $num_posts; $i++) {
+				if (in_array($this->posts[$i]->ID, $sticky_posts)) {
 					$sticky_post = $this->posts[$i];
 					// Remove sticky from current position
 					array_splice($this->posts, $i, 1);
@@ -2957,36 +2957,36 @@ 
 					$sticky_offset++;
 					// Remove post from sticky posts array
 					$offset = array_search($sticky_post->ID, $sticky_posts);
-					unset( $sticky_posts[$offset] );
+					unset($sticky_posts[$offset]);
 				}
 			}
 
 			// If any posts have been excluded specifically, Ignore those that are sticky.
-			if ( !empty($sticky_posts) && !empty($q['post__not_in']) )
+			if ( ! empty($sticky_posts) && ! empty($q['post__not_in']))
 				$sticky_posts = array_diff($sticky_posts, $q['post__not_in']);
 
 			// Fetch sticky posts that weren't in the query results
-			if ( !empty($sticky_posts) ) {
-				$stickies = get_posts( array(
+			if ( ! empty($sticky_posts)) {
+				$stickies = get_posts(array(
 					'post__in' => $sticky_posts,
 					'post_type' => $post_type,
 					'post_status' => 'publish',
 					'nopaging' => true
-				) );
+				));
 
-				foreach ( $stickies as $sticky_post ) {
-					array_splice( $this->posts, $sticky_offset, 0, array( $sticky_post ) );
+				foreach ($stickies as $sticky_post) {
+					array_splice($this->posts, $sticky_offset, 0, array($sticky_post));
 					$sticky_offset++;
 				}
 			}
 		}
 
 		// If comments have been fetched as part of the query, make sure comment meta lazy-loading is set up.
-		if ( ! empty( $this->comments ) ) {
-			wp_queue_comments_for_comment_meta_lazyload( $this->comments );
+		if ( ! empty($this->comments)) {
+			wp_queue_comments_for_comment_meta_lazyload($this->comments);
 		}
 
-		if ( ! $q['suppress_filters'] ) {
+		if ( ! $q['suppress_filters']) {
 			/**
 			 * Filters the array of retrieved posts after they've been fetched and
 			 * internally processed.
@@ -2996,27 +2996,27 @@ 
 			 * @param array    $posts The array of retrieved posts.
 			 * @param WP_Query &$this The WP_Query instance (passed by reference).
 			 */
-			$this->posts = apply_filters_ref_array( 'the_posts', array( $this->posts, &$this ) );
+			$this->posts = apply_filters_ref_array('the_posts', array($this->posts, &$this));
 		}
 
 		// Ensure that any posts added/modified via one of the filters above are
 		// of the type WP_Post and are filtered.
-		if ( $this->posts ) {
-			$this->post_count = count( $this->posts );
+		if ($this->posts) {
+			$this->post_count = count($this->posts);
 
-			$this->posts = array_map( 'get_post', $this->posts );
+			$this->posts = array_map('get_post', $this->posts);
 
-			if ( $q['cache_results'] )
+			if ($q['cache_results'])
 				update_post_caches($this->posts, $post_type, $q['update_post_term_cache'], $q['update_post_meta_cache']);
 
-			$this->post = reset( $this->posts );
+			$this->post = reset($this->posts);
 		} else {
 			$this->post_count = 0;
 			$this->posts = array();
 		}
 
-		if ( $q['lazy_load_term_meta'] ) {
-			wp_queue_posts_for_term_meta_lazyload( $this->posts );
+		if ($q['lazy_load_term_meta']) {
+			wp_queue_posts_for_term_meta_lazyload($this->posts);
 		}
 
 		return $this->posts;
@@ -3032,14 +3032,14 @@ 
 	 * @param array  $q      Query variables.
 	 * @param string $limits LIMIT clauses of the query.
 	 */
-	private function set_found_posts( $q, $limits ) {
+	private function set_found_posts($q, $limits) {
 		global $wpdb;
 		// Bail if posts is an empty array. Continue if posts is an empty string,
 		// null, or false to accommodate caching plugins that fill posts later.
-		if ( $q['no_found_rows'] || ( is_array( $this->posts ) && ! $this->posts ) )
+		if ($q['no_found_rows'] || (is_array($this->posts) && ! $this->posts))
 			return;
 
-		if ( ! empty( $limits ) ) {
+		if ( ! empty($limits)) {
 			/**
 			 * Filters the query to run for retrieving the found posts.
 			 *
@@ -3048,9 +3048,9 @@ 
 			 * @param string   $found_posts The query to run to find the found posts.
 			 * @param WP_Query &$this       The WP_Query instance (passed by reference).
 			 */
-			$this->found_posts = $wpdb->get_var( apply_filters_ref_array( 'found_posts_query', array( 'SELECT FOUND_ROWS()', &$this ) ) );
+			$this->found_posts = $wpdb->get_var(apply_filters_ref_array('found_posts_query', array('SELECT FOUND_ROWS()', &$this)));
 		} else {
-			$this->found_posts = count( $this->posts );
+			$this->found_posts = count($this->posts);
 		}
 
 		/**
@@ -3061,10 +3061,10 @@ 
 		 * @param int      $found_posts The number of posts found.
 		 * @param WP_Query &$this       The WP_Query instance (passed by reference).
 		 */
-		$this->found_posts = apply_filters_ref_array( 'found_posts', array( $this->found_posts, &$this ) );
+		$this->found_posts = apply_filters_ref_array('found_posts', array($this->found_posts, &$this));
 
-		if ( ! empty( $limits ) )
-			$this->max_num_pages = ceil( $this->found_posts / $q['posts_per_page'] );
+		if ( ! empty($limits))
+			$this->max_num_pages = ceil($this->found_posts / $q['posts_per_page']);
 	}
 
 	/**
@@ -3098,7 +3098,7 @@ 
 		global $post;
 		$this->in_the_loop = true;
 
-		if ( $this->current_post == -1 ) // loop has just started
+		if ($this->current_post == -1) // loop has just started
 			/**
 			 * Fires once the loop is started.
 			 *
@@ -3106,10 +3106,10 @@ 
 			 *
 			 * @param WP_Query &$this The WP_Query instance (passed by reference).
 			 */
-			do_action_ref_array( 'loop_start', array( &$this ) );
+			do_action_ref_array('loop_start', array(&$this));
 
 		$post = $this->next_post();
-		$this->setup_postdata( $post );
+		$this->setup_postdata($post);
 	}
 
 	/**
@@ -3123,9 +3123,9 @@ 
 	 * @return bool True if posts are available, false if end of loop.
 	 */
 	public function have_posts() {
-		if ( $this->current_post + 1 < $this->post_count ) {
+		if ($this->current_post + 1 < $this->post_count) {
 			return true;
-		} elseif ( $this->current_post + 1 == $this->post_count && $this->post_count > 0 ) {
+		} elseif ($this->current_post + 1 == $this->post_count && $this->post_count > 0) {
 			/**
 			 * Fires once the loop has ended.
 			 *
@@ -3133,7 +3133,7 @@ 
 			 *
 			 * @param WP_Query &$this The WP_Query instance (passed by reference).
 			 */
-			do_action_ref_array( 'loop_end', array( &$this ) );
+			do_action_ref_array('loop_end', array(&$this));
 			// Do some cleaning up after the loop
 			$this->rewind_posts();
 		}
@@ -3150,7 +3150,7 @@ 
 	 */
 	public function rewind_posts() {
 		$this->current_post = -1;
-		if ( $this->post_count > 0 ) {
+		if ($this->post_count > 0) {
 			$this->post = $this->posts[0];
 		}
 	}
@@ -3182,13 +3182,13 @@ 
 
 		$comment = $this->next_comment();
 
-		if ( $this->current_comment == 0 ) {
+		if ($this->current_comment == 0) {
 			/**
 			 * Fires once the comment loop is started.
 			 *
 			 * @since 2.2.0
 			 */
-			do_action( 'comment_loop_start' );
+			do_action('comment_loop_start');
 		}
 	}
 
@@ -3203,9 +3203,9 @@ 
 	 * @return bool True, if more comments. False, if no more posts.
 	 */
 	public function have_comments() {
-		if ( $this->current_comment + 1 < $this->comment_count ) {
+		if ($this->current_comment + 1 < $this->comment_count) {
 			return true;
-		} elseif ( $this->current_comment + 1 == $this->comment_count ) {
+		} elseif ($this->current_comment + 1 == $this->comment_count) {
 			$this->rewind_comments();
 		}
 
@@ -3220,7 +3220,7 @@ 
 	 */
 	public function rewind_comments() {
 		$this->current_comment = -1;
-		if ( $this->comment_count > 0 ) {
+		if ($this->comment_count > 0) {
 			$this->comment = $this->comments[0];
 		}
 	}
@@ -3234,9 +3234,9 @@ 
 	 * @param string|array $query URL query string or array of query arguments.
 	 * @return array List of posts.
 	 */
-	public function query( $query ) {
+	public function query($query) {
 		$this->init();
-		$this->query = $this->query_vars = wp_parse_args( $query );
+		$this->query = $this->query_vars = wp_parse_args($query);
 		return $this->get_posts();
 	}
 
@@ -3253,64 +3253,64 @@ 
 	 * @return object
 	 */
 	public function get_queried_object() {
-		if ( isset($this->queried_object) )
+		if (isset($this->queried_object))
 			return $this->queried_object;
 
 		$this->queried_object = null;
 		$this->queried_object_id = null;
 
-		if ( $this->is_category || $this->is_tag || $this->is_tax ) {
-			if ( $this->is_category ) {
-				if ( $this->get( 'cat' ) ) {
-					$term = get_term( $this->get( 'cat' ), 'category' );
-				} elseif ( $this->get( 'category_name' ) ) {
-					$term = get_term_by( 'slug', $this->get( 'category_name' ), 'category' );
+		if ($this->is_category || $this->is_tag || $this->is_tax) {
+			if ($this->is_category) {
+				if ($this->get('cat')) {
+					$term = get_term($this->get('cat'), 'category');
+				} elseif ($this->get('category_name')) {
+					$term = get_term_by('slug', $this->get('category_name'), 'category');
 				}
-			} elseif ( $this->is_tag ) {
-				if ( $this->get( 'tag_id' ) ) {
-					$term = get_term( $this->get( 'tag_id' ), 'post_tag' );
-				} elseif ( $this->get( 'tag' ) ) {
-					$term = get_term_by( 'slug', $this->get( 'tag' ), 'post_tag' );
+			} elseif ($this->is_tag) {
+				if ($this->get('tag_id')) {
+					$term = get_term($this->get('tag_id'), 'post_tag');
+				} elseif ($this->get('tag')) {
+					$term = get_term_by('slug', $this->get('tag'), 'post_tag');
 				}
 			} else {
 				// For other tax queries, grab the first term from the first clause.
-				if ( ! empty( $this->tax_query->queried_terms ) ) {
-					$queried_taxonomies = array_keys( $this->tax_query->queried_terms );
-					$matched_taxonomy = reset( $queried_taxonomies );
-					$query = $this->tax_query->queried_terms[ $matched_taxonomy ];
-
-					if ( ! empty( $query['terms'] ) ) {
-						if ( 'term_id' == $query['field'] ) {
-							$term = get_term( reset( $query['terms'] ), $matched_taxonomy );
+				if ( ! empty($this->tax_query->queried_terms)) {
+					$queried_taxonomies = array_keys($this->tax_query->queried_terms);
+					$matched_taxonomy = reset($queried_taxonomies);
+					$query = $this->tax_query->queried_terms[$matched_taxonomy];
+
+					if ( ! empty($query['terms'])) {
+						if ('term_id' == $query['field']) {
+							$term = get_term(reset($query['terms']), $matched_taxonomy);
 						} else {
-							$term = get_term_by( $query['field'], reset( $query['terms'] ), $matched_taxonomy );
+							$term = get_term_by($query['field'], reset($query['terms']), $matched_taxonomy);
 						}
 					}
 				}
 			}
 
-			if ( ! empty( $term ) && ! is_wp_error( $term ) )  {
+			if ( ! empty($term) && ! is_wp_error($term)) {
 				$this->queried_object = $term;
 				$this->queried_object_id = (int) $term->term_id;
 
-				if ( $this->is_category && 'category' === $this->queried_object->taxonomy )
-					_make_cat_compat( $this->queried_object );
+				if ($this->is_category && 'category' === $this->queried_object->taxonomy)
+					_make_cat_compat($this->queried_object);
 			}
-		} elseif ( $this->is_post_type_archive ) {
-			$post_type = $this->get( 'post_type' );
-			if ( is_array( $post_type ) )
-				$post_type = reset( $post_type );
-			$this->queried_object = get_post_type_object( $post_type );
-		} elseif ( $this->is_posts_page ) {
+		} elseif ($this->is_post_type_archive) {
+			$post_type = $this->get('post_type');
+			if (is_array($post_type))
+				$post_type = reset($post_type);
+			$this->queried_object = get_post_type_object($post_type);
+		} elseif ($this->is_posts_page) {
 			$page_for_posts = get_option('page_for_posts');
-			$this->queried_object = get_post( $page_for_posts );
+			$this->queried_object = get_post($page_for_posts);
 			$this->queried_object_id = (int) $this->queried_object->ID;
-		} elseif ( $this->is_singular && ! empty( $this->post ) ) {
+		} elseif ($this->is_singular && ! empty($this->post)) {
 			$this->queried_object = $this->post;
 			$this->queried_object_id = (int) $this->post->ID;
-		} elseif ( $this->is_author ) {
+		} elseif ($this->is_author) {
 			$this->queried_object_id = (int) $this->get('author');
-			$this->queried_object = get_userdata( $this->queried_object_id );
+			$this->queried_object = get_userdata($this->queried_object_id);
 		}
 
 		return $this->queried_object;
@@ -3327,7 +3327,7 @@ 
 	public function get_queried_object_id() {
 		$this->get_queried_object();
 
-		if ( isset($this->queried_object_id) ) {
+		if (isset($this->queried_object_id)) {
 			return $this->queried_object_id;
 		}
 
@@ -3344,9 +3344,9 @@ 
 	 *
 	 * @param string|array $query URL query string or array of vars.
 	 */
-	public function __construct( $query = '' ) {
-		if ( ! empty( $query ) ) {
-			$this->query( $query );
+	public function __construct($query = '') {
+		if ( ! empty($query)) {
+			$this->query($query);
 		}
 	}
 
@@ -3359,8 +3359,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;
 		}
 	}
@@ -3374,9 +3374,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);
 		}
 	}
 
@@ -3390,9 +3390,9 @@ 
 	 * @param array    $arguments Arguments to pass when calling.
 	 * @return mixed|false Return value of the callback, false otherwise.
 	 */
-	public function __call( $name, $arguments ) {
-		if ( in_array( $name, $this->compat_methods ) ) {
-			return call_user_func_array( array( $this, $name ), $arguments );
+	public function __call($name, $arguments) {
+		if (in_array($name, $this->compat_methods)) {
+			return call_user_func_array(array($this, $name), $arguments);
 		}
 		return false;
 	}
@@ -3418,16 +3418,16 @@ 
 	 * @param mixed $post_types Optional. Post type or array of posts types to check against.
 	 * @return bool
 	 */
-	public function is_post_type_archive( $post_types = '' ) {
-		if ( empty( $post_types ) || ! $this->is_post_type_archive )
+	public function is_post_type_archive($post_types = '') {
+		if (empty($post_types) || ! $this->is_post_type_archive)
 			return (bool) $this->is_post_type_archive;
 
-		$post_type = $this->get( 'post_type' );
-		if ( is_array( $post_type ) )
-			$post_type = reset( $post_type );
-		$post_type_object = get_post_type_object( $post_type );
+		$post_type = $this->get('post_type');
+		if (is_array($post_type))
+			$post_type = reset($post_type);
+		$post_type_object = get_post_type_object($post_type);
 
-		return in_array( $post_type_object->name, (array) $post_types );
+		return in_array($post_type_object->name, (array) $post_types);
 	}
 
 	/**
@@ -3438,24 +3438,24 @@ 
 	 * @param mixed $attachment Attachment ID, title, slug, or array of such.
 	 * @return bool
 	 */
-	public function is_attachment( $attachment = '' ) {
-		if ( ! $this->is_attachment ) {
+	public function is_attachment($attachment = '') {
+		if ( ! $this->is_attachment) {
 			return false;
 		}
 
-		if ( empty( $attachment ) ) {
+		if (empty($attachment)) {
 			return true;
 		}
 
-		$attachment = array_map( 'strval', (array) $attachment );
+		$attachment = array_map('strval', (array) $attachment);
 
 		$post_obj = $this->get_queried_object();
 
-		if ( in_array( (string) $post_obj->ID, $attachment ) ) {
+		if (in_array((string) $post_obj->ID, $attachment)) {
 			return true;
-		} elseif ( in_array( $post_obj->post_title, $attachment ) ) {
+		} elseif (in_array($post_obj->post_title, $attachment)) {
 			return true;
-		} elseif ( in_array( $post_obj->post_name, $attachment ) ) {
+		} elseif (in_array($post_obj->post_name, $attachment)) {
 			return true;
 		}
 		return false;
@@ -3472,22 +3472,22 @@ 
 	 * @param mixed $author Optional. User ID, nickname, nicename, or array of User IDs, nicknames, and nicenames
 	 * @return bool
 	 */
-	public function is_author( $author = '' ) {
-		if ( !$this->is_author )
+	public function is_author($author = '') {
+		if ( ! $this->is_author)
 			return false;
 
-		if ( empty($author) )
+		if (empty($author))
 			return true;
 
 		$author_obj = $this->get_queried_object();
 
-		$author = array_map( 'strval', (array) $author );
+		$author = array_map('strval', (array) $author);
 
-		if ( in_array( (string) $author_obj->ID, $author ) )
+		if (in_array((string) $author_obj->ID, $author))
 			return true;
-		elseif ( in_array( $author_obj->nickname, $author ) )
+		elseif (in_array($author_obj->nickname, $author))
 			return true;
-		elseif ( in_array( $author_obj->user_nicename, $author ) )
+		elseif (in_array($author_obj->user_nicename, $author))
 			return true;
 
 		return false;
@@ -3504,22 +3504,22 @@ 
 	 * @param mixed $category Optional. Category ID, name, slug, or array of Category IDs, names, and slugs.
 	 * @return bool
 	 */
-	public function is_category( $category = '' ) {
-		if ( !$this->is_category )
+	public function is_category($category = '') {
+		if ( ! $this->is_category)
 			return false;
 
-		if ( empty($category) )
+		if (empty($category))
 			return true;
 
 		$cat_obj = $this->get_queried_object();
 
-		$category = array_map( 'strval', (array) $category );
+		$category = array_map('strval', (array) $category);
 
-		if ( in_array( (string) $cat_obj->term_id, $category ) )
+		if (in_array((string) $cat_obj->term_id, $category))
 			return true;
-		elseif ( in_array( $cat_obj->name, $category ) )
+		elseif (in_array($cat_obj->name, $category))
 			return true;
-		elseif ( in_array( $cat_obj->slug, $category ) )
+		elseif (in_array($cat_obj->slug, $category))
 			return true;
 
 		return false;
@@ -3536,22 +3536,22 @@ 
 	 * @param mixed $tag Optional. Tag ID, name, slug, or array of Tag IDs, names, and slugs.
 	 * @return bool
 	 */
-	public function is_tag( $tag = '' ) {
-		if ( ! $this->is_tag )
+	public function is_tag($tag = '') {
+		if ( ! $this->is_tag)
 			return false;
 
-		if ( empty( $tag ) )
+		if (empty($tag))
 			return true;
 
 		$tag_obj = $this->get_queried_object();
 
-		$tag = array_map( 'strval', (array) $tag );
+		$tag = array_map('strval', (array) $tag);
 
-		if ( in_array( (string) $tag_obj->term_id, $tag ) )
+		if (in_array((string) $tag_obj->term_id, $tag))
 			return true;
-		elseif ( in_array( $tag_obj->name, $tag ) )
+		elseif (in_array($tag_obj->name, $tag))
 			return true;
-		elseif ( in_array( $tag_obj->slug, $tag ) )
+		elseif (in_array($tag_obj->slug, $tag))
 			return true;
 
 		return false;
@@ -3575,32 +3575,32 @@ 
 	 * @param mixed $term     Optional. Term ID, name, slug or array of Term IDs, names, and slugs.
 	 * @return bool True for custom taxonomy archive pages, false for built-in taxonomies (category and tag archives).
 	 */
-	public function is_tax( $taxonomy = '', $term = '' ) {
+	public function is_tax($taxonomy = '', $term = '') {
 		global $wp_taxonomies;
 
-		if ( !$this->is_tax )
+		if ( ! $this->is_tax)
 			return false;
 
-		if ( empty( $taxonomy ) )
+		if (empty($taxonomy))
 			return true;
 
 		$queried_object = $this->get_queried_object();
-		$tax_array = array_intersect( array_keys( $wp_taxonomies ), (array) $taxonomy );
+		$tax_array = array_intersect(array_keys($wp_taxonomies), (array) $taxonomy);
 		$term_array = (array) $term;
 
 		// Check that the taxonomy matches.
-		if ( ! ( isset( $queried_object->taxonomy ) && count( $tax_array ) && in_array( $queried_object->taxonomy, $tax_array ) ) )
+		if ( ! (isset($queried_object->taxonomy) && count($tax_array) && in_array($queried_object->taxonomy, $tax_array)))
 			return false;
 
 		// Only a Taxonomy provided.
-		if ( empty( $term ) )
+		if (empty($term))
 			return true;
 
-		return isset( $queried_object->term_id ) &&
-			count( array_intersect(
-				array( $queried_object->term_id, $queried_object->name, $queried_object->slug ),
+		return isset($queried_object->term_id) &&
+			count(array_intersect(
+				array($queried_object->term_id, $queried_object->name, $queried_object->slug),
 				$term_array
-			) );
+			));
 	}
 
 	/**
@@ -3612,7 +3612,7 @@ 
 	 * @return bool
 	 */
 	public function is_comments_popup() {
-		_deprecated_function( __FUNCTION__, '4.5.0' );
+		_deprecated_function(__FUNCTION__, '4.5.0');
 
 		return false;
 	}
@@ -3647,13 +3647,13 @@ 
 	 * @param string|array $feeds Optional feed types to check.
 	 * @return bool
 	 */
-	public function is_feed( $feeds = '' ) {
-		if ( empty( $feeds ) || ! $this->is_feed )
+	public function is_feed($feeds = '') {
+		if (empty($feeds) || ! $this->is_feed)
 			return (bool) $this->is_feed;
-		$qv = $this->get( 'feed' );
-		if ( 'feed' == $qv )
+		$qv = $this->get('feed');
+		if ('feed' == $qv)
 			$qv = get_default_feed();
-		return in_array( $qv, (array) $feeds );
+		return in_array($qv, (array) $feeds);
 	}
 
 	/**
@@ -3685,9 +3685,9 @@ 
 	 */
 	public function is_front_page() {
 		// most likely case
-		if ( 'posts' == get_option( 'show_on_front') && $this->is_home() )
+		if ('posts' == get_option('show_on_front') && $this->is_home())
 			return true;
-		elseif ( 'page' == get_option( 'show_on_front') && get_option( 'page_on_front' ) && $this->is_page( get_option( 'page_on_front' ) ) )
+		elseif ('page' == get_option('show_on_front') && get_option('page_on_front') && $this->is_page(get_option('page_on_front')))
 			return true;
 		else
 			return false;
@@ -3738,31 +3738,31 @@ 
 	 * @param int|string|array $page Optional. Page ID, title, slug, path, or array of such. Default empty.
 	 * @return bool Whether the query is for an existing single page.
 	 */
-	public function is_page( $page = '' ) {
-		if ( !$this->is_page )
+	public function is_page($page = '') {
+		if ( ! $this->is_page)
 			return false;
 
-		if ( empty( $page ) )
+		if (empty($page))
 			return true;
 
 		$page_obj = $this->get_queried_object();
 
-		$page = array_map( 'strval', (array) $page );
+		$page = array_map('strval', (array) $page);
 
-		if ( in_array( (string) $page_obj->ID, $page ) ) {
+		if (in_array((string) $page_obj->ID, $page)) {
 			return true;
-		} elseif ( in_array( $page_obj->post_title, $page ) ) {
+		} elseif (in_array($page_obj->post_title, $page)) {
 			return true;
-		} elseif ( in_array( $page_obj->post_name, $page ) ) {
+		} elseif (in_array($page_obj->post_name, $page)) {
 			return true;
 		} else {
-			foreach ( $page as $pagepath ) {
-				if ( ! strpos( $pagepath, '/' ) ) {
+			foreach ($page as $pagepath) {
+				if ( ! strpos($pagepath, '/')) {
 					continue;
 				}
-				$pagepath_obj = get_page_by_path( $pagepath );
+				$pagepath_obj = get_page_by_path($pagepath);
 
-				if ( $pagepath_obj && ( $pagepath_obj->ID == $page_obj->ID ) ) {
+				if ($pagepath_obj && ($pagepath_obj->ID == $page_obj->ID)) {
 					return true;
 				}
 			}
@@ -3831,31 +3831,31 @@ 
 	 * @param int|string|array $post Optional. Post ID, title, slug, path, or array of such. Default empty.
 	 * @return bool Whether the query is for an existing single post.
 	 */
-	public function is_single( $post = '' ) {
-		if ( !$this->is_single )
+	public function is_single($post = '') {
+		if ( ! $this->is_single)
 			return false;
 
-		if ( empty($post) )
+		if (empty($post))
 			return true;
 
 		$post_obj = $this->get_queried_object();
 
-		$post = array_map( 'strval', (array) $post );
+		$post = array_map('strval', (array) $post);
 
-		if ( in_array( (string) $post_obj->ID, $post ) ) {
+		if (in_array((string) $post_obj->ID, $post)) {
 			return true;
-		} elseif ( in_array( $post_obj->post_title, $post ) ) {
+		} elseif (in_array($post_obj->post_title, $post)) {
 			return true;
-		} elseif ( in_array( $post_obj->post_name, $post ) ) {
+		} elseif (in_array($post_obj->post_name, $post)) {
 			return true;
 		} else {
-			foreach ( $post as $postpath ) {
-				if ( ! strpos( $postpath, '/' ) ) {
+			foreach ($post as $postpath) {
+				if ( ! strpos($postpath, '/')) {
 					continue;
 				}
-				$postpath_obj = get_page_by_path( $postpath, OBJECT, $post_obj->post_type );
+				$postpath_obj = get_page_by_path($postpath, OBJECT, $post_obj->post_type);
 
-				if ( $postpath_obj && ( $postpath_obj->ID == $post_obj->ID ) ) {
+				if ($postpath_obj && ($postpath_obj->ID == $post_obj->ID)) {
 					return true;
 				}
 			}
@@ -3877,13 +3877,13 @@ 
 	 * @param string|array $post_types Optional. Post type or array of post types. Default empty.
 	 * @return bool Whether the query is for an existing single post of any of the given post types.
 	 */
-	public function is_singular( $post_types = '' ) {
-		if ( empty( $post_types ) || !$this->is_singular )
+	public function is_singular($post_types = '') {
+		if (empty($post_types) || ! $this->is_singular)
 			return (bool) $this->is_singular;
 
 		$post_obj = $this->get_queried_object();
 
-		return in_array( $post_obj->post_type, (array) $post_types );
+		return in_array($post_obj->post_type, (array) $post_types);
 	}
 
 	/**
@@ -3974,14 +3974,14 @@ 
 	 * @param WP_Post|object|int $post WP_Post instance or Post ID/object.
 	 * @return true True when finished.
 	 */
-	public function setup_postdata( $post ) {
+	public function setup_postdata($post) {
 		global $id, $authordata, $currentday, $currentmonth, $page, $pages, $multipage, $more, $numpages;
 
-		if ( ! ( $post instanceof WP_Post ) ) {
-			$post = get_post( $post );
+		if ( ! ($post instanceof WP_Post)) {
+			$post = get_post($post);
 		}
 
-		if ( ! $post ) {
+		if ( ! $post) {
 			return;
 		}
 
@@ -3993,35 +3993,35 @@ 
 		$currentmonth = mysql2date('m', $post->post_date, false);
 		$numpages = 1;
 		$multipage = 0;
-		$page = $this->get( 'page' );
-		if ( ! $page )
+		$page = $this->get('page');
+		if ( ! $page)
 			$page = 1;
 
 		/*
 		 * Force full post content when viewing the permalink for the $post,
 		 * or when on an RSS feed. Otherwise respect the 'more' tag.
 		 */
-		if ( $post->ID === get_queried_object_id() && ( $this->is_page() || $this->is_single() ) ) {
+		if ($post->ID === get_queried_object_id() && ($this->is_page() || $this->is_single())) {
 			$more = 1;
-		} elseif ( $this->is_feed() ) {
+		} elseif ($this->is_feed()) {
 			$more = 1;
 		} else {
 			$more = 0;
 		}
 
 		$content = $post->post_content;
-		if ( false !== strpos( $content, '<!--nextpage-->' ) ) {
-			$content = str_replace( "\n<!--nextpage-->\n", '<!--nextpage-->', $content );
-			$content = str_replace( "\n<!--nextpage-->", '<!--nextpage-->', $content );
-			$content = str_replace( "<!--nextpage-->\n", '<!--nextpage-->', $content );
+		if (false !== strpos($content, '<!--nextpage-->')) {
+			$content = str_replace("\n<!--nextpage-->\n", '<!--nextpage-->', $content);
+			$content = str_replace("\n<!--nextpage-->", '<!--nextpage-->', $content);
+			$content = str_replace("<!--nextpage-->\n", '<!--nextpage-->', $content);
 
 			// Ignore nextpage at the beginning of the content.
-			if ( 0 === strpos( $content, '<!--nextpage-->' ) )
-				$content = substr( $content, 15 );
+			if (0 === strpos($content, '<!--nextpage-->'))
+				$content = substr($content, 15);
 
 			$pages = explode('<!--nextpage-->', $content);
 		} else {
-			$pages = array( $post->post_content );
+			$pages = array($post->post_content);
 		}
 
 		/**
@@ -4036,12 +4036,12 @@ 
 		 *                       of `<!-- nextpage -->` tags..
 		 * @param WP_Post $post  Current post object.
 		 */
-		$pages = apply_filters( 'content_pagination', $pages, $post );
+		$pages = apply_filters('content_pagination', $pages, $post);
 
-		$numpages = count( $pages );
+		$numpages = count($pages);
 
-		if ( $numpages > 1 ) {
-			if ( $page > 1 ) {
+		if ($numpages > 1) {
+			if ($page > 1) {
 				$more = 1;
 			}
 			$multipage = 1;
@@ -4058,7 +4058,7 @@ 
 		 * @param WP_Post  &$post The Post object (passed by reference).
 		 * @param WP_Query &$this The current Query object (passed by reference).
 		 */
-		do_action_ref_array( 'the_post', array( &$post, &$this ) );
+		do_action_ref_array('the_post', array(&$post, &$this));
 
 		return true;
 	}
@@ -4071,9 +4071,9 @@ 
 	 * @global WP_Post $post
 	 */
 	public function reset_postdata() {
-		if ( ! empty( $this->post ) ) {
+		if ( ! empty($this->post)) {
 			$GLOBALS['post'] = $this->post;
-			$this->setup_postdata( $this->post );
+			$this->setup_postdata($this->post);
 		}
 	}
 
@@ -4087,8 +4087,8 @@ 
 	 * @param int   $term_id
 	 * @return mixed
 	 */
-	public function lazyload_term_meta( $check, $term_id ) {
-		_deprecated_function( __METHOD__, '4.5.0' );
+	public function lazyload_term_meta($check, $term_id) {
+		_deprecated_function(__METHOD__, '4.5.0');
 		return $check;
 	}
 
@@ -4102,8 +4102,8 @@ 
 	 * @param int   $comment_id
 	 * @return mixed
 	 */
-	public function lazyload_comment_meta( $check, $comment_id ) {
-		_deprecated_function( __METHOD__, '4.5.0' );
+	public function lazyload_comment_meta($check, $comment_id) {
+		_deprecated_function(__METHOD__, '4.5.0');
 		return $check;
 	}
 }

Braces +358 added lines, -244 removed lines

@@ -613,8 +613,9 @@ 
 		);
 
 		foreach ( $keys as $key ) {
-			if ( !isset($array[$key]) )
-				$array[$key] = '';
+			if ( !isset($array[$key]) ) {
+							$array[$key] = '';
+			}
 		}
 
 		$array_keys = array( 'category__in', 'category__not_in', 'category__and', 'post__in', 'post__not_in', 'post_name__in',
@@ -622,8 +623,9 @@ 
 			'author__in', 'author__not_in' );
 
 		foreach ( $array_keys as $key ) {
-			if ( !isset($array[$key]) )
-				$array[$key] = array();
+			if ( !isset($array[$key]) ) {
+							$array[$key] = array();
+			}
 		}
 		return $array;
 	}
@@ -762,8 +764,9 @@ 
 		$qv = &$this->query_vars;
 		$this->query_vars_changed = true;
 
-		if ( ! empty($qv['robots']) )
-			$this->is_robots = true;
+		if ( ! empty($qv['robots']) ) {
+					$this->is_robots = true;
+		}
 
 		if ( ! is_scalar( $qv['p'] ) || $qv['p'] < 0 ) {
 			$qv['p'] = 0;
@@ -784,10 +787,18 @@ 
 		$qv['pagename'] = trim( $qv['pagename'] );
 		$qv['name'] = trim( $qv['name'] );
 		$qv['title'] = trim( $qv['title'] );
-		if ( '' !== $qv['hour'] ) $qv['hour'] = absint($qv['hour']);
-		if ( '' !== $qv['minute'] ) $qv['minute'] = absint($qv['minute']);
-		if ( '' !== $qv['second'] ) $qv['second'] = absint($qv['second']);
-		if ( '' !== $qv['menu_order'] ) $qv['menu_order'] = absint($qv['menu_order']);
+		if ( '' !== $qv['hour'] ) {
+			$qv['hour'] = absint($qv['hour']);
+		}
+		if ( '' !== $qv['minute'] ) {
+			$qv['minute'] = absint($qv['minute']);
+		}
+		if ( '' !== $qv['second'] ) {
+			$qv['second'] = absint($qv['second']);
+		}
+		if ( '' !== $qv['menu_order'] ) {
+			$qv['menu_order'] = absint($qv['menu_order']);
+		}
 
 		// Fairly insane upper bound for search string lengths.
 		if ( ! is_scalar( $qv['s'] ) || ( ! empty( $qv['s'] ) && strlen( $qv['s'] ) > 1600 ) ) {
@@ -795,10 +806,12 @@ 
 		}
 
 		// Compat. Map subpost to attachment.
-		if ( '' != $qv['subpost'] )
-			$qv['attachment'] = $qv['subpost'];
-		if ( '' != $qv['subpost_id'] )
-			$qv['attachment_id'] = $qv['subpost_id'];
+		if ( '' != $qv['subpost'] ) {
+					$qv['attachment'] = $qv['subpost'];
+		}
+		if ( '' != $qv['subpost_id'] ) {
+					$qv['attachment_id'] = $qv['subpost_id'];
+		}
 
 		$qv['attachment_id'] = absint($qv['attachment_id']);
 
@@ -914,38 +927,46 @@ 
 				$this->is_author = true;
 			}
 
-			if ( '' != $qv['author_name'] )
-				$this->is_author = true;
+			if ( '' != $qv['author_name'] ) {
+							$this->is_author = true;
+			}
 
 			if ( !empty( $qv['post_type'] ) && ! is_array( $qv['post_type'] ) ) {
 				$post_type_obj = get_post_type_object( $qv['post_type'] );
-				if ( ! empty( $post_type_obj->has_archive ) )
-					$this->is_post_type_archive = true;
+				if ( ! empty( $post_type_obj->has_archive ) ) {
+									$this->is_post_type_archive = true;
+				}
 			}
 
-			if ( $this->is_post_type_archive || $this->is_date || $this->is_author || $this->is_category || $this->is_tag || $this->is_tax )
-				$this->is_archive = true;
+			if ( $this->is_post_type_archive || $this->is_date || $this->is_author || $this->is_category || $this->is_tag || $this->is_tax ) {
+							$this->is_archive = true;
+			}
 		}
 
-		if ( '' != $qv['feed'] )
-			$this->is_feed = true;
+		if ( '' != $qv['feed'] ) {
+					$this->is_feed = true;
+		}
 
 		if ( '' != $qv['embed'] ) {
 			$this->is_embed = true;
 		}
 
-		if ( '' != $qv['tb'] )
-			$this->is_trackback = true;
+		if ( '' != $qv['tb'] ) {
+					$this->is_trackback = true;
+		}
 
-		if ( '' != $qv['paged'] && ( intval($qv['paged']) > 1 ) )
-			$this->is_paged = true;
+		if ( '' != $qv['paged'] && ( intval($qv['paged']) > 1 ) ) {
+					$this->is_paged = true;
+		}
 
 		// if we're previewing inside the write screen
-		if ( '' != $qv['preview'] )
-			$this->is_preview = true;
+		if ( '' != $qv['preview'] ) {
+					$this->is_preview = true;
+		}
 
-		if ( is_admin() )
-			$this->is_admin = true;
+		if ( is_admin() ) {
+					$this->is_admin = true;
+		}
 
 		if ( false !== strpos($qv['feed'], 'comments-') ) {
 			$qv['feed'] = str_replace('comments-', '', $qv['feed']);
@@ -954,18 +975,21 @@ 
 
 		$this->is_singular = $this->is_single || $this->is_page || $this->is_attachment;
 
-		if ( $this->is_feed && ( !empty($qv['withcomments']) || ( empty($qv['withoutcomments']) && $this->is_singular ) ) )
-			$this->is_comment_feed = true;
+		if ( $this->is_feed && ( !empty($qv['withcomments']) || ( empty($qv['withoutcomments']) && $this->is_singular ) ) ) {
+					$this->is_comment_feed = true;
+		}
 
-		if ( !( $this->is_singular || $this->is_archive || $this->is_search || $this->is_feed || ( defined( 'REST_REQUEST' ) && REST_REQUEST ) || $this->is_trackback || $this->is_404 || $this->is_admin || $this->is_robots ) )
-			$this->is_home = true;
+		if ( !( $this->is_singular || $this->is_archive || $this->is_search || $this->is_feed || ( defined( 'REST_REQUEST' ) && REST_REQUEST ) || $this->is_trackback || $this->is_404 || $this->is_admin || $this->is_robots ) ) {
+					$this->is_home = true;
+		}
 
 		// Correct is_* for page_on_front and page_for_posts
 		if ( $this->is_home && 'page' == get_option('show_on_front') && get_option('page_on_front') ) {
 			$_query = wp_parse_args($this->query);
 			// pagename can be set and empty depending on matched rewrite rules. Ignore an empty pagename.
-			if ( isset($_query['pagename']) && '' == $_query['pagename'] )
-				unset($_query['pagename']);
+			if ( isset($_query['pagename']) && '' == $_query['pagename'] ) {
+							unset($_query['pagename']);
+			}
 
 			unset( $_query['embed'] );
 
@@ -1018,27 +1042,31 @@ 
 		}
 
 		if ( !empty($qv['post_type']) ) {
-			if ( is_array($qv['post_type']) )
-				$qv['post_type'] = array_map('sanitize_key', $qv['post_type']);
-			else
-				$qv['post_type'] = sanitize_key($qv['post_type']);
+			if ( is_array($qv['post_type']) ) {
+							$qv['post_type'] = array_map('sanitize_key', $qv['post_type']);
+			} else {
+							$qv['post_type'] = sanitize_key($qv['post_type']);
+			}
 		}
 
 		if ( ! empty( $qv['post_status'] ) ) {
-			if ( is_array( $qv['post_status'] ) )
-				$qv['post_status'] = array_map('sanitize_key', $qv['post_status']);
-			else
-				$qv['post_status'] = preg_replace('|[^a-z0-9_,-]|', '', $qv['post_status']);
+			if ( is_array( $qv['post_status'] ) ) {
+							$qv['post_status'] = array_map('sanitize_key', $qv['post_status']);
+			} else {
+							$qv['post_status'] = preg_replace('|[^a-z0-9_,-]|', '', $qv['post_status']);
+			}
 		}
 
-		if ( $this->is_posts_page && ( ! isset($qv['withcomments']) || ! $qv['withcomments'] ) )
-			$this->is_comment_feed = false;
+		if ( $this->is_posts_page && ( ! isset($qv['withcomments']) || ! $qv['withcomments'] ) ) {
+					$this->is_comment_feed = false;
+		}
 
 		$this->is_singular = $this->is_single || $this->is_page || $this->is_attachment;
 		// Done correcting is_* for page_on_front and page_for_posts
 
-		if ( '404' == $qv['error'] )
-			$this->set_404();
+		if ( '404' == $qv['error'] ) {
+					$this->set_404();
+		}
 
 		$this->is_embed = $this->is_embed && ( $this->is_singular || $this->is_404 );
 
@@ -1081,8 +1109,10 @@ 
 		}
 
 		foreach ( get_taxonomies( array() , 'objects' ) as $taxonomy => $t ) {
-			if ( 'post_tag' == $taxonomy )
-				continue;	// Handled further down in the $q['tag'] block
+			if ( 'post_tag' == $taxonomy ) {
+							continue;
+			}
+			// Handled further down in the $q['tag'] block
 
 			if ( $t->query_var && !empty( $q[$t->query_var] ) ) {
 				$tax_query_defaults = array(
@@ -1129,10 +1159,11 @@ 
 			$q['cat'] = implode( ',', $cat_array );
 
 			foreach ( $cat_array as $cat ) {
-				if ( $cat > 0 )
-					$cat_in[] = $cat;
-				elseif ( $cat < 0 )
-					$cat_not_in[] = abs( $cat );
+				if ( $cat > 0 ) {
+									$cat_in[] = $cat;
+				} elseif ( $cat < 0 ) {
+									$cat_not_in[] = abs( $cat );
+				}
 			}
 
 			if ( ! empty( $cat_in ) ) {
@@ -1158,8 +1189,9 @@ 
 
 		if ( ! empty( $q['category__and'] ) && 1 === count( (array) $q['category__and'] ) ) {
 			$q['category__and'] = (array) $q['category__and'];
-			if ( ! isset( $q['category__in'] ) )
-				$q['category__in'] = array();
+			if ( ! isset( $q['category__in'] ) ) {
+							$q['category__in'] = array();
+			}
 			$q['category__in'][] = absint( reset( $q['category__and'] ) );
 			unset( $q['category__and'] );
 		}
@@ -1300,8 +1332,9 @@ 
 
 		// added slashes screw with quote grouping when done early, so done later
 		$q['s'] = stripslashes( $q['s'] );
-		if ( empty( $_GET['s'] ) && $this->is_main_query() )
-			$q['s'] = urldecode( $q['s'] );
+		if ( empty( $_GET['s'] ) && $this->is_main_query() ) {
+					$q['s'] = urldecode( $q['s'] );
+		}
 		// there are no line breaks in <input /> fields
 		$q['s'] = str_replace( array( "\r", "\n" ), '', $q['s'] );
 		$q['search_terms_count'] = 1;
@@ -1312,8 +1345,9 @@ 
 				$q['search_terms_count'] = count( $matches[0] );
 				$q['search_terms'] = $this->parse_search_terms( $matches[0] );
 				// if the search string has only short terms or stopwords, or is 10+ terms long, match it as sentence
-				if ( empty( $q['search_terms'] ) || count( $q['search_terms'] ) > 9 )
-					$q['search_terms'] = array( $q['s'] );
+				if ( empty( $q['search_terms'] ) || count( $q['search_terms'] ) > 9 ) {
+									$q['search_terms'] = array( $q['s'] );
+				}
 			} else {
 				$q['search_terms'] = array( $q['s'] );
 			}
@@ -1385,17 +1419,20 @@ 
 
 		foreach ( $terms as $term ) {
 			// keep before/after spaces when term is for exact match
-			if ( preg_match( '/^".+"$/', $term ) )
-				$term = trim( $term, "\"'" );
-			else
-				$term = trim( $term, "\"' " );
+			if ( preg_match( '/^".+"$/', $term ) ) {
+							$term = trim( $term, "\"'" );
+			} else {
+							$term = trim( $term, "\"' " );
+			}
 
 			// Avoid single A-Z and single dashes.
-			if ( ! $term || ( 1 === strlen( $term ) && preg_match( '/^[a-z\-]$/i', $term ) ) )
-				continue;
+			if ( ! $term || ( 1 === strlen( $term ) && preg_match( '/^[a-z\-]$/i', $term ) ) ) {
+							continue;
+			}
 
-			if ( in_array( call_user_func( $strtolower, $term ), $stopwords, true ) )
-				continue;
+			if ( in_array( call_user_func( $strtolower, $term ), $stopwords, true ) ) {
+							continue;
+			}
 
 			$checked[] = $term;
 		}
@@ -1411,8 +1448,9 @@ 
 	 * @return array Stopwords.
 	 */
 	protected function get_search_stopwords() {
-		if ( isset( $this->stopwords ) )
-			return $this->stopwords;
+		if ( isset( $this->stopwords ) ) {
+					return $this->stopwords;
+		}
 
 		/* translators: This is a comma-separated list of very common words that should be excluded from a search,
 		 * like a, an, and the. These are usually called "stopwords". You should not simply translate these individual
@@ -1424,8 +1462,9 @@ 
 		$stopwords = array();
 		foreach ( $words as $word ) {
 			$word = trim( $word, "\r\n\t " );
-			if ( $word )
-				$stopwords[] = $word;
+			if ( $word ) {
+							$stopwords[] = $word;
+			}
 		}
 
 		/**
@@ -1470,8 +1509,9 @@ 
 				// all words in title
 				$search_orderby .= 'WHEN ' . implode( ' AND ', $q['search_orderby_title'] ) . ' THEN 2 ';
 				// any word in title, not needed when $num_terms == 1
-				if ( $num_terms > 1 )
-					$search_orderby .= 'WHEN ' . implode( ' OR ', $q['search_orderby_title'] ) . ' THEN 3 ';
+				if ( $num_terms > 1 ) {
+									$search_orderby .= 'WHEN ' . implode( ' OR ', $q['search_orderby_title'] ) . ' THEN 3 ';
+				}
 			}
 
 			// Sentence match in 'post_content' and 'post_excerpt'.
@@ -1714,38 +1754,45 @@ 
 
 		if ( isset( $q['caller_get_posts'] ) ) {
 			_deprecated_argument( 'WP_Query', '3.1.0', __( '"caller_get_posts" is deprecated. Use "ignore_sticky_posts" instead.' ) );
-			if ( !isset( $q['ignore_sticky_posts'] ) )
-				$q['ignore_sticky_posts'] = $q['caller_get_posts'];
+			if ( !isset( $q['ignore_sticky_posts'] ) ) {
+							$q['ignore_sticky_posts'] = $q['caller_get_posts'];
+			}
 		}
 
-		if ( !isset( $q['ignore_sticky_posts'] ) )
-			$q['ignore_sticky_posts'] = false;
+		if ( !isset( $q['ignore_sticky_posts'] ) ) {
+					$q['ignore_sticky_posts'] = false;
+		}
 
-		if ( !isset($q['suppress_filters']) )
-			$q['suppress_filters'] = false;
+		if ( !isset($q['suppress_filters']) ) {
+					$q['suppress_filters'] = false;
+		}
 
 		if ( !isset($q['cache_results']) ) {
-			if ( wp_using_ext_object_cache() )
-				$q['cache_results'] = false;
-			else
-				$q['cache_results'] = true;
+			if ( wp_using_ext_object_cache() ) {
+							$q['cache_results'] = false;
+			} else {
+							$q['cache_results'] = true;
+			}
 		}
 
-		if ( !isset($q['update_post_term_cache']) )
-			$q['update_post_term_cache'] = true;
+		if ( !isset($q['update_post_term_cache']) ) {
+					$q['update_post_term_cache'] = true;
+		}
 
 		if ( ! isset( $q['lazy_load_term_meta'] ) ) {
 			$q['lazy_load_term_meta'] = $q['update_post_term_cache'];
 		}
 
-		if ( !isset($q['update_post_meta_cache']) )
-			$q['update_post_meta_cache'] = true;
+		if ( !isset($q['update_post_meta_cache']) ) {
+					$q['update_post_meta_cache'] = true;
+		}
 
 		if ( !isset($q['post_type']) ) {
-			if ( $this->is_search )
-				$q['post_type'] = 'any';
-			else
-				$q['post_type'] = '';
+			if ( $this->is_search ) {
+							$q['post_type'] = 'any';
+			} else {
+							$q['post_type'] = '';
+			}
 		}
 		$post_type = $q['post_type'];
 		if ( empty( $q['posts_per_page'] ) ) {
@@ -1755,8 +1802,9 @@ 
 			$q['showposts'] = (int) $q['showposts'];
 			$q['posts_per_page'] = $q['showposts'];
 		}
-		if ( (isset($q['posts_per_archive_page']) && $q['posts_per_archive_page'] != 0) && ($this->is_archive || $this->is_search) )
-			$q['posts_per_page'] = $q['posts_per_archive_page'];
+		if ( (isset($q['posts_per_archive_page']) && $q['posts_per_archive_page'] != 0) && ($this->is_archive || $this->is_search) ) {
+					$q['posts_per_page'] = $q['posts_per_archive_page'];
+		}
 		if ( !isset($q['nopaging']) ) {
 			if ( $q['posts_per_page'] == -1 ) {
 				$q['nopaging'] = true;
@@ -1775,13 +1823,15 @@ 
 			$q['nopaging'] = false;
 		}
 		$q['posts_per_page'] = (int) $q['posts_per_page'];
-		if ( $q['posts_per_page'] < -1 )
-			$q['posts_per_page'] = abs($q['posts_per_page']);
-		elseif ( $q['posts_per_page'] == 0 )
-			$q['posts_per_page'] = 1;
+		if ( $q['posts_per_page'] < -1 ) {
+					$q['posts_per_page'] = abs($q['posts_per_page']);
+		} elseif ( $q['posts_per_page'] == 0 ) {
+					$q['posts_per_page'] = 1;
+		}
 
-		if ( !isset($q['comments_per_page']) || $q['comments_per_page'] == 0 )
-			$q['comments_per_page'] = get_option('comments_per_page');
+		if ( !isset($q['comments_per_page']) || $q['comments_per_page'] == 0 ) {
+					$q['comments_per_page'] = get_option('comments_per_page');
+		}
 
 		if ( $this->is_home && (empty($this->query) || $q['preview'] == 'true') && ( 'page' == get_option('show_on_front') ) && get_option('page_on_front') ) {
 			$this->is_page = true;
@@ -1795,10 +1845,11 @@ 
 		}
 
 		// If true, forcibly turns off SQL_CALC_FOUND_ROWS even when limits are present.
-		if ( isset($q['no_found_rows']) )
-			$q['no_found_rows'] = (bool) $q['no_found_rows'];
-		else
-			$q['no_found_rows'] = false;
+		if ( isset($q['no_found_rows']) ) {
+					$q['no_found_rows'] = (bool) $q['no_found_rows'];
+		} else {
+					$q['no_found_rows'] = false;
+		}
 
 		switch ( $q['fields'] ) {
 			case 'ids':
@@ -1837,26 +1888,33 @@ 
 		// Handle the other individual date parameters
 		$date_parameters = array();
 
-		if ( '' !== $q['hour'] )
-			$date_parameters['hour'] = $q['hour'];
+		if ( '' !== $q['hour'] ) {
+					$date_parameters['hour'] = $q['hour'];
+		}
 
-		if ( '' !== $q['minute'] )
-			$date_parameters['minute'] = $q['minute'];
+		if ( '' !== $q['minute'] ) {
+					$date_parameters['minute'] = $q['minute'];
+		}
 
-		if ( '' !== $q['second'] )
-			$date_parameters['second'] = $q['second'];
+		if ( '' !== $q['second'] ) {
+					$date_parameters['second'] = $q['second'];
+		}
 
-		if ( $q['year'] )
-			$date_parameters['year'] = $q['year'];
+		if ( $q['year'] ) {
+					$date_parameters['year'] = $q['year'];
+		}
 
-		if ( $q['monthnum'] )
-			$date_parameters['monthnum'] = $q['monthnum'];
+		if ( $q['monthnum'] ) {
+					$date_parameters['monthnum'] = $q['monthnum'];
+		}
 
-		if ( $q['w'] )
-			$date_parameters['week'] = $q['w'];
+		if ( $q['w'] ) {
+					$date_parameters['week'] = $q['w'];
+		}
 
-		if ( $q['day'] )
-			$date_parameters['day'] = $q['day'];
+		if ( $q['day'] ) {
+					$date_parameters['day'] = $q['day'];
+		}
 
 		if ( $date_parameters ) {
 			$date_query = new WP_Date_Query( array( $date_parameters ) );
@@ -1875,8 +1933,9 @@ 
 		if ( !empty($q['post_type']) && 'any' != $q['post_type'] ) {
 			foreach ( (array)$q['post_type'] as $_post_type ) {
 				$ptype_obj = get_post_type_object($_post_type);
-				if ( !$ptype_obj || !$ptype_obj->query_var || empty($q[ $ptype_obj->query_var ]) )
-					continue;
+				if ( !$ptype_obj || !$ptype_obj->query_var || empty($q[ $ptype_obj->query_var ]) ) {
+									continue;
+				}
 
 				if ( ! $ptype_obj->hierarchical ) {
 					// Non-hierarchical post types can directly use 'name'.
@@ -1908,21 +1967,24 @@ 
 				if ( 'page' != $q['post_type'] ) {
 					foreach ( (array)$q['post_type'] as $_post_type ) {
 						$ptype_obj = get_post_type_object($_post_type);
-						if ( !$ptype_obj || !$ptype_obj->hierarchical )
-							continue;
+						if ( !$ptype_obj || !$ptype_obj->hierarchical ) {
+													continue;
+						}
 
 						$reqpage = get_page_by_path($q['pagename'], OBJECT, $_post_type);
-						if ( $reqpage )
-							break;
+						if ( $reqpage ) {
+													break;
+						}
 					}
 					unset($ptype_obj);
 				} else {
 					$reqpage = get_page_by_path($q['pagename']);
 				}
-				if ( !empty($reqpage) )
-					$reqpage = $reqpage->ID;
-				else
-					$reqpage = 0;
+				if ( !empty($reqpage) ) {
+									$reqpage = $reqpage->ID;
+				} else {
+									$reqpage = 0;
+				}
 			}
 
 			$page_for_posts = get_option('page_for_posts');
@@ -1949,8 +2011,9 @@ 
 		}
 
 		// If an attachment is requested by number, let it supersede any post number.
-		if ( $q['attachment_id'] )
-			$q['p'] = absint($q['attachment_id']);
+		if ( $q['attachment_id'] ) {
+					$q['p'] = absint($q['attachment_id']);
+		}
 
 		// If a post number is specified, load that post
 		if ( $q['p'] ) {
@@ -2014,13 +2077,15 @@ 
 				$taxonomies = array_keys( $this->tax_query->queried_terms );
 				foreach ( get_post_types( array( 'exclude_from_search' => false ) ) as $pt ) {
 					$object_taxonomies = $pt === 'attachment' ? get_taxonomies_for_attachments() : get_object_taxonomies( $pt );
-					if ( array_intersect( $taxonomies, $object_taxonomies ) )
-						$post_type[] = $pt;
+					if ( array_intersect( $taxonomies, $object_taxonomies ) ) {
+											$post_type[] = $pt;
+					}
+				}
+				if ( ! $post_type ) {
+									$post_type = 'any';
+				} elseif ( count( $post_type ) == 1 ) {
+									$post_type = $post_type[0];
 				}
-				if ( ! $post_type )
-					$post_type = 'any';
-				elseif ( count( $post_type ) == 1 )
-					$post_type = $post_type[0];
 
 				$post_status_join = true;
 			} elseif ( in_array('attachment', (array) $post_type) ) {
@@ -2121,8 +2186,9 @@ 
 			}
 			$q['author_name'] = sanitize_title_for_query( $q['author_name'] );
 			$q['author'] = get_user_by('slug', $q['author_name']);
-			if ( $q['author'] )
-				$q['author'] = $q['author']->ID;
+			if ( $q['author'] ) {
+							$q['author'] = $q['author']->ID;
+			}
 			$whichauthor .= " AND ({$wpdb->posts}.post_author = " . absint($q['author']) . ')';
 		}
 
@@ -2206,8 +2272,9 @@ 
 		// Order search results by relevance only when another "orderby" is not specified in the query.
 		if ( ! empty( $q['s'] ) ) {
 			$search_orderby = '';
-			if ( ! empty( $q['search_orderby_title'] ) && ( empty( $q['orderby'] ) && ! $this->is_feed ) || ( isset( $q['orderby'] ) && 'relevance' === $q['orderby'] ) )
-				$search_orderby = $this->parse_search_order( $q );
+			if ( ! empty( $q['search_orderby_title'] ) && ( empty( $q['orderby'] ) && ! $this->is_feed ) || ( isset( $q['orderby'] ) && 'relevance' === $q['orderby'] ) ) {
+							$search_orderby = $this->parse_search_order( $q );
+			}
 
 			if ( ! $q['suppress_filters'] ) {
 				/**
@@ -2221,18 +2288,21 @@ 
 				$search_orderby = apply_filters( 'posts_search_orderby', $search_orderby, $this );
 			}
 
-			if ( $search_orderby )
-				$orderby = $orderby ? $search_orderby . ', ' . $orderby : $search_orderby;
+			if ( $search_orderby ) {
+							$orderby = $orderby ? $search_orderby . ', ' . $orderby : $search_orderby;
+			}
 		}
 
 		if ( is_array( $post_type ) && count( $post_type ) > 1 ) {
 			$post_type_cap = 'multiple_post_type';
 		} else {
-			if ( is_array( $post_type ) )
-				$post_type = reset( $post_type );
+			if ( is_array( $post_type ) ) {
+							$post_type = reset( $post_type );
+			}
 			$post_type_object = get_post_type_object( $post_type );
-			if ( empty( $post_type_object ) )
-				$post_type_cap = $post_type;
+			if ( empty( $post_type_object ) ) {
+							$post_type_cap = $post_type;
+			}
 		}
 
 		if ( isset( $q['post_password'] ) ) {
@@ -2292,8 +2362,9 @@ 
 		if ( ! empty( $q['post_status'] ) ) {
 			$statuswheres = array();
 			$q_status = $q['post_status'];
-			if ( ! is_array( $q_status ) )
-				$q_status = explode(',', $q_status);
+			if ( ! is_array( $q_status ) ) {
+							$q_status = explode(',', $q_status);
+			}
 			$r_status = array();
 			$p_status = array();
 			$e_status = array();
@@ -2353,8 +2424,10 @@ 
 			// Add public states.
 			$public_states = get_post_stati( array('public' => true) );
 			foreach ( (array) $public_states as $state ) {
-				if ( 'publish' == $state ) // Publish is hard-coded above.
+				if ( 'publish' == $state ) {
+					// Publish is hard-coded above.
 					continue;
+				}
 				$where .= " OR {$wpdb->posts}.post_status = '$state'";
 			}
 
@@ -2406,8 +2479,9 @@ 
 		// Paging
 		if ( empty($q['nopaging']) && !$this->is_singular ) {
 			$page = absint($q['paged']);
-			if ( !$page )
-				$page = 1;
+			if ( !$page ) {
+							$page = 1;
+			}
 
 			// If 'offset' is provided, it takes precedence over 'paged'.
 			if ( isset( $q['offset'] ) && is_numeric( $q['offset'] ) ) {
@@ -2492,8 +2566,9 @@ 
 
 			$post_ids = array();
 
-			foreach ( $this->comments as $comment )
-				$post_ids[] = (int) $comment->comment_post_ID;
+			foreach ( $this->comments as $comment ) {
+							$post_ids[] = (int) $comment->comment_post_ID;
+			}
 
 			$post_ids = join(',', $post_ids);
 			$join = '';
@@ -2731,14 +2806,17 @@ 
 			$limits = isset( $clauses[ 'limits' ] ) ? $clauses[ 'limits' ] : '';
 		}
 
-		if ( ! empty($groupby) )
-			$groupby = 'GROUP BY ' . $groupby;
-		if ( !empty( $orderby ) )
-			$orderby = 'ORDER BY ' . $orderby;
+		if ( ! empty($groupby) ) {
+					$groupby = 'GROUP BY ' . $groupby;
+		}
+		if ( !empty( $orderby ) ) {
+					$orderby = 'ORDER BY ' . $orderby;
+		}
 
 		$found_rows = '';
-		if ( !$q['no_found_rows'] && !empty($limits) )
-			$found_rows = 'SQL_CALC_FOUND_ROWS';
+		if ( !$q['no_found_rows'] && !empty($limits) ) {
+					$found_rows = 'SQL_CALC_FOUND_ROWS';
+		}
 
 		$this->request = $old_request = "SELECT $found_rows $distinct $fields FROM {$wpdb->posts} $join WHERE 1=1 $where $groupby $orderby $limits";
 
@@ -2915,12 +2993,14 @@ 
 							$this->posts = array();
 						} else {
 							$this->is_preview = true;
-							if ( 'future' != $status )
-								$this->posts[0]->post_date = current_time('mysql');
+							if ( 'future' != $status ) {
+															$this->posts[0]->post_date = current_time('mysql');
+							}
 						}
 					} elseif ( $post_status_obj->private ) {
-						if ( ! current_user_can($read_cap, $this->posts[0]->ID) )
-							$this->posts = array();
+						if ( ! current_user_can($read_cap, $this->posts[0]->ID) ) {
+													$this->posts = array();
+						}
 					} else {
 						$this->posts = array();
 					}
@@ -2962,8 +3042,9 @@ 
 			}
 
 			// If any posts have been excluded specifically, Ignore those that are sticky.
-			if ( !empty($sticky_posts) && !empty($q['post__not_in']) )
-				$sticky_posts = array_diff($sticky_posts, $q['post__not_in']);
+			if ( !empty($sticky_posts) && !empty($q['post__not_in']) ) {
+							$sticky_posts = array_diff($sticky_posts, $q['post__not_in']);
+			}
 
 			// Fetch sticky posts that weren't in the query results
 			if ( !empty($sticky_posts) ) {
@@ -3006,8 +3087,9 @@ 
 
 			$this->posts = array_map( 'get_post', $this->posts );
 
-			if ( $q['cache_results'] )
-				update_post_caches($this->posts, $post_type, $q['update_post_term_cache'], $q['update_post_meta_cache']);
+			if ( $q['cache_results'] ) {
+							update_post_caches($this->posts, $post_type, $q['update_post_term_cache'], $q['update_post_meta_cache']);
+			}
 
 			$this->post = reset( $this->posts );
 		} else {
@@ -3036,8 +3118,9 @@ 
 		global $wpdb;
 		// Bail if posts is an empty array. Continue if posts is an empty string,
 		// null, or false to accommodate caching plugins that fill posts later.
-		if ( $q['no_found_rows'] || ( is_array( $this->posts ) && ! $this->posts ) )
-			return;
+		if ( $q['no_found_rows'] || ( is_array( $this->posts ) && ! $this->posts ) ) {
+					return;
+		}
 
 		if ( ! empty( $limits ) ) {
 			/**
@@ -3063,8 +3146,9 @@ 
 		 */
 		$this->found_posts = apply_filters_ref_array( 'found_posts', array( $this->found_posts, &$this ) );
 
-		if ( ! empty( $limits ) )
-			$this->max_num_pages = ceil( $this->found_posts / $q['posts_per_page'] );
+		if ( ! empty( $limits ) ) {
+					$this->max_num_pages = ceil( $this->found_posts / $q['posts_per_page'] );
+		}
 	}
 
 	/**
@@ -3098,7 +3182,8 @@ 
 		global $post;
 		$this->in_the_loop = true;
 
-		if ( $this->current_post == -1 ) // loop has just started
+		if ( $this->current_post == -1 ) {
+			// loop has just started
 			/**
 			 * Fires once the loop is started.
 			 *
@@ -3107,6 +3192,7 @@ 
 			 * @param WP_Query &$this The WP_Query instance (passed by reference).
 			 */
 			do_action_ref_array( 'loop_start', array( &$this ) );
+		}
 
 		$post = $this->next_post();
 		$this->setup_postdata( $post );
@@ -3253,8 +3339,9 @@ 
 	 * @return object
 	 */
 	public function get_queried_object() {
-		if ( isset($this->queried_object) )
-			return $this->queried_object;
+		if ( isset($this->queried_object) ) {
+					return $this->queried_object;
+		}
 
 		$this->queried_object = null;
 		$this->queried_object_id = null;
@@ -3293,13 +3380,15 @@ 
 				$this->queried_object = $term;
 				$this->queried_object_id = (int) $term->term_id;
 
-				if ( $this->is_category && 'category' === $this->queried_object->taxonomy )
-					_make_cat_compat( $this->queried_object );
+				if ( $this->is_category && 'category' === $this->queried_object->taxonomy ) {
+									_make_cat_compat( $this->queried_object );
+				}
 			}
 		} elseif ( $this->is_post_type_archive ) {
 			$post_type = $this->get( 'post_type' );
-			if ( is_array( $post_type ) )
-				$post_type = reset( $post_type );
+			if ( is_array( $post_type ) ) {
+							$post_type = reset( $post_type );
+			}
 			$this->queried_object = get_post_type_object( $post_type );
 		} elseif ( $this->is_posts_page ) {
 			$page_for_posts = get_option('page_for_posts');
@@ -3419,12 +3508,14 @@ 
 	 * @return bool
 	 */
 	public function is_post_type_archive( $post_types = '' ) {
-		if ( empty( $post_types ) || ! $this->is_post_type_archive )
-			return (bool) $this->is_post_type_archive;
+		if ( empty( $post_types ) || ! $this->is_post_type_archive ) {
+					return (bool) $this->is_post_type_archive;
+		}
 
 		$post_type = $this->get( 'post_type' );
-		if ( is_array( $post_type ) )
-			$post_type = reset( $post_type );
+		if ( is_array( $post_type ) ) {
+					$post_type = reset( $post_type );
+		}
 		$post_type_object = get_post_type_object( $post_type );
 
 		return in_array( $post_type_object->name, (array) $post_types );
@@ -3473,22 +3564,25 @@ 
 	 * @return bool
 	 */
 	public function is_author( $author = '' ) {
-		if ( !$this->is_author )
-			return false;
+		if ( !$this->is_author ) {
+					return false;
+		}
 
-		if ( empty($author) )
-			return true;
+		if ( empty($author) ) {
+					return true;
+		}
 
 		$author_obj = $this->get_queried_object();
 
 		$author = array_map( 'strval', (array) $author );
 
-		if ( in_array( (string) $author_obj->ID, $author ) )
-			return true;
-		elseif ( in_array( $author_obj->nickname, $author ) )
-			return true;
-		elseif ( in_array( $author_obj->user_nicename, $author ) )
-			return true;
+		if ( in_array( (string) $author_obj->ID, $author ) ) {
+					return true;
+		} elseif ( in_array( $author_obj->nickname, $author ) ) {
+					return true;
+		} elseif ( in_array( $author_obj->user_nicename, $author ) ) {
+					return true;
+		}
 
 		return false;
 	}
@@ -3505,22 +3599,25 @@ 
 	 * @return bool
 	 */
 	public function is_category( $category = '' ) {
-		if ( !$this->is_category )
-			return false;
+		if ( !$this->is_category ) {
+					return false;
+		}
 
-		if ( empty($category) )
-			return true;
+		if ( empty($category) ) {
+					return true;
+		}
 
 		$cat_obj = $this->get_queried_object();
 
 		$category = array_map( 'strval', (array) $category );
 
-		if ( in_array( (string) $cat_obj->term_id, $category ) )
-			return true;
-		elseif ( in_array( $cat_obj->name, $category ) )
-			return true;
-		elseif ( in_array( $cat_obj->slug, $category ) )
-			return true;
+		if ( in_array( (string) $cat_obj->term_id, $category ) ) {
+					return true;
+		} elseif ( in_array( $cat_obj->name, $category ) ) {
+					return true;
+		} elseif ( in_array( $cat_obj->slug, $category ) ) {
+					return true;
+		}
 
 		return false;
 	}
@@ -3537,22 +3634,25 @@ 
 	 * @return bool
 	 */
 	public function is_tag( $tag = '' ) {
-		if ( ! $this->is_tag )
-			return false;
+		if ( ! $this->is_tag ) {
+					return false;
+		}
 
-		if ( empty( $tag ) )
-			return true;
+		if ( empty( $tag ) ) {
+					return true;
+		}
 
 		$tag_obj = $this->get_queried_object();
 
 		$tag = array_map( 'strval', (array) $tag );
 
-		if ( in_array( (string) $tag_obj->term_id, $tag ) )
-			return true;
-		elseif ( in_array( $tag_obj->name, $tag ) )
-			return true;
-		elseif ( in_array( $tag_obj->slug, $tag ) )
-			return true;
+		if ( in_array( (string) $tag_obj->term_id, $tag ) ) {
+					return true;
+		} elseif ( in_array( $tag_obj->name, $tag ) ) {
+					return true;
+		} elseif ( in_array( $tag_obj->slug, $tag ) ) {
+					return true;
+		}
 
 		return false;
 	}
@@ -3578,23 +3678,27 @@ 
 	public function is_tax( $taxonomy = '', $term = '' ) {
 		global $wp_taxonomies;
 
-		if ( !$this->is_tax )
-			return false;
+		if ( !$this->is_tax ) {
+					return false;
+		}
 
-		if ( empty( $taxonomy ) )
-			return true;
+		if ( empty( $taxonomy ) ) {
+					return true;
+		}
 
 		$queried_object = $this->get_queried_object();
 		$tax_array = array_intersect( array_keys( $wp_taxonomies ), (array) $taxonomy );
 		$term_array = (array) $term;
 
 		// Check that the taxonomy matches.
-		if ( ! ( isset( $queried_object->taxonomy ) && count( $tax_array ) && in_array( $queried_object->taxonomy, $tax_array ) ) )
-			return false;
+		if ( ! ( isset( $queried_object->taxonomy ) && count( $tax_array ) && in_array( $queried_object->taxonomy, $tax_array ) ) ) {
+					return false;
+		}
 
 		// Only a Taxonomy provided.
-		if ( empty( $term ) )
-			return true;
+		if ( empty( $term ) ) {
+					return true;
+		}
 
 		return isset( $queried_object->term_id ) &&
 			count( array_intersect(
@@ -3648,11 +3752,13 @@ 
 	 * @return bool
 	 */
 	public function is_feed( $feeds = '' ) {
-		if ( empty( $feeds ) || ! $this->is_feed )
-			return (bool) $this->is_feed;
+		if ( empty( $feeds ) || ! $this->is_feed ) {
+					return (bool) $this->is_feed;
+		}
 		$qv = $this->get( 'feed' );
-		if ( 'feed' == $qv )
-			$qv = get_default_feed();
+		if ( 'feed' == $qv ) {
+					$qv = get_default_feed();
+		}
 		return in_array( $qv, (array) $feeds );
 	}
 
@@ -3685,12 +3791,13 @@ 
 	 */
 	public function is_front_page() {
 		// most likely case
-		if ( 'posts' == get_option( 'show_on_front') && $this->is_home() )
-			return true;
-		elseif ( 'page' == get_option( 'show_on_front') && get_option( 'page_on_front' ) && $this->is_page( get_option( 'page_on_front' ) ) )
-			return true;
-		else
-			return false;
+		if ( 'posts' == get_option( 'show_on_front') && $this->is_home() ) {
+					return true;
+		} elseif ( 'page' == get_option( 'show_on_front') && get_option( 'page_on_front' ) && $this->is_page( get_option( 'page_on_front' ) ) ) {
+					return true;
+		} else {
+					return false;
+		}
 	}
 
 	/**
@@ -3739,11 +3846,13 @@ 
 	 * @return bool Whether the query is for an existing single page.
 	 */
 	public function is_page( $page = '' ) {
-		if ( !$this->is_page )
-			return false;
+		if ( !$this->is_page ) {
+					return false;
+		}
 
-		if ( empty( $page ) )
-			return true;
+		if ( empty( $page ) ) {
+					return true;
+		}
 
 		$page_obj = $this->get_queried_object();
 
@@ -3832,11 +3941,13 @@ 
 	 * @return bool Whether the query is for an existing single post.
 	 */
 	public function is_single( $post = '' ) {
-		if ( !$this->is_single )
-			return false;
+		if ( !$this->is_single ) {
+					return false;
+		}
 
-		if ( empty($post) )
-			return true;
+		if ( empty($post) ) {
+					return true;
+		}
 
 		$post_obj = $this->get_queried_object();
 
@@ -3878,8 +3989,9 @@ 
 	 * @return bool Whether the query is for an existing single post of any of the given post types.
 	 */
 	public function is_singular( $post_types = '' ) {
-		if ( empty( $post_types ) || !$this->is_singular )
-			return (bool) $this->is_singular;
+		if ( empty( $post_types ) || !$this->is_singular ) {
+					return (bool) $this->is_singular;
+		}
 
 		$post_obj = $this->get_queried_object();
 
@@ -3994,8 +4106,9 @@ 
 		$numpages = 1;
 		$multipage = 0;
 		$page = $this->get( 'page' );
-		if ( ! $page )
-			$page = 1;
+		if ( ! $page ) {
+					$page = 1;
+		}
 
 		/*
 		 * Force full post content when viewing the permalink for the $post,
@@ -4016,8 +4129,9 @@ 
 			$content = str_replace( "<!--nextpage-->\n", '<!--nextpage-->', $content );
 
 			// Ignore nextpage at the beginning of the content.
-			if ( 0 === strpos( $content, '<!--nextpage-->' ) )
-				$content = substr( $content, 15 );
+			if ( 0 === strpos( $content, '<!--nextpage-->' ) ) {
+							$content = substr( $content, 15 );
+			}
 
 			$pages = explode('<!--nextpage-->', $content);
 		} else {

src/wp-includes/class-wp-text-diff-renderer-table.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 ) ) {

Indentation +1 added lines, -1 removed lines

@@ -169,7 +169,7 @@
 				 *
 				 * @param String $processed_line The processed diffed line.
 				 * @param String $line           The unprocessed diffed line.
-		 		 * @param string null            The line context. Values are 'added', 'deleted' or 'unchanged'.
+				 * @param string null            The line context. Values are 'added', 'deleted' or 'unchanged'.
 				 */
 				$line = apply_filters( 'process_text_diff_html', $processed_line, $line, 'added' );
 			}

Spacing +94 added lines, -94 removed lines

@@ -21,7 +21,7 @@ 
 	 * @access public
 	 * @since 2.6.0
 	 */
-	public $_leading_context_lines  = 10000;
+	public $_leading_context_lines = 10000;
 
 	/**
 	 * @see Text_Diff_Renderer::_trailing_context_lines
@@ -58,7 +58,7 @@ 
 	 */
 	protected $_show_split_view = true;
 
-	protected $compat_fields = array( '_show_split_view', 'inline_diff_renderer', '_diff_threshold' );
+	protected $compat_fields = array('_show_split_view', 'inline_diff_renderer', '_diff_threshold');
 
 	/**
 	 * Constructor - Call parent constructor with params array.
@@ -69,10 +69,10 @@ 
 	 *
 	 * @param array $params
 	 */
-	public function __construct( $params = array() ) {
-		parent::__construct( $params );
-		if ( isset( $params[ 'show_split_view' ] ) )
-			$this->_show_split_view = $params[ 'show_split_view' ];
+	public function __construct($params = array()) {
+		parent::__construct($params);
+		if (isset($params['show_split_view']))
+			$this->_show_split_view = $params['show_split_view'];
 	}
 
 	/**
@@ -81,7 +81,7 @@ 
 	 * @param string $header
 	 * @return string
 	 */
-	public function _startBlock( $header ) {
+	public function _startBlock($header) {
 		return '';
 	}
 
@@ -91,7 +91,7 @@ 
 	 * @param array $lines
 	 * @param string $prefix
 	 */
-	public function _lines( $lines, $prefix=' ' ) {
+	public function _lines($lines, $prefix = ' ') {
 	}
 
 	/**
@@ -100,7 +100,7 @@ 
 	 * @param string $line HTML-escape the value.
 	 * @return string
 	 */
-	public function addedLine( $line ) {
+	public function addedLine($line) {
 		return "<td class='diff-addedline'>{$line}</td>";
 
 	}
@@ -111,7 +111,7 @@ 
 	 * @param string $line HTML-escape the value.
 	 * @return string
 	 */
-	public function deletedLine( $line ) {
+	public function deletedLine($line) {
 		return "<td class='diff-deletedline'>{$line}</td>";
 	}
 
@@ -121,7 +121,7 @@ 
 	 * @param string $line HTML-escape the value.
 	 * @return string
 	 */
-	public function contextLine( $line ) {
+	public function contextLine($line) {
 		return "<td class='diff-context'>{$line}</td>";
 	}
 
@@ -142,11 +142,11 @@ 
 	 * @param bool $encode
 	 * @return string
 	 */
-	public function _added( $lines, $encode = true ) {
+	public function _added($lines, $encode = true) {
 		$r = '';
 		foreach ($lines as $line) {
-			if ( $encode ) {
-				$processed_line = htmlspecialchars( $line );
+			if ($encode) {
+				$processed_line = htmlspecialchars($line);
 
 				/**
 				 * Contextually filters a diffed line.
@@ -161,13 +161,13 @@ 
 				 * @param String $line           The unprocessed diffed line.
 		 		 * @param string null            The line context. Values are 'added', 'deleted' or 'unchanged'.
 				 */
-				$line = apply_filters( 'process_text_diff_html', $processed_line, $line, 'added' );
+				$line = apply_filters('process_text_diff_html', $processed_line, $line, 'added');
 			}
 
-			if ( $this->_show_split_view ) {
-				$r .= '<tr>' . $this->emptyLine() . $this->emptyLine() . $this->addedLine( $line ) . "</tr>\n";
+			if ($this->_show_split_view) {
+				$r .= '<tr>'.$this->emptyLine().$this->emptyLine().$this->addedLine($line)."</tr>\n";
 			} else {
-				$r .= '<tr>' . $this->addedLine( $line ) . "</tr>\n";
+				$r .= '<tr>'.$this->addedLine($line)."</tr>\n";
 			}
 		}
 		return $r;
@@ -181,19 +181,19 @@ 
 	 * @param bool $encode
 	 * @return string
 	 */
-	public function _deleted( $lines, $encode = true ) {
+	public function _deleted($lines, $encode = true) {
 		$r = '';
 		foreach ($lines as $line) {
-			if ( $encode ) {
-				$processed_line = htmlspecialchars( $line );
+			if ($encode) {
+				$processed_line = htmlspecialchars($line);
 
 				/** This filter is documented in wp-includes/wp-diff.php */
-				$line = apply_filters( 'process_text_diff_html', $processed_line, $line, 'deleted' );
+				$line = apply_filters('process_text_diff_html', $processed_line, $line, 'deleted');
 			}
-			if ( $this->_show_split_view ) {
-				$r .= '<tr>' . $this->deletedLine( $line ) . $this->emptyLine() . $this->emptyLine() . "</tr>\n";
+			if ($this->_show_split_view) {
+				$r .= '<tr>'.$this->deletedLine($line).$this->emptyLine().$this->emptyLine()."</tr>\n";
 			} else {
-				$r .= '<tr>' . $this->deletedLine( $line ) . "</tr>\n";
+				$r .= '<tr>'.$this->deletedLine($line)."</tr>\n";
 			}
 
 		}
@@ -208,19 +208,19 @@ 
 	 * @param bool $encode
 	 * @return string
 	 */
-	public function _context( $lines, $encode = true ) {
+	public function _context($lines, $encode = true) {
 		$r = '';
 		foreach ($lines as $line) {
-			if ( $encode ) {
-				$processed_line = htmlspecialchars( $line );
+			if ($encode) {
+				$processed_line = htmlspecialchars($line);
 
 				/** This filter is documented in wp-includes/wp-diff.php */
-				$line = apply_filters( 'process_text_diff_html', $processed_line, $line, 'unchanged' );
+				$line = apply_filters('process_text_diff_html', $processed_line, $line, 'unchanged');
 			}
-			if (  $this->_show_split_view ) {
-				$r .= '<tr>' . $this->contextLine( $line ) . $this->emptyLine() . $this->contextLine( $line )  . "</tr>\n";
+			if ($this->_show_split_view) {
+				$r .= '<tr>'.$this->contextLine($line).$this->emptyLine().$this->contextLine($line)."</tr>\n";
 			} else {
-				$r .= '<tr>' . $this->contextLine( $line ) . "</tr>\n";
+				$r .= '<tr>'.$this->contextLine($line)."</tr>\n";
 			}
 		}
 		return $r;
@@ -239,7 +239,7 @@ 
 	 * @param array $final
 	 * @return string
 	 */
-	public function _changed( $orig, $final ) {
+	public function _changed($orig, $final) {
 		$r = '';
 
 		// Does the aforementioned additional processing
@@ -249,66 +249,66 @@ 
 		// *_rows are column vectors for the orig column and the final column.
 		//	row >= 0: an indix of the $orig or $final array
 		//	row  < 0: a blank row for that column
-		list($orig_matches, $final_matches, $orig_rows, $final_rows) = $this->interleave_changed_lines( $orig, $final );
+		list($orig_matches, $final_matches, $orig_rows, $final_rows) = $this->interleave_changed_lines($orig, $final);
 
 		// These will hold the word changes as determined by an inline diff
 		$orig_diffs  = array();
 		$final_diffs = array();
 
 		// Compute word diffs for each matched pair using the inline diff
-		foreach ( $orig_matches as $o => $f ) {
-			if ( is_numeric($o) && is_numeric($f) ) {
-				$text_diff = new Text_Diff( 'auto', array( array($orig[$o]), array($final[$f]) ) );
+		foreach ($orig_matches as $o => $f) {
+			if (is_numeric($o) && is_numeric($f)) {
+				$text_diff = new Text_Diff('auto', array(array($orig[$o]), array($final[$f])));
 				$renderer = new $this->inline_diff_renderer;
-				$diff = $renderer->render( $text_diff );
+				$diff = $renderer->render($text_diff);
 
 				// If they're too different, don't include any <ins> or <dels>
-				if ( preg_match_all( '!(<ins>.*?</ins>|<del>.*?</del>)!', $diff, $diff_matches ) ) {
+				if (preg_match_all('!(<ins>.*?</ins>|<del>.*?</del>)!', $diff, $diff_matches)) {
 					// length of all text between <ins> or <del>
-					$stripped_matches = strlen(strip_tags( join(' ', $diff_matches[0]) ));
+					$stripped_matches = strlen(strip_tags(join(' ', $diff_matches[0])));
 					// since we count lengith of text between <ins> or <del> (instead of picking just one),
 					//	we double the length of chars not in those tags.
-					$stripped_diff = strlen(strip_tags( $diff )) * 2 - $stripped_matches;
+					$stripped_diff = strlen(strip_tags($diff)) * 2 - $stripped_matches;
 					$diff_ratio = $stripped_matches / $stripped_diff;
-					if ( $diff_ratio > $this->_diff_threshold )
+					if ($diff_ratio > $this->_diff_threshold)
 						continue; // Too different. Don't save diffs.
 				}
 
 				// Un-inline the diffs by removing del or ins
-				$orig_diffs[$o]  = preg_replace( '|<ins>.*?</ins>|', '', $diff );
-				$final_diffs[$f] = preg_replace( '|<del>.*?</del>|', '', $diff );
+				$orig_diffs[$o]  = preg_replace('|<ins>.*?</ins>|', '', $diff);
+				$final_diffs[$f] = preg_replace('|<del>.*?</del>|', '', $diff);
 			}
 		}
 
-		foreach ( array_keys($orig_rows) as $row ) {
+		foreach (array_keys($orig_rows) as $row) {
 			// Both columns have blanks. Ignore them.
-			if ( $orig_rows[$row] < 0 && $final_rows[$row] < 0 )
+			if ($orig_rows[$row] < 0 && $final_rows[$row] < 0)
 				continue;
 
 			// If we have a word based diff, use it. Otherwise, use the normal line.
-			if ( isset( $orig_diffs[$orig_rows[$row]] ) )
+			if (isset($orig_diffs[$orig_rows[$row]]))
 				$orig_line = $orig_diffs[$orig_rows[$row]];
-			elseif ( isset( $orig[$orig_rows[$row]] ) )
+			elseif (isset($orig[$orig_rows[$row]]))
 				$orig_line = htmlspecialchars($orig[$orig_rows[$row]]);
 			else
 				$orig_line = '';
 
-			if ( isset( $final_diffs[$final_rows[$row]] ) )
+			if (isset($final_diffs[$final_rows[$row]]))
 				$final_line = $final_diffs[$final_rows[$row]];
-			elseif ( isset( $final[$final_rows[$row]] ) )
+			elseif (isset($final[$final_rows[$row]]))
 				$final_line = htmlspecialchars($final[$final_rows[$row]]);
 			else
 				$final_line = '';
 
-			if ( $orig_rows[$row] < 0 ) { // Orig is blank. This is really an added row.
-				$r .= $this->_added( array($final_line), false );
-			} elseif ( $final_rows[$row] < 0 ) { // Final is blank. This is really a deleted row.
-				$r .= $this->_deleted( array($orig_line), false );
+			if ($orig_rows[$row] < 0) { // Orig is blank. This is really an added row.
+				$r .= $this->_added(array($final_line), false);
+			} elseif ($final_rows[$row] < 0) { // Final is blank. This is really a deleted row.
+				$r .= $this->_deleted(array($orig_line), false);
 			} else { // A true changed row.
-				if ( $this->_show_split_view ) {
-					$r .= '<tr>' . $this->deletedLine( $orig_line ) . $this->emptyLine() . $this->addedLine( $final_line ) . "</tr>\n";
+				if ($this->_show_split_view) {
+					$r .= '<tr>'.$this->deletedLine($orig_line).$this->emptyLine().$this->addedLine($final_line)."</tr>\n";
 				} else {
-					$r .= '<tr>' . $this->deletedLine( $orig_line ) . "</tr><tr>" . $this->addedLine( $final_line ) . "</tr>\n";
+					$r .= '<tr>'.$this->deletedLine($orig_line)."</tr><tr>".$this->addedLine($final_line)."</tr>\n";
 				}
 			}
 		}
@@ -330,13 +330,13 @@ 
 	 * @param array $final
 	 * @return array
 	 */
-	public function interleave_changed_lines( $orig, $final ) {
+	public function interleave_changed_lines($orig, $final) {
 
 		// Contains all pairwise string comparisons. Keys are such that this need only be a one dimensional array.
 		$matches = array();
-		foreach ( array_keys($orig) as $o ) {
-			foreach ( array_keys($final) as $f ) {
-				$matches["$o,$f"] = $this->compute_string_distance( $orig[$o], $final[$f] );
+		foreach (array_keys($orig) as $o) {
+			foreach (array_keys($final) as $f) {
+				$matches["$o,$f"] = $this->compute_string_distance($orig[$o], $final[$f]);
 			}
 		}
 		asort($matches); // Order by string distance.
@@ -344,28 +344,28 @@ 
 		$orig_matches  = array();
 		$final_matches = array();
 
-		foreach ( $matches as $keys => $difference ) {
+		foreach ($matches as $keys => $difference) {
 			list($o, $f) = explode(',', $keys);
 			$o = (int) $o;
 			$f = (int) $f;
 
 			// Already have better matches for these guys
-			if ( isset($orig_matches[$o]) && isset($final_matches[$f]) )
+			if (isset($orig_matches[$o]) && isset($final_matches[$f]))
 				continue;
 
 			// First match for these guys. Must be best match
-			if ( !isset($orig_matches[$o]) && !isset($final_matches[$f]) ) {
+			if ( ! isset($orig_matches[$o]) && ! isset($final_matches[$f])) {
 				$orig_matches[$o] = $f;
 				$final_matches[$f] = $o;
 				continue;
 			}
 
 			// Best match of this final is already taken?  Must mean this final is a new row.
-			if ( isset($orig_matches[$o]) )
+			if (isset($orig_matches[$o]))
 				$final_matches[$f] = 'x';
 
 			// Best match of this orig is already taken?  Must mean this orig is a deleted row.
-			elseif ( isset($final_matches[$f]) )
+			elseif (isset($final_matches[$f]))
 				$orig_matches[$o] = 'x';
 		}
 
@@ -379,31 +379,31 @@ 
 
 		// Interleaves rows with blanks to keep matches aligned.
 		// We may end up with some extraneous blank rows, but we'll just ignore them later.
-		foreach ( $orig_rows_copy as $orig_row ) {
+		foreach ($orig_rows_copy as $orig_row) {
 			$final_pos = array_search($orig_matches[$orig_row], $final_rows, true);
 			$orig_pos = (int) array_search($orig_row, $orig_rows, true);
 
-			if ( false === $final_pos ) { // This orig is paired with a blank final.
-				array_splice( $final_rows, $orig_pos, 0, -1 );
-			} elseif ( $final_pos < $orig_pos ) { // This orig's match is up a ways. Pad final with blank rows.
+			if (false === $final_pos) { // This orig is paired with a blank final.
+				array_splice($final_rows, $orig_pos, 0, -1);
+			} elseif ($final_pos < $orig_pos) { // This orig's match is up a ways. Pad final with blank rows.
 				$diff_pos = $final_pos - $orig_pos;
-				while ( $diff_pos < 0 )
-					array_splice( $final_rows, $orig_pos, 0, $diff_pos++ );
-			} elseif ( $final_pos > $orig_pos ) { // This orig's match is down a ways. Pad orig with blank rows.
+				while ($diff_pos < 0)
+					array_splice($final_rows, $orig_pos, 0, $diff_pos++);
+			} elseif ($final_pos > $orig_pos) { // This orig's match is down a ways. Pad orig with blank rows.
 				$diff_pos = $orig_pos - $final_pos;
-				while ( $diff_pos < 0 )
-					array_splice( $orig_rows, $orig_pos, 0, $diff_pos++ );
+				while ($diff_pos < 0)
+					array_splice($orig_rows, $orig_pos, 0, $diff_pos++);
 			}
 		}
 
 		// Pad the ends with blank rows if the columns aren't the same length
 		$diff_count = count($orig_rows) - count($final_rows);
-		if ( $diff_count < 0 ) {
-			while ( $diff_count < 0 )
+		if ($diff_count < 0) {
+			while ($diff_count < 0)
 				array_push($orig_rows, $diff_count++);
-		} elseif ( $diff_count > 0 ) {
+		} elseif ($diff_count > 0) {
 			$diff_count = -1 * $diff_count;
-			while ( $diff_count < 0 )
+			while ($diff_count < 0)
 				array_push($final_rows, $diff_count++);
 		}
 
@@ -419,16 +419,16 @@ 
 	 * @param string $string2
 	 * @return int
 	 */
-	public function compute_string_distance( $string1, $string2 ) {
+	public function compute_string_distance($string1, $string2) {
 		// Vectors containing character frequency for all chars in each string
 		$chars1 = count_chars($string1);
 		$chars2 = count_chars($string2);
 
 		// L1-norm of difference vector.
-		$difference = array_sum( array_map( array($this, 'difference'), $chars1, $chars2 ) );
+		$difference = array_sum(array_map(array($this, 'difference'), $chars1, $chars2));
 
 		// $string1 has zero length? Odd. Give huge penalty by not dividing.
-		if ( !$string1 )
+		if ( ! $string1)
 			return $difference;
 
 		// Return distance per character (of string1).
@@ -443,8 +443,8 @@ 
 	 * @param int $b
 	 * @return int
 	 */
-	public function difference( $a, $b ) {
-		return abs( $a - $b );
+	public function difference($a, $b) {
+		return abs($a - $b);
 	}
 
 	/**
@@ -456,8 +456,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;
 		}
 	}
@@ -472,8 +472,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;
 		}
 	}
@@ -487,9 +487,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);
 		}
 	}
 
@@ -501,9 +501,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);
 		}
 	}
 }

Braces +49 added lines, -35 removed lines

@@ -81,8 +81,9 @@ 
 	 */
 	public function __construct( $params = array() ) {
 		parent::__construct( $params );
-		if ( isset( $params[ 'show_split_view' ] ) )
-			$this->_show_split_view = $params[ 'show_split_view' ];
+		if ( isset( $params[ 'show_split_view' ] ) ) {
+					$this->_show_split_view = $params[ 'show_split_view' ];
+		}
 	}
 
 	/**
@@ -280,8 +281,10 @@ 
 					//	we double the length of chars not in those tags.
 					$stripped_diff = strlen(strip_tags( $diff )) * 2 - $stripped_matches;
 					$diff_ratio = $stripped_matches / $stripped_diff;
-					if ( $diff_ratio > $this->_diff_threshold )
-						continue; // Too different. Don't save diffs.
+					if ( $diff_ratio > $this->_diff_threshold ) {
+											continue;
+					}
+					// Too different. Don't save diffs.
 				}
 
 				// Un-inline the diffs by removing del or ins
@@ -292,23 +295,26 @@ 
 
 		foreach ( array_keys($orig_rows) as $row ) {
 			// Both columns have blanks. Ignore them.
-			if ( $orig_rows[$row] < 0 && $final_rows[$row] < 0 )
-				continue;
+			if ( $orig_rows[$row] < 0 && $final_rows[$row] < 0 ) {
+							continue;
+			}
 
 			// If we have a word based diff, use it. Otherwise, use the normal line.
-			if ( isset( $orig_diffs[$orig_rows[$row]] ) )
-				$orig_line = $orig_diffs[$orig_rows[$row]];
-			elseif ( isset( $orig[$orig_rows[$row]] ) )
-				$orig_line = htmlspecialchars($orig[$orig_rows[$row]]);
-			else
-				$orig_line = '';
-
-			if ( isset( $final_diffs[$final_rows[$row]] ) )
-				$final_line = $final_diffs[$final_rows[$row]];
-			elseif ( isset( $final[$final_rows[$row]] ) )
-				$final_line = htmlspecialchars($final[$final_rows[$row]]);
-			else
-				$final_line = '';
+			if ( isset( $orig_diffs[$orig_rows[$row]] ) ) {
+							$orig_line = $orig_diffs[$orig_rows[$row]];
+			} elseif ( isset( $orig[$orig_rows[$row]] ) ) {
+							$orig_line = htmlspecialchars($orig[$orig_rows[$row]]);
+			} else {
+							$orig_line = '';
+			}
+
+			if ( isset( $final_diffs[$final_rows[$row]] ) ) {
+							$final_line = $final_diffs[$final_rows[$row]];
+			} elseif ( isset( $final[$final_rows[$row]] ) ) {
+							$final_line = htmlspecialchars($final[$final_rows[$row]]);
+			} else {
+							$final_line = '';
+			}
 
 			if ( $orig_rows[$row] < 0 ) { // Orig is blank. This is really an added row.
 				$r .= $this->_added( array($final_line), false );
@@ -360,8 +366,9 @@ 
 			$f = (int) $f;
 
 			// Already have better matches for these guys
-			if ( isset($orig_matches[$o]) && isset($final_matches[$f]) )
-				continue;
+			if ( isset($orig_matches[$o]) && isset($final_matches[$f]) ) {
+							continue;
+			}
 
 			// First match for these guys. Must be best match
 			if ( !isset($orig_matches[$o]) && !isset($final_matches[$f]) ) {
@@ -371,12 +378,14 @@ 
 			}
 
 			// Best match of this final is already taken?  Must mean this final is a new row.
-			if ( isset($orig_matches[$o]) )
-				$final_matches[$f] = 'x';
+			if ( isset($orig_matches[$o]) ) {
+							$final_matches[$f] = 'x';
+			}
 
 			// Best match of this orig is already taken?  Must mean this orig is a deleted row.
-			elseif ( isset($final_matches[$f]) )
-				$orig_matches[$o] = 'x';
+			elseif ( isset($final_matches[$f]) ) {
+							$orig_matches[$o] = 'x';
+			}
 		}
 
 		// We read the text in this order
@@ -397,24 +406,28 @@ 
 				array_splice( $final_rows, $orig_pos, 0, -1 );
 			} elseif ( $final_pos < $orig_pos ) { // This orig's match is up a ways. Pad final with blank rows.
 				$diff_pos = $final_pos - $orig_pos;
-				while ( $diff_pos < 0 )
-					array_splice( $final_rows, $orig_pos, 0, $diff_pos++ );
+				while ( $diff_pos < 0 ) {
+									array_splice( $final_rows, $orig_pos, 0, $diff_pos++ );
+				}
 			} elseif ( $final_pos > $orig_pos ) { // This orig's match is down a ways. Pad orig with blank rows.
 				$diff_pos = $orig_pos - $final_pos;
-				while ( $diff_pos < 0 )
-					array_splice( $orig_rows, $orig_pos, 0, $diff_pos++ );
+				while ( $diff_pos < 0 ) {
+									array_splice( $orig_rows, $orig_pos, 0, $diff_pos++ );
+				}
 			}
 		}
 
 		// Pad the ends with blank rows if the columns aren't the same length
 		$diff_count = count($orig_rows) - count($final_rows);
 		if ( $diff_count < 0 ) {
-			while ( $diff_count < 0 )
-				array_push($orig_rows, $diff_count++);
+			while ( $diff_count < 0 ) {
+							array_push($orig_rows, $diff_count++);
+			}
 		} elseif ( $diff_count > 0 ) {
 			$diff_count = -1 * $diff_count;
-			while ( $diff_count < 0 )
-				array_push($final_rows, $diff_count++);
+			while ( $diff_count < 0 ) {
+							array_push($final_rows, $diff_count++);
+			}
 		}
 
 		return array($orig_matches, $final_matches, $orig_rows, $final_rows);
@@ -438,8 +451,9 @@ 
 		$difference = array_sum( array_map( array($this, 'difference'), $chars1, $chars2 ) );
 
 		// $string1 has zero length? Odd. Give huge penalty by not dividing.
-		if ( !$string1 )
-			return $difference;
+		if ( !$string1 ) {
+					return $difference;
+		}
 
 		// Return distance per character (of string1).
 		return $difference / strlen($string1);

src/wp-includes/comment.php

Doc Comments +3 added lines, -3 removed lines

@@ -796,7 +796,7 @@ 
  * @param bool   $avoid_die When true, a disallowed comment will result in the function
  *                          returning a WP_Error object, rather than executing wp_die().
  *                          Default false.
- * @return bool Whether comment flooding is occurring.
+ * @return boolean|null Whether comment flooding is occurring.
  */
 function wp_check_comment_flood( $is_flood, $ip, $email, $date, $avoid_die = false ) {
 
@@ -1636,7 +1636,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.
@@ -2830,7 +2830,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' ) )

Spacing +564 added lines, -564 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);
 
 		/**
 		 * Filters the number of links found in a comment.
@@ -60,27 +60,27 @@ 
 		 * @param string $url       Comment author's URL. Included in allowed links total.
 		 * @param string $comment   Content of the comment.
 		 */
-		$num_links = apply_filters( 'comment_max_links_url', $num_links, $url, $comment );
+		$num_links = apply_filters('comment_max_links_url', $num_links, $url, $comment);
 
 		/*
 		 * 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;
 
 			/*
@@ -94,12 +94,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;
 		}
 	}
 
@@ -110,17 +110,17 @@ 
 	 * 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 != '' ) {
-			$comment_user = get_user_by( 'email', wp_unslash( $email ) );
-			if ( ! empty( $comment_user->ID ) ) {
-				$ok_to_comment = $wpdb->get_var( $wpdb->prepare( "SELECT comment_approved FROM $wpdb->comments WHERE user_id = %d AND comment_approved = '1' LIMIT 1", $comment_user->ID ) );
+	if (1 == get_option('comment_whitelist')) {
+		if ('trackback' != $comment_type && 'pingback' != $comment_type && $author != '' && $email != '') {
+			$comment_user = get_user_by('email', wp_unslash($email));
+			if ( ! empty($comment_user->ID)) {
+				$ok_to_comment = $wpdb->get_var($wpdb->prepare("SELECT comment_approved FROM $wpdb->comments WHERE user_id = %d AND comment_approved = '1' LIMIT 1", $comment_user->ID));
 			} else {
 				// expected_slashed ($author, $email)
-				$ok_to_comment = $wpdb->get_var( $wpdb->prepare( "SELECT comment_approved FROM $wpdb->comments WHERE comment_author = %s AND comment_author_email = %s and comment_approved = '1' LIMIT 1", $author, $email ) );
+				$ok_to_comment = $wpdb->get_var($wpdb->prepare("SELECT comment_approved FROM $wpdb->comments WHERE comment_author = %s AND comment_author_email = %s and comment_approved = '1' LIMIT 1", $author, $email));
 			}
-			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;
@@ -142,8 +142,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();
 	}
 
@@ -152,10 +152,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);
 }
 
 /**
@@ -174,20 +174,20 @@ 
  *                                       a WP_Comment object, an associative array, or a numeric array, respectively. Default OBJECT.
  * @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;
 	}
 
@@ -198,14 +198,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;
 }
@@ -221,9 +221,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);
 }
 
 /**
@@ -238,10 +238,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;
@@ -256,8 +256,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';
@@ -269,10 +269,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';
 	}
@@ -287,7 +287,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);
 }
 
 /**
@@ -302,33 +302,33 @@ 
  * @param string $timezone Which timezone to use in reference to 'gmt', 'blog', or 'server' locations.
  * @return string|false Last comment modified date on success, false on failure.
  */
-function get_lastcommentmodified( $timezone = 'server' ) {
+function get_lastcommentmodified($timezone = 'server') {
 	global $wpdb;
 
-	$timezone = strtolower( $timezone );
+	$timezone = strtolower($timezone);
 	$key = "lastcommentmodified:$timezone";
 
-	$comment_modified_date = wp_cache_get( $key, 'timeinfo' );
-	if ( false !== $comment_modified_date ) {
+	$comment_modified_date = wp_cache_get($key, 'timeinfo');
+	if (false !== $comment_modified_date) {
 		return $comment_modified_date;
 	}
 
-	switch ( $timezone ) {
+	switch ($timezone) {
 		case 'gmt':
-			$comment_modified_date = $wpdb->get_var( "SELECT comment_date_gmt FROM $wpdb->comments WHERE comment_approved = '1' ORDER BY comment_date_gmt DESC LIMIT 1" );
+			$comment_modified_date = $wpdb->get_var("SELECT comment_date_gmt FROM $wpdb->comments WHERE comment_approved = '1' ORDER BY comment_date_gmt DESC LIMIT 1");
 			break;
 		case 'blog':
-			$comment_modified_date = $wpdb->get_var( "SELECT comment_date FROM $wpdb->comments WHERE comment_approved = '1' ORDER BY comment_date_gmt DESC LIMIT 1" );
+			$comment_modified_date = $wpdb->get_var("SELECT comment_date FROM $wpdb->comments WHERE comment_approved = '1' ORDER BY comment_date_gmt DESC LIMIT 1");
 			break;
 		case 'server':
-			$add_seconds_server = date( 'Z' );
+			$add_seconds_server = date('Z');
 
-			$comment_modified_date = $wpdb->get_var( $wpdb->prepare( "SELECT DATE_ADD(comment_date_gmt, INTERVAL %s SECOND) FROM $wpdb->comments WHERE comment_approved = '1' ORDER BY comment_date_gmt DESC LIMIT 1", $add_seconds_server ) );
+			$comment_modified_date = $wpdb->get_var($wpdb->prepare("SELECT DATE_ADD(comment_date_gmt, INTERVAL %s SECOND) FROM $wpdb->comments WHERE comment_approved = '1' ORDER BY comment_date_gmt DESC LIMIT 1", $add_seconds_server));
 			break;
 	}
 
-	if ( $comment_modified_date ) {
-		wp_cache_set( $key, $comment_modified_date, 'timeinfo' );
+	if ($comment_modified_date) {
+		wp_cache_set($key, $comment_modified_date, 'timeinfo');
 
 		return $comment_modified_date;
 	}
@@ -349,13 +349,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);
 	}
 
@@ -376,8 +376,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;
@@ -489,20 +489,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);
 	}
 }
 
@@ -516,7 +516,7 @@ 
  * @since 3.4.0
  */
 function wp_set_comment_cookies($comment, $user) {
-	if ( $user->exists() )
+	if ($user->exists())
 		return;
 
 	/**
@@ -526,11 +526,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);
 }
 
 /**
@@ -542,7 +542,7 @@ 
  * @since 2.0.4
  */
 function sanitize_comment_cookies() {
-	if ( isset( $_COOKIE['comment_author_' . COOKIEHASH] ) ) {
+	if (isset($_COOKIE['comment_author_'.COOKIEHASH])) {
 		/**
 		 * Filters the comment author's name cookie before it is set.
 		 *
@@ -553,13 +553,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])) {
 		/**
 		 * Filters the comment author's email cookie before it is set.
 		 *
@@ -570,13 +570,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])) {
 		/**
 		 * Filters the comment author's URL cookie before it is set.
 		 *
@@ -587,7 +587,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;
 	}
@@ -609,29 +609,29 @@ 
  * @return int|string|WP_Error Allowed comments return the approval status (0|1|'spam').
  *                             If `$avoid_die` is true, disallowed comments return a WP_Error.
  */
-function wp_allow_comment( $commentdata, $avoid_die = false ) {
+function wp_allow_comment($commentdata, $avoid_die = false) {
 	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(
 			"AND 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.
@@ -643,9 +643,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.
 		 *
@@ -653,15 +653,15 @@ 
 		 *
 		 * @param array $commentdata Comment data.
 		 */
-		do_action( 'comment_duplicate_trigger', $commentdata );
-		if ( true === $avoid_die ) {
-			return new WP_Error( 'comment_duplicate', __( 'Duplicate comment detected; it looks as though you&#8217;ve already said that!' ), 409 );
+		do_action('comment_duplicate_trigger', $commentdata);
+		if (true === $avoid_die) {
+			return new WP_Error('comment_duplicate', __('Duplicate comment detected; it looks as though you&#8217;ve already said that!'), 409);
 		} else {
-			if ( wp_doing_ajax() ) {
-				die( __('Duplicate comment detected; it looks as though you&#8217;ve already said that!') );
+			if (wp_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);
 		}
 	}
 
@@ -710,24 +710,24 @@ 
 		$avoid_die
 	);
 
-	if ( $is_flood ) {
-		return new WP_Error( 'comment_flood', __( 'You are posting comments too quickly. Slow down.' ), 429 );
+	if ($is_flood) {
+		return new WP_Error('comment_flood', __('You are posting comments too quickly. Slow down.'), 429);
 	}
 
-	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'],
@@ -735,20 +735,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';
 		}
 	}
@@ -761,7 +761,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;
 }
 
@@ -776,7 +776,7 @@ 
  * @since 4.7.0 Converted to be an add_filter() wrapper.
  */
 function check_comment_flood_db() {
-	add_filter( 'wp_is_comment_flood', 'wp_check_comment_flood', 10, 5 );
+	add_filter('wp_is_comment_flood', 'wp_check_comment_flood', 10, 5);
 }
 
 /**
@@ -798,22 +798,22 @@ 
  *                          Default false.
  * @return bool Whether comment flooding is occurring.
  */
-function wp_check_comment_flood( $is_flood, $ip, $email, $date, $avoid_die = false ) {
+function wp_check_comment_flood($is_flood, $ip, $email, $date, $avoid_die = false) {
 
 	global $wpdb;
 
 	// Another callback has declared a flood. Trust it.
-	if ( true === $is_flood ) {
+	if (true === $is_flood) {
 		return $is_flood;
 	}
 
 	// 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 false;
 	}
-	$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 {
@@ -827,8 +827,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);
 		/**
@@ -840,8 +840,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.
 			 *
@@ -850,15 +850,15 @@ 
 			 * @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 );
-			if ( true === $avoid_die ) {
+			do_action('comment_flood_trigger', $time_lastcomment, $time_newcomment);
+			if (true === $avoid_die) {
 				return true;
 			} else {
-				if ( wp_doing_ajax() ) {
-					die( __('You are posting comments too quickly. Slow down.') );
+				if (wp_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);
 			}
 		}
 	}
@@ -877,12 +877,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];
 	}
 
@@ -903,37 +903,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;
@@ -959,49 +959,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'],
@@ -1019,15 +1019,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']);
 		}
 	}
 
@@ -1058,7 +1058,7 @@ 
 	 * }
 	 * @param int $comment_ID ID of the comment.
 	 */
-	return apply_filters( 'get_page_of_comment', (int) $page, $args, $original_args, $comment_ID );
+	return apply_filters('get_page_of_comment', (int) $page, $args, $original_args, $comment_ID);
 }
 
 /**
@@ -1080,28 +1080,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;
 			}
 		}
 	}
@@ -1113,7 +1113,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);
 }
 
 /**
@@ -1125,23 +1125,23 @@ 
  * @return WP_Error|true WP_Error when a comment field exceeds the limit,
  *                       otherwise true.
  */
-function wp_check_comment_data_max_lengths( $comment_data ) {
+function wp_check_comment_data_max_lengths($comment_data) {
 	$max_lengths = wp_get_comment_fields_max_lengths();
 
-	if ( isset( $comment_data['comment_author'] ) && mb_strlen( $comment_data['comment_author'], '8bit' ) > $max_lengths['comment_author'] ) {
-		return new WP_Error( 'comment_author_column_length', __( '<strong>ERROR</strong>: your name is too long.' ), 200 );
+	if (isset($comment_data['comment_author']) && mb_strlen($comment_data['comment_author'], '8bit') > $max_lengths['comment_author']) {
+		return new WP_Error('comment_author_column_length', __('<strong>ERROR</strong>: your name is too long.'), 200);
 	}
 
-	if ( isset( $comment_data['comment_author_email'] ) && strlen( $comment_data['comment_author_email'] ) > $max_lengths['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_data['comment_author_email']) && strlen($comment_data['comment_author_email']) > $max_lengths['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_data['comment_author_url'] ) && strlen( $comment_data['comment_author_url'] ) > $max_lengths['comment_author_url'] ) {
-		return new WP_Error( 'comment_author_url_column_length', __( '<strong>ERROR</strong>: your url is too long.' ), 200 );
+	if (isset($comment_data['comment_author_url']) && strlen($comment_data['comment_author_url']) > $max_lengths['comment_author_url']) {
+		return new WP_Error('comment_author_url_column_length', __('<strong>ERROR</strong>: your url is too long.'), 200);
 	}
 
-	if ( isset( $comment_data['comment_content'] ) && mb_strlen( $comment_data['comment_content'], '8bit' ) > $max_lengths['comment_content'] ) {
-		return new WP_Error( 'comment_content_column_length', __( '<strong>ERROR</strong>: your comment is too long.' ), 200 );
+	if (isset($comment_data['comment_content']) && mb_strlen($comment_data['comment_content'], '8bit') > $max_lengths['comment_content']) {
+		return new WP_Error('comment_content_column_length', __('<strong>ERROR</strong>: your comment is too long.'), 200);
 	}
 
 	return true;
@@ -1173,22 +1173,22 @@ 
 	 * @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
 
 	// Ensure HTML tags are not being used to bypass the blacklist.
-	$comment_without_html = wp_strip_all_tags( $comment );
+	$comment_without_html = wp_strip_all_tags($comment);
 
-	$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:
@@ -1225,7 +1225,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;
 
 	/**
@@ -1236,22 +1236,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;
 }
@@ -1275,10 +1275,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);
 
 	/**
@@ -1288,21 +1288,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;
 
 	/**
@@ -1312,16 +1312,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;
@@ -1338,10 +1338,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;
 
 	/**
@@ -1351,13 +1351,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.
@@ -1366,7 +1366,7 @@ 
 		 *
 		 * @param int $comment_id The comment ID.
 		 */
-		do_action( 'trashed_comment', $comment->comment_ID );
+		do_action('trashed_comment', $comment->comment_ID);
 		return true;
 	}
 
@@ -1382,8 +1382,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;
 	}
 
@@ -1394,15 +1394,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.
 		 *
@@ -1410,7 +1410,7 @@ 
 		 *
 		 * @param int $comment_id The comment ID.
 		 */
-		do_action( 'untrashed_comment', $comment->comment_ID );
+		do_action('untrashed_comment', $comment->comment_ID);
 		return true;
 	}
 
@@ -1425,9 +1425,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;
 	}
 
@@ -1438,13 +1438,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.
 		 *
@@ -1452,7 +1452,7 @@ 
 		 *
 		 * @param int $comment_id The comment ID.
 		 */
-		do_action( 'spammed_comment', $comment->comment_ID );
+		do_action('spammed_comment', $comment->comment_ID);
 		return true;
 	}
 
@@ -1467,9 +1467,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;
 	}
 
@@ -1480,15 +1480,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.
 		 *
@@ -1496,7 +1496,7 @@ 
 		 *
 		 * @param int $comment_id The comment ID.
 		 */
-		do_action( 'unspammed_comment', $comment->comment_ID );
+		do_action('unspammed_comment', $comment->comment_ID);
 		return true;
 	}
 
@@ -1513,20 +1513,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;
@@ -1562,11 +1562,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.
 		 *
@@ -1576,7 +1576,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.
 		 *
@@ -1587,7 +1587,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.
@@ -1603,7 +1603,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);
 }
 
 /**
@@ -1618,10 +1618,10 @@ 
  * @param string $new_status The new comment status.
  * @param string $old_status The old comment status.
  */
-function _clear_modified_cache_on_transition_comment_status( $new_status, $old_status ) {
-	if ( 'approved' === $new_status || 'approved' === $old_status ) {
-		foreach ( array( 'server', 'gmt', 'blog' ) as $timezone ) {
-			wp_cache_delete( "lastcommentmodified:$timezone", 'timeinfo' );
+function _clear_modified_cache_on_transition_comment_status($new_status, $old_status) {
+	if ('approved' === $new_status || 'approved' === $old_status) {
+		foreach (array('server', 'gmt', 'blog') as $timezone) {
+			wp_cache_delete("lastcommentmodified:$timezone", 'timeinfo');
 		}
 	}
 }
@@ -1642,15 +1642,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];
 
 	/**
@@ -1666,7 +1666,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'));
 }
 
 /**
@@ -1704,51 +1704,51 @@ 
  * }
  * @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);
 
-		foreach ( array( 'server', 'gmt', 'blog' ) as $timezone ) {
-			wp_cache_delete( "lastcommentmodified:$timezone", 'timeinfo' );
+		foreach (array('server', 'gmt', 'blog') as $timezone) {
+			wp_cache_delete("lastcommentmodified:$timezone", 'timeinfo');
 		}
 	}
 
-	clean_comment_cache( $id );
+	clean_comment_cache($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);
 		}
 	}
 
@@ -1760,7 +1760,7 @@ 
 	 * @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);
 
 	return $id;
 }
@@ -1778,7 +1778,7 @@ 
  * @return array Parsed comment information.
  */
 function wp_filter_comment($commentdata) {
-	if ( isset( $commentdata['user_ID'] ) ) {
+	if (isset($commentdata['user_ID'])) {
 		/**
 		 * Filters the comment author's user id before it is set.
 		 *
@@ -1789,10 +1789,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']);
 	}
 
 	/**
@@ -1802,9 +1802,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']);
 	/**
 	 * Filters the comment content before it is set.
 	 *
@@ -1812,7 +1812,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']);
 	/**
 	 * Filters the comment author's IP before it is set.
 	 *
@@ -1820,11 +1820,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;
 }
@@ -1840,9 +1840,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;
 }
@@ -1891,14 +1891,14 @@ 
  *                        executing wp_die()? Default false.
  * @return int|false|WP_Error The ID of the comment on success, false or WP_Error on failure.
  */
-function wp_new_comment( $commentdata, $avoid_die = false ) {
+function wp_new_comment($commentdata, $avoid_die = false) {
 	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;
 
 	/**
 	 * Filters a comment's data before it is sanitized and inserted into the database.
@@ -1907,63 +1907,63 @@ 
 	 *
 	 * @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);
 
-	$commentdata['comment_approved'] = wp_allow_comment( $commentdata, $avoid_die );
-	if ( is_wp_error( $commentdata['comment_approved'] ) ) {
+	$commentdata['comment_approved'] = wp_allow_comment($commentdata, $avoid_die);
+	if (is_wp_error($commentdata['comment_approved'])) {
 		return $commentdata['comment_approved'];
 	}
 
 	$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, $avoid_die );
-		if ( is_wp_error( $commentdata['comment_approved'] ) ) {
+		$commentdata['comment_approved'] = wp_allow_comment($commentdata, $avoid_die);
+		if (is_wp_error($commentdata['comment_approved'])) {
 			return $commentdata['comment_approved'];
 		}
 
-		$comment_ID = wp_insert_comment( $commentdata );
-		if ( ! $comment_ID ) {
+		$comment_ID = wp_insert_comment($commentdata);
+		if ( ! $comment_ID) {
 			return false;
 		}
 	}
@@ -1978,7 +1978,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;
 }
@@ -1991,20 +1991,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);
 }
 
 /**
@@ -2018,10 +2018,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');
 
 	/**
 	 * Filters whether to send the post author new comment notification emails,
@@ -2032,22 +2032,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);
 }
 
 /**
@@ -2068,7 +2068,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';
@@ -2076,7 +2076,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';
@@ -2090,16 +2090,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
@@ -2111,7 +2111,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);
 
@@ -2137,12 +2137,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;
 	}
 
@@ -2154,10 +2154,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);
 
 	/**
 	 * Filters the comment content before it is updated in the database.
@@ -2166,15 +2166,15 @@ 
 	 *
 	 * @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;
 	}
 
@@ -2192,15 +2192,15 @@ 
 	 * @param array $comment    The old, unslashed comment data.
 	 * @param array $commentarr The new, raw comment data.
 	 */
-	$data = apply_filters( 'wp_update_comment_data', $data, $comment, $commentarr );
+	$data = apply_filters('wp_update_comment_data', $data, $comment, $commentarr);
 
-	$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 );
+	$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' ) );
+	$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.
 	 *
@@ -2212,7 +2212,7 @@ 
 	 * @param int   $comment_ID The comment ID.
 	 * @param array $data       Comment data.
 	 */
-	do_action( 'edit_comment', $comment_ID, $data );
+	do_action('edit_comment', $comment_ID, $data);
 	$comment = get_comment($comment_ID);
 	wp_transition_comment_status($comment->comment_approved, $old_status, $comment);
 	return $rval;
@@ -2232,14 +2232,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;
@@ -2267,26 +2267,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);
 	}
 
@@ -2305,13 +2305,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;
@@ -2325,17 +2325,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.
@@ -2346,9 +2346,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;
 }
@@ -2370,9 +2370,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.0' );
+function discover_pingback_server_uri($url, $deprecated = '') {
+	if ( ! empty($deprecated))
+		_deprecated_argument(__FUNCTION__, '2.7.0');
 
 	$pingback_str_dquote = 'rel="pingback"';
 	$pingback_str_squote = 'rel=\'pingback\'';
@@ -2380,47 +2380,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;
 		}
 	}
@@ -2440,20 +2440,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
@@ -2470,44 +2470,44 @@ 
  *
  * @param int|WP_Post $post_id Post object or ID to do trackbacks on.
  */
-function do_trackbacks( $post_id ) {
+function do_trackbacks($post_id) {
 	global $wpdb;
-	$post = get_post( $post_id );
-	if ( ! $post ) {
+	$post = get_post($post_id);
+	if ( ! $post) {
 		return false;
 	}
 
-	$to_ping = get_to_ping( $post );
-	$pinged  = get_pung( $post );
-	if ( empty( $to_ping ) ) {
-		$wpdb->update($wpdb->posts, array( 'to_ping' => '' ), array( 'ID' => $post->ID ) );
+	$to_ping = get_to_ping($post);
+	$pinged  = get_pung($post);
+	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) ) {
-				trackback( $tb_ping, $post_title, $excerpt, $post->ID );
+			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));
 			}
 		}
 	}
@@ -2521,13 +2521,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);
 	}
 
@@ -2543,27 +2543,27 @@ 
  * @param string $content Post content to check for links. If empty will retrieve from post.
  * @param int|WP_Post $post_id Post Object or ID.
  */
-function pingback( $content, $post_id ) {
-	include_once( ABSPATH . WPINC . '/class-IXR.php' );
-	include_once( ABSPATH . WPINC . '/class-wp-http-ixr-client.php' );
+function pingback($content, $post_id) {
+	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();
 
-	$post = get_post( $post_id );
-	if ( ! $post ) {
+	$post = get_post($post_id);
+	if ( ! $post) {
 		return;
 	}
 
-	$pung = get_pung( $post );
+	$pung = get_pung($post);
 
-	if ( empty( $content ) ) {
+	if (empty($content)) {
 		$content = $post->post_content;
 	}
 
 	// 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
@@ -2574,19 +2574,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.
 	 *
@@ -2596,15 +2596,15 @@ 
 	 * @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 );
+			$pagelinkedfrom = get_permalink($post);
 
 			// using a timeout of 3 seconds should be enough to cover slow servers
 			$client = new WP_HTTP_IXR_Client($pingback_server_url);
@@ -2621,12 +2621,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/' . get_bloginfo( 'version' ), $client->useragent, $pingback_server_url, $pagelinkedto, $pagelinkedfrom );
+			$client->useragent = apply_filters('pingback_useragent', $client->useragent.' -- WordPress/'.get_bloginfo('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, $pagelinkedto );
+			if ($client->query('pingback.ping', $pagelinkedfrom, $pagelinkedto) || (isset($client->error->code) && 48 == $client->error->code)) // Already registered
+				add_ping($post, $pagelinkedto);
 		}
 	}
 }
@@ -2640,7 +2640,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 '';
@@ -2664,7 +2664,7 @@ 
 function trackback($trackback_url, $title, $excerpt, $ID) {
 	global $wpdb;
 
-	if ( empty($trackback_url) )
+	if (empty($trackback_url))
 		return;
 
 	$options = array();
@@ -2676,13 +2676,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));
 }
 
 /**
@@ -2694,18 +2694,18 @@ 
  * @param string $path Path to send the ping.
  */
 function weblog_ping($server = '', $path = '') {
-	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/' . get_bloginfo( 'version' );
+	$client->useragent .= ' -- WordPress/'.get_bloginfo('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);
 }
 
@@ -2718,8 +2718,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);
 }
 
 /**
@@ -2734,10 +2734,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, '');
 }
 
 //
@@ -2752,8 +2752,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.
@@ -2762,10 +2762,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');
 }
 
 /**
@@ -2781,17 +2781,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);
 	}
 }
 
@@ -2807,14 +2807,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);
 	}
 }
 
@@ -2832,8 +2832,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;
 
 	/**
@@ -2843,15 +2843,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';
 	}
@@ -2869,30 +2869,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;
@@ -2919,33 +2919,33 @@ 
  * }
  * @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 = 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']);
 	}
 
-	$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.
@@ -2954,22 +2954,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.
@@ -2978,11 +2978,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.
@@ -2991,11 +2991,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.
@@ -3004,11 +3004,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.
@@ -3017,9 +3017,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 {
 
@@ -3030,46 +3030,46 @@ 
 		 *
 		 * @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 comment.' ), 403 );
+		if (get_option('comment_registration')) {
+			return new WP_Error('not_logged_in', __('Sorry, you must be logged in to comment.'), 403);
 		}
 	}
 
 	$comment_type = '';
 
-	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 ( '' == $comment_content ) {
-		return new WP_Error( 'require_valid_comment', __( '<strong>ERROR</strong>: please type a comment.' ), 200 );
+	if ('' == $comment_content) {
+		return new WP_Error('require_valid_comment', __('<strong>ERROR</strong>: please type a comment.'), 200);
 	}
 
 	$commentdata = compact(
@@ -3083,19 +3083,19 @@ 
 		'user_ID'
 	);
 
-	$check_max_lengths = wp_check_comment_data_max_lengths( $commentdata );
-	if ( is_wp_error( $check_max_lengths ) ) {
+	$check_max_lengths = wp_check_comment_data_max_lengths($commentdata);
+	if (is_wp_error($check_max_lengths)) {
 		return $check_max_lengths;
 	}
 
-	$comment_id = wp_new_comment( wp_slash( $commentdata ), true );
-	if ( is_wp_error( $comment_id ) ) {
+	$comment_id = wp_new_comment(wp_slash($commentdata), true);
+	if (is_wp_error($comment_id)) {
 		return $comment_id;
 	}
 
-	if ( ! $comment_id ) {
-		return new WP_Error( 'comment_save_error', __( '<strong>ERROR</strong>: The comment could not be saved. Please try again later.' ), 500 );
+	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 +241 added lines, -157 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 );
@@ -66,8 +67,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'));
@@ -80,8 +82,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
@@ -94,12 +97,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;
+			}
 		}
 	}
 
@@ -120,10 +135,11 @@ 
 				$ok_to_comment = $wpdb->get_var( $wpdb->prepare( "SELECT comment_approved FROM $wpdb->comments WHERE comment_author = %s AND comment_author_email = %s and comment_approved = '1' LIMIT 1", $author, $email ) );
 			}
 			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;
 		}
@@ -516,8 +532,9 @@ 
  * @since 3.4.0
  */
 function wp_set_comment_cookies($comment, $user) {
-	if ( $user->exists() )
-		return;
+	if ( $user->exists() ) {
+			return;
+	}
 
 	/**
 	 * Filters the lifetime of the comment cookie in seconds.
@@ -879,11 +896,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;
@@ -906,28 +925,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;
@@ -964,8 +990,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 );
@@ -993,15 +1020,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'],
@@ -1176,8 +1205,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
 
 	// Ensure HTML tags are not being used to bypass the blacklist.
 	$comment_without_html = wp_strip_all_tags( $comment );
@@ -1203,8 +1234,9 @@ 
 			|| preg_match($pattern, $comment_without_html)
 			|| preg_match($pattern, $user_ip)
 			|| preg_match($pattern, $user_agent)
-		 )
-			return true;
+		 ) {
+					return true;
+		}
 	}
 	return false;
 }
@@ -1275,11 +1307,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.
@@ -1299,11 +1333,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.
@@ -1315,8 +1351,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 );
 
@@ -1338,11 +1375,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.
@@ -1397,8 +1436,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' );
@@ -1483,8 +1523,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' );
@@ -1513,24 +1554,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.
@@ -1562,8 +1605,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 ) {
@@ -1642,16 +1689,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];
+	}
 
 	/**
 	 * Filters the current commenter's name, email, and URL.
@@ -1840,10 +1890,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;
 }
 
@@ -2091,10 +2144,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 );
@@ -2238,8 +2292,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;
@@ -2285,8 +2340,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);
 	}
 
@@ -2305,14 +2359,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;
 
@@ -2371,8 +2427,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.0' );
+	if ( !empty( $deprecated ) ) {
+			_deprecated_argument( __FUNCTION__, '2.7.0' );
+	}
 
 	$pingback_str_dquote = 'rel="pingback"';
 	$pingback_str_squote = 'rel=\'pingback\'';
@@ -2380,31 +2437,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 );
 
@@ -2452,9 +2516,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();
@@ -2527,8 +2592,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;
@@ -2578,10 +2644,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;
@@ -2625,8 +2692,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, $pagelinkedto );
+			}
 		}
 	}
 }
@@ -2640,11 +2709,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.
@@ -2664,8 +2734,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;
@@ -2678,8 +2749,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) );
@@ -2705,9 +2777,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
@@ -2735,8 +2809,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, '' );
 }
 
@@ -2782,8 +2857,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.
@@ -2833,8 +2909,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;
+	}
 
 	/**
 	 * Filters the list of post types to automatically close comments for.
@@ -2844,12 +2921,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';
@@ -2870,30 +2949,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;
 }