ntwb / wordpress

src/wp-includes/customize/class-wp-customize-selective-refresh.php

Doc Comments +2 added lines, -2 removed lines

@@ -78,7 +78,7 @@ 
 	 * @since 4.5.0
 	 * @access public
 	 *
-	 * @return array Partials.
+	 * @return WP_Customize_Partial[] Partials.
 	 */
 	public function partials() {
 		return $this->partials;
@@ -283,7 +283,7 @@ 
 	 * @param string $errstr  Error string.
 	 * @param string $errfile Error file.
 	 * @param string $errline Error line.
-	 * @return true Always true.
+	 * @return boolean Always true.
 	 */
 	public function handle_error( $errno, $errstr, $errfile = null, $errline = null ) {
 		$this->triggered_errors[] = array(

Indentation +6 added lines, -6 removed lines

@@ -1,11 +1,11 @@
 <?php
 /**
- * Customize API: WP_Customize_Selective_Refresh class
- *
- * @package WordPress
- * @subpackage Customize
- * @since 4.5.0
- */
+	 * Customize API: WP_Customize_Selective_Refresh class
+	 *
+	 * @package WordPress
+	 * @subpackage Customize
+	 * @since 4.5.0
+	 */
 
 /**
  * Core Customizer class for implementing selective refresh.

Spacing +63 added lines, -63 removed lines

@@ -65,11 +65,11 @@ 
 	 *
 	 * @param WP_Customize_Manager $manager Manager instance.
 	 */
-	public function __construct( WP_Customize_Manager $manager ) {
+	public function __construct(WP_Customize_Manager $manager) {
 		$this->manager = $manager;
-		require_once( ABSPATH . WPINC . '/customize/class-wp-customize-partial.php' );
+		require_once(ABSPATH.WPINC.'/customize/class-wp-customize-partial.php');
 
-		add_action( 'customize_preview_init', array( $this, 'init_preview' ) );
+		add_action('customize_preview_init', array($this, 'init_preview'));
 	}
 
 	/**
@@ -94,22 +94,22 @@ 
 	 * @param array                       $args Optional. Partial arguments. Default empty array.
 	 * @return WP_Customize_Partial             The instance of the panel that was added.
 	 */
-	public function add_partial( $id, $args = array() ) {
-		if ( $id instanceof WP_Customize_Partial ) {
+	public function add_partial($id, $args = array()) {
+		if ($id instanceof WP_Customize_Partial) {
 			$partial = $id;
 		} else {
 			$class = 'WP_Customize_Partial';
 
 			/** This filter (will be) documented in wp-includes/class-wp-customize-manager.php */
-			$args = apply_filters( 'customize_dynamic_partial_args', $args, $id );
+			$args = apply_filters('customize_dynamic_partial_args', $args, $id);
 
 			/** This filter (will be) documented in wp-includes/class-wp-customize-manager.php */
-			$class = apply_filters( 'customize_dynamic_partial_class', $class, $id, $args );
+			$class = apply_filters('customize_dynamic_partial_class', $class, $id, $args);
 
-			$partial = new $class( $this, $id, $args );
+			$partial = new $class($this, $id, $args);
 		}
 
-		$this->partials[ $partial->id ] = $partial;
+		$this->partials[$partial->id] = $partial;
 		return $partial;
 	}
 
@@ -122,9 +122,9 @@ 
 	 * @param string $id Customize Partial ID.
 	 * @return WP_Customize_Partial|null The partial, if set. Otherwise null.
 	 */
-	public function get_partial( $id ) {
-		if ( isset( $this->partials[ $id ] ) ) {
-			return $this->partials[ $id ];
+	public function get_partial($id) {
+		if (isset($this->partials[$id])) {
+			return $this->partials[$id];
 		} else {
 			return null;
 		}
@@ -138,8 +138,8 @@ 
 	 *
 	 * @param string $id Customize Partial ID.
 	 */
-	public function remove_partial( $id ) {
-		unset( $this->partials[ $id ] );
+	public function remove_partial($id) {
+		unset($this->partials[$id]);
 	}
 
 	/**
@@ -149,8 +149,8 @@ 
 	 * @access public
 	 */
 	public function init_preview() {
-		add_action( 'template_redirect', array( $this, 'handle_render_partials_request' ) );
-		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_preview_scripts' ) );
+		add_action('template_redirect', array($this, 'handle_render_partials_request'));
+		add_action('wp_enqueue_scripts', array($this, 'enqueue_preview_scripts'));
 	}
 
 	/**
@@ -160,8 +160,8 @@ 
 	 * @access public
 	 */
 	public function enqueue_preview_scripts() {
-		wp_enqueue_script( 'customize-selective-refresh' );
-		add_action( 'wp_footer', array( $this, 'export_preview_data' ), 1000 );
+		wp_enqueue_script('customize-selective-refresh');
+		add_action('wp_footer', array($this, 'export_preview_data'), 1000);
 	}
 
 	/**
@@ -173,9 +173,9 @@ 
 	public function export_preview_data() {
 		$partials = array();
 
-		foreach ( $this->partials() as $partial ) {
-			if ( $partial->check_capabilities() ) {
-				$partials[ $partial->id ] = $partial->json();
+		foreach ($this->partials() as $partial) {
+			if ($partial->check_capabilities()) {
+				$partials[$partial->id] = $partial->json();
 			}
 		}
 
@@ -183,14 +183,14 @@ 
 			'partials'       => $partials,
 			'renderQueryVar' => self::RENDER_QUERY_VAR,
 			'l10n'           => array(
-				'shiftClickToEdit' => __( 'Shift-click to edit this element.' ),
+				'shiftClickToEdit' => __('Shift-click to edit this element.'),
 				/* translators: %s: document.write() */
-				'badDocumentWrite' => sprintf( __( '%s is forbidden' ), 'document.write()' ),
+				'badDocumentWrite' => sprintf(__('%s is forbidden'), 'document.write()'),
 			),
 		);
 
 		// Export data to JS.
-		echo sprintf( '<script>var _customizePartialRefreshExports = %s;</script>', wp_json_encode( $exports ) );
+		echo sprintf('<script>var _customizePartialRefreshExports = %s;</script>', wp_json_encode($exports));
 	}
 
 	/**
@@ -204,14 +204,14 @@ 
 	 * @param array $partial_ids The partial ID to add.
 	 * @return array Added WP_Customize_Partial instances.
 	 */
-	public function add_dynamic_partials( $partial_ids ) {
+	public function add_dynamic_partials($partial_ids) {
 		$new_partials = array();
 
-		foreach ( $partial_ids as $partial_id ) {
+		foreach ($partial_ids as $partial_id) {
 
 			// Skip partials already created.
-			$partial = $this->get_partial( $partial_id );
-			if ( $partial ) {
+			$partial = $this->get_partial($partial_id);
+			if ($partial) {
 				continue;
 			}
 
@@ -230,8 +230,8 @@ 
 			 * @param false|array $partial_args The arguments to the WP_Customize_Partial constructor.
 			 * @param string      $partial_id   ID for dynamic partial.
 			 */
-			$partial_args = apply_filters( 'customize_dynamic_partial_args', $partial_args, $partial_id );
-			if ( false === $partial_args ) {
+			$partial_args = apply_filters('customize_dynamic_partial_args', $partial_args, $partial_id);
+			if (false === $partial_args) {
 				continue;
 			}
 
@@ -246,11 +246,11 @@ 
 			 * @param string $partial_id    ID for dynamic partial.
 			 * @param array  $partial_args  The arguments to the WP_Customize_Partial constructor.
 			 */
-			$partial_class = apply_filters( 'customize_dynamic_partial_class', $partial_class, $partial_id, $partial_args );
+			$partial_class = apply_filters('customize_dynamic_partial_class', $partial_class, $partial_id, $partial_args);
 
-			$partial = new $partial_class( $this, $partial_id, $partial_args );
+			$partial = new $partial_class($this, $partial_id, $partial_args);
 
-			$this->add_partial( $partial );
+			$this->add_partial($partial);
 			$new_partials[] = $partial;
 		}
 		return $new_partials;
@@ -268,7 +268,7 @@ 
 	 * @return bool Whether the request is for rendering partials.
 	 */
 	public function is_render_partials_request() {
-		return ! empty( $_POST[ self::RENDER_QUERY_VAR ] );
+		return ! empty($_POST[self::RENDER_QUERY_VAR]);
 	}
 
 	/**
@@ -285,7 +285,7 @@ 
 	 * @param string $errline Error line.
 	 * @return true Always true.
 	 */
-	public function handle_error( $errno, $errstr, $errfile = null, $errline = null ) {
+	public function handle_error($errno, $errstr, $errfile = null, $errline = null) {
 		$this->triggered_errors[] = array(
 			'partial'      => $this->current_partial_id,
 			'error_number' => $errno,
@@ -303,7 +303,7 @@ 
 	 * @access public
 	 */
 	public function handle_render_partials_request() {
-		if ( ! $this->is_render_partials_request() ) {
+		if ( ! $this->is_render_partials_request()) {
 			return;
 		}
 
@@ -314,21 +314,21 @@ 
 		 * user passed the 'customize' capability check and the nonce check, since
 		 * WP_Customize_Manager::setup_theme() is where the previewing flag is set.
 		 */
-		if ( ! is_customize_preview() ) {
-			status_header( 403 );
-			wp_send_json_error( 'expected_customize_preview' );
-		} else if ( ! isset( $_POST['partials'] ) ) {
-			status_header( 400 );
-			wp_send_json_error( 'missing_partials' );
+		if ( ! is_customize_preview()) {
+			status_header(403);
+			wp_send_json_error('expected_customize_preview');
+		} else if ( ! isset($_POST['partials'])) {
+			status_header(400);
+			wp_send_json_error('missing_partials');
 		}
 
-		$partials = json_decode( wp_unslash( $_POST['partials'] ), true );
+		$partials = json_decode(wp_unslash($_POST['partials']), true);
 
-		if ( ! is_array( $partials ) ) {
-			wp_send_json_error( 'malformed_partials' );
+		if ( ! is_array($partials)) {
+			wp_send_json_error('malformed_partials');
 		}
 
-		$this->add_dynamic_partials( array_keys( $partials ) );
+		$this->add_dynamic_partials(array_keys($partials));
 
 		/**
 		 * Fires immediately before partials are rendered.
@@ -343,35 +343,35 @@ 
 		 *                                                 The array is keyed by partial ID, with each item being an array of
 		 *                                                 the placements' context data.
 		 */
-		do_action( 'customize_render_partials_before', $this, $partials );
+		do_action('customize_render_partials_before', $this, $partials);
 
-		set_error_handler( array( $this, 'handle_error' ), error_reporting() );
+		set_error_handler(array($this, 'handle_error'), error_reporting());
 
 		$contents = array();
 
-		foreach ( $partials as $partial_id => $container_contexts ) {
+		foreach ($partials as $partial_id => $container_contexts) {
 			$this->current_partial_id = $partial_id;
 
-			if ( ! is_array( $container_contexts ) ) {
-				wp_send_json_error( 'malformed_container_contexts' );
+			if ( ! is_array($container_contexts)) {
+				wp_send_json_error('malformed_container_contexts');
 			}
 
-			$partial = $this->get_partial( $partial_id );
+			$partial = $this->get_partial($partial_id);
 
-			if ( ! $partial || ! $partial->check_capabilities() ) {
-				$contents[ $partial_id ] = null;
+			if ( ! $partial || ! $partial->check_capabilities()) {
+				$contents[$partial_id] = null;
 				continue;
 			}
 
-			$contents[ $partial_id ] = array();
+			$contents[$partial_id] = array();
 
 			// @todo The array should include not only the contents, but also whether the container is included?
-			if ( empty( $container_contexts ) ) {
+			if (empty($container_contexts)) {
 				// Since there are no container contexts, render just once.
-				$contents[ $partial_id ][] = $partial->render( null );
+				$contents[$partial_id][] = $partial->render(null);
 			} else {
-				foreach ( $container_contexts as $container_context ) {
-					$contents[ $partial_id ][] = $partial->render( $container_context );
+				foreach ($container_contexts as $container_context) {
+					$contents[$partial_id][] = $partial->render($container_context);
 				}
 			}
 		}
@@ -392,13 +392,13 @@ 
 		 *                                                 The array is keyed by partial ID, with each item being an array of
 		 *                                                 the placements' context data.
 		 */
-		do_action( 'customize_render_partials_after', $this, $partials );
+		do_action('customize_render_partials_after', $this, $partials);
 
 		$response = array(
 			'contents' => $contents,
 		);
 
-		if ( defined( 'WP_DEBUG_DISPLAY' ) && WP_DEBUG_DISPLAY ) {
+		if (defined('WP_DEBUG_DISPLAY') && WP_DEBUG_DISPLAY) {
 			$response['errors'] = $this->triggered_errors;
 		}
 
@@ -432,8 +432,8 @@ 
 		 *                                                 The array is keyed by partial ID, with each item being an array of
 		 *                                                 the placements' context data.
 		 */
-		$response = apply_filters( 'customize_render_partials_response', $response, $this, $partials );
+		$response = apply_filters('customize_render_partials_response', $response, $this, $partials);
 
-		wp_send_json_success( $response );
+		wp_send_json_success($response);
 	}
 }

src/wp-includes/formatting.php

Doc Comments +4 added lines, -5 removed lines

@@ -879,7 +879,7 @@ 
  * @staticvar string $_charset
  *
  * @param string     $string         The text which is to be encoded.
- * @param int|string $quote_style    Optional. Converts double quotes if set to ENT_COMPAT,
+ * @param integer $quote_style    Optional. Converts double quotes if set to ENT_COMPAT,
  *                                   both single and double if set to ENT_QUOTES or none if set to ENT_NOQUOTES.
  *                                   Also compatible with old values; converting single quotes if set to 'single',
  *                                   double if set to 'double' or both if otherwise set.
@@ -952,7 +952,7 @@ 
  * @since 2.8.0
  *
  * @param string     $string The text which is to be decoded.
- * @param string|int $quote_style Optional. Converts double quotes if set to ENT_COMPAT,
+ * @param integer $quote_style Optional. Converts double quotes if set to ENT_COMPAT,
  *                                both single and double if set to ENT_QUOTES or
  *                                none if set to ENT_NOQUOTES.
  *                                Also compatible with old _wp_specialchars() values;
@@ -2658,7 +2658,7 @@ 
  * @since 1.5.0
  *
  * @param string $timezone Either 'Z' for 0 offset or '±hhmm'.
- * @return int|float The offset in seconds.
+ * @return integer The offset in seconds.
  */
 function iso8601_timezone_to_offset( $timezone ) {
 	// $timezone is either 'Z' or '[+|-]hhmm'
@@ -3316,7 +3316,7 @@ 
  * @since 2.8.1
  * @access private
  *
- * @param string|array $search  The value being searched for, otherwise known as the needle.
+ * @param string[] $search  The value being searched for, otherwise known as the needle.
  *                              An array may be used to designate multiple needles.
  * @param string       $subject The string being searched and replaced on, otherwise known as the haystack.
  * @return string The string with the replaced svalues.
@@ -3970,7 +3970,6 @@ 
  * @link http://www.php.net/sprintf
  *
  * @param string $pattern   The string which formatted args are inserted.
- * @param mixed  $args ,... Arguments to be formatted into the $pattern string.
  * @return string The formatted string.
  */
 function wp_sprintf( $pattern ) {

Indentation +14 added lines, -14 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 /**
- * Main WordPress Formatting API.
- *
- * Handles many functions for formatting output.
- *
- * @package WordPress
- */
+	 * Main WordPress Formatting API.
+	 *
+	 * Handles many functions for formatting output.
+	 *
+	 * @package WordPress
+	 */
 
 /**
  * Replaces common plain text characters into formatted entities
@@ -805,7 +805,7 @@ 
 		.     '\\['                          // Opening bracket
 		.     "($tagregexp)"                 // 2: Shortcode name
 		.     '(?![\\w-])'                   // Not followed by word character or hyphen
-		                                     // Unroll the loop: Inside the opening shortcode tag
+											 // Unroll the loop: Inside the opening shortcode tag
 		.     '[^\\]\\/]*'                   // Not a closing bracket or forward slash
 		.     '(?:'
 		.         '\\/(?!\\])'               // A forward slash not followed by a closing bracket
@@ -2238,7 +2238,7 @@ 
 				)
 				(\)?)                                                  # 3: Trailing closing parenthesis (for parethesis balancing post processing)
 			~xS'; // The regex is a non-anchored pattern and does not have a single fixed starting character.
-			      // Tell PCRE to spend more time optimizing since, when used on a page load, it will probably be used several times.
+				  // Tell PCRE to spend more time optimizing since, when used on a page load, it will probably be used several times.
 
 			$ret = preg_replace_callback( $url_clickable, '_make_url_clickable_cb', $ret );
 
@@ -2342,7 +2342,7 @@ 
 	$rel  = 'nofollow';
 
 	if ( preg_match( '%href=["\'](' . preg_quote( set_url_scheme( home_url(), 'http' ) ) . ')%i', $text ) ||
-	     preg_match( '%href=["\'](' . preg_quote( set_url_scheme( home_url(), 'https' ) ) . ')%i', $text )
+		 preg_match( '%href=["\'](' . preg_quote( set_url_scheme( home_url(), 'https' ) ) . ')%i', $text )
 	) {
 		return "<a $text>";
 	}
@@ -3515,7 +3515,7 @@ 
 	 * @since 2.0.6
 	 *
 	 * @param string $safe_text The text after it has been escaped.
- 	 * @param string $text      The text prior to being escaped.
+	 * @param string $text      The text prior to being escaped.
 	 */
 	return apply_filters( 'js_escape', $safe_text, $text );
 }
@@ -3540,7 +3540,7 @@ 
 	 * @since 2.8.0
 	 *
 	 * @param string $safe_text The text after it has been escaped.
- 	 * @param string $text      The text prior to being escaped.
+	 * @param string $text      The text prior to being escaped.
 	 */
 	return apply_filters( 'esc_html', $safe_text, $text );
 }
@@ -3565,7 +3565,7 @@ 
 	 * @since 2.0.6
 	 *
 	 * @param string $safe_text The text after it has been escaped.
- 	 * @param string $text      The text prior to being escaped.
+	 * @param string $text      The text prior to being escaped.
 	 */
 	return apply_filters( 'attribute_escape', $safe_text, $text );
 }
@@ -3586,7 +3586,7 @@ 
 	 * @since 3.1.0
 	 *
 	 * @param string $safe_text The text after it has been escaped.
- 	 * @param string $text      The text prior to being escaped.
+	 * @param string $text      The text prior to being escaped.
 	 */
 	return apply_filters( 'esc_textarea', $safe_text, $text );
 }
@@ -3607,7 +3607,7 @@ 
 	 * @since 2.8.0
 	 *
 	 * @param string $safe_tag The tag name after it has been escaped.
- 	 * @param string $tag_name The text before it was escaped.
+	 * @param string $tag_name The text before it was escaped.
 	 */
 	return apply_filters( 'tag_escape', $safe_tag, $tag_name );
 }

Spacing +956 added lines, -957 removed lines

@@ -38,7 +38,7 @@ 
  * @param bool   $reset Set to true for unit testing. Translated patterns will reset.
  * @return string The string replaced with html entities
  */
-function wptexturize( $text, $reset = false ) {
+function wptexturize($text, $reset = false) {
 	global $wp_cockneyreplace, $shortcode_tags;
 	static $static_characters = null,
 		$static_replacements = null,
@@ -59,12 +59,12 @@ 
 		$apos_flag = '<!--apos-->';
 
 	// If there's nothing to do, just stop.
-	if ( empty( $text ) || false === $run_texturize ) {
+	if (empty($text) || false === $run_texturize) {
 		return $text;
 	}
 
 	// Set up static variables. Run once only.
-	if ( $reset || ! isset( $static_characters ) ) {
+	if ($reset || ! isset($static_characters)) {
 		/**
 		 * Filter whether to skip running wptexturize().
 		 *
@@ -79,118 +79,118 @@ 
 		 *
 		 * @param bool $run_texturize Whether to short-circuit wptexturize().
 		 */
-		$run_texturize = apply_filters( 'run_wptexturize', $run_texturize );
-		if ( false === $run_texturize ) {
+		$run_texturize = apply_filters('run_wptexturize', $run_texturize);
+		if (false === $run_texturize) {
 			return $text;
 		}
 
 		/* translators: opening curly double quote */
-		$opening_quote = _x( '&#8220;', 'opening curly double quote' );
+		$opening_quote = _x('&#8220;', 'opening curly double quote');
 		/* translators: closing curly double quote */
-		$closing_quote = _x( '&#8221;', 'closing curly double quote' );
+		$closing_quote = _x('&#8221;', 'closing curly double quote');
 
 		/* translators: apostrophe, for example in 'cause or can't */
-		$apos = _x( '&#8217;', 'apostrophe' );
+		$apos = _x('&#8217;', 'apostrophe');
 
 		/* translators: prime, for example in 9' (nine feet) */
-		$prime = _x( '&#8242;', 'prime' );
+		$prime = _x('&#8242;', 'prime');
 		/* translators: double prime, for example in 9" (nine inches) */
-		$double_prime = _x( '&#8243;', 'double prime' );
+		$double_prime = _x('&#8243;', 'double prime');
 
 		/* translators: opening curly single quote */
-		$opening_single_quote = _x( '&#8216;', 'opening curly single quote' );
+		$opening_single_quote = _x('&#8216;', 'opening curly single quote');
 		/* translators: closing curly single quote */
-		$closing_single_quote = _x( '&#8217;', 'closing curly single quote' );
+		$closing_single_quote = _x('&#8217;', 'closing curly single quote');
 
 		/* translators: en dash */
-		$en_dash = _x( '&#8211;', 'en dash' );
+		$en_dash = _x('&#8211;', 'en dash');
 		/* translators: em dash */
-		$em_dash = _x( '&#8212;', 'em dash' );
+		$em_dash = _x('&#8212;', 'em dash');
 
 		$default_no_texturize_tags = array('pre', 'code', 'kbd', 'style', 'script', 'tt');
 		$default_no_texturize_shortcodes = array('code');
 
 		// if a plugin has provided an autocorrect array, use it
-		if ( isset($wp_cockneyreplace) ) {
-			$cockney = array_keys( $wp_cockneyreplace );
-			$cockneyreplace = array_values( $wp_cockneyreplace );
+		if (isset($wp_cockneyreplace)) {
+			$cockney = array_keys($wp_cockneyreplace);
+			$cockneyreplace = array_values($wp_cockneyreplace);
 		} else {
 			/* translators: This is a comma-separated list of words that defy the syntax of quotations in normal use,
 			 * for example...  'We do not have enough words yet' ... is a typical quoted phrase.  But when we write
 			 * lines of code 'til we have enough of 'em, then we need to insert apostrophes instead of quotes.
 			 */
-			$cockney = explode( ',', _x( "'tain't,'twere,'twas,'tis,'twill,'til,'bout,'nuff,'round,'cause,'em",
-				'Comma-separated list of words to texturize in your language' ) );
+			$cockney = explode(',', _x("'tain't,'twere,'twas,'tis,'twill,'til,'bout,'nuff,'round,'cause,'em",
+				'Comma-separated list of words to texturize in your language'));
 
-			$cockneyreplace = explode( ',', _x( '&#8217;tain&#8217;t,&#8217;twere,&#8217;twas,&#8217;tis,&#8217;twill,&#8217;til,&#8217;bout,&#8217;nuff,&#8217;round,&#8217;cause,&#8217;em',
-				'Comma-separated list of replacement words in your language' ) );
+			$cockneyreplace = explode(',', _x('&#8217;tain&#8217;t,&#8217;twere,&#8217;twas,&#8217;tis,&#8217;twill,&#8217;til,&#8217;bout,&#8217;nuff,&#8217;round,&#8217;cause,&#8217;em',
+				'Comma-separated list of replacement words in your language'));
 		}
 
-		$static_characters = array_merge( array( '...', '``', '\'\'', ' (tm)' ), $cockney );
-		$static_replacements = array_merge( array( '&#8230;', $opening_quote, $closing_quote, ' &#8482;' ), $cockneyreplace );
+		$static_characters = array_merge(array('...', '``', '\'\'', ' (tm)'), $cockney);
+		$static_replacements = array_merge(array('&#8230;', $opening_quote, $closing_quote, ' &#8482;'), $cockneyreplace);
 
 
 		// Pattern-based replacements of characters.
 		// Sort the remaining patterns into several arrays for performance tuning.
-		$dynamic_characters = array( 'apos' => array(), 'quote' => array(), 'dash' => array() );
-		$dynamic_replacements = array( 'apos' => array(), 'quote' => array(), 'dash' => array() );
+		$dynamic_characters = array('apos' => array(), 'quote' => array(), 'dash' => array());
+		$dynamic_replacements = array('apos' => array(), 'quote' => array(), 'dash' => array());
 		$dynamic = array();
 		$spaces = wp_spaces_regexp();
 
 		// '99' and '99" are ambiguous among other patterns; assume it's an abbreviated year at the end of a quotation.
-		if ( "'" !== $apos || "'" !== $closing_single_quote ) {
-			$dynamic[ '/\'(\d\d)\'(?=\Z|[.,:;!?)}\-\]]|&gt;|' . $spaces . ')/' ] = $apos_flag . '$1' . $closing_single_quote;
+		if ("'" !== $apos || "'" !== $closing_single_quote) {
+			$dynamic['/\'(\d\d)\'(?=\Z|[.,:;!?)}\-\]]|&gt;|'.$spaces.')/'] = $apos_flag.'$1'.$closing_single_quote;
 		}
-		if ( "'" !== $apos || '"' !== $closing_quote ) {
-			$dynamic[ '/\'(\d\d)"(?=\Z|[.,:;!?)}\-\]]|&gt;|' . $spaces . ')/' ] = $apos_flag . '$1' . $closing_quote;
+		if ("'" !== $apos || '"' !== $closing_quote) {
+			$dynamic['/\'(\d\d)"(?=\Z|[.,:;!?)}\-\]]|&gt;|'.$spaces.')/'] = $apos_flag.'$1'.$closing_quote;
 		}
 
 		// '99 '99s '99's (apostrophe)  But never '9 or '99% or '999 or '99.0.
-		if ( "'" !== $apos ) {
-			$dynamic[ '/\'(?=\d\d(?:\Z|(?![%\d]|[.,]\d)))/' ] = $apos_flag;
+		if ("'" !== $apos) {
+			$dynamic['/\'(?=\d\d(?:\Z|(?![%\d]|[.,]\d)))/'] = $apos_flag;
 		}
 
 		// Quoted Numbers like '0.42'
-		if ( "'" !== $opening_single_quote && "'" !== $closing_single_quote ) {
-			$dynamic[ '/(?<=\A|' . $spaces . ')\'(\d[.,\d]*)\'/' ] = $open_sq_flag . '$1' . $closing_single_quote;
+		if ("'" !== $opening_single_quote && "'" !== $closing_single_quote) {
+			$dynamic['/(?<=\A|'.$spaces.')\'(\d[.,\d]*)\'/'] = $open_sq_flag.'$1'.$closing_single_quote;
 		}
 
 		// Single quote at start, or preceded by (, {, <, [, ", -, or spaces.
-		if ( "'" !== $opening_single_quote ) {
-			$dynamic[ '/(?<=\A|[([{"\-]|&lt;|' . $spaces . ')\'/' ] = $open_sq_flag;
+		if ("'" !== $opening_single_quote) {
+			$dynamic['/(?<=\A|[([{"\-]|&lt;|'.$spaces.')\'/'] = $open_sq_flag;
 		}
 
 		// Apostrophe in a word.  No spaces, double apostrophes, or other punctuation.
-		if ( "'" !== $apos ) {
-			$dynamic[ '/(?<!' . $spaces . ')\'(?!\Z|[.,:;!?"\'(){}[\]\-]|&[lg]t;|' . $spaces . ')/' ] = $apos_flag;
+		if ("'" !== $apos) {
+			$dynamic['/(?<!'.$spaces.')\'(?!\Z|[.,:;!?"\'(){}[\]\-]|&[lg]t;|'.$spaces.')/'] = $apos_flag;
 		}
 
-		$dynamic_characters['apos'] = array_keys( $dynamic );
-		$dynamic_replacements['apos'] = array_values( $dynamic );
+		$dynamic_characters['apos'] = array_keys($dynamic);
+		$dynamic_replacements['apos'] = array_values($dynamic);
 		$dynamic = array();
 
 		// Quoted Numbers like "42"
-		if ( '"' !== $opening_quote && '"' !== $closing_quote ) {
-			$dynamic[ '/(?<=\A|' . $spaces . ')"(\d[.,\d]*)"/' ] = $open_q_flag . '$1' . $closing_quote;
+		if ('"' !== $opening_quote && '"' !== $closing_quote) {
+			$dynamic['/(?<=\A|'.$spaces.')"(\d[.,\d]*)"/'] = $open_q_flag.'$1'.$closing_quote;
 		}
 
 		// Double quote at start, or preceded by (, {, <, [, -, or spaces, and not followed by spaces.
-		if ( '"' !== $opening_quote ) {
-			$dynamic[ '/(?<=\A|[([{\-]|&lt;|' . $spaces . ')"(?!' . $spaces . ')/' ] = $open_q_flag;
+		if ('"' !== $opening_quote) {
+			$dynamic['/(?<=\A|[([{\-]|&lt;|'.$spaces.')"(?!'.$spaces.')/'] = $open_q_flag;
 		}
 
-		$dynamic_characters['quote'] = array_keys( $dynamic );
-		$dynamic_replacements['quote'] = array_values( $dynamic );
+		$dynamic_characters['quote'] = array_keys($dynamic);
+		$dynamic_replacements['quote'] = array_values($dynamic);
 		$dynamic = array();
 
 		// Dashes and spaces
-		$dynamic[ '/---/' ] = $em_dash;
-		$dynamic[ '/(?<=^|' . $spaces . ')--(?=$|' . $spaces . ')/' ] = $em_dash;
-		$dynamic[ '/(?<!xn)--/' ] = $en_dash;
-		$dynamic[ '/(?<=^|' . $spaces . ')-(?=$|' . $spaces . ')/' ] = $en_dash;
+		$dynamic['/---/'] = $em_dash;
+		$dynamic['/(?<=^|'.$spaces.')--(?=$|'.$spaces.')/'] = $em_dash;
+		$dynamic['/(?<!xn)--/'] = $en_dash;
+		$dynamic['/(?<=^|'.$spaces.')-(?=$|'.$spaces.')/'] = $en_dash;
 
-		$dynamic_characters['dash'] = array_keys( $dynamic );
-		$dynamic_replacements['dash'] = array_values( $dynamic );
+		$dynamic_characters['dash'] = array_keys($dynamic);
+		$dynamic_replacements['dash'] = array_values($dynamic);
 	}
 
 	// Must do this every time in case plugins use these filters in a context sensitive manner
@@ -201,7 +201,7 @@ 
 	 *
 	 * @param array $default_no_texturize_tags An array of HTML element names.
 	 */
-	$no_texturize_tags = apply_filters( 'no_texturize_tags', $default_no_texturize_tags );
+	$no_texturize_tags = apply_filters('no_texturize_tags', $default_no_texturize_tags);
 	/**
 	 * Filter the list of shortcodes not to texturize.
 	 *
@@ -209,84 +209,84 @@ 
 	 *
 	 * @param array $default_no_texturize_shortcodes An array of shortcode names.
 	 */
-	$no_texturize_shortcodes = apply_filters( 'no_texturize_shortcodes', $default_no_texturize_shortcodes );
+	$no_texturize_shortcodes = apply_filters('no_texturize_shortcodes', $default_no_texturize_shortcodes);
 
 	$no_texturize_tags_stack = array();
 	$no_texturize_shortcodes_stack = array();
 
 	// Look for shortcodes and HTML elements.
 
-	preg_match_all( '@\[/?([^<>&/\[\]\x00-\x20=]++)@', $text, $matches );
-	$tagnames = array_intersect( array_keys( $shortcode_tags ), $matches[1] );
-	$found_shortcodes = ! empty( $tagnames );
-	$shortcode_regex = $found_shortcodes ? _get_wptexturize_shortcode_regex( $tagnames ) : '';
-	$regex = _get_wptexturize_split_regex( $shortcode_regex );
+	preg_match_all('@\[/?([^<>&/\[\]\x00-\x20=]++)@', $text, $matches);
+	$tagnames = array_intersect(array_keys($shortcode_tags), $matches[1]);
+	$found_shortcodes = ! empty($tagnames);
+	$shortcode_regex = $found_shortcodes ? _get_wptexturize_shortcode_regex($tagnames) : '';
+	$regex = _get_wptexturize_split_regex($shortcode_regex);
 
-	$textarr = preg_split( $regex, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY );
+	$textarr = preg_split($regex, $text, -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
 
-	foreach ( $textarr as &$curl ) {
+	foreach ($textarr as &$curl) {
 		// Only call _wptexturize_pushpop_element if $curl is a delimiter.
 		$first = $curl[0];
-		if ( '<' === $first ) {
-			if ( '<!--' === substr( $curl, 0, 4 ) ) {
+		if ('<' === $first) {
+			if ('<!--' === substr($curl, 0, 4)) {
 				// This is an HTML comment delimiter.
 				continue;
 			} else {
 				// This is an HTML element delimiter.
 
 				// Replace each & with &#038; unless it already looks like an entity.
-				$curl = preg_replace( '/&(?!#(?:\d+|x[a-f0-9]+);|[a-z1-4]{1,8};)/i', '&#038;', $curl );
+				$curl = preg_replace('/&(?!#(?:\d+|x[a-f0-9]+);|[a-z1-4]{1,8};)/i', '&#038;', $curl);
 
-				_wptexturize_pushpop_element( $curl, $no_texturize_tags_stack, $no_texturize_tags );
+				_wptexturize_pushpop_element($curl, $no_texturize_tags_stack, $no_texturize_tags);
 			}
 
-		} elseif ( '' === trim( $curl ) ) {
+		} elseif ('' === trim($curl)) {
 			// This is a newline between delimiters.  Performance improves when we check this.
 			continue;
 
-		} elseif ( '[' === $first && $found_shortcodes && 1 === preg_match( '/^' . $shortcode_regex . '$/', $curl ) ) {
+		} elseif ('[' === $first && $found_shortcodes && 1 === preg_match('/^'.$shortcode_regex.'$/', $curl)) {
 			// This is a shortcode delimiter.
 
-			if ( '[[' !== substr( $curl, 0, 2 ) && ']]' !== substr( $curl, -2 ) ) {
+			if ('[[' !== substr($curl, 0, 2) && ']]' !== substr($curl, -2)) {
 				// Looks like a normal shortcode.
-				_wptexturize_pushpop_element( $curl, $no_texturize_shortcodes_stack, $no_texturize_shortcodes );
+				_wptexturize_pushpop_element($curl, $no_texturize_shortcodes_stack, $no_texturize_shortcodes);
 			} else {
 				// Looks like an escaped shortcode.
 				continue;
 			}
 
-		} elseif ( empty( $no_texturize_shortcodes_stack ) && empty( $no_texturize_tags_stack ) ) {
+		} elseif (empty($no_texturize_shortcodes_stack) && empty($no_texturize_tags_stack)) {
 			// This is neither a delimiter, nor is this content inside of no_texturize pairs.  Do texturize.
 
-			$curl = str_replace( $static_characters, $static_replacements, $curl );
+			$curl = str_replace($static_characters, $static_replacements, $curl);
 
-			if ( false !== strpos( $curl, "'" ) ) {
-				$curl = preg_replace( $dynamic_characters['apos'], $dynamic_replacements['apos'], $curl );
-				$curl = wptexturize_primes( $curl, "'", $prime, $open_sq_flag, $closing_single_quote );
-				$curl = str_replace( $apos_flag, $apos, $curl );
-				$curl = str_replace( $open_sq_flag, $opening_single_quote, $curl );
+			if (false !== strpos($curl, "'")) {
+				$curl = preg_replace($dynamic_characters['apos'], $dynamic_replacements['apos'], $curl);
+				$curl = wptexturize_primes($curl, "'", $prime, $open_sq_flag, $closing_single_quote);
+				$curl = str_replace($apos_flag, $apos, $curl);
+				$curl = str_replace($open_sq_flag, $opening_single_quote, $curl);
 			}
-			if ( false !== strpos( $curl, '"' ) ) {
-				$curl = preg_replace( $dynamic_characters['quote'], $dynamic_replacements['quote'], $curl );
-				$curl = wptexturize_primes( $curl, '"', $double_prime, $open_q_flag, $closing_quote );
-				$curl = str_replace( $open_q_flag, $opening_quote, $curl );
+			if (false !== strpos($curl, '"')) {
+				$curl = preg_replace($dynamic_characters['quote'], $dynamic_replacements['quote'], $curl);
+				$curl = wptexturize_primes($curl, '"', $double_prime, $open_q_flag, $closing_quote);
+				$curl = str_replace($open_q_flag, $opening_quote, $curl);
 			}
-			if ( false !== strpos( $curl, '-' ) ) {
-				$curl = preg_replace( $dynamic_characters['dash'], $dynamic_replacements['dash'], $curl );
+			if (false !== strpos($curl, '-')) {
+				$curl = preg_replace($dynamic_characters['dash'], $dynamic_replacements['dash'], $curl);
 			}
 
 			// 9x9 (times), but never 0x9999
-			if ( 1 === preg_match( '/(?<=\d)x\d/', $curl ) ) {
+			if (1 === preg_match('/(?<=\d)x\d/', $curl)) {
 				// Searching for a digit is 10 times more expensive than for the x, so we avoid doing this one!
-				$curl = preg_replace( '/\b(\d(?(?<=0)[\d\.,]+|[\d\.,]*))x(\d[\d\.,]*)\b/', '$1&#215;$2', $curl );
+				$curl = preg_replace('/\b(\d(?(?<=0)[\d\.,]+|[\d\.,]*))x(\d[\d\.,]*)\b/', '$1&#215;$2', $curl);
 			}
 
 			// Replace each & with &#038; unless it already looks like an entity.
-			$curl = preg_replace( '/&(?!#(?:\d+|x[a-f0-9]+);|[a-z1-4]{1,8};)/i', '&#038;', $curl );
+			$curl = preg_replace('/&(?!#(?:\d+|x[a-f0-9]+);|[a-z1-4]{1,8};)/i', '&#038;', $curl);
 		}
 	}
 
-	return implode( '', $textarr );
+	return implode('', $textarr);
 }
 
 /**
@@ -303,59 +303,59 @@ 
  * @param string $close_quote The closing quote char to use for replacement.
  * @return string The $haystack value after primes and quotes replacements.
  */
-function wptexturize_primes( $haystack, $needle, $prime, $open_quote, $close_quote ) {
+function wptexturize_primes($haystack, $needle, $prime, $open_quote, $close_quote) {
 	$spaces = wp_spaces_regexp();
 	$flag = '<!--wp-prime-or-quote-->';
-	$quote_pattern = "/$needle(?=\\Z|[.,:;!?)}\\-\\]]|&gt;|" . $spaces . ")/";
+	$quote_pattern = "/$needle(?=\\Z|[.,:;!?)}\\-\\]]|&gt;|".$spaces.")/";
 	$prime_pattern    = "/(?<=\\d)$needle/";
 	$flag_after_digit = "/(?<=\\d)$flag/";
 	$flag_no_digit    = "/(?<!\\d)$flag/";
 
-	$sentences = explode( $open_quote, $haystack );
+	$sentences = explode($open_quote, $haystack);
 
-	foreach ( $sentences as $key => &$sentence ) {
-		if ( false === strpos( $sentence, $needle ) ) {
+	foreach ($sentences as $key => &$sentence) {
+		if (false === strpos($sentence, $needle)) {
 			continue;
-		} elseif ( 0 !== $key && 0 === substr_count( $sentence, $close_quote ) ) {
-			$sentence = preg_replace( $quote_pattern, $flag, $sentence, -1, $count );
-			if ( $count > 1 ) {
+		} elseif (0 !== $key && 0 === substr_count($sentence, $close_quote)) {
+			$sentence = preg_replace($quote_pattern, $flag, $sentence, -1, $count);
+			if ($count > 1) {
 				// This sentence appears to have multiple closing quotes.  Attempt Vulcan logic.
-				$sentence = preg_replace( $flag_no_digit, $close_quote, $sentence, -1, $count2 );
-				if ( 0 === $count2 ) {
+				$sentence = preg_replace($flag_no_digit, $close_quote, $sentence, -1, $count2);
+				if (0 === $count2) {
 					// Try looking for a quote followed by a period.
-					$count2 = substr_count( $sentence, "$flag." );
-					if ( $count2 > 0 ) {
+					$count2 = substr_count($sentence, "$flag.");
+					if ($count2 > 0) {
 						// Assume the rightmost quote-period match is the end of quotation.
-						$pos = strrpos( $sentence, "$flag." );
+						$pos = strrpos($sentence, "$flag.");
 					} else {
 						// When all else fails, make the rightmost candidate a closing quote.
 						// This is most likely to be problematic in the context of bug #18549.
-						$pos = strrpos( $sentence, $flag );
+						$pos = strrpos($sentence, $flag);
 					}
-					$sentence = substr_replace( $sentence, $close_quote, $pos, strlen( $flag ) );
+					$sentence = substr_replace($sentence, $close_quote, $pos, strlen($flag));
 				}
 				// Use conventional replacement on any remaining primes and quotes.
-				$sentence = preg_replace( $prime_pattern, $prime, $sentence );
-				$sentence = preg_replace( $flag_after_digit, $prime, $sentence );
-				$sentence = str_replace( $flag, $close_quote, $sentence );
-			} elseif ( 1 == $count ) {
+				$sentence = preg_replace($prime_pattern, $prime, $sentence);
+				$sentence = preg_replace($flag_after_digit, $prime, $sentence);
+				$sentence = str_replace($flag, $close_quote, $sentence);
+			} elseif (1 == $count) {
 				// Found only one closing quote candidate, so give it priority over primes.
-				$sentence = str_replace( $flag, $close_quote, $sentence );
-				$sentence = preg_replace( $prime_pattern, $prime, $sentence );
+				$sentence = str_replace($flag, $close_quote, $sentence);
+				$sentence = preg_replace($prime_pattern, $prime, $sentence);
 			} else {
 				// No closing quotes found.  Just run primes pattern.
-				$sentence = preg_replace( $prime_pattern, $prime, $sentence );
+				$sentence = preg_replace($prime_pattern, $prime, $sentence);
 			}
 		} else {
-			$sentence = preg_replace( $prime_pattern, $prime, $sentence );
-			$sentence = preg_replace( $quote_pattern, $close_quote, $sentence );
+			$sentence = preg_replace($prime_pattern, $prime, $sentence);
+			$sentence = preg_replace($quote_pattern, $close_quote, $sentence);
 		}
-		if ( '"' == $needle && false !== strpos( $sentence, '"' ) ) {
-			$sentence = str_replace( '"', $close_quote, $sentence );
+		if ('"' == $needle && false !== strpos($sentence, '"')) {
+			$sentence = str_replace('"', $close_quote, $sentence);
 		}
 	}
 
-	return implode( $open_quote, $sentences );
+	return implode($open_quote, $sentences);
 }
 
 /**
@@ -372,12 +372,12 @@ 
  * @param array  $stack List of open tag elements.
  * @param array  $disabled_elements The tag names to match against. Spaces are not allowed in tag names.
  */
-function _wptexturize_pushpop_element( $text, &$stack, $disabled_elements ) {
+function _wptexturize_pushpop_element($text, &$stack, $disabled_elements) {
 	// Is it an opening tag or closing tag?
-	if ( isset( $text[1] ) && '/' !== $text[1] ) {
+	if (isset($text[1]) && '/' !== $text[1]) {
 		$opening_tag = true;
 		$name_offset = 1;
-	} elseif ( 0 == count( $stack ) ) {
+	} elseif (0 == count($stack)) {
 		// Stack is empty. Just stop.
 		return;
 	} else {
@@ -386,17 +386,17 @@ 
 	}
 
 	// Parse out the tag name.
-	$space = strpos( $text, ' ' );
-	if ( false === $space ) {
+	$space = strpos($text, ' ');
+	if (false === $space) {
 		$space = -1;
 	} else {
 		$space -= $name_offset;
 	}
-	$tag = substr( $text, $name_offset, $space );
+	$tag = substr($text, $name_offset, $space);
 
 	// Handle disabled tags.
-	if ( in_array( $tag, $disabled_elements ) ) {
-		if ( $opening_tag ) {
+	if (in_array($tag, $disabled_elements)) {
+		if ($opening_tag) {
 			/*
 			 * This disables texturize until we find a closing tag of our type
 			 * (e.g. <pre>) even if there was invalid nesting before that
@@ -405,9 +405,9 @@ 
 			 *          "baba" won't be texturize
 			 */
 
-			array_push( $stack, $tag );
-		} elseif ( end( $stack ) == $tag ) {
-			array_pop( $stack );
+			array_push($stack, $tag);
+		} elseif (end($stack) == $tag) {
+			array_pop($stack);
 		}
 	}
 }
@@ -426,38 +426,38 @@ 
  *                    after paragraphing. Default true.
  * @return string Text which has been converted into correct paragraph tags.
  */
-function wpautop( $pee, $br = true ) {
+function wpautop($pee, $br = true) {
 	$pre_tags = array();
 
-	if ( trim($pee) === '' )
+	if (trim($pee) === '')
 		return '';
 
 	// Just to make things a little easier, pad the end.
-	$pee = $pee . "\n";
+	$pee = $pee."\n";
 
 	/*
 	 * Pre tags shouldn't be touched by autop.
 	 * Replace pre tags with placeholders and bring them back after autop.
 	 */
-	if ( strpos($pee, '<pre') !== false ) {
-		$pee_parts = explode( '</pre>', $pee );
+	if (strpos($pee, '<pre') !== false) {
+		$pee_parts = explode('</pre>', $pee);
 		$last_pee = array_pop($pee_parts);
 		$pee = '';
 		$i = 0;
 
-		foreach ( $pee_parts as $pee_part ) {
+		foreach ($pee_parts as $pee_part) {
 			$start = strpos($pee_part, '<pre');
 
 			// Malformed html?
-			if ( $start === false ) {
+			if ($start === false) {
 				$pee .= $pee_part;
 				continue;
 			}
 
 			$name = "<pre wp-pre-tag-$i></pre>";
-			$pre_tags[$name] = substr( $pee_part, $start ) . '</pre>';
+			$pre_tags[$name] = substr($pee_part, $start).'</pre>';
 
-			$pee .= substr( $pee_part, 0, $start ) . $name;
+			$pee .= substr($pee_part, 0, $start).$name;
 			$i++;
 		}
 
@@ -469,41 +469,41 @@ 
 	$allblocks = '(?:table|thead|tfoot|caption|col|colgroup|tbody|tr|td|th|div|dl|dd|dt|ul|ol|li|pre|form|map|area|blockquote|address|math|style|p|h[1-6]|hr|fieldset|legend|section|article|aside|hgroup|header|footer|nav|figure|figcaption|details|menu|summary)';
 
 	// Add a single line break above block-level opening tags.
-	$pee = preg_replace('!(<' . $allblocks . '[\s/>])!', "\n$1", $pee);
+	$pee = preg_replace('!(<'.$allblocks.'[\s/>])!', "\n$1", $pee);
 
 	// Add a double line break below block-level closing tags.
-	$pee = preg_replace('!(</' . $allblocks . '>)!', "$1\n\n", $pee);
+	$pee = preg_replace('!(</'.$allblocks.'>)!', "$1\n\n", $pee);
 
 	// Standardize newline characters to "\n".
 	$pee = str_replace(array("\r\n", "\r"), "\n", $pee);
 
 	// Find newlines in all elements and add placeholders.
-	$pee = wp_replace_in_html_tags( $pee, array( "\n" => " <!-- wpnl --> " ) );
+	$pee = wp_replace_in_html_tags($pee, array("\n" => " <!-- wpnl --> "));
 
 	// Collapse line breaks before and after <option> elements so they don't get autop'd.
-	if ( strpos( $pee, '<option' ) !== false ) {
-		$pee = preg_replace( '|\s*<option|', '<option', $pee );
-		$pee = preg_replace( '|</option>\s*|', '</option>', $pee );
+	if (strpos($pee, '<option') !== false) {
+		$pee = preg_replace('|\s*<option|', '<option', $pee);
+		$pee = preg_replace('|</option>\s*|', '</option>', $pee);
 	}
 
 	/*
 	 * Collapse line breaks inside <object> elements, before <param> and <embed> elements
 	 * so they don't get autop'd.
 	 */
-	if ( strpos( $pee, '</object>' ) !== false ) {
-		$pee = preg_replace( '|(<object[^>]*>)\s*|', '$1', $pee );
-		$pee = preg_replace( '|\s*</object>|', '</object>', $pee );
-		$pee = preg_replace( '%\s*(</?(?:param|embed)[^>]*>)\s*%', '$1', $pee );
+	if (strpos($pee, '</object>') !== false) {
+		$pee = preg_replace('|(<object[^>]*>)\s*|', '$1', $pee);
+		$pee = preg_replace('|\s*</object>|', '</object>', $pee);
+		$pee = preg_replace('%\s*(</?(?:param|embed)[^>]*>)\s*%', '$1', $pee);
 	}
 
 	/*
 	 * Collapse line breaks inside <audio> and <video> elements,
 	 * before and after <source> and <track> elements.
 	 */
-	if ( strpos( $pee, '<source' ) !== false || strpos( $pee, '<track' ) !== false ) {
-		$pee = preg_replace( '%([<\[](?:audio|video)[^>\]]*[>\]])\s*%', '$1', $pee );
-		$pee = preg_replace( '%\s*([<\[]/(?:audio|video)[>\]])%', '$1', $pee );
-		$pee = preg_replace( '%\s*(<(?:source|track)[^>]*>)\s*%', '$1', $pee );
+	if (strpos($pee, '<source') !== false || strpos($pee, '<track') !== false) {
+		$pee = preg_replace('%([<\[](?:audio|video)[^>\]]*[>\]])\s*%', '$1', $pee);
+		$pee = preg_replace('%\s*([<\[]/(?:audio|video)[>\]])%', '$1', $pee);
+		$pee = preg_replace('%\s*(<(?:source|track)[^>]*>)\s*%', '$1', $pee);
 	}
 
 	// Remove more than two contiguous line breaks.
@@ -516,8 +516,8 @@ 
 	$pee = '';
 
 	// Rebuild the content as a string, wrapping every bit with a <p>.
-	foreach ( $pees as $tinkle ) {
-		$pee .= '<p>' . trim($tinkle, "\n") . "</p>\n";
+	foreach ($pees as $tinkle) {
+		$pee .= '<p>'.trim($tinkle, "\n")."</p>\n";
 	}
 
 	// Under certain strange conditions it could create a P of entirely whitespace.
@@ -527,7 +527,7 @@ 
 	$pee = preg_replace('!<p>([^<]+)</(div|address|form)>!', "<p>$1</p></$2>", $pee);
 
 	// If an opening or closing block element tag is wrapped in a <p>, unwrap it.
-	$pee = preg_replace('!<p>\s*(</?' . $allblocks . '[^>]*>)\s*</p>!', "$1", $pee);
+	$pee = preg_replace('!<p>\s*(</?'.$allblocks.'[^>]*>)\s*</p>!', "$1", $pee);
 
 	// In some cases <li> may get wrapped in <p>, fix them.
 	$pee = preg_replace("|<p>(<li.+?)</p>|", "$1", $pee);
@@ -537,18 +537,18 @@ 
 	$pee = str_replace('</blockquote></p>', '</p></blockquote>', $pee);
 
 	// If an opening or closing block element tag is preceded by an opening <p> tag, remove it.
-	$pee = preg_replace('!<p>\s*(</?' . $allblocks . '[^>]*>)!', "$1", $pee);
+	$pee = preg_replace('!<p>\s*(</?'.$allblocks.'[^>]*>)!', "$1", $pee);
 
 	// If an opening or closing block element tag is followed by a closing <p> tag, remove it.
-	$pee = preg_replace('!(</?' . $allblocks . '[^>]*>)\s*</p>!', "$1", $pee);
+	$pee = preg_replace('!(</?'.$allblocks.'[^>]*>)\s*</p>!', "$1", $pee);
 
 	// Optionally insert line breaks.
-	if ( $br ) {
+	if ($br) {
 		// Replace newlines that shouldn't be touched with a placeholder.
 		$pee = preg_replace_callback('/<(script|style).*?<\/\\1>/s', '_autop_newline_preservation_helper', $pee);
 
 		// Normalize <br>
-		$pee = str_replace( array( '<br>', '<br/>' ), '<br />', $pee );
+		$pee = str_replace(array('<br>', '<br/>'), '<br />', $pee);
 
 		// Replace any new line characters that aren't preceded by a <br /> with a <br />.
 		$pee = preg_replace('|(?<!<br />)\s*\n|', "<br />\n", $pee);
@@ -558,19 +558,19 @@ 
 	}
 
 	// If a <br /> tag is after an opening or closing block tag, remove it.
-	$pee = preg_replace('!(</?' . $allblocks . '[^>]*>)\s*<br />!', "$1", $pee);
+	$pee = preg_replace('!(</?'.$allblocks.'[^>]*>)\s*<br />!', "$1", $pee);
 
 	// If a <br /> tag is before a subset of opening or closing block tags, remove it.
 	$pee = preg_replace('!<br />(\s*</?(?:p|li|div|dl|dd|dt|th|pre|td|ul|ol)[^>]*>)!', '$1', $pee);
-	$pee = preg_replace( "|\n</p>$|", '</p>', $pee );
+	$pee = preg_replace("|\n</p>$|", '</p>', $pee);
 
 	// Replace placeholder <pre> tags with their original content.
-	if ( !empty($pre_tags) )
+	if ( ! empty($pre_tags))
 		$pee = str_replace(array_keys($pre_tags), array_values($pre_tags), $pee);
 
 	// Restore newlines in all elements.
-	if ( false !== strpos( $pee, '<!-- wpnl -->' ) ) {
-		$pee = str_replace( array( ' <!-- wpnl --> ', '<!-- wpnl -->' ), "\n", $pee );
+	if (false !== strpos($pee, '<!-- wpnl -->')) {
+		$pee = str_replace(array(' <!-- wpnl --> ', '<!-- wpnl -->'), "\n", $pee);
 	}
 
 	return $pee;
@@ -584,8 +584,8 @@ 
  * @param string $input The text which has to be formatted.
  * @return array The formatted text.
  */
-function wp_html_split( $input ) {
-	return preg_split( get_html_split_regex(), $input, -1, PREG_SPLIT_DELIM_CAPTURE );
+function wp_html_split($input) {
+	return preg_split(get_html_split_regex(), $input, -1, PREG_SPLIT_DELIM_CAPTURE);
 }
 
 /**
@@ -598,14 +598,14 @@ 
 function get_html_split_regex() {
 	static $regex;
 
-	if ( ! isset( $regex ) ) {
+	if ( ! isset($regex)) {
 		$comments =
 			  '!'           // Start of comment, after the <.
 			. '(?:'         // Unroll the loop: Consume everything until --> is found.
 			.     '-(?!->)' // Dash not followed by end of comment.
 			.     '[^\-]*+' // Consume non-dashes.
 			. ')*+'         // Loop possessively.
-			. '(?:-->)?';   // End of comment. If not found, match all input.
+			. '(?:-->)?'; // End of comment. If not found, match all input.
 
 		$cdata =
 			  '!\[CDATA\['  // Start of comment, after the <.
@@ -614,7 +614,7 @@ 
 			.     '](?!]>)' // One ] not followed by end of comment.
 			.     '[^\]]*+' // Consume non-].
 			. ')*+'         // Loop possessively.
-			. '(?:]]>)?';   // End of comment. If not found, match all input.
+			. '(?:]]>)?'; // End of comment. If not found, match all input.
 
 		$escaped =
 			  '(?='           // Is the element escaped?
@@ -653,19 +653,19 @@ 
  * @param string $shortcode_regex The result from _get_wptexturize_shortcode_regex().  Optional.
  * @return string The regular expression
  */
-function _get_wptexturize_split_regex( $shortcode_regex = '' ) {
+function _get_wptexturize_split_regex($shortcode_regex = '') {
 	static $html_regex;
 
-	if ( ! isset( $html_regex ) ) {
+	if ( ! isset($html_regex)) {
 		$comment_regex =
 			  '!'           // Start of comment, after the <.
 			. '(?:'         // Unroll the loop: Consume everything until --> is found.
 			.     '-(?!->)' // Dash not followed by end of comment.
 			.     '[^\-]*+' // Consume non-dashes.
 			. ')*+'         // Loop possessively.
-			. '(?:-->)?';   // End of comment. If not found, match all input.
+			. '(?:-->)?'; // End of comment. If not found, match all input.
 
-		$html_regex =			 // Needs replaced with wp_html_split() per Shortcode API Roadmap.
+		$html_regex = // Needs replaced with wp_html_split() per Shortcode API Roadmap.
 			  '<'                // Find start of element.
 			. '(?(?=!--)'        // Is this a comment?
 			.     $comment_regex // Find end of comment.
@@ -674,10 +674,10 @@ 
 			. ')';
 	}
 
-	if ( empty( $shortcode_regex ) ) {
-		$regex = '/(' . $html_regex . ')/';
+	if (empty($shortcode_regex)) {
+		$regex = '/('.$html_regex.')/';
 	} else {
-		$regex = '/(' . $html_regex . '|' . $shortcode_regex . ')/';
+		$regex = '/('.$html_regex.'|'.$shortcode_regex.')/';
 	}
 
 	return $regex;
@@ -694,8 +694,8 @@ 
  * @param array $tagnames List of shortcodes to find.
  * @return string The regular expression
  */
-function _get_wptexturize_shortcode_regex( $tagnames ) {
-	$tagregexp = join( '|', array_map( 'preg_quote', $tagnames ) );
+function _get_wptexturize_shortcode_regex($tagnames) {
+	$tagregexp = join('|', array_map('preg_quote', $tagnames));
 	$tagregexp = "(?:$tagregexp)(?=[\\s\\]\\/])"; // Excerpt of get_shortcode_regex().
 	$regex =
 		  '\['              // Find start of shortcode.
@@ -707,7 +707,7 @@ 
 		.     '<[^\[\]>]*>' // HTML elements permitted. Prevents matching ] before >.
 		. ')*+'             // Possessive critical.
 		. '\]'              // Find end of shortcode.
-		. '\]?';            // Shortcodes may end with ]]
+		. '\]?'; // Shortcodes may end with ]]
 
 	return $regex;
 }
@@ -721,32 +721,32 @@ 
  * @param array $replace_pairs In the form array('from' => 'to', ...).
  * @return string The formatted text.
  */
-function wp_replace_in_html_tags( $haystack, $replace_pairs ) {
+function wp_replace_in_html_tags($haystack, $replace_pairs) {
 	// Find all elements.
-	$textarr = wp_html_split( $haystack );
+	$textarr = wp_html_split($haystack);
 	$changed = false;
 
 	// Optimize when searching for one item.
-	if ( 1 === count( $replace_pairs ) ) {
+	if (1 === count($replace_pairs)) {
 		// Extract $needle and $replace.
-		foreach ( $replace_pairs as $needle => $replace );
+		foreach ($replace_pairs as $needle => $replace);
 
 		// Loop through delimiters (elements) only.
-		for ( $i = 1, $c = count( $textarr ); $i < $c; $i += 2 ) {
-			if ( false !== strpos( $textarr[$i], $needle ) ) {
-				$textarr[$i] = str_replace( $needle, $replace, $textarr[$i] );
+		for ($i = 1, $c = count($textarr); $i < $c; $i += 2) {
+			if (false !== strpos($textarr[$i], $needle)) {
+				$textarr[$i] = str_replace($needle, $replace, $textarr[$i]);
 				$changed = true;
 			}
 		}
 	} else {
 		// Extract all $needles.
-		$needles = array_keys( $replace_pairs );
+		$needles = array_keys($replace_pairs);
 
 		// Loop through delimiters (elements) only.
-		for ( $i = 1, $c = count( $textarr ); $i < $c; $i += 2 ) {
-			foreach ( $needles as $needle ) {
-				if ( false !== strpos( $textarr[$i], $needle ) ) {
-					$textarr[$i] = strtr( $textarr[$i], $replace_pairs );
+		for ($i = 1, $c = count($textarr); $i < $c; $i += 2) {
+			foreach ($needles as $needle) {
+				if (false !== strpos($textarr[$i], $needle)) {
+					$textarr[$i] = strtr($textarr[$i], $replace_pairs);
 					$changed = true;
 					// After one strtr() break out of the foreach loop and look at next element.
 					break;
@@ -755,8 +755,8 @@ 
 		}
 	}
 
-	if ( $changed ) {
-		$haystack = implode( $textarr );
+	if ($changed) {
+		$haystack = implode($textarr);
 	}
 
 	return $haystack;
@@ -771,8 +771,8 @@ 
  * @param array $matches preg_replace_callback matches array
  * @return string
  */
-function _autop_newline_preservation_helper( $matches ) {
-	return str_replace( "\n", "<WPPreserveNewline />", $matches[0] );
+function _autop_newline_preservation_helper($matches) {
+	return str_replace("\n", "<WPPreserveNewline />", $matches[0]);
 }
 
 /**
@@ -787,20 +787,20 @@ 
  * @param string $pee The content.
  * @return string The filtered content.
  */
-function shortcode_unautop( $pee ) {
+function shortcode_unautop($pee) {
 	global $shortcode_tags;
 
-	if ( empty( $shortcode_tags ) || !is_array( $shortcode_tags ) ) {
+	if (empty($shortcode_tags) || ! is_array($shortcode_tags)) {
 		return $pee;
 	}
 
-	$tagregexp = join( '|', array_map( 'preg_quote', array_keys( $shortcode_tags ) ) );
+	$tagregexp = join('|', array_map('preg_quote', array_keys($shortcode_tags)));
 	$spaces = wp_spaces_regexp();
 
 	$pattern =
 		  '/'
 		. '<p>'                              // Opening paragraph
-		. '(?:' . $spaces . ')*+'            // Optional leading whitespace
+		. '(?:'.$spaces.')*+'            // Optional leading whitespace
 		. '('                                // 1: The shortcode
 		.     '\\['                          // Opening bracket
 		.     "($tagregexp)"                 // 2: Shortcode name
@@ -825,11 +825,11 @@ 
 		.         ')?'
 		.     ')'
 		. ')'
-		. '(?:' . $spaces . ')*+'            // optional trailing whitespace
+		. '(?:'.$spaces.')*+'            // optional trailing whitespace
 		. '<\\/p>'                           // closing paragraph
 		. '/';
 
-	return preg_replace( $pattern, '$1', $pee );
+	return preg_replace($pattern, '$1', $pee);
 }
 
 /**
@@ -844,20 +844,20 @@ 
  * @param string $str The string to be checked
  * @return bool True if $str fits a UTF-8 model, false otherwise.
  */
-function seems_utf8( $str ) {
+function seems_utf8($str) {
 	mbstring_binary_safe_encoding();
 	$length = strlen($str);
 	reset_mbstring_encoding();
-	for ($i=0; $i < $length; $i++) {
+	for ($i = 0; $i < $length; $i++) {
 		$c = ord($str[$i]);
 		if ($c < 0x80) $n = 0; // 0bbbbbbb
-		elseif (($c & 0xE0) == 0xC0) $n=1; // 110bbbbb
-		elseif (($c & 0xF0) == 0xE0) $n=2; // 1110bbbb
-		elseif (($c & 0xF8) == 0xF0) $n=3; // 11110bbb
-		elseif (($c & 0xFC) == 0xF8) $n=4; // 111110bb
-		elseif (($c & 0xFE) == 0xFC) $n=5; // 1111110b
+		elseif (($c & 0xE0) == 0xC0) $n = 1; // 110bbbbb
+		elseif (($c & 0xF0) == 0xE0) $n = 2; // 1110bbbb
+		elseif (($c & 0xF8) == 0xF0) $n = 3; // 11110bbb
+		elseif (($c & 0xFC) == 0xF8) $n = 4; // 111110bb
+		elseif (($c & 0xFE) == 0xFC) $n = 5; // 1111110b
 		else return false; // Does not match any model
-		for ($j=0; $j<$n; $j++) { // n bytes matching 10bbbbbb follow ?
+		for ($j = 0; $j < $n; $j++) { // n bytes matching 10bbbbbb follow ?
 			if ((++$i == $length) || ((ord($str[$i]) & 0xC0) != 0x80))
 				return false;
 		}
@@ -888,55 +888,55 @@ 
  * @param bool       $double_encode  Optional. Whether to encode existing html entities. Default is false.
  * @return string The encoded text with HTML entities.
  */
-function _wp_specialchars( $string, $quote_style = ENT_NOQUOTES, $charset = false, $double_encode = false ) {
+function _wp_specialchars($string, $quote_style = ENT_NOQUOTES, $charset = false, $double_encode = false) {
 	$string = (string) $string;
 
-	if ( 0 === strlen( $string ) )
+	if (0 === strlen($string))
 		return '';
 
 	// Don't bother if there are no specialchars - saves some processing
-	if ( ! preg_match( '/[&<>"\']/', $string ) )
+	if ( ! preg_match('/[&<>"\']/', $string))
 		return $string;
 
 	// Account for the previous behaviour of the function when the $quote_style is not an accepted value
-	if ( empty( $quote_style ) )
+	if (empty($quote_style))
 		$quote_style = ENT_NOQUOTES;
-	elseif ( ! in_array( $quote_style, array( 0, 2, 3, 'single', 'double' ), true ) )
+	elseif ( ! in_array($quote_style, array(0, 2, 3, 'single', 'double'), true))
 		$quote_style = ENT_QUOTES;
 
 	// Store the site charset as a static to avoid multiple calls to wp_load_alloptions()
-	if ( ! $charset ) {
+	if ( ! $charset) {
 		static $_charset = null;
-		if ( ! isset( $_charset ) ) {
+		if ( ! isset($_charset)) {
 			$alloptions = wp_load_alloptions();
-			$_charset = isset( $alloptions['blog_charset'] ) ? $alloptions['blog_charset'] : '';
+			$_charset = isset($alloptions['blog_charset']) ? $alloptions['blog_charset'] : '';
 		}
 		$charset = $_charset;
 	}
 
-	if ( in_array( $charset, array( 'utf8', 'utf-8', 'UTF8' ) ) )
+	if (in_array($charset, array('utf8', 'utf-8', 'UTF8')))
 		$charset = 'UTF-8';
 
 	$_quote_style = $quote_style;
 
-	if ( $quote_style === 'double' ) {
+	if ($quote_style === 'double') {
 		$quote_style = ENT_COMPAT;
 		$_quote_style = ENT_COMPAT;
-	} elseif ( $quote_style === 'single' ) {
+	} elseif ($quote_style === 'single') {
 		$quote_style = ENT_NOQUOTES;
 	}
 
-	if ( ! $double_encode ) {
+	if ( ! $double_encode) {
 		// Guarantee every &entity; is valid, convert &garbage; into &amp;garbage;
 		// This is required for PHP < 5.4.0 because ENT_HTML401 flag is unavailable.
-		$string = wp_kses_normalize_entities( $string );
+		$string = wp_kses_normalize_entities($string);
 	}
 
-	$string = @htmlspecialchars( $string, $quote_style, $charset, $double_encode );
+	$string = @htmlspecialchars($string, $quote_style, $charset, $double_encode);
 
 	// Backwards compatibility
-	if ( 'single' === $_quote_style )
-		$string = str_replace( "'", '&#039;', $string );
+	if ('single' === $_quote_style)
+		$string = str_replace("'", '&#039;', $string);
 
 	return $string;
 }
@@ -961,52 +961,52 @@ 
  *                                Default is ENT_NOQUOTES.
  * @return string The decoded text without HTML entities.
  */
-function wp_specialchars_decode( $string, $quote_style = ENT_NOQUOTES ) {
+function wp_specialchars_decode($string, $quote_style = ENT_NOQUOTES) {
 	$string = (string) $string;
 
-	if ( 0 === strlen( $string ) ) {
+	if (0 === strlen($string)) {
 		return '';
 	}
 
 	// Don't bother if there are no entities - saves a lot of processing
-	if ( strpos( $string, '&' ) === false ) {
+	if (strpos($string, '&') === false) {
 		return $string;
 	}
 
 	// Match the previous behaviour of _wp_specialchars() when the $quote_style is not an accepted value
-	if ( empty( $quote_style ) ) {
+	if (empty($quote_style)) {
 		$quote_style = ENT_NOQUOTES;
-	} elseif ( !in_array( $quote_style, array( 0, 2, 3, 'single', 'double' ), true ) ) {
+	} elseif ( ! in_array($quote_style, array(0, 2, 3, 'single', 'double'), true)) {
 		$quote_style = ENT_QUOTES;
 	}
 
 	// More complete than get_html_translation_table( HTML_SPECIALCHARS )
-	$single = array( '&#039;'  => '\'', '&#x27;' => '\'' );
-	$single_preg = array( '/&#0*39;/'  => '&#039;', '/&#x0*27;/i' => '&#x27;' );
-	$double = array( '&quot;' => '"', '&#034;'  => '"', '&#x22;' => '"' );
-	$double_preg = array( '/&#0*34;/'  => '&#034;', '/&#x0*22;/i' => '&#x22;' );
-	$others = array( '&lt;'   => '<', '&#060;'  => '<', '&gt;'   => '>', '&#062;'  => '>', '&amp;'  => '&', '&#038;'  => '&', '&#x26;' => '&' );
-	$others_preg = array( '/&#0*60;/'  => '&#060;', '/&#0*62;/'  => '&#062;', '/&#0*38;/'  => '&#038;', '/&#x0*26;/i' => '&#x26;' );
-
-	if ( $quote_style === ENT_QUOTES ) {
-		$translation = array_merge( $single, $double, $others );
-		$translation_preg = array_merge( $single_preg, $double_preg, $others_preg );
-	} elseif ( $quote_style === ENT_COMPAT || $quote_style === 'double' ) {
-		$translation = array_merge( $double, $others );
-		$translation_preg = array_merge( $double_preg, $others_preg );
-	} elseif ( $quote_style === 'single' ) {
-		$translation = array_merge( $single, $others );
-		$translation_preg = array_merge( $single_preg, $others_preg );
-	} elseif ( $quote_style === ENT_NOQUOTES ) {
+	$single = array('&#039;'  => '\'', '&#x27;' => '\'');
+	$single_preg = array('/&#0*39;/'  => '&#039;', '/&#x0*27;/i' => '&#x27;');
+	$double = array('&quot;' => '"', '&#034;'  => '"', '&#x22;' => '"');
+	$double_preg = array('/&#0*34;/'  => '&#034;', '/&#x0*22;/i' => '&#x22;');
+	$others = array('&lt;'   => '<', '&#060;'  => '<', '&gt;'   => '>', '&#062;'  => '>', '&amp;'  => '&', '&#038;'  => '&', '&#x26;' => '&');
+	$others_preg = array('/&#0*60;/'  => '&#060;', '/&#0*62;/'  => '&#062;', '/&#0*38;/'  => '&#038;', '/&#x0*26;/i' => '&#x26;');
+
+	if ($quote_style === ENT_QUOTES) {
+		$translation = array_merge($single, $double, $others);
+		$translation_preg = array_merge($single_preg, $double_preg, $others_preg);
+	} elseif ($quote_style === ENT_COMPAT || $quote_style === 'double') {
+		$translation = array_merge($double, $others);
+		$translation_preg = array_merge($double_preg, $others_preg);
+	} elseif ($quote_style === 'single') {
+		$translation = array_merge($single, $others);
+		$translation_preg = array_merge($single_preg, $others_preg);
+	} elseif ($quote_style === ENT_NOQUOTES) {
 		$translation = $others;
 		$translation_preg = $others_preg;
 	}
 
 	// Remove zero padding on numeric entities
-	$string = preg_replace( array_keys( $translation_preg ), array_values( $translation_preg ), $string );
+	$string = preg_replace(array_keys($translation_preg), array_values($translation_preg), $string);
 
 	// Replace characters according to translation table
-	return strtr( $string, $translation );
+	return strtr($string, $translation);
 }
 
 /**
@@ -1021,40 +1021,40 @@ 
  * @param bool    $strip Optional. Whether to attempt to strip out invalid UTF8. Default is false.
  * @return string The checked text.
  */
-function wp_check_invalid_utf8( $string, $strip = false ) {
+function wp_check_invalid_utf8($string, $strip = false) {
 	$string = (string) $string;
 
-	if ( 0 === strlen( $string ) ) {
+	if (0 === strlen($string)) {
 		return '';
 	}
 
 	// Store the site charset as a static to avoid multiple calls to get_option()
 	static $is_utf8 = null;
-	if ( ! isset( $is_utf8 ) ) {
-		$is_utf8 = in_array( get_option( 'blog_charset' ), array( 'utf8', 'utf-8', 'UTF8', 'UTF-8' ) );
+	if ( ! isset($is_utf8)) {
+		$is_utf8 = in_array(get_option('blog_charset'), array('utf8', 'utf-8', 'UTF8', 'UTF-8'));
 	}
-	if ( ! $is_utf8 ) {
+	if ( ! $is_utf8) {
 		return $string;
 	}
 
 	// Check for support for utf8 in the installed PCRE library once and store the result in a static
 	static $utf8_pcre = null;
-	if ( ! isset( $utf8_pcre ) ) {
-		$utf8_pcre = @preg_match( '/^./u', 'a' );
+	if ( ! isset($utf8_pcre)) {
+		$utf8_pcre = @preg_match('/^./u', 'a');
 	}
 	// We can't demand utf8 in the PCRE installation, so just return the string in those cases
-	if ( !$utf8_pcre ) {
+	if ( ! $utf8_pcre) {
 		return $string;
 	}
 
 	// preg_match fails when it encounters invalid UTF8 in $string
-	if ( 1 === @preg_match( '/^./us', $string ) ) {
+	if (1 === @preg_match('/^./us', $string)) {
 		return $string;
 	}
 
 	// Attempt to strip the bad chars if requested (not recommended)
-	if ( $strip && function_exists( 'iconv' ) ) {
-		return iconv( 'utf-8', 'utf-8', $string );
+	if ($strip && function_exists('iconv')) {
+		return iconv('utf-8', 'utf-8', $string);
 	}
 
 	return '';
@@ -1069,30 +1069,30 @@ 
  * @param int    $length Max  length of the string
  * @return string String with Unicode encoded for URI.
  */
-function utf8_uri_encode( $utf8_string, $length = 0 ) {
+function utf8_uri_encode($utf8_string, $length = 0) {
 	$unicode = '';
 	$values = array();
 	$num_octets = 1;
 	$unicode_length = 0;
 
 	mbstring_binary_safe_encoding();
-	$string_length = strlen( $utf8_string );
+	$string_length = strlen($utf8_string);
 	reset_mbstring_encoding();
 
-	for ($i = 0; $i < $string_length; $i++ ) {
+	for ($i = 0; $i < $string_length; $i++) {
 
-		$value = ord( $utf8_string[ $i ] );
+		$value = ord($utf8_string[$i]);
 
-		if ( $value < 128 ) {
-			if ( $length && ( $unicode_length >= $length ) )
+		if ($value < 128) {
+			if ($length && ($unicode_length >= $length))
 				break;
 			$unicode .= chr($value);
 			$unicode_length++;
 		} else {
-			if ( count( $values ) == 0 ) {
-				if ( $value < 224 ) {
+			if (count($values) == 0) {
+				if ($value < 224) {
 					$num_octets = 2;
-				} elseif ( $value < 240 ) {
+				} elseif ($value < 240) {
 					$num_octets = 3;
 				} else {
 					$num_octets = 4;
@@ -1101,11 +1101,11 @@ 
 
 			$values[] = $value;
 
-			if ( $length && ( $unicode_length + ($num_octets * 3) ) > $length )
+			if ($length && ($unicode_length + ($num_octets * 3)) > $length)
 				break;
-			if ( count( $values ) == $num_octets ) {
-				for ( $j = 0; $j < $num_octets; $j++ ) {
-					$unicode .= '%' . dechex( $values[ $j ] );
+			if (count($values) == $num_octets) {
+				for ($j = 0; $j < $num_octets; $j++) {
+					$unicode .= '%'.dechex($values[$j]);
 				}
 
 				$unicode_length += $num_octets * 3;
@@ -1129,8 +1129,8 @@ 
  * @param string $string Text that might have accent characters
  * @return string Filtered string with replaced "nice" characters.
  */
-function remove_accents( $string ) {
-	if ( !preg_match('/[\x80-\xff]/', $string) )
+function remove_accents($string) {
+	if ( ! preg_match('/[\x80-\xff]/', $string))
 		return $string;
 
 	if (seems_utf8($string)) {
@@ -1140,7 +1140,7 @@ 
 		chr(195).chr(128) => 'A', chr(195).chr(129) => 'A',
 		chr(195).chr(130) => 'A', chr(195).chr(131) => 'A',
 		chr(195).chr(132) => 'A', chr(195).chr(133) => 'A',
-		chr(195).chr(134) => 'AE',chr(195).chr(135) => 'C',
+		chr(195).chr(134) => 'AE', chr(195).chr(135) => 'C',
 		chr(195).chr(136) => 'E', chr(195).chr(137) => 'E',
 		chr(195).chr(138) => 'E', chr(195).chr(139) => 'E',
 		chr(195).chr(140) => 'I', chr(195).chr(141) => 'I',
@@ -1151,11 +1151,11 @@ 
 		chr(195).chr(150) => 'O', chr(195).chr(153) => 'U',
 		chr(195).chr(154) => 'U', chr(195).chr(155) => 'U',
 		chr(195).chr(156) => 'U', chr(195).chr(157) => 'Y',
-		chr(195).chr(158) => 'TH',chr(195).chr(159) => 's',
+		chr(195).chr(158) => 'TH', chr(195).chr(159) => 's',
 		chr(195).chr(160) => 'a', chr(195).chr(161) => 'a',
 		chr(195).chr(162) => 'a', chr(195).chr(163) => 'a',
 		chr(195).chr(164) => 'a', chr(195).chr(165) => 'a',
-		chr(195).chr(166) => 'ae',chr(195).chr(167) => 'c',
+		chr(195).chr(166) => 'ae', chr(195).chr(167) => 'c',
 		chr(195).chr(168) => 'e', chr(195).chr(169) => 'e',
 		chr(195).chr(170) => 'e', chr(195).chr(171) => 'e',
 		chr(195).chr(172) => 'i', chr(195).chr(173) => 'i',
@@ -1194,7 +1194,7 @@ 
 		chr(196).chr(172) => 'I', chr(196).chr(173) => 'i',
 		chr(196).chr(174) => 'I', chr(196).chr(175) => 'i',
 		chr(196).chr(176) => 'I', chr(196).chr(177) => 'i',
-		chr(196).chr(178) => 'IJ',chr(196).chr(179) => 'ij',
+		chr(196).chr(178) => 'IJ', chr(196).chr(179) => 'ij',
 		chr(196).chr(180) => 'J', chr(196).chr(181) => 'j',
 		chr(196).chr(182) => 'K', chr(196).chr(183) => 'k',
 		chr(196).chr(184) => 'k', chr(196).chr(185) => 'L',
@@ -1210,13 +1210,13 @@ 
 		chr(197).chr(140) => 'O', chr(197).chr(141) => 'o',
 		chr(197).chr(142) => 'O', chr(197).chr(143) => 'o',
 		chr(197).chr(144) => 'O', chr(197).chr(145) => 'o',
-		chr(197).chr(146) => 'OE',chr(197).chr(147) => 'oe',
-		chr(197).chr(148) => 'R',chr(197).chr(149) => 'r',
-		chr(197).chr(150) => 'R',chr(197).chr(151) => 'r',
-		chr(197).chr(152) => 'R',chr(197).chr(153) => 'r',
-		chr(197).chr(154) => 'S',chr(197).chr(155) => 's',
-		chr(197).chr(156) => 'S',chr(197).chr(157) => 's',
-		chr(197).chr(158) => 'S',chr(197).chr(159) => 's',
+		chr(197).chr(146) => 'OE', chr(197).chr(147) => 'oe',
+		chr(197).chr(148) => 'R', chr(197).chr(149) => 'r',
+		chr(197).chr(150) => 'R', chr(197).chr(151) => 'r',
+		chr(197).chr(152) => 'R', chr(197).chr(153) => 'r',
+		chr(197).chr(154) => 'S', chr(197).chr(155) => 's',
+		chr(197).chr(156) => 'S', chr(197).chr(157) => 's',
+		chr(197).chr(158) => 'S', chr(197).chr(159) => 's',
 		chr(197).chr(160) => 'S', chr(197).chr(161) => 's',
 		chr(197).chr(162) => 'T', chr(197).chr(163) => 't',
 		chr(197).chr(164) => 'T', chr(197).chr(165) => 't',
@@ -1313,21 +1313,21 @@ 
 		// Used for locale-specific rules
 		$locale = get_locale();
 
-		if ( 'de_DE' == $locale || 'de_DE_formal' == $locale ) {
-			$chars[ chr(195).chr(132) ] = 'Ae';
-			$chars[ chr(195).chr(164) ] = 'ae';
-			$chars[ chr(195).chr(150) ] = 'Oe';
-			$chars[ chr(195).chr(182) ] = 'oe';
-			$chars[ chr(195).chr(156) ] = 'Ue';
-			$chars[ chr(195).chr(188) ] = 'ue';
-			$chars[ chr(195).chr(159) ] = 'ss';
-		} elseif ( 'da_DK' === $locale ) {
-			$chars[ chr(195).chr(134) ] = 'Ae';
- 			$chars[ chr(195).chr(166) ] = 'ae';
-			$chars[ chr(195).chr(152) ] = 'Oe';
-			$chars[ chr(195).chr(184) ] = 'oe';
-			$chars[ chr(195).chr(133) ] = 'Aa';
-			$chars[ chr(195).chr(165) ] = 'aa';
+		if ('de_DE' == $locale || 'de_DE_formal' == $locale) {
+			$chars[chr(195).chr(132)] = 'Ae';
+			$chars[chr(195).chr(164)] = 'ae';
+			$chars[chr(195).chr(150)] = 'Oe';
+			$chars[chr(195).chr(182)] = 'oe';
+			$chars[chr(195).chr(156)] = 'Ue';
+			$chars[chr(195).chr(188)] = 'ue';
+			$chars[chr(195).chr(159)] = 'ss';
+		} elseif ('da_DK' === $locale) {
+			$chars[chr(195).chr(134)] = 'Ae';
+ 			$chars[chr(195).chr(166)] = 'ae';
+			$chars[chr(195).chr(152)] = 'Oe';
+			$chars[chr(195).chr(184)] = 'oe';
+			$chars[chr(195).chr(133)] = 'Aa';
+			$chars[chr(195).chr(165)] = 'aa';
 		}
 
 		$string = strtr($string, $chars);
@@ -1371,7 +1371,7 @@ 
  * @param string $filename The filename to be sanitized
  * @return string The sanitized filename
  */
-function sanitize_file_name( $filename ) {
+function sanitize_file_name($filename) {
 	$filename_raw = $filename;
 	$special_chars = array("?", "[", "]", "/", "\\", "=", "<", ">", ":", ";", ",", "'", "\"", "&", "$", "#", "*", "(", ")", "|", "~", "`", "!", "{", "}", "%", "+", chr(0));
 	/**
@@ -1382,18 +1382,18 @@ 
 	 * @param array  $special_chars Characters to remove.
 	 * @param string $filename_raw  Filename as it was passed into sanitize_file_name().
 	 */
-	$special_chars = apply_filters( 'sanitize_file_name_chars', $special_chars, $filename_raw );
-	$filename = preg_replace( "#\x{00a0}#siu", ' ', $filename );
-	$filename = str_replace( $special_chars, '', $filename );
-	$filename = str_replace( array( '%20', '+' ), '-', $filename );
-	$filename = preg_replace( '/[\r\n\t -]+/', '-', $filename );
-	$filename = trim( $filename, '.-_' );
+	$special_chars = apply_filters('sanitize_file_name_chars', $special_chars, $filename_raw);
+	$filename = preg_replace("#\x{00a0}#siu", ' ', $filename);
+	$filename = str_replace($special_chars, '', $filename);
+	$filename = str_replace(array('%20', '+'), '-', $filename);
+	$filename = preg_replace('/[\r\n\t -]+/', '-', $filename);
+	$filename = trim($filename, '.-_');
 
 	// Split the filename into a base and extension[s]
 	$parts = explode('.', $filename);
 
 	// Return if only one extension
-	if ( count( $parts ) <= 2 ) {
+	if (count($parts) <= 2) {
 		/**
 		 * Filter a sanitized filename string.
 		 *
@@ -1402,7 +1402,7 @@ 
 		 * @param string $filename     Sanitized filename.
 		 * @param string $filename_raw The filename prior to sanitization.
 		 */
-		return apply_filters( 'sanitize_file_name', $filename, $filename_raw );
+		return apply_filters('sanitize_file_name', $filename, $filename_raw);
 	}
 
 	// Process multiple extensions
@@ -1414,23 +1414,23 @@ 
 	 * Loop over any intermediate extensions. Postfix them with a trailing underscore
 	 * if they are a 2 - 5 character long alpha string not in the extension whitelist.
 	 */
-	foreach ( (array) $parts as $part) {
-		$filename .= '.' . $part;
+	foreach ((array) $parts as $part) {
+		$filename .= '.'.$part;
 
-		if ( preg_match("/^[a-zA-Z]{2,5}\d?$/", $part) ) {
+		if (preg_match("/^[a-zA-Z]{2,5}\d?$/", $part)) {
 			$allowed = false;
-			foreach ( $mimes as $ext_preg => $mime_match ) {
-				$ext_preg = '!^(' . $ext_preg . ')$!i';
-				if ( preg_match( $ext_preg, $part ) ) {
+			foreach ($mimes as $ext_preg => $mime_match) {
+				$ext_preg = '!^('.$ext_preg.')$!i';
+				if (preg_match($ext_preg, $part)) {
 					$allowed = true;
 					break;
 				}
 			}
-			if ( !$allowed )
+			if ( ! $allowed)
 				$filename .= '_';
 		}
 	}
-	$filename .= '.' . $extension;
+	$filename .= '.'.$extension;
 	/** This filter is documented in wp-includes/formatting.php */
 	return apply_filters('sanitize_file_name', $filename, $filename_raw);
 }
@@ -1449,21 +1449,21 @@ 
  * @param bool   $strict   If set limits $username to specific characters. Default false.
  * @return string The sanitized username, after passing through filters.
  */
-function sanitize_user( $username, $strict = false ) {
+function sanitize_user($username, $strict = false) {
 	$raw_username = $username;
-	$username = wp_strip_all_tags( $username );
-	$username = remove_accents( $username );
+	$username = wp_strip_all_tags($username);
+	$username = remove_accents($username);
 	// Kill octets
-	$username = preg_replace( '|%([a-fA-F0-9][a-fA-F0-9])|', '', $username );
-	$username = preg_replace( '/&.+?;/', '', $username ); // Kill entities
+	$username = preg_replace('|%([a-fA-F0-9][a-fA-F0-9])|', '', $username);
+	$username = preg_replace('/&.+?;/', '', $username); // Kill entities
 
 	// If strict, reduce to ASCII for max portability.
-	if ( $strict )
-		$username = preg_replace( '|[^a-z0-9 _.\-@]|i', '', $username );
+	if ($strict)
+		$username = preg_replace('|[^a-z0-9 _.\-@]|i', '', $username);
 
-	$username = trim( $username );
+	$username = trim($username);
 	// Consolidate contiguous whitespace
-	$username = preg_replace( '|\s+|', ' ', $username );
+	$username = preg_replace('|\s+|', ' ', $username);
 
 	/**
 	 * Filter a sanitized username string.
@@ -1474,7 +1474,7 @@ 
 	 * @param string $raw_username The username prior to sanitization.
 	 * @param bool   $strict       Whether to limit the sanitization to specific characters. Default false.
 	 */
-	return apply_filters( 'sanitize_user', $username, $raw_username, $strict );
+	return apply_filters('sanitize_user', $username, $raw_username, $strict);
 }
 
 /**
@@ -1487,10 +1487,10 @@ 
  * @param string $key String key
  * @return string Sanitized key
  */
-function sanitize_key( $key ) {
+function sanitize_key($key) {
 	$raw_key = $key;
-	$key = strtolower( $key );
-	$key = preg_replace( '/[^a-z0-9_\-]/', '', $key );
+	$key = strtolower($key);
+	$key = preg_replace('/[^a-z0-9_\-]/', '', $key);
 
 	/**
 	 * Filter a sanitized key string.
@@ -1500,7 +1500,7 @@ 
 	 * @param string $key     Sanitized key.
 	 * @param string $raw_key The key prior to sanitization.
 	 */
-	return apply_filters( 'sanitize_key', $key, $raw_key );
+	return apply_filters('sanitize_key', $key, $raw_key);
 }
 
 /**
@@ -1517,10 +1517,10 @@ 
  * @param string $context        Optional. The operation for which the string is sanitized
  * @return string The sanitized string.
  */
-function sanitize_title( $title, $fallback_title = '', $context = 'save' ) {
+function sanitize_title($title, $fallback_title = '', $context = 'save') {
 	$raw_title = $title;
 
-	if ( 'save' == $context )
+	if ('save' == $context)
 		$title = remove_accents($title);
 
 	/**
@@ -1532,9 +1532,9 @@ 
 	 * @param string $raw_title The title prior to sanitization.
 	 * @param string $context   The context for which the title is being sanitized.
 	 */
-	$title = apply_filters( 'sanitize_title', $title, $raw_title, $context );
+	$title = apply_filters('sanitize_title', $title, $raw_title, $context);
 
-	if ( '' === $title || false === $title )
+	if ('' === $title || false === $title)
 		$title = $fallback_title;
 
 	return $title;
@@ -1550,8 +1550,8 @@ 
  * @param string $title The string to be sanitized.
  * @return string The sanitized string.
  */
-function sanitize_title_for_query( $title ) {
-	return sanitize_title( $title, '', 'query' );
+function sanitize_title_for_query($title) {
+	return sanitize_title($title, '', 'query');
 }
 
 /**
@@ -1567,7 +1567,7 @@ 
  * @param string $context   Optional. The operation for which the string is sanitized.
  * @return string The sanitized title.
  */
-function sanitize_title_with_dashes( $title, $raw_title = '', $context = 'display' ) {
+function sanitize_title_with_dashes($title, $raw_title = '', $context = 'display') {
 	$title = strip_tags($title);
 	// Preserve escaped octets.
 	$title = preg_replace('|%([a-fA-F0-9][a-fA-F0-9])|', '---$1---', $title);
@@ -1585,14 +1585,14 @@ 
 
 	$title = strtolower($title);
 
-	if ( 'save' == $context ) {
+	if ('save' == $context) {
 		// Convert nbsp, ndash and mdash to hyphens
-		$title = str_replace( array( '%c2%a0', '%e2%80%93', '%e2%80%94' ), '-', $title );
+		$title = str_replace(array('%c2%a0', '%e2%80%93', '%e2%80%94'), '-', $title);
 		// Convert nbsp, ndash and mdash HTML entities to hyphens
-		$title = str_replace( array( '&nbsp;', '&#160;', '&ndash;', '&#8211;', '&mdash;', '&#8212;' ), '-', $title );
+		$title = str_replace(array('&nbsp;', '&#160;', '&ndash;', '&#8211;', '&mdash;', '&#8212;'), '-', $title);
 
 		// Strip these characters entirely
-		$title = str_replace( array(
+		$title = str_replace(array(
 			// iexcl and iquest
 			'%c2%a1', '%c2%bf',
 			// angle quotes
@@ -1606,10 +1606,10 @@ 
 			'%c2%b4', '%cb%8a', '%cc%81', '%cd%81',
 			// grave accent, macron, caron
 			'%cc%80', '%cc%84', '%cc%8c',
-		), '', $title );
+		), '', $title);
 
 		// Convert times to x
-		$title = str_replace( '%c3%97', 'x', $title );
+		$title = str_replace('%c3%97', 'x', $title);
 	}
 
 	$title = preg_replace('/&.+?;/', '', $title); // kill entities
@@ -1636,8 +1636,8 @@ 
  * @param string $orderby Order by clause to be validated.
  * @return string|false Returns $orderby if valid, false otherwise.
  */
-function sanitize_sql_orderby( $orderby ) {
-	if ( preg_match( '/^\s*(([a-z0-9_]+|`[a-z0-9_]+`)(\s+(ASC|DESC))?\s*(,\s*(?=[a-z0-9_`])|$))+$/i', $orderby ) || preg_match( '/^\s*RAND\(\s*\)\s*$/i', $orderby ) ) {
+function sanitize_sql_orderby($orderby) {
+	if (preg_match('/^\s*(([a-z0-9_]+|`[a-z0-9_]+`)(\s+(ASC|DESC))?\s*(,\s*(?=[a-z0-9_`])|$))+$/i', $orderby) || preg_match('/^\s*RAND\(\s*\)\s*$/i', $orderby)) {
 		return $orderby;
 	}
 	return false;
@@ -1658,15 +1658,15 @@ 
  * 	Defaults to an empty string.
  * @return string The sanitized value
  */
-function sanitize_html_class( $class, $fallback = '' ) {
+function sanitize_html_class($class, $fallback = '') {
 	//Strip out any % encoded octets
-	$sanitized = preg_replace( '|%[a-fA-F0-9][a-fA-F0-9]|', '', $class );
+	$sanitized = preg_replace('|%[a-fA-F0-9][a-fA-F0-9]|', '', $class);
 
 	//Limit to A-Z,a-z,0-9,_,-
-	$sanitized = preg_replace( '/[^A-Za-z0-9_-]/', '', $sanitized );
+	$sanitized = preg_replace('/[^A-Za-z0-9_-]/', '', $sanitized);
 
-	if ( '' == $sanitized && $fallback ) {
-		return sanitize_html_class( $fallback );
+	if ('' == $sanitized && $fallback) {
+		return sanitize_html_class($fallback);
 	}
 	/**
 	 * Filter a sanitized HTML class string.
@@ -1677,7 +1677,7 @@ 
 	 * @param string $class     HTML class before sanitization.
 	 * @param string $fallback  The fallback string.
 	 */
-	return apply_filters( 'sanitize_html_class', $sanitized, $class, $fallback );
+	return apply_filters('sanitize_html_class', $sanitized, $class, $fallback);
 }
 
 /**
@@ -1689,13 +1689,13 @@ 
  * @param string $deprecated Not used.
  * @return string Converted string.
  */
-function convert_chars( $content, $deprecated = '' ) {
-	if ( ! empty( $deprecated ) ) {
-		_deprecated_argument( __FUNCTION__, '0.71' );
+function convert_chars($content, $deprecated = '') {
+	if ( ! empty($deprecated)) {
+		_deprecated_argument(__FUNCTION__, '0.71');
 	}
 
-	if ( strpos( $content, '&' ) !== false ) {
-		$content = preg_replace( '/&([^#])(?![a-z1-4]{1,8};)/i', '&#038;$1', $content );
+	if (strpos($content, '&') !== false) {
+		$content = preg_replace('/&([^#])(?![a-z1-4]{1,8};)/i', '&#038;$1', $content);
 	}
 
 	return $content;
@@ -1709,12 +1709,12 @@ 
  * @param string $content String with entities that need converting.
  * @return string Converted string.
  */
-function convert_invalid_entities( $content ) {
+function convert_invalid_entities($content) {
 	$wp_htmltranswinuni = array(
 		'&#128;' => '&#8364;', // the Euro sign
 		'&#129;' => '',
 		'&#130;' => '&#8218;', // these are Windows CP1252 specific characters
-		'&#131;' => '&#402;',  // they would look weird on non-Windows browsers
+		'&#131;' => '&#402;', // they would look weird on non-Windows browsers
 		'&#132;' => '&#8222;',
 		'&#133;' => '&#8230;',
 		'&#134;' => '&#8224;',
@@ -1745,8 +1745,8 @@ 
 		'&#159;' => '&#376;'
 	);
 
-	if ( strpos( $content, '&#1' ) !== false ) {
-		$content = strtr( $content, $wp_htmltranswinuni );
+	if (strpos($content, '&#1') !== false) {
+		$content = strtr($content, $wp_htmltranswinuni);
 	}
 
 	return $content;
@@ -1761,9 +1761,9 @@ 
  * @param bool   $force If true, forces balancing, ignoring the value of the option. Default false.
  * @return string Balanced text
  */
-function balanceTags( $text, $force = false ) {
-	if ( $force || get_option('use_balanceTags') == 1 ) {
-		return force_balance_tags( $text );
+function balanceTags($text, $force = false) {
+	if ($force || get_option('use_balanceTags') == 1) {
+		return force_balance_tags($text);
 	} else {
 		return $text;
 	}
@@ -1787,22 +1787,22 @@ 
  * @param string $text Text to be balanced.
  * @return string Balanced text.
  */
-function force_balance_tags( $text ) {
+function force_balance_tags($text) {
 	$tagstack = array();
 	$stacksize = 0;
 	$tagqueue = '';
 	$newtext = '';
 	// Known single-entity/self-closing tags
-	$single_tags = array( 'area', 'base', 'basefont', 'br', 'col', 'command', 'embed', 'frame', 'hr', 'img', 'input', 'isindex', 'link', 'meta', 'param', 'source' );
+	$single_tags = array('area', 'base', 'basefont', 'br', 'col', 'command', 'embed', 'frame', 'hr', 'img', 'input', 'isindex', 'link', 'meta', 'param', 'source');
 	// Tags that can be immediately nested within themselves
-	$nestable_tags = array( 'blockquote', 'div', 'object', 'q', 'span' );
+	$nestable_tags = array('blockquote', 'div', 'object', 'q', 'span');
 
 	// WP bug fix for comments - in case you REALLY meant to type '< !--'
 	$text = str_replace('< !--', '<    !--', $text);
 	// WP bug fix for LOVE <3 (and other situations with '<' before a number)
 	$text = preg_replace('#<([0-9]{1})#', '&lt;$1', $text);
 
-	while ( preg_match("/<(\/?[\w:]*)\s*([^>]*)>/", $text, $regex) ) {
+	while (preg_match("/<(\/?[\w:]*)\s*([^>]*)>/", $text, $regex)) {
 		$newtext .= $tagqueue;
 
 		$i = strpos($text, $regex[0]);
@@ -1811,25 +1811,25 @@ 
 		// clear the shifter
 		$tagqueue = '';
 		// Pop or Push
-		if ( isset($regex[1][0]) && '/' == $regex[1][0] ) { // End Tag
-			$tag = strtolower(substr($regex[1],1));
+		if (isset($regex[1][0]) && '/' == $regex[1][0]) { // End Tag
+			$tag = strtolower(substr($regex[1], 1));
 			// if too many closing tags
-			if ( $stacksize <= 0 ) {
+			if ($stacksize <= 0) {
 				$tag = '';
 				// or close to be safe $tag = '/' . $tag;
 			}
 			// if stacktop value = tag close value then pop
-			elseif ( $tagstack[$stacksize - 1] == $tag ) { // found closing tag
-				$tag = '</' . $tag . '>'; // Close Tag
+			elseif ($tagstack[$stacksize - 1] == $tag) { // found closing tag
+				$tag = '</'.$tag.'>'; // Close Tag
 				// Pop
-				array_pop( $tagstack );
+				array_pop($tagstack);
 				$stacksize--;
 			} else { // closing tag not at top, search for it
-				for ( $j = $stacksize-1; $j >= 0; $j-- ) {
-					if ( $tagstack[$j] == $tag ) {
+				for ($j = $stacksize - 1; $j >= 0; $j--) {
+					if ($tagstack[$j] == $tag) {
 					// add tag to tagqueue
-						for ( $k = $stacksize-1; $k >= $j; $k--) {
-							$tagqueue .= '</' . array_pop( $tagstack ) . '>';
+						for ($k = $stacksize - 1; $k >= $j; $k--) {
+							$tagqueue .= '</'.array_pop($tagstack).'>';
 							$stacksize--;
 						}
 						break;
@@ -1843,43 +1843,43 @@ 
 			// Tag Cleaning
 
 			// If it's an empty tag "< >", do nothing
-			if ( '' == $tag ) {
+			if ('' == $tag) {
 				// do nothing
 			}
 			// ElseIf it presents itself as a self-closing tag...
-			elseif ( substr( $regex[2], -1 ) == '/' ) {
+			elseif (substr($regex[2], -1) == '/') {
 				// ...but it isn't a known single-entity self-closing tag, then don't let it be treated as such and
 				// immediately close it with a closing tag (the tag will encapsulate no text as a result)
-				if ( ! in_array( $tag, $single_tags ) )
-					$regex[2] = trim( substr( $regex[2], 0, -1 ) ) . "></$tag";
+				if ( ! in_array($tag, $single_tags))
+					$regex[2] = trim(substr($regex[2], 0, -1))."></$tag";
 			}
 			// ElseIf it's a known single-entity tag but it doesn't close itself, do so
-			elseif ( in_array($tag, $single_tags) ) {
+			elseif (in_array($tag, $single_tags)) {
 				$regex[2] .= '/';
 			}
 			// Else it's not a single-entity tag
 			else {
 				// If the top of the stack is the same as the tag we want to push, close previous tag
-				if ( $stacksize > 0 && !in_array($tag, $nestable_tags) && $tagstack[$stacksize - 1] == $tag ) {
-					$tagqueue = '</' . array_pop( $tagstack ) . '>';
+				if ($stacksize > 0 && ! in_array($tag, $nestable_tags) && $tagstack[$stacksize - 1] == $tag) {
+					$tagqueue = '</'.array_pop($tagstack).'>';
 					$stacksize--;
 				}
-				$stacksize = array_push( $tagstack, $tag );
+				$stacksize = array_push($tagstack, $tag);
 			}
 
 			// Attributes
 			$attributes = $regex[2];
-			if ( ! empty( $attributes ) && $attributes[0] != '>' )
-				$attributes = ' ' . $attributes;
+			if ( ! empty($attributes) && $attributes[0] != '>')
+				$attributes = ' '.$attributes;
 
-			$tag = '<' . $tag . $attributes . '>';
+			$tag = '<'.$tag.$attributes.'>';
 			//If already queuing a close tag, then put this tag on, too
-			if ( !empty($tagqueue) ) {
+			if ( ! empty($tagqueue)) {
 				$tagqueue .= $tag;
 				$tag = '';
 			}
 		}
-		$newtext .= substr($text, 0, $i) . $tag;
+		$newtext .= substr($text, 0, $i).$tag;
 		$text = substr($text, $i + $l);
 	}
 
@@ -1890,12 +1890,12 @@ 
 	$newtext .= $text;
 
 	// Empty Stack
-	while( $x = array_pop($tagstack) )
-		$newtext .= '</' . $x . '>'; // Add remaining tags to close
+	while ($x = array_pop($tagstack))
+		$newtext .= '</'.$x.'>'; // Add remaining tags to close
 
 	// WP fix for the bug with HTML comments
-	$newtext = str_replace("< !--","<!--",$newtext);
-	$newtext = str_replace("<    !--","< !--",$newtext);
+	$newtext = str_replace("< !--", "<!--", $newtext);
+	$newtext = str_replace("<    !--", "< !--", $newtext);
 
 	return $newtext;
 }
@@ -1916,7 +1916,7 @@ 
  *                          Default false.
  * @return string The text after the filter (and possibly htmlspecialchars()) has been run.
  */
-function format_to_edit( $content, $rich_text = false ) {
+function format_to_edit($content, $rich_text = false) {
 	/**
 	 * Filter the text to be formatted for editing.
 	 *
@@ -1924,9 +1924,9 @@ 
 	 *
 	 * @param string $content The text, prior to formatting for editing.
 	 */
-	$content = apply_filters( 'format_to_edit', $content );
-	if ( ! $rich_text )
-		$content = esc_textarea( $content );
+	$content = apply_filters('format_to_edit', $content);
+	if ( ! $rich_text)
+		$content = esc_textarea($content);
 	return $content;
 }
 
@@ -1947,8 +1947,8 @@ 
  * @param int $threshold  Digit places number needs to be to not have zeros added.
  * @return string Adds leading zeros to number if needed.
  */
-function zeroise( $number, $threshold ) {
-	return sprintf( '%0' . $threshold . 's', $number );
+function zeroise($number, $threshold) {
+	return sprintf('%0'.$threshold.'s', $number);
 }
 
 /**
@@ -1959,10 +1959,10 @@ 
  * @param string $string Value to which backslashes will be added.
  * @return string String with backslashes inserted.
  */
-function backslashit( $string ) {
-	if ( isset( $string[0] ) && $string[0] >= '0' && $string[0] <= '9' )
-		$string = '\\\\' . $string;
-	return addcslashes( $string, 'A..Za..z' );
+function backslashit($string) {
+	if (isset($string[0]) && $string[0] >= '0' && $string[0] <= '9')
+		$string = '\\\\'.$string;
+	return addcslashes($string, 'A..Za..z');
 }
 
 /**
@@ -1979,8 +1979,8 @@ 
  * @param string $string What to add the trailing slash to.
  * @return string String with trailing slash added.
  */
-function trailingslashit( $string ) {
-	return untrailingslashit( $string ) . '/';
+function trailingslashit($string) {
+	return untrailingslashit($string).'/';
 }
 
 /**
@@ -1994,8 +1994,8 @@ 
  * @param string $string What to remove the trailing slashes from.
  * @return string String without the trailing slashes.
  */
-function untrailingslashit( $string ) {
-	return rtrim( $string, '/\\' );
+function untrailingslashit($string) {
+	return rtrim($string, '/\\');
 }
 
 /**
@@ -2010,7 +2010,7 @@ 
  * @return string Returns a string escaped with slashes.
  */
 function addslashes_gpc($gpc) {
-	if ( get_magic_quotes_gpc() )
+	if (get_magic_quotes_gpc())
 		$gpc = stripslashes($gpc);
 
 	return wp_slash($gpc);
@@ -2024,8 +2024,8 @@ 
  * @param mixed $value The value to be stripped.
  * @return mixed Stripped value.
  */
-function stripslashes_deep( $value ) {
-	return map_deep( $value, 'stripslashes_from_strings_only' );
+function stripslashes_deep($value) {
+	return map_deep($value, 'stripslashes_from_strings_only');
 }
 
 /**
@@ -2036,8 +2036,8 @@ 
  * @param mixed $value The array or string to be stripped.
  * @return mixed $value The stripped value.
  */
-function stripslashes_from_strings_only( $value ) {
-	return is_string( $value ) ? stripslashes( $value ) : $value;
+function stripslashes_from_strings_only($value) {
+	return is_string($value) ? stripslashes($value) : $value;
 }
 
 /**
@@ -2048,8 +2048,8 @@ 
  * @param mixed $value The array or string to be encoded.
  * @return mixed $value The encoded value.
  */
-function urlencode_deep( $value ) {
-	return map_deep( $value, 'urlencode' );
+function urlencode_deep($value) {
+	return map_deep($value, 'urlencode');
 }
 
 /**
@@ -2060,8 +2060,8 @@ 
  * @param mixed $value The array or string to be encoded.
  * @return mixed $value The encoded value.
  */
-function rawurlencode_deep( $value ) {
-	return map_deep( $value, 'rawurlencode' );
+function rawurlencode_deep($value) {
+	return map_deep($value, 'rawurlencode');
 }
 
 /**
@@ -2072,8 +2072,8 @@ 
  * @param mixed $value The array or string to be decoded.
  * @return mixed $value The decoded value.
  */
-function urldecode_deep( $value ) {
-	return map_deep( $value, 'urldecode' );
+function urldecode_deep($value) {
+	return map_deep($value, 'urldecode');
 }
 
 /**
@@ -2085,20 +2085,20 @@ 
  * @param int    $hex_encoding  Optional. Set to 1 to enable hex encoding.
  * @return string Converted email address.
  */
-function antispambot( $email_address, $hex_encoding = 0 ) {
+function antispambot($email_address, $hex_encoding = 0) {
 	$email_no_spam_address = '';
-	for ( $i = 0, $len = strlen( $email_address ); $i < $len; $i++ ) {
-		$j = rand( 0, 1 + $hex_encoding );
-		if ( $j == 0 ) {
-			$email_no_spam_address .= '&#' . ord( $email_address[$i] ) . ';';
-		} elseif ( $j == 1 ) {
+	for ($i = 0, $len = strlen($email_address); $i < $len; $i++) {
+		$j = rand(0, 1 + $hex_encoding);
+		if ($j == 0) {
+			$email_no_spam_address .= '&#'.ord($email_address[$i]).';';
+		} elseif ($j == 1) {
 			$email_no_spam_address .= $email_address[$i];
-		} elseif ( $j == 2 ) {
-			$email_no_spam_address .= '%' . zeroise( dechex( ord( $email_address[$i] ) ), 2 );
+		} elseif ($j == 2) {
+			$email_no_spam_address .= '%'.zeroise(dechex(ord($email_address[$i])), 2);
 		}
 	}
 
-	return str_replace( '@', '&#64;', $email_no_spam_address );
+	return str_replace('@', '&#64;', $email_no_spam_address);
 }
 
 /**
@@ -2113,10 +2113,10 @@ 
  * @param array $matches Single Regex Match.
  * @return string HTML A element with URI address.
  */
-function _make_url_clickable_cb( $matches ) {
+function _make_url_clickable_cb($matches) {
 	$url = $matches[2];
 
-	if ( ')' == $matches[3] && strpos( $url, '(' ) ) {
+	if (')' == $matches[3] && strpos($url, '(')) {
 		// If the trailing character is a closing parethesis, and the URL has an opening parenthesis in it, add the closing parenthesis to the URL.
 		// Then we can let the parenthesis balancer do its thing below.
 		$url .= $matches[3];
@@ -2126,16 +2126,16 @@ 
 	}
 
 	// Include parentheses in the URL only if paired
-	while ( substr_count( $url, '(' ) < substr_count( $url, ')' ) ) {
-		$suffix = strrchr( $url, ')' ) . $suffix;
-		$url = substr( $url, 0, strrpos( $url, ')' ) );
+	while (substr_count($url, '(') < substr_count($url, ')')) {
+		$suffix = strrchr($url, ')').$suffix;
+		$url = substr($url, 0, strrpos($url, ')'));
 	}
 
 	$url = esc_url($url);
-	if ( empty($url) )
+	if (empty($url))
 		return $matches[0];
 
-	return $matches[1] . "<a href=\"$url\" rel=\"nofollow\">$url</a>" . $suffix;
+	return $matches[1]."<a href=\"$url\" rel=\"nofollow\">$url</a>".$suffix;
 }
 
 /**
@@ -2150,22 +2150,22 @@ 
  * @param array $matches Single Regex Match.
  * @return string HTML A element with URL address.
  */
-function _make_web_ftp_clickable_cb( $matches ) {
+function _make_web_ftp_clickable_cb($matches) {
 	$ret = '';
 	$dest = $matches[2];
-	$dest = 'http://' . $dest;
+	$dest = 'http://'.$dest;
 
 	// removed trailing [.,;:)] from URL
-	if ( in_array( substr($dest, -1), array('.', ',', ';', ':', ')') ) === true ) {
+	if (in_array(substr($dest, -1), array('.', ',', ';', ':', ')')) === true) {
 		$ret = substr($dest, -1);
-		$dest = substr($dest, 0, strlen($dest)-1);
+		$dest = substr($dest, 0, strlen($dest) - 1);
 	}
 
 	$dest = esc_url($dest);
-	if ( empty($dest) )
+	if (empty($dest))
 		return $matches[0];
 
-	return $matches[1] . "<a href=\"$dest\" rel=\"nofollow\">$dest</a>$ret";
+	return $matches[1]."<a href=\"$dest\" rel=\"nofollow\">$dest</a>$ret";
 }
 
 /**
@@ -2180,9 +2180,9 @@ 
  * @param array $matches Single Regex Match.
  * @return string HTML A element with email address.
  */
-function _make_email_clickable_cb( $matches ) {
-	$email = $matches[2] . '@' . $matches[3];
-	return $matches[1] . "<a href=\"mailto:$email\">$email</a>";
+function _make_email_clickable_cb($matches) {
+	$email = $matches[2].'@'.$matches[3];
+	return $matches[1]."<a href=\"mailto:$email\">$email</a>";
 }
 
 /**
@@ -2196,30 +2196,30 @@ 
  * @param string $text Content to convert URIs.
  * @return string Content with converted URIs.
  */
-function make_clickable( $text ) {
+function make_clickable($text) {
 	$r = '';
-	$textarr = preg_split( '/(<[^<>]+>)/', $text, -1, PREG_SPLIT_DELIM_CAPTURE ); // split out HTML tags
+	$textarr = preg_split('/(<[^<>]+>)/', $text, -1, PREG_SPLIT_DELIM_CAPTURE); // split out HTML tags
 	$nested_code_pre = 0; // Keep track of how many levels link is nested inside <pre> or <code>
-	foreach ( $textarr as $piece ) {
+	foreach ($textarr as $piece) {
 
-		if ( preg_match( '|^<code[\s>]|i', $piece ) || preg_match( '|^<pre[\s>]|i', $piece ) || preg_match( '|^<script[\s>]|i', $piece ) || preg_match( '|^<style[\s>]|i', $piece ) )
+		if (preg_match('|^<code[\s>]|i', $piece) || preg_match('|^<pre[\s>]|i', $piece) || preg_match('|^<script[\s>]|i', $piece) || preg_match('|^<style[\s>]|i', $piece))
 			$nested_code_pre++;
-		elseif ( $nested_code_pre && ( '</code>' === strtolower( $piece ) || '</pre>' === strtolower( $piece ) || '</script>' === strtolower( $piece ) || '</style>' === strtolower( $piece ) ) )
+		elseif ($nested_code_pre && ('</code>' === strtolower($piece) || '</pre>' === strtolower($piece) || '</script>' === strtolower($piece) || '</style>' === strtolower($piece)))
 			$nested_code_pre--;
 
-		if ( $nested_code_pre || empty( $piece ) || ( $piece[0] === '<' && ! preg_match( '|^<\s*[\w]{1,20}+://|', $piece ) ) ) {
+		if ($nested_code_pre || empty($piece) || ($piece[0] === '<' && ! preg_match('|^<\s*[\w]{1,20}+://|', $piece))) {
 			$r .= $piece;
 			continue;
 		}
 
 		// Long strings might contain expensive edge cases ...
-		if ( 10000 < strlen( $piece ) ) {
+		if (10000 < strlen($piece)) {
 			// ... break it up
-			foreach ( _split_str_by_whitespace( $piece, 2100 ) as $chunk ) { // 2100: Extra room for scheme and leading and trailing paretheses
-				if ( 2101 < strlen( $chunk ) ) {
+			foreach (_split_str_by_whitespace($piece, 2100) as $chunk) { // 2100: Extra room for scheme and leading and trailing paretheses
+				if (2101 < strlen($chunk)) {
 					$r .= $chunk; // Too big, no whitespace: bail.
 				} else {
-					$r .= make_clickable( $chunk );
+					$r .= make_clickable($chunk);
 				}
 			}
 		} else {
@@ -2240,18 +2240,18 @@ 
 			~xS'; // The regex is a non-anchored pattern and does not have a single fixed starting character.
 			      // Tell PCRE to spend more time optimizing since, when used on a page load, it will probably be used several times.
 
-			$ret = preg_replace_callback( $url_clickable, '_make_url_clickable_cb', $ret );
+			$ret = preg_replace_callback($url_clickable, '_make_url_clickable_cb', $ret);
 
-			$ret = preg_replace_callback( '#([\s>])((www|ftp)\.[\w\\x80-\\xff\#$%&~/.\-;:=,?@\[\]+]+)#is', '_make_web_ftp_clickable_cb', $ret );
-			$ret = preg_replace_callback( '#([\s>])([.0-9a-z_+-]+)@(([0-9a-z-]+\.)+[0-9a-z]{2,})#i', '_make_email_clickable_cb', $ret );
+			$ret = preg_replace_callback('#([\s>])((www|ftp)\.[\w\\x80-\\xff\#$%&~/.\-;:=,?@\[\]+]+)#is', '_make_web_ftp_clickable_cb', $ret);
+			$ret = preg_replace_callback('#([\s>])([.0-9a-z_+-]+)@(([0-9a-z-]+\.)+[0-9a-z]{2,})#i', '_make_email_clickable_cb', $ret);
 
-			$ret = substr( $ret, 1, -1 ); // Remove our whitespace padding.
+			$ret = substr($ret, 1, -1); // Remove our whitespace padding.
 			$r .= $ret;
 		}
 	}
 
 	// Cleanup of accidental links within links
-	return preg_replace( '#(<a([ \r\n\t]+[^>]+?>|>))<a [^>]+?>([^>]+?)</a></a>#i', "$1$3</a>", $r );
+	return preg_replace('#(<a([ \r\n\t]+[^>]+?>|>))<a [^>]+?>([^>]+?)</a></a>#i', "$1$3</a>", $r);
 }
 
 /**
@@ -2283,27 +2283,27 @@ 
  * @param int    $goal   The desired chunk length.
  * @return array Numeric array of chunks.
  */
-function _split_str_by_whitespace( $string, $goal ) {
+function _split_str_by_whitespace($string, $goal) {
 	$chunks = array();
 
-	$string_nullspace = strtr( $string, "\r\n\t\v\f ", "\000\000\000\000\000\000" );
+	$string_nullspace = strtr($string, "\r\n\t\v\f ", "\000\000\000\000\000\000");
 
-	while ( $goal < strlen( $string_nullspace ) ) {
-		$pos = strrpos( substr( $string_nullspace, 0, $goal + 1 ), "\000" );
+	while ($goal < strlen($string_nullspace)) {
+		$pos = strrpos(substr($string_nullspace, 0, $goal + 1), "\000");
 
-		if ( false === $pos ) {
-			$pos = strpos( $string_nullspace, "\000", $goal + 1 );
-			if ( false === $pos ) {
+		if (false === $pos) {
+			$pos = strpos($string_nullspace, "\000", $goal + 1);
+			if (false === $pos) {
 				break;
 			}
 		}
 
-		$chunks[] = substr( $string, 0, $pos + 1 );
-		$string = substr( $string, $pos + 1 );
-		$string_nullspace = substr( $string_nullspace, $pos + 1 );
+		$chunks[] = substr($string, 0, $pos + 1);
+		$string = substr($string, $pos + 1);
+		$string_nullspace = substr($string_nullspace, $pos + 1);
 	}
 
-	if ( $string ) {
+	if ($string) {
 		$chunks[] = $string;
 	}
 
@@ -2318,11 +2318,11 @@ 
  * @param string $text Content that may contain HTML A elements.
  * @return string Converted content.
  */
-function wp_rel_nofollow( $text ) {
+function wp_rel_nofollow($text) {
 	// This is a pre save filter, so text is already escaped.
 	$text = stripslashes($text);
 	$text = preg_replace_callback('|<a (.+?)>|i', 'wp_rel_nofollow_callback', $text);
-	return wp_slash( $text );
+	return wp_slash($text);
 }
 
 /**
@@ -2336,30 +2336,30 @@ 
  * @param array $matches Single Match
  * @return string HTML A Element with rel nofollow.
  */
-function wp_rel_nofollow_callback( $matches ) {
+function wp_rel_nofollow_callback($matches) {
 	$text = $matches[1];
-	$atts = shortcode_parse_atts( $matches[1] );
+	$atts = shortcode_parse_atts($matches[1]);
 	$rel  = 'nofollow';
 
-	if ( preg_match( '%href=["\'](' . preg_quote( set_url_scheme( home_url(), 'http' ) ) . ')%i', $text ) ||
-	     preg_match( '%href=["\'](' . preg_quote( set_url_scheme( home_url(), 'https' ) ) . ')%i', $text )
+	if (preg_match('%href=["\']('.preg_quote(set_url_scheme(home_url(), 'http')).')%i', $text) ||
+	     preg_match('%href=["\']('.preg_quote(set_url_scheme(home_url(), 'https')).')%i', $text)
 	) {
 		return "<a $text>";
 	}
 
-	if ( ! empty( $atts['rel'] ) ) {
-		$parts = array_map( 'trim', explode( ' ', $atts['rel'] ) );
-		if ( false === array_search( 'nofollow', $parts ) ) {
+	if ( ! empty($atts['rel'])) {
+		$parts = array_map('trim', explode(' ', $atts['rel']));
+		if (false === array_search('nofollow', $parts)) {
 			$parts[] = 'nofollow';
 		}
-		$rel = implode( ' ', $parts );
-		unset( $atts['rel'] );
+		$rel = implode(' ', $parts);
+		unset($atts['rel']);
 
 		$html = '';
-		foreach ( $atts as $name => $value ) {
+		foreach ($atts as $name => $value) {
 			$html .= "{$name}=\"$value\" ";
 		}
-		$text = trim( $html );
+		$text = trim($html);
 	}
 	return "<a $text rel=\"$rel\">";
 }
@@ -2378,21 +2378,21 @@ 
  * @param array $matches Single match. Smiley code to convert to image.
  * @return string Image string for smiley.
  */
-function translate_smiley( $matches ) {
+function translate_smiley($matches) {
 	global $wpsmiliestrans;
 
-	if ( count( $matches ) == 0 )
+	if (count($matches) == 0)
 		return '';
 
-	$smiley = trim( reset( $matches ) );
-	$img = $wpsmiliestrans[ $smiley ];
+	$smiley = trim(reset($matches));
+	$img = $wpsmiliestrans[$smiley];
 
 	$matches = array();
-	$ext = preg_match( '/\.([^.]+)$/', $img, $matches ) ? strtolower( $matches[1] ) : false;
-	$image_exts = array( 'jpg', 'jpeg', 'jpe', 'gif', 'png' );
+	$ext = preg_match('/\.([^.]+)$/', $img, $matches) ? strtolower($matches[1]) : false;
+	$image_exts = array('jpg', 'jpeg', 'jpe', 'gif', 'png');
 
 	// Don't convert smilies that aren't images - they're probably emoji.
-	if ( ! in_array( $ext, $image_exts ) ) {
+	if ( ! in_array($ext, $image_exts)) {
 		return $img;
 	}
 
@@ -2405,9 +2405,9 @@ 
 	 * @param string $img        Filename for the smiley image.
 	 * @param string $site_url   Site URL, as returned by site_url().
 	 */
-	$src_url = apply_filters( 'smilies_src', includes_url( "images/smilies/$img" ), $img, site_url() );
+	$src_url = apply_filters('smilies_src', includes_url("images/smilies/$img"), $img, site_url());
 
-	return sprintf( '<img src="%s" alt="%s" class="wp-smiley" style="height: 1em; max-height: 1em;" />', esc_url( $src_url ), esc_attr( $smiley ) );
+	return sprintf('<img src="%s" alt="%s" class="wp-smiley" style="height: 1em; max-height: 1em;" />', esc_url($src_url), esc_attr($smiley));
 }
 
 /**
@@ -2423,33 +2423,33 @@ 
  * @param string $text Content to convert smilies from text.
  * @return string Converted content with text smilies replaced with images.
  */
-function convert_smilies( $text ) {
+function convert_smilies($text) {
 	global $wp_smiliessearch;
 	$output = '';
-	if ( get_option( 'use_smilies' ) && ! empty( $wp_smiliessearch ) ) {
+	if (get_option('use_smilies') && ! empty($wp_smiliessearch)) {
 		// HTML loop taken from texturize function, could possible be consolidated
-		$textarr = preg_split( '/(<.*>)/U', $text, -1, PREG_SPLIT_DELIM_CAPTURE ); // capture the tags as well as in between
-		$stop = count( $textarr );// loop stuff
+		$textarr = preg_split('/(<.*>)/U', $text, -1, PREG_SPLIT_DELIM_CAPTURE); // capture the tags as well as in between
+		$stop = count($textarr); // loop stuff
 
 		// Ignore proessing of specific tags
 		$tags_to_ignore = 'code|pre|style|script|textarea';
 		$ignore_block_element = '';
 
-		for ( $i = 0; $i < $stop; $i++ ) {
+		for ($i = 0; $i < $stop; $i++) {
 			$content = $textarr[$i];
 
 			// If we're in an ignore block, wait until we find its closing tag
-			if ( '' == $ignore_block_element && preg_match( '/^<(' . $tags_to_ignore . ')>/', $content, $matches ) )  {
+			if ('' == $ignore_block_element && preg_match('/^<('.$tags_to_ignore.')>/', $content, $matches)) {
 				$ignore_block_element = $matches[1];
 			}
 
 			// If it's not a tag and not in ignore block
-			if ( '' ==  $ignore_block_element && strlen( $content ) > 0 && '<' != $content[0] ) {
-				$content = preg_replace_callback( $wp_smiliessearch, 'translate_smiley', $content );
+			if ('' == $ignore_block_element && strlen($content) > 0 && '<' != $content[0]) {
+				$content = preg_replace_callback($wp_smiliessearch, 'translate_smiley', $content);
 			}
 
 			// did we exit ignore block
-			if ( '' != $ignore_block_element && '</' . $ignore_block_element . '>' == $content )  {
+			if ('' != $ignore_block_element && '</'.$ignore_block_element.'>' == $content) {
 				$ignore_block_element = '';
 			}
 
@@ -2473,12 +2473,12 @@ 
  * @param bool   $deprecated Deprecated.
  * @return string|bool Either false or the valid email address.
  */
-function is_email( $email, $deprecated = false ) {
-	if ( ! empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '3.0' );
+function is_email($email, $deprecated = false) {
+	if ( ! empty($deprecated))
+		_deprecated_argument(__FUNCTION__, '3.0');
 
 	// Test for the minimum length the email can be
-	if ( strlen( $email ) < 3 ) {
+	if (strlen($email) < 3) {
 		/**
 		 * Filter whether an email address is valid.
 		 *
@@ -2492,65 +2492,65 @@ 
 		 * @param string $email    The email address being checked.
 		 * @param string $context  Context under which the email was tested.
 		 */
-		return apply_filters( 'is_email', false, $email, 'email_too_short' );
+		return apply_filters('is_email', false, $email, 'email_too_short');
 	}
 
 	// Test for an @ character after the first position
-	if ( strpos( $email, '@', 1 ) === false ) {
+	if (strpos($email, '@', 1) === false) {
 		/** This filter is documented in wp-includes/formatting.php */
-		return apply_filters( 'is_email', false, $email, 'email_no_at' );
+		return apply_filters('is_email', false, $email, 'email_no_at');
 	}
 
 	// Split out the local and domain parts
-	list( $local, $domain ) = explode( '@', $email, 2 );
+	list($local, $domain) = explode('@', $email, 2);
 
 	// LOCAL PART
 	// Test for invalid characters
-	if ( !preg_match( '/^[a-zA-Z0-9!#$%&\'*+\/=?^_`{|}~\.-]+$/', $local ) ) {
+	if ( ! preg_match('/^[a-zA-Z0-9!#$%&\'*+\/=?^_`{|}~\.-]+$/', $local)) {
 		/** This filter is documented in wp-includes/formatting.php */
-		return apply_filters( 'is_email', false, $email, 'local_invalid_chars' );
+		return apply_filters('is_email', false, $email, 'local_invalid_chars');
 	}
 
 	// DOMAIN PART
 	// Test for sequences of periods
-	if ( preg_match( '/\.{2,}/', $domain ) ) {
+	if (preg_match('/\.{2,}/', $domain)) {
 		/** This filter is documented in wp-includes/formatting.php */
-		return apply_filters( 'is_email', false, $email, 'domain_period_sequence' );
+		return apply_filters('is_email', false, $email, 'domain_period_sequence');
 	}
 
 	// Test for leading and trailing periods and whitespace
-	if ( trim( $domain, " \t\n\r\0\x0B." ) !== $domain ) {
+	if (trim($domain, " \t\n\r\0\x0B.") !== $domain) {
 		/** This filter is documented in wp-includes/formatting.php */
-		return apply_filters( 'is_email', false, $email, 'domain_period_limits' );
+		return apply_filters('is_email', false, $email, 'domain_period_limits');
 	}
 
 	// Split the domain into subs
-	$subs = explode( '.', $domain );
+	$subs = explode('.', $domain);
 
 	// Assume the domain will have at least two subs
-	if ( 2 > count( $subs ) ) {
+	if (2 > count($subs)) {
 		/** This filter is documented in wp-includes/formatting.php */
-		return apply_filters( 'is_email', false, $email, 'domain_no_periods' );
+		return apply_filters('is_email', false, $email, 'domain_no_periods');
 	}
 
 	// Loop through each sub
-	foreach ( $subs as $sub ) {
+	foreach ($subs as $sub) {
 		// Test for leading and trailing hyphens and whitespace
-		if ( trim( $sub, " \t\n\r\0\x0B-" ) !== $sub ) {
+		if (trim($sub, " \t\n\r\0\x0B-") !== $sub) {
 			/** This filter is documented in wp-includes/formatting.php */
-			return apply_filters( 'is_email', false, $email, 'sub_hyphen_limits' );
+			return apply_filters('is_email', false, $email, 'sub_hyphen_limits');
 		}
 
 		// Test for invalid characters
-		if ( !preg_match('/^[a-z0-9-]+$/i', $sub ) ) {
+		if ( ! preg_match('/^[a-z0-9-]+$/i', $sub)) {
 			/** This filter is documented in wp-includes/formatting.php */
-			return apply_filters( 'is_email', false, $email, 'sub_invalid_chars' );
+			return apply_filters('is_email', false, $email, 'sub_invalid_chars');
 		}
 	}
 
 	// Congratulations your email made it!
 	/** This filter is documented in wp-includes/formatting.php */
-	return apply_filters( 'is_email', $email, $email, null );
+	return apply_filters('is_email', $email, $email, null);
 }
 
 /**
@@ -2561,13 +2561,13 @@ 
  * @param string $string Subject line
  * @return string Converted string to ASCII
  */
-function wp_iso_descrambler( $string ) {
+function wp_iso_descrambler($string) {
 	/* this may only work with iso-8859-1, I'm afraid */
-	if (!preg_match('#\=\?(.+)\?Q\?(.+)\?\=#i', $string, $matches)) {
+	if ( ! preg_match('#\=\?(.+)\?Q\?(.+)\?\=#i', $string, $matches)) {
 		return $string;
 	} else {
 		$subject = str_replace('_', ' ', $matches[2]);
-		return preg_replace_callback( '#\=([0-9a-f]{2})#i', '_wp_iso_convert', $subject );
+		return preg_replace_callback('#\=([0-9a-f]{2})#i', '_wp_iso_convert', $subject);
 	}
 }
 
@@ -2580,8 +2580,8 @@ 
  * @param array $match The preg_replace_callback matches array
  * @return string Converted chars
  */
-function _wp_iso_convert( $match ) {
-	return chr( hexdec( strtolower( $match[1] ) ) );
+function _wp_iso_convert($match) {
+	return chr(hexdec(strtolower($match[1])));
 }
 
 /**
@@ -2598,25 +2598,25 @@ 
  * @param string $format The format string for the returned date (default is Y-m-d H:i:s)
  * @return string GMT version of the date provided.
  */
-function get_gmt_from_date( $string, $format = 'Y-m-d H:i:s' ) {
-	$tz = get_option( 'timezone_string' );
-	if ( $tz ) {
-		$datetime = date_create( $string, new DateTimeZone( $tz ) );
-		if ( ! $datetime ) {
-			return gmdate( $format, 0 );
+function get_gmt_from_date($string, $format = 'Y-m-d H:i:s') {
+	$tz = get_option('timezone_string');
+	if ($tz) {
+		$datetime = date_create($string, new DateTimeZone($tz));
+		if ( ! $datetime) {
+			return gmdate($format, 0);
 		}
-		$datetime->setTimezone( new DateTimeZone( 'UTC' ) );
-		$string_gmt = $datetime->format( $format );
+		$datetime->setTimezone(new DateTimeZone('UTC'));
+		$string_gmt = $datetime->format($format);
 	} else {
-		if ( ! preg_match( '#([0-9]{1,4})-([0-9]{1,2})-([0-9]{1,2}) ([0-9]{1,2}):([0-9]{1,2}):([0-9]{1,2})#', $string, $matches ) ) {
-			$datetime = strtotime( $string );
-			if ( false === $datetime ) {
-				return gmdate( $format, 0 );
+		if ( ! preg_match('#([0-9]{1,4})-([0-9]{1,2})-([0-9]{1,2}) ([0-9]{1,2}):([0-9]{1,2}):([0-9]{1,2})#', $string, $matches)) {
+			$datetime = strtotime($string);
+			if (false === $datetime) {
+				return gmdate($format, 0);
 			}
-			return gmdate( $format, $datetime );
+			return gmdate($format, $datetime);
 		}
-		$string_time = gmmktime( $matches[4], $matches[5], $matches[6], $matches[2], $matches[3], $matches[1] );
-		$string_gmt = gmdate( $format, $string_time - get_option( 'gmt_offset' ) * HOUR_IN_SECONDS );
+		$string_time = gmmktime($matches[4], $matches[5], $matches[6], $matches[2], $matches[3], $matches[1]);
+		$string_gmt = gmdate($format, $string_time - get_option('gmt_offset') * HOUR_IN_SECONDS);
 	}
 	return $string_gmt;
 }
@@ -2635,19 +2635,19 @@ 
  * @param string $format The format string for the returned date (default is Y-m-d H:i:s)
  * @return string Formatted date relative to the timezone / GMT offset.
  */
-function get_date_from_gmt( $string, $format = 'Y-m-d H:i:s' ) {
-	$tz = get_option( 'timezone_string' );
-	if ( $tz ) {
-		$datetime = date_create( $string, new DateTimeZone( 'UTC' ) );
-		if ( ! $datetime )
-			return date( $format, 0 );
-		$datetime->setTimezone( new DateTimeZone( $tz ) );
-		$string_localtime = $datetime->format( $format );
+function get_date_from_gmt($string, $format = 'Y-m-d H:i:s') {
+	$tz = get_option('timezone_string');
+	if ($tz) {
+		$datetime = date_create($string, new DateTimeZone('UTC'));
+		if ( ! $datetime)
+			return date($format, 0);
+		$datetime->setTimezone(new DateTimeZone($tz));
+		$string_localtime = $datetime->format($format);
 	} else {
-		if ( ! preg_match('#([0-9]{1,4})-([0-9]{1,2})-([0-9]{1,2}) ([0-9]{1,2}):([0-9]{1,2}):([0-9]{1,2})#', $string, $matches) )
-			return date( $format, 0 );
-		$string_time = gmmktime( $matches[4], $matches[5], $matches[6], $matches[2], $matches[3], $matches[1] );
-		$string_localtime = gmdate( $format, $string_time + get_option( 'gmt_offset' ) * HOUR_IN_SECONDS );
+		if ( ! preg_match('#([0-9]{1,4})-([0-9]{1,2})-([0-9]{1,2}) ([0-9]{1,2}):([0-9]{1,2}):([0-9]{1,2})#', $string, $matches))
+			return date($format, 0);
+		$string_time = gmmktime($matches[4], $matches[5], $matches[6], $matches[2], $matches[3], $matches[1]);
+		$string_localtime = gmdate($format, $string_time + get_option('gmt_offset') * HOUR_IN_SECONDS);
 	}
 	return $string_localtime;
 }
@@ -2660,7 +2660,7 @@ 
  * @param string $timezone Either 'Z' for 0 offset or '±hhmm'.
  * @return int|float The offset in seconds.
  */
-function iso8601_timezone_to_offset( $timezone ) {
+function iso8601_timezone_to_offset($timezone) {
 	// $timezone is either 'Z' or '[+|-]hhmm'
 	if ($timezone == 'Z') {
 		$offset = 0;
@@ -2682,14 +2682,14 @@ 
  * @param string $timezone    Optional. If set to GMT returns the time minus gmt_offset. Default is 'user'.
  * @return string The date and time in MySQL DateTime format - Y-m-d H:i:s.
  */
-function iso8601_to_datetime( $date_string, $timezone = 'user' ) {
+function iso8601_to_datetime($date_string, $timezone = 'user') {
 	$timezone = strtolower($timezone);
 
 	if ($timezone == 'gmt') {
 
 		preg_match('#([0-9]{4})([0-9]{2})([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})(Z|[\+|\-][0-9]{2,4}){0,1}#', $date_string, $date_bits);
 
-		if (!empty($date_bits[7])) { // we have a timezone, so let's compute an offset
+		if ( ! empty($date_bits[7])) { // we have a timezone, so let's compute an offset
 			$offset = iso8601_timezone_to_offset($date_bits[7]);
 		} else { // we don't have a timezone, so we assume user local timezone (not server's!)
 			$offset = HOUR_IN_SECONDS * get_option('gmt_offset');
@@ -2713,9 +2713,9 @@ 
  * @param string $email Email address to filter.
  * @return string Filtered email address.
  */
-function sanitize_email( $email ) {
+function sanitize_email($email) {
 	// Test for the minimum length the email can be
-	if ( strlen( $email ) < 3 ) {
+	if (strlen($email) < 3) {
 		/**
 		 * Filter a sanitized email address.
 		 *
@@ -2729,82 +2729,82 @@ 
 		 * @param string $email   The email address, as provided to sanitize_email().
 		 * @param string $message A message to pass to the user.
 		 */
-		return apply_filters( 'sanitize_email', '', $email, 'email_too_short' );
+		return apply_filters('sanitize_email', '', $email, 'email_too_short');
 	}
 
 	// Test for an @ character after the first position
-	if ( strpos( $email, '@', 1 ) === false ) {
+	if (strpos($email, '@', 1) === false) {
 		/** This filter is documented in wp-includes/formatting.php */
-		return apply_filters( 'sanitize_email', '', $email, 'email_no_at' );
+		return apply_filters('sanitize_email', '', $email, 'email_no_at');
 	}
 
 	// Split out the local and domain parts
-	list( $local, $domain ) = explode( '@', $email, 2 );
+	list($local, $domain) = explode('@', $email, 2);
 
 	// LOCAL PART
 	// Test for invalid characters
-	$local = preg_replace( '/[^a-zA-Z0-9!#$%&\'*+\/=?^_`{|}~\.-]/', '', $local );
-	if ( '' === $local ) {
+	$local = preg_replace('/[^a-zA-Z0-9!#$%&\'*+\/=?^_`{|}~\.-]/', '', $local);
+	if ('' === $local) {
 		/** This filter is documented in wp-includes/formatting.php */
-		return apply_filters( 'sanitize_email', '', $email, 'local_invalid_chars' );
+		return apply_filters('sanitize_email', '', $email, 'local_invalid_chars');
 	}
 
 	// DOMAIN PART
 	// Test for sequences of periods
-	$domain = preg_replace( '/\.{2,}/', '', $domain );
-	if ( '' === $domain ) {
+	$domain = preg_replace('/\.{2,}/', '', $domain);
+	if ('' === $domain) {
 		/** This filter is documented in wp-includes/formatting.php */
-		return apply_filters( 'sanitize_email', '', $email, 'domain_period_sequence' );
+		return apply_filters('sanitize_email', '', $email, 'domain_period_sequence');
 	}
 
 	// Test for leading and trailing periods and whitespace
-	$domain = trim( $domain, " \t\n\r\0\x0B." );
-	if ( '' === $domain ) {
+	$domain = trim($domain, " \t\n\r\0\x0B.");
+	if ('' === $domain) {
 		/** This filter is documented in wp-includes/formatting.php */
-		return apply_filters( 'sanitize_email', '', $email, 'domain_period_limits' );
+		return apply_filters('sanitize_email', '', $email, 'domain_period_limits');
 	}
 
 	// Split the domain into subs
-	$subs = explode( '.', $domain );
+	$subs = explode('.', $domain);
 
 	// Assume the domain will have at least two subs
-	if ( 2 > count( $subs ) ) {
+	if (2 > count($subs)) {
 		/** This filter is documented in wp-includes/formatting.php */
-		return apply_filters( 'sanitize_email', '', $email, 'domain_no_periods' );
+		return apply_filters('sanitize_email', '', $email, 'domain_no_periods');
 	}
 
 	// Create an array that will contain valid subs
 	$new_subs = array();
 
 	// Loop through each sub
-	foreach ( $subs as $sub ) {
+	foreach ($subs as $sub) {
 		// Test for leading and trailing hyphens
-		$sub = trim( $sub, " \t\n\r\0\x0B-" );
+		$sub = trim($sub, " \t\n\r\0\x0B-");
 
 		// Test for invalid characters
-		$sub = preg_replace( '/[^a-z0-9-]+/i', '', $sub );
+		$sub = preg_replace('/[^a-z0-9-]+/i', '', $sub);
 
 		// If there's anything left, add it to the valid subs
-		if ( '' !== $sub ) {
+		if ('' !== $sub) {
 			$new_subs[] = $sub;
 		}
 	}
 
 	// If there aren't 2 or more valid subs
-	if ( 2 > count( $new_subs ) ) {
+	if (2 > count($new_subs)) {
 		/** This filter is documented in wp-includes/formatting.php */
-		return apply_filters( 'sanitize_email', '', $email, 'domain_no_valid_subs' );
+		return apply_filters('sanitize_email', '', $email, 'domain_no_valid_subs');
 	}
 
 	// Join valid subs into the new domain
-	$domain = join( '.', $new_subs );
+	$domain = join('.', $new_subs);
 
 	// Put the email back together
-	$email = $local . '@' . $domain;
+	$email = $local.'@'.$domain;
 
 	// Congratulations your email made it!
 	/** This filter is documented in wp-includes/formatting.php */
-	return apply_filters( 'sanitize_email', $email, $email, null );
+	return apply_filters('sanitize_email', $email, $email, null);
 }
 
 /**
@@ -2819,44 +2819,44 @@ 
  * @param int $to   Optional. Unix timestamp to end the time difference. Default becomes time() if not set.
  * @return string Human readable time difference.
  */
-function human_time_diff( $from, $to = '' ) {
-	if ( empty( $to ) ) {
+function human_time_diff($from, $to = '') {
+	if (empty($to)) {
 		$to = time();
 	}
 
-	$diff = (int) abs( $to - $from );
+	$diff = (int) abs($to - $from);
 
-	if ( $diff < HOUR_IN_SECONDS ) {
-		$mins = round( $diff / MINUTE_IN_SECONDS );
-		if ( $mins <= 1 )
+	if ($diff < HOUR_IN_SECONDS) {
+		$mins = round($diff / MINUTE_IN_SECONDS);
+		if ($mins <= 1)
 			$mins = 1;
 		/* translators: min=minute */
-		$since = sprintf( _n( '%s min', '%s mins', $mins ), $mins );
-	} elseif ( $diff < DAY_IN_SECONDS && $diff >= HOUR_IN_SECONDS ) {
-		$hours = round( $diff / HOUR_IN_SECONDS );
-		if ( $hours <= 1 )
+		$since = sprintf(_n('%s min', '%s mins', $mins), $mins);
+	} elseif ($diff < DAY_IN_SECONDS && $diff >= HOUR_IN_SECONDS) {
+		$hours = round($diff / HOUR_IN_SECONDS);
+		if ($hours <= 1)
 			$hours = 1;
-		$since = sprintf( _n( '%s hour', '%s hours', $hours ), $hours );
-	} elseif ( $diff < WEEK_IN_SECONDS && $diff >= DAY_IN_SECONDS ) {
-		$days = round( $diff / DAY_IN_SECONDS );
-		if ( $days <= 1 )
+		$since = sprintf(_n('%s hour', '%s hours', $hours), $hours);
+	} elseif ($diff < WEEK_IN_SECONDS && $diff >= DAY_IN_SECONDS) {
+		$days = round($diff / DAY_IN_SECONDS);
+		if ($days <= 1)
 			$days = 1;
-		$since = sprintf( _n( '%s day', '%s days', $days ), $days );
-	} elseif ( $diff < MONTH_IN_SECONDS && $diff >= WEEK_IN_SECONDS ) {
-		$weeks = round( $diff / WEEK_IN_SECONDS );
-		if ( $weeks <= 1 )
+		$since = sprintf(_n('%s day', '%s days', $days), $days);
+	} elseif ($diff < MONTH_IN_SECONDS && $diff >= WEEK_IN_SECONDS) {
+		$weeks = round($diff / WEEK_IN_SECONDS);
+		if ($weeks <= 1)
 			$weeks = 1;
-		$since = sprintf( _n( '%s week', '%s weeks', $weeks ), $weeks );
-	} elseif ( $diff < YEAR_IN_SECONDS && $diff >= MONTH_IN_SECONDS ) {
-		$months = round( $diff / MONTH_IN_SECONDS );
-		if ( $months <= 1 )
+		$since = sprintf(_n('%s week', '%s weeks', $weeks), $weeks);
+	} elseif ($diff < YEAR_IN_SECONDS && $diff >= MONTH_IN_SECONDS) {
+		$months = round($diff / MONTH_IN_SECONDS);
+		if ($months <= 1)
 			$months = 1;
-		$since = sprintf( _n( '%s month', '%s months', $months ), $months );
-	} elseif ( $diff >= YEAR_IN_SECONDS ) {
-		$years = round( $diff / YEAR_IN_SECONDS );
-		if ( $years <= 1 )
+		$since = sprintf(_n('%s month', '%s months', $months), $months);
+	} elseif ($diff >= YEAR_IN_SECONDS) {
+		$years = round($diff / YEAR_IN_SECONDS);
+		if ($years <= 1)
 			$years = 1;
-		$since = sprintf( _n( '%s year', '%s years', $years ), $years );
+		$since = sprintf(_n('%s year', '%s years', $years), $years);
 	}
 
 	/**
@@ -2869,7 +2869,7 @@ 
 	 * @param int    $from  Unix timestamp from which the difference begins.
 	 * @param int    $to    Unix timestamp to end the time difference.
 	 */
-	return apply_filters( 'human_time_diff', $since, $diff, $from, $to );
+	return apply_filters('human_time_diff', $since, $diff, $from, $to);
 }
 
 /**
@@ -2887,15 +2887,15 @@ 
  * @param string $text Optional. The excerpt. If set to empty, an excerpt is generated.
  * @return string The excerpt.
  */
-function wp_trim_excerpt( $text = '' ) {
+function wp_trim_excerpt($text = '') {
 	$raw_excerpt = $text;
-	if ( '' == $text ) {
+	if ('' == $text) {
 		$text = get_the_content('');
 
-		$text = strip_shortcodes( $text );
+		$text = strip_shortcodes($text);
 
 		/** This filter is documented in wp-includes/post-template.php */
-		$text = apply_filters( 'the_content', $text );
+		$text = apply_filters('the_content', $text);
 		$text = str_replace(']]>', ']]&gt;', $text);
 
 		/**
@@ -2905,7 +2905,7 @@ 
 		 *
 		 * @param int $number The number of words. Default 55.
 		 */
-		$excerpt_length = apply_filters( 'excerpt_length', 55 );
+		$excerpt_length = apply_filters('excerpt_length', 55);
 		/**
 		 * Filter the string in the "more" link displayed after a trimmed excerpt.
 		 *
@@ -2913,8 +2913,8 @@ 
 		 *
 		 * @param string $more_string The string shown within the more link.
 		 */
-		$excerpt_more = apply_filters( 'excerpt_more', ' ' . '[&hellip;]' );
-		$text = wp_trim_words( $text, $excerpt_length, $excerpt_more );
+		$excerpt_more = apply_filters('excerpt_more', ' '.'[&hellip;]');
+		$text = wp_trim_words($text, $excerpt_length, $excerpt_more);
 	}
 	/**
 	 * Filter the trimmed excerpt string.
@@ -2924,7 +2924,7 @@ 
 	 * @param string $text        The trimmed text.
 	 * @param string $raw_excerpt The text prior to trimming.
 	 */
-	return apply_filters( 'wp_trim_excerpt', $text, $raw_excerpt );
+	return apply_filters('wp_trim_excerpt', $text, $raw_excerpt);
 }
 
 /**
@@ -2941,35 +2941,35 @@ 
  * @param string $more      Optional. What to append if $text needs to be trimmed. Default '&hellip;'.
  * @return string Trimmed text.
  */
-function wp_trim_words( $text, $num_words = 55, $more = null ) {
-	if ( null === $more ) {
-		$more = __( '&hellip;' );
+function wp_trim_words($text, $num_words = 55, $more = null) {
+	if (null === $more) {
+		$more = __('&hellip;');
 	}
 
 	$original_text = $text;
-	$text = wp_strip_all_tags( $text );
+	$text = wp_strip_all_tags($text);
 
 	/*
 	 * translators: If your word count is based on single characters (e.g. East Asian characters),
 	 * enter 'characters_excluding_spaces' or 'characters_including_spaces'. Otherwise, enter 'words'.
 	 * Do not translate into your own language.
 	 */
-	if ( strpos( _x( 'words', 'Word count type. Do not translate!' ), 'characters' ) === 0 && preg_match( '/^utf\-?8$/i', get_option( 'blog_charset' ) ) ) {
-		$text = trim( preg_replace( "/[\n\r\t ]+/", ' ', $text ), ' ' );
-		preg_match_all( '/./u', $text, $words_array );
-		$words_array = array_slice( $words_array[0], 0, $num_words + 1 );
+	if (strpos(_x('words', 'Word count type. Do not translate!'), 'characters') === 0 && preg_match('/^utf\-?8$/i', get_option('blog_charset'))) {
+		$text = trim(preg_replace("/[\n\r\t ]+/", ' ', $text), ' ');
+		preg_match_all('/./u', $text, $words_array);
+		$words_array = array_slice($words_array[0], 0, $num_words + 1);
 		$sep = '';
 	} else {
-		$words_array = preg_split( "/[\n\r\t ]+/", $text, $num_words + 1, PREG_SPLIT_NO_EMPTY );
+		$words_array = preg_split("/[\n\r\t ]+/", $text, $num_words + 1, PREG_SPLIT_NO_EMPTY);
 		$sep = ' ';
 	}
 
-	if ( count( $words_array ) > $num_words ) {
-		array_pop( $words_array );
-		$text = implode( $sep, $words_array );
-		$text = $text . $more;
+	if (count($words_array) > $num_words) {
+		array_pop($words_array);
+		$text = implode($sep, $words_array);
+		$text = $text.$more;
 	} else {
-		$text = implode( $sep, $words_array );
+		$text = implode($sep, $words_array);
 	}
 
 	/**
@@ -2982,7 +2982,7 @@ 
 	 * @param string $more          An optional string to append to the end of the trimmed text, e.g. &hellip;.
 	 * @param string $original_text The text before it was trimmed.
 	 */
-	return apply_filters( 'wp_trim_words', $text, $num_words, $more, $original_text );
+	return apply_filters('wp_trim_words', $text, $num_words, $more, $original_text);
 }
 
 /**
@@ -2993,7 +2993,7 @@ 
  * @param string $text The text within which entities will be converted.
  * @return string Text with converted entities.
  */
-function ent2ncr( $text ) {
+function ent2ncr($text) {
 
 	/**
 	 * Filter text before named entities are converted into numbered entities.
@@ -3005,8 +3005,8 @@ 
 	 * @param null   $converted_text The text to be converted. Default null.
 	 * @param string $text           The text prior to entity conversion.
 	 */
-	$filtered = apply_filters( 'pre_ent2ncr', null, $text );
-	if ( null !== $filtered )
+	$filtered = apply_filters('pre_ent2ncr', null, $text);
+	if (null !== $filtered)
 		return $filtered;
 
 	$to_ncr = array(
@@ -3268,7 +3268,7 @@ 
 		'&diams;' => '&#9830;'
 	);
 
-	return str_replace( array_keys($to_ncr), array_values($to_ncr), $text );
+	return str_replace(array_keys($to_ncr), array_values($to_ncr), $text);
 }
 
 /**
@@ -3289,9 +3289,9 @@ 
  *                               It is usually either 'html' or 'tinymce'.
  * @return string The formatted text after filter is applied.
  */
-function format_for_editor( $text, $default_editor = null ) {
-	if ( $text ) {
-		$text = htmlspecialchars( $text, ENT_NOQUOTES, get_option( 'blog_charset' ) );
+function format_for_editor($text, $default_editor = null) {
+	if ($text) {
+		$text = htmlspecialchars($text, ENT_NOQUOTES, get_option('blog_charset'));
 	}
 
 	/**
@@ -3303,7 +3303,7 @@ 
 	 * @param string $default_editor The default editor for the current user.
 	 *                               It is usually either 'html' or 'tinymce'.
 	 */
-	return apply_filters( 'format_for_editor', $text, $default_editor );
+	return apply_filters('format_for_editor', $text, $default_editor);
 }
 
 /**
@@ -3321,12 +3321,12 @@ 
  * @param string       $subject The string being searched and replaced on, otherwise known as the haystack.
  * @return string The string with the replaced svalues.
  */
-function _deep_replace( $search, $subject ) {
+function _deep_replace($search, $subject) {
 	$subject = (string) $subject;
 
 	$count = 1;
-	while ( $count ) {
-		$subject = str_replace( $search, '', $subject, $count );
+	while ($count) {
+		$subject = str_replace($search, '', $subject, $count);
 	}
 
 	return $subject;
@@ -3346,9 +3346,9 @@ 
  * @param string|array $data Unescaped data
  * @return string|array Escaped data
  */
-function esc_sql( $data ) {
+function esc_sql($data) {
 	global $wpdb;
-	return $wpdb->_escape( $data );
+	return $wpdb->_escape($data);
 }
 
 /**
@@ -3366,20 +3366,20 @@ 
  * @param string $_context  Private. Use esc_url_raw() for database usage.
  * @return string The cleaned $url after the 'clean_url' filter is applied.
  */
-function esc_url( $url, $protocols = null, $_context = 'display' ) {
+function esc_url($url, $protocols = null, $_context = 'display') {
 	$original_url = $url;
 
-	if ( '' == $url )
+	if ('' == $url)
 		return $url;
 
-	$url = str_replace( ' ', '%20', $url );
+	$url = str_replace(' ', '%20', $url);
 	$url = preg_replace('|[^a-z0-9-~+_.?#=!&;,/:%@$\|*\'()\[\]\\x80-\\xff]|i', '', $url);
 
-	if ( '' === $url ) {
+	if ('' === $url) {
 		return $url;
 	}
 
-	if ( 0 !== stripos( $url, 'mailto:' ) ) {
+	if (0 !== stripos($url, 'mailto:')) {
 		$strip = array('%0d', '%0a', '%0D', '%0A');
 		$url = _deep_replace($strip, $url);
 	}
@@ -3389,61 +3389,61 @@ 
 	 * presume it needs http:// prepended (unless a relative
 	 * link starting with /, # or ? or a php file).
 	 */
-	if ( strpos($url, ':') === false && ! in_array( $url[0], array( '/', '#', '?' ) ) &&
-		! preg_match('/^[a-z0-9-]+?\.php/i', $url) )
-		$url = 'http://' . $url;
+	if (strpos($url, ':') === false && ! in_array($url[0], array('/', '#', '?')) &&
+		! preg_match('/^[a-z0-9-]+?\.php/i', $url))
+		$url = 'http://'.$url;
 
 	// Replace ampersands and single quotes only when displaying.
-	if ( 'display' == $_context ) {
-		$url = wp_kses_normalize_entities( $url );
-		$url = str_replace( '&amp;', '&#038;', $url );
-		$url = str_replace( "'", '&#039;', $url );
+	if ('display' == $_context) {
+		$url = wp_kses_normalize_entities($url);
+		$url = str_replace('&amp;', '&#038;', $url);
+		$url = str_replace("'", '&#039;', $url);
 	}
 
-	if ( ( false !== strpos( $url, '[' ) ) || ( false !== strpos( $url, ']' ) ) ) {
+	if ((false !== strpos($url, '[')) || (false !== strpos($url, ']'))) {
 
-		$parsed = wp_parse_url( $url );
+		$parsed = wp_parse_url($url);
 		$front  = '';
 
-		if ( isset( $parsed['scheme'] ) ) {
-			$front .= $parsed['scheme'] . '://';
-		} elseif ( '/' === $url[0] ) {
+		if (isset($parsed['scheme'])) {
+			$front .= $parsed['scheme'].'://';
+		} elseif ('/' === $url[0]) {
 			$front .= '//';
 		}
 
-		if ( isset( $parsed['user'] ) ) {
+		if (isset($parsed['user'])) {
 			$front .= $parsed['user'];
 		}
 
-		if ( isset( $parsed['pass'] ) ) {
-			$front .= ':' . $parsed['pass'];
+		if (isset($parsed['pass'])) {
+			$front .= ':'.$parsed['pass'];
 		}
 
-		if ( isset( $parsed['user'] ) || isset( $parsed['pass'] ) ) {
+		if (isset($parsed['user']) || isset($parsed['pass'])) {
 			$front .= '@';
 		}
 
-		if ( isset( $parsed['host'] ) ) {
+		if (isset($parsed['host'])) {
 			$front .= $parsed['host'];
 		}
 
-		if ( isset( $parsed['port'] ) ) {
-			$front .= ':' . $parsed['port'];
+		if (isset($parsed['port'])) {
+			$front .= ':'.$parsed['port'];
 		}
 
-		$end_dirty = str_replace( $front, '', $url );
-		$end_clean = str_replace( array( '[', ']' ), array( '%5B', '%5D' ), $end_dirty );
-		$url       = str_replace( $end_dirty, $end_clean, $url );
+		$end_dirty = str_replace($front, '', $url);
+		$end_clean = str_replace(array('[', ']'), array('%5B', '%5D'), $end_dirty);
+		$url       = str_replace($end_dirty, $end_clean, $url);
 
 	}
 
-	if ( '/' === $url[0] ) {
+	if ('/' === $url[0]) {
 		$good_protocol_url = $url;
 	} else {
-		if ( ! is_array( $protocols ) )
+		if ( ! is_array($protocols))
 			$protocols = wp_allowed_protocols();
-		$good_protocol_url = wp_kses_bad_protocol( $url, $protocols );
-		if ( strtolower( $good_protocol_url ) != strtolower( $url ) )
+		$good_protocol_url = wp_kses_bad_protocol($url, $protocols);
+		if (strtolower($good_protocol_url) != strtolower($url))
 			return '';
 	}
 
@@ -3456,7 +3456,7 @@ 
 	 * @param string $original_url      The URL prior to cleaning.
 	 * @param string $_context          If 'display', replace ampersands and single quotes only.
 	 */
-	return apply_filters( 'clean_url', $good_protocol_url, $original_url, $_context );
+	return apply_filters('clean_url', $good_protocol_url, $original_url, $_context);
 }
 
 /**
@@ -3468,8 +3468,8 @@ 
  * @param array  $protocols An array of acceptable protocols.
  * @return string The cleaned URL.
  */
-function esc_url_raw( $url, $protocols = null ) {
-	return esc_url( $url, $protocols, 'db' );
+function esc_url_raw($url, $protocols = null) {
+	return esc_url($url, $protocols, 'db');
 }
 
 /**
@@ -3482,10 +3482,10 @@ 
  * @param string $myHTML The text to be converted.
  * @return string Converted text.
  */
-function htmlentities2( $myHTML ) {
-	$translation_table = get_html_translation_table( HTML_ENTITIES, ENT_QUOTES );
+function htmlentities2($myHTML) {
+	$translation_table = get_html_translation_table(HTML_ENTITIES, ENT_QUOTES);
 	$translation_table[chr(38)] = '&';
-	return preg_replace( "/&(?![A-Za-z]{0,4}\w{2,3};|#[0-9]{2,3};)/", "&amp;", strtr($myHTML, $translation_table) );
+	return preg_replace("/&(?![A-Za-z]{0,4}\w{2,3};|#[0-9]{2,3};)/", "&amp;", strtr($myHTML, $translation_table));
 }
 
 /**
@@ -3500,12 +3500,12 @@ 
  * @param string $text The text to be escaped.
  * @return string Escaped text.
  */
-function esc_js( $text ) {
-	$safe_text = wp_check_invalid_utf8( $text );
-	$safe_text = _wp_specialchars( $safe_text, ENT_COMPAT );
-	$safe_text = preg_replace( '/&#(x)?0*(?(1)27|39);?/i', "'", stripslashes( $safe_text ) );
-	$safe_text = str_replace( "\r", '', $safe_text );
-	$safe_text = str_replace( "\n", '\\n', addslashes( $safe_text ) );
+function esc_js($text) {
+	$safe_text = wp_check_invalid_utf8($text);
+	$safe_text = _wp_specialchars($safe_text, ENT_COMPAT);
+	$safe_text = preg_replace('/&#(x)?0*(?(1)27|39);?/i', "'", stripslashes($safe_text));
+	$safe_text = str_replace("\r", '', $safe_text);
+	$safe_text = str_replace("\n", '\\n', addslashes($safe_text));
 	/**
 	 * Filter a string cleaned and escaped for output in JavaScript.
 	 *
@@ -3517,7 +3517,7 @@ 
 	 * @param string $safe_text The text after it has been escaped.
  	 * @param string $text      The text prior to being escaped.
 	 */
-	return apply_filters( 'js_escape', $safe_text, $text );
+	return apply_filters('js_escape', $safe_text, $text);
 }
 
 /**
@@ -3528,9 +3528,9 @@ 
  * @param string $text
  * @return string
  */
-function esc_html( $text ) {
-	$safe_text = wp_check_invalid_utf8( $text );
-	$safe_text = _wp_specialchars( $safe_text, ENT_QUOTES );
+function esc_html($text) {
+	$safe_text = wp_check_invalid_utf8($text);
+	$safe_text = _wp_specialchars($safe_text, ENT_QUOTES);
 	/**
 	 * Filter a string cleaned and escaped for output in HTML.
 	 *
@@ -3542,7 +3542,7 @@ 
 	 * @param string $safe_text The text after it has been escaped.
  	 * @param string $text      The text prior to being escaped.
 	 */
-	return apply_filters( 'esc_html', $safe_text, $text );
+	return apply_filters('esc_html', $safe_text, $text);
 }
 
 /**
@@ -3553,9 +3553,9 @@ 
  * @param string $text
  * @return string
  */
-function esc_attr( $text ) {
-	$safe_text = wp_check_invalid_utf8( $text );
-	$safe_text = _wp_specialchars( $safe_text, ENT_QUOTES );
+function esc_attr($text) {
+	$safe_text = wp_check_invalid_utf8($text);
+	$safe_text = _wp_specialchars($safe_text, ENT_QUOTES);
 	/**
 	 * Filter a string cleaned and escaped for output in an HTML attribute.
 	 *
@@ -3567,7 +3567,7 @@ 
 	 * @param string $safe_text The text after it has been escaped.
  	 * @param string $text      The text prior to being escaped.
 	 */
-	return apply_filters( 'attribute_escape', $safe_text, $text );
+	return apply_filters('attribute_escape', $safe_text, $text);
 }
 
 /**
@@ -3578,8 +3578,8 @@ 
  * @param string $text
  * @return string
  */
-function esc_textarea( $text ) {
-	$safe_text = htmlspecialchars( $text, ENT_QUOTES, get_option( 'blog_charset' ) );
+function esc_textarea($text) {
+	$safe_text = htmlspecialchars($text, ENT_QUOTES, get_option('blog_charset'));
 	/**
 	 * Filter a string cleaned and escaped for output in a textarea element.
 	 *
@@ -3588,7 +3588,7 @@ 
 	 * @param string $safe_text The text after it has been escaped.
  	 * @param string $text      The text prior to being escaped.
 	 */
-	return apply_filters( 'esc_textarea', $safe_text, $text );
+	return apply_filters('esc_textarea', $safe_text, $text);
 }
 
 /**
@@ -3599,8 +3599,8 @@ 
  * @param string $tag_name
  * @return string
  */
-function tag_escape( $tag_name ) {
-	$safe_tag = strtolower( preg_replace('/[^a-zA-Z0-9_:]/', '', $tag_name) );
+function tag_escape($tag_name) {
+	$safe_tag = strtolower(preg_replace('/[^a-zA-Z0-9_:]/', '', $tag_name));
 	/**
 	 * Filter a string cleaned and escaped for output as an HTML tag.
 	 *
@@ -3609,7 +3609,7 @@ 
 	 * @param string $safe_tag The tag name after it has been escaped.
  	 * @param string $tag_name The text before it was escaped.
 	 */
-	return apply_filters( 'tag_escape', $safe_tag, $tag_name );
+	return apply_filters('tag_escape', $safe_tag, $tag_name);
 }
 
 /**
@@ -3624,8 +3624,8 @@ 
  * @param string $link Full URL path.
  * @return string Absolute path.
  */
-function wp_make_link_relative( $link ) {
-	return preg_replace( '|^(https?:)?//[^/]+(/?.*)|i', '$2', $link );
+function wp_make_link_relative($link) {
+	return preg_replace('|^(https?:)?//[^/]+(/?.*)|i', '$2', $link);
 }
 
 /**
@@ -3642,22 +3642,22 @@ 
  * @param string $value  The unsanitised value.
  * @return string Sanitized value.
  */
-function sanitize_option( $option, $value ) {
+function sanitize_option($option, $value) {
 	global $wpdb;
 
 	$original_value = $value;
 	$error = '';
 
-	switch ( $option ) {
+	switch ($option) {
 		case 'admin_email' :
 		case 'new_admin_email' :
-			$value = $wpdb->strip_invalid_text_for_column( $wpdb->options, 'option_value', $value );
-			if ( is_wp_error( $value ) ) {
+			$value = $wpdb->strip_invalid_text_for_column($wpdb->options, 'option_value', $value);
+			if (is_wp_error($value)) {
 				$error = $value->get_error_message();
 			} else {
-				$value = sanitize_email( $value );
-				if ( ! is_email( $value ) ) {
-					$error = __( 'The email address entered did not appear to be a valid email address. Please enter a valid email address.' );
+				$value = sanitize_email($value);
+				if ( ! is_email($value)) {
+					$error = __('The email address entered did not appear to be a valid email address. Please enter a valid email address.');
 				}
 			}
 			break;
@@ -3684,32 +3684,32 @@ 
 		case 'users_can_register':
 		case 'start_of_week':
 		case 'site_icon':
-			$value = absint( $value );
+			$value = absint($value);
 			break;
 
 		case 'posts_per_page':
 		case 'posts_per_rss':
 			$value = (int) $value;
-			if ( empty($value) )
+			if (empty($value))
 				$value = 1;
-			if ( $value < -1 )
+			if ($value < -1)
 				$value = abs($value);
 			break;
 
 		case 'default_ping_status':
 		case 'default_comment_status':
 			// Options that if not there have 0 value but need to be something like "closed"
-			if ( $value == '0' || $value == '')
+			if ($value == '0' || $value == '')
 				$value = 'closed';
 			break;
 
 		case 'blogdescription':
 		case 'blogname':
-			$value = $wpdb->strip_invalid_text_for_column( $wpdb->options, 'option_value', $value );
-			if ( is_wp_error( $value ) ) {
+			$value = $wpdb->strip_invalid_text_for_column($wpdb->options, 'option_value', $value);
+			if (is_wp_error($value)) {
 				$error = $value->get_error_message();
 			} else {
-				$value = esc_html( $value );
+				$value = esc_html($value);
 			}
 			break;
 
@@ -3719,10 +3719,10 @@ 
 
 		case 'blog_public':
 			// This is the value if the settings checkbox is not checked on POST. Don't rely on this.
-			if ( null === $value )
+			if (null === $value)
 				$value = 1;
 			else
-				$value = intval( $value );
+				$value = intval($value);
 			break;
 
 		case 'date_format':
@@ -3731,20 +3731,20 @@ 
 		case 'mailserver_login':
 		case 'mailserver_pass':
 		case 'upload_path':
-			$value = $wpdb->strip_invalid_text_for_column( $wpdb->options, 'option_value', $value );
-			if ( is_wp_error( $value ) ) {
+			$value = $wpdb->strip_invalid_text_for_column($wpdb->options, 'option_value', $value);
+			if (is_wp_error($value)) {
 				$error = $value->get_error_message();
 			} else {
-				$value = strip_tags( $value );
-				$value = wp_kses_data( $value );
+				$value = strip_tags($value);
+				$value = wp_kses_data($value);
 			}
 			break;
 
 		case 'ping_sites':
-			$value = explode( "\n", $value );
-			$value = array_filter( array_map( 'trim', $value ) );
-			$value = array_filter( array_map( 'esc_url_raw', $value ) );
-			$value = implode( "\n", $value );
+			$value = explode("\n", $value);
+			$value = array_filter(array_map('trim', $value));
+			$value = array_filter(array_map('esc_url_raw', $value));
+			$value = implode("\n", $value);
 			break;
 
 		case 'gmt_offset':
@@ -3752,120 +3752,120 @@ 
 			break;
 
 		case 'siteurl':
-			$value = $wpdb->strip_invalid_text_for_column( $wpdb->options, 'option_value', $value );
-			if ( is_wp_error( $value ) ) {
+			$value = $wpdb->strip_invalid_text_for_column($wpdb->options, 'option_value', $value);
+			if (is_wp_error($value)) {
 				$error = $value->get_error_message();
 			} else {
-				if ( preg_match( '#http(s?)://(.+)#i', $value ) ) {
-					$value = esc_url_raw( $value );
+				if (preg_match('#http(s?)://(.+)#i', $value)) {
+					$value = esc_url_raw($value);
 				} else {
-					$error = __( 'The WordPress address you entered did not appear to be a valid URL. Please enter a valid URL.' );
+					$error = __('The WordPress address you entered did not appear to be a valid URL. Please enter a valid URL.');
 				}
 			}
 			break;
 
 		case 'home':
-			$value = $wpdb->strip_invalid_text_for_column( $wpdb->options, 'option_value', $value );
-			if ( is_wp_error( $value ) ) {
+			$value = $wpdb->strip_invalid_text_for_column($wpdb->options, 'option_value', $value);
+			if (is_wp_error($value)) {
 				$error = $value->get_error_message();
 			} else {
-				if ( preg_match( '#http(s?)://(.+)#i', $value ) ) {
-					$value = esc_url_raw( $value );
+				if (preg_match('#http(s?)://(.+)#i', $value)) {
+					$value = esc_url_raw($value);
 				} else {
-					$error = __( 'The Site address you entered did not appear to be a valid URL. Please enter a valid URL.' );
+					$error = __('The Site address you entered did not appear to be a valid URL. Please enter a valid URL.');
 				}
 			}
 			break;
 
 		case 'WPLANG':
 			$allowed = get_available_languages();
-			if ( ! is_multisite() && defined( 'WPLANG' ) && '' !== WPLANG && 'en_US' !== WPLANG ) {
+			if ( ! is_multisite() && defined('WPLANG') && '' !== WPLANG && 'en_US' !== WPLANG) {
 				$allowed[] = WPLANG;
 			}
-			if ( ! in_array( $value, $allowed ) && ! empty( $value ) ) {
-				$value = get_option( $option );
+			if ( ! in_array($value, $allowed) && ! empty($value)) {
+				$value = get_option($option);
 			}
 			break;
 
 		case 'illegal_names':
-			$value = $wpdb->strip_invalid_text_for_column( $wpdb->options, 'option_value', $value );
-			if ( is_wp_error( $value ) ) {
+			$value = $wpdb->strip_invalid_text_for_column($wpdb->options, 'option_value', $value);
+			if (is_wp_error($value)) {
 				$error = $value->get_error_message();
 			} else {
-				if ( ! is_array( $value ) )
-					$value = explode( ' ', $value );
+				if ( ! is_array($value))
+					$value = explode(' ', $value);
 
-				$value = array_values( array_filter( array_map( 'trim', $value ) ) );
+				$value = array_values(array_filter(array_map('trim', $value)));
 
-				if ( ! $value )
+				if ( ! $value)
 					$value = '';
 			}
 			break;
 
 		case 'limited_email_domains':
 		case 'banned_email_domains':
-			$value = $wpdb->strip_invalid_text_for_column( $wpdb->options, 'option_value', $value );
-			if ( is_wp_error( $value ) ) {
+			$value = $wpdb->strip_invalid_text_for_column($wpdb->options, 'option_value', $value);
+			if (is_wp_error($value)) {
 				$error = $value->get_error_message();
 			} else {
-				if ( ! is_array( $value ) )
-					$value = explode( "\n", $value );
+				if ( ! is_array($value))
+					$value = explode("\n", $value);
 
-				$domains = array_values( array_filter( array_map( 'trim', $value ) ) );
+				$domains = array_values(array_filter(array_map('trim', $value)));
 				$value = array();
 
-				foreach ( $domains as $domain ) {
-					if ( ! preg_match( '/(--|\.\.)/', $domain ) && preg_match( '|^([a-zA-Z0-9-\.])+$|', $domain ) ) {
+				foreach ($domains as $domain) {
+					if ( ! preg_match('/(--|\.\.)/', $domain) && preg_match('|^([a-zA-Z0-9-\.])+$|', $domain)) {
 						$value[] = $domain;
 					}
 				}
-				if ( ! $value )
+				if ( ! $value)
 					$value = '';
 			}
 			break;
 
 		case 'timezone_string':
 			$allowed_zones = timezone_identifiers_list();
-			if ( ! in_array( $value, $allowed_zones ) && ! empty( $value ) ) {
-				$error = __( 'The timezone you have entered is not valid. Please select a valid timezone.' );
+			if ( ! in_array($value, $allowed_zones) && ! empty($value)) {
+				$error = __('The timezone you have entered is not valid. Please select a valid timezone.');
 			}
 			break;
 
 		case 'permalink_structure':
 		case 'category_base':
 		case 'tag_base':
-			$value = $wpdb->strip_invalid_text_for_column( $wpdb->options, 'option_value', $value );
-			if ( is_wp_error( $value ) ) {
+			$value = $wpdb->strip_invalid_text_for_column($wpdb->options, 'option_value', $value);
+			if (is_wp_error($value)) {
 				$error = $value->get_error_message();
 			} else {
-				$value = esc_url_raw( $value );
-				$value = str_replace( 'http://', '', $value );
+				$value = esc_url_raw($value);
+				$value = str_replace('http://', '', $value);
 			}
 			break;
 
 		case 'default_role' :
-			if ( ! get_role( $value ) && get_role( 'subscriber' ) )
+			if ( ! get_role($value) && get_role('subscriber'))
 				$value = 'subscriber';
 			break;
 
 		case 'moderation_keys':
 		case 'blacklist_keys':
-			$value = $wpdb->strip_invalid_text_for_column( $wpdb->options, 'option_value', $value );
-			if ( is_wp_error( $value ) ) {
+			$value = $wpdb->strip_invalid_text_for_column($wpdb->options, 'option_value', $value);
+			if (is_wp_error($value)) {
 				$error = $value->get_error_message();
 			} else {
-				$value = explode( "\n", $value );
-				$value = array_filter( array_map( 'trim', $value ) );
-				$value = array_unique( $value );
-				$value = implode( "\n", $value );
+				$value = explode("\n", $value);
+				$value = array_filter(array_map('trim', $value));
+				$value = array_unique($value);
+				$value = implode("\n", $value);
 			}
 			break;
 	}
 
-	if ( ! empty( $error ) ) {
-		$value = get_option( $option );
-		if ( function_exists( 'add_settings_error' ) ) {
-			add_settings_error( $option, "invalid_{$option}", $error );
+	if ( ! empty($error)) {
+		$value = get_option($option);
+		if (function_exists('add_settings_error')) {
+			add_settings_error($option, "invalid_{$option}", $error);
 		}
 	}
 
@@ -3879,7 +3879,7 @@ 
 	 * @param string $option         The option name.
 	 * @param string $original_value The original value passed to the function.
 	 */
-	return apply_filters( "sanitize_option_{$option}", $value, $option, $original_value );
+	return apply_filters("sanitize_option_{$option}", $value, $option, $original_value);
 }
 
 /**
@@ -3893,18 +3893,18 @@ 
  * @param callable $callback The function to map onto $value.
  * @return mixed The value with the callback applied to all non-arrays and non-objects inside it.
  */
-function map_deep( $value, $callback ) {
-	if ( is_array( $value ) ) {
-		foreach ( $value as $index => $item ) {
-			$value[ $index ] = map_deep( $item, $callback );
+function map_deep($value, $callback) {
+	if (is_array($value)) {
+		foreach ($value as $index => $item) {
+			$value[$index] = map_deep($item, $callback);
 		}
-	} elseif ( is_object( $value ) ) {
-		$object_vars = get_object_vars( $value );
-		foreach ( $object_vars as $property_name => $property_value ) {
-			$value->$property_name = map_deep( $property_value, $callback );
+	} elseif (is_object($value)) {
+		$object_vars = get_object_vars($value);
+		foreach ($object_vars as $property_name => $property_value) {
+			$value->$property_name = map_deep($property_value, $callback);
 		}
 	} else {
-		$value = call_user_func( $callback, $value );
+		$value = call_user_func($callback, $value);
 	}
 
 	return $value;
@@ -3921,10 +3921,10 @@ 
  * @param string $string The string to be parsed.
  * @param array  $array  Variables will be stored in this array.
  */
-function wp_parse_str( $string, &$array ) {
-	parse_str( $string, $array );
-	if ( get_magic_quotes_gpc() )
-		$array = stripslashes_deep( $array );
+function wp_parse_str($string, &$array) {
+	parse_str($string, $array);
+	if (get_magic_quotes_gpc())
+		$array = stripslashes_deep($array);
 	/**
 	 * Filter the array of variables derived from a parsed string.
 	 *
@@ -3932,7 +3932,7 @@ 
 	 *
 	 * @param array $array The array populated with variables.
 	 */
-	$array = apply_filters( 'wp_parse_str', $array );
+	$array = apply_filters('wp_parse_str', $array);
 }
 
 /**
@@ -3945,7 +3945,7 @@ 
  * @param string $text Text to be converted.
  * @return string Converted text.
  */
-function wp_pre_kses_less_than( $text ) {
+function wp_pre_kses_less_than($text) {
 	return preg_replace_callback('%<[^>]*?((?=<)|>|$)%', 'wp_pre_kses_less_than_callback', $text);
 }
 
@@ -3957,8 +3957,8 @@ 
  * @param array $matches Populated by matches to preg_replace.
  * @return string The text returned after esc_html if needed.
  */
-function wp_pre_kses_less_than_callback( $matches ) {
-	if ( false === strpos($matches[0], '>') )
+function wp_pre_kses_less_than_callback($matches) {
+	if (false === strpos($matches[0], '>'))
 		return esc_html($matches[0]);
 	return $matches[0];
 }
@@ -3973,21 +3973,21 @@ 
  * @param mixed  $args ,... Arguments to be formatted into the $pattern string.
  * @return string The formatted string.
  */
-function wp_sprintf( $pattern ) {
+function wp_sprintf($pattern) {
 	$args = func_get_args();
 	$len = strlen($pattern);
 	$start = 0;
 	$result = '';
 	$arg_index = 0;
-	while ( $len > $start ) {
+	while ($len > $start) {
 		// Last character: append and break
-		if ( strlen($pattern) - 1 == $start ) {
+		if (strlen($pattern) - 1 == $start) {
 			$result .= substr($pattern, -1);
 			break;
 		}
 
 		// Literal %: append and continue
-		if ( substr($pattern, $start, 2) == '%%' ) {
+		if (substr($pattern, $start, 2) == '%%') {
 			$start += 2;
 			$result .= '%';
 			continue;
@@ -3995,14 +3995,14 @@ 
 
 		// Get fragment before next %
 		$end = strpos($pattern, '%', $start + 1);
-		if ( false === $end )
+		if (false === $end)
 			$end = $len;
 		$fragment = substr($pattern, $start, $end - $start);
 
 		// Fragment has a specifier
-		if ( $pattern[$start] == '%' ) {
+		if ($pattern[$start] == '%') {
 			// Find numbered arguments or take the next one in order
-			if ( preg_match('/^%(\d+)\$/', $fragment, $matches) ) {
+			if (preg_match('/^%(\d+)\$/', $fragment, $matches)) {
 				$arg = isset($args[$matches[1]]) ? $args[$matches[1]] : '';
 				$fragment = str_replace("%{$matches[1]}$", '%', $fragment);
 			} else {
@@ -4020,11 +4020,11 @@ 
 			 * @param string $fragment A fragment from the pattern.
 			 * @param string $arg      The argument.
 			 */
-			$_fragment = apply_filters( 'wp_sprintf', $fragment, $arg );
-			if ( $_fragment != $fragment )
+			$_fragment = apply_filters('wp_sprintf', $fragment, $arg);
+			if ($_fragment != $fragment)
 				$fragment = $_fragment;
 			else
-				$fragment = sprintf($fragment, strval($arg) );
+				$fragment = sprintf($fragment, strval($arg));
 		}
 
 		// Append to result and move to next fragment
@@ -4047,13 +4047,13 @@ 
  * @param array  $args    List items to prepend to the content and replace '%l'.
  * @return string Localized list items and rest of the content.
  */
-function wp_sprintf_l( $pattern, $args ) {
+function wp_sprintf_l($pattern, $args) {
 	// Not a match
-	if ( substr($pattern, 0, 2) != '%l' )
+	if (substr($pattern, 0, 2) != '%l')
 		return $pattern;
 
 	// Nothing to work with
-	if ( empty($args) )
+	if (empty($args))
 		return '';
 
 	/**
@@ -4067,30 +4067,30 @@ 
 	 *
 	 * @param array $delimiters An array of translated delimiters.
 	 */
-	$l = apply_filters( 'wp_sprintf_l', array(
+	$l = apply_filters('wp_sprintf_l', array(
 		/* translators: used to join items in a list with more than 2 items */
-		'between'          => sprintf( __('%s, %s'), '', '' ),
+		'between'          => sprintf(__('%s, %s'), '', ''),
 		/* translators: used to join last two items in a list with more than 2 times */
-		'between_last_two' => sprintf( __('%s, and %s'), '', '' ),
+		'between_last_two' => sprintf(__('%s, and %s'), '', ''),
 		/* translators: used to join items in a list with only 2 items */
-		'between_only_two' => sprintf( __('%s and %s'), '', '' ),
-	) );
+		'between_only_two' => sprintf(__('%s and %s'), '', ''),
+	));
 
 	$args = (array) $args;
 	$result = array_shift($args);
-	if ( count($args) == 1 )
-		$result .= $l['between_only_two'] . array_shift($args);
+	if (count($args) == 1)
+		$result .= $l['between_only_two'].array_shift($args);
 	// Loop when more than two args
 	$i = count($args);
-	while ( $i ) {
+	while ($i) {
 		$arg = array_shift($args);
 		$i--;
-		if ( 0 == $i )
-			$result .= $l['between_last_two'] . $arg;
+		if (0 == $i)
+			$result .= $l['between_last_two'].$arg;
 		else
-			$result .= $l['between'] . $arg;
+			$result .= $l['between'].$arg;
 	}
-	return $result . substr($pattern, 2);
+	return $result.substr($pattern, 2);
 }
 
 /**
@@ -4107,15 +4107,15 @@ 
  * @param string $more  Optional. What to append if $str needs to be trimmed. Defaults to empty string.
  * @return string The excerpt.
  */
-function wp_html_excerpt( $str, $count, $more = null ) {
-	if ( null === $more )
+function wp_html_excerpt($str, $count, $more = null) {
+	if (null === $more)
 		$more = '';
-	$str = wp_strip_all_tags( $str, true );
-	$excerpt = mb_substr( $str, 0, $count );
+	$str = wp_strip_all_tags($str, true);
+	$excerpt = mb_substr($str, 0, $count);
 	// remove part of an entity at the end
-	$excerpt = preg_replace( '/&[^;\s]{0,6}$/', '', $excerpt );
-	if ( $str != $excerpt )
-		$excerpt = trim( $excerpt ) . $more;
+	$excerpt = preg_replace('/&[^;\s]{0,6}$/', '', $excerpt);
+	if ($str != $excerpt)
+		$excerpt = trim($excerpt).$more;
 	return $excerpt;
 }
 
@@ -4134,11 +4134,11 @@ 
  * @param array  $attrs   The attributes which should be processed.
  * @return string The processed content.
  */
-function links_add_base_url( $content, $base, $attrs = array('src', 'href') ) {
+function links_add_base_url($content, $base, $attrs = array('src', 'href')) {
 	global $_links_add_base;
 	$_links_add_base = $base;
-	$attrs = implode('|', (array)$attrs);
-	return preg_replace_callback( "!($attrs)=(['\"])(.+?)\\2!i", '_links_add_base', $content );
+	$attrs = implode('|', (array) $attrs);
+	return preg_replace_callback("!($attrs)=(['\"])(.+?)\\2!i", '_links_add_base', $content);
 }
 
 /**
@@ -4152,13 +4152,12 @@ 
  * @param string $m The matched link.
  * @return string The processed link.
  */
-function _links_add_base( $m ) {
+function _links_add_base($m) {
 	global $_links_add_base;
 	//1 = attribute name  2 = quotation mark  3 = URL
-	return $m[1] . '=' . $m[2] .
-		( preg_match( '#^(\w{1,20}):#', $m[3], $protocol ) && in_array( $protocol[1], wp_allowed_protocols() ) ?
-			$m[3] :
-			WP_Http::make_absolute_url( $m[3], $_links_add_base )
+	return $m[1].'='.$m[2].
+		(preg_match('#^(\w{1,20}):#', $m[3], $protocol) && in_array($protocol[1], wp_allowed_protocols()) ?
+			$m[3] : WP_Http::make_absolute_url($m[3], $_links_add_base)
 		)
 		. $m[2];
 }
@@ -4180,11 +4179,11 @@ 
  * @param array  $tags    An array of tags to apply to.
  * @return string The processed content.
  */
-function links_add_target( $content, $target = '_blank', $tags = array('a') ) {
+function links_add_target($content, $target = '_blank', $tags = array('a')) {
 	global $_links_add_target;
 	$_links_add_target = $target;
-	$tags = implode('|', (array)$tags);
-	return preg_replace_callback( "!<($tags)([^>]*)>!i", '_links_add_target', $content );
+	$tags = implode('|', (array) $tags);
+	return preg_replace_callback("!<($tags)([^>]*)>!i", '_links_add_target', $content);
 }
 
 /**
@@ -4198,11 +4197,11 @@ 
  * @param string $m The matched link.
  * @return string The processed link.
  */
-function _links_add_target( $m ) {
+function _links_add_target($m) {
 	global $_links_add_target;
 	$tag = $m[1];
 	$link = preg_replace('|( target=([\'"])(.*?)\2)|i', '', $m[2]);
-	return '<' . $tag . $link . ' target="' . esc_attr( $_links_add_target ) . '">';
+	return '<'.$tag.$link.' target="'.esc_attr($_links_add_target).'">';
 }
 
 /**
@@ -4213,10 +4212,10 @@ 
  * @param string $str The string to normalize.
  * @return string The normalized string.
  */
-function normalize_whitespace( $str ) {
-	$str  = trim( $str );
-	$str  = str_replace( "\r", "\n", $str );
-	$str  = preg_replace( array( '/\n+/', '/[ \t]+/' ), array( "\n", ' ' ), $str );
+function normalize_whitespace($str) {
+	$str  = trim($str);
+	$str  = str_replace("\r", "\n", $str);
+	$str  = preg_replace(array('/\n+/', '/[ \t]+/'), array("\n", ' '), $str);
 	return $str;
 }
 
@@ -4234,13 +4233,13 @@ 
  * @return string The processed string.
  */
 function wp_strip_all_tags($string, $remove_breaks = false) {
-	$string = preg_replace( '@<(script|style)[^>]*?>.*?</\\1>@si', '', $string );
+	$string = preg_replace('@<(script|style)[^>]*?>.*?</\\1>@si', '', $string);
 	$string = strip_tags($string);
 
-	if ( $remove_breaks )
+	if ($remove_breaks)
 		$string = preg_replace('/[\r\n\t ]+/', ' ', $string);
 
-	return trim( $string );
+	return trim($string);
 }
 
 /**
@@ -4257,26 +4256,26 @@ 
  * @param string $str
  * @return string
  */
-function sanitize_text_field( $str ) {
-	$filtered = wp_check_invalid_utf8( $str );
+function sanitize_text_field($str) {
+	$filtered = wp_check_invalid_utf8($str);
 
-	if ( strpos($filtered, '<') !== false ) {
-		$filtered = wp_pre_kses_less_than( $filtered );
+	if (strpos($filtered, '<') !== false) {
+		$filtered = wp_pre_kses_less_than($filtered);
 		// This will strip extra whitespace for us.
-		$filtered = wp_strip_all_tags( $filtered, true );
+		$filtered = wp_strip_all_tags($filtered, true);
 	} else {
-		$filtered = trim( preg_replace('/[\r\n\t ]+/', ' ', $filtered) );
+		$filtered = trim(preg_replace('/[\r\n\t ]+/', ' ', $filtered));
 	}
 
 	$found = false;
-	while ( preg_match('/%[a-f0-9]{2}/i', $filtered, $match) ) {
+	while (preg_match('/%[a-f0-9]{2}/i', $filtered, $match)) {
 		$filtered = str_replace($match[0], '', $filtered);
 		$found = true;
 	}
 
-	if ( $found ) {
+	if ($found) {
 		// Strip out the whitespace that may now exist after removing the octets.
-		$filtered = trim( preg_replace('/ +/', ' ', $filtered) );
+		$filtered = trim(preg_replace('/ +/', ' ', $filtered));
 	}
 
 	/**
@@ -4287,7 +4286,7 @@ 
 	 * @param string $filtered The sanitized string.
 	 * @param string $str      The string prior to being sanitized.
 	 */
-	return apply_filters( 'sanitize_text_field', $filtered, $str );
+	return apply_filters('sanitize_text_field', $filtered, $str);
 }
 
 /**
@@ -4299,8 +4298,8 @@ 
  * @param string $suffix If the filename ends in suffix this will also be cut off.
  * @return string
  */
-function wp_basename( $path, $suffix = '' ) {
-	return urldecode( basename( str_replace( array( '%2F', '%5C' ), '/', urlencode( $path ) ), $suffix ) );
+function wp_basename($path, $suffix = '') {
+	return urldecode(basename(str_replace(array('%2F', '%5C'), '/', urlencode($path)), $suffix));
 }
 
 /**
@@ -4315,19 +4314,19 @@ 
  * @param string $text The text to be modified.
  * @return string The modified text.
  */
-function capital_P_dangit( $text ) {
+function capital_P_dangit($text) {
 	// Simple replacement for titles
 	$current_filter = current_filter();
-	if ( 'the_title' === $current_filter || 'wp_title' === $current_filter )
-		return str_replace( 'Wordpress', 'WordPress', $text );
+	if ('the_title' === $current_filter || 'wp_title' === $current_filter)
+		return str_replace('Wordpress', 'WordPress', $text);
 	// Still here? Use the more judicious replacement
 	static $dblq = false;
-	if ( false === $dblq ) {
-		$dblq = _x( '&#8220;', 'opening curly double quote' );
+	if (false === $dblq) {
+		$dblq = _x('&#8220;', 'opening curly double quote');
 	}
 	return str_replace(
-		array( ' Wordpress', '&#8216;Wordpress', $dblq . 'Wordpress', '>Wordpress', '(Wordpress' ),
-		array( ' WordPress', '&#8216;WordPress', $dblq . 'WordPress', '>WordPress', '(WordPress' ),
+		array(' Wordpress', '&#8216;Wordpress', $dblq.'Wordpress', '>Wordpress', '(Wordpress'),
+		array(' WordPress', '&#8216;WordPress', $dblq.'WordPress', '>WordPress', '(WordPress'),
 	$text );
 }
 
@@ -4339,8 +4338,8 @@ 
  * @param string $mime_type Mime type
  * @return string Sanitized mime type
  */
-function sanitize_mime_type( $mime_type ) {
-	$sani_mime_type = preg_replace( '/[^-+*.a-zA-Z0-9\/]/', '', $mime_type );
+function sanitize_mime_type($mime_type) {
+	$sani_mime_type = preg_replace('/[^-+*.a-zA-Z0-9\/]/', '', $mime_type);
 	/**
 	 * Filter a mime type following sanitization.
 	 *
@@ -4349,7 +4348,7 @@ 
 	 * @param string $sani_mime_type The sanitized mime type.
 	 * @param string $mime_type      The mime type prior to sanitization.
 	 */
-	return apply_filters( 'sanitize_mime_type', $sani_mime_type, $mime_type );
+	return apply_filters('sanitize_mime_type', $sani_mime_type, $mime_type);
 }
 
 /**
@@ -4360,14 +4359,14 @@ 
  * @param string $to_ping Space or carriage return separated URLs
  * @return string URLs starting with the http or https protocol, separated by a carriage return.
  */
-function sanitize_trackback_urls( $to_ping ) {
-	$urls_to_ping = preg_split( '/[\r\n\t ]/', trim( $to_ping ), -1, PREG_SPLIT_NO_EMPTY );
-	foreach ( $urls_to_ping as $k => $url ) {
-		if ( !preg_match( '#^https?://.#i', $url ) )
-			unset( $urls_to_ping[$k] );
+function sanitize_trackback_urls($to_ping) {
+	$urls_to_ping = preg_split('/[\r\n\t ]/', trim($to_ping), -1, PREG_SPLIT_NO_EMPTY);
+	foreach ($urls_to_ping as $k => $url) {
+		if ( ! preg_match('#^https?://.#i', $url))
+			unset($urls_to_ping[$k]);
 	}
-	$urls_to_ping = array_map( 'esc_url_raw', $urls_to_ping );
-	$urls_to_ping = implode( "\n", $urls_to_ping );
+	$urls_to_ping = array_map('esc_url_raw', $urls_to_ping);
+	$urls_to_ping = implode("\n", $urls_to_ping);
 	/**
 	 * Filter a list of trackback URLs following sanitization.
 	 *
@@ -4379,7 +4378,7 @@ 
 	 * @param string $urls_to_ping Sanitized space or carriage return separated URLs.
 	 * @param string $to_ping      Space or carriage return separated URLs before sanitization.
 	 */
-	return apply_filters( 'sanitize_trackback_urls', $urls_to_ping, $to_ping );
+	return apply_filters('sanitize_trackback_urls', $urls_to_ping, $to_ping);
 }
 
 /**
@@ -4393,17 +4392,17 @@ 
  * @param string|array $value String or array of strings to slash.
  * @return string|array Slashed $value
  */
-function wp_slash( $value ) {
-	if ( is_array( $value ) ) {
-		foreach ( $value as $k => $v ) {
-			if ( is_array( $v ) ) {
-				$value[$k] = wp_slash( $v );
+function wp_slash($value) {
+	if (is_array($value)) {
+		foreach ($value as $k => $v) {
+			if (is_array($v)) {
+				$value[$k] = wp_slash($v);
 			} else {
-				$value[$k] = addslashes( $v );
+				$value[$k] = addslashes($v);
 			}
 		}
 	} else {
-		$value = addslashes( $value );
+		$value = addslashes($value);
 	}
 
 	return $value;
@@ -4420,8 +4419,8 @@ 
  * @param string|array $value String or array of strings to unslash.
  * @return string|array Unslashed $value
  */
-function wp_unslash( $value ) {
-	return stripslashes_deep( $value );
+function wp_unslash($value) {
+	return stripslashes_deep($value);
 }
 
 /**
@@ -4432,13 +4431,13 @@ 
  * @param string $content A string which might contain a URL.
  * @return string|false The found URL.
  */
-function get_url_in_content( $content ) {
-	if ( empty( $content ) ) {
+function get_url_in_content($content) {
+	if (empty($content)) {
 		return false;
 	}
 
-	if ( preg_match( '/<a\s[^>]*?href=([\'"])(.+?)\1/is', $content, $matches ) ) {
-		return esc_url_raw( $matches[2] );
+	if (preg_match('/<a\s[^>]*?href=([\'"])(.+?)\1/is', $content, $matches)) {
+		return esc_url_raw($matches[2]);
 	}
 
 	return false;
@@ -4460,7 +4459,7 @@ 
 function wp_spaces_regexp() {
 	static $spaces = '';
 
-	if ( empty( $spaces ) ) {
+	if (empty($spaces)) {
 		/**
 		 * Filter the regexp for common whitespace characters.
 		 *
@@ -4473,7 +4472,7 @@ 
 		 *
 		 * @param string $spaces Regexp pattern for matching common whitespace characters.
 		 */
-		$spaces = apply_filters( 'wp_spaces_regexp', '[\r\n\t ]|\xC2\xA0|&nbsp;' );
+		$spaces = apply_filters('wp_spaces_regexp', '[\r\n\t ]|\xC2\xA0|&nbsp;');
 	}
 
 	return $spaces;
@@ -4489,7 +4488,7 @@ 
 function print_emoji_styles() {
 	static $printed = false;
 
-	if ( $printed ) {
+	if ($printed) {
 		return;
 	}
 
@@ -4521,7 +4520,7 @@ 
 	global $wp_version;
 	static $printed = false;
 
-	if ( $printed ) {
+	if ($printed) {
 		return;
 	}
 
@@ -4535,7 +4534,7 @@ 
 		 *
 		 * @param string The emoji base URL.
 		 */
-		'baseUrl' => apply_filters( 'emoji_url', 'https://s.w.org/images/core/emoji/72x72/' ),
+		'baseUrl' => apply_filters('emoji_url', 'https://s.w.org/images/core/emoji/72x72/'),
 
 		/**
 		 * Filter the extension of the emoji files.
@@ -4544,29 +4543,29 @@ 
 		 *
 		 * @param string The emoji extension. Default .png.
 		 */
-		'ext' => apply_filters( 'emoji_ext', '.png' ),
+		'ext' => apply_filters('emoji_ext', '.png'),
 	);
 
-	$version = 'ver=' . $wp_version;
+	$version = 'ver='.$wp_version;
 
-	if ( SCRIPT_DEBUG ) {
+	if (SCRIPT_DEBUG) {
 		$settings['source'] = array(
 			/** This filter is documented in wp-includes/class.wp-scripts.php */
-			'wpemoji' => apply_filters( 'script_loader_src', includes_url( "js/wp-emoji.js?$version" ), 'wpemoji' ),
+			'wpemoji' => apply_filters('script_loader_src', includes_url("js/wp-emoji.js?$version"), 'wpemoji'),
 			/** This filter is documented in wp-includes/class.wp-scripts.php */
-			'twemoji' => apply_filters( 'script_loader_src', includes_url( "js/twemoji.js?$version" ), 'twemoji' ),
+			'twemoji' => apply_filters('script_loader_src', includes_url("js/twemoji.js?$version"), 'twemoji'),
 		);
 
 		?>
 		<script type="text/javascript">
-			window._wpemojiSettings = <?php echo wp_json_encode( $settings ); ?>;
-			<?php readfile( ABSPATH . WPINC . "/js/wp-emoji-loader.js" ); ?>
+			window._wpemojiSettings = <?php echo wp_json_encode($settings); ?>;
+			<?php readfile(ABSPATH.WPINC."/js/wp-emoji-loader.js"); ?>
 		</script>
 		<?php
 	} else {
 		$settings['source'] = array(
 			/** This filter is documented in wp-includes/class.wp-scripts.php */
-			'concatemoji' => apply_filters( 'script_loader_src', includes_url( "js/wp-emoji-release.min.js?$version" ), 'concatemoji' ),
+			'concatemoji' => apply_filters('script_loader_src', includes_url("js/wp-emoji-release.min.js?$version"), 'concatemoji'),
 		);
 
 		/*
@@ -4581,7 +4580,7 @@ 
 		 */
 		?>
 		<script type="text/javascript">
-			window._wpemojiSettings = <?php echo wp_json_encode( $settings ); ?>;
+			window._wpemojiSettings = <?php echo wp_json_encode($settings); ?>;
 			include "js/wp-emoji-loader.min.js"
 		</script>
 		<?php
@@ -4601,8 +4600,8 @@ 
  * @param string $content The content to encode.
  * @return string The encoded content.
  */
-function wp_encode_emoji( $content ) {
-	if ( function_exists( 'mb_convert_encoding' ) ) {
+function wp_encode_emoji($content) {
+	if (function_exists('mb_convert_encoding')) {
 		$regex = '/(
 		     \x23\xE2\x83\xA3               # Digits
 		     [\x30-\x39]\xE2\x83\xA3
@@ -4614,18 +4613,18 @@ 
 		)/x';
 
 		$matches = array();
-		if ( preg_match_all( $regex, $content, $matches ) ) {
-			if ( ! empty( $matches[1] ) ) {
-				foreach ( $matches[1] as $emoji ) {
+		if (preg_match_all($regex, $content, $matches)) {
+			if ( ! empty($matches[1])) {
+				foreach ($matches[1] as $emoji) {
 					/*
 					 * UTF-32's hex encoding is the same as HTML's hex encoding.
 					 * So, by converting the emoji from UTF-8 to UTF-32, we magically
 					 * get the correct hex encoding.
 					 */
-					$unpacked = unpack( 'H*', mb_convert_encoding( $emoji, 'UTF-32', 'UTF-8' ) );
-					if ( isset( $unpacked[1] ) ) {
-						$entity = '&#x' . ltrim( $unpacked[1], '0' ) . ';';
-						$content = str_replace( $emoji, $entity, $content );
+					$unpacked = unpack('H*', mb_convert_encoding($emoji, 'UTF-32', 'UTF-8'));
+					if (isset($unpacked[1])) {
+						$entity = '&#x'.ltrim($unpacked[1], '0').';';
+						$content = str_replace($emoji, $entity, $content);
 					}
 				}
 			}
@@ -4643,14 +4642,14 @@ 
  * @param string $text The content to encode.
  * @return string The encoded content.
  */
-function wp_staticize_emoji( $text ) {
-	$text = wp_encode_emoji( $text );
+function wp_staticize_emoji($text) {
+	$text = wp_encode_emoji($text);
 
 	/** This filter is documented in wp-includes/formatting.php */
-	$cdn_url = apply_filters( 'emoji_url', 'https://s.w.org/images/core/emoji/72x72/' );
+	$cdn_url = apply_filters('emoji_url', 'https://s.w.org/images/core/emoji/72x72/');
 
 	/** This filter is documented in wp-includes/formatting.php */
-	$ext = apply_filters( 'emoji_ext', '.png' );
+	$ext = apply_filters('emoji_ext', '.png');
 
 	$output = '';
 	/*
@@ -4659,33 +4658,33 @@ 
 	 *
 	 * First, capture the tags as well as in between.
 	 */
-	$textarr = preg_split( '/(<.*>)/U', $text, -1, PREG_SPLIT_DELIM_CAPTURE );
-	$stop = count( $textarr );
+	$textarr = preg_split('/(<.*>)/U', $text, -1, PREG_SPLIT_DELIM_CAPTURE);
+	$stop = count($textarr);
 
 	// Ignore processing of specific tags.
 	$tags_to_ignore = 'code|pre|style|script|textarea';
 	$ignore_block_element = '';
 
-	for ( $i = 0; $i < $stop; $i++ ) {
+	for ($i = 0; $i < $stop; $i++) {
 		$content = $textarr[$i];
 
 		// If we're in an ignore block, wait until we find its closing tag.
-		if ( '' == $ignore_block_element && preg_match( '/^<(' . $tags_to_ignore . ')>/', $content, $matches ) )  {
+		if ('' == $ignore_block_element && preg_match('/^<('.$tags_to_ignore.')>/', $content, $matches)) {
 			$ignore_block_element = $matches[1];
 		}
 
 		// If it's not a tag and not in ignore block.
-		if ( '' ==  $ignore_block_element && strlen( $content ) > 0 && '<' != $content[0] ) {
+		if ('' == $ignore_block_element && strlen($content) > 0 && '<' != $content[0]) {
 			$matches = array();
-			if ( preg_match_all( '/(&#x1f1(e[6-9a-f]|f[0-9a-f]);){2}/', $content, $matches ) ) {
-				if ( ! empty( $matches[0] ) ) {
-					foreach ( $matches[0] as $flag ) {
-						$chars = str_replace( array( '&#x', ';'), '', $flag );
+			if (preg_match_all('/(&#x1f1(e[6-9a-f]|f[0-9a-f]);){2}/', $content, $matches)) {
+				if ( ! empty($matches[0])) {
+					foreach ($matches[0] as $flag) {
+						$chars = str_replace(array('&#x', ';'), '', $flag);
 
-						list( $char1, $char2 ) = str_split( $chars, 5 );
-						$entity = sprintf( '<img src="%s" alt="%s" class="wp-smiley" style="height: 1em; max-height: 1em;" />', $cdn_url . $char1 . '-' . $char2 . $ext, html_entity_decode( $flag ) );
+						list($char1, $char2) = str_split($chars, 5);
+						$entity = sprintf('<img src="%s" alt="%s" class="wp-smiley" style="height: 1em; max-height: 1em;" />', $cdn_url.$char1.'-'.$char2.$ext, html_entity_decode($flag));
 
-						$content = str_replace( $flag, $entity, $content );
+						$content = str_replace($flag, $entity, $content);
 					}
 				}
 			}
@@ -4694,20 +4693,20 @@ 
 			$regex = '/(&#x[2-3][0-9a-f]{3};|&#x1f[1-6][0-9a-f]{2};)/';
 
 			$matches = array();
-			if ( preg_match_all( $regex, $content, $matches ) ) {
-				if ( ! empty( $matches[1] ) ) {
-					foreach ( $matches[1] as $emoji ) {
-						$char = str_replace( array( '&#x', ';'), '', $emoji );
-						$entity = sprintf( '<img src="%s" alt="%s" class="wp-smiley" style="height: 1em; max-height: 1em;" />', $cdn_url . $char . $ext, html_entity_decode( $emoji ) );
+			if (preg_match_all($regex, $content, $matches)) {
+				if ( ! empty($matches[1])) {
+					foreach ($matches[1] as $emoji) {
+						$char = str_replace(array('&#x', ';'), '', $emoji);
+						$entity = sprintf('<img src="%s" alt="%s" class="wp-smiley" style="height: 1em; max-height: 1em;" />', $cdn_url.$char.$ext, html_entity_decode($emoji));
 
-						$content = str_replace( $emoji, $entity, $content );
+						$content = str_replace($emoji, $entity, $content);
 					}
 				}
 			}
 		}
 
 		// Did we exit ignore block.
-		if ( '' != $ignore_block_element && '</' . $ignore_block_element . '>' == $content )  {
+		if ('' != $ignore_block_element && '</'.$ignore_block_element.'>' == $content) {
 			$ignore_block_element = '';
 		}
 
@@ -4725,8 +4724,8 @@ 
  * @param array $mail The email data array.
  * @return array The email data array, with emoji in the message staticized.
  */
-function wp_staticize_emoji_for_email( $mail ) {
-	if ( ! isset( $mail['message'] ) ) {
+function wp_staticize_emoji_for_email($mail) {
+	if ( ! isset($mail['message'])) {
 		return $mail;
 	}
 
@@ -4738,47 +4737,47 @@ 
 	 * is handling changing the Content-Type.
 	 */
 	$headers = array();
-	if ( isset( $mail['headers'] ) ) {
-		if ( is_array( $mail['headers'] ) ) {
+	if (isset($mail['headers'])) {
+		if (is_array($mail['headers'])) {
 			$headers = $mail['headers'];
 		} else {
-			$headers = explode( "\n", str_replace( "\r\n", "\n", $mail['headers'] ) );
+			$headers = explode("\n", str_replace("\r\n", "\n", $mail['headers']));
 		}
 	}
 
-	foreach ( $headers as $header ) {
-		if ( strpos($header, ':') === false ) {
+	foreach ($headers as $header) {
+		if (strpos($header, ':') === false) {
 			continue;
 		}
 
 		// Explode them out.
-		list( $name, $content ) = explode( ':', trim( $header ), 2 );
+		list($name, $content) = explode(':', trim($header), 2);
 
 		// Cleanup crew.
-		$name    = trim( $name    );
-		$content = trim( $content );
+		$name    = trim($name);
+		$content = trim($content);
 
-		if ( 'content-type' === strtolower( $name ) ) {
-			if ( strpos( $content, ';' ) !== false ) {
-				list( $type, $charset ) = explode( ';', $content );
-				$content_type = trim( $type );
+		if ('content-type' === strtolower($name)) {
+			if (strpos($content, ';') !== false) {
+				list($type, $charset) = explode(';', $content);
+				$content_type = trim($type);
 			} else {
-				$content_type = trim( $content );
+				$content_type = trim($content);
 			}
 			break;
 		}
 	}
 
 	// Set Content-Type if we don't have a content-type from the input headers.
-	if ( ! isset( $content_type ) ) {
+	if ( ! isset($content_type)) {
 		$content_type = 'text/plain';
 	}
 
 	/** This filter is documented in wp-includes/pluggable.php */
-	$content_type = apply_filters( 'wp_mail_content_type', $content_type );
+	$content_type = apply_filters('wp_mail_content_type', $content_type);
 
-	if ( 'text/html' === $content_type ) {
-		$mail['message'] = wp_staticize_emoji( $mail['message'] );
+	if ('text/html' === $content_type) {
+		$mail['message'] = wp_staticize_emoji($mail['message']);
 	}
 
 	return $mail;
@@ -4794,12 +4793,12 @@ 
  * @param int    $length Optional. Maximum length of the shortened URL. Default 35 characters.
  * @return string Shortened URL.
  */
-function url_shorten( $url, $length = 35 ) {
-	$stripped = str_replace( array( 'https://', 'http://', 'www.' ), '', $url );
-	$short_url = untrailingslashit( $stripped );
+function url_shorten($url, $length = 35) {
+	$stripped = str_replace(array('https://', 'http://', 'www.'), '', $url);
+	$short_url = untrailingslashit($stripped);
 
-	if ( strlen( $short_url ) > $length ) {
-		$short_url = substr( $short_url, 0, $length - 3 ) . '&hellip;';
+	if (strlen($short_url) > $length) {
+		$short_url = substr($short_url, 0, $length - 3).'&hellip;';
 	}
 	return $short_url;
 }

Braces +222 added lines, -139 removed lines

@@ -429,8 +429,9 @@ 
 function wpautop( $pee, $br = true ) {
 	$pre_tags = array();
 
-	if ( trim($pee) === '' )
-		return '';
+	if ( trim($pee) === '' ) {
+			return '';
+	}
 
 	// Just to make things a little easier, pad the end.
 	$pee = $pee . "\n";
@@ -565,8 +566,9 @@ 
 	$pee = preg_replace( "|\n</p>$|", '</p>', $pee );
 
 	// Replace placeholder <pre> tags with their original content.
-	if ( !empty($pre_tags) )
-		$pee = str_replace(array_keys($pre_tags), array_values($pre_tags), $pee);
+	if ( !empty($pre_tags) ) {
+			$pee = str_replace(array_keys($pre_tags), array_values($pre_tags), $pee);
+	}
 
 	// Restore newlines in all elements.
 	if ( false !== strpos( $pee, '<!-- wpnl -->' ) ) {
@@ -850,16 +852,38 @@ 
 	reset_mbstring_encoding();
 	for ($i=0; $i < $length; $i++) {
 		$c = ord($str[$i]);
-		if ($c < 0x80) $n = 0; // 0bbbbbbb
-		elseif (($c & 0xE0) == 0xC0) $n=1; // 110bbbbb
-		elseif (($c & 0xF0) == 0xE0) $n=2; // 1110bbbb
-		elseif (($c & 0xF8) == 0xF0) $n=3; // 11110bbb
-		elseif (($c & 0xFC) == 0xF8) $n=4; // 111110bb
-		elseif (($c & 0xFE) == 0xFC) $n=5; // 1111110b
-		else return false; // Does not match any model
+		if ($c < 0x80) {
+			$n = 0;
+		}
+		// 0bbbbbbb
+		elseif (($c & 0xE0) == 0xC0) {
+			$n=1;
+		}
+		// 110bbbbb
+		elseif (($c & 0xF0) == 0xE0) {
+			$n=2;
+		}
+		// 1110bbbb
+		elseif (($c & 0xF8) == 0xF0) {
+			$n=3;
+		}
+		// 11110bbb
+		elseif (($c & 0xFC) == 0xF8) {
+			$n=4;
+		}
+		// 111110bb
+		elseif (($c & 0xFE) == 0xFC) {
+			$n=5;
+		}
+		// 1111110b
+		else {
+			return false;
+		}
+		// Does not match any model
 		for ($j=0; $j<$n; $j++) { // n bytes matching 10bbbbbb follow ?
-			if ((++$i == $length) || ((ord($str[$i]) & 0xC0) != 0x80))
-				return false;
+			if ((++$i == $length) || ((ord($str[$i]) & 0xC0) != 0x80)) {
+							return false;
+			}
 		}
 	}
 	return true;
@@ -891,18 +915,21 @@ 
 function _wp_specialchars( $string, $quote_style = ENT_NOQUOTES, $charset = false, $double_encode = false ) {
 	$string = (string) $string;
 
-	if ( 0 === strlen( $string ) )
-		return '';
+	if ( 0 === strlen( $string ) ) {
+			return '';
+	}
 
 	// Don't bother if there are no specialchars - saves some processing
-	if ( ! preg_match( '/[&<>"\']/', $string ) )
-		return $string;
+	if ( ! preg_match( '/[&<>"\']/', $string ) ) {
+			return $string;
+	}
 
 	// Account for the previous behaviour of the function when the $quote_style is not an accepted value
-	if ( empty( $quote_style ) )
-		$quote_style = ENT_NOQUOTES;
-	elseif ( ! in_array( $quote_style, array( 0, 2, 3, 'single', 'double' ), true ) )
-		$quote_style = ENT_QUOTES;
+	if ( empty( $quote_style ) ) {
+			$quote_style = ENT_NOQUOTES;
+	} elseif ( ! in_array( $quote_style, array( 0, 2, 3, 'single', 'double' ), true ) ) {
+			$quote_style = ENT_QUOTES;
+	}
 
 	// Store the site charset as a static to avoid multiple calls to wp_load_alloptions()
 	if ( ! $charset ) {
@@ -914,8 +941,9 @@ 
 		$charset = $_charset;
 	}
 
-	if ( in_array( $charset, array( 'utf8', 'utf-8', 'UTF8' ) ) )
-		$charset = 'UTF-8';
+	if ( in_array( $charset, array( 'utf8', 'utf-8', 'UTF8' ) ) ) {
+			$charset = 'UTF-8';
+	}
 
 	$_quote_style = $quote_style;
 
@@ -935,8 +963,9 @@ 
 	$string = @htmlspecialchars( $string, $quote_style, $charset, $double_encode );
 
 	// Backwards compatibility
-	if ( 'single' === $_quote_style )
-		$string = str_replace( "'", '&#039;', $string );
+	if ( 'single' === $_quote_style ) {
+			$string = str_replace( "'", '&#039;', $string );
+	}
 
 	return $string;
 }
@@ -1084,8 +1113,9 @@ 
 		$value = ord( $utf8_string[ $i ] );
 
 		if ( $value < 128 ) {
-			if ( $length && ( $unicode_length >= $length ) )
-				break;
+			if ( $length && ( $unicode_length >= $length ) ) {
+							break;
+			}
 			$unicode .= chr($value);
 			$unicode_length++;
 		} else {
@@ -1101,8 +1131,9 @@ 
 
 			$values[] = $value;
 
-			if ( $length && ( $unicode_length + ($num_octets * 3) ) > $length )
-				break;
+			if ( $length && ( $unicode_length + ($num_octets * 3) ) > $length ) {
+							break;
+			}
 			if ( count( $values ) == $num_octets ) {
 				for ( $j = 0; $j < $num_octets; $j++ ) {
 					$unicode .= '%' . dechex( $values[ $j ] );
@@ -1130,8 +1161,9 @@ 
  * @return string Filtered string with replaced "nice" characters.
  */
 function remove_accents( $string ) {
-	if ( !preg_match('/[\x80-\xff]/', $string) )
-		return $string;
+	if ( !preg_match('/[\x80-\xff]/', $string) ) {
+			return $string;
+	}
 
 	if (seems_utf8($string)) {
 		$chars = array(
@@ -1426,8 +1458,9 @@ 
 					break;
 				}
 			}
-			if ( !$allowed )
-				$filename .= '_';
+			if ( !$allowed ) {
+							$filename .= '_';
+			}
 		}
 	}
 	$filename .= '.' . $extension;
@@ -1458,8 +1491,9 @@ 
 	$username = preg_replace( '/&.+?;/', '', $username ); // Kill entities
 
 	// If strict, reduce to ASCII for max portability.
-	if ( $strict )
-		$username = preg_replace( '|[^a-z0-9 _.\-@]|i', '', $username );
+	if ( $strict ) {
+			$username = preg_replace( '|[^a-z0-9 _.\-@]|i', '', $username );
+	}
 
 	$username = trim( $username );
 	// Consolidate contiguous whitespace
@@ -1520,8 +1554,9 @@ 
 function sanitize_title( $title, $fallback_title = '', $context = 'save' ) {
 	$raw_title = $title;
 
-	if ( 'save' == $context )
-		$title = remove_accents($title);
+	if ( 'save' == $context ) {
+			$title = remove_accents($title);
+	}
 
 	/**
 	 * Filter a sanitized title string.
@@ -1534,8 +1569,9 @@ 
 	 */
 	$title = apply_filters( 'sanitize_title', $title, $raw_title, $context );
 
-	if ( '' === $title || false === $title )
-		$title = $fallback_title;
+	if ( '' === $title || false === $title ) {
+			$title = $fallback_title;
+	}
 
 	return $title;
 }
@@ -1850,8 +1886,9 @@ 
 			elseif ( substr( $regex[2], -1 ) == '/' ) {
 				// ...but it isn't a known single-entity self-closing tag, then don't let it be treated as such and
 				// immediately close it with a closing tag (the tag will encapsulate no text as a result)
-				if ( ! in_array( $tag, $single_tags ) )
-					$regex[2] = trim( substr( $regex[2], 0, -1 ) ) . "></$tag";
+				if ( ! in_array( $tag, $single_tags ) ) {
+									$regex[2] = trim( substr( $regex[2], 0, -1 ) ) . "></$tag";
+				}
 			}
 			// ElseIf it's a known single-entity tag but it doesn't close itself, do so
 			elseif ( in_array($tag, $single_tags) ) {
@@ -1869,8 +1906,9 @@ 
 
 			// Attributes
 			$attributes = $regex[2];
-			if ( ! empty( $attributes ) && $attributes[0] != '>' )
-				$attributes = ' ' . $attributes;
+			if ( ! empty( $attributes ) && $attributes[0] != '>' ) {
+							$attributes = ' ' . $attributes;
+			}
 
 			$tag = '<' . $tag . $attributes . '>';
 			//If already queuing a close tag, then put this tag on, too
@@ -1890,8 +1928,10 @@ 
 	$newtext .= $text;
 
 	// Empty Stack
-	while( $x = array_pop($tagstack) )
-		$newtext .= '</' . $x . '>'; // Add remaining tags to close
+	while( $x = array_pop($tagstack) ) {
+			$newtext .= '</' . $x . '>';
+	}
+	// Add remaining tags to close
 
 	// WP fix for the bug with HTML comments
 	$newtext = str_replace("< !--","<!--",$newtext);
@@ -1925,8 +1965,9 @@ 
 	 * @param string $content The text, prior to formatting for editing.
 	 */
 	$content = apply_filters( 'format_to_edit', $content );
-	if ( ! $rich_text )
-		$content = esc_textarea( $content );
+	if ( ! $rich_text ) {
+			$content = esc_textarea( $content );
+	}
 	return $content;
 }
 
@@ -1960,8 +2001,9 @@ 
  * @return string String with backslashes inserted.
  */
 function backslashit( $string ) {
-	if ( isset( $string[0] ) && $string[0] >= '0' && $string[0] <= '9' )
-		$string = '\\\\' . $string;
+	if ( isset( $string[0] ) && $string[0] >= '0' && $string[0] <= '9' ) {
+			$string = '\\\\' . $string;
+	}
 	return addcslashes( $string, 'A..Za..z' );
 }
 
@@ -2010,8 +2052,9 @@ 
  * @return string Returns a string escaped with slashes.
  */
 function addslashes_gpc($gpc) {
-	if ( get_magic_quotes_gpc() )
-		$gpc = stripslashes($gpc);
+	if ( get_magic_quotes_gpc() ) {
+			$gpc = stripslashes($gpc);
+	}
 
 	return wp_slash($gpc);
 }
@@ -2132,8 +2175,9 @@ 
 	}
 
 	$url = esc_url($url);
-	if ( empty($url) )
-		return $matches[0];
+	if ( empty($url) ) {
+			return $matches[0];
+	}
 
 	return $matches[1] . "<a href=\"$url\" rel=\"nofollow\">$url</a>" . $suffix;
 }
@@ -2162,8 +2206,9 @@ 
 	}
 
 	$dest = esc_url($dest);
-	if ( empty($dest) )
-		return $matches[0];
+	if ( empty($dest) ) {
+			return $matches[0];
+	}
 
 	return $matches[1] . "<a href=\"$dest\" rel=\"nofollow\">$dest</a>$ret";
 }
@@ -2202,10 +2247,11 @@ 
 	$nested_code_pre = 0; // Keep track of how many levels link is nested inside <pre> or <code>
 	foreach ( $textarr as $piece ) {
 
-		if ( preg_match( '|^<code[\s>]|i', $piece ) || preg_match( '|^<pre[\s>]|i', $piece ) || preg_match( '|^<script[\s>]|i', $piece ) || preg_match( '|^<style[\s>]|i', $piece ) )
-			$nested_code_pre++;
-		elseif ( $nested_code_pre && ( '</code>' === strtolower( $piece ) || '</pre>' === strtolower( $piece ) || '</script>' === strtolower( $piece ) || '</style>' === strtolower( $piece ) ) )
-			$nested_code_pre--;
+		if ( preg_match( '|^<code[\s>]|i', $piece ) || preg_match( '|^<pre[\s>]|i', $piece ) || preg_match( '|^<script[\s>]|i', $piece ) || preg_match( '|^<style[\s>]|i', $piece ) ) {
+					$nested_code_pre++;
+		} elseif ( $nested_code_pre && ( '</code>' === strtolower( $piece ) || '</pre>' === strtolower( $piece ) || '</script>' === strtolower( $piece ) || '</style>' === strtolower( $piece ) ) ) {
+					$nested_code_pre--;
+		}
 
 		if ( $nested_code_pre || empty( $piece ) || ( $piece[0] === '<' && ! preg_match( '|^<\s*[\w]{1,20}+://|', $piece ) ) ) {
 			$r .= $piece;
@@ -2381,8 +2427,9 @@ 
 function translate_smiley( $matches ) {
 	global $wpsmiliestrans;
 
-	if ( count( $matches ) == 0 )
-		return '';
+	if ( count( $matches ) == 0 ) {
+			return '';
+	}
 
 	$smiley = trim( reset( $matches ) );
 	$img = $wpsmiliestrans[ $smiley ];
@@ -2474,8 +2521,9 @@ 
  * @return string|bool Either false or the valid email address.
  */
 function is_email( $email, $deprecated = false ) {
-	if ( ! empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '3.0' );
+	if ( ! empty( $deprecated ) ) {
+			_deprecated_argument( __FUNCTION__, '3.0' );
+	}
 
 	// Test for the minimum length the email can be
 	if ( strlen( $email ) < 3 ) {
@@ -2639,13 +2687,15 @@ 
 	$tz = get_option( 'timezone_string' );
 	if ( $tz ) {
 		$datetime = date_create( $string, new DateTimeZone( 'UTC' ) );
-		if ( ! $datetime )
-			return date( $format, 0 );
+		if ( ! $datetime ) {
+					return date( $format, 0 );
+		}
 		$datetime->setTimezone( new DateTimeZone( $tz ) );
 		$string_localtime = $datetime->format( $format );
 	} else {
-		if ( ! preg_match('#([0-9]{1,4})-([0-9]{1,2})-([0-9]{1,2}) ([0-9]{1,2}):([0-9]{1,2}):([0-9]{1,2})#', $string, $matches) )
-			return date( $format, 0 );
+		if ( ! preg_match('#([0-9]{1,4})-([0-9]{1,2})-([0-9]{1,2}) ([0-9]{1,2}):([0-9]{1,2}):([0-9]{1,2})#', $string, $matches) ) {
+					return date( $format, 0 );
+		}
 		$string_time = gmmktime( $matches[4], $matches[5], $matches[6], $matches[2], $matches[3], $matches[1] );
 		$string_localtime = gmdate( $format, $string_time + get_option( 'gmt_offset' ) * HOUR_IN_SECONDS );
 	}
@@ -2828,34 +2878,40 @@ 
 
 	if ( $diff < HOUR_IN_SECONDS ) {
 		$mins = round( $diff / MINUTE_IN_SECONDS );
-		if ( $mins <= 1 )
-			$mins = 1;
+		if ( $mins <= 1 ) {
+					$mins = 1;
+		}
 		/* translators: min=minute */
 		$since = sprintf( _n( '%s min', '%s mins', $mins ), $mins );
 	} elseif ( $diff < DAY_IN_SECONDS && $diff >= HOUR_IN_SECONDS ) {
 		$hours = round( $diff / HOUR_IN_SECONDS );
-		if ( $hours <= 1 )
-			$hours = 1;
+		if ( $hours <= 1 ) {
+					$hours = 1;
+		}
 		$since = sprintf( _n( '%s hour', '%s hours', $hours ), $hours );
 	} elseif ( $diff < WEEK_IN_SECONDS && $diff >= DAY_IN_SECONDS ) {
 		$days = round( $diff / DAY_IN_SECONDS );
-		if ( $days <= 1 )
-			$days = 1;
+		if ( $days <= 1 ) {
+					$days = 1;
+		}
 		$since = sprintf( _n( '%s day', '%s days', $days ), $days );
 	} elseif ( $diff < MONTH_IN_SECONDS && $diff >= WEEK_IN_SECONDS ) {
 		$weeks = round( $diff / WEEK_IN_SECONDS );
-		if ( $weeks <= 1 )
-			$weeks = 1;
+		if ( $weeks <= 1 ) {
+					$weeks = 1;
+		}
 		$since = sprintf( _n( '%s week', '%s weeks', $weeks ), $weeks );
 	} elseif ( $diff < YEAR_IN_SECONDS && $diff >= MONTH_IN_SECONDS ) {
 		$months = round( $diff / MONTH_IN_SECONDS );
-		if ( $months <= 1 )
-			$months = 1;
+		if ( $months <= 1 ) {
+					$months = 1;
+		}
 		$since = sprintf( _n( '%s month', '%s months', $months ), $months );
 	} elseif ( $diff >= YEAR_IN_SECONDS ) {
 		$years = round( $diff / YEAR_IN_SECONDS );
-		if ( $years <= 1 )
-			$years = 1;
+		if ( $years <= 1 ) {
+					$years = 1;
+		}
 		$since = sprintf( _n( '%s year', '%s years', $years ), $years );
 	}
 
@@ -3006,8 +3062,9 @@ 
 	 * @param string $text           The text prior to entity conversion.
 	 */
 	$filtered = apply_filters( 'pre_ent2ncr', null, $text );
-	if ( null !== $filtered )
-		return $filtered;
+	if ( null !== $filtered ) {
+			return $filtered;
+	}
 
 	$to_ncr = array(
 		'&quot;' => '&#34;',
@@ -3369,8 +3426,9 @@ 
 function esc_url( $url, $protocols = null, $_context = 'display' ) {
 	$original_url = $url;
 
-	if ( '' == $url )
-		return $url;
+	if ( '' == $url ) {
+			return $url;
+	}
 
 	$url = str_replace( ' ', '%20', $url );
 	$url = preg_replace('|[^a-z0-9-~+_.?#=!&;,/:%@$\|*\'()\[\]\\x80-\\xff]|i', '', $url);
@@ -3390,8 +3448,9 @@ 
 	 * link starting with /, # or ? or a php file).
 	 */
 	if ( strpos($url, ':') === false && ! in_array( $url[0], array( '/', '#', '?' ) ) &&
-		! preg_match('/^[a-z0-9-]+?\.php/i', $url) )
-		$url = 'http://' . $url;
+		! preg_match('/^[a-z0-9-]+?\.php/i', $url) ) {
+			$url = 'http://' . $url;
+	}
 
 	// Replace ampersands and single quotes only when displaying.
 	if ( 'display' == $_context ) {
@@ -3440,11 +3499,13 @@ 
 	if ( '/' === $url[0] ) {
 		$good_protocol_url = $url;
 	} else {
-		if ( ! is_array( $protocols ) )
-			$protocols = wp_allowed_protocols();
+		if ( ! is_array( $protocols ) ) {
+					$protocols = wp_allowed_protocols();
+		}
 		$good_protocol_url = wp_kses_bad_protocol( $url, $protocols );
-		if ( strtolower( $good_protocol_url ) != strtolower( $url ) )
-			return '';
+		if ( strtolower( $good_protocol_url ) != strtolower( $url ) ) {
+					return '';
+		}
 	}
 
 	/**
@@ -3690,17 +3751,20 @@ 
 		case 'posts_per_page':
 		case 'posts_per_rss':
 			$value = (int) $value;
-			if ( empty($value) )
-				$value = 1;
-			if ( $value < -1 )
-				$value = abs($value);
+			if ( empty($value) ) {
+							$value = 1;
+			}
+			if ( $value < -1 ) {
+							$value = abs($value);
+			}
 			break;
 
 		case 'default_ping_status':
 		case 'default_comment_status':
 			// Options that if not there have 0 value but need to be something like "closed"
-			if ( $value == '0' || $value == '')
-				$value = 'closed';
+			if ( $value == '0' || $value == '') {
+							$value = 'closed';
+			}
 			break;
 
 		case 'blogdescription':
@@ -3719,10 +3783,11 @@ 
 
 		case 'blog_public':
 			// This is the value if the settings checkbox is not checked on POST. Don't rely on this.
-			if ( null === $value )
-				$value = 1;
-			else
-				$value = intval( $value );
+			if ( null === $value ) {
+							$value = 1;
+			} else {
+							$value = intval( $value );
+			}
 			break;
 
 		case 'date_format':
@@ -3792,13 +3857,15 @@ 
 			if ( is_wp_error( $value ) ) {
 				$error = $value->get_error_message();
 			} else {
-				if ( ! is_array( $value ) )
-					$value = explode( ' ', $value );
+				if ( ! is_array( $value ) ) {
+									$value = explode( ' ', $value );
+				}
 
 				$value = array_values( array_filter( array_map( 'trim', $value ) ) );
 
-				if ( ! $value )
-					$value = '';
+				if ( ! $value ) {
+									$value = '';
+				}
 			}
 			break;
 
@@ -3808,8 +3875,9 @@ 
 			if ( is_wp_error( $value ) ) {
 				$error = $value->get_error_message();
 			} else {
-				if ( ! is_array( $value ) )
-					$value = explode( "\n", $value );
+				if ( ! is_array( $value ) ) {
+									$value = explode( "\n", $value );
+				}
 
 				$domains = array_values( array_filter( array_map( 'trim', $value ) ) );
 				$value = array();
@@ -3819,8 +3887,9 @@ 
 						$value[] = $domain;
 					}
 				}
-				if ( ! $value )
-					$value = '';
+				if ( ! $value ) {
+									$value = '';
+				}
 			}
 			break;
 
@@ -3844,8 +3913,9 @@ 
 			break;
 
 		case 'default_role' :
-			if ( ! get_role( $value ) && get_role( 'subscriber' ) )
-				$value = 'subscriber';
+			if ( ! get_role( $value ) && get_role( 'subscriber' ) ) {
+							$value = 'subscriber';
+			}
 			break;
 
 		case 'moderation_keys':
@@ -3923,8 +3993,9 @@ 
  */
 function wp_parse_str( $string, &$array ) {
 	parse_str( $string, $array );
-	if ( get_magic_quotes_gpc() )
-		$array = stripslashes_deep( $array );
+	if ( get_magic_quotes_gpc() ) {
+			$array = stripslashes_deep( $array );
+	}
 	/**
 	 * Filter the array of variables derived from a parsed string.
 	 *
@@ -3958,8 +4029,9 @@ 
  * @return string The text returned after esc_html if needed.
  */
 function wp_pre_kses_less_than_callback( $matches ) {
-	if ( false === strpos($matches[0], '>') )
-		return esc_html($matches[0]);
+	if ( false === strpos($matches[0], '>') ) {
+			return esc_html($matches[0]);
+	}
 	return $matches[0];
 }
 
@@ -3995,8 +4067,9 @@ 
 
 		// Get fragment before next %
 		$end = strpos($pattern, '%', $start + 1);
-		if ( false === $end )
-			$end = $len;
+		if ( false === $end ) {
+					$end = $len;
+		}
 		$fragment = substr($pattern, $start, $end - $start);
 
 		// Fragment has a specifier
@@ -4021,10 +4094,11 @@ 
 			 * @param string $arg      The argument.
 			 */
 			$_fragment = apply_filters( 'wp_sprintf', $fragment, $arg );
-			if ( $_fragment != $fragment )
-				$fragment = $_fragment;
-			else
-				$fragment = sprintf($fragment, strval($arg) );
+			if ( $_fragment != $fragment ) {
+							$fragment = $_fragment;
+			} else {
+							$fragment = sprintf($fragment, strval($arg) );
+			}
 		}
 
 		// Append to result and move to next fragment
@@ -4049,12 +4123,14 @@ 
  */
 function wp_sprintf_l( $pattern, $args ) {
 	// Not a match
-	if ( substr($pattern, 0, 2) != '%l' )
-		return $pattern;
+	if ( substr($pattern, 0, 2) != '%l' ) {
+			return $pattern;
+	}
 
 	// Nothing to work with
-	if ( empty($args) )
-		return '';
+	if ( empty($args) ) {
+			return '';
+	}
 
 	/**
 	 * Filter the translated delimiters used by wp_sprintf_l().
@@ -4078,17 +4154,19 @@ 
 
 	$args = (array) $args;
 	$result = array_shift($args);
-	if ( count($args) == 1 )
-		$result .= $l['between_only_two'] . array_shift($args);
+	if ( count($args) == 1 ) {
+			$result .= $l['between_only_two'] . array_shift($args);
+	}
 	// Loop when more than two args
 	$i = count($args);
 	while ( $i ) {
 		$arg = array_shift($args);
 		$i--;
-		if ( 0 == $i )
-			$result .= $l['between_last_two'] . $arg;
-		else
-			$result .= $l['between'] . $arg;
+		if ( 0 == $i ) {
+					$result .= $l['between_last_two'] . $arg;
+		} else {
+					$result .= $l['between'] . $arg;
+		}
 	}
 	return $result . substr($pattern, 2);
 }
@@ -4108,14 +4186,16 @@ 
  * @return string The excerpt.
  */
 function wp_html_excerpt( $str, $count, $more = null ) {
-	if ( null === $more )
-		$more = '';
+	if ( null === $more ) {
+			$more = '';
+	}
 	$str = wp_strip_all_tags( $str, true );
 	$excerpt = mb_substr( $str, 0, $count );
 	// remove part of an entity at the end
 	$excerpt = preg_replace( '/&[^;\s]{0,6}$/', '', $excerpt );
-	if ( $str != $excerpt )
-		$excerpt = trim( $excerpt ) . $more;
+	if ( $str != $excerpt ) {
+			$excerpt = trim( $excerpt ) . $more;
+	}
 	return $excerpt;
 }
 
@@ -4237,8 +4317,9 @@ 
 	$string = preg_replace( '@<(script|style)[^>]*?>.*?</\\1>@si', '', $string );
 	$string = strip_tags($string);
 
-	if ( $remove_breaks )
-		$string = preg_replace('/[\r\n\t ]+/', ' ', $string);
+	if ( $remove_breaks ) {
+			$string = preg_replace('/[\r\n\t ]+/', ' ', $string);
+	}
 
 	return trim( $string );
 }
@@ -4318,8 +4399,9 @@ 
 function capital_P_dangit( $text ) {
 	// Simple replacement for titles
 	$current_filter = current_filter();
-	if ( 'the_title' === $current_filter || 'wp_title' === $current_filter )
-		return str_replace( 'Wordpress', 'WordPress', $text );
+	if ( 'the_title' === $current_filter || 'wp_title' === $current_filter ) {
+			return str_replace( 'Wordpress', 'WordPress', $text );
+	}
 	// Still here? Use the more judicious replacement
 	static $dblq = false;
 	if ( false === $dblq ) {
@@ -4363,8 +4445,9 @@ 
 function sanitize_trackback_urls( $to_ping ) {
 	$urls_to_ping = preg_split( '/[\r\n\t ]/', trim( $to_ping ), -1, PREG_SPLIT_NO_EMPTY );
 	foreach ( $urls_to_ping as $k => $url ) {
-		if ( !preg_match( '#^https?://.#i', $url ) )
-			unset( $urls_to_ping[$k] );
+		if ( !preg_match( '#^https?://.#i', $url ) ) {
+					unset( $urls_to_ping[$k] );
+		}
 	}
 	$urls_to_ping = array_map( 'esc_url_raw', $urls_to_ping );
 	$urls_to_ping = implode( "\n", $urls_to_ping );

src/wp-includes/functions.wp-scripts.php

Doc Comments +1 added lines, -1 removed lines

@@ -243,7 +243,7 @@
  * @param string           $handle    Name of the script. Should be unique.
  * @param string           $src       Full URL of the script, or path of the script relative to the WordPress root directory.
  * @param array            $deps      Optional. An array of registered script handles this script depends on. Default empty array.
- * @param string|bool|null $ver       Optional. String specifying script version number, if it has one, which is added to the URL
+ * @param string $ver       Optional. String specifying script version number, if it has one, which is added to the URL
  *                                    as a query string for cache busting purposes. If version is set to false, a version
  *                                    number is automatically added equal to current installed WordPress version.
  *                                    If set to null, no version is added.

Indentation +7 added lines, -7 removed lines

@@ -1,12 +1,12 @@
 <?php
 /**
- * Dependencies API: Scripts functions
- *
- * @since 2.6.0
- *
- * @package WordPress
- * @subpackage Dependencies
- */
+	 * Dependencies API: Scripts functions
+	 *
+	 * @since 2.6.0
+	 *
+	 * @package WordPress
+	 * @subpackage Dependencies
+	 */
 
 /**
  * Initialize $wp_scripts if it has not been set.

Spacing +54 added lines, -54 removed lines

@@ -19,7 +19,7 @@ 
  */
 function wp_scripts() {
 	global $wp_scripts;
-	if ( ! ( $wp_scripts instanceof WP_Scripts ) ) {
+	if ( ! ($wp_scripts instanceof WP_Scripts)) {
 		$wp_scripts = new WP_Scripts();
 	}
 	return $wp_scripts;
@@ -33,17 +33,17 @@ 
  *
  * @param string $function Function name.
  */
-function _wp_scripts_maybe_doing_it_wrong( $function ) {
-	if ( did_action( 'init' ) ) {
+function _wp_scripts_maybe_doing_it_wrong($function) {
+	if (did_action('init')) {
 		return;
 	}
 
-	_doing_it_wrong( $function, sprintf(
-		__( 'Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.' ),
+	_doing_it_wrong($function, sprintf(
+		__('Scripts and styles should not be registered or enqueued until the %1$s, %2$s, or %3$s hooks.'),
 		'<code>wp_enqueue_scripts</code>',
 		'<code>admin_enqueue_scripts</code>',
 		'<code>login_enqueue_scripts</code>'
-	), '3.3' );
+	), '3.3');
 }
 
 /**
@@ -62,27 +62,27 @@ 
  * @param string|bool|array $handles Optional. Scripts to be printed. Default 'false'.
  * @return array On success, a processed array of WP_Dependencies items; otherwise, an empty array.
  */
-function wp_print_scripts( $handles = false ) {
+function wp_print_scripts($handles = false) {
 	/**
 	 * Fires before scripts in the $handles queue are printed.
 	 *
 	 * @since 2.1.0
 	 */
-	do_action( 'wp_print_scripts' );
-	if ( '' === $handles ) { // for wp_head
+	do_action('wp_print_scripts');
+	if ('' === $handles) { // for wp_head
 		$handles = false;
 	}
 
-	_wp_scripts_maybe_doing_it_wrong( __FUNCTION__ );
+	_wp_scripts_maybe_doing_it_wrong(__FUNCTION__);
 
 	global $wp_scripts;
-	if ( ! ( $wp_scripts instanceof WP_Scripts ) ) {
-		if ( ! $handles ) {
+	if ( ! ($wp_scripts instanceof WP_Scripts)) {
+		if ( ! $handles) {
 			return array(); // No need to instantiate if nothing is there.
 		}
 	}
 
-	return wp_scripts()->do_items( $handles );
+	return wp_scripts()->do_items($handles);
 }
 
 /**
@@ -103,15 +103,15 @@ 
  *                         or after. Default 'after'.
  * @return bool True on success, false on failure.
  */
-function wp_add_inline_script( $handle, $data, $position = 'after' ) {
-	_wp_scripts_maybe_doing_it_wrong( __FUNCTION__ );
+function wp_add_inline_script($handle, $data, $position = 'after') {
+	_wp_scripts_maybe_doing_it_wrong(__FUNCTION__);
 
-	if ( false !== stripos( $data, '</script>' ) ) {
-		_doing_it_wrong( __FUNCTION__, __( 'Do not pass script tags to wp_add_inline_script().' ), '4.5.0' );
-		$data = trim( preg_replace( '#<script[^>]*>(.*)</script>#is', '$1', $data ) );
+	if (false !== stripos($data, '</script>')) {
+		_doing_it_wrong(__FUNCTION__, __('Do not pass script tags to wp_add_inline_script().'), '4.5.0');
+		$data = trim(preg_replace('#<script[^>]*>(.*)</script>#is', '$1', $data));
 	}
 
-	return wp_scripts()->add_inline_script( $handle, $data, $position );
+	return wp_scripts()->add_inline_script($handle, $data, $position);
 }
 
 /**
@@ -136,13 +136,13 @@ 
  *                                    Default 'false'.
  * @return bool Whether the script has been registered. True on success, false on failure.
  */
-function wp_register_script( $handle, $src, $deps = array(), $ver = false, $in_footer = false ) {
+function wp_register_script($handle, $src, $deps = array(), $ver = false, $in_footer = false) {
 	$wp_scripts = wp_scripts();
-	_wp_scripts_maybe_doing_it_wrong( __FUNCTION__ );
+	_wp_scripts_maybe_doing_it_wrong(__FUNCTION__);
 
-	$registered = $wp_scripts->add( $handle, $src, $deps, $ver );
-	if ( $in_footer ) {
-		$wp_scripts->add_data( $handle, 'group', 1 );
+	$registered = $wp_scripts->add($handle, $src, $deps, $ver);
+	if ($in_footer) {
+		$wp_scripts->add_data($handle, 'group', 1);
 	}
 
 	return $registered;
@@ -176,14 +176,14 @@ 
  * @param array $l10n         The data itself. The data can be either a single or multi-dimensional array.
  * @return bool True if the script was successfully localized, false otherwise.
  */
-function wp_localize_script( $handle, $object_name, $l10n ) {
+function wp_localize_script($handle, $object_name, $l10n) {
 	global $wp_scripts;
-	if ( ! ( $wp_scripts instanceof WP_Scripts ) ) {
-		_wp_scripts_maybe_doing_it_wrong( __FUNCTION__ );
+	if ( ! ($wp_scripts instanceof WP_Scripts)) {
+		_wp_scripts_maybe_doing_it_wrong(__FUNCTION__);
 		return false;
 	}
 
-	return $wp_scripts->localize( $handle, $object_name, $l10n );
+	return $wp_scripts->localize($handle, $object_name, $l10n);
 }
 
 /**
@@ -198,16 +198,16 @@ 
  *
  * @param string $handle Name of the script to be removed.
  */
-function wp_deregister_script( $handle ) {
-	_wp_scripts_maybe_doing_it_wrong( __FUNCTION__ );
+function wp_deregister_script($handle) {
+	_wp_scripts_maybe_doing_it_wrong(__FUNCTION__);
 
 	/**
 	 * Do not allow accidental or negligent de-registering of critical scripts in the admin.
 	 * Show minimal remorse if the correct hook is used.
 	 */
 	$current_filter = current_filter();
-	if ( ( is_admin() && 'admin_enqueue_scripts' !== $current_filter ) ||
-		( 'wp-login.php' === $GLOBALS['pagenow'] && 'login_enqueue_scripts' !== $current_filter )
+	if ((is_admin() && 'admin_enqueue_scripts' !== $current_filter) ||
+		('wp-login.php' === $GLOBALS['pagenow'] && 'login_enqueue_scripts' !== $current_filter)
 	) {
 		$no = array(
 			'jquery', 'jquery-core', 'jquery-migrate', 'jquery-ui-core', 'jquery-ui-accordion',
@@ -218,15 +218,15 @@ 
 			'jquery-ui-tooltip', 'jquery-ui-widget', 'underscore', 'backbone',
 		);
 
-		if ( in_array( $handle, $no ) ) {
-			$message = sprintf( __( 'Do not deregister the %1$s script in the administration area. To target the front-end theme, use the %2$s hook.' ),
-				"<code>$handle</code>", '<code>wp_enqueue_scripts</code>' );
-			_doing_it_wrong( __FUNCTION__, $message, '3.6' );
+		if (in_array($handle, $no)) {
+			$message = sprintf(__('Do not deregister the %1$s script in the administration area. To target the front-end theme, use the %2$s hook.'),
+				"<code>$handle</code>", '<code>wp_enqueue_scripts</code>');
+			_doing_it_wrong(__FUNCTION__, $message, '3.6');
 			return;
 		}
 	}
 
-	wp_scripts()->remove( $handle );
+	wp_scripts()->remove($handle);
 }
 
 /**
@@ -250,25 +250,25 @@ 
  * @param bool             $in_footer Optional. Whether to enqueue the script before </body> instead of in the <head>.
  *                                    Default 'false'.
  */
-function wp_enqueue_script( $handle, $src = false, $deps = array(), $ver = false, $in_footer = false ) {
+function wp_enqueue_script($handle, $src = false, $deps = array(), $ver = false, $in_footer = false) {
 	$wp_scripts = wp_scripts();
 
-	_wp_scripts_maybe_doing_it_wrong( __FUNCTION__ );
+	_wp_scripts_maybe_doing_it_wrong(__FUNCTION__);
 
 
-	if ( $src || $in_footer ) {
-		$_handle = explode( '?', $handle );
+	if ($src || $in_footer) {
+		$_handle = explode('?', $handle);
 
-		if ( $src ) {
-			$wp_scripts->add( $_handle[0], $src, $deps, $ver );
+		if ($src) {
+			$wp_scripts->add($_handle[0], $src, $deps, $ver);
 		}
 
-		if ( $in_footer ) {
-			$wp_scripts->add_data( $_handle[0], 'group', 1 );
+		if ($in_footer) {
+			$wp_scripts->add_data($_handle[0], 'group', 1);
 		}
 	}
 
-	$wp_scripts->enqueue( $handle );
+	$wp_scripts->enqueue($handle);
 }
 
 /**
@@ -280,10 +280,10 @@ 
  *
  * @param string $handle Name of the script to be removed.
  */
-function wp_dequeue_script( $handle ) {
-	_wp_scripts_maybe_doing_it_wrong( __FUNCTION__ );
+function wp_dequeue_script($handle) {
+	_wp_scripts_maybe_doing_it_wrong(__FUNCTION__);
 
-	wp_scripts()->dequeue( $handle );
+	wp_scripts()->dequeue($handle);
 }
 
 /**
@@ -297,10 +297,10 @@ 
  *                       Accepts 'enqueued', 'registered', 'queue', 'to_do', and 'done'.
  * @return bool Whether the script is queued.
  */
-function wp_script_is( $handle, $list = 'enqueued' ) {
-	_wp_scripts_maybe_doing_it_wrong( __FUNCTION__ );
+function wp_script_is($handle, $list = 'enqueued') {
+	_wp_scripts_maybe_doing_it_wrong(__FUNCTION__);
 
-	return (bool) wp_scripts()->query( $handle, $list );
+	return (bool) wp_scripts()->query($handle, $list);
 }
 
 /**
@@ -320,6 +320,6 @@ 
  * @param mixed  $value  String containing the data to be added.
  * @return bool True on success, false on failure.
  */
-function wp_script_add_data( $handle, $key, $value ){
-	return wp_scripts()->add_data( $handle, $key, $value );
+function wp_script_add_data($handle, $key, $value) {
+	return wp_scripts()->add_data($handle, $key, $value);
 }

src/wp-includes/media.php

Doc Comments +8 added lines, -8 removed lines

@@ -299,7 +299,7 @@ 
  *
  * @param int        $width  Image width in pixels.
  * @param int        $height Image height in pixels.
- * @param bool|array $crop   Optional. Whether to crop images to specified width and height or resize.
+ * @param boolean $crop   Optional. Whether to crop images to specified width and height or resize.
  *                           An array can specify positioning of the crop area. Default false.
  */
 function set_post_thumbnail_size( $width = 0, $height = 0, $crop = false ) {
@@ -943,7 +943,7 @@ 
  *                                    width and height values in pixels (in that order). Default 'medium'.
  * @param array        $image_meta    Optional. The image meta data as returned by 'wp_get_attachment_metadata()'.
  *                                    Default null.
- * @return string|bool A 'srcset' value string or false.
+ * @return false|string A 'srcset' value string or false.
  */
 function wp_get_attachment_image_srcset( $attachment_id, $size = 'medium', $image_meta = null ) {
 	if ( ! $image = wp_get_attachment_image_src( $attachment_id, $size ) ) {
@@ -972,7 +972,7 @@ 
  * @param string $image_src     The 'src' of the image.
  * @param array  $image_meta    The image meta data as returned by 'wp_get_attachment_metadata()'.
  * @param int    $attachment_id Optional. The image attachment ID to pass to the filter. Default 0.
- * @return string|bool          The 'srcset' attribute value. False on error or when only one source exists.
+ * @return false|string          The 'srcset' attribute value. False on error or when only one source exists.
  */
 function wp_calculate_image_srcset( $size_array, $image_src, $image_meta, $attachment_id = 0 ) {
 	/**
@@ -3495,7 +3495,7 @@ 
  * @since 3.6.0
  *
  * @param string      $type Mime type.
- * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global $post.
+ * @param integer $post Optional. Post ID or WP_Post object. Default is global $post.
  * @return array Found attachments.
  */
 function get_attached_media( $type, $post = 0 ) {
@@ -3634,7 +3634,7 @@ 
  *
  * @since 3.6.0
  *
- * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global $post.
+ * @param integer $post Optional. Post ID or WP_Post object. Default is global $post.
  * @param bool        $html Optional. Whether to return HTML or data. Default is true.
  * @return string|array Gallery data and srcs parsed from the expanded shortcode.
  */
@@ -3661,7 +3661,7 @@ 
  *
  * @see get_post_galleries()
  *
- * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global `$post`.
+ * @param integer $post Optional. Post ID or WP_Post object. Default is global `$post`.
  * @return array A list of lists, each containing image srcs parsed.
  *               from an expanded shortcode
  */
@@ -3677,7 +3677,7 @@ 
  *
  * @see get_post_gallery()
  *
- * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global `$post`.
+ * @param integer $post Optional. Post ID or WP_Post object. Default is global `$post`.
  * @return array A list of a gallery's image srcs in order.
  */
 function get_post_gallery_images( $post = 0 ) {
@@ -3762,7 +3762,7 @@ 
  *
  * @global string $wp_version
  *
- * @return array The relevant CSS file URLs.
+ * @return string[] The relevant CSS file URLs.
  */
 function wpview_media_sandbox_styles() {
  	$version = 'ver=' . $GLOBALS['wp_version'];

Indentation +30 added lines, -30 removed lines

@@ -1,10 +1,10 @@ 
 <?php
 /**
- * WordPress API for media display.
- *
- * @package WordPress
- * @subpackage Media
- */
+	 * WordPress API for media display.
+	 *
+	 * @package WordPress
+	 * @subpackage Media
+	 */
 
 /**
  * Scale down the default size of an image.
@@ -663,8 +663,8 @@ 
 				// If the size doesn't match within one pixel, then it is of a different aspect ratio, so we skip it, unless it's the thumbnail size
 				if ( 'thumbnail' != $_size &&
 				  ( ! $maybe_cropped
-				    || ( $maybe_cropped[4] != $data['width'] && $maybe_cropped[4] + 1 != $data['width'] )
-				    || ( $maybe_cropped[5] != $data['height'] && $maybe_cropped[5] + 1 != $data['height'] )
+					|| ( $maybe_cropped[4] != $data['width'] && $maybe_cropped[4] + 1 != $data['width'] )
+					|| ( $maybe_cropped[5] != $data['height'] && $maybe_cropped[5] + 1 != $data['height'] )
 				  ) ) {
 				  continue;
 				}
@@ -1128,7 +1128,7 @@ 
 	 * @param array  $size_array    Array of width and height values in pixels (in that order).
 	 * @param string $image_src     The 'src' of the image.
 	 * @param array  $image_meta    The image meta data as returned by 'wp_get_attachment_metadata()'.
- 	 * @param int    $attachment_id Image attachment ID or 0.
+	 * @param int    $attachment_id Image attachment ID or 0.
 	 */
 	$sources = apply_filters( 'wp_calculate_image_srcset', $sources, $size_array, $image_src, $image_meta, $attachment_id );
 
@@ -2132,28 +2132,28 @@ 
 	return apply_filters( 'wp_get_attachment_id3_keys', $fields, $attachment, $context );
 }
 /**
- * Builds the Audio shortcode output.
- *
- * This implements the functionality of the Audio Shortcode for displaying
- * WordPress mp3s in a post.
- *
- * @since 3.6.0
- *
- * @staticvar int $instance
- *
- * @param array  $attr {
- *     Attributes of the audio shortcode.
- *
- *     @type string $src      URL to the source of the audio file. Default empty.
- *     @type string $loop     The 'loop' attribute for the `<audio>` element. Default empty.
- *     @type string $autoplay The 'autoplay' attribute for the `<audio>` element. Default empty.
- *     @type string $preload  The 'preload' attribute for the `<audio>` element. Default 'none'.
- *     @type string $class    The 'class' attribute for the `<audio>` element. Default 'wp-audio-shortcode'.
- *     @type string $style    The 'style' attribute for the `<audio>` element. Default 'width: 100%; visibility: hidden;'.
- * }
- * @param string $content Shortcode content.
- * @return string|void HTML content to display audio.
- */
+	 * Builds the Audio shortcode output.
+	 *
+	 * This implements the functionality of the Audio Shortcode for displaying
+	 * WordPress mp3s in a post.
+	 *
+	 * @since 3.6.0
+	 *
+	 * @staticvar int $instance
+	 *
+	 * @param array  $attr {
+	 *     Attributes of the audio shortcode.
+	 *
+	 *     @type string $src      URL to the source of the audio file. Default empty.
+	 *     @type string $loop     The 'loop' attribute for the `<audio>` element. Default empty.
+	 *     @type string $autoplay The 'autoplay' attribute for the `<audio>` element. Default empty.
+	 *     @type string $preload  The 'preload' attribute for the `<audio>` element. Default 'none'.
+	 *     @type string $class    The 'class' attribute for the `<audio>` element. Default 'wp-audio-shortcode'.
+	 *     @type string $style    The 'style' attribute for the `<audio>` element. Default 'width: 100%; visibility: hidden;'.
+	 * }
+	 * @param string $content Shortcode content.
+	 * @return string|void HTML content to display audio.
+	 */
 function wp_audio_shortcode( $attr, $content = '' ) {
 	$post_id = get_post() ? get_the_ID() : 0;
 

Spacing +895 added lines, -895 removed lines

@@ -38,39 +38,39 @@ 
  *                              (like inserting into an editor). Default null.
  * @return array Width and height of what the result image should resize to.
  */
-function image_constrain_size_for_editor( $width, $height, $size = 'medium', $context = null ) {
+function image_constrain_size_for_editor($width, $height, $size = 'medium', $context = null) {
 	global $content_width, $_wp_additional_image_sizes;
 
-	if ( ! $context )
+	if ( ! $context)
 		$context = is_admin() ? 'edit' : 'display';
 
-	if ( is_array($size) ) {
+	if (is_array($size)) {
 		$max_width = $size[0];
 		$max_height = $size[1];
 	}
-	elseif ( $size == 'thumb' || $size == 'thumbnail' ) {
+	elseif ($size == 'thumb' || $size == 'thumbnail') {
 		$max_width = intval(get_option('thumbnail_size_w'));
 		$max_height = intval(get_option('thumbnail_size_h'));
 		// last chance thumbnail size defaults
-		if ( !$max_width && !$max_height ) {
+		if ( ! $max_width && ! $max_height) {
 			$max_width = 128;
 			$max_height = 96;
 		}
 	}
-	elseif ( $size == 'medium' ) {
+	elseif ($size == 'medium') {
 		$max_width = intval(get_option('medium_size_w'));
 		$max_height = intval(get_option('medium_size_h'));
 
 	}
-	elseif ( $size == 'medium_large' ) {
-		$max_width = intval( get_option( 'medium_large_size_w' ) );
-		$max_height = intval( get_option( 'medium_large_size_h' ) );
+	elseif ($size == 'medium_large') {
+		$max_width = intval(get_option('medium_large_size_w'));
+		$max_height = intval(get_option('medium_large_size_h'));
 
-		if ( intval( $content_width ) > 0 ) {
-			$max_width = min( intval( $content_width ), $max_width );
+		if (intval($content_width) > 0) {
+			$max_width = min(intval($content_width), $max_width);
 		}
 	}
-	elseif ( $size == 'large' ) {
+	elseif ($size == 'large') {
 		/*
 		 * We're inserting a large size image into the editor. If it's a really
 		 * big image we'll scale it down to fit reasonably within the editor
@@ -79,14 +79,14 @@ 
 		 */
 		$max_width = intval(get_option('large_size_w'));
 		$max_height = intval(get_option('large_size_h'));
-		if ( intval($content_width) > 0 ) {
-			$max_width = min( intval($content_width), $max_width );
+		if (intval($content_width) > 0) {
+			$max_width = min(intval($content_width), $max_width);
 		}
-	} elseif ( isset( $_wp_additional_image_sizes ) && count( $_wp_additional_image_sizes ) && in_array( $size, array_keys( $_wp_additional_image_sizes ) ) ) {
-		$max_width = intval( $_wp_additional_image_sizes[$size]['width'] );
-		$max_height = intval( $_wp_additional_image_sizes[$size]['height'] );
-		if ( intval($content_width) > 0 && 'edit' == $context ) // Only in admin. Assume that theme authors know what they're doing.
-			$max_width = min( intval($content_width), $max_width );
+	} elseif (isset($_wp_additional_image_sizes) && count($_wp_additional_image_sizes) && in_array($size, array_keys($_wp_additional_image_sizes))) {
+		$max_width = intval($_wp_additional_image_sizes[$size]['width']);
+		$max_height = intval($_wp_additional_image_sizes[$size]['height']);
+		if (intval($content_width) > 0 && 'edit' == $context) // Only in admin. Assume that theme authors know what they're doing.
+			$max_width = min(intval($content_width), $max_width);
 	}
 	// $size == 'full' has no constraint
 	else {
@@ -106,9 +106,9 @@ 
 	 *                                     Possible values are 'display' (like in a theme)
 	 *                                     or 'edit' (like inserting into an editor).
 	 */
-	list( $max_width, $max_height ) = apply_filters( 'editor_max_image_size', array( $max_width, $max_height ), $size, $context );
+	list($max_width, $max_height) = apply_filters('editor_max_image_size', array($max_width, $max_height), $size, $context);
 
-	return wp_constrain_dimensions( $width, $height, $max_width, $max_height );
+	return wp_constrain_dimensions($width, $height, $max_width, $max_height);
 }
 
 /**
@@ -128,7 +128,7 @@ 
  * @param int|string $height Image height in pixels.
  * @return string HTML attributes for width and, or height.
  */
-function image_hwstring( $width, $height ) {
+function image_hwstring($width, $height) {
 	$out = '';
 	if ($width)
 		$out .= 'width="'.intval($width).'" ';
@@ -162,9 +162,9 @@ 
  * @return false|array Array containing the image URL, width, height, and boolean for whether
  *                     the image is an intermediate size. False on failure.
  */
-function image_downsize( $id, $size = 'medium' ) {
+function image_downsize($id, $size = 'medium') {
 
-	if ( !wp_attachment_is_image($id) )
+	if ( ! wp_attachment_is_image($id))
 		return false;
 
 	/**
@@ -180,7 +180,7 @@ 
 	 * @param array|string $size     Size of image. Image size or array of width and height values (in that order).
 	 *                               Default 'medium'.
 	 */
-	if ( $out = apply_filters( 'image_downsize', false, $id, $size ) ) {
+	if ($out = apply_filters('image_downsize', false, $id, $size)) {
 		return $out;
 	}
 
@@ -191,32 +191,32 @@ 
 	$img_url_basename = wp_basename($img_url);
 
 	// try for a new style intermediate size
-	if ( $intermediate = image_get_intermediate_size($id, $size) ) {
+	if ($intermediate = image_get_intermediate_size($id, $size)) {
 		$img_url = str_replace($img_url_basename, $intermediate['file'], $img_url);
 		$width = $intermediate['width'];
 		$height = $intermediate['height'];
 		$is_intermediate = true;
 	}
-	elseif ( $size == 'thumbnail' ) {
+	elseif ($size == 'thumbnail') {
 		// fall back to the old thumbnail
-		if ( ($thumb_file = wp_get_attachment_thumb_file($id)) && $info = getimagesize($thumb_file) ) {
+		if (($thumb_file = wp_get_attachment_thumb_file($id)) && $info = getimagesize($thumb_file)) {
 			$img_url = str_replace($img_url_basename, wp_basename($thumb_file), $img_url);
 			$width = $info[0];
 			$height = $info[1];
 			$is_intermediate = true;
 		}
 	}
-	if ( !$width && !$height && isset( $meta['width'], $meta['height'] ) ) {
+	if ( ! $width && ! $height && isset($meta['width'], $meta['height'])) {
 		// any other type: use the real image
 		$width = $meta['width'];
 		$height = $meta['height'];
 	}
 
-	if ( $img_url) {
+	if ($img_url) {
 		// we have the actual image size, but might need to further constrain it if content_width is narrower
-		list( $width, $height ) = image_constrain_size_for_editor( $width, $height, $size );
+		list($width, $height) = image_constrain_size_for_editor($width, $height, $size);
 
-		return array( $img_url, $width, $height, $is_intermediate );
+		return array($img_url, $width, $height, $is_intermediate);
 	}
 	return false;
 
@@ -243,12 +243,12 @@ 
  * @param bool|array $crop   Optional. Whether to crop images to specified width and height or resize.
  *                           An array can specify positioning of the crop area. Default false.
  */
-function add_image_size( $name, $width = 0, $height = 0, $crop = false ) {
+function add_image_size($name, $width = 0, $height = 0, $crop = false) {
 	global $_wp_additional_image_sizes;
 
-	$_wp_additional_image_sizes[ $name ] = array(
-		'width'  => absint( $width ),
-		'height' => absint( $height ),
+	$_wp_additional_image_sizes[$name] = array(
+		'width'  => absint($width),
+		'height' => absint($height),
 		'crop'   => $crop,
 	);
 }
@@ -263,10 +263,10 @@ 
  * @param string $name The image size to check.
  * @return bool True if the image size exists, false if not.
  */
-function has_image_size( $name ) {
+function has_image_size($name) {
 	global $_wp_additional_image_sizes;
 
-	return isset( $_wp_additional_image_sizes[ $name ] );
+	return isset($_wp_additional_image_sizes[$name]);
 }
 
 /**
@@ -279,11 +279,11 @@ 
  * @param string $name The image size to remove.
  * @return bool True if the image size was successfully removed, false on failure.
  */
-function remove_image_size( $name ) {
+function remove_image_size($name) {
 	global $_wp_additional_image_sizes;
 
-	if ( isset( $_wp_additional_image_sizes[ $name ] ) ) {
-		unset( $_wp_additional_image_sizes[ $name ] );
+	if (isset($_wp_additional_image_sizes[$name])) {
+		unset($_wp_additional_image_sizes[$name]);
 		return true;
 	}
 
@@ -302,8 +302,8 @@ 
  * @param bool|array $crop   Optional. Whether to crop images to specified width and height or resize.
  *                           An array can specify positioning of the crop area. Default false.
  */
-function set_post_thumbnail_size( $width = 0, $height = 0, $crop = false ) {
-	add_image_size( 'post-thumbnail', $width, $height, $crop );
+function set_post_thumbnail_size($width = 0, $height = 0, $crop = false) {
+	add_image_size('post-thumbnail', $width, $height, $crop);
 }
 
 /**
@@ -329,14 +329,14 @@ 
  *                            (in that order). Default 'medium'.
  * @return string HTML IMG element for given image attachment
  */
-function get_image_tag( $id, $alt, $title, $align, $size = 'medium' ) {
+function get_image_tag($id, $alt, $title, $align, $size = 'medium') {
 
-	list( $img_src, $width, $height ) = image_downsize($id, $size);
+	list($img_src, $width, $height) = image_downsize($id, $size);
 	$hwstring = image_hwstring($width, $height);
 
-	$title = $title ? 'title="' . esc_attr( $title ) . '" ' : '';
+	$title = $title ? 'title="'.esc_attr($title).'" ' : '';
 
-	$class = 'align' . esc_attr($align) .' size-' . esc_attr($size) . ' wp-image-' . $id;
+	$class = 'align'.esc_attr($align).' size-'.esc_attr($size).' wp-image-'.$id;
 
 	/**
 	 * Filter the value of the attachment's image tag class attribute.
@@ -349,9 +349,9 @@ 
 	 * @param string|array $size  Size of image. Image size or array of width and height values (in that order).
 	 *                            Default 'medium'.
 	 */
-	$class = apply_filters( 'get_image_tag_class', $class, $id, $align, $size );
+	$class = apply_filters('get_image_tag_class', $class, $id, $align, $size);
 
-	$html = '<img src="' . esc_attr($img_src) . '" alt="' . esc_attr($alt) . '" ' . $title . $hwstring . 'class="' . $class . '" />';
+	$html = '<img src="'.esc_attr($img_src).'" alt="'.esc_attr($alt).'" '.$title.$hwstring.'class="'.$class.'" />';
 
 	/**
 	 * Filter the HTML content for the image tag.
@@ -366,7 +366,7 @@ 
 	 * @param string|array $size  Size of image. Image size or array of width and height values (in that order).
 	 *                            Default 'medium'.
 	 */
-	return apply_filters( 'get_image_tag', $html, $id, $alt, $title, $align, $size );
+	return apply_filters('get_image_tag', $html, $id, $alt, $title, $align, $size);
 }
 
 /**
@@ -383,28 +383,28 @@ 
  * @param int $max_height     Optional. Max height in pixels to constrain to. Default 0.
  * @return array First item is the width, the second item is the height.
  */
-function wp_constrain_dimensions( $current_width, $current_height, $max_width = 0, $max_height = 0 ) {
-	if ( !$max_width && !$max_height )
-		return array( $current_width, $current_height );
+function wp_constrain_dimensions($current_width, $current_height, $max_width = 0, $max_height = 0) {
+	if ( ! $max_width && ! $max_height)
+		return array($current_width, $current_height);
 
 	$width_ratio = $height_ratio = 1.0;
 	$did_width = $did_height = false;
 
-	if ( $max_width > 0 && $current_width > 0 && $current_width > $max_width ) {
+	if ($max_width > 0 && $current_width > 0 && $current_width > $max_width) {
 		$width_ratio = $max_width / $current_width;
 		$did_width = true;
 	}
 
-	if ( $max_height > 0 && $current_height > 0 && $current_height > $max_height ) {
+	if ($max_height > 0 && $current_height > 0 && $current_height > $max_height) {
 		$height_ratio = $max_height / $current_height;
 		$did_height = true;
 	}
 
 	// Calculate the larger/smaller ratios
-	$smaller_ratio = min( $width_ratio, $height_ratio );
-	$larger_ratio  = max( $width_ratio, $height_ratio );
+	$smaller_ratio = min($width_ratio, $height_ratio);
+	$larger_ratio  = max($width_ratio, $height_ratio);
 
-	if ( (int) round( $current_width * $larger_ratio ) > $max_width || (int) round( $current_height * $larger_ratio ) > $max_height ) {
+	if ((int) round($current_width * $larger_ratio) > $max_width || (int) round($current_height * $larger_ratio) > $max_height) {
  		// The larger ratio is too big. It would result in an overflow.
 		$ratio = $smaller_ratio;
 	} else {
@@ -413,20 +413,20 @@ 
 	}
 
 	// Very small dimensions may result in 0, 1 should be the minimum.
-	$w = max ( 1, (int) round( $current_width  * $ratio ) );
-	$h = max ( 1, (int) round( $current_height * $ratio ) );
+	$w = max(1, (int) round($current_width * $ratio));
+	$h = max(1, (int) round($current_height * $ratio));
 
 	// Sometimes, due to rounding, we'll end up with a result like this: 465x700 in a 177x177 box is 117x176... a pixel short
 	// We also have issues with recursive calls resulting in an ever-changing result. Constraining to the result of a constraint should yield the original result.
 	// Thus we look for dimensions that are one pixel shy of the max value and bump them up
 
 	// Note: $did_width means it is possible $smaller_ratio == $width_ratio.
-	if ( $did_width && $w == $max_width - 1 ) {
+	if ($did_width && $w == $max_width - 1) {
 		$w = $max_width; // Round it up
 	}
 
 	// Note: $did_height means it is possible $smaller_ratio == $height_ratio.
-	if ( $did_height && $h == $max_height - 1 ) {
+	if ($did_height && $h == $max_height - 1) {
 		$h = $max_height; // Round it up
 	}
 
@@ -441,7 +441,7 @@ 
 	 * @param int 	$max_width      The maximum width permitted.
 	 * @param int 	$max_height     The maximum height permitted.
 	 */
-	return apply_filters( 'wp_constrain_dimensions', array( $w, $h ), $current_width, $current_height, $max_width, $max_height );
+	return apply_filters('wp_constrain_dimensions', array($w, $h), $current_width, $current_height, $max_width, $max_height);
 }
 
 /**
@@ -468,7 +468,7 @@ 
  *                           An array can specify positioning of the crop area. Default false.
  * @return false|array False on failure. Returned array matches parameters for `imagecopyresampled()`.
  */
-function image_resize_dimensions( $orig_w, $orig_h, $dest_w, $dest_h, $crop = false ) {
+function image_resize_dimensions($orig_w, $orig_h, $dest_w, $dest_h, $crop = false) {
 
 	if ($orig_w <= 0 || $orig_h <= 0)
 		return false;
@@ -492,22 +492,22 @@ 
 	 * @param bool|array $crop   Whether to crop image to specified width and height or resize.
 	 *                           An array can specify positioning of the crop area. Default false.
 	 */
-	$output = apply_filters( 'image_resize_dimensions', null, $orig_w, $orig_h, $dest_w, $dest_h, $crop );
-	if ( null !== $output )
+	$output = apply_filters('image_resize_dimensions', null, $orig_w, $orig_h, $dest_w, $dest_h, $crop);
+	if (null !== $output)
 		return $output;
 
-	if ( $crop ) {
+	if ($crop) {
 		// crop the largest possible portion of the original image that we can size to $dest_w x $dest_h
 		$aspect_ratio = $orig_w / $orig_h;
 		$new_w = min($dest_w, $orig_w);
 		$new_h = min($dest_h, $orig_h);
 
-		if ( ! $new_w ) {
-			$new_w = (int) round( $new_h * $aspect_ratio );
+		if ( ! $new_w) {
+			$new_w = (int) round($new_h * $aspect_ratio);
 		}
 
-		if ( ! $new_h ) {
-			$new_h = (int) round( $new_w / $aspect_ratio );
+		if ( ! $new_h) {
+			$new_h = (int) round($new_w / $aspect_ratio);
 		}
 
 		$size_ratio = max($new_w / $orig_w, $new_h / $orig_h);
@@ -515,26 +515,26 @@ 
 		$crop_w = round($new_w / $size_ratio);
 		$crop_h = round($new_h / $size_ratio);
 
-		if ( ! is_array( $crop ) || count( $crop ) !== 2 ) {
-			$crop = array( 'center', 'center' );
+		if ( ! is_array($crop) || count($crop) !== 2) {
+			$crop = array('center', 'center');
 		}
 
-		list( $x, $y ) = $crop;
+		list($x, $y) = $crop;
 
-		if ( 'left' === $x ) {
+		if ('left' === $x) {
 			$s_x = 0;
-		} elseif ( 'right' === $x ) {
+		} elseif ('right' === $x) {
 			$s_x = $orig_w - $crop_w;
 		} else {
-			$s_x = floor( ( $orig_w - $crop_w ) / 2 );
+			$s_x = floor(($orig_w - $crop_w) / 2);
 		}
 
-		if ( 'top' === $y ) {
+		if ('top' === $y) {
 			$s_y = 0;
-		} elseif ( 'bottom' === $y ) {
+		} elseif ('bottom' === $y) {
 			$s_y = $orig_h - $crop_h;
 		} else {
-			$s_y = floor( ( $orig_h - $crop_h ) / 2 );
+			$s_y = floor(($orig_h - $crop_h) / 2);
 		}
 	} else {
 		// don't crop, just resize using $dest_w x $dest_h as a maximum bounding box
@@ -544,17 +544,17 @@ 
 		$s_x = 0;
 		$s_y = 0;
 
-		list( $new_w, $new_h ) = wp_constrain_dimensions( $orig_w, $orig_h, $dest_w, $dest_h );
+		list($new_w, $new_h) = wp_constrain_dimensions($orig_w, $orig_h, $dest_w, $dest_h);
 	}
 
 	// if the resulting image would be the same size or larger we don't want to resize it
-	if ( $new_w >= $orig_w && $new_h >= $orig_h && $dest_w != $orig_w && $dest_h != $orig_h ) {
+	if ($new_w >= $orig_w && $new_h >= $orig_h && $dest_w != $orig_w && $dest_h != $orig_h) {
 		return false;
 	}
 
 	// the return array matches the parameters to imagecopyresampled()
 	// int dst_x, int dst_y, int src_x, int src_y, int dst_w, int dst_h, int src_w, int src_h
-	return array( 0, 0, (int) $s_x, (int) $s_y, (int) $new_w, (int) $new_h, (int) $crop_w, (int) $crop_h );
+	return array(0, 0, (int) $s_x, (int) $s_y, (int) $new_w, (int) $new_h, (int) $crop_w, (int) $crop_h);
 
 }
 
@@ -574,17 +574,17 @@ 
  *                       Default false.
  * @return false|array False, if no image was created. Metadata array on success.
  */
-function image_make_intermediate_size( $file, $width, $height, $crop = false ) {
-	if ( $width || $height ) {
-		$editor = wp_get_image_editor( $file );
+function image_make_intermediate_size($file, $width, $height, $crop = false) {
+	if ($width || $height) {
+		$editor = wp_get_image_editor($file);
 
-		if ( is_wp_error( $editor ) || is_wp_error( $editor->resize( $width, $height, $crop ) ) )
+		if (is_wp_error($editor) || is_wp_error($editor->resize($width, $height, $crop)))
 			return false;
 
 		$resized_file = $editor->save();
 
-		if ( ! is_wp_error( $resized_file ) && $resized_file ) {
-			unset( $resized_file['path'] );
+		if ( ! is_wp_error($resized_file) && $resized_file) {
+			unset($resized_file['path']);
 			return $resized_file;
 		}
 	}
@@ -629,63 +629,63 @@ 
  *                          parameter.
  * }
  */
-function image_get_intermediate_size( $post_id, $size = 'thumbnail' ) {
-	if ( !is_array( $imagedata = wp_get_attachment_metadata( $post_id ) ) )
+function image_get_intermediate_size($post_id, $size = 'thumbnail') {
+	if ( ! is_array($imagedata = wp_get_attachment_metadata($post_id)))
 		return false;
 
 	// get the best one for a specified set of dimensions
-	if ( is_array($size) && !empty($imagedata['sizes']) ) {
+	if (is_array($size) && ! empty($imagedata['sizes'])) {
 		$candidates = array();
 
-		foreach ( $imagedata['sizes'] as $_size => $data ) {
+		foreach ($imagedata['sizes'] as $_size => $data) {
 			// If there's an exact match to an existing image size, short circuit.
-			if ( $data['width'] == $size[0] && $data['height'] == $size[1] ) {
-				list( $data['width'], $data['height'] ) = image_constrain_size_for_editor( $data['width'], $data['height'], $size );
+			if ($data['width'] == $size[0] && $data['height'] == $size[1]) {
+				list($data['width'], $data['height']) = image_constrain_size_for_editor($data['width'], $data['height'], $size);
 
 				/** This filter is documented in wp-includes/media.php */
-				return apply_filters( 'image_get_intermediate_size', $data, $post_id, $size );
+				return apply_filters('image_get_intermediate_size', $data, $post_id, $size);
 			}
 			// If it's not an exact match but it's at least the dimensions requested.
-			if ( $data['width'] >= $size[0] && $data['height'] >= $size[1] ) {
-				$candidates[ $data['width'] * $data['height'] ] = $_size;
+			if ($data['width'] >= $size[0] && $data['height'] >= $size[1]) {
+				$candidates[$data['width'] * $data['height']] = $_size;
 			}
 		}
 
-		if ( ! empty( $candidates ) ) {
+		if ( ! empty($candidates)) {
 			// find for the smallest image not smaller than the desired size
-			ksort( $candidates );
-			foreach ( $candidates as $_size ) {
+			ksort($candidates);
+			foreach ($candidates as $_size) {
 				$data = $imagedata['sizes'][$_size];
 
 				// Skip images with unexpectedly divergent aspect ratios (crops)
 				// First, we calculate what size the original image would be if constrained to a box the size of the current image in the loop
-				$maybe_cropped = image_resize_dimensions($imagedata['width'], $imagedata['height'], $data['width'], $data['height'], false );
+				$maybe_cropped = image_resize_dimensions($imagedata['width'], $imagedata['height'], $data['width'], $data['height'], false);
 				// If the size doesn't match within one pixel, then it is of a different aspect ratio, so we skip it, unless it's the thumbnail size
-				if ( 'thumbnail' != $_size &&
+				if ('thumbnail' != $_size &&
 				  ( ! $maybe_cropped
-				    || ( $maybe_cropped[4] != $data['width'] && $maybe_cropped[4] + 1 != $data['width'] )
-				    || ( $maybe_cropped[5] != $data['height'] && $maybe_cropped[5] + 1 != $data['height'] )
-				  ) ) {
+				    || ($maybe_cropped[4] != $data['width'] && $maybe_cropped[4] + 1 != $data['width'])
+				    || ($maybe_cropped[5] != $data['height'] && $maybe_cropped[5] + 1 != $data['height'])
+				  )) {
 				  continue;
 				}
 				// If we're still here, then we're going to use this size.
-				list( $data['width'], $data['height'] ) = image_constrain_size_for_editor( $data['width'], $data['height'], $size );
+				list($data['width'], $data['height']) = image_constrain_size_for_editor($data['width'], $data['height'], $size);
 
 				/** This filter is documented in wp-includes/media.php */
-				return apply_filters( 'image_get_intermediate_size', $data, $post_id, $size );
+				return apply_filters('image_get_intermediate_size', $data, $post_id, $size);
 			}
 		}
 	}
 
-	if ( is_array($size) || empty($size) || empty($imagedata['sizes'][$size]) )
+	if (is_array($size) || empty($size) || empty($imagedata['sizes'][$size]))
 		return false;
 
 	$data = $imagedata['sizes'][$size];
 	// include the full filesystem path of the intermediate file
-	if ( empty($data['path']) && !empty($data['file']) ) {
+	if (empty($data['path']) && ! empty($data['file'])) {
 		$file_url = wp_get_attachment_url($post_id);
-		$data['path'] = path_join( dirname($imagedata['file']), $data['file'] );
-		$data['url'] = path_join( dirname($file_url), $data['file'] );
+		$data['path'] = path_join(dirname($imagedata['file']), $data['file']);
+		$data['url'] = path_join(dirname($file_url), $data['file']);
 	}
 
 	/**
@@ -701,7 +701,7 @@ 
 	 * @param string|array $size    Registered image size or flat array of initially-requested height and width
 	 *                              dimensions (in that order).
 	 */
-	return apply_filters( 'image_get_intermediate_size', $data, $post_id, $size );
+	return apply_filters('image_get_intermediate_size', $data, $post_id, $size);
 }
 
 /**
@@ -716,8 +716,8 @@ 
 function get_intermediate_image_sizes() {
 	global $_wp_additional_image_sizes;
 	$image_sizes = array('thumbnail', 'medium', 'medium_large', 'large'); // Standard sizes
-	if ( isset( $_wp_additional_image_sizes ) && count( $_wp_additional_image_sizes ) )
-		$image_sizes = array_merge( $image_sizes, array_keys( $_wp_additional_image_sizes ) );
+	if (isset($_wp_additional_image_sizes) && count($_wp_additional_image_sizes))
+		$image_sizes = array_merge($image_sizes, array_keys($_wp_additional_image_sizes));
 
 	/**
 	 * Filter the list of intermediate image sizes.
@@ -727,7 +727,7 @@ 
 	 * @param array $image_sizes An array of intermediate image sizes. Defaults
 	 *                           are 'thumbnail', 'medium', 'medium_large', 'large'.
 	 */
-	return apply_filters( 'intermediate_image_sizes', $image_sizes );
+	return apply_filters('intermediate_image_sizes', $image_sizes);
 }
 
 /**
@@ -748,22 +748,22 @@ 
  * @param bool         $icon          Optional. Whether the image should be treated as an icon. Default false.
  * @return false|array Returns an array (url, width, height, is_intermediate), or false, if no image is available.
  */
-function wp_get_attachment_image_src( $attachment_id, $size = 'thumbnail', $icon = false ) {
+function wp_get_attachment_image_src($attachment_id, $size = 'thumbnail', $icon = false) {
 	// get a thumbnail or intermediate image if there is one
-	$image = image_downsize( $attachment_id, $size );
-	if ( ! $image ) {
+	$image = image_downsize($attachment_id, $size);
+	if ( ! $image) {
 		$src = false;
 
-		if ( $icon && $src = wp_mime_type_icon( $attachment_id ) ) {
+		if ($icon && $src = wp_mime_type_icon($attachment_id)) {
 			/** This filter is documented in wp-includes/post.php */
-			$icon_dir = apply_filters( 'icon_dir', ABSPATH . WPINC . '/images/media' );
+			$icon_dir = apply_filters('icon_dir', ABSPATH.WPINC.'/images/media');
 
-			$src_file = $icon_dir . '/' . wp_basename( $src );
-			@list( $width, $height ) = getimagesize( $src_file );
+			$src_file = $icon_dir.'/'.wp_basename($src);
+			@list($width, $height) = getimagesize($src_file);
 		}
 
-		if ( $src && $width && $height ) {
-			$image = array( $src, $width, $height );
+		if ($src && $width && $height) {
+			$image = array($src, $width, $height);
 		}
 	}
 	/**
@@ -777,7 +777,7 @@ 
 	 *                                    (in that order). Default 'thumbnail'.
 	 * @param bool         $icon          Whether the image should be treated as an icon. Default false.
 	 */
-	return apply_filters( 'wp_get_attachment_image_src', $image, $attachment_id, $size, $icon );
+	return apply_filters('wp_get_attachment_image_src', $image, $attachment_id, $size, $icon);
 }
 
 /**
@@ -800,39 +800,39 @@ 
 function wp_get_attachment_image($attachment_id, $size = 'thumbnail', $icon = false, $attr = '') {
 	$html = '';
 	$image = wp_get_attachment_image_src($attachment_id, $size, $icon);
-	if ( $image ) {
+	if ($image) {
 		list($src, $width, $height) = $image;
 		$hwstring = image_hwstring($width, $height);
 		$size_class = $size;
-		if ( is_array( $size_class ) ) {
-			$size_class = join( 'x', $size_class );
+		if (is_array($size_class)) {
+			$size_class = join('x', $size_class);
 		}
 		$attachment = get_post($attachment_id);
 		$default_attr = array(
 			'src'	=> $src,
 			'class'	=> "attachment-$size_class size-$size_class",
-			'alt'	=> trim(strip_tags( get_post_meta($attachment_id, '_wp_attachment_image_alt', true) )), // Use Alt field first
+			'alt'	=> trim(strip_tags(get_post_meta($attachment_id, '_wp_attachment_image_alt', true))), // Use Alt field first
 		);
-		if ( empty($default_attr['alt']) )
-			$default_attr['alt'] = trim(strip_tags( $attachment->post_excerpt )); // If not, Use the Caption
-		if ( empty($default_attr['alt']) )
-			$default_attr['alt'] = trim(strip_tags( $attachment->post_title )); // Finally, use the title
+		if (empty($default_attr['alt']))
+			$default_attr['alt'] = trim(strip_tags($attachment->post_excerpt)); // If not, Use the Caption
+		if (empty($default_attr['alt']))
+			$default_attr['alt'] = trim(strip_tags($attachment->post_title)); // Finally, use the title
 
-		$attr = wp_parse_args( $attr, $default_attr );
+		$attr = wp_parse_args($attr, $default_attr);
 
 		// Generate 'srcset' and 'sizes' if not already present.
-		if ( empty( $attr['srcset'] ) ) {
-			$image_meta = get_post_meta( $attachment_id, '_wp_attachment_metadata', true );
+		if (empty($attr['srcset'])) {
+			$image_meta = get_post_meta($attachment_id, '_wp_attachment_metadata', true);
 
-			if ( is_array( $image_meta ) ) {
-				$size_array = array( absint( $width ), absint( $height ) );
-				$srcset = wp_calculate_image_srcset( $size_array, $src, $image_meta, $attachment_id );
-				$sizes = wp_calculate_image_sizes( $size_array, $src, $image_meta, $attachment_id );
+			if (is_array($image_meta)) {
+				$size_array = array(absint($width), absint($height));
+				$srcset = wp_calculate_image_srcset($size_array, $src, $image_meta, $attachment_id);
+				$sizes = wp_calculate_image_sizes($size_array, $src, $image_meta, $attachment_id);
 
-				if ( $srcset && ( $sizes || ! empty( $attr['sizes'] ) ) ) {
+				if ($srcset && ($sizes || ! empty($attr['sizes']))) {
 					$attr['srcset'] = $srcset;
 
-					if ( empty( $attr['sizes'] ) ) {
+					if (empty($attr['sizes'])) {
 						$attr['sizes'] = $sizes;
 					}
 				}
@@ -849,11 +849,11 @@ 
 		 * @param string|array $size       Requested size. Image size or array of width and height values
 		 *                                 (in that order). Default 'thumbnail'.
 		 */
-		$attr = apply_filters( 'wp_get_attachment_image_attributes', $attr, $attachment, $size );
-		$attr = array_map( 'esc_attr', $attr );
+		$attr = apply_filters('wp_get_attachment_image_attributes', $attr, $attachment, $size);
+		$attr = array_map('esc_attr', $attr);
 		$html = rtrim("<img $hwstring");
-		foreach ( $attr as $name => $value ) {
-			$html .= " $name=" . '"' . $value . '"';
+		foreach ($attr as $name => $value) {
+			$html .= " $name=".'"'.$value.'"';
 		}
 		$html .= ' />';
 	}
@@ -872,9 +872,9 @@ 
  * @param bool         $icon          Optional. Whether the image should be treated as an icon. Default false.
  * @return string|false Attachment URL or false if no image is available.
  */
-function wp_get_attachment_image_url( $attachment_id, $size = 'thumbnail', $icon = false ) {
-	$image = wp_get_attachment_image_src( $attachment_id, $size, $icon );
-	return isset( $image['0'] ) ? $image['0'] : false;
+function wp_get_attachment_image_url($attachment_id, $size = 'thumbnail', $icon = false) {
+	$image = wp_get_attachment_image_src($attachment_id, $size, $icon);
+	return isset($image['0']) ? $image['0'] : false;
 }
 
 /**
@@ -886,17 +886,17 @@ 
  * @param string $file Attachment file name.
  * @return string Attachment path relative to the upload directory.
  */
-function _wp_get_attachment_relative_path( $file ) {
-	$dirname = dirname( $file );
+function _wp_get_attachment_relative_path($file) {
+	$dirname = dirname($file);
 
-	if ( '.' === $dirname ) {
+	if ('.' === $dirname) {
 		return '';
 	}
 
-	if ( false !== strpos( $dirname, 'wp-content/uploads' ) ) {
+	if (false !== strpos($dirname, 'wp-content/uploads')) {
 		// Get the directory name relative to the upload directory (back compat for pre-2.7 uploads)
-		$dirname = substr( $dirname, strpos( $dirname, 'wp-content/uploads' ) + 18 );
-		$dirname = ltrim( $dirname, '/' );
+		$dirname = substr($dirname, strpos($dirname, 'wp-content/uploads') + 18);
+		$dirname = ltrim($dirname, '/');
 	}
 
 	return $dirname;
@@ -915,16 +915,16 @@ 
  * @return array|bool Array of width and height values in pixels (in that order)
  *                    or false if the size doesn't exist.
  */
-function _wp_get_image_size_from_meta( $size_name, $image_meta ) {
-	if ( $size_name === 'full' ) {
+function _wp_get_image_size_from_meta($size_name, $image_meta) {
+	if ($size_name === 'full') {
 		return array(
-			absint( $image_meta['width'] ),
-			absint( $image_meta['height'] ),
+			absint($image_meta['width']),
+			absint($image_meta['height']),
 		);
-	} elseif ( ! empty( $image_meta['sizes'][$size_name] ) ) {
+	} elseif ( ! empty($image_meta['sizes'][$size_name])) {
 		return array(
-			absint( $image_meta['sizes'][$size_name]['width'] ),
-			absint( $image_meta['sizes'][$size_name]['height'] ),
+			absint($image_meta['sizes'][$size_name]['width']),
+			absint($image_meta['sizes'][$size_name]['height']),
 		);
 	}
 
@@ -945,22 +945,22 @@ 
  *                                    Default null.
  * @return string|bool A 'srcset' value string or false.
  */
-function wp_get_attachment_image_srcset( $attachment_id, $size = 'medium', $image_meta = null ) {
-	if ( ! $image = wp_get_attachment_image_src( $attachment_id, $size ) ) {
+function wp_get_attachment_image_srcset($attachment_id, $size = 'medium', $image_meta = null) {
+	if ( ! $image = wp_get_attachment_image_src($attachment_id, $size)) {
 		return false;
 	}
 
-	if ( ! is_array( $image_meta ) ) {
-		$image_meta = get_post_meta( $attachment_id, '_wp_attachment_metadata', true );
+	if ( ! is_array($image_meta)) {
+		$image_meta = get_post_meta($attachment_id, '_wp_attachment_metadata', true);
 	}
 
 	$image_src = $image[0];
 	$size_array = array(
-		absint( $image[1] ),
-		absint( $image[2] )
+		absint($image[1]),
+		absint($image[2])
 	);
 
-	return wp_calculate_image_srcset( $size_array, $image_src, $image_meta, $attachment_id );
+	return wp_calculate_image_srcset($size_array, $image_src, $image_meta, $attachment_id);
 }
 
 /**
@@ -974,7 +974,7 @@ 
  * @param int    $attachment_id Optional. The image attachment ID to pass to the filter. Default 0.
  * @return string|bool          The 'srcset' attribute value. False on error or when only one source exists.
  */
-function wp_calculate_image_srcset( $size_array, $image_src, $image_meta, $attachment_id = 0 ) {
+function wp_calculate_image_srcset($size_array, $image_src, $image_meta, $attachment_id = 0) {
 	/**
 	 * Let plugins pre-filter the image meta to be able to fix inconsistencies in the stored data.
 	 *
@@ -983,9 +983,9 @@ 
 	 * @param string $image_src     The 'src' of the image.
 	 * @param int    $attachment_id The image attachment ID or 0 if not supplied.
 	 */
-	$image_meta = apply_filters( 'wp_calculate_image_srcset_meta', $image_meta, $size_array, $image_src, $attachment_id );
+	$image_meta = apply_filters('wp_calculate_image_srcset_meta', $image_meta, $size_array, $image_src, $attachment_id);
 
-	if ( empty( $image_meta['sizes'] ) || ! isset( $image_meta['file'] ) || strlen( $image_meta['file'] ) < 4 ) {
+	if (empty($image_meta['sizes']) || ! isset($image_meta['file']) || strlen($image_meta['file']) < 4) {
 		return false;
 	}
 
@@ -996,43 +996,43 @@ 
 	$image_height = (int) $size_array[1];
 
 	// Bail early if error/no width.
-	if ( $image_width < 1 ) {
+	if ($image_width < 1) {
 		return false;
 	}
 
-	$image_basename = wp_basename( $image_meta['file'] );
+	$image_basename = wp_basename($image_meta['file']);
 
 	/*
 	 * WordPress flattens animated GIFs into one frame when generating intermediate sizes.
 	 * To avoid hiding animation in user content, if src is a full size GIF, a srcset attribute is not generated.
 	 * If src is an intermediate size GIF, the full size is excluded from srcset to keep a flattened GIF from becoming animated.
 	 */
-	if ( ! isset( $image_sizes['thumbnail']['mime-type'] ) || 'image/gif' !== $image_sizes['thumbnail']['mime-type'] ) {
+	if ( ! isset($image_sizes['thumbnail']['mime-type']) || 'image/gif' !== $image_sizes['thumbnail']['mime-type']) {
 		$image_sizes['full'] = array(
 			'width'  => $image_meta['width'],
 			'height' => $image_meta['height'],
 			'file'   => $image_basename,
 		);
-	} elseif ( strpos( $image_src, $image_meta['file'] ) ) {
+	} elseif (strpos($image_src, $image_meta['file'])) {
 		return false;
 	}
 
 	// Retrieve the uploads sub-directory from the full size image.
-	$dirname = _wp_get_attachment_relative_path( $image_meta['file'] );
+	$dirname = _wp_get_attachment_relative_path($image_meta['file']);
 
-	if ( $dirname ) {
-		$dirname = trailingslashit( $dirname );
+	if ($dirname) {
+		$dirname = trailingslashit($dirname);
 	}
 
 	$upload_dir = wp_get_upload_dir();
-	$image_baseurl = trailingslashit( $upload_dir['baseurl'] ) . $dirname;
+	$image_baseurl = trailingslashit($upload_dir['baseurl']).$dirname;
 
 	/*
 	 * Images that have been edited in WordPress after being uploaded will
 	 * contain a unique hash. Look for that hash and use it later to filter
 	 * out images that are leftovers from previous versions.
 	 */
-	$image_edited = preg_match( '/-e[0-9]{13}/', wp_basename( $image_src ), $image_edit_hash );
+	$image_edited = preg_match('/-e[0-9]{13}/', wp_basename($image_src), $image_edit_hash);
 
 	/**
 	 * Filter the maximum image width to be included in a 'srcset' attribute.
@@ -1042,7 +1042,7 @@ 
 	 * @param int   $max_width  The maximum image width to be included in the 'srcset'. Default '1600'.
 	 * @param array $size_array Array of width and height values in pixels (in that order).
 	 */
-	$max_srcset_image_width = apply_filters( 'max_srcset_image_width', 1600, $size_array );
+	$max_srcset_image_width = apply_filters('max_srcset_image_width', 1600, $size_array);
 
 	// Array to hold URL candidates.
 	$sources = array();
@@ -1058,20 +1058,20 @@ 
 	 * Loop through available images. Only use images that are resized
 	 * versions of the same edit.
 	 */
-	foreach ( $image_sizes as $image ) {
+	foreach ($image_sizes as $image) {
 
 		// Check if image meta isn't corrupted.
-		if ( ! is_array( $image ) ) {
+		if ( ! is_array($image)) {
 			continue;
 		}
 
 		// If the file name is part of the `src`, we've confirmed a match.
-		if ( ! $src_matched && false !== strpos( $image_src, $dirname . $image['file'] ) ) {
+		if ( ! $src_matched && false !== strpos($image_src, $dirname.$image['file'])) {
 			$src_matched = true;
 		}
 
 		// Filter out images that are from previous edits.
-		if ( $image_edited && ! strpos( $image['file'], $image_edit_hash[0] ) ) {
+		if ($image_edited && ! strpos($image['file'], $image_edit_hash[0])) {
 			continue;
 		}
 
@@ -1079,8 +1079,8 @@ 
 		 * Filter out images that are wider than '$max_srcset_image_width' unless
 		 * that file is in the 'src' attribute.
 		 */
-		if ( $max_srcset_image_width && $image['width'] > $max_srcset_image_width &&
-			false === strpos( $image_src, $image['file'] ) ) {
+		if ($max_srcset_image_width && $image['width'] > $max_srcset_image_width &&
+			false === strpos($image_src, $image['file'])) {
 
 			continue;
 		}
@@ -1090,19 +1090,19 @@ 
 		 * image if the larger were constrained by the width of the smaller and then
 		 * see if it matches what we're expecting.
 		 */
-		if ( $image_width > $image['width'] ) {
-			$constrained_size = wp_constrain_dimensions( $image_width, $image_height, $image['width'] );
-			$expected_size = array( $image['width'], $image['height'] );
+		if ($image_width > $image['width']) {
+			$constrained_size = wp_constrain_dimensions($image_width, $image_height, $image['width']);
+			$expected_size = array($image['width'], $image['height']);
 		} else {
-			$constrained_size = wp_constrain_dimensions( $image['width'], $image['height'], $image_width );
-			$expected_size = array( $image_width, $image_height );
+			$constrained_size = wp_constrain_dimensions($image['width'], $image['height'], $image_width);
+			$expected_size = array($image_width, $image_height);
 		}
 
 		// If the image dimensions are within 1px of the expected size, use it.
-		if ( abs( $constrained_size[0] - $expected_size[0] ) <= 1 && abs( $constrained_size[1] - $expected_size[1] ) <= 1 ) {
+		if (abs($constrained_size[0] - $expected_size[0]) <= 1 && abs($constrained_size[1] - $expected_size[1]) <= 1) {
 			// Add the URL, descriptor, and value to the sources array to be returned.
-			$sources[ $image['width'] ] = array(
-				'url'        => $image_baseurl . $image['file'],
+			$sources[$image['width']] = array(
+				'url'        => $image_baseurl.$image['file'],
 				'descriptor' => 'w',
 				'value'      => $image['width'],
 			);
@@ -1130,20 +1130,20 @@ 
 	 * @param array  $image_meta    The image meta data as returned by 'wp_get_attachment_metadata()'.
  	 * @param int    $attachment_id Image attachment ID or 0.
 	 */
-	$sources = apply_filters( 'wp_calculate_image_srcset', $sources, $size_array, $image_src, $image_meta, $attachment_id );
+	$sources = apply_filters('wp_calculate_image_srcset', $sources, $size_array, $image_src, $image_meta, $attachment_id);
 
 	// Only return a 'srcset' value if there is more than one source.
-	if ( ! $src_matched || count( $sources ) < 2 ) {
+	if ( ! $src_matched || count($sources) < 2) {
 		return false;
 	}
 
 	$srcset = '';
 
-	foreach ( $sources as $source ) {
-		$srcset .= $source['url'] . ' ' . $source['value'] . $source['descriptor'] . ', ';
+	foreach ($sources as $source) {
+		$srcset .= $source['url'].' '.$source['value'].$source['descriptor'].', ';
 	}
 
-	return rtrim( $srcset, ', ' );
+	return rtrim($srcset, ', ');
 }
 
 /**
@@ -1160,22 +1160,22 @@ 
  *                                    Default null.
  * @return string|bool A valid source size value for use in a 'sizes' attribute or false.
  */
-function wp_get_attachment_image_sizes( $attachment_id, $size = 'medium', $image_meta = null ) {
-	if ( ! $image = wp_get_attachment_image_src( $attachment_id, $size ) ) {
+function wp_get_attachment_image_sizes($attachment_id, $size = 'medium', $image_meta = null) {
+	if ( ! $image = wp_get_attachment_image_src($attachment_id, $size)) {
 		return false;
 	}
 
-	if ( ! is_array( $image_meta ) ) {
-		$image_meta = get_post_meta( $attachment_id, '_wp_attachment_metadata', true );
+	if ( ! is_array($image_meta)) {
+		$image_meta = get_post_meta($attachment_id, '_wp_attachment_metadata', true);
 	}
 
 	$image_src = $image[0];
 	$size_array = array(
-		absint( $image[1] ),
-		absint( $image[2] )
+		absint($image[1]),
+		absint($image[2])
 	);
 
-	return wp_calculate_image_sizes( $size_array, $image_src, $image_meta, $attachment_id );
+	return wp_calculate_image_sizes($size_array, $image_src, $image_meta, $attachment_id);
 }
 
 /**
@@ -1192,30 +1192,30 @@ 
  *                                    is needed when using the image size name as argument for `$size`. Default 0.
  * @return string|bool A valid source size value for use in a 'sizes' attribute or false.
  */
-function wp_calculate_image_sizes( $size, $image_src = null, $image_meta = null, $attachment_id = 0 ) {
+function wp_calculate_image_sizes($size, $image_src = null, $image_meta = null, $attachment_id = 0) {
 	$width = 0;
 
-	if ( is_array( $size ) ) {
-		$width = absint( $size[0] );
-	} elseif ( is_string( $size ) ) {
-		if ( ! $image_meta && $attachment_id ) {
-			$image_meta = get_post_meta( $attachment_id, '_wp_attachment_metadata', true );
+	if (is_array($size)) {
+		$width = absint($size[0]);
+	} elseif (is_string($size)) {
+		if ( ! $image_meta && $attachment_id) {
+			$image_meta = get_post_meta($attachment_id, '_wp_attachment_metadata', true);
 		}
 
-		if ( is_array( $image_meta ) ) {
-			$size_array = _wp_get_image_size_from_meta( $size, $image_meta );
-			if ( $size_array ) {
-				$width = absint( $size_array[0] );
+		if (is_array($image_meta)) {
+			$size_array = _wp_get_image_size_from_meta($size, $image_meta);
+			if ($size_array) {
+				$width = absint($size_array[0]);
 			}
 		}
 	}
 
-	if ( ! $width ) {
+	if ( ! $width) {
 		return false;
 	}
 
 	// Setup the default 'sizes' attribute.
-	$sizes = sprintf( '(max-width: %1$dpx) 100vw, %1$dpx', $width );
+	$sizes = sprintf('(max-width: %1$dpx) 100vw, %1$dpx', $width);
 
 	/**
 	 * Filter the output of 'wp_calculate_image_sizes()'.
@@ -1229,7 +1229,7 @@ 
 	 * @param array|null   $image_meta    The image meta data as returned by wp_get_attachment_metadata() or null.
 	 * @param int          $attachment_id Image attachment ID of the original image or 0.
 	 */
-	return apply_filters( 'wp_calculate_image_sizes', $sizes, $size, $image_src, $image_meta, $attachment_id );
+	return apply_filters('wp_calculate_image_sizes', $sizes, $size, $image_src, $image_meta, $attachment_id);
 }
 
 /**
@@ -1242,40 +1242,40 @@ 
  * @param string $content The raw post content to be filtered.
  * @return string Converted content with 'srcset' and 'sizes' attributes added to images.
  */
-function wp_make_content_images_responsive( $content ) {
-	if ( ! preg_match_all( '/<img [^>]+>/', $content, $matches ) ) {
+function wp_make_content_images_responsive($content) {
+	if ( ! preg_match_all('/<img [^>]+>/', $content, $matches)) {
 		return $content;
 	}
 
 	$selected_images = $attachment_ids = array();
 
-	foreach( $matches[0] as $image ) {
-		if ( false === strpos( $image, ' srcset=' ) && preg_match( '/wp-image-([0-9]+)/i', $image, $class_id ) &&
-			( $attachment_id = absint( $class_id[1] ) ) ) {
+	foreach ($matches[0] as $image) {
+		if (false === strpos($image, ' srcset=') && preg_match('/wp-image-([0-9]+)/i', $image, $class_id) &&
+			($attachment_id = absint($class_id[1]))) {
 
 			/*
 			 * If exactly the same image tag is used more than once, overwrite it.
 			 * All identical tags will be replaced later with 'str_replace()'.
 			 */
-			$selected_images[ $image ] = $attachment_id;
+			$selected_images[$image] = $attachment_id;
 			// Overwrite the ID when the same image is included more than once.
-			$attachment_ids[ $attachment_id ] = true;
+			$attachment_ids[$attachment_id] = true;
 		}
 	}
 
-	if ( count( $attachment_ids ) > 1 ) {
+	if (count($attachment_ids) > 1) {
 		/*
 		 * Warm object cache for use with 'get_post_meta()'.
 		 *
 		 * To avoid making a database call for each image, a single query
 		 * warms the object cache with the meta information for all images.
 		 */
-		update_meta_cache( 'post', array_keys( $attachment_ids ) );
+		update_meta_cache('post', array_keys($attachment_ids));
 	}
 
-	foreach ( $selected_images as $image => $attachment_id ) {
-		$image_meta = get_post_meta( $attachment_id, '_wp_attachment_metadata', true );
-		$content = str_replace( $image, wp_image_add_srcset_and_sizes( $image, $image_meta, $attachment_id ), $content );
+	foreach ($selected_images as $image => $attachment_id) {
+		$image_meta = get_post_meta($attachment_id, '_wp_attachment_metadata', true);
+		$content = str_replace($image, wp_image_add_srcset_and_sizes($image, $image_meta, $attachment_id), $content);
 	}
 
 	return $content;
@@ -1294,43 +1294,43 @@ 
  * @param int    $attachment_id Image attachment ID.
  * @return string Converted 'img' element with 'srcset' and 'sizes' attributes added.
  */
-function wp_image_add_srcset_and_sizes( $image, $image_meta, $attachment_id ) {
+function wp_image_add_srcset_and_sizes($image, $image_meta, $attachment_id) {
 	// Ensure the image meta exists.
-	if ( empty( $image_meta['sizes'] ) ) {
+	if (empty($image_meta['sizes'])) {
 		return $image;
 	}
 
-	$image_src = preg_match( '/src="([^"]+)"/', $image, $match_src ) ? $match_src[1] : '';
-	list( $image_src ) = explode( '?', $image_src );
+	$image_src = preg_match('/src="([^"]+)"/', $image, $match_src) ? $match_src[1] : '';
+	list($image_src) = explode('?', $image_src);
 
 	// Return early if we couldn't get the image source.
-	if ( ! $image_src ) {
+	if ( ! $image_src) {
 		return $image;
 	}
 
 	// Bail early if an image has been inserted and later edited.
-	if ( preg_match( '/-e[0-9]{13}/', $image_meta['file'], $img_edit_hash ) &&
-		strpos( wp_basename( $image_src ), $img_edit_hash[0] ) === false ) {
+	if (preg_match('/-e[0-9]{13}/', $image_meta['file'], $img_edit_hash) &&
+		strpos(wp_basename($image_src), $img_edit_hash[0]) === false) {
 
 		return $image;
 	}
 
-	$width  = preg_match( '/ width="([0-9]+)"/',  $image, $match_width  ) ? (int) $match_width[1]  : 0;
-	$height = preg_match( '/ height="([0-9]+)"/', $image, $match_height ) ? (int) $match_height[1] : 0;
+	$width  = preg_match('/ width="([0-9]+)"/', $image, $match_width) ? (int) $match_width[1] : 0;
+	$height = preg_match('/ height="([0-9]+)"/', $image, $match_height) ? (int) $match_height[1] : 0;
 
-	if ( ! $width || ! $height ) {
+	if ( ! $width || ! $height) {
 		/*
 		 * If attempts to parse the size value failed, attempt to use the image meta data to match
 		 * the image file name from 'src' against the available sizes for an attachment.
 		 */
-		$image_filename = wp_basename( $image_src );
+		$image_filename = wp_basename($image_src);
 
-		if ( $image_filename === wp_basename( $image_meta['file'] ) ) {
+		if ($image_filename === wp_basename($image_meta['file'])) {
 			$width = (int) $image_meta['width'];
 			$height = (int) $image_meta['height'];
 		} else {
-			foreach( $image_meta['sizes'] as $image_size_data ) {
-				if ( $image_filename === $image_size_data['file'] ) {
+			foreach ($image_meta['sizes'] as $image_size_data) {
+				if ($image_filename === $image_size_data['file']) {
 					$width = (int) $image_size_data['width'];
 					$height = (int) $image_size_data['height'];
 					break;
@@ -1339,32 +1339,32 @@ 
 		}
 	}
 
-	if ( ! $width || ! $height ) {
+	if ( ! $width || ! $height) {
 		return $image;
 	}
 
-	$size_array = array( $width, $height );
-	$srcset = wp_calculate_image_srcset( $size_array, $image_src, $image_meta, $attachment_id );
+	$size_array = array($width, $height);
+	$srcset = wp_calculate_image_srcset($size_array, $image_src, $image_meta, $attachment_id);
 
-	if ( $srcset ) {
+	if ($srcset) {
 		// Check if there is already a 'sizes' attribute.
-		$sizes = strpos( $image, ' sizes=' );
+		$sizes = strpos($image, ' sizes=');
 
-		if ( ! $sizes ) {
-			$sizes = wp_calculate_image_sizes( $size_array, $image_src, $image_meta, $attachment_id );
+		if ( ! $sizes) {
+			$sizes = wp_calculate_image_sizes($size_array, $image_src, $image_meta, $attachment_id);
 		}
 	}
 
-	if ( $srcset && $sizes ) {
+	if ($srcset && $sizes) {
 		// Format the 'srcset' and 'sizes' string and escape attributes.
-		$attr = sprintf( ' srcset="%s"', esc_attr( $srcset ) );
+		$attr = sprintf(' srcset="%s"', esc_attr($srcset));
 
-		if ( is_string( $sizes ) ) {
-			$attr .= sprintf( ' sizes="%s"', esc_attr( $sizes ) );
+		if (is_string($sizes)) {
+			$attr .= sprintf(' sizes="%s"', esc_attr($sizes));
 		}
 
 		// Add 'srcset' and 'sizes' attributes to the image markup.
-		$image = preg_replace( '/<img ([^>]+?)[\/ ]*>/', '<img $1' . $attr . ' />', $image );
+		$image = preg_replace('/<img ([^>]+?)[\/ ]*>/', '<img $1'.$attr.' />', $image);
 	}
 
 	return $image;
@@ -1382,7 +1382,7 @@ 
  * @param array $attr Thumbnail attributes including src, class, alt, title.
  * @return array Modified array of attributes including the new 'wp-post-image' class.
  */
-function _wp_post_thumbnail_class_filter( $attr ) {
+function _wp_post_thumbnail_class_filter($attr) {
 	$attr['class'] .= ' wp-post-image';
 	return $attr;
 }
@@ -1396,8 +1396,8 @@ 
  *
  * @param array $attr Thumbnail attributes including src, class, alt, title.
  */
-function _wp_post_thumbnail_class_filter_add( $attr ) {
-	add_filter( 'wp_get_attachment_image_attributes', '_wp_post_thumbnail_class_filter' );
+function _wp_post_thumbnail_class_filter_add($attr) {
+	add_filter('wp_get_attachment_image_attributes', '_wp_post_thumbnail_class_filter');
 }
 
 /**
@@ -1409,8 +1409,8 @@ 
  *
  * @param array $attr Thumbnail attributes including src, class, alt, title.
  */
-function _wp_post_thumbnail_class_filter_remove( $attr ) {
-	remove_filter( 'wp_get_attachment_image_attributes', '_wp_post_thumbnail_class_filter' );
+function _wp_post_thumbnail_class_filter_remove($attr) {
+	remove_filter('wp_get_attachment_image_attributes', '_wp_post_thumbnail_class_filter');
 }
 
 add_shortcode('wp_caption', 'img_caption_shortcode');
@@ -1441,15 +1441,15 @@ 
  * @param string $content Shortcode content.
  * @return string HTML content to display the caption.
  */
-function img_caption_shortcode( $attr, $content = null ) {
+function img_caption_shortcode($attr, $content = null) {
 	// New-style shortcode with the caption inside the shortcode with the link and image tags.
-	if ( ! isset( $attr['caption'] ) ) {
-		if ( preg_match( '#((?:<a [^>]+>\s*)?<img [^>]+>(?:\s*</a>)?)(.*)#is', $content, $matches ) ) {
+	if ( ! isset($attr['caption'])) {
+		if (preg_match('#((?:<a [^>]+>\s*)?<img [^>]+>(?:\s*</a>)?)(.*)#is', $content, $matches)) {
 			$content = $matches[1];
-			$attr['caption'] = trim( $matches[2] );
+			$attr['caption'] = trim($matches[2]);
 		}
-	} elseif ( strpos( $attr['caption'], '<' ) !== false ) {
-		$attr['caption'] = wp_kses( $attr['caption'], 'post' );
+	} elseif (strpos($attr['caption'], '<') !== false) {
+		$attr['caption'] = wp_kses($attr['caption'], 'post');
 	}
 
 	/**
@@ -1466,30 +1466,30 @@ 
 	 * @param array  $attr    Attributes of the caption shortcode.
 	 * @param string $content The image element, possibly wrapped in a hyperlink.
 	 */
-	$output = apply_filters( 'img_caption_shortcode', '', $attr, $content );
-	if ( $output != '' )
+	$output = apply_filters('img_caption_shortcode', '', $attr, $content);
+	if ($output != '')
 		return $output;
 
-	$atts = shortcode_atts( array(
+	$atts = shortcode_atts(array(
 		'id'	  => '',
 		'align'	  => 'alignnone',
 		'width'	  => '',
 		'caption' => '',
 		'class'   => '',
-	), $attr, 'caption' );
+	), $attr, 'caption');
 
 	$atts['width'] = (int) $atts['width'];
-	if ( $atts['width'] < 1 || empty( $atts['caption'] ) )
+	if ($atts['width'] < 1 || empty($atts['caption']))
 		return $content;
 
-	if ( ! empty( $atts['id'] ) )
-		$atts['id'] = 'id="' . esc_attr( sanitize_html_class( $atts['id'] ) ) . '" ';
+	if ( ! empty($atts['id']))
+		$atts['id'] = 'id="'.esc_attr(sanitize_html_class($atts['id'])).'" ';
 
-	$class = trim( 'wp-caption ' . $atts['align'] . ' ' . $atts['class'] );
+	$class = trim('wp-caption '.$atts['align'].' '.$atts['class']);
 
-	$html5 = current_theme_supports( 'html5', 'caption' );
+	$html5 = current_theme_supports('html5', 'caption');
 	// HTML5 captions never added the extra 10px to the image width
-	$width = $html5 ? $atts['width'] : ( 10 + $atts['width'] );
+	$width = $html5 ? $atts['width'] : (10 + $atts['width']);
 
 	/**
 	 * Filter the width of an image's caption.
@@ -1506,19 +1506,19 @@ 
 	 * @param array  $atts     Attributes of the caption shortcode.
 	 * @param string $content  The image element, possibly wrapped in a hyperlink.
 	 */
-	$caption_width = apply_filters( 'img_caption_shortcode_width', $width, $atts, $content );
+	$caption_width = apply_filters('img_caption_shortcode_width', $width, $atts, $content);
 
 	$style = '';
-	if ( $caption_width )
-		$style = 'style="width: ' . (int) $caption_width . 'px" ';
+	if ($caption_width)
+		$style = 'style="width: '.(int) $caption_width.'px" ';
 
 	$html = '';
-	if ( $html5 ) {
-		$html = '<figure ' . $atts['id'] . $style . 'class="' . esc_attr( $class ) . '">'
-		. do_shortcode( $content ) . '<figcaption class="wp-caption-text">' . $atts['caption'] . '</figcaption></figure>';
+	if ($html5) {
+		$html = '<figure '.$atts['id'].$style.'class="'.esc_attr($class).'">'
+		. do_shortcode($content).'<figcaption class="wp-caption-text">'.$atts['caption'].'</figcaption></figure>';
 	} else {
-		$html = '<div ' . $atts['id'] . $style . 'class="' . esc_attr( $class ) . '">'
-		. do_shortcode( $content ) . '<p class="wp-caption-text">' . $atts['caption'] . '</p></div>';
+		$html = '<div '.$atts['id'].$style.'class="'.esc_attr($class).'">'
+		. do_shortcode($content).'<p class="wp-caption-text">'.$atts['caption'].'</p></div>';
 	}
 
 	return $html;
@@ -1560,15 +1560,15 @@ 
  * }
  * @return string HTML content to display gallery.
  */
-function gallery_shortcode( $attr ) {
+function gallery_shortcode($attr) {
 	$post = get_post();
 
 	static $instance = 0;
 	$instance++;
 
-	if ( ! empty( $attr['ids'] ) ) {
+	if ( ! empty($attr['ids'])) {
 		// 'ids' is explicitly ordered, unless you specify otherwise.
-		if ( empty( $attr['orderby'] ) ) {
+		if (empty($attr['orderby'])) {
 			$attr['orderby'] = 'post__in';
 		}
 		$attr['include'] = $attr['ids'];
@@ -1589,69 +1589,69 @@ 
 	 * @param array  $attr     Attributes of the gallery shortcode.
 	 * @param int    $instance Unique numeric ID of this gallery shortcode instance.
 	 */
-	$output = apply_filters( 'post_gallery', '', $attr, $instance );
-	if ( $output != '' ) {
+	$output = apply_filters('post_gallery', '', $attr, $instance);
+	if ($output != '') {
 		return $output;
 	}
 
-	$html5 = current_theme_supports( 'html5', 'gallery' );
-	$atts = shortcode_atts( array(
+	$html5 = current_theme_supports('html5', 'gallery');
+	$atts = shortcode_atts(array(
 		'order'      => 'ASC',
 		'orderby'    => 'menu_order ID',
 		'id'         => $post ? $post->ID : 0,
-		'itemtag'    => $html5 ? 'figure'     : 'dl',
-		'icontag'    => $html5 ? 'div'        : 'dt',
+		'itemtag'    => $html5 ? 'figure' : 'dl',
+		'icontag'    => $html5 ? 'div' : 'dt',
 		'captiontag' => $html5 ? 'figcaption' : 'dd',
 		'columns'    => 3,
 		'size'       => 'thumbnail',
 		'include'    => '',
 		'exclude'    => '',
 		'link'       => ''
-	), $attr, 'gallery' );
+	), $attr, 'gallery');
 
-	$id = intval( $atts['id'] );
+	$id = intval($atts['id']);
 
-	if ( ! empty( $atts['include'] ) ) {
-		$_attachments = get_posts( array( 'include' => $atts['include'], 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => $atts['order'], 'orderby' => $atts['orderby'] ) );
+	if ( ! empty($atts['include'])) {
+		$_attachments = get_posts(array('include' => $atts['include'], 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => $atts['order'], 'orderby' => $atts['orderby']));
 
 		$attachments = array();
-		foreach ( $_attachments as $key => $val ) {
+		foreach ($_attachments as $key => $val) {
 			$attachments[$val->ID] = $_attachments[$key];
 		}
-	} elseif ( ! empty( $atts['exclude'] ) ) {
-		$attachments = get_children( array( 'post_parent' => $id, 'exclude' => $atts['exclude'], 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => $atts['order'], 'orderby' => $atts['orderby'] ) );
+	} elseif ( ! empty($atts['exclude'])) {
+		$attachments = get_children(array('post_parent' => $id, 'exclude' => $atts['exclude'], 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => $atts['order'], 'orderby' => $atts['orderby']));
 	} else {
-		$attachments = get_children( array( 'post_parent' => $id, 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => $atts['order'], 'orderby' => $atts['orderby'] ) );
+		$attachments = get_children(array('post_parent' => $id, 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => $atts['order'], 'orderby' => $atts['orderby']));
 	}
 
-	if ( empty( $attachments ) ) {
+	if (empty($attachments)) {
 		return '';
 	}
 
-	if ( is_feed() ) {
+	if (is_feed()) {
 		$output = "\n";
-		foreach ( $attachments as $att_id => $attachment ) {
-			$output .= wp_get_attachment_link( $att_id, $atts['size'], true ) . "\n";
+		foreach ($attachments as $att_id => $attachment) {
+			$output .= wp_get_attachment_link($att_id, $atts['size'], true)."\n";
 		}
 		return $output;
 	}
 
-	$itemtag = tag_escape( $atts['itemtag'] );
-	$captiontag = tag_escape( $atts['captiontag'] );
-	$icontag = tag_escape( $atts['icontag'] );
-	$valid_tags = wp_kses_allowed_html( 'post' );
-	if ( ! isset( $valid_tags[ $itemtag ] ) ) {
+	$itemtag = tag_escape($atts['itemtag']);
+	$captiontag = tag_escape($atts['captiontag']);
+	$icontag = tag_escape($atts['icontag']);
+	$valid_tags = wp_kses_allowed_html('post');
+	if ( ! isset($valid_tags[$itemtag])) {
 		$itemtag = 'dl';
 	}
-	if ( ! isset( $valid_tags[ $captiontag ] ) ) {
+	if ( ! isset($valid_tags[$captiontag])) {
 		$captiontag = 'dd';
 	}
-	if ( ! isset( $valid_tags[ $icontag ] ) ) {
+	if ( ! isset($valid_tags[$icontag])) {
 		$icontag = 'dt';
 	}
 
-	$columns = intval( $atts['columns'] );
-	$itemwidth = $columns > 0 ? floor(100/$columns) : 100;
+	$columns = intval($atts['columns']);
+	$itemwidth = $columns > 0 ? floor(100 / $columns) : 100;
 	$float = is_rtl() ? 'right' : 'left';
 
 	$selector = "gallery-{$instance}";
@@ -1667,7 +1667,7 @@ 
 	 *                    Defaults to false if the theme supports HTML5 galleries.
 	 *                    Otherwise, defaults to true.
 	 */
-	if ( apply_filters( 'use_default_gallery_style', ! $html5 ) ) {
+	if (apply_filters('use_default_gallery_style', ! $html5)) {
 		$gallery_style = "
 		<style type='text/css'>
 			#{$selector} {
@@ -1689,7 +1689,7 @@ 
 		</style>\n\t\t";
 	}
 
-	$size_class = sanitize_html_class( $atts['size'] );
+	$size_class = sanitize_html_class($atts['size']);
 	$gallery_div = "<div id='$selector' class='gallery galleryid-{$id} gallery-columns-{$columns} gallery-size-{$size_class}'>";
 
 	/**
@@ -1700,43 +1700,43 @@ 
 	 * @param string $gallery_style Default CSS styles and opening HTML div container
 	 *                              for the gallery shortcode output.
 	 */
-	$output = apply_filters( 'gallery_style', $gallery_style . $gallery_div );
+	$output = apply_filters('gallery_style', $gallery_style.$gallery_div);
 
 	$i = 0;
-	foreach ( $attachments as $id => $attachment ) {
+	foreach ($attachments as $id => $attachment) {
 
-		$attr = ( trim( $attachment->post_excerpt ) ) ? array( 'aria-describedby' => "$selector-$id" ) : '';
-		if ( ! empty( $atts['link'] ) && 'file' === $atts['link'] ) {
-			$image_output = wp_get_attachment_link( $id, $atts['size'], false, false, false, $attr );
-		} elseif ( ! empty( $atts['link'] ) && 'none' === $atts['link'] ) {
-			$image_output = wp_get_attachment_image( $id, $atts['size'], false, $attr );
+		$attr = (trim($attachment->post_excerpt)) ? array('aria-describedby' => "$selector-$id") : '';
+		if ( ! empty($atts['link']) && 'file' === $atts['link']) {
+			$image_output = wp_get_attachment_link($id, $atts['size'], false, false, false, $attr);
+		} elseif ( ! empty($atts['link']) && 'none' === $atts['link']) {
+			$image_output = wp_get_attachment_image($id, $atts['size'], false, $attr);
 		} else {
-			$image_output = wp_get_attachment_link( $id, $atts['size'], true, false, false, $attr );
+			$image_output = wp_get_attachment_link($id, $atts['size'], true, false, false, $attr);
 		}
-		$image_meta  = wp_get_attachment_metadata( $id );
+		$image_meta  = wp_get_attachment_metadata($id);
 
 		$orientation = '';
-		if ( isset( $image_meta['height'], $image_meta['width'] ) ) {
-			$orientation = ( $image_meta['height'] > $image_meta['width'] ) ? 'portrait' : 'landscape';
+		if (isset($image_meta['height'], $image_meta['width'])) {
+			$orientation = ($image_meta['height'] > $image_meta['width']) ? 'portrait' : 'landscape';
 		}
 		$output .= "<{$itemtag} class='gallery-item'>";
 		$output .= "
 			<{$icontag} class='gallery-icon {$orientation}'>
 				$image_output
 			</{$icontag}>";
-		if ( $captiontag && trim($attachment->post_excerpt) ) {
+		if ($captiontag && trim($attachment->post_excerpt)) {
 			$output .= "
 				<{$captiontag} class='wp-caption-text gallery-caption' id='$selector-$id'>
-				" . wptexturize($attachment->post_excerpt) . "
+				".wptexturize($attachment->post_excerpt)."
 				</{$captiontag}>";
 		}
 		$output .= "</{$itemtag}>";
-		if ( ! $html5 && $columns > 0 && ++$i % $columns == 0 ) {
+		if ( ! $html5 && $columns > 0 && ++$i % $columns == 0) {
 			$output .= '<br style="clear: both" />';
 		}
 	}
 
-	if ( ! $html5 && $columns > 0 && $i % $columns !== 0 ) {
+	if ( ! $html5 && $columns > 0 && $i % $columns !== 0) {
 		$output .= "
 			<br style='clear: both' />";
 	}
@@ -1761,7 +1761,7 @@ 
 	<div class="wp-playlist-caption">
 		<span class="wp-playlist-item-meta wp-playlist-item-title"><?php
 			/* translators: playlist item title */
-			printf( _x( '&#8220;%s&#8221;', 'playlist item title' ), '{{ data.title }}' );
+			printf(_x('&#8220;%s&#8221;', 'playlist item title'), '{{ data.title }}');
 		?></span>
 		<# if ( data.meta.album ) { #><span class="wp-playlist-item-meta wp-playlist-item-album">{{ data.meta.album }}</span><# } #>
 		<# if ( data.meta.artist ) { #><span class="wp-playlist-item-meta wp-playlist-item-artist">{{ data.meta.artist }}</span><# } #>
@@ -1776,7 +1776,7 @@ 
 			<# } else { #>
 				<span class="wp-playlist-item-title"><?php
 					/* translators: playlist item title */
-					printf( _x( '&#8220;%s&#8221;', 'playlist item title' ), '{{{ data.title }}}' );
+					printf(_x('&#8220;%s&#8221;', 'playlist item title'), '{{{ data.title }}}');
 				?></span>
 				<# if ( data.artists && data.meta.artist ) { #>
 				<span class="wp-playlist-item-artist"> &mdash; {{ data.meta.artist }}</span>
@@ -1798,14 +1798,14 @@ 
  *
  * @param string $type Type of playlist. Accepts 'audio' or 'video'.
  */
-function wp_playlist_scripts( $type ) {
-	wp_enqueue_style( 'wp-mediaelement' );
-	wp_enqueue_script( 'wp-playlist' );
+function wp_playlist_scripts($type) {
+	wp_enqueue_style('wp-mediaelement');
+	wp_enqueue_script('wp-playlist');
 ?>
-<!--[if lt IE 9]><script>document.createElement('<?php echo esc_js( $type ) ?>');</script><![endif]-->
+<!--[if lt IE 9]><script>document.createElement('<?php echo esc_js($type) ?>');</script><![endif]-->
 <?php
-	add_action( 'wp_footer', 'wp_underscore_playlist_templates', 0 );
-	add_action( 'admin_footer', 'wp_underscore_playlist_templates', 0 );
+	add_action('wp_footer', 'wp_underscore_playlist_templates', 0);
+	add_action('admin_footer', 'wp_underscore_playlist_templates', 0);
 }
 
 /**
@@ -1845,16 +1845,16 @@ 
  *
  * @return string Playlist output. Empty string if the passed type is unsupported.
  */
-function wp_playlist_shortcode( $attr ) {
+function wp_playlist_shortcode($attr) {
 	global $content_width;
 	$post = get_post();
 
 	static $instance = 0;
 	$instance++;
 
-	if ( ! empty( $attr['ids'] ) ) {
+	if ( ! empty($attr['ids'])) {
 		// 'ids' is explicitly ordered, unless you specify otherwise.
-		if ( empty( $attr['orderby'] ) ) {
+		if (empty($attr['orderby'])) {
 			$attr['orderby'] = 'post__in';
 		}
 		$attr['include'] = $attr['ids'];
@@ -1873,12 +1873,12 @@ 
 	 * @param array  $attr     An array of shortcode attributes.
 	 * @param int    $instance Unique numeric ID of this playlist shortcode instance.
 	 */
-	$output = apply_filters( 'post_playlist', '', $attr, $instance );
-	if ( $output != '' ) {
+	$output = apply_filters('post_playlist', '', $attr, $instance);
+	if ($output != '') {
 		return $output;
 	}
 
-	$atts = shortcode_atts( array(
+	$atts = shortcode_atts(array(
 		'type'		=> 'audio',
 		'order'		=> 'ASC',
 		'orderby'	=> 'menu_order ID',
@@ -1890,11 +1890,11 @@ 
 		'tracknumbers' => true,
 		'images'	=> true,
 		'artists'	=> true
-	), $attr, 'playlist' );
+	), $attr, 'playlist');
 
-	$id = intval( $atts['id'] );
+	$id = intval($atts['id']);
 
-	if ( $atts['type'] !== 'audio' ) {
+	if ($atts['type'] !== 'audio') {
 		$atts['type'] = 'video';
 	}
 
@@ -1906,31 +1906,31 @@ 
 		'orderby' => $atts['orderby']
 	);
 
-	if ( ! empty( $atts['include'] ) ) {
+	if ( ! empty($atts['include'])) {
 		$args['include'] = $atts['include'];
-		$_attachments = get_posts( $args );
+		$_attachments = get_posts($args);
 
 		$attachments = array();
-		foreach ( $_attachments as $key => $val ) {
+		foreach ($_attachments as $key => $val) {
 			$attachments[$val->ID] = $_attachments[$key];
 		}
-	} elseif ( ! empty( $atts['exclude'] ) ) {
+	} elseif ( ! empty($atts['exclude'])) {
 		$args['post_parent'] = $id;
 		$args['exclude'] = $atts['exclude'];
-		$attachments = get_children( $args );
+		$attachments = get_children($args);
 	} else {
 		$args['post_parent'] = $id;
-		$attachments = get_children( $args );
+		$attachments = get_children($args);
 	}
 
-	if ( empty( $attachments ) ) {
+	if (empty($attachments)) {
 		return '';
 	}
 
-	if ( is_feed() ) {
+	if (is_feed()) {
 		$output = "\n";
-		foreach ( $attachments as $att_id => $attachment ) {
-			$output .= wp_get_attachment_link( $att_id ) . "\n";
+		foreach ($attachments as $att_id => $attachment) {
+			$output .= wp_get_attachment_link($att_id)."\n";
 		}
 		return $output;
 	}
@@ -1940,22 +1940,22 @@ 
 	$default_width = 640;
 	$default_height = 360;
 
-	$theme_width = empty( $content_width ) ? $default_width : ( $content_width - $outer );
-	$theme_height = empty( $content_width ) ? $default_height : round( ( $default_height * $theme_width ) / $default_width );
+	$theme_width = empty($content_width) ? $default_width : ($content_width - $outer);
+	$theme_height = empty($content_width) ? $default_height : round(($default_height * $theme_width) / $default_width);
 
 	$data = array(
 		'type' => $atts['type'],
 		// don't pass strings to JSON, will be truthy in JS
-		'tracklist' => wp_validate_boolean( $atts['tracklist'] ),
-		'tracknumbers' => wp_validate_boolean( $atts['tracknumbers'] ),
-		'images' => wp_validate_boolean( $atts['images'] ),
-		'artists' => wp_validate_boolean( $atts['artists'] ),
+		'tracklist' => wp_validate_boolean($atts['tracklist']),
+		'tracknumbers' => wp_validate_boolean($atts['tracknumbers']),
+		'images' => wp_validate_boolean($atts['images']),
+		'artists' => wp_validate_boolean($atts['artists']),
 	);
 
 	$tracks = array();
-	foreach ( $attachments as $attachment ) {
-		$url = wp_get_attachment_url( $attachment->ID );
-		$ftype = wp_check_filetype( $url, wp_get_mime_types() );
+	foreach ($attachments as $attachment) {
+		$url = wp_get_attachment_url($attachment->ID);
+		$ftype = wp_check_filetype($url, wp_get_mime_types());
 		$track = array(
 			'src' => $url,
 			'type' => $ftype['type'],
@@ -1965,27 +1965,27 @@ 
 		);
 
 		$track['meta'] = array();
-		$meta = wp_get_attachment_metadata( $attachment->ID );
-		if ( ! empty( $meta ) ) {
+		$meta = wp_get_attachment_metadata($attachment->ID);
+		if ( ! empty($meta)) {
 
-			foreach ( wp_get_attachment_id3_keys( $attachment ) as $key => $label ) {
-				if ( ! empty( $meta[ $key ] ) ) {
-					$track['meta'][ $key ] = $meta[ $key ];
+			foreach (wp_get_attachment_id3_keys($attachment) as $key => $label) {
+				if ( ! empty($meta[$key])) {
+					$track['meta'][$key] = $meta[$key];
 				}
 			}
 
-			if ( 'video' === $atts['type'] ) {
-				if ( ! empty( $meta['width'] ) && ! empty( $meta['height'] ) ) {
+			if ('video' === $atts['type']) {
+				if ( ! empty($meta['width']) && ! empty($meta['height'])) {
 					$width = $meta['width'];
 					$height = $meta['height'];
-					$theme_height = round( ( $height * $theme_width ) / $width );
+					$theme_height = round(($height * $theme_width) / $width);
 				} else {
 					$width = $default_width;
 					$height = $default_height;
 				}
 
 				$track['dimensions'] = array(
-					'original' => compact( 'width', 'height' ),
+					'original' => compact('width', 'height'),
 					'resized' => array(
 						'width' => $theme_width,
 						'height' => $theme_height
@@ -1994,19 +1994,19 @@ 
 			}
 		}
 
-		if ( $atts['images'] ) {
-			$thumb_id = get_post_thumbnail_id( $attachment->ID );
-			if ( ! empty( $thumb_id ) ) {
-				list( $src, $width, $height ) = wp_get_attachment_image_src( $thumb_id, 'full' );
-				$track['image'] = compact( 'src', 'width', 'height' );
-				list( $src, $width, $height ) = wp_get_attachment_image_src( $thumb_id, 'thumbnail' );
-				$track['thumb'] = compact( 'src', 'width', 'height' );
+		if ($atts['images']) {
+			$thumb_id = get_post_thumbnail_id($attachment->ID);
+			if ( ! empty($thumb_id)) {
+				list($src, $width, $height) = wp_get_attachment_image_src($thumb_id, 'full');
+				$track['image'] = compact('src', 'width', 'height');
+				list($src, $width, $height) = wp_get_attachment_image_src($thumb_id, 'thumbnail');
+				$track['thumb'] = compact('src', 'width', 'height');
 			} else {
-				$src = wp_mime_type_icon( $attachment->ID );
+				$src = wp_mime_type_icon($attachment->ID);
 				$width = 48;
 				$height = 64;
-				$track['image'] = compact( 'src', 'width', 'height' );
-				$track['thumb'] = compact( 'src', 'width', 'height' );
+				$track['image'] = compact('src', 'width', 'height');
+				$track['thumb'] = compact('src', 'width', 'height');
 			}
 		}
 
@@ -2014,12 +2014,12 @@ 
 	}
 	$data['tracks'] = $tracks;
 
-	$safe_type = esc_attr( $atts['type'] );
-	$safe_style = esc_attr( $atts['style'] );
+	$safe_type = esc_attr($atts['type']);
+	$safe_style = esc_attr($atts['style']);
 
 	ob_start();
 
-	if ( 1 === $instance ) {
+	if (1 === $instance) {
 		/**
 		 * Print and enqueue playlist scripts, styles, and JavaScript templates.
 		 *
@@ -2028,15 +2028,15 @@ 
 		 * @param string $type  Type of playlist. Possible values are 'audio' or 'video'.
 		 * @param string $style The 'theme' for the playlist. Core provides 'light' and 'dark'.
 		 */
-		do_action( 'wp_playlist_scripts', $atts['type'], $atts['style'] );
+		do_action('wp_playlist_scripts', $atts['type'], $atts['style']);
 	} ?>
 <div class="wp-playlist wp-<?php echo $safe_type ?>-playlist wp-playlist-<?php echo $safe_style ?>">
-	<?php if ( 'audio' === $atts['type'] ): ?>
+	<?php if ('audio' === $atts['type']): ?>
 	<div class="wp-playlist-current-item"></div>
 	<?php endif ?>
 	<<?php echo $safe_type ?> controls="controls" preload="none" width="<?php
 		echo (int) $theme_width;
-	?>"<?php if ( 'video' === $safe_type ):
+	?>"<?php if ('video' === $safe_type):
 		echo ' height="', (int) $theme_height, '"';
 	else:
 		echo ' style="visibility: hidden"';
@@ -2045,17 +2045,17 @@ 
 	<div class="wp-playlist-prev"></div>
 	<noscript>
 	<ol><?php
-	foreach ( $attachments as $att_id => $attachment ) {
-		printf( '<li>%s</li>', wp_get_attachment_link( $att_id ) );
+	foreach ($attachments as $att_id => $attachment) {
+		printf('<li>%s</li>', wp_get_attachment_link($att_id));
 	}
 	?></ol>
 	</noscript>
-	<script type="application/json" class="wp-playlist-script"><?php echo wp_json_encode( $data ) ?></script>
+	<script type="application/json" class="wp-playlist-script"><?php echo wp_json_encode($data) ?></script>
 </div>
 	<?php
 	return ob_get_clean();
 }
-add_shortcode( 'playlist', 'wp_playlist_shortcode' );
+add_shortcode('playlist', 'wp_playlist_shortcode');
 
 /**
  * Provides a No-JS Flash fallback as a last resort for audio / video.
@@ -2065,7 +2065,7 @@ 
  * @param string $url The media element URL.
  * @return string Fallback HTML.
  */
-function wp_mediaelement_fallback( $url ) {
+function wp_mediaelement_fallback($url) {
 	/**
 	 * Filter the Mediaelement fallback output for no-JS.
 	 *
@@ -2074,7 +2074,7 @@ 
 	 * @param string $output Fallback output for no-JS.
 	 * @param string $url    Media file URL.
 	 */
-	return apply_filters( 'wp_mediaelement_fallback', sprintf( '<a href="%1$s">%1$s</a>', esc_url( $url ) ), $url );
+	return apply_filters('wp_mediaelement_fallback', sprintf('<a href="%1$s">%1$s</a>', esc_url($url)), $url);
 }
 
 /**
@@ -2093,7 +2093,7 @@ 
 	 * @param array $extensions An array of support audio formats. Defaults are
 	 *                          'mp3', 'ogg', 'wma', 'm4a', 'wav'.
 	 */
-	return apply_filters( 'wp_audio_extensions', array( 'mp3', 'ogg', 'wma', 'm4a', 'wav' ) );
+	return apply_filters('wp_audio_extensions', array('mp3', 'ogg', 'wma', 'm4a', 'wav'));
 }
 
 /**
@@ -2105,19 +2105,19 @@ 
  * @param string  $context    Optional. The context. Accepts 'edit', 'display'. Default 'display'.
  * @return array Key/value pairs of field keys to labels.
  */
-function wp_get_attachment_id3_keys( $attachment, $context = 'display' ) {
+function wp_get_attachment_id3_keys($attachment, $context = 'display') {
 	$fields = array(
-		'artist' => __( 'Artist' ),
-		'album' => __( 'Album' ),
+		'artist' => __('Artist'),
+		'album' => __('Album'),
 	);
 
-	if ( 'display' === $context ) {
-		$fields['genre']            = __( 'Genre' );
-		$fields['year']             = __( 'Year' );
-		$fields['length_formatted'] = _x( 'Length', 'video or audio' );
-	} elseif ( 'js' === $context ) {
-		$fields['bitrate']          = __( 'Bitrate' );
-		$fields['bitrate_mode']     = __( 'Bitrate Mode' );
+	if ('display' === $context) {
+		$fields['genre']            = __('Genre');
+		$fields['year']             = __('Year');
+		$fields['length_formatted'] = _x('Length', 'video or audio');
+	} elseif ('js' === $context) {
+		$fields['bitrate']          = __('Bitrate');
+		$fields['bitrate_mode']     = __('Bitrate Mode');
 	}
 
 	/**
@@ -2129,7 +2129,7 @@ 
 	 * @param WP_Post $attachment Attachment object.
 	 * @param string  $context    The context. Accepts 'edit', 'display'. Default 'display'.
 	 */
-	return apply_filters( 'wp_get_attachment_id3_keys', $fields, $attachment, $context );
+	return apply_filters('wp_get_attachment_id3_keys', $fields, $attachment, $context);
 }
 /**
  * Builds the Audio shortcode output.
@@ -2154,7 +2154,7 @@ 
  * @param string $content Shortcode content.
  * @return string|void HTML content to display audio.
  */
-function wp_audio_shortcode( $attr, $content = '' ) {
+function wp_audio_shortcode($attr, $content = '') {
 	$post_id = get_post() ? get_the_ID() : 0;
 
 	static $instance = 0;
@@ -2172,8 +2172,8 @@ 
 	 * @param string $content  Shortcode content.
 	 * @param int    $instance Unique numeric ID of this audio shortcode instance.
 	 */
-	$override = apply_filters( 'wp_audio_shortcode_override', '', $attr, $content, $instance );
-	if ( '' !== $override ) {
+	$override = apply_filters('wp_audio_shortcode_override', '', $attr, $content, $instance);
+	if ('' !== $override) {
 		return $override;
 	}
 
@@ -2188,44 +2188,44 @@ 
 		'class'    => 'wp-audio-shortcode',
 		'style'    => 'width: 100%; visibility: hidden;'
 	);
-	foreach ( $default_types as $type ) {
+	foreach ($default_types as $type) {
 		$defaults_atts[$type] = '';
 	}
 
-	$atts = shortcode_atts( $defaults_atts, $attr, 'audio' );
+	$atts = shortcode_atts($defaults_atts, $attr, 'audio');
 
 	$primary = false;
-	if ( ! empty( $atts['src'] ) ) {
-		$type = wp_check_filetype( $atts['src'], wp_get_mime_types() );
-		if ( ! in_array( strtolower( $type['ext'] ), $default_types ) ) {
-			return sprintf( '<a class="wp-embedded-audio" href="%s">%s</a>', esc_url( $atts['src'] ), esc_html( $atts['src'] ) );
+	if ( ! empty($atts['src'])) {
+		$type = wp_check_filetype($atts['src'], wp_get_mime_types());
+		if ( ! in_array(strtolower($type['ext']), $default_types)) {
+			return sprintf('<a class="wp-embedded-audio" href="%s">%s</a>', esc_url($atts['src']), esc_html($atts['src']));
 		}
 		$primary = true;
-		array_unshift( $default_types, 'src' );
+		array_unshift($default_types, 'src');
 	} else {
-		foreach ( $default_types as $ext ) {
-			if ( ! empty( $atts[ $ext ] ) ) {
-				$type = wp_check_filetype( $atts[ $ext ], wp_get_mime_types() );
-				if ( strtolower( $type['ext'] ) === $ext ) {
+		foreach ($default_types as $ext) {
+			if ( ! empty($atts[$ext])) {
+				$type = wp_check_filetype($atts[$ext], wp_get_mime_types());
+				if (strtolower($type['ext']) === $ext) {
 					$primary = true;
 				}
 			}
 		}
 	}
 
-	if ( ! $primary ) {
-		$audios = get_attached_media( 'audio', $post_id );
-		if ( empty( $audios ) ) {
+	if ( ! $primary) {
+		$audios = get_attached_media('audio', $post_id);
+		if (empty($audios)) {
 			return;
 		}
 
-		$audio = reset( $audios );
-		$atts['src'] = wp_get_attachment_url( $audio->ID );
-		if ( empty( $atts['src'] ) ) {
+		$audio = reset($audios);
+		$atts['src'] = wp_get_attachment_url($audio->ID);
+		if (empty($atts['src'])) {
 			return;
 		}
 
-		array_unshift( $default_types, 'src' );
+		array_unshift($default_types, 'src');
 	}
 
 	/**
@@ -2235,10 +2235,10 @@ 
 	 *
 	 * @param string $library Media library used for the audio shortcode.
 	 */
-	$library = apply_filters( 'wp_audio_shortcode_library', 'mediaelement' );
-	if ( 'mediaelement' === $library && did_action( 'init' ) ) {
-		wp_enqueue_style( 'wp-mediaelement' );
-		wp_enqueue_script( 'wp-mediaelement' );
+	$library = apply_filters('wp_audio_shortcode_library', 'mediaelement');
+	if ('mediaelement' === $library && did_action('init')) {
+		wp_enqueue_style('wp-mediaelement');
+		wp_enqueue_script('wp-mediaelement');
 	}
 
 	/**
@@ -2248,50 +2248,50 @@ 
 	 *
 	 * @param string $class CSS class or list of space-separated classes.
 	 */
-	$atts['class'] = apply_filters( 'wp_audio_shortcode_class', $atts['class'] );
+	$atts['class'] = apply_filters('wp_audio_shortcode_class', $atts['class']);
 
 	$html_atts = array(
 		'class'    => $atts['class'],
-		'id'       => sprintf( 'audio-%d-%d', $post_id, $instance ),
-		'loop'     => wp_validate_boolean( $atts['loop'] ),
-		'autoplay' => wp_validate_boolean( $atts['autoplay'] ),
+		'id'       => sprintf('audio-%d-%d', $post_id, $instance),
+		'loop'     => wp_validate_boolean($atts['loop']),
+		'autoplay' => wp_validate_boolean($atts['autoplay']),
 		'preload'  => $atts['preload'],
 		'style'    => $atts['style'],
 	);
 
 	// These ones should just be omitted altogether if they are blank
-	foreach ( array( 'loop', 'autoplay', 'preload' ) as $a ) {
-		if ( empty( $html_atts[$a] ) ) {
-			unset( $html_atts[$a] );
+	foreach (array('loop', 'autoplay', 'preload') as $a) {
+		if (empty($html_atts[$a])) {
+			unset($html_atts[$a]);
 		}
 	}
 
 	$attr_strings = array();
-	foreach ( $html_atts as $k => $v ) {
-		$attr_strings[] = $k . '="' . esc_attr( $v ) . '"';
+	foreach ($html_atts as $k => $v) {
+		$attr_strings[] = $k.'="'.esc_attr($v).'"';
 	}
 
 	$html = '';
-	if ( 'mediaelement' === $library && 1 === $instance ) {
+	if ('mediaelement' === $library && 1 === $instance) {
 		$html .= "<!--[if lt IE 9]><script>document.createElement('audio');</script><![endif]-->\n";
 	}
-	$html .= sprintf( '<audio %s controls="controls">', join( ' ', $attr_strings ) );
+	$html .= sprintf('<audio %s controls="controls">', join(' ', $attr_strings));
 
 	$fileurl = '';
 	$source = '<source type="%s" src="%s" />';
-	foreach ( $default_types as $fallback ) {
-		if ( ! empty( $atts[ $fallback ] ) ) {
-			if ( empty( $fileurl ) ) {
-				$fileurl = $atts[ $fallback ];
+	foreach ($default_types as $fallback) {
+		if ( ! empty($atts[$fallback])) {
+			if (empty($fileurl)) {
+				$fileurl = $atts[$fallback];
 			}
-			$type = wp_check_filetype( $atts[ $fallback ], wp_get_mime_types() );
-			$url = add_query_arg( '_', $instance, $atts[ $fallback ] );
-			$html .= sprintf( $source, $type['type'], esc_url( $url ) );
+			$type = wp_check_filetype($atts[$fallback], wp_get_mime_types());
+			$url = add_query_arg('_', $instance, $atts[$fallback]);
+			$html .= sprintf($source, $type['type'], esc_url($url));
 		}
 	}
 
-	if ( 'mediaelement' === $library ) {
-		$html .= wp_mediaelement_fallback( $fileurl );
+	if ('mediaelement' === $library) {
+		$html .= wp_mediaelement_fallback($fileurl);
 	}
 	$html .= '</audio>';
 
@@ -2306,9 +2306,9 @@ 
 	 * @param int    $post_id Post ID.
 	 * @param string $library Media library used for the audio shortcode.
 	 */
-	return apply_filters( 'wp_audio_shortcode', $html, $atts, $audio, $post_id, $library );
+	return apply_filters('wp_audio_shortcode', $html, $atts, $audio, $post_id, $library);
 }
-add_shortcode( 'audio', 'wp_audio_shortcode' );
+add_shortcode('audio', 'wp_audio_shortcode');
 
 /**
  * Returns a filtered list of WP-supported video formats.
@@ -2326,7 +2326,7 @@ 
 	 * @param array $extensions An array of support video formats. Defaults are
 	 *                          'mp4', 'm4v', 'webm', 'ogv', 'wmv', 'flv'.
 	 */
-	return apply_filters( 'wp_video_extensions', array( 'mp4', 'm4v', 'webm', 'ogv', 'wmv', 'flv' ) );
+	return apply_filters('wp_video_extensions', array('mp4', 'm4v', 'webm', 'ogv', 'wmv', 'flv'));
 }
 
 /**
@@ -2357,7 +2357,7 @@ 
  * @param string $content Shortcode content.
  * @return string|void HTML content to display video.
  */
-function wp_video_shortcode( $attr, $content = '' ) {
+function wp_video_shortcode($attr, $content = '') {
 	global $content_width;
 	$post_id = get_post() ? get_the_ID() : 0;
 
@@ -2379,8 +2379,8 @@ 
 	 * @param string $content  Video shortcode content.
 	 * @param int    $instance Unique numeric ID of this video shortcode instance.
 	 */
-	$override = apply_filters( 'wp_video_shortcode_override', '', $attr, $content, $instance );
-	if ( '' !== $override ) {
+	$override = apply_filters('wp_video_shortcode_override', '', $attr, $content, $instance);
+	if ('' !== $override) {
 		return $override;
 	}
 
@@ -2398,22 +2398,22 @@ 
 		'class'    => 'wp-video-shortcode',
 	);
 
-	foreach ( $default_types as $type ) {
+	foreach ($default_types as $type) {
 		$defaults_atts[$type] = '';
 	}
 
-	$atts = shortcode_atts( $defaults_atts, $attr, 'video' );
+	$atts = shortcode_atts($defaults_atts, $attr, 'video');
 
-	if ( is_admin() ) {
+	if (is_admin()) {
 		// shrink the video so it isn't huge in the admin
-		if ( $atts['width'] > $defaults_atts['width'] ) {
-			$atts['height'] = round( ( $atts['height'] * $defaults_atts['width'] ) / $atts['width'] );
+		if ($atts['width'] > $defaults_atts['width']) {
+			$atts['height'] = round(($atts['height'] * $defaults_atts['width']) / $atts['width']);
 			$atts['width'] = $defaults_atts['width'];
 		}
 	} else {
 		// if the video is bigger than the theme
-		if ( ! empty( $content_width ) && $atts['width'] > $content_width ) {
-			$atts['height'] = round( ( $atts['height'] * $content_width ) / $atts['width'] );
+		if ( ! empty($content_width) && $atts['width'] > $content_width) {
+			$atts['height'] = round(($atts['height'] * $content_width) / $atts['width']);
 			$atts['width'] = $content_width;
 		}
 	}
@@ -2423,46 +2423,46 @@ 
 	$vimeo_pattern = '#^https?://(.+\.)?vimeo\.com/.*#';
 
 	$primary = false;
-	if ( ! empty( $atts['src'] ) ) {
-		$is_vimeo = ( preg_match( $vimeo_pattern, $atts['src'] ) );
-		$is_youtube = (  preg_match( $yt_pattern, $atts['src'] ) );
-		if ( ! $is_youtube && ! $is_vimeo ) {
-			$type = wp_check_filetype( $atts['src'], wp_get_mime_types() );
-			if ( ! in_array( strtolower( $type['ext'] ), $default_types ) ) {
-				return sprintf( '<a class="wp-embedded-video" href="%s">%s</a>', esc_url( $atts['src'] ), esc_html( $atts['src'] ) );
+	if ( ! empty($atts['src'])) {
+		$is_vimeo = (preg_match($vimeo_pattern, $atts['src']));
+		$is_youtube = (preg_match($yt_pattern, $atts['src']));
+		if ( ! $is_youtube && ! $is_vimeo) {
+			$type = wp_check_filetype($atts['src'], wp_get_mime_types());
+			if ( ! in_array(strtolower($type['ext']), $default_types)) {
+				return sprintf('<a class="wp-embedded-video" href="%s">%s</a>', esc_url($atts['src']), esc_html($atts['src']));
 			}
 		}
 
-		if ( $is_vimeo ) {
-			wp_enqueue_script( 'froogaloop' );
+		if ($is_vimeo) {
+			wp_enqueue_script('froogaloop');
 		}
 
 		$primary = true;
-		array_unshift( $default_types, 'src' );
+		array_unshift($default_types, 'src');
 	} else {
-		foreach ( $default_types as $ext ) {
-			if ( ! empty( $atts[ $ext ] ) ) {
-				$type = wp_check_filetype( $atts[ $ext ], wp_get_mime_types() );
-				if ( strtolower( $type['ext'] ) === $ext ) {
+		foreach ($default_types as $ext) {
+			if ( ! empty($atts[$ext])) {
+				$type = wp_check_filetype($atts[$ext], wp_get_mime_types());
+				if (strtolower($type['ext']) === $ext) {
 					$primary = true;
 				}
 			}
 		}
 	}
 
-	if ( ! $primary ) {
-		$videos = get_attached_media( 'video', $post_id );
-		if ( empty( $videos ) ) {
+	if ( ! $primary) {
+		$videos = get_attached_media('video', $post_id);
+		if (empty($videos)) {
 			return;
 		}
 
-		$video = reset( $videos );
-		$atts['src'] = wp_get_attachment_url( $video->ID );
-		if ( empty( $atts['src'] ) ) {
+		$video = reset($videos);
+		$atts['src'] = wp_get_attachment_url($video->ID);
+		if (empty($atts['src'])) {
 			return;
 		}
 
-		array_unshift( $default_types, 'src' );
+		array_unshift($default_types, 'src');
 	}
 
 	/**
@@ -2472,10 +2472,10 @@ 
 	 *
 	 * @param string $library Media library used for the video shortcode.
 	 */
-	$library = apply_filters( 'wp_video_shortcode_library', 'mediaelement' );
-	if ( 'mediaelement' === $library && did_action( 'init' ) ) {
-		wp_enqueue_style( 'wp-mediaelement' );
-		wp_enqueue_script( 'wp-mediaelement' );
+	$library = apply_filters('wp_video_shortcode_library', 'mediaelement');
+	if ('mediaelement' === $library && did_action('init')) {
+		wp_enqueue_style('wp-mediaelement');
+		wp_enqueue_script('wp-mediaelement');
 	}
 
 	/**
@@ -2485,73 +2485,73 @@ 
 	 *
 	 * @param string $class CSS class or list of space-separated classes.
 	 */
-	$atts['class'] = apply_filters( 'wp_video_shortcode_class', $atts['class'] );
+	$atts['class'] = apply_filters('wp_video_shortcode_class', $atts['class']);
 
 	$html_atts = array(
 		'class'    => $atts['class'],
-		'id'       => sprintf( 'video-%d-%d', $post_id, $instance ),
-		'width'    => absint( $atts['width'] ),
-		'height'   => absint( $atts['height'] ),
-		'poster'   => esc_url( $atts['poster'] ),
-		'loop'     => wp_validate_boolean( $atts['loop'] ),
-		'autoplay' => wp_validate_boolean( $atts['autoplay'] ),
+		'id'       => sprintf('video-%d-%d', $post_id, $instance),
+		'width'    => absint($atts['width']),
+		'height'   => absint($atts['height']),
+		'poster'   => esc_url($atts['poster']),
+		'loop'     => wp_validate_boolean($atts['loop']),
+		'autoplay' => wp_validate_boolean($atts['autoplay']),
 		'preload'  => $atts['preload'],
 	);
 
 	// These ones should just be omitted altogether if they are blank
-	foreach ( array( 'poster', 'loop', 'autoplay', 'preload' ) as $a ) {
-		if ( empty( $html_atts[$a] ) ) {
-			unset( $html_atts[$a] );
+	foreach (array('poster', 'loop', 'autoplay', 'preload') as $a) {
+		if (empty($html_atts[$a])) {
+			unset($html_atts[$a]);
 		}
 	}
 
 	$attr_strings = array();
-	foreach ( $html_atts as $k => $v ) {
-		$attr_strings[] = $k . '="' . esc_attr( $v ) . '"';
+	foreach ($html_atts as $k => $v) {
+		$attr_strings[] = $k.'="'.esc_attr($v).'"';
 	}
 
 	$html = '';
-	if ( 'mediaelement' === $library && 1 === $instance ) {
+	if ('mediaelement' === $library && 1 === $instance) {
 		$html .= "<!--[if lt IE 9]><script>document.createElement('video');</script><![endif]-->\n";
 	}
-	$html .= sprintf( '<video %s controls="controls">', join( ' ', $attr_strings ) );
+	$html .= sprintf('<video %s controls="controls">', join(' ', $attr_strings));
 
 	$fileurl = '';
 	$source = '<source type="%s" src="%s" />';
-	foreach ( $default_types as $fallback ) {
-		if ( ! empty( $atts[ $fallback ] ) ) {
-			if ( empty( $fileurl ) ) {
-				$fileurl = $atts[ $fallback ];
+	foreach ($default_types as $fallback) {
+		if ( ! empty($atts[$fallback])) {
+			if (empty($fileurl)) {
+				$fileurl = $atts[$fallback];
 			}
-			if ( 'src' === $fallback && $is_youtube ) {
-				$type = array( 'type' => 'video/youtube' );
-			} elseif ( 'src' === $fallback && $is_vimeo ) {
-				$type = array( 'type' => 'video/vimeo' );
+			if ('src' === $fallback && $is_youtube) {
+				$type = array('type' => 'video/youtube');
+			} elseif ('src' === $fallback && $is_vimeo) {
+				$type = array('type' => 'video/vimeo');
 			} else {
-				$type = wp_check_filetype( $atts[ $fallback ], wp_get_mime_types() );
+				$type = wp_check_filetype($atts[$fallback], wp_get_mime_types());
 			}
-			$url = add_query_arg( '_', $instance, $atts[ $fallback ] );
-			$html .= sprintf( $source, $type['type'], esc_url( $url ) );
+			$url = add_query_arg('_', $instance, $atts[$fallback]);
+			$html .= sprintf($source, $type['type'], esc_url($url));
 		}
 	}
 
-	if ( ! empty( $content ) ) {
-		if ( false !== strpos( $content, "\n" ) ) {
-			$content = str_replace( array( "\r\n", "\n", "\t" ), '', $content );
+	if ( ! empty($content)) {
+		if (false !== strpos($content, "\n")) {
+			$content = str_replace(array("\r\n", "\n", "\t"), '', $content);
 		}
-		$html .= trim( $content );
+		$html .= trim($content);
 	}
 
-	if ( 'mediaelement' === $library ) {
-		$html .= wp_mediaelement_fallback( $fileurl );
+	if ('mediaelement' === $library) {
+		$html .= wp_mediaelement_fallback($fileurl);
 	}
 	$html .= '</video>';
 
 	$width_rule = '';
-	if ( ! empty( $atts['width'] ) ) {
-		$width_rule = sprintf( 'width: %dpx; ', $atts['width'] );
+	if ( ! empty($atts['width'])) {
+		$width_rule = sprintf('width: %dpx; ', $atts['width']);
 	}
-	$output = sprintf( '<div style="%s" class="wp-video">%s</div>', $width_rule, $html );
+	$output = sprintf('<div style="%s" class="wp-video">%s</div>', $width_rule, $html);
 
 	/**
 	 * Filter the output of the video shortcode.
@@ -2564,9 +2564,9 @@ 
 	 * @param int    $post_id Post ID.
 	 * @param string $library Media library used for the video shortcode.
 	 */
-	return apply_filters( 'wp_video_shortcode', $output, $atts, $video, $post_id, $library );
+	return apply_filters('wp_video_shortcode', $output, $atts, $video, $post_id, $library);
 }
-add_shortcode( 'video', 'wp_video_shortcode' );
+add_shortcode('video', 'wp_video_shortcode');
 
 /**
  * Displays previous image link that has the same post parent.
@@ -2580,7 +2580,7 @@ 
  *                           default to 'post_title' or `$text`. Default 'thumbnail'.
  * @param string       $text Optional. Link text. Default false.
  */
-function previous_image_link( $size = 'thumbnail', $text = false ) {
+function previous_image_link($size = 'thumbnail', $text = false) {
 	adjacent_image_link(true, $size, $text);
 }
 
@@ -2596,7 +2596,7 @@ 
  *                           default to 'post_title' or `$text`. Default 'thumbnail'.
  * @param string       $text Optional. Link text. Default false.
  */
-function next_image_link( $size = 'thumbnail', $text = false ) {
+function next_image_link($size = 'thumbnail', $text = false) {
 	adjacent_image_link(false, $size, $text);
 }
 
@@ -2612,12 +2612,12 @@ 
  *                           values in pixels (in that order). Default 'thumbnail'.
  * @param bool         $text Optional. Link text. Default false.
  */
-function adjacent_image_link( $prev = true, $size = 'thumbnail', $text = false ) {
+function adjacent_image_link($prev = true, $size = 'thumbnail', $text = false) {
 	$post = get_post();
-	$attachments = array_values( get_children( array( 'post_parent' => $post->post_parent, 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => 'ASC', 'orderby' => 'menu_order ID' ) ) );
+	$attachments = array_values(get_children(array('post_parent' => $post->post_parent, 'post_status' => 'inherit', 'post_type' => 'attachment', 'post_mime_type' => 'image', 'order' => 'ASC', 'orderby' => 'menu_order ID')));
 
-	foreach ( $attachments as $k => $attachment ) {
-		if ( $attachment->ID == $post->ID ) {
+	foreach ($attachments as $k => $attachment) {
+		if ($attachment->ID == $post->ID) {
 			break;
 		}
 	}
@@ -2625,12 +2625,12 @@ 
 	$output = '';
 	$attachment_id = 0;
 
-	if ( $attachments ) {
+	if ($attachments) {
 		$k = $prev ? $k - 1 : $k + 1;
 
-		if ( isset( $attachments[ $k ] ) ) {
-			$attachment_id = $attachments[ $k ]->ID;
-			$output = wp_get_attachment_link( $attachment_id, $size, true, false, $text );
+		if (isset($attachments[$k])) {
+			$attachment_id = $attachments[$k]->ID;
+			$output = wp_get_attachment_link($attachment_id, $size, true, false, $text);
 		}
 	}
 
@@ -2649,7 +2649,7 @@ 
 	 * @param string $size          Image size.
 	 * @param string $text          Link text.
 	 */
-	echo apply_filters( "{$adjacent}_image_link", $output, $attachment_id, $size, $text );
+	echo apply_filters("{$adjacent}_image_link", $output, $attachment_id, $size, $text);
 }
 
 /**
@@ -2660,33 +2660,33 @@ 
  * @param int|array|object $attachment Attachment ID, data array, or data object.
  * @return array Empty array on failure. List of taxonomies on success.
  */
-function get_attachment_taxonomies( $attachment ) {
-	if ( is_int( $attachment ) ) {
-		$attachment = get_post( $attachment );
-	} elseif ( is_array( $attachment ) ) {
+function get_attachment_taxonomies($attachment) {
+	if (is_int($attachment)) {
+		$attachment = get_post($attachment);
+	} elseif (is_array($attachment)) {
 		$attachment = (object) $attachment;
 	}
-	if ( ! is_object($attachment) )
+	if ( ! is_object($attachment))
 		return array();
 
-	$file = get_attached_file( $attachment->ID );
-	$filename = basename( $file );
+	$file = get_attached_file($attachment->ID);
+	$filename = basename($file);
 
 	$objects = array('attachment');
 
-	if ( false !== strpos($filename, '.') )
-		$objects[] = 'attachment:' . substr($filename, strrpos($filename, '.') + 1);
-	if ( !empty($attachment->post_mime_type) ) {
-		$objects[] = 'attachment:' . $attachment->post_mime_type;
-		if ( false !== strpos($attachment->post_mime_type, '/') )
-			foreach ( explode('/', $attachment->post_mime_type) as $token )
-				if ( !empty($token) )
+	if (false !== strpos($filename, '.'))
+		$objects[] = 'attachment:'.substr($filename, strrpos($filename, '.') + 1);
+	if ( ! empty($attachment->post_mime_type)) {
+		$objects[] = 'attachment:'.$attachment->post_mime_type;
+		if (false !== strpos($attachment->post_mime_type, '/'))
+			foreach (explode('/', $attachment->post_mime_type) as $token)
+				if ( ! empty($token))
 					$objects[] = "attachment:$token";
 	}
 
 	$taxonomies = array();
-	foreach ( $objects as $object )
-		if ( $taxes = get_object_taxonomies($object) )
+	foreach ($objects as $object)
+		if ($taxes = get_object_taxonomies($object))
 			$taxonomies = array_merge($taxonomies, $taxes);
 
 	return array_unique($taxonomies);
@@ -2705,15 +2705,15 @@ 
  *                       Default 'names'.
  * @return array The names of all taxonomy of $object_type.
  */
-function get_taxonomies_for_attachments( $output = 'names' ) {
+function get_taxonomies_for_attachments($output = 'names') {
 	$taxonomies = array();
-	foreach ( get_taxonomies( array(), 'objects' ) as $taxonomy ) {
-		foreach ( $taxonomy->object_type as $object_type ) {
-			if ( 'attachment' == $object_type || 0 === strpos( $object_type, 'attachment:' ) ) {
-				if ( 'names' == $output )
+	foreach (get_taxonomies(array(), 'objects') as $taxonomy) {
+		foreach ($taxonomy->object_type as $object_type) {
+			if ('attachment' == $object_type || 0 === strpos($object_type, 'attachment:')) {
+				if ('names' == $output)
 					$taxonomies[] = $taxonomy->name;
 				else
-					$taxonomies[ $taxonomy->name ] = $taxonomy;
+					$taxonomies[$taxonomy->name] = $taxonomy;
 				break;
 			}
 		}
@@ -2735,7 +2735,7 @@ 
  */
 function wp_imagecreatetruecolor($width, $height) {
 	$img = imagecreatetruecolor($width, $height);
-	if ( is_resource($img) && function_exists('imagealphablending') && function_exists('imagesavealpha') ) {
+	if (is_resource($img) && function_exists('imagealphablending') && function_exists('imagesavealpha')) {
 		imagealphablending($img, false);
 		imagesavealpha($img, true);
 	}
@@ -2755,13 +2755,13 @@ 
  * @param int $max_height     The maximum allowed height.
  * @return array The maximum possible width and height based on the example ratio.
  */
-function wp_expand_dimensions( $example_width, $example_height, $max_width, $max_height ) {
+function wp_expand_dimensions($example_width, $example_height, $max_width, $max_height) {
 	$example_width  = (int) $example_width;
 	$example_height = (int) $example_height;
 	$max_width      = (int) $max_width;
 	$max_height     = (int) $max_height;
 
-	return wp_constrain_dimensions( $example_width * 1000000, $example_height * 1000000, $max_width, $max_height );
+	return wp_constrain_dimensions($example_width * 1000000, $example_height * 1000000, $max_width, $max_height);
 }
 
 /**
@@ -2772,15 +2772,15 @@ 
  * @param string $size A shorthand byte value.
  * @return int An integer byte value.
  */
-function wp_convert_hr_to_bytes( $size ) {
-	$size  = strtolower( $size );
+function wp_convert_hr_to_bytes($size) {
+	$size  = strtolower($size);
 	$bytes = (int) $size;
-	if ( strpos( $size, 'k' ) !== false )
-		$bytes = intval( $size ) * KB_IN_BYTES;
-	elseif ( strpos( $size, 'm' ) !== false )
+	if (strpos($size, 'k') !== false)
+		$bytes = intval($size) * KB_IN_BYTES;
+	elseif (strpos($size, 'm') !== false)
 		$bytes = intval($size) * MB_IN_BYTES;
-	elseif ( strpos( $size, 'g' ) !== false )
-		$bytes = intval( $size ) * GB_IN_BYTES;
+	elseif (strpos($size, 'g') !== false)
+		$bytes = intval($size) * GB_IN_BYTES;
 	return $bytes;
 }
 
@@ -2792,8 +2792,8 @@ 
  * @return int Allowed upload size.
  */
 function wp_max_upload_size() {
-	$u_bytes = wp_convert_hr_to_bytes( ini_get( 'upload_max_filesize' ) );
-	$p_bytes = wp_convert_hr_to_bytes( ini_get( 'post_max_size' ) );
+	$u_bytes = wp_convert_hr_to_bytes(ini_get('upload_max_filesize'));
+	$p_bytes = wp_convert_hr_to_bytes(ini_get('post_max_size'));
 
 	/**
 	 * Filter the maximum upload size allowed in php.ini.
@@ -2804,7 +2804,7 @@ 
 	 * @param int $u_bytes Maximum upload filesize in bytes.
 	 * @param int $p_bytes Maximum size of POST data in bytes.
 	 */
-	return apply_filters( 'upload_size_limit', min( $u_bytes, $p_bytes ), $u_bytes, $p_bytes );
+	return apply_filters('upload_size_limit', min($u_bytes, $p_bytes), $u_bytes, $p_bytes);
 }
 
 /**
@@ -2818,31 +2818,31 @@ 
  * @return WP_Image_Editor|WP_Error The WP_Image_Editor object if successful, an WP_Error
  *                                  object otherwise.
  */
-function wp_get_image_editor( $path, $args = array() ) {
+function wp_get_image_editor($path, $args = array()) {
 	$args['path'] = $path;
 
-	if ( ! isset( $args['mime_type'] ) ) {
-		$file_info = wp_check_filetype( $args['path'] );
+	if ( ! isset($args['mime_type'])) {
+		$file_info = wp_check_filetype($args['path']);
 
 		// If $file_info['type'] is false, then we let the editor attempt to
 		// figure out the file type, rather than forcing a failure based on extension.
-		if ( isset( $file_info ) && $file_info['type'] )
+		if (isset($file_info) && $file_info['type'])
 			$args['mime_type'] = $file_info['type'];
 	}
 
-	$implementation = _wp_image_editor_choose( $args );
+	$implementation = _wp_image_editor_choose($args);
 
-	if ( $implementation ) {
-		$editor = new $implementation( $path );
+	if ($implementation) {
+		$editor = new $implementation($path);
 		$loaded = $editor->load();
 
-		if ( is_wp_error( $loaded ) )
+		if (is_wp_error($loaded))
 			return $loaded;
 
 		return $editor;
 	}
 
-	return new WP_Error( 'image_no_editor', __('No editor could be selected.') );
+	return new WP_Error('image_no_editor', __('No editor could be selected.'));
 }
 
 /**
@@ -2854,8 +2854,8 @@ 
  *                           Default empty array.
  * @return bool True if an eligible editor is found; false otherwise.
  */
-function wp_image_editor_supports( $args = array() ) {
-	return (bool) _wp_image_editor_choose( $args );
+function wp_image_editor_supports($args = array()) {
+	return (bool) _wp_image_editor_choose($args);
 }
 
 /**
@@ -2868,10 +2868,10 @@ 
  * @return string|false Class name for the first editor that claims to support the request. False if no
  *                     editor claims to support the request.
  */
-function _wp_image_editor_choose( $args = array() ) {
-	require_once ABSPATH . WPINC . '/class-wp-image-editor.php';
-	require_once ABSPATH . WPINC . '/class-wp-image-editor-gd.php';
-	require_once ABSPATH . WPINC . '/class-wp-image-editor-imagick.php';
+function _wp_image_editor_choose($args = array()) {
+	require_once ABSPATH.WPINC.'/class-wp-image-editor.php';
+	require_once ABSPATH.WPINC.'/class-wp-image-editor-gd.php';
+	require_once ABSPATH.WPINC.'/class-wp-image-editor-imagick.php';
 
 	/**
 	 * Filter the list of image editing library classes.
@@ -2881,21 +2881,21 @@ 
 	 * @param array $image_editors List of available image editors. Defaults are
 	 *                             'WP_Image_Editor_Imagick', 'WP_Image_Editor_GD'.
 	 */
-	$implementations = apply_filters( 'wp_image_editors', array( 'WP_Image_Editor_Imagick', 'WP_Image_Editor_GD' ) );
+	$implementations = apply_filters('wp_image_editors', array('WP_Image_Editor_Imagick', 'WP_Image_Editor_GD'));
 
-	foreach ( $implementations as $implementation ) {
-		if ( ! call_user_func( array( $implementation, 'test' ), $args ) )
+	foreach ($implementations as $implementation) {
+		if ( ! call_user_func(array($implementation, 'test'), $args))
 			continue;
 
-		if ( isset( $args['mime_type'] ) &&
+		if (isset($args['mime_type']) &&
 			! call_user_func(
-				array( $implementation, 'supports_mime_type' ),
-				$args['mime_type'] ) ) {
+				array($implementation, 'supports_mime_type'),
+				$args['mime_type'] )) {
 			continue;
 		}
 
-		if ( isset( $args['methods'] ) &&
-			 array_diff( $args['methods'], get_class_methods( $implementation ) ) ) {
+		if (isset($args['methods']) &&
+			 array_diff($args['methods'], get_class_methods($implementation))) {
 			continue;
 		}
 
@@ -2913,8 +2913,8 @@ 
 function wp_plupload_default_settings() {
 	$wp_scripts = wp_scripts();
 
-	$data = $wp_scripts->get_data( 'wp-plupload', 'data' );
-	if ( $data && false !== strpos( $data, '_wpPluploadSettings' ) )
+	$data = $wp_scripts->get_data('wp-plupload', 'data');
+	if ($data && false !== strpos($data, '_wpPluploadSettings'))
 		return;
 
 	$max_upload_size = wp_max_upload_size();
@@ -2922,18 +2922,18 @@ 
 	$defaults = array(
 		'runtimes'            => 'html5,flash,silverlight,html4',
 		'file_data_name'      => 'async-upload', // key passed to $_FILE.
-		'url'                 => admin_url( 'async-upload.php', 'relative' ),
-		'flash_swf_url'       => includes_url( 'js/plupload/plupload.flash.swf' ),
-		'silverlight_xap_url' => includes_url( 'js/plupload/plupload.silverlight.xap' ),
+		'url'                 => admin_url('async-upload.php', 'relative'),
+		'flash_swf_url'       => includes_url('js/plupload/plupload.flash.swf'),
+		'silverlight_xap_url' => includes_url('js/plupload/plupload.silverlight.xap'),
 		'filters' => array(
-			'max_file_size'   => $max_upload_size . 'b',
+			'max_file_size'   => $max_upload_size.'b',
 		),
 	);
 
 	// Currently only iOS Safari supports multiple files uploading but iOS 7.x has a bug that prevents uploading of videos
 	// when enabled. See #29602.
-	if ( wp_is_mobile() && strpos( $_SERVER['HTTP_USER_AGENT'], 'OS 7_' ) !== false &&
-		strpos( $_SERVER['HTTP_USER_AGENT'], 'like Mac OS X' ) !== false ) {
+	if (wp_is_mobile() && strpos($_SERVER['HTTP_USER_AGENT'], 'OS 7_') !== false &&
+		strpos($_SERVER['HTTP_USER_AGENT'], 'like Mac OS X') !== false) {
 
 		$defaults['multi_selection'] = false;
 	}
@@ -2945,7 +2945,7 @@ 
 	 *
 	 * @param array $defaults Default Plupload settings array.
 	 */
-	$defaults = apply_filters( 'plupload_default_settings', $defaults );
+	$defaults = apply_filters('plupload_default_settings', $defaults);
 
 	$params = array(
 		'action' => 'upload-attachment',
@@ -2958,8 +2958,8 @@ 
 	 *
 	 * @param array $params Default Plupload parameters array.
 	 */
-	$params = apply_filters( 'plupload_default_params', $params );
-	$params['_wpnonce'] = wp_create_nonce( 'media-form' );
+	$params = apply_filters('plupload_default_params', $params);
+	$params['_wpnonce'] = wp_create_nonce('media-form');
 	$defaults['multipart_params'] = $params;
 
 	$settings = array(
@@ -2971,12 +2971,12 @@ 
 		'limitExceeded' => is_multisite() && ! is_upload_space_available()
 	);
 
-	$script = 'var _wpPluploadSettings = ' . wp_json_encode( $settings ) . ';';
+	$script = 'var _wpPluploadSettings = '.wp_json_encode($settings).';';
 
-	if ( $data )
+	if ($data)
 		$script = "$data\n$script";
 
-	$wp_scripts->add_data( 'wp-plupload', 'data', $script );
+	$wp_scripts->add_data('wp-plupload', 'data', $script);
 }
 
 /**
@@ -2988,42 +2988,42 @@ 
  * @param mixed $attachment Attachment ID or object.
  * @return array|void Array of attachment details.
  */
-function wp_prepare_attachment_for_js( $attachment ) {
-	if ( ! $attachment = get_post( $attachment ) )
+function wp_prepare_attachment_for_js($attachment) {
+	if ( ! $attachment = get_post($attachment))
 		return;
 
-	if ( 'attachment' != $attachment->post_type )
+	if ('attachment' != $attachment->post_type)
 		return;
 
-	$meta = wp_get_attachment_metadata( $attachment->ID );
-	if ( false !== strpos( $attachment->post_mime_type, '/' ) )
-		list( $type, $subtype ) = explode( '/', $attachment->post_mime_type );
+	$meta = wp_get_attachment_metadata($attachment->ID);
+	if (false !== strpos($attachment->post_mime_type, '/'))
+		list($type, $subtype) = explode('/', $attachment->post_mime_type);
 	else
-		list( $type, $subtype ) = array( $attachment->post_mime_type, '' );
+		list($type, $subtype) = array($attachment->post_mime_type, '');
 
-	$attachment_url = wp_get_attachment_url( $attachment->ID );
+	$attachment_url = wp_get_attachment_url($attachment->ID);
 
 	$response = array(
 		'id'          => $attachment->ID,
 		'title'       => $attachment->post_title,
-		'filename'    => wp_basename( get_attached_file( $attachment->ID ) ),
+		'filename'    => wp_basename(get_attached_file($attachment->ID)),
 		'url'         => $attachment_url,
-		'link'        => get_attachment_link( $attachment->ID ),
-		'alt'         => get_post_meta( $attachment->ID, '_wp_attachment_image_alt', true ),
+		'link'        => get_attachment_link($attachment->ID),
+		'alt'         => get_post_meta($attachment->ID, '_wp_attachment_image_alt', true),
 		'author'      => $attachment->post_author,
 		'description' => $attachment->post_content,
 		'caption'     => $attachment->post_excerpt,
 		'name'        => $attachment->post_name,
 		'status'      => $attachment->post_status,
 		'uploadedTo'  => $attachment->post_parent,
-		'date'        => strtotime( $attachment->post_date_gmt ) * 1000,
-		'modified'    => strtotime( $attachment->post_modified_gmt ) * 1000,
+		'date'        => strtotime($attachment->post_date_gmt) * 1000,
+		'modified'    => strtotime($attachment->post_modified_gmt) * 1000,
 		'menuOrder'   => $attachment->menu_order,
 		'mime'        => $attachment->post_mime_type,
 		'type'        => $type,
 		'subtype'     => $subtype,
-		'icon'        => wp_mime_type_icon( $attachment->ID ),
-		'dateFormatted' => mysql2date( __( 'F j, Y' ), $attachment->post_date ),
+		'icon'        => wp_mime_type_icon($attachment->ID),
+		'dateFormatted' => mysql2date(__('F j, Y'), $attachment->post_date),
 		'nonces'      => array(
 			'update' => false,
 			'delete' => false,
@@ -3033,141 +3033,141 @@ 
 		'meta'       => false,
 	);
 
-	$author = new WP_User( $attachment->post_author );
+	$author = new WP_User($attachment->post_author);
 	$response['authorName'] = $author->display_name;
 
-	if ( $attachment->post_parent ) {
-		$post_parent = get_post( $attachment->post_parent );
+	if ($attachment->post_parent) {
+		$post_parent = get_post($attachment->post_parent);
 	} else {
 		$post_parent = false;
 	}
 
-	if ( $post_parent ) {
-		$parent_type = get_post_type_object( $post_parent->post_type );
-		if ( $parent_type && $parent_type->show_ui && current_user_can( 'edit_post', $attachment->post_parent ) ) {
-			$response['uploadedToLink'] = get_edit_post_link( $attachment->post_parent, 'raw' );
+	if ($post_parent) {
+		$parent_type = get_post_type_object($post_parent->post_type);
+		if ($parent_type && $parent_type->show_ui && current_user_can('edit_post', $attachment->post_parent)) {
+			$response['uploadedToLink'] = get_edit_post_link($attachment->post_parent, 'raw');
 		}
-		$response['uploadedToTitle'] = $post_parent->post_title ? $post_parent->post_title : __( '(no title)' );
+		$response['uploadedToTitle'] = $post_parent->post_title ? $post_parent->post_title : __('(no title)');
 	}
 
-	$attached_file = get_attached_file( $attachment->ID );
+	$attached_file = get_attached_file($attachment->ID);
 
-	if ( isset( $meta['filesize'] ) ) {
+	if (isset($meta['filesize'])) {
 		$bytes = $meta['filesize'];
-	} elseif ( file_exists( $attached_file ) ) {
-		$bytes = filesize( $attached_file );
+	} elseif (file_exists($attached_file)) {
+		$bytes = filesize($attached_file);
 	} else {
 		$bytes = '';
 	}
 
-	if ( $bytes ) {
+	if ($bytes) {
 		$response['filesizeInBytes'] = $bytes;
-		$response['filesizeHumanReadable'] = size_format( $bytes );
+		$response['filesizeHumanReadable'] = size_format($bytes);
 	}
 
-	if ( current_user_can( 'edit_post', $attachment->ID ) ) {
-		$response['nonces']['update'] = wp_create_nonce( 'update-post_' . $attachment->ID );
-		$response['nonces']['edit'] = wp_create_nonce( 'image_editor-' . $attachment->ID );
-		$response['editLink'] = get_edit_post_link( $attachment->ID, 'raw' );
+	if (current_user_can('edit_post', $attachment->ID)) {
+		$response['nonces']['update'] = wp_create_nonce('update-post_'.$attachment->ID);
+		$response['nonces']['edit'] = wp_create_nonce('image_editor-'.$attachment->ID);
+		$response['editLink'] = get_edit_post_link($attachment->ID, 'raw');
 	}
 
-	if ( current_user_can( 'delete_post', $attachment->ID ) )
-		$response['nonces']['delete'] = wp_create_nonce( 'delete-post_' . $attachment->ID );
+	if (current_user_can('delete_post', $attachment->ID))
+		$response['nonces']['delete'] = wp_create_nonce('delete-post_'.$attachment->ID);
 
-	if ( $meta && 'image' === $type ) {
+	if ($meta && 'image' === $type) {
 		$sizes = array();
 
 		/** This filter is documented in wp-admin/includes/media.php */
-		$possible_sizes = apply_filters( 'image_size_names_choose', array(
+		$possible_sizes = apply_filters('image_size_names_choose', array(
 			'thumbnail' => __('Thumbnail'),
 			'medium'    => __('Medium'),
 			'large'     => __('Large'),
 			'full'      => __('Full Size'),
-		) );
-		unset( $possible_sizes['full'] );
+		));
+		unset($possible_sizes['full']);
 
 		// Loop through all potential sizes that may be chosen. Try to do this with some efficiency.
 		// First: run the image_downsize filter. If it returns something, we can use its data.
 		// If the filter does not return something, then image_downsize() is just an expensive
 		// way to check the image metadata, which we do second.
-		foreach ( $possible_sizes as $size => $label ) {
+		foreach ($possible_sizes as $size => $label) {
 
 			/** This filter is documented in wp-includes/media.php */
-			if ( $downsize = apply_filters( 'image_downsize', false, $attachment->ID, $size ) ) {
-				if ( ! $downsize[3] )
+			if ($downsize = apply_filters('image_downsize', false, $attachment->ID, $size)) {
+				if ( ! $downsize[3])
 					continue;
-				$sizes[ $size ] = array(
+				$sizes[$size] = array(
 					'height'      => $downsize[2],
 					'width'       => $downsize[1],
 					'url'         => $downsize[0],
 					'orientation' => $downsize[2] > $downsize[1] ? 'portrait' : 'landscape',
 				);
-			} elseif ( isset( $meta['sizes'][ $size ] ) ) {
-				if ( ! isset( $base_url ) )
-					$base_url = str_replace( wp_basename( $attachment_url ), '', $attachment_url );
+			} elseif (isset($meta['sizes'][$size])) {
+				if ( ! isset($base_url))
+					$base_url = str_replace(wp_basename($attachment_url), '', $attachment_url);
 
 				// Nothing from the filter, so consult image metadata if we have it.
-				$size_meta = $meta['sizes'][ $size ];
+				$size_meta = $meta['sizes'][$size];
 
 				// We have the actual image size, but might need to further constrain it if content_width is narrower.
 				// Thumbnail, medium, and full sizes are also checked against the site's height/width options.
-				list( $width, $height ) = image_constrain_size_for_editor( $size_meta['width'], $size_meta['height'], $size, 'edit' );
+				list($width, $height) = image_constrain_size_for_editor($size_meta['width'], $size_meta['height'], $size, 'edit');
 
-				$sizes[ $size ] = array(
+				$sizes[$size] = array(
 					'height'      => $height,
 					'width'       => $width,
-					'url'         => $base_url . $size_meta['file'],
+					'url'         => $base_url.$size_meta['file'],
 					'orientation' => $height > $width ? 'portrait' : 'landscape',
 				);
 			}
 		}
 
-		$sizes['full'] = array( 'url' => $attachment_url );
+		$sizes['full'] = array('url' => $attachment_url);
 
-		if ( isset( $meta['height'], $meta['width'] ) ) {
+		if (isset($meta['height'], $meta['width'])) {
 			$sizes['full']['height'] = $meta['height'];
 			$sizes['full']['width'] = $meta['width'];
 			$sizes['full']['orientation'] = $meta['height'] > $meta['width'] ? 'portrait' : 'landscape';
 		}
 
-		$response = array_merge( $response, array( 'sizes' => $sizes ), $sizes['full'] );
-	} elseif ( $meta && 'video' === $type ) {
-		if ( isset( $meta['width'] ) )
+		$response = array_merge($response, array('sizes' => $sizes), $sizes['full']);
+	} elseif ($meta && 'video' === $type) {
+		if (isset($meta['width']))
 			$response['width'] = (int) $meta['width'];
-		if ( isset( $meta['height'] ) )
+		if (isset($meta['height']))
 			$response['height'] = (int) $meta['height'];
 	}
 
-	if ( $meta && ( 'audio' === $type || 'video' === $type ) ) {
-		if ( isset( $meta['length_formatted'] ) )
+	if ($meta && ('audio' === $type || 'video' === $type)) {
+		if (isset($meta['length_formatted']))
 			$response['fileLength'] = $meta['length_formatted'];
 
 		$response['meta'] = array();
-		foreach ( wp_get_attachment_id3_keys( $attachment, 'js' ) as $key => $label ) {
-			$response['meta'][ $key ] = false;
+		foreach (wp_get_attachment_id3_keys($attachment, 'js') as $key => $label) {
+			$response['meta'][$key] = false;
 
-			if ( ! empty( $meta[ $key ] ) ) {
-				$response['meta'][ $key ] = $meta[ $key ];
+			if ( ! empty($meta[$key])) {
+				$response['meta'][$key] = $meta[$key];
 			}
 		}
 
-		$id = get_post_thumbnail_id( $attachment->ID );
-		if ( ! empty( $id ) ) {
-			list( $src, $width, $height ) = wp_get_attachment_image_src( $id, 'full' );
-			$response['image'] = compact( 'src', 'width', 'height' );
-			list( $src, $width, $height ) = wp_get_attachment_image_src( $id, 'thumbnail' );
-			$response['thumb'] = compact( 'src', 'width', 'height' );
+		$id = get_post_thumbnail_id($attachment->ID);
+		if ( ! empty($id)) {
+			list($src, $width, $height) = wp_get_attachment_image_src($id, 'full');
+			$response['image'] = compact('src', 'width', 'height');
+			list($src, $width, $height) = wp_get_attachment_image_src($id, 'thumbnail');
+			$response['thumb'] = compact('src', 'width', 'height');
 		} else {
-			$src = wp_mime_type_icon( $attachment->ID );
+			$src = wp_mime_type_icon($attachment->ID);
 			$width = 48;
 			$height = 64;
-			$response['image'] = compact( 'src', 'width', 'height' );
-			$response['thumb'] = compact( 'src', 'width', 'height' );
+			$response['image'] = compact('src', 'width', 'height');
+			$response['thumb'] = compact('src', 'width', 'height');
 		}
 	}
 
-	if ( function_exists('get_compat_media_markup') )
-		$response['compat'] = get_compat_media_markup( $attachment->ID, array( 'in_modal' => true ) );
+	if (function_exists('get_compat_media_markup'))
+		$response['compat'] = get_compat_media_markup($attachment->ID, array('in_modal' => true));
 
 	/**
 	 * Filter the attachment data prepared for JavaScript.
@@ -3178,7 +3178,7 @@ 
 	 * @param int|object $attachment Attachment ID or object.
 	 * @param array      $meta       Array of attachment meta data.
 	 */
-	return apply_filters( 'wp_prepare_attachment_for_js', $response, $attachment, $meta );
+	return apply_filters('wp_prepare_attachment_for_js', $response, $attachment, $meta);
 }
 
 /**
@@ -3197,9 +3197,9 @@ 
  *     @type int|WP_Post A post object or ID.
  * }
  */
-function wp_enqueue_media( $args = array() ) {
+function wp_enqueue_media($args = array()) {
 	// Enqueue me just once per page, please.
-	if ( did_action( 'wp_enqueue_media' ) )
+	if (did_action('wp_enqueue_media'))
 		return;
 
 	global $content_width, $wpdb, $wp_locale;
@@ -3207,7 +3207,7 @@ 
 	$defaults = array(
 		'post' => null,
 	);
-	$args = wp_parse_args( $args, $defaults );
+	$args = wp_parse_args($args, $defaults);
 
 	// We're going to pass the old thickbox media tabs to `media_upload_tabs`
 	// to ensure plugins will work. We will then unset those tabs.
@@ -3220,67 +3220,67 @@ 
 	);
 
 	/** This filter is documented in wp-admin/includes/media.php */
-	$tabs = apply_filters( 'media_upload_tabs', $tabs );
-	unset( $tabs['type'], $tabs['type_url'], $tabs['gallery'], $tabs['library'] );
+	$tabs = apply_filters('media_upload_tabs', $tabs);
+	unset($tabs['type'], $tabs['type_url'], $tabs['gallery'], $tabs['library']);
 
 	$props = array(
-		'link'  => get_option( 'image_default_link_type' ), // db default is 'file'
-		'align' => get_option( 'image_default_align' ), // empty default
-		'size'  => get_option( 'image_default_size' ),  // empty default
+		'link'  => get_option('image_default_link_type'), // db default is 'file'
+		'align' => get_option('image_default_align'), // empty default
+		'size'  => get_option('image_default_size'), // empty default
 	);
 
-	$exts = array_merge( wp_get_audio_extensions(), wp_get_video_extensions() );
+	$exts = array_merge(wp_get_audio_extensions(), wp_get_video_extensions());
 	$mimes = get_allowed_mime_types();
 	$ext_mimes = array();
-	foreach ( $exts as $ext ) {
-		foreach ( $mimes as $ext_preg => $mime_match ) {
-			if ( preg_match( '#' . $ext . '#i', $ext_preg ) ) {
-				$ext_mimes[ $ext ] = $mime_match;
+	foreach ($exts as $ext) {
+		foreach ($mimes as $ext_preg => $mime_match) {
+			if (preg_match('#'.$ext.'#i', $ext_preg)) {
+				$ext_mimes[$ext] = $mime_match;
 				break;
 			}
 		}
 	}
 
-	$has_audio = $wpdb->get_var( "
+	$has_audio = $wpdb->get_var("
 		SELECT ID
 		FROM $wpdb->posts
 		WHERE post_type = 'attachment'
 		AND post_mime_type LIKE 'audio%'
 		LIMIT 1
-	" );
-	$has_video = $wpdb->get_var( "
+	");
+	$has_video = $wpdb->get_var("
 		SELECT ID
 		FROM $wpdb->posts
 		WHERE post_type = 'attachment'
 		AND post_mime_type LIKE 'video%'
 		LIMIT 1
-	" );
-	$months = $wpdb->get_results( $wpdb->prepare( "
+	");
+	$months = $wpdb->get_results($wpdb->prepare("
 		SELECT DISTINCT YEAR( post_date ) AS year, MONTH( post_date ) AS month
 		FROM $wpdb->posts
 		WHERE post_type = %s
 		ORDER BY post_date DESC
-	", 'attachment' ) );
-	foreach ( $months as $month_year ) {
-		$month_year->text = sprintf( __( '%1$s %2$d' ), $wp_locale->get_month( $month_year->month ), $month_year->year );
+	", 'attachment'));
+	foreach ($months as $month_year) {
+		$month_year->text = sprintf(__('%1$s %2$d'), $wp_locale->get_month($month_year->month), $month_year->year);
 	}
 
 	$settings = array(
 		'tabs'      => $tabs,
-		'tabUrl'    => add_query_arg( array( 'chromeless' => true ), admin_url('media-upload.php') ),
-		'mimeTypes' => wp_list_pluck( get_post_mime_types(), 0 ),
+		'tabUrl'    => add_query_arg(array('chromeless' => true), admin_url('media-upload.php')),
+		'mimeTypes' => wp_list_pluck(get_post_mime_types(), 0),
 		/** This filter is documented in wp-admin/includes/media.php */
-		'captions'  => ! apply_filters( 'disable_captions', '' ),
+		'captions'  => ! apply_filters('disable_captions', ''),
 		'nonce'     => array(
-			'sendToEditor' => wp_create_nonce( 'media-send-to-editor' ),
+			'sendToEditor' => wp_create_nonce('media-send-to-editor'),
 		),
 		'post'    => array(
 			'id' => 0,
 		),
 		'defaultProps' => $props,
 		'attachmentCounts' => array(
-			'audio' => ( $has_audio ) ? 1 : 0,
-			'video' => ( $has_video ) ? 1 : 0
+			'audio' => ($has_audio) ? 1 : 0,
+			'video' => ($has_video) ? 1 : 0
 		),
 		'embedExts'    => $exts,
 		'embedMimes'   => $ext_mimes,
@@ -3290,154 +3290,154 @@ 
 	);
 
 	$post = null;
-	if ( isset( $args['post'] ) ) {
-		$post = get_post( $args['post'] );
+	if (isset($args['post'])) {
+		$post = get_post($args['post']);
 		$settings['post'] = array(
 			'id' => $post->ID,
-			'nonce' => wp_create_nonce( 'update-post_' . $post->ID ),
+			'nonce' => wp_create_nonce('update-post_'.$post->ID),
 		);
 
-		$thumbnail_support = current_theme_supports( 'post-thumbnails', $post->post_type ) && post_type_supports( $post->post_type, 'thumbnail' );
-		if ( ! $thumbnail_support && 'attachment' === $post->post_type && $post->post_mime_type ) {
-			if ( wp_attachment_is( 'audio', $post ) ) {
-				$thumbnail_support = post_type_supports( 'attachment:audio', 'thumbnail' ) || current_theme_supports( 'post-thumbnails', 'attachment:audio' );
-			} elseif ( wp_attachment_is( 'video', $post ) ) {
-				$thumbnail_support = post_type_supports( 'attachment:video', 'thumbnail' ) || current_theme_supports( 'post-thumbnails', 'attachment:video' );
+		$thumbnail_support = current_theme_supports('post-thumbnails', $post->post_type) && post_type_supports($post->post_type, 'thumbnail');
+		if ( ! $thumbnail_support && 'attachment' === $post->post_type && $post->post_mime_type) {
+			if (wp_attachment_is('audio', $post)) {
+				$thumbnail_support = post_type_supports('attachment:audio', 'thumbnail') || current_theme_supports('post-thumbnails', 'attachment:audio');
+			} elseif (wp_attachment_is('video', $post)) {
+				$thumbnail_support = post_type_supports('attachment:video', 'thumbnail') || current_theme_supports('post-thumbnails', 'attachment:video');
 			}
 		}
 
-		if ( $thumbnail_support ) {
-			$featured_image_id = get_post_meta( $post->ID, '_thumbnail_id', true );
+		if ($thumbnail_support) {
+			$featured_image_id = get_post_meta($post->ID, '_thumbnail_id', true);
 			$settings['post']['featuredImageId'] = $featured_image_id ? $featured_image_id : -1;
 		}
 	}
 
-	if ( $post ) {
-		$post_type_object = get_post_type_object( $post->post_type );
+	if ($post) {
+		$post_type_object = get_post_type_object($post->post_type);
 	} else {
-		$post_type_object = get_post_type_object( 'post' );
+		$post_type_object = get_post_type_object('post');
 	}
 
 	$strings = array(
 		// Generic
-		'url'         => __( 'URL' ),
-		'addMedia'    => __( 'Add Media' ),
-		'search'      => __( 'Search' ),
-		'select'      => __( 'Select' ),
-		'cancel'      => __( 'Cancel' ),
-		'update'      => __( 'Update' ),
-		'replace'     => __( 'Replace' ),
-		'remove'      => __( 'Remove' ),
-		'back'        => __( 'Back' ),
+		'url'         => __('URL'),
+		'addMedia'    => __('Add Media'),
+		'search'      => __('Search'),
+		'select'      => __('Select'),
+		'cancel'      => __('Cancel'),
+		'update'      => __('Update'),
+		'replace'     => __('Replace'),
+		'remove'      => __('Remove'),
+		'back'        => __('Back'),
 		/* translators: This is a would-be plural string used in the media manager.
 		   If there is not a word you can use in your language to avoid issues with the
 		   lack of plural support here, turn it into "selected: %d" then translate it.
 		 */
-		'selected'    => __( '%d selected' ),
-		'dragInfo'    => __( 'Drag and drop to reorder media files.' ),
+		'selected'    => __('%d selected'),
+		'dragInfo'    => __('Drag and drop to reorder media files.'),
 
 		// Upload
-		'uploadFilesTitle'  => __( 'Upload Files' ),
-		'uploadImagesTitle' => __( 'Upload Images' ),
+		'uploadFilesTitle'  => __('Upload Files'),
+		'uploadImagesTitle' => __('Upload Images'),
 
 		// Library
-		'mediaLibraryTitle'      => __( 'Media Library' ),
-		'insertMediaTitle'       => __( 'Insert Media' ),
-		'createNewGallery'       => __( 'Create a new gallery' ),
-		'createNewPlaylist'      => __( 'Create a new playlist' ),
-		'createNewVideoPlaylist' => __( 'Create a new video playlist' ),
-		'returnToLibrary'        => __( '&#8592; Return to library' ),
-		'allMediaItems'          => __( 'All media items' ),
-		'allDates'               => __( 'All dates' ),
-		'noItemsFound'           => __( 'No items found.' ),
+		'mediaLibraryTitle'      => __('Media Library'),
+		'insertMediaTitle'       => __('Insert Media'),
+		'createNewGallery'       => __('Create a new gallery'),
+		'createNewPlaylist'      => __('Create a new playlist'),
+		'createNewVideoPlaylist' => __('Create a new video playlist'),
+		'returnToLibrary'        => __('&#8592; Return to library'),
+		'allMediaItems'          => __('All media items'),
+		'allDates'               => __('All dates'),
+		'noItemsFound'           => __('No items found.'),
 		'insertIntoPost'         => $post_type_object->labels->insert_into_item,
-		'unattached'             => __( 'Unattached' ),
-		'trash'                  => _x( 'Trash', 'noun' ),
+		'unattached'             => __('Unattached'),
+		'trash'                  => _x('Trash', 'noun'),
 		'uploadedToThisPost'     => $post_type_object->labels->uploaded_to_this_item,
-		'warnDelete'             => __( "You are about to permanently delete this item.\n  'Cancel' to stop, 'OK' to delete." ),
-		'warnBulkDelete'         => __( "You are about to permanently delete these items.\n  'Cancel' to stop, 'OK' to delete." ),
-		'warnBulkTrash'          => __( "You are about to trash these items.\n  'Cancel' to stop, 'OK' to delete." ),
-		'bulkSelect'             => __( 'Bulk Select' ),
-		'cancelSelection'        => __( 'Cancel Selection' ),
-		'trashSelected'          => __( 'Trash Selected' ),
-		'untrashSelected'        => __( 'Untrash Selected' ),
-		'deleteSelected'         => __( 'Delete Selected' ),
-		'deletePermanently'      => __( 'Delete Permanently' ),
-		'apply'                  => __( 'Apply' ),
-		'filterByDate'           => __( 'Filter by date' ),
-		'filterByType'           => __( 'Filter by type' ),
-		'searchMediaLabel'       => __( 'Search Media' ),
-		'noMedia'                => __( 'No media files found.' ),
+		'warnDelete'             => __("You are about to permanently delete this item.\n  'Cancel' to stop, 'OK' to delete."),
+		'warnBulkDelete'         => __("You are about to permanently delete these items.\n  'Cancel' to stop, 'OK' to delete."),
+		'warnBulkTrash'          => __("You are about to trash these items.\n  'Cancel' to stop, 'OK' to delete."),
+		'bulkSelect'             => __('Bulk Select'),
+		'cancelSelection'        => __('Cancel Selection'),
+		'trashSelected'          => __('Trash Selected'),
+		'untrashSelected'        => __('Untrash Selected'),
+		'deleteSelected'         => __('Delete Selected'),
+		'deletePermanently'      => __('Delete Permanently'),
+		'apply'                  => __('Apply'),
+		'filterByDate'           => __('Filter by date'),
+		'filterByType'           => __('Filter by type'),
+		'searchMediaLabel'       => __('Search Media'),
+		'noMedia'                => __('No media files found.'),
 
 		// Library Details
-		'attachmentDetails'  => __( 'Attachment Details' ),
+		'attachmentDetails'  => __('Attachment Details'),
 
 		// From URL
-		'insertFromUrlTitle' => __( 'Insert from URL' ),
+		'insertFromUrlTitle' => __('Insert from URL'),
 
 		// Featured Images
 		'setFeaturedImageTitle' => $post_type_object->labels->featured_image,
 		'setFeaturedImage'      => $post_type_object->labels->set_featured_image,
 
 		// Gallery
-		'createGalleryTitle' => __( 'Create Gallery' ),
-		'editGalleryTitle'   => __( 'Edit Gallery' ),
-		'cancelGalleryTitle' => __( '&#8592; Cancel Gallery' ),
-		'insertGallery'      => __( 'Insert gallery' ),
-		'updateGallery'      => __( 'Update gallery' ),
-		'addToGallery'       => __( 'Add to gallery' ),
-		'addToGalleryTitle'  => __( 'Add to Gallery' ),
-		'reverseOrder'       => __( 'Reverse order' ),
+		'createGalleryTitle' => __('Create Gallery'),
+		'editGalleryTitle'   => __('Edit Gallery'),
+		'cancelGalleryTitle' => __('&#8592; Cancel Gallery'),
+		'insertGallery'      => __('Insert gallery'),
+		'updateGallery'      => __('Update gallery'),
+		'addToGallery'       => __('Add to gallery'),
+		'addToGalleryTitle'  => __('Add to Gallery'),
+		'reverseOrder'       => __('Reverse order'),
 
 		// Edit Image
-		'imageDetailsTitle'     => __( 'Image Details' ),
-		'imageReplaceTitle'     => __( 'Replace Image' ),
-		'imageDetailsCancel'    => __( 'Cancel Edit' ),
-		'editImage'             => __( 'Edit Image' ),
+		'imageDetailsTitle'     => __('Image Details'),
+		'imageReplaceTitle'     => __('Replace Image'),
+		'imageDetailsCancel'    => __('Cancel Edit'),
+		'editImage'             => __('Edit Image'),
 
 		// Crop Image
-		'chooseImage' => __( 'Choose Image' ),
-		'selectAndCrop' => __( 'Select and Crop' ),
-		'skipCropping' => __( 'Skip Cropping' ),
-		'cropImage' => __( 'Crop Image' ),
-		'cropYourImage' => __( 'Crop your image' ),
-		'cropping' => __( 'Cropping&hellip;' ),
-		'suggestedDimensions' => __( 'Suggested image dimensions:' ),
-		'cropError' => __( 'There has been an error cropping your image.' ),
+		'chooseImage' => __('Choose Image'),
+		'selectAndCrop' => __('Select and Crop'),
+		'skipCropping' => __('Skip Cropping'),
+		'cropImage' => __('Crop Image'),
+		'cropYourImage' => __('Crop your image'),
+		'cropping' => __('Cropping&hellip;'),
+		'suggestedDimensions' => __('Suggested image dimensions:'),
+		'cropError' => __('There has been an error cropping your image.'),
 
 		// Edit Audio
-		'audioDetailsTitle'     => __( 'Audio Details' ),
-		'audioReplaceTitle'     => __( 'Replace Audio' ),
-		'audioAddSourceTitle'   => __( 'Add Audio Source' ),
-		'audioDetailsCancel'    => __( 'Cancel Edit' ),
+		'audioDetailsTitle'     => __('Audio Details'),
+		'audioReplaceTitle'     => __('Replace Audio'),
+		'audioAddSourceTitle'   => __('Add Audio Source'),
+		'audioDetailsCancel'    => __('Cancel Edit'),
 
 		// Edit Video
-		'videoDetailsTitle'     => __( 'Video Details' ),
-		'videoReplaceTitle'     => __( 'Replace Video' ),
-		'videoAddSourceTitle'   => __( 'Add Video Source' ),
-		'videoDetailsCancel'    => __( 'Cancel Edit' ),
-		'videoSelectPosterImageTitle' => __( 'Select Poster Image' ),
-		'videoAddTrackTitle'	=> __( 'Add Subtitles' ),
+		'videoDetailsTitle'     => __('Video Details'),
+		'videoReplaceTitle'     => __('Replace Video'),
+		'videoAddSourceTitle'   => __('Add Video Source'),
+		'videoDetailsCancel'    => __('Cancel Edit'),
+		'videoSelectPosterImageTitle' => __('Select Poster Image'),
+		'videoAddTrackTitle'	=> __('Add Subtitles'),
 
  		// Playlist
- 		'playlistDragInfo'    => __( 'Drag and drop to reorder tracks.' ),
- 		'createPlaylistTitle' => __( 'Create Audio Playlist' ),
- 		'editPlaylistTitle'   => __( 'Edit Audio Playlist' ),
- 		'cancelPlaylistTitle' => __( '&#8592; Cancel Audio Playlist' ),
- 		'insertPlaylist'      => __( 'Insert audio playlist' ),
- 		'updatePlaylist'      => __( 'Update audio playlist' ),
- 		'addToPlaylist'       => __( 'Add to audio playlist' ),
- 		'addToPlaylistTitle'  => __( 'Add to Audio Playlist' ),
+ 		'playlistDragInfo'    => __('Drag and drop to reorder tracks.'),
+ 		'createPlaylistTitle' => __('Create Audio Playlist'),
+ 		'editPlaylistTitle'   => __('Edit Audio Playlist'),
+ 		'cancelPlaylistTitle' => __('&#8592; Cancel Audio Playlist'),
+ 		'insertPlaylist'      => __('Insert audio playlist'),
+ 		'updatePlaylist'      => __('Update audio playlist'),
+ 		'addToPlaylist'       => __('Add to audio playlist'),
+ 		'addToPlaylistTitle'  => __('Add to Audio Playlist'),
 
  		// Video Playlist
- 		'videoPlaylistDragInfo'    => __( 'Drag and drop to reorder videos.' ),
- 		'createVideoPlaylistTitle' => __( 'Create Video Playlist' ),
- 		'editVideoPlaylistTitle'   => __( 'Edit Video Playlist' ),
- 		'cancelVideoPlaylistTitle' => __( '&#8592; Cancel Video Playlist' ),
- 		'insertVideoPlaylist'      => __( 'Insert video playlist' ),
- 		'updateVideoPlaylist'      => __( 'Update video playlist' ),
- 		'addToVideoPlaylist'       => __( 'Add to video playlist' ),
- 		'addToVideoPlaylistTitle'  => __( 'Add to Video Playlist' ),
+ 		'videoPlaylistDragInfo'    => __('Drag and drop to reorder videos.'),
+ 		'createVideoPlaylistTitle' => __('Create Video Playlist'),
+ 		'editVideoPlaylistTitle'   => __('Edit Video Playlist'),
+ 		'cancelVideoPlaylistTitle' => __('&#8592; Cancel Video Playlist'),
+ 		'insertVideoPlaylist'      => __('Insert video playlist'),
+ 		'updateVideoPlaylist'      => __('Update video playlist'),
+ 		'addToVideoPlaylist'       => __('Add to video playlist'),
+ 		'addToVideoPlaylistTitle'  => __('Add to Video Playlist'),
 	);
 
 	/**
@@ -3448,7 +3448,7 @@ 
 	 * @param array   $settings List of media view settings.
 	 * @param WP_Post $post     Post object.
 	 */
-	$settings = apply_filters( 'media_view_settings', $settings, $post );
+	$settings = apply_filters('media_view_settings', $settings, $post);
 
 	/**
 	 * Filter the media view strings.
@@ -3458,35 +3458,35 @@ 
 	 * @param array   $strings List of media view strings.
 	 * @param WP_Post $post    Post object.
 	 */
-	$strings = apply_filters( 'media_view_strings', $strings,  $post );
+	$strings = apply_filters('media_view_strings', $strings, $post);
 
 	$strings['settings'] = $settings;
 
 	// Ensure we enqueue media-editor first, that way media-views is
 	// registered internally before we try to localize it. see #24724.
-	wp_enqueue_script( 'media-editor' );
-	wp_localize_script( 'media-views', '_wpMediaViewsL10n', $strings );
+	wp_enqueue_script('media-editor');
+	wp_localize_script('media-views', '_wpMediaViewsL10n', $strings);
 
-	wp_enqueue_script( 'media-audiovideo' );
-	wp_enqueue_style( 'media-views' );
-	if ( is_admin() ) {
-		wp_enqueue_script( 'mce-view' );
-		wp_enqueue_script( 'image-edit' );
+	wp_enqueue_script('media-audiovideo');
+	wp_enqueue_style('media-views');
+	if (is_admin()) {
+		wp_enqueue_script('mce-view');
+		wp_enqueue_script('image-edit');
 	}
-	wp_enqueue_style( 'imgareaselect' );
+	wp_enqueue_style('imgareaselect');
 	wp_plupload_default_settings();
 
-	require_once ABSPATH . WPINC . '/media-template.php';
-	add_action( 'admin_footer', 'wp_print_media_templates' );
-	add_action( 'wp_footer', 'wp_print_media_templates' );
-	add_action( 'customize_controls_print_footer_scripts', 'wp_print_media_templates' );
+	require_once ABSPATH.WPINC.'/media-template.php';
+	add_action('admin_footer', 'wp_print_media_templates');
+	add_action('wp_footer', 'wp_print_media_templates');
+	add_action('customize_controls_print_footer_scripts', 'wp_print_media_templates');
 
 	/**
 	 * Fires at the conclusion of wp_enqueue_media().
 	 *
 	 * @since 3.5.0
 	 */
-	do_action( 'wp_enqueue_media' );
+	do_action('wp_enqueue_media');
 }
 
 /**
@@ -3498,8 +3498,8 @@ 
  * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global $post.
  * @return array Found attachments.
  */
-function get_attached_media( $type, $post = 0 ) {
-	if ( ! $post = get_post( $post ) )
+function get_attached_media($type, $post = 0) {
+	if ( ! $post = get_post($post))
 		return array();
 
 	$args = array(
@@ -3520,9 +3520,9 @@ 
 	 * @param string $type Mime type of the desired media.
 	 * @param mixed  $post Post ID or object.
 	 */
-	$args = apply_filters( 'get_attached_media_args', $args, $type, $post );
+	$args = apply_filters('get_attached_media_args', $args, $type, $post);
 
-	$children = get_children( $args );
+	$children = get_children($args);
 
 	/**
 	 * Filter the list of media attached to the given post.
@@ -3533,7 +3533,7 @@ 
 	 * @param string $type     Mime type of the media desired.
 	 * @param mixed  $post     Post ID or object.
 	 */
-	return (array) apply_filters( 'get_attached_media', $children, $type, $post );
+	return (array) apply_filters('get_attached_media', $children, $type, $post);
 }
 
 /**
@@ -3545,7 +3545,7 @@ 
  * @param array  $types   An array of media types: 'audio', 'video', 'object', 'embed', or 'iframe'.
  * @return array A list of found HTML media embeds.
  */
-function get_media_embedded_in_content( $content, $types = null ) {
+function get_media_embedded_in_content($content, $types = null) {
 	$html = array();
 
 	/**
@@ -3556,20 +3556,20 @@ 
 	 * @param array $allowed_media_types An array of allowed media types. Default media types are
 	 *                                   'audio', 'video', 'object', 'embed', and 'iframe'.
 	 */
-	$allowed_media_types = apply_filters( 'media_embedded_in_content_allowed_types', array( 'audio', 'video', 'object', 'embed', 'iframe' ) );
+	$allowed_media_types = apply_filters('media_embedded_in_content_allowed_types', array('audio', 'video', 'object', 'embed', 'iframe'));
 
-	if ( ! empty( $types ) ) {
-		if ( ! is_array( $types ) ) {
-			$types = array( $types );
+	if ( ! empty($types)) {
+		if ( ! is_array($types)) {
+			$types = array($types);
 		}
 
-		$allowed_media_types = array_intersect( $allowed_media_types, $types );
+		$allowed_media_types = array_intersect($allowed_media_types, $types);
 	}
 
-	$tags = implode( '|', $allowed_media_types );
+	$tags = implode('|', $allowed_media_types);
 
-	if ( preg_match_all( '#<(?P<tag>' . $tags . ')[^<]*?(?:>[\s\S]*?<\/(?P=tag)>|\s*\/>)#', $content, $matches ) ) {
-		foreach ( $matches[0] as $match ) {
+	if (preg_match_all('#<(?P<tag>'.$tags.')[^<]*?(?:>[\s\S]*?<\/(?P=tag)>|\s*\/>)#', $content, $matches)) {
+		foreach ($matches[0] as $match) {
 			$html[] = $match;
 		}
 	}
@@ -3587,31 +3587,31 @@ 
  * @return array A list of arrays, each containing gallery data and srcs parsed
  *               from the expanded shortcode.
  */
-function get_post_galleries( $post, $html = true ) {
-	if ( ! $post = get_post( $post ) )
+function get_post_galleries($post, $html = true) {
+	if ( ! $post = get_post($post))
 		return array();
 
-	if ( ! has_shortcode( $post->post_content, 'gallery' ) )
+	if ( ! has_shortcode($post->post_content, 'gallery'))
 		return array();
 
 	$galleries = array();
-	if ( preg_match_all( '/' . get_shortcode_regex() . '/s', $post->post_content, $matches, PREG_SET_ORDER ) ) {
-		foreach ( $matches as $shortcode ) {
-			if ( 'gallery' === $shortcode[2] ) {
+	if (preg_match_all('/'.get_shortcode_regex().'/s', $post->post_content, $matches, PREG_SET_ORDER)) {
+		foreach ($matches as $shortcode) {
+			if ('gallery' === $shortcode[2]) {
 				$srcs = array();
 
-				$gallery = do_shortcode_tag( $shortcode );
-				if ( $html ) {
+				$gallery = do_shortcode_tag($shortcode);
+				if ($html) {
 					$galleries[] = $gallery;
 				} else {
-					preg_match_all( '#src=([\'"])(.+?)\1#is', $gallery, $src, PREG_SET_ORDER );
-					if ( ! empty( $src ) ) {
-						foreach ( $src as $s )
+					preg_match_all('#src=([\'"])(.+?)\1#is', $gallery, $src, PREG_SET_ORDER);
+					if ( ! empty($src)) {
+						foreach ($src as $s)
 							$srcs[] = $s[2];
 					}
 
-					$data = shortcode_parse_atts( $shortcode[3] );
-					$data['src'] = array_values( array_unique( $srcs ) );
+					$data = shortcode_parse_atts($shortcode[3]);
+					$data['src'] = array_values(array_unique($srcs));
 					$galleries[] = $data;
 				}
 			}
@@ -3626,7 +3626,7 @@ 
 	 * @param array   $galleries Associative array of all found post galleries.
 	 * @param WP_Post $post      Post object.
 	 */
-	return apply_filters( 'get_post_galleries', $galleries, $post );
+	return apply_filters('get_post_galleries', $galleries, $post);
 }
 
 /**
@@ -3638,9 +3638,9 @@ 
  * @param bool        $html Optional. Whether to return HTML or data. Default is true.
  * @return string|array Gallery data and srcs parsed from the expanded shortcode.
  */
-function get_post_gallery( $post = 0, $html = true ) {
-	$galleries = get_post_galleries( $post, $html );
-	$gallery = reset( $galleries );
+function get_post_gallery($post = 0, $html = true) {
+	$galleries = get_post_galleries($post, $html);
+	$gallery = reset($galleries);
 
 	/**
 	 * Filter the first-found post gallery.
@@ -3651,7 +3651,7 @@ 
 	 * @param int|WP_Post $post      Post ID or object.
 	 * @param array       $galleries Associative array of all found post galleries.
 	 */
-	return apply_filters( 'get_post_gallery', $gallery, $post, $galleries );
+	return apply_filters('get_post_gallery', $gallery, $post, $galleries);
 }
 
 /**
@@ -3665,9 +3665,9 @@ 
  * @return array A list of lists, each containing image srcs parsed.
  *               from an expanded shortcode
  */
-function get_post_galleries_images( $post = 0 ) {
-	$galleries = get_post_galleries( $post, false );
-	return wp_list_pluck( $galleries, 'src' );
+function get_post_galleries_images($post = 0) {
+	$galleries = get_post_galleries($post, false);
+	return wp_list_pluck($galleries, 'src');
 }
 
 /**
@@ -3680,9 +3680,9 @@ 
  * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global `$post`.
  * @return array A list of a gallery's image srcs in order.
  */
-function get_post_gallery_images( $post = 0 ) {
-	$gallery = get_post_gallery( $post, false );
-	return empty( $gallery['src'] ) ? array() : $gallery['src'];
+function get_post_gallery_images($post = 0) {
+	$gallery = get_post_gallery($post, false);
+	return empty($gallery['src']) ? array() : $gallery['src'];
 }
 
 /**
@@ -3692,20 +3692,20 @@ 
  *
  * @param WP_Post $attachment Attachment object.
  */
-function wp_maybe_generate_attachment_metadata( $attachment ) {
-	if ( empty( $attachment ) || ( empty( $attachment->ID ) || ! $attachment_id = (int) $attachment->ID ) ) {
+function wp_maybe_generate_attachment_metadata($attachment) {
+	if (empty($attachment) || (empty($attachment->ID) || ! $attachment_id = (int) $attachment->ID)) {
 		return;
 	}
 
-	$file = get_attached_file( $attachment_id );
-	$meta = wp_get_attachment_metadata( $attachment_id );
-	if ( empty( $meta ) && file_exists( $file ) ) {
-		$_meta = get_post_meta( $attachment_id );
-		$regeneration_lock = 'wp_generating_att_' . $attachment_id;
-		if ( ! array_key_exists( '_wp_attachment_metadata', $_meta ) && ! get_transient( $regeneration_lock ) ) {
-			set_transient( $regeneration_lock, $file );
-			wp_update_attachment_metadata( $attachment_id, wp_generate_attachment_metadata( $attachment_id, $file ) );
-			delete_transient( $regeneration_lock );
+	$file = get_attached_file($attachment_id);
+	$meta = wp_get_attachment_metadata($attachment_id);
+	if (empty($meta) && file_exists($file)) {
+		$_meta = get_post_meta($attachment_id);
+		$regeneration_lock = 'wp_generating_att_'.$attachment_id;
+		if ( ! array_key_exists('_wp_attachment_metadata', $_meta) && ! get_transient($regeneration_lock)) {
+			set_transient($regeneration_lock, $file);
+			wp_update_attachment_metadata($attachment_id, wp_generate_attachment_metadata($attachment_id, $file));
+			delete_transient($regeneration_lock);
 		}
 	}
 }
@@ -3720,29 +3720,29 @@ 
  * @param string $url The URL to resolve.
  * @return int The found post ID, or 0 on failure.
  */
-function attachment_url_to_postid( $url ) {
+function attachment_url_to_postid($url) {
 	global $wpdb;
 
 	$dir = wp_get_upload_dir();
 	$path = $url;
 
-	$site_url = parse_url( $dir['url'] );
-	$image_path = parse_url( $path );
+	$site_url = parse_url($dir['url']);
+	$image_path = parse_url($path);
 
 	//force the protocols to match if needed
-	if ( isset( $image_path['scheme'] ) && ( $image_path['scheme'] !== $site_url['scheme'] ) ) {
-		$path = str_replace( $image_path['scheme'], $site_url['scheme'], $path );
+	if (isset($image_path['scheme']) && ($image_path['scheme'] !== $site_url['scheme'])) {
+		$path = str_replace($image_path['scheme'], $site_url['scheme'], $path);
 	}
 
-	if ( 0 === strpos( $path, $dir['baseurl'] . '/' ) ) {
-		$path = substr( $path, strlen( $dir['baseurl'] . '/' ) );
+	if (0 === strpos($path, $dir['baseurl'].'/')) {
+		$path = substr($path, strlen($dir['baseurl'].'/'));
 	}
 
 	$sql = $wpdb->prepare(
 		"SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_wp_attached_file' AND meta_value = %s",
 		$path
 	);
-	$post_id = $wpdb->get_var( $sql );
+	$post_id = $wpdb->get_var($sql);
 
 	/**
 	 * Filter an attachment id found by URL.
@@ -3752,7 +3752,7 @@ 
 	 * @param int|null $post_id The post_id (if any) found by the function.
 	 * @param string   $url     The URL being looked up.
 	 */
-	return (int) apply_filters( 'attachment_url_to_postid', $post_id, $url );
+	return (int) apply_filters('attachment_url_to_postid', $post_id, $url);
 }
 
 /**
@@ -3765,9 +3765,9 @@ 
  * @return array The relevant CSS file URLs.
  */
 function wpview_media_sandbox_styles() {
- 	$version = 'ver=' . $GLOBALS['wp_version'];
- 	$mediaelement = includes_url( "js/mediaelement/mediaelementplayer.min.css?$version" );
- 	$wpmediaelement = includes_url( "js/mediaelement/wp-mediaelement.css?$version" );
+ 	$version = 'ver='.$GLOBALS['wp_version'];
+ 	$mediaelement = includes_url("js/mediaelement/mediaelementplayer.min.css?$version");
+ 	$wpmediaelement = includes_url("js/mediaelement/wp-mediaelement.css?$version");
 
-	return array( $mediaelement, $wpmediaelement );
+	return array($mediaelement, $wpmediaelement);
 }

Braces +153 added lines, -108 removed lines

@@ -41,14 +41,14 @@ 
 function image_constrain_size_for_editor( $width, $height, $size = 'medium', $context = null ) {
 	global $content_width, $_wp_additional_image_sizes;
 
-	if ( ! $context )
-		$context = is_admin() ? 'edit' : 'display';
+	if ( ! $context ) {
+			$context = is_admin() ? 'edit' : 'display';
+	}
 
 	if ( is_array($size) ) {
 		$max_width = $size[0];
 		$max_height = $size[1];
-	}
-	elseif ( $size == 'thumb' || $size == 'thumbnail' ) {
+	} elseif ( $size == 'thumb' || $size == 'thumbnail' ) {
 		$max_width = intval(get_option('thumbnail_size_w'));
 		$max_height = intval(get_option('thumbnail_size_h'));
 		// last chance thumbnail size defaults
@@ -56,21 +56,18 @@ 
 			$max_width = 128;
 			$max_height = 96;
 		}
-	}
-	elseif ( $size == 'medium' ) {
+	} elseif ( $size == 'medium' ) {
 		$max_width = intval(get_option('medium_size_w'));
 		$max_height = intval(get_option('medium_size_h'));
 
-	}
-	elseif ( $size == 'medium_large' ) {
+	} elseif ( $size == 'medium_large' ) {
 		$max_width = intval( get_option( 'medium_large_size_w' ) );
 		$max_height = intval( get_option( 'medium_large_size_h' ) );
 
 		if ( intval( $content_width ) > 0 ) {
 			$max_width = min( intval( $content_width ), $max_width );
 		}
-	}
-	elseif ( $size == 'large' ) {
+	} elseif ( $size == 'large' ) {
 		/*
 		 * We're inserting a large size image into the editor. If it's a really
 		 * big image we'll scale it down to fit reasonably within the editor
@@ -85,8 +82,10 @@ 
 	} elseif ( isset( $_wp_additional_image_sizes ) && count( $_wp_additional_image_sizes ) && in_array( $size, array_keys( $_wp_additional_image_sizes ) ) ) {
 		$max_width = intval( $_wp_additional_image_sizes[$size]['width'] );
 		$max_height = intval( $_wp_additional_image_sizes[$size]['height'] );
-		if ( intval($content_width) > 0 && 'edit' == $context ) // Only in admin. Assume that theme authors know what they're doing.
+		if ( intval($content_width) > 0 && 'edit' == $context ) {
+			// Only in admin. Assume that theme authors know what they're doing.
 			$max_width = min( intval($content_width), $max_width );
+		}
 	}
 	// $size == 'full' has no constraint
 	else {
@@ -130,10 +129,12 @@ 
  */
 function image_hwstring( $width, $height ) {
 	$out = '';
-	if ($width)
-		$out .= 'width="'.intval($width).'" ';
-	if ($height)
-		$out .= 'height="'.intval($height).'" ';
+	if ($width) {
+			$out .= 'width="'.intval($width).'" ';
+	}
+	if ($height) {
+			$out .= 'height="'.intval($height).'" ';
+	}
 	return $out;
 }
 
@@ -164,8 +165,9 @@ 
  */
 function image_downsize( $id, $size = 'medium' ) {
 
-	if ( !wp_attachment_is_image($id) )
-		return false;
+	if ( !wp_attachment_is_image($id) ) {
+			return false;
+	}
 
 	/**
 	 * Filter whether to preempt the output of image_downsize().
@@ -196,8 +198,7 @@ 
 		$width = $intermediate['width'];
 		$height = $intermediate['height'];
 		$is_intermediate = true;
-	}
-	elseif ( $size == 'thumbnail' ) {
+	} elseif ( $size == 'thumbnail' ) {
 		// fall back to the old thumbnail
 		if ( ($thumb_file = wp_get_attachment_thumb_file($id)) && $info = getimagesize($thumb_file) ) {
 			$img_url = str_replace($img_url_basename, wp_basename($thumb_file), $img_url);
@@ -384,8 +385,9 @@ 
  * @return array First item is the width, the second item is the height.
  */
 function wp_constrain_dimensions( $current_width, $current_height, $max_width = 0, $max_height = 0 ) {
-	if ( !$max_width && !$max_height )
-		return array( $current_width, $current_height );
+	if ( !$max_width && !$max_height ) {
+			return array( $current_width, $current_height );
+	}
 
 	$width_ratio = $height_ratio = 1.0;
 	$did_width = $did_height = false;
@@ -470,11 +472,13 @@ 
  */
 function image_resize_dimensions( $orig_w, $orig_h, $dest_w, $dest_h, $crop = false ) {
 
-	if ($orig_w <= 0 || $orig_h <= 0)
-		return false;
+	if ($orig_w <= 0 || $orig_h <= 0) {
+			return false;
+	}
 	// at least one of dest_w or dest_h must be specific
-	if ($dest_w <= 0 && $dest_h <= 0)
-		return false;
+	if ($dest_w <= 0 && $dest_h <= 0) {
+			return false;
+	}
 
 	/**
 	 * Filter whether to preempt calculating the image resize dimensions.
@@ -493,8 +497,9 @@ 
 	 *                           An array can specify positioning of the crop area. Default false.
 	 */
 	$output = apply_filters( 'image_resize_dimensions', null, $orig_w, $orig_h, $dest_w, $dest_h, $crop );
-	if ( null !== $output )
-		return $output;
+	if ( null !== $output ) {
+			return $output;
+	}
 
 	if ( $crop ) {
 		// crop the largest possible portion of the original image that we can size to $dest_w x $dest_h
@@ -578,8 +583,9 @@ 
 	if ( $width || $height ) {
 		$editor = wp_get_image_editor( $file );
 
-		if ( is_wp_error( $editor ) || is_wp_error( $editor->resize( $width, $height, $crop ) ) )
-			return false;
+		if ( is_wp_error( $editor ) || is_wp_error( $editor->resize( $width, $height, $crop ) ) ) {
+					return false;
+		}
 
 		$resized_file = $editor->save();
 
@@ -630,8 +636,9 @@ 
  * }
  */
 function image_get_intermediate_size( $post_id, $size = 'thumbnail' ) {
-	if ( !is_array( $imagedata = wp_get_attachment_metadata( $post_id ) ) )
-		return false;
+	if ( !is_array( $imagedata = wp_get_attachment_metadata( $post_id ) ) ) {
+			return false;
+	}
 
 	// get the best one for a specified set of dimensions
 	if ( is_array($size) && !empty($imagedata['sizes']) ) {
@@ -677,8 +684,9 @@ 
 		}
 	}
 
-	if ( is_array($size) || empty($size) || empty($imagedata['sizes'][$size]) )
-		return false;
+	if ( is_array($size) || empty($size) || empty($imagedata['sizes'][$size]) ) {
+			return false;
+	}
 
 	$data = $imagedata['sizes'][$size];
 	// include the full filesystem path of the intermediate file
@@ -716,8 +724,9 @@ 
 function get_intermediate_image_sizes() {
 	global $_wp_additional_image_sizes;
 	$image_sizes = array('thumbnail', 'medium', 'medium_large', 'large'); // Standard sizes
-	if ( isset( $_wp_additional_image_sizes ) && count( $_wp_additional_image_sizes ) )
-		$image_sizes = array_merge( $image_sizes, array_keys( $_wp_additional_image_sizes ) );
+	if ( isset( $_wp_additional_image_sizes ) && count( $_wp_additional_image_sizes ) ) {
+			$image_sizes = array_merge( $image_sizes, array_keys( $_wp_additional_image_sizes ) );
+	}
 
 	/**
 	 * Filter the list of intermediate image sizes.
@@ -813,10 +822,14 @@ 
 			'class'	=> "attachment-$size_class size-$size_class",
 			'alt'	=> trim(strip_tags( get_post_meta($attachment_id, '_wp_attachment_image_alt', true) )), // Use Alt field first
 		);
-		if ( empty($default_attr['alt']) )
-			$default_attr['alt'] = trim(strip_tags( $attachment->post_excerpt )); // If not, Use the Caption
-		if ( empty($default_attr['alt']) )
-			$default_attr['alt'] = trim(strip_tags( $attachment->post_title )); // Finally, use the title
+		if ( empty($default_attr['alt']) ) {
+					$default_attr['alt'] = trim(strip_tags( $attachment->post_excerpt ));
+		}
+		// If not, Use the Caption
+		if ( empty($default_attr['alt']) ) {
+					$default_attr['alt'] = trim(strip_tags( $attachment->post_title ));
+		}
+		// Finally, use the title
 
 		$attr = wp_parse_args( $attr, $default_attr );
 
@@ -1467,8 +1480,9 @@ 
 	 * @param string $content The image element, possibly wrapped in a hyperlink.
 	 */
 	$output = apply_filters( 'img_caption_shortcode', '', $attr, $content );
-	if ( $output != '' )
-		return $output;
+	if ( $output != '' ) {
+			return $output;
+	}
 
 	$atts = shortcode_atts( array(
 		'id'	  => '',
@@ -1479,11 +1493,13 @@ 
 	), $attr, 'caption' );
 
 	$atts['width'] = (int) $atts['width'];
-	if ( $atts['width'] < 1 || empty( $atts['caption'] ) )
-		return $content;
+	if ( $atts['width'] < 1 || empty( $atts['caption'] ) ) {
+			return $content;
+	}
 
-	if ( ! empty( $atts['id'] ) )
-		$atts['id'] = 'id="' . esc_attr( sanitize_html_class( $atts['id'] ) ) . '" ';
+	if ( ! empty( $atts['id'] ) ) {
+			$atts['id'] = 'id="' . esc_attr( sanitize_html_class( $atts['id'] ) ) . '" ';
+	}
 
 	$class = trim( 'wp-caption ' . $atts['align'] . ' ' . $atts['class'] );
 
@@ -1509,8 +1525,9 @@ 
 	$caption_width = apply_filters( 'img_caption_shortcode_width', $width, $atts, $content );
 
 	$style = '';
-	if ( $caption_width )
-		$style = 'style="width: ' . (int) $caption_width . 'px" ';
+	if ( $caption_width ) {
+			$style = 'style="width: ' . (int) $caption_width . 'px" ';
+	}
 
 	$html = '';
 	if ( $html5 ) {
@@ -2038,8 +2055,10 @@ 
 		echo (int) $theme_width;
 	?>"<?php if ( 'video' === $safe_type ):
 		echo ' height="', (int) $theme_height, '"';
-	else:
+	else {
+		:
 		echo ' style="visibility: hidden"';
+	}
 	endif; ?>></<?php echo $safe_type ?>>
 	<div class="wp-playlist-next"></div>
 	<div class="wp-playlist-prev"></div>
@@ -2666,28 +2685,32 @@ 
 	} elseif ( is_array( $attachment ) ) {
 		$attachment = (object) $attachment;
 	}
-	if ( ! is_object($attachment) )
-		return array();
+	if ( ! is_object($attachment) ) {
+			return array();
+	}
 
 	$file = get_attached_file( $attachment->ID );
 	$filename = basename( $file );
 
 	$objects = array('attachment');
 
-	if ( false !== strpos($filename, '.') )
-		$objects[] = 'attachment:' . substr($filename, strrpos($filename, '.') + 1);
+	if ( false !== strpos($filename, '.') ) {
+			$objects[] = 'attachment:' . substr($filename, strrpos($filename, '.') + 1);
+	}
 	if ( !empty($attachment->post_mime_type) ) {
 		$objects[] = 'attachment:' . $attachment->post_mime_type;
-		if ( false !== strpos($attachment->post_mime_type, '/') )
-			foreach ( explode('/', $attachment->post_mime_type) as $token )
+		if ( false !== strpos($attachment->post_mime_type, '/') ) {
+					foreach ( explode('/', $attachment->post_mime_type) as $token )
 				if ( !empty($token) )
 					$objects[] = "attachment:$token";
+		}
 	}
 
 	$taxonomies = array();
-	foreach ( $objects as $object )
-		if ( $taxes = get_object_taxonomies($object) )
+	foreach ( $objects as $object ) {
+			if ( $taxes = get_object_taxonomies($object) )
 			$taxonomies = array_merge($taxonomies, $taxes);
+	}
 
 	return array_unique($taxonomies);
 }
@@ -2710,10 +2733,11 @@ 
 	foreach ( get_taxonomies( array(), 'objects' ) as $taxonomy ) {
 		foreach ( $taxonomy->object_type as $object_type ) {
 			if ( 'attachment' == $object_type || 0 === strpos( $object_type, 'attachment:' ) ) {
-				if ( 'names' == $output )
-					$taxonomies[] = $taxonomy->name;
-				else
-					$taxonomies[ $taxonomy->name ] = $taxonomy;
+				if ( 'names' == $output ) {
+									$taxonomies[] = $taxonomy->name;
+				} else {
+									$taxonomies[ $taxonomy->name ] = $taxonomy;
+				}
 				break;
 			}
 		}
@@ -2775,12 +2799,13 @@ 
 function wp_convert_hr_to_bytes( $size ) {
 	$size  = strtolower( $size );
 	$bytes = (int) $size;
-	if ( strpos( $size, 'k' ) !== false )
-		$bytes = intval( $size ) * KB_IN_BYTES;
-	elseif ( strpos( $size, 'm' ) !== false )
-		$bytes = intval($size) * MB_IN_BYTES;
-	elseif ( strpos( $size, 'g' ) !== false )
-		$bytes = intval( $size ) * GB_IN_BYTES;
+	if ( strpos( $size, 'k' ) !== false ) {
+			$bytes = intval( $size ) * KB_IN_BYTES;
+	} elseif ( strpos( $size, 'm' ) !== false ) {
+			$bytes = intval($size) * MB_IN_BYTES;
+	} elseif ( strpos( $size, 'g' ) !== false ) {
+			$bytes = intval( $size ) * GB_IN_BYTES;
+	}
 	return $bytes;
 }
 
@@ -2826,8 +2851,9 @@ 
 
 		// If $file_info['type'] is false, then we let the editor attempt to
 		// figure out the file type, rather than forcing a failure based on extension.
-		if ( isset( $file_info ) && $file_info['type'] )
-			$args['mime_type'] = $file_info['type'];
+		if ( isset( $file_info ) && $file_info['type'] ) {
+					$args['mime_type'] = $file_info['type'];
+		}
 	}
 
 	$implementation = _wp_image_editor_choose( $args );
@@ -2836,8 +2862,9 @@ 
 		$editor = new $implementation( $path );
 		$loaded = $editor->load();
 
-		if ( is_wp_error( $loaded ) )
-			return $loaded;
+		if ( is_wp_error( $loaded ) ) {
+					return $loaded;
+		}
 
 		return $editor;
 	}
@@ -2884,8 +2911,9 @@ 
 	$implementations = apply_filters( 'wp_image_editors', array( 'WP_Image_Editor_Imagick', 'WP_Image_Editor_GD' ) );
 
 	foreach ( $implementations as $implementation ) {
-		if ( ! call_user_func( array( $implementation, 'test' ), $args ) )
-			continue;
+		if ( ! call_user_func( array( $implementation, 'test' ), $args ) ) {
+					continue;
+		}
 
 		if ( isset( $args['mime_type'] ) &&
 			! call_user_func(
@@ -2914,8 +2942,9 @@ 
 	$wp_scripts = wp_scripts();
 
 	$data = $wp_scripts->get_data( 'wp-plupload', 'data' );
-	if ( $data && false !== strpos( $data, '_wpPluploadSettings' ) )
-		return;
+	if ( $data && false !== strpos( $data, '_wpPluploadSettings' ) ) {
+			return;
+	}
 
 	$max_upload_size = wp_max_upload_size();
 
@@ -2973,8 +3002,9 @@ 
 
 	$script = 'var _wpPluploadSettings = ' . wp_json_encode( $settings ) . ';';
 
-	if ( $data )
-		$script = "$data\n$script";
+	if ( $data ) {
+			$script = "$data\n$script";
+	}
 
 	$wp_scripts->add_data( 'wp-plupload', 'data', $script );
 }
@@ -2989,17 +3019,20 @@ 
  * @return array|void Array of attachment details.
  */
 function wp_prepare_attachment_for_js( $attachment ) {
-	if ( ! $attachment = get_post( $attachment ) )
-		return;
+	if ( ! $attachment = get_post( $attachment ) ) {
+			return;
+	}
 
-	if ( 'attachment' != $attachment->post_type )
-		return;
+	if ( 'attachment' != $attachment->post_type ) {
+			return;
+	}
 
 	$meta = wp_get_attachment_metadata( $attachment->ID );
-	if ( false !== strpos( $attachment->post_mime_type, '/' ) )
-		list( $type, $subtype ) = explode( '/', $attachment->post_mime_type );
-	else
-		list( $type, $subtype ) = array( $attachment->post_mime_type, '' );
+	if ( false !== strpos( $attachment->post_mime_type, '/' ) ) {
+			list( $type, $subtype ) = explode( '/', $attachment->post_mime_type );
+	} else {
+			list( $type, $subtype ) = array( $attachment->post_mime_type, '' );
+	}
 
 	$attachment_url = wp_get_attachment_url( $attachment->ID );
 
@@ -3071,8 +3104,9 @@ 
 		$response['editLink'] = get_edit_post_link( $attachment->ID, 'raw' );
 	}
 
-	if ( current_user_can( 'delete_post', $attachment->ID ) )
-		$response['nonces']['delete'] = wp_create_nonce( 'delete-post_' . $attachment->ID );
+	if ( current_user_can( 'delete_post', $attachment->ID ) ) {
+			$response['nonces']['delete'] = wp_create_nonce( 'delete-post_' . $attachment->ID );
+	}
 
 	if ( $meta && 'image' === $type ) {
 		$sizes = array();
@@ -3094,8 +3128,9 @@ 
 
 			/** This filter is documented in wp-includes/media.php */
 			if ( $downsize = apply_filters( 'image_downsize', false, $attachment->ID, $size ) ) {
-				if ( ! $downsize[3] )
-					continue;
+				if ( ! $downsize[3] ) {
+									continue;
+				}
 				$sizes[ $size ] = array(
 					'height'      => $downsize[2],
 					'width'       => $downsize[1],
@@ -3103,8 +3138,9 @@ 
 					'orientation' => $downsize[2] > $downsize[1] ? 'portrait' : 'landscape',
 				);
 			} elseif ( isset( $meta['sizes'][ $size ] ) ) {
-				if ( ! isset( $base_url ) )
-					$base_url = str_replace( wp_basename( $attachment_url ), '', $attachment_url );
+				if ( ! isset( $base_url ) ) {
+									$base_url = str_replace( wp_basename( $attachment_url ), '', $attachment_url );
+				}
 
 				// Nothing from the filter, so consult image metadata if we have it.
 				$size_meta = $meta['sizes'][ $size ];
@@ -3132,15 +3168,18 @@ 
 
 		$response = array_merge( $response, array( 'sizes' => $sizes ), $sizes['full'] );
 	} elseif ( $meta && 'video' === $type ) {
-		if ( isset( $meta['width'] ) )
-			$response['width'] = (int) $meta['width'];
-		if ( isset( $meta['height'] ) )
-			$response['height'] = (int) $meta['height'];
+		if ( isset( $meta['width'] ) ) {
+					$response['width'] = (int) $meta['width'];
+		}
+		if ( isset( $meta['height'] ) ) {
+					$response['height'] = (int) $meta['height'];
+		}
 	}
 
 	if ( $meta && ( 'audio' === $type || 'video' === $type ) ) {
-		if ( isset( $meta['length_formatted'] ) )
-			$response['fileLength'] = $meta['length_formatted'];
+		if ( isset( $meta['length_formatted'] ) ) {
+					$response['fileLength'] = $meta['length_formatted'];
+		}
 
 		$response['meta'] = array();
 		foreach ( wp_get_attachment_id3_keys( $attachment, 'js' ) as $key => $label ) {
@@ -3166,8 +3205,9 @@ 
 		}
 	}
 
-	if ( function_exists('get_compat_media_markup') )
-		$response['compat'] = get_compat_media_markup( $attachment->ID, array( 'in_modal' => true ) );
+	if ( function_exists('get_compat_media_markup') ) {
+			$response['compat'] = get_compat_media_markup( $attachment->ID, array( 'in_modal' => true ) );
+	}
 
 	/**
 	 * Filter the attachment data prepared for JavaScript.
@@ -3199,8 +3239,9 @@ 
  */
 function wp_enqueue_media( $args = array() ) {
 	// Enqueue me just once per page, please.
-	if ( did_action( 'wp_enqueue_media' ) )
-		return;
+	if ( did_action( 'wp_enqueue_media' ) ) {
+			return;
+	}
 
 	global $content_width, $wpdb, $wp_locale;
 
@@ -3499,8 +3540,9 @@ 
  * @return array Found attachments.
  */
 function get_attached_media( $type, $post = 0 ) {
-	if ( ! $post = get_post( $post ) )
-		return array();
+	if ( ! $post = get_post( $post ) ) {
+			return array();
+	}
 
 	$args = array(
 		'post_parent' => $post->ID,
@@ -3588,11 +3630,13 @@ 
  *               from the expanded shortcode.
  */
 function get_post_galleries( $post, $html = true ) {
-	if ( ! $post = get_post( $post ) )
-		return array();
+	if ( ! $post = get_post( $post ) ) {
+			return array();
+	}
 
-	if ( ! has_shortcode( $post->post_content, 'gallery' ) )
-		return array();
+	if ( ! has_shortcode( $post->post_content, 'gallery' ) ) {
+			return array();
+	}
 
 	$galleries = array();
 	if ( preg_match_all( '/' . get_shortcode_regex() . '/s', $post->post_content, $matches, PREG_SET_ORDER ) ) {
@@ -3606,8 +3650,9 @@ 
 				} else {
 					preg_match_all( '#src=([\'"])(.+?)\1#is', $gallery, $src, PREG_SET_ORDER );
 					if ( ! empty( $src ) ) {
-						foreach ( $src as $s )
-							$srcs[] = $s[2];
+						foreach ( $src as $s ) {
+													$srcs[] = $s[2];
+						}
 					}
 
 					$data = shortcode_parse_atts( $shortcode[3] );

src/wp-includes/option.php

Doc Comments +1 added lines, -1 removed lines

@@ -1071,7 +1071,7 @@
  * @param int      $network_id ID of the network. Can be null to default to the current network ID.
  * @param string   $option     Name of option to retrieve. Expected to not be SQL-escaped.
  * @param mixed    $default    Optional. Value to return if the option doesn't exist. Default false.
- * @return mixed Value set for the option.
+ * @return string Value set for the option.
  */
 function get_network_option( $network_id, $option, $default = false ) {
 	global $wpdb, $current_site;

Indentation +5 added lines, -5 removed lines

@@ -1,10 +1,10 @@
 <?php
 /**
- * Option API
- *
- * @package WordPress
- * @subpackage Option
- */
+	 * Option API
+	 *
+	 * @package WordPress
+	 * @subpackage Option
+	 */
 
 /**
  * Retrieve option value based on name of option.

Spacing +354 added lines, -354 removed lines

@@ -27,11 +27,11 @@ 
  * @param mixed  $default Optional. Default value to return if the option does not exist.
  * @return mixed Value set for the option.
  */
-function get_option( $option, $default = false ) {
+function get_option($option, $default = false) {
 	global $wpdb;
 
-	$option = trim( $option );
-	if ( empty( $option ) )
+	$option = trim($option);
+	if (empty($option))
 		return false;
 
 	/**
@@ -49,17 +49,17 @@ 
 	 *                               Default false to skip it.
 	 * @param string     $option     Option name.
 	 */
-	$pre = apply_filters( 'pre_option_' . $option, false, $option );
-	if ( false !== $pre )
+	$pre = apply_filters('pre_option_'.$option, false, $option);
+	if (false !== $pre)
 		return $pre;
 
-	if ( defined( 'WP_SETUP_CONFIG' ) )
+	if (defined('WP_SETUP_CONFIG'))
 		return false;
 
-	if ( ! wp_installing() ) {
+	if ( ! wp_installing()) {
 		// prevent non-existent options from triggering multiple queries
-		$notoptions = wp_cache_get( 'notoptions', 'options' );
-		if ( isset( $notoptions[ $option ] ) ) {
+		$notoptions = wp_cache_get('notoptions', 'options');
+		if (isset($notoptions[$option])) {
 			/**
 			 * Filter the default value for an option.
 			 *
@@ -72,53 +72,53 @@ 
 			 *                        in the database.
 			 * @param string $option  Option name.
 			 */
-			return apply_filters( 'default_option_' . $option, $default, $option );
+			return apply_filters('default_option_'.$option, $default, $option);
 		}
 
 		$alloptions = wp_load_alloptions();
 
-		if ( isset( $alloptions[$option] ) ) {
+		if (isset($alloptions[$option])) {
 			$value = $alloptions[$option];
 		} else {
-			$value = wp_cache_get( $option, 'options' );
+			$value = wp_cache_get($option, 'options');
 
-			if ( false === $value ) {
-				$row = $wpdb->get_row( $wpdb->prepare( "SELECT option_value FROM $wpdb->options WHERE option_name = %s LIMIT 1", $option ) );
+			if (false === $value) {
+				$row = $wpdb->get_row($wpdb->prepare("SELECT option_value FROM $wpdb->options WHERE option_name = %s LIMIT 1", $option));
 
 				// Has to be get_row instead of get_var because of funkiness with 0, false, null values
-				if ( is_object( $row ) ) {
+				if (is_object($row)) {
 					$value = $row->option_value;
-					wp_cache_add( $option, $value, 'options' );
+					wp_cache_add($option, $value, 'options');
 				} else { // option does not exist, so we must cache its non-existence
-					if ( ! is_array( $notoptions ) ) {
+					if ( ! is_array($notoptions)) {
 						 $notoptions = array();
 					}
 					$notoptions[$option] = true;
-					wp_cache_set( 'notoptions', $notoptions, 'options' );
+					wp_cache_set('notoptions', $notoptions, 'options');
 
 					/** This filter is documented in wp-includes/option.php */
-					return apply_filters( 'default_option_' . $option, $default, $option );
+					return apply_filters('default_option_'.$option, $default, $option);
 				}
 			}
 		}
 	} else {
 		$suppress = $wpdb->suppress_errors();
-		$row = $wpdb->get_row( $wpdb->prepare( "SELECT option_value FROM $wpdb->options WHERE option_name = %s LIMIT 1", $option ) );
-		$wpdb->suppress_errors( $suppress );
-		if ( is_object( $row ) ) {
+		$row = $wpdb->get_row($wpdb->prepare("SELECT option_value FROM $wpdb->options WHERE option_name = %s LIMIT 1", $option));
+		$wpdb->suppress_errors($suppress);
+		if (is_object($row)) {
 			$value = $row->option_value;
 		} else {
 			/** This filter is documented in wp-includes/option.php */
-			return apply_filters( 'default_option_' . $option, $default, $option );
+			return apply_filters('default_option_'.$option, $default, $option);
 		}
 	}
 
 	// If home is not set use siteurl.
-	if ( 'home' == $option && '' == $value )
-		return get_option( 'siteurl' );
+	if ('home' == $option && '' == $value)
+		return get_option('siteurl');
 
-	if ( in_array( $option, array('siteurl', 'home', 'category_base', 'tag_base') ) )
-		$value = untrailingslashit( $value );
+	if (in_array($option, array('siteurl', 'home', 'category_base', 'tag_base')))
+		$value = untrailingslashit($value);
 
 	/**
 	 * Filter the value of an existing option.
@@ -133,7 +133,7 @@ 
 	 *                       unserialized prior to being returned.
 	 * @param string $option Option name.
 	 */
-	return apply_filters( 'option_' . $option, maybe_unserialize( $value ), $option );
+	return apply_filters('option_'.$option, maybe_unserialize($value), $option);
 }
 
 /**
@@ -146,9 +146,9 @@ 
  *
  * @param string $option Option name.
  */
-function wp_protect_special_option( $option ) {
-	if ( 'alloptions' === $option || 'notoptions' === $option )
-		wp_die( sprintf( __( '%s is a protected WP option and may not be modified' ), esc_html( $option ) ) );
+function wp_protect_special_option($option) {
+	if ('alloptions' === $option || 'notoptions' === $option)
+		wp_die(sprintf(__('%s is a protected WP option and may not be modified'), esc_html($option)));
 }
 
 /**
@@ -158,8 +158,8 @@ 
  *
  * @param string $option Option name.
  */
-function form_option( $option ) {
-	echo esc_attr( get_option( $option ) );
+function form_option($option) {
+	echo esc_attr(get_option($option));
 }
 
 /**
@@ -174,22 +174,22 @@ 
 function wp_load_alloptions() {
 	global $wpdb;
 
-	if ( ! wp_installing() || ! is_multisite() )
-		$alloptions = wp_cache_get( 'alloptions', 'options' );
+	if ( ! wp_installing() || ! is_multisite())
+		$alloptions = wp_cache_get('alloptions', 'options');
 	else
 		$alloptions = false;
 
-	if ( !$alloptions ) {
+	if ( ! $alloptions) {
 		$suppress = $wpdb->suppress_errors();
-		if ( !$alloptions_db = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options WHERE autoload = 'yes'" ) )
-			$alloptions_db = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options" );
+		if ( ! $alloptions_db = $wpdb->get_results("SELECT option_name, option_value FROM $wpdb->options WHERE autoload = 'yes'"))
+			$alloptions_db = $wpdb->get_results("SELECT option_name, option_value FROM $wpdb->options");
 		$wpdb->suppress_errors($suppress);
 		$alloptions = array();
-		foreach ( (array) $alloptions_db as $o ) {
+		foreach ((array) $alloptions_db as $o) {
 			$alloptions[$o->option_name] = $o->option_value;
 		}
-		if ( ! wp_installing() || ! is_multisite() )
-			wp_cache_add( 'alloptions', $alloptions, 'options' );
+		if ( ! wp_installing() || ! is_multisite())
+			wp_cache_add('alloptions', $alloptions, 'options');
 	}
 
 	return $alloptions;
@@ -204,26 +204,26 @@ 
  *
  * @param int $site_id Optional site ID for which to query the options. Defaults to the current site.
  */
-function wp_load_core_site_options( $site_id = null ) {
+function wp_load_core_site_options($site_id = null) {
 	global $wpdb;
 
-	if ( ! is_multisite() || wp_using_ext_object_cache() || wp_installing() )
+	if ( ! is_multisite() || wp_using_ext_object_cache() || wp_installing())
 		return;
 
-	if ( empty($site_id) )
+	if (empty($site_id))
 		$site_id = $wpdb->siteid;
 
-	$core_options = array('site_name', 'siteurl', 'active_sitewide_plugins', '_site_transient_timeout_theme_roots', '_site_transient_theme_roots', 'site_admins', 'can_compress_scripts', 'global_terms_enabled', 'ms_files_rewriting' );
+	$core_options = array('site_name', 'siteurl', 'active_sitewide_plugins', '_site_transient_timeout_theme_roots', '_site_transient_theme_roots', 'site_admins', 'can_compress_scripts', 'global_terms_enabled', 'ms_files_rewriting');
 
-	$core_options_in = "'" . implode("', '", $core_options) . "'";
-	$options = $wpdb->get_results( $wpdb->prepare("SELECT meta_key, meta_value FROM $wpdb->sitemeta WHERE meta_key IN ($core_options_in) AND site_id = %d", $site_id) );
+	$core_options_in = "'".implode("', '", $core_options)."'";
+	$options = $wpdb->get_results($wpdb->prepare("SELECT meta_key, meta_value FROM $wpdb->sitemeta WHERE meta_key IN ($core_options_in) AND site_id = %d", $site_id));
 
-	foreach ( $options as $option ) {
+	foreach ($options as $option) {
 		$key = $option->meta_key;
 		$cache_key = "{$site_id}:$key";
-		$option->meta_value = maybe_unserialize( $option->meta_value );
+		$option->meta_value = maybe_unserialize($option->meta_value);
 
-		wp_cache_set( $cache_key, $option->meta_value, 'site-options' );
+		wp_cache_set($cache_key, $option->meta_value, 'site-options');
 	}
 }
 
@@ -250,20 +250,20 @@ 
  *                              the default value is 'yes'. Default null.
  * @return bool False if value was not updated and true if value was updated.
  */
-function update_option( $option, $value, $autoload = null ) {
+function update_option($option, $value, $autoload = null) {
 	global $wpdb;
 
 	$option = trim($option);
-	if ( empty($option) )
+	if (empty($option))
 		return false;
 
-	wp_protect_special_option( $option );
+	wp_protect_special_option($option);
 
-	if ( is_object( $value ) )
+	if (is_object($value))
 		$value = clone $value;
 
-	$value = sanitize_option( $option, $value );
-	$old_value = get_option( $option );
+	$value = sanitize_option($option, $value);
+	$old_value = get_option($option);
 
 	/**
 	 * Filter a specific option before its value is (maybe) serialized and updated.
@@ -277,7 +277,7 @@ 
 	 * @param mixed  $old_value The old option value.
 	 * @param string $option    Option name.
 	 */
-	$value = apply_filters( 'pre_update_option_' . $option, $value, $old_value, $option );
+	$value = apply_filters('pre_update_option_'.$option, $value, $old_value, $option);
 
 	/**
 	 * Filter an option before its value is (maybe) serialized and updated.
@@ -288,23 +288,23 @@ 
 	 * @param string $option    Name of the option.
 	 * @param mixed  $old_value The old option value.
 	 */
-	$value = apply_filters( 'pre_update_option', $value, $option, $old_value );
+	$value = apply_filters('pre_update_option', $value, $option, $old_value);
 
 	// If the new and old values are the same, no need to update.
-	if ( $value === $old_value )
+	if ($value === $old_value)
 		return false;
 
 	/** This filter is documented in wp-includes/option.php */
-	if ( apply_filters( 'default_option_' . $option, false ) === $old_value ) {
+	if (apply_filters('default_option_'.$option, false) === $old_value) {
 		// Default setting for new options is 'yes'.
-		if ( null === $autoload ) {
+		if (null === $autoload) {
 			$autoload = 'yes';
 		}
 
-		return add_option( $option, $value, '', $autoload );
+		return add_option($option, $value, '', $autoload);
 	}
 
-	$serialized_value = maybe_serialize( $value );
+	$serialized_value = maybe_serialize($value);
 
 	/**
 	 * Fires immediately before an option value is updated.
@@ -315,33 +315,33 @@ 
 	 * @param mixed  $old_value The old option value.
 	 * @param mixed  $value     The new option value.
 	 */
-	do_action( 'update_option', $option, $old_value, $value );
+	do_action('update_option', $option, $old_value, $value);
 
 	$update_args = array(
 		'option_value' => $serialized_value,
 	);
 
-	if ( null !== $autoload ) {
-		$update_args['autoload'] = ( 'no' === $autoload || false === $autoload ) ? 'no' : 'yes';
+	if (null !== $autoload) {
+		$update_args['autoload'] = ('no' === $autoload || false === $autoload) ? 'no' : 'yes';
 	}
 
-	$result = $wpdb->update( $wpdb->options, $update_args, array( 'option_name' => $option ) );
-	if ( ! $result )
+	$result = $wpdb->update($wpdb->options, $update_args, array('option_name' => $option));
+	if ( ! $result)
 		return false;
 
-	$notoptions = wp_cache_get( 'notoptions', 'options' );
-	if ( is_array( $notoptions ) && isset( $notoptions[$option] ) ) {
-		unset( $notoptions[$option] );
-		wp_cache_set( 'notoptions', $notoptions, 'options' );
+	$notoptions = wp_cache_get('notoptions', 'options');
+	if (is_array($notoptions) && isset($notoptions[$option])) {
+		unset($notoptions[$option]);
+		wp_cache_set('notoptions', $notoptions, 'options');
 	}
 
-	if ( ! wp_installing() ) {
+	if ( ! wp_installing()) {
 		$alloptions = wp_load_alloptions();
-		if ( isset( $alloptions[$option] ) ) {
-			$alloptions[ $option ] = $serialized_value;
-			wp_cache_set( 'alloptions', $alloptions, 'options' );
+		if (isset($alloptions[$option])) {
+			$alloptions[$option] = $serialized_value;
+			wp_cache_set('alloptions', $alloptions, 'options');
 		} else {
-			wp_cache_set( $option, $serialized_value, 'options' );
+			wp_cache_set($option, $serialized_value, 'options');
 		}
 	}
 
@@ -357,7 +357,7 @@ 
 	 * @param mixed  $value     The new option value.
 	 * @param string $option    Option name.
 	 */
-	do_action( "update_option_{$option}", $old_value, $value, $option );
+	do_action("update_option_{$option}", $old_value, $value, $option);
 
 	/**
 	 * Fires after the value of an option has been successfully updated.
@@ -368,7 +368,7 @@ 
 	 * @param mixed  $old_value The old option value.
 	 * @param mixed  $value     The new option value.
 	 */
-	do_action( 'updated_option', $option, $old_value, $value );
+	do_action('updated_option', $option, $old_value, $value);
 	return true;
 }
 
@@ -395,32 +395,32 @@ 
  *                                    Default is enabled. Accepts 'no' to disable for legacy reasons.
  * @return bool False if option was not added and true if option was added.
  */
-function add_option( $option, $value = '', $deprecated = '', $autoload = 'yes' ) {
+function add_option($option, $value = '', $deprecated = '', $autoload = 'yes') {
 	global $wpdb;
 
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '2.3' );
+	if ( ! empty($deprecated))
+		_deprecated_argument(__FUNCTION__, '2.3');
 
 	$option = trim($option);
-	if ( empty($option) )
+	if (empty($option))
 		return false;
 
-	wp_protect_special_option( $option );
+	wp_protect_special_option($option);
 
-	if ( is_object($value) )
+	if (is_object($value))
 		$value = clone $value;
 
-	$value = sanitize_option( $option, $value );
+	$value = sanitize_option($option, $value);
 
 	// Make sure the option doesn't already exist. We can check the 'notoptions' cache before we ask for a db query
-	$notoptions = wp_cache_get( 'notoptions', 'options' );
-	if ( !is_array( $notoptions ) || !isset( $notoptions[$option] ) )
+	$notoptions = wp_cache_get('notoptions', 'options');
+	if ( ! is_array($notoptions) || ! isset($notoptions[$option]))
 		/** This filter is documented in wp-includes/option.php */
-		if ( apply_filters( 'default_option_' . $option, false ) !== get_option( $option ) )
+		if (apply_filters('default_option_'.$option, false) !== get_option($option))
 			return false;
 
-	$serialized_value = maybe_serialize( $value );
-	$autoload = ( 'no' === $autoload || false === $autoload ) ? 'no' : 'yes';
+	$serialized_value = maybe_serialize($value);
+	$autoload = ('no' === $autoload || false === $autoload) ? 'no' : 'yes';
 
 	/**
 	 * Fires before an option is added.
@@ -430,27 +430,27 @@ 
 	 * @param string $option Name of the option to add.
 	 * @param mixed  $value  Value of the option.
 	 */
-	do_action( 'add_option', $option, $value );
+	do_action('add_option', $option, $value);
 
-	$result = $wpdb->query( $wpdb->prepare( "INSERT INTO `$wpdb->options` (`option_name`, `option_value`, `autoload`) VALUES (%s, %s, %s) ON DUPLICATE KEY UPDATE `option_name` = VALUES(`option_name`), `option_value` = VALUES(`option_value`), `autoload` = VALUES(`autoload`)", $option, $serialized_value, $autoload ) );
-	if ( ! $result )
+	$result = $wpdb->query($wpdb->prepare("INSERT INTO `$wpdb->options` (`option_name`, `option_value`, `autoload`) VALUES (%s, %s, %s) ON DUPLICATE KEY UPDATE `option_name` = VALUES(`option_name`), `option_value` = VALUES(`option_value`), `autoload` = VALUES(`autoload`)", $option, $serialized_value, $autoload));
+	if ( ! $result)
 		return false;
 
-	if ( ! wp_installing() ) {
-		if ( 'yes' == $autoload ) {
+	if ( ! wp_installing()) {
+		if ('yes' == $autoload) {
 			$alloptions = wp_load_alloptions();
-			$alloptions[ $option ] = $serialized_value;
-			wp_cache_set( 'alloptions', $alloptions, 'options' );
+			$alloptions[$option] = $serialized_value;
+			wp_cache_set('alloptions', $alloptions, 'options');
 		} else {
-			wp_cache_set( $option, $serialized_value, 'options' );
+			wp_cache_set($option, $serialized_value, 'options');
 		}
 	}
 
 	// This option exists now
-	$notoptions = wp_cache_get( 'notoptions', 'options' ); // yes, again... we need it to be fresh
-	if ( is_array( $notoptions ) && isset( $notoptions[$option] ) ) {
-		unset( $notoptions[$option] );
-		wp_cache_set( 'notoptions', $notoptions, 'options' );
+	$notoptions = wp_cache_get('notoptions', 'options'); // yes, again... we need it to be fresh
+	if (is_array($notoptions) && isset($notoptions[$option])) {
+		unset($notoptions[$option]);
+		wp_cache_set('notoptions', $notoptions, 'options');
 	}
 
 	/**
@@ -464,7 +464,7 @@ 
 	 * @param string $option Name of the option to add.
 	 * @param mixed  $value  Value of the option.
 	 */
-	do_action( "add_option_{$option}", $option, $value );
+	do_action("add_option_{$option}", $option, $value);
 
 	/**
 	 * Fires after an option has been added.
@@ -474,7 +474,7 @@ 
 	 * @param string $option Name of the added option.
 	 * @param mixed  $value  Value of the option.
 	 */
-	do_action( 'added_option', $option, $value );
+	do_action('added_option', $option, $value);
 	return true;
 }
 
@@ -488,18 +488,18 @@ 
  * @param string $option Name of option to remove. Expected to not be SQL-escaped.
  * @return bool True, if option is successfully deleted. False on failure.
  */
-function delete_option( $option ) {
+function delete_option($option) {
 	global $wpdb;
 
-	$option = trim( $option );
-	if ( empty( $option ) )
+	$option = trim($option);
+	if (empty($option))
 		return false;
 
-	wp_protect_special_option( $option );
+	wp_protect_special_option($option);
 
 	// Get the ID, if no ID then return
-	$row = $wpdb->get_row( $wpdb->prepare( "SELECT autoload FROM $wpdb->options WHERE option_name = %s", $option ) );
-	if ( is_null( $row ) )
+	$row = $wpdb->get_row($wpdb->prepare("SELECT autoload FROM $wpdb->options WHERE option_name = %s", $option));
+	if (is_null($row))
 		return false;
 
 	/**
@@ -509,21 +509,21 @@ 
 	 *
 	 * @param string $option Name of the option to delete.
 	 */
-	do_action( 'delete_option', $option );
+	do_action('delete_option', $option);
 
-	$result = $wpdb->delete( $wpdb->options, array( 'option_name' => $option ) );
-	if ( ! wp_installing() ) {
-		if ( 'yes' == $row->autoload ) {
+	$result = $wpdb->delete($wpdb->options, array('option_name' => $option));
+	if ( ! wp_installing()) {
+		if ('yes' == $row->autoload) {
 			$alloptions = wp_load_alloptions();
-			if ( is_array( $alloptions ) && isset( $alloptions[$option] ) ) {
-				unset( $alloptions[$option] );
-				wp_cache_set( 'alloptions', $alloptions, 'options' );
+			if (is_array($alloptions) && isset($alloptions[$option])) {
+				unset($alloptions[$option]);
+				wp_cache_set('alloptions', $alloptions, 'options');
 			}
 		} else {
-			wp_cache_delete( $option, 'options' );
+			wp_cache_delete($option, 'options');
 		}
 	}
-	if ( $result ) {
+	if ($result) {
 
 		/**
 		 * Fires after a specific option has been deleted.
@@ -534,7 +534,7 @@ 
 		 *
 		 * @param string $option Name of the deleted option.
 		 */
-		do_action( "delete_option_$option", $option );
+		do_action("delete_option_$option", $option);
 
 		/**
 		 * Fires after an option has been deleted.
@@ -543,7 +543,7 @@ 
 		 *
 		 * @param string $option Name of the deleted option.
 		 */
-		do_action( 'deleted_option', $option );
+		do_action('deleted_option', $option);
 		return true;
 	}
 	return false;
@@ -557,7 +557,7 @@ 
  * @param string $transient Transient name. Expected to not be SQL-escaped.
  * @return bool true if successful, false otherwise
  */
-function delete_transient( $transient ) {
+function delete_transient($transient) {
 
 	/**
 	 * Fires immediately before a specific transient is deleted.
@@ -568,19 +568,19 @@ 
 	 *
 	 * @param string $transient Transient name.
 	 */
-	do_action( 'delete_transient_' . $transient, $transient );
+	do_action('delete_transient_'.$transient, $transient);
 
-	if ( wp_using_ext_object_cache() ) {
-		$result = wp_cache_delete( $transient, 'transient' );
+	if (wp_using_ext_object_cache()) {
+		$result = wp_cache_delete($transient, 'transient');
 	} else {
-		$option_timeout = '_transient_timeout_' . $transient;
-		$option = '_transient_' . $transient;
-		$result = delete_option( $option );
-		if ( $result )
-			delete_option( $option_timeout );
+		$option_timeout = '_transient_timeout_'.$transient;
+		$option = '_transient_'.$transient;
+		$result = delete_option($option);
+		if ($result)
+			delete_option($option_timeout);
 	}
 
-	if ( $result ) {
+	if ($result) {
 
 		/**
 		 * Fires after a transient is deleted.
@@ -589,7 +589,7 @@ 
 		 *
 		 * @param string $transient Deleted transient name.
 		 */
-		do_action( 'deleted_transient', $transient );
+		do_action('deleted_transient', $transient);
 	}
 
 	return $result;
@@ -606,7 +606,7 @@ 
  * @param string $transient Transient name. Expected to not be SQL-escaped.
  * @return mixed Value of transient.
  */
-function get_transient( $transient ) {
+function get_transient($transient) {
 
 	/**
 	 * Filter the value of an existing transient.
@@ -624,30 +624,30 @@ 
 	 *                              of the transient, and return the returned value.
 	 * @param string $transient     Transient name.
 	 */
-	$pre = apply_filters( 'pre_transient_' . $transient, false, $transient );
-	if ( false !== $pre )
+	$pre = apply_filters('pre_transient_'.$transient, false, $transient);
+	if (false !== $pre)
 		return $pre;
 
-	if ( wp_using_ext_object_cache() ) {
-		$value = wp_cache_get( $transient, 'transient' );
+	if (wp_using_ext_object_cache()) {
+		$value = wp_cache_get($transient, 'transient');
 	} else {
-		$transient_option = '_transient_' . $transient;
-		if ( ! wp_installing() ) {
+		$transient_option = '_transient_'.$transient;
+		if ( ! wp_installing()) {
 			// If option is not in alloptions, it is not autoloaded and thus has a timeout
 			$alloptions = wp_load_alloptions();
-			if ( !isset( $alloptions[$transient_option] ) ) {
-				$transient_timeout = '_transient_timeout_' . $transient;
-				$timeout = get_option( $transient_timeout );
-				if ( false !== $timeout && $timeout < time() ) {
-					delete_option( $transient_option  );
-					delete_option( $transient_timeout );
+			if ( ! isset($alloptions[$transient_option])) {
+				$transient_timeout = '_transient_timeout_'.$transient;
+				$timeout = get_option($transient_timeout);
+				if (false !== $timeout && $timeout < time()) {
+					delete_option($transient_option);
+					delete_option($transient_timeout);
 					$value = false;
 				}
 			}
 		}
 
-		if ( ! isset( $value ) )
-			$value = get_option( $transient_option );
+		if ( ! isset($value))
+			$value = get_option($transient_option);
 	}
 
 	/**
@@ -661,7 +661,7 @@ 
 	 * @param mixed  $value     Value of transient.
 	 * @param string $transient Transient name.
 	 */
-	return apply_filters( 'transient_' . $transient, $value, $transient );
+	return apply_filters('transient_'.$transient, $value, $transient);
 }
 
 /**
@@ -679,7 +679,7 @@ 
  * @param int    $expiration Optional. Time until expiration in seconds. Default 0 (no expiration).
  * @return bool False if value was not set and true if value was set.
  */
-function set_transient( $transient, $value, $expiration = 0 ) {
+function set_transient($transient, $value, $expiration = 0) {
 
 	$expiration = (int) $expiration;
 
@@ -696,7 +696,7 @@ 
 	 * @param int    $expiration Time until expiration in seconds.
 	 * @param string $transient  Transient name.
 	 */
-	$value = apply_filters( 'pre_set_transient_' . $transient, $value, $expiration, $transient );
+	$value = apply_filters('pre_set_transient_'.$transient, $value, $expiration, $transient);
 
 	/**
 	 * Filter the expiration for a transient before its value is set.
@@ -709,41 +709,41 @@ 
 	 * @param mixed  $value      New value of transient.
 	 * @param string $transient  Transient name.
 	 */
-	$expiration = apply_filters( 'expiration_of_transient_' . $transient, $expiration, $value, $transient );
+	$expiration = apply_filters('expiration_of_transient_'.$transient, $expiration, $value, $transient);
 
-	if ( wp_using_ext_object_cache() ) {
-		$result = wp_cache_set( $transient, $value, 'transient', $expiration );
+	if (wp_using_ext_object_cache()) {
+		$result = wp_cache_set($transient, $value, 'transient', $expiration);
 	} else {
-		$transient_timeout = '_transient_timeout_' . $transient;
-		$transient_option = '_transient_' . $transient;
-		if ( false === get_option( $transient_option ) ) {
+		$transient_timeout = '_transient_timeout_'.$transient;
+		$transient_option = '_transient_'.$transient;
+		if (false === get_option($transient_option)) {
 			$autoload = 'yes';
-			if ( $expiration ) {
+			if ($expiration) {
 				$autoload = 'no';
-				add_option( $transient_timeout, time() + $expiration, '', 'no' );
+				add_option($transient_timeout, time() + $expiration, '', 'no');
 			}
-			$result = add_option( $transient_option, $value, '', $autoload );
+			$result = add_option($transient_option, $value, '', $autoload);
 		} else {
 			// If expiration is requested, but the transient has no timeout option,
 			// delete, then re-create transient rather than update.
 			$update = true;
-			if ( $expiration ) {
-				if ( false === get_option( $transient_timeout ) ) {
-					delete_option( $transient_option );
-					add_option( $transient_timeout, time() + $expiration, '', 'no' );
-					$result = add_option( $transient_option, $value, '', 'no' );
+			if ($expiration) {
+				if (false === get_option($transient_timeout)) {
+					delete_option($transient_option);
+					add_option($transient_timeout, time() + $expiration, '', 'no');
+					$result = add_option($transient_option, $value, '', 'no');
 					$update = false;
 				} else {
-					update_option( $transient_timeout, time() + $expiration );
+					update_option($transient_timeout, time() + $expiration);
 				}
 			}
-			if ( $update ) {
-				$result = update_option( $transient_option, $value );
+			if ($update) {
+				$result = update_option($transient_option, $value);
 			}
 		}
 	}
 
-	if ( $result ) {
+	if ($result) {
 
 		/**
 		 * Fires after the value for a specific transient has been set.
@@ -758,7 +758,7 @@ 
 		 * @param int    $expiration Time until expiration in seconds.
 		 * @param string $transient  The name of the transient.
 		 */
-		do_action( 'set_transient_' . $transient, $value, $expiration, $transient );
+		do_action('set_transient_'.$transient, $value, $expiration, $transient);
 
 		/**
 		 * Fires after the value for a transient has been set.
@@ -770,7 +770,7 @@ 
 		 * @param mixed  $value      Transient value.
 		 * @param int    $expiration Time until expiration in seconds.
 		 */
-		do_action( 'setted_transient', $transient, $value, $expiration );
+		do_action('setted_transient', $transient, $value, $expiration);
 	}
 	return $result;
 }
@@ -786,43 +786,43 @@ 
  */
 function wp_user_settings() {
 
-	if ( ! is_admin() || defined( 'DOING_AJAX' ) ) {
+	if ( ! is_admin() || defined('DOING_AJAX')) {
 		return;
 	}
 
-	if ( ! $user_id = get_current_user_id() ) {
+	if ( ! $user_id = get_current_user_id()) {
 		return;
 	}
 
-	if ( is_super_admin() && ! is_user_member_of_blog() ) {
+	if (is_super_admin() && ! is_user_member_of_blog()) {
 		return;
 	}
 
-	$settings = (string) get_user_option( 'user-settings', $user_id );
+	$settings = (string) get_user_option('user-settings', $user_id);
 
-	if ( isset( $_COOKIE['wp-settings-' . $user_id] ) ) {
-		$cookie = preg_replace( '/[^A-Za-z0-9=&_]/', '', $_COOKIE['wp-settings-' . $user_id] );
+	if (isset($_COOKIE['wp-settings-'.$user_id])) {
+		$cookie = preg_replace('/[^A-Za-z0-9=&_]/', '', $_COOKIE['wp-settings-'.$user_id]);
 
 		// No change or both empty
-		if ( $cookie == $settings )
+		if ($cookie == $settings)
 			return;
 
-		$last_saved = (int) get_user_option( 'user-settings-time', $user_id );
-		$current = isset( $_COOKIE['wp-settings-time-' . $user_id]) ? preg_replace( '/[^0-9]/', '', $_COOKIE['wp-settings-time-' . $user_id] ) : 0;
+		$last_saved = (int) get_user_option('user-settings-time', $user_id);
+		$current = isset($_COOKIE['wp-settings-time-'.$user_id]) ? preg_replace('/[^0-9]/', '', $_COOKIE['wp-settings-time-'.$user_id]) : 0;
 
 		// The cookie is newer than the saved value. Update the user_option and leave the cookie as-is
-		if ( $current > $last_saved ) {
-			update_user_option( $user_id, 'user-settings', $cookie, false );
-			update_user_option( $user_id, 'user-settings-time', time() - 5, false );
+		if ($current > $last_saved) {
+			update_user_option($user_id, 'user-settings', $cookie, false);
+			update_user_option($user_id, 'user-settings-time', time() - 5, false);
 			return;
 		}
 	}
 
 	// The cookie is not set in the current browser or the saved value is newer.
-	$secure = ( 'https' === parse_url( admin_url(), PHP_URL_SCHEME ) );
-	setcookie( 'wp-settings-' . $user_id, $settings, time() + YEAR_IN_SECONDS, SITECOOKIEPATH, null, $secure );
-	setcookie( 'wp-settings-time-' . $user_id, time(), time() + YEAR_IN_SECONDS, SITECOOKIEPATH, null, $secure );
-	$_COOKIE['wp-settings-' . $user_id] = $settings;
+	$secure = ('https' === parse_url(admin_url(), PHP_URL_SCHEME));
+	setcookie('wp-settings-'.$user_id, $settings, time() + YEAR_IN_SECONDS, SITECOOKIEPATH, null, $secure);
+	setcookie('wp-settings-time-'.$user_id, time(), time() + YEAR_IN_SECONDS, SITECOOKIEPATH, null, $secure);
+	$_COOKIE['wp-settings-'.$user_id] = $settings;
 }
 
 /**
@@ -834,10 +834,10 @@ 
  * @param string $default Optional default value to return when $name is not set.
  * @return mixed the last saved user setting or the default value/false if it doesn't exist.
  */
-function get_user_setting( $name, $default = false ) {
+function get_user_setting($name, $default = false) {
 	$all_user_settings = get_all_user_settings();
 
-	return isset( $all_user_settings[$name] ) ? $all_user_settings[$name] : $default;
+	return isset($all_user_settings[$name]) ? $all_user_settings[$name] : $default;
 }
 
 /**
@@ -852,15 +852,15 @@ 
  * @param string $value The value for the setting.
  * @return bool|void true if set successfully/false if not.
  */
-function set_user_setting( $name, $value ) {
-	if ( headers_sent() ) {
+function set_user_setting($name, $value) {
+	if (headers_sent()) {
 		return false;
 	}
 
 	$all_user_settings = get_all_user_settings();
 	$all_user_settings[$name] = $value;
 
-	return wp_set_all_user_settings( $all_user_settings );
+	return wp_set_all_user_settings($all_user_settings);
 }
 
 /**
@@ -874,8 +874,8 @@ 
  * @param string $names The name or array of names of the setting to be deleted.
  * @return bool|void true if deleted successfully/false if not.
  */
-function delete_user_setting( $names ) {
-	if ( headers_sent() ) {
+function delete_user_setting($names) {
+	if (headers_sent()) {
 		return false;
 	}
 
@@ -883,15 +883,15 @@ 
 	$names = (array) $names;
 	$deleted = false;
 
-	foreach ( $names as $name ) {
-		if ( isset( $all_user_settings[$name] ) ) {
-			unset( $all_user_settings[$name] );
+	foreach ($names as $name) {
+		if (isset($all_user_settings[$name])) {
+			unset($all_user_settings[$name]);
 			$deleted = true;
 		}
 	}
 
-	if ( $deleted ) {
-		return wp_set_all_user_settings( $all_user_settings );
+	if ($deleted) {
+		return wp_set_all_user_settings($all_user_settings);
 	}
 
 	return false;
@@ -909,27 +909,27 @@ 
 function get_all_user_settings() {
 	global $_updated_user_settings;
 
-	if ( ! $user_id = get_current_user_id() ) {
+	if ( ! $user_id = get_current_user_id()) {
 		return array();
 	}
 
-	if ( isset( $_updated_user_settings ) && is_array( $_updated_user_settings ) ) {
+	if (isset($_updated_user_settings) && is_array($_updated_user_settings)) {
 		return $_updated_user_settings;
 	}
 
 	$user_settings = array();
 
-	if ( isset( $_COOKIE['wp-settings-' . $user_id] ) ) {
-		$cookie = preg_replace( '/[^A-Za-z0-9=&_-]/', '', $_COOKIE['wp-settings-' . $user_id] );
+	if (isset($_COOKIE['wp-settings-'.$user_id])) {
+		$cookie = preg_replace('/[^A-Za-z0-9=&_-]/', '', $_COOKIE['wp-settings-'.$user_id]);
 
-		if ( strpos( $cookie, '=' ) ) { // '=' cannot be 1st char
-			parse_str( $cookie, $user_settings );
+		if (strpos($cookie, '=')) { // '=' cannot be 1st char
+			parse_str($cookie, $user_settings);
 		}
 	} else {
-		$option = get_user_option( 'user-settings', $user_id );
+		$option = get_user_option('user-settings', $user_id);
 
-		if ( $option && is_string( $option ) ) {
-			parse_str( $option, $user_settings );
+		if ($option && is_string($option)) {
+			parse_str($option, $user_settings);
 		}
 	}
 
@@ -947,32 +947,32 @@ 
  * @param array $user_settings
  * @return bool|void
  */
-function wp_set_all_user_settings( $user_settings ) {
+function wp_set_all_user_settings($user_settings) {
 	global $_updated_user_settings;
 
-	if ( ! $user_id = get_current_user_id() ) {
+	if ( ! $user_id = get_current_user_id()) {
 		return false;
 	}
 
-	if ( is_super_admin() && ! is_user_member_of_blog() ) {
+	if (is_super_admin() && ! is_user_member_of_blog()) {
 		return;
 	}
 
 	$settings = '';
-	foreach ( $user_settings as $name => $value ) {
-		$_name = preg_replace( '/[^A-Za-z0-9_-]+/', '', $name );
-		$_value = preg_replace( '/[^A-Za-z0-9_-]+/', '', $value );
+	foreach ($user_settings as $name => $value) {
+		$_name = preg_replace('/[^A-Za-z0-9_-]+/', '', $name);
+		$_value = preg_replace('/[^A-Za-z0-9_-]+/', '', $value);
 
-		if ( ! empty( $_name ) ) {
-			$settings .= $_name . '=' . $_value . '&';
+		if ( ! empty($_name)) {
+			$settings .= $_name.'='.$_value.'&';
 		}
 	}
 
-	$settings = rtrim( $settings, '&' );
-	parse_str( $settings, $_updated_user_settings );
+	$settings = rtrim($settings, '&');
+	parse_str($settings, $_updated_user_settings);
 
-	update_user_option( $user_id, 'user-settings', $settings, false );
-	update_user_option( $user_id, 'user-settings-time', time(), false );
+	update_user_option($user_id, 'user-settings', $settings, false);
+	update_user_option($user_id, 'user-settings-time', time(), false);
 
 	return true;
 }
@@ -983,12 +983,12 @@ 
  * @since 2.7.0
  */
 function delete_all_user_settings() {
-	if ( ! $user_id = get_current_user_id() ) {
+	if ( ! $user_id = get_current_user_id()) {
 		return;
 	}
 
-	update_user_option( $user_id, 'user-settings', '', false );
-	setcookie( 'wp-settings-' . $user_id, ' ', time() - YEAR_IN_SECONDS, SITECOOKIEPATH );
+	update_user_option($user_id, 'user-settings', '', false);
+	setcookie('wp-settings-'.$user_id, ' ', time() - YEAR_IN_SECONDS, SITECOOKIEPATH);
 }
 
 /**
@@ -1005,8 +1005,8 @@ 
  * @param bool   $deprecated Whether to use cache. Multisite only. Always set to true.
  * @return mixed Value set for the option.
  */
-function get_site_option( $option, $default = false, $deprecated = true ) {
-	return get_network_option( null, $option, $default );
+function get_site_option($option, $default = false, $deprecated = true) {
+	return get_network_option(null, $option, $default);
 }
 
 /**
@@ -1023,8 +1023,8 @@ 
  * @param mixed  $value  Option value, can be anything. Expected to not be SQL-escaped.
  * @return bool False if the option was not added. True if the option was added.
  */
-function add_site_option( $option, $value ) {
-	return add_network_option( null, $option, $value );
+function add_site_option($option, $value) {
+	return add_network_option(null, $option, $value);
 }
 
 /**
@@ -1038,8 +1038,8 @@ 
  * @param string $option Name of option to remove. Expected to not be SQL-escaped.
  * @return bool True, if succeed. False, if failure.
  */
-function delete_site_option( $option ) {
-	return delete_network_option( null, $option );
+function delete_site_option($option) {
+	return delete_network_option(null, $option);
 }
 
 /**
@@ -1054,8 +1054,8 @@ 
  * @param mixed  $value  Option value. Expected to not be SQL-escaped.
  * @return bool False if value was not updated. True if value was updated.
  */
-function update_site_option( $option, $value ) {
-	return update_network_option( null, $option, $value );
+function update_site_option($option, $value) {
+	return update_network_option(null, $option, $value);
 }
 
 /**
@@ -1073,17 +1073,17 @@ 
  * @param mixed    $default    Optional. Value to return if the option doesn't exist. Default false.
  * @return mixed Value set for the option.
  */
-function get_network_option( $network_id, $option, $default = false ) {
+function get_network_option($network_id, $option, $default = false) {
 	global $wpdb, $current_site;
 
-	if ( $network_id && ! is_numeric( $network_id ) ) {
+	if ($network_id && ! is_numeric($network_id)) {
 		return false;
 	}
 
 	$network_id = (int) $network_id;
 
 	// Fallback to the current network if a network ID is not specified.
-	if ( ! $network_id && is_multisite() ) {
+	if ( ! $network_id && is_multisite()) {
 		$network_id = $current_site->id;
 	}
 
@@ -1102,17 +1102,17 @@ 
 	 * @param mixed  $pre_option The default value to return if the option does not exist.
 	 * @param string $option     Option name.
 	 */
-	$pre = apply_filters( 'pre_site_option_' . $option, false, $option );
+	$pre = apply_filters('pre_site_option_'.$option, false, $option);
 
-	if ( false !== $pre ) {
+	if (false !== $pre) {
 		return $pre;
 	}
 
 	// prevent non-existent options from triggering multiple queries
 	$notoptions_key = "$network_id:notoptions";
-	$notoptions = wp_cache_get( $notoptions_key, 'site-options' );
+	$notoptions = wp_cache_get($notoptions_key, 'site-options');
 
-	if ( isset( $notoptions[ $option ] ) ) {
+	if (isset($notoptions[$option])) {
 
 		/**
 		 * Filter a specific default network option.
@@ -1126,34 +1126,34 @@ 
 		 *                        in the database.
 		 * @param string $option  Option name.
 		 */
-		return apply_filters( 'default_site_option_' . $option, $default, $option );
+		return apply_filters('default_site_option_'.$option, $default, $option);
 	}
 
-	if ( ! is_multisite() ) {
+	if ( ! is_multisite()) {
 		/** This filter is documented in wp-includes/option.php */
-		$default = apply_filters( 'default_site_option_' . $option, $default, $option );
-		$value = get_option( $option, $default );
+		$default = apply_filters('default_site_option_'.$option, $default, $option);
+		$value = get_option($option, $default);
 	} else {
 		$cache_key = "$network_id:$option";
-		$value = wp_cache_get( $cache_key, 'site-options' );
+		$value = wp_cache_get($cache_key, 'site-options');
 
-		if ( ! isset( $value ) || false === $value ) {
-			$row = $wpdb->get_row( $wpdb->prepare( "SELECT meta_value FROM $wpdb->sitemeta WHERE meta_key = %s AND site_id = %d", $option, $network_id ) );
+		if ( ! isset($value) || false === $value) {
+			$row = $wpdb->get_row($wpdb->prepare("SELECT meta_value FROM $wpdb->sitemeta WHERE meta_key = %s AND site_id = %d", $option, $network_id));
 
 			// Has to be get_row instead of get_var because of funkiness with 0, false, null values
-			if ( is_object( $row ) ) {
+			if (is_object($row)) {
 				$value = $row->meta_value;
-				$value = maybe_unserialize( $value );
-				wp_cache_set( $cache_key, $value, 'site-options' );
+				$value = maybe_unserialize($value);
+				wp_cache_set($cache_key, $value, 'site-options');
 			} else {
-				if ( ! is_array( $notoptions ) ) {
+				if ( ! is_array($notoptions)) {
 					$notoptions = array();
 				}
-				$notoptions[ $option ] = true;
-				wp_cache_set( $notoptions_key, $notoptions, 'site-options' );
+				$notoptions[$option] = true;
+				wp_cache_set($notoptions_key, $notoptions, 'site-options');
 
 				/** This filter is documented in wp-includes/option.php */
-				$value = apply_filters( 'default_site_option_' . $option, $default, $option );
+				$value = apply_filters('default_site_option_'.$option, $default, $option);
 			}
 		}
 	}
@@ -1170,7 +1170,7 @@ 
 	 * @param mixed  $value  Value of network option.
 	 * @param string $option Option name.
 	 */
-	return apply_filters( 'site_option_' . $option, $value, $option );
+	return apply_filters('site_option_'.$option, $value, $option);
 }
 
 /**
@@ -1190,21 +1190,21 @@ 
  * @param mixed  $value      Option value, can be anything. Expected to not be SQL-escaped.
  * @return bool False if option was not added and true if option was added.
  */
-function add_network_option( $network_id, $option, $value ) {
+function add_network_option($network_id, $option, $value) {
 	global $wpdb, $current_site;
 
-	if ( $network_id && ! is_numeric( $network_id ) ) {
+	if ($network_id && ! is_numeric($network_id)) {
 		return false;
 	}
 
 	$network_id = (int) $network_id;
 
 	// Fallback to the current network if a network ID is not specified.
-	if ( ! $network_id && is_multisite() ) {
+	if ( ! $network_id && is_multisite()) {
 		$network_id = $current_site->id;
 	}
 
-	wp_protect_special_option( $option );
+	wp_protect_special_option($option);
 
 	/**
 	 * Filter the value of a specific network option before it is added.
@@ -1218,43 +1218,43 @@ 
 	 * @param mixed  $value  Value of network option.
 	 * @param string $option Option name.
 	 */
-	$value = apply_filters( 'pre_add_site_option_' . $option, $value, $option );
+	$value = apply_filters('pre_add_site_option_'.$option, $value, $option);
 
 	$notoptions_key = "$network_id:notoptions";
 
-	if ( ! is_multisite() ) {
-		$result = add_option( $option, $value );
+	if ( ! is_multisite()) {
+		$result = add_option($option, $value);
 	} else {
 		$cache_key = "$network_id:$option";
 
 		// Make sure the option doesn't already exist. We can check the 'notoptions' cache before we ask for a db query
-		$notoptions = wp_cache_get( $notoptions_key, 'site-options' );
-		if ( ! is_array( $notoptions ) || ! isset( $notoptions[ $option ] ) ) {
-			if ( false !== get_network_option( $network_id, $option, false ) ) {
+		$notoptions = wp_cache_get($notoptions_key, 'site-options');
+		if ( ! is_array($notoptions) || ! isset($notoptions[$option])) {
+			if (false !== get_network_option($network_id, $option, false)) {
 				return false;
 			}
 		}
 
-		$value = sanitize_option( $option, $value );
+		$value = sanitize_option($option, $value);
 
-		$serialized_value = maybe_serialize( $value );
-		$result = $wpdb->insert( $wpdb->sitemeta, array( 'site_id'    => $network_id, 'meta_key'   => $option, 'meta_value' => $serialized_value ) );
+		$serialized_value = maybe_serialize($value);
+		$result = $wpdb->insert($wpdb->sitemeta, array('site_id'    => $network_id, 'meta_key'   => $option, 'meta_value' => $serialized_value));
 
-		if ( ! $result ) {
+		if ( ! $result) {
 			return false;
 		}
 
-		wp_cache_set( $cache_key, $value, 'site-options' );
+		wp_cache_set($cache_key, $value, 'site-options');
 
 		// This option exists now
-		$notoptions = wp_cache_get( $notoptions_key, 'site-options' ); // yes, again... we need it to be fresh
-		if ( is_array( $notoptions ) && isset( $notoptions[ $option ] ) ) {
-			unset( $notoptions[ $option ] );
-			wp_cache_set( $notoptions_key, $notoptions, 'site-options' );
+		$notoptions = wp_cache_get($notoptions_key, 'site-options'); // yes, again... we need it to be fresh
+		if (is_array($notoptions) && isset($notoptions[$option])) {
+			unset($notoptions[$option]);
+			wp_cache_set($notoptions_key, $notoptions, 'site-options');
 		}
 	}
 
-	if ( $result ) {
+	if ($result) {
 
 		/**
 		 * Fires after a specific network option has been successfully added.
@@ -1267,7 +1267,7 @@ 
 		 * @param string $option Name of the network option.
 		 * @param mixed  $value  Value of the network option.
 		 */
-		do_action( 'add_site_option_' . $option, $option, $value );
+		do_action('add_site_option_'.$option, $option, $value);
 
 		/**
 		 * Fires after a network option has been successfully added.
@@ -1277,7 +1277,7 @@ 
 		 * @param string $option Name of the network option.
 		 * @param mixed  $value  Value of the network option.
 		 */
-		do_action( 'add_site_option', $option, $value );
+		do_action('add_site_option', $option, $value);
 
 		return true;
 	}
@@ -1299,17 +1299,17 @@ 
  * @param string $option     Name of option to remove. Expected to not be SQL-escaped.
  * @return bool True, if succeed. False, if failure.
  */
-function delete_network_option( $network_id, $option ) {
+function delete_network_option($network_id, $option) {
 	global $wpdb, $current_site;
 
-	if ( $network_id && ! is_numeric( $network_id ) ) {
+	if ($network_id && ! is_numeric($network_id)) {
 		return false;
 	}
 
 	$network_id = (int) $network_id;
 
 	// Fallback to the current network if a network ID is not specified.
-	if ( ! $network_id && is_multisite() ) {
+	if ( ! $network_id && is_multisite()) {
 		$network_id = $current_site->id;
 	}
 
@@ -1323,22 +1323,22 @@ 
 	 *
 	 * @param string $option Option name.
 	 */
-	do_action( 'pre_delete_site_option_' . $option, $option );
+	do_action('pre_delete_site_option_'.$option, $option);
 
-	if ( ! is_multisite() ) {
-		$result = delete_option( $option );
+	if ( ! is_multisite()) {
+		$result = delete_option($option);
 	} else {
-		$row = $wpdb->get_row( $wpdb->prepare( "SELECT meta_id FROM {$wpdb->sitemeta} WHERE meta_key = %s AND site_id = %d", $option, $network_id ) );
-		if ( is_null( $row ) || ! $row->meta_id ) {
+		$row = $wpdb->get_row($wpdb->prepare("SELECT meta_id FROM {$wpdb->sitemeta} WHERE meta_key = %s AND site_id = %d", $option, $network_id));
+		if (is_null($row) || ! $row->meta_id) {
 			return false;
 		}
 		$cache_key = "$network_id:$option";
-		wp_cache_delete( $cache_key, 'site-options' );
+		wp_cache_delete($cache_key, 'site-options');
 
-		$result = $wpdb->delete( $wpdb->sitemeta, array( 'meta_key' => $option, 'site_id' => $network_id ) );
+		$result = $wpdb->delete($wpdb->sitemeta, array('meta_key' => $option, 'site_id' => $network_id));
 	}
 
-	if ( $result ) {
+	if ($result) {
 
 		/**
 		 * Fires after a specific network option has been deleted.
@@ -1350,7 +1350,7 @@ 
 		 *
 		 * @param string $option Name of the network option.
 		 */
-		do_action( 'delete_site_option_' . $option, $option );
+		do_action('delete_site_option_'.$option, $option);
 
 		/**
 		 * Fires after a network option has been deleted.
@@ -1359,7 +1359,7 @@ 
 		 *
 		 * @param string $option Name of the network option.
 		 */
-		do_action( 'delete_site_option', $option );
+		do_action('delete_site_option', $option);
 
 		return true;
 	}
@@ -1382,23 +1382,23 @@ 
  * @param mixed    $value      Option value. Expected to not be SQL-escaped.
  * @return bool False if value was not updated and true if value was updated.
  */
-function update_network_option( $network_id, $option, $value ) {
+function update_network_option($network_id, $option, $value) {
 	global $wpdb, $current_site;
 
-	if ( $network_id && ! is_numeric( $network_id ) ) {
+	if ($network_id && ! is_numeric($network_id)) {
 		return false;
 	}
 
 	$network_id = (int) $network_id;
 
 	// Fallback to the current network if a network ID is not specified.
-	if ( ! $network_id && is_multisite() ) {
+	if ( ! $network_id && is_multisite()) {
 		$network_id = $current_site->id;
 	}
 
-	wp_protect_special_option( $option );
+	wp_protect_special_option($option);
 
-	$old_value = get_network_option( $network_id, $option, false );
+	$old_value = get_network_option($network_id, $option, false);
 
 	/**
 	 * Filter a specific network option before its value is updated.
@@ -1413,38 +1413,38 @@ 
 	 * @param mixed  $old_value Old value of the network option.
 	 * @param string $option    Option name.
 	 */
-	$value = apply_filters( 'pre_update_site_option_' . $option, $value, $old_value, $option );
+	$value = apply_filters('pre_update_site_option_'.$option, $value, $old_value, $option);
 
-	if ( $value === $old_value ) {
+	if ($value === $old_value) {
 		return false;
 	}
 
-	if ( false === $old_value ) {
-		return add_network_option( $network_id, $option, $value );
+	if (false === $old_value) {
+		return add_network_option($network_id, $option, $value);
 	}
 
 	$notoptions_key = "$network_id:notoptions";
-	$notoptions = wp_cache_get( $notoptions_key, 'site-options' );
-	if ( is_array( $notoptions ) && isset( $notoptions[ $option ] ) ) {
-		unset( $notoptions[ $option ] );
-		wp_cache_set( $notoptions_key, $notoptions, 'site-options' );
+	$notoptions = wp_cache_get($notoptions_key, 'site-options');
+	if (is_array($notoptions) && isset($notoptions[$option])) {
+		unset($notoptions[$option]);
+		wp_cache_set($notoptions_key, $notoptions, 'site-options');
 	}
 
-	if ( ! is_multisite() ) {
-		$result = update_option( $option, $value );
+	if ( ! is_multisite()) {
+		$result = update_option($option, $value);
 	} else {
-		$value = sanitize_option( $option, $value );
+		$value = sanitize_option($option, $value);
 
-		$serialized_value = maybe_serialize( $value );
-		$result = $wpdb->update( $wpdb->sitemeta, array( 'meta_value' => $serialized_value ), array( 'site_id' => $network_id, 'meta_key' => $option ) );
+		$serialized_value = maybe_serialize($value);
+		$result = $wpdb->update($wpdb->sitemeta, array('meta_value' => $serialized_value), array('site_id' => $network_id, 'meta_key' => $option));
 
-		if ( $result ) {
+		if ($result) {
 			$cache_key = "$network_id:$option";
-			wp_cache_set( $cache_key, $value, 'site-options' );
+			wp_cache_set($cache_key, $value, 'site-options');
 		}
 	}
 
-	if ( $result ) {
+	if ($result) {
 
 		/**
 		 * Fires after the value of a specific network option has been successfully updated.
@@ -1458,7 +1458,7 @@ 
 		 * @param mixed  $value     Current value of the network option.
 		 * @param mixed  $old_value Old value of the network option.
 		 */
-		do_action( 'update_site_option_' . $option, $option, $value, $old_value );
+		do_action('update_site_option_'.$option, $option, $value, $old_value);
 
 		/**
 		 * Fires after the value of a network option has been successfully updated.
@@ -1469,7 +1469,7 @@ 
 		 * @param mixed  $value     Current value of the network option.
 		 * @param mixed  $old_value Old value of the network option.
 		 */
-		do_action( 'update_site_option', $option, $value, $old_value );
+		do_action('update_site_option', $option, $value, $old_value);
 
 		return true;
 	}
@@ -1485,7 +1485,7 @@ 
  * @param string $transient Transient name. Expected to not be SQL-escaped.
  * @return bool True if successful, false otherwise
  */
-function delete_site_transient( $transient ) {
+function delete_site_transient($transient) {
 
 	/**
 	 * Fires immediately before a specific site transient is deleted.
@@ -1496,18 +1496,18 @@ 
 	 *
 	 * @param string $transient Transient name.
 	 */
-	do_action( 'delete_site_transient_' . $transient, $transient );
+	do_action('delete_site_transient_'.$transient, $transient);
 
-	if ( wp_using_ext_object_cache() ) {
-		$result = wp_cache_delete( $transient, 'site-transient' );
+	if (wp_using_ext_object_cache()) {
+		$result = wp_cache_delete($transient, 'site-transient');
 	} else {
-		$option_timeout = '_site_transient_timeout_' . $transient;
-		$option = '_site_transient_' . $transient;
-		$result = delete_site_option( $option );
-		if ( $result )
-			delete_site_option( $option_timeout );
+		$option_timeout = '_site_transient_timeout_'.$transient;
+		$option = '_site_transient_'.$transient;
+		$result = delete_site_option($option);
+		if ($result)
+			delete_site_option($option_timeout);
 	}
-	if ( $result ) {
+	if ($result) {
 
 		/**
 		 * Fires after a transient is deleted.
@@ -1516,7 +1516,7 @@ 
 		 *
 		 * @param string $transient Deleted transient name.
 		 */
-		do_action( 'deleted_site_transient', $transient );
+		do_action('deleted_site_transient', $transient);
 	}
 
 	return $result;
@@ -1535,7 +1535,7 @@ 
  * @param string $transient Transient name. Expected to not be SQL-escaped.
  * @return mixed Value of transient.
  */
-function get_site_transient( $transient ) {
+function get_site_transient($transient) {
 
 	/**
 	 * Filter the value of an existing site transient.
@@ -1553,29 +1553,29 @@ 
 	 *                                   of the transient, and return the returned value.
 	 * @param string $transient          Transient name.
 	 */
-	$pre = apply_filters( 'pre_site_transient_' . $transient, false, $transient );
+	$pre = apply_filters('pre_site_transient_'.$transient, false, $transient);
 
-	if ( false !== $pre )
+	if (false !== $pre)
 		return $pre;
 
-	if ( wp_using_ext_object_cache() ) {
-		$value = wp_cache_get( $transient, 'site-transient' );
+	if (wp_using_ext_object_cache()) {
+		$value = wp_cache_get($transient, 'site-transient');
 	} else {
 		// Core transients that do not have a timeout. Listed here so querying timeouts can be avoided.
 		$no_timeout = array('update_core', 'update_plugins', 'update_themes');
-		$transient_option = '_site_transient_' . $transient;
-		if ( ! in_array( $transient, $no_timeout ) ) {
-			$transient_timeout = '_site_transient_timeout_' . $transient;
-			$timeout = get_site_option( $transient_timeout );
-			if ( false !== $timeout && $timeout < time() ) {
-				delete_site_option( $transient_option  );
-				delete_site_option( $transient_timeout );
+		$transient_option = '_site_transient_'.$transient;
+		if ( ! in_array($transient, $no_timeout)) {
+			$transient_timeout = '_site_transient_timeout_'.$transient;
+			$timeout = get_site_option($transient_timeout);
+			if (false !== $timeout && $timeout < time()) {
+				delete_site_option($transient_option);
+				delete_site_option($transient_timeout);
 				$value = false;
 			}
 		}
 
-		if ( ! isset( $value ) )
-			$value = get_site_option( $transient_option );
+		if ( ! isset($value))
+			$value = get_site_option($transient_option);
 	}
 
 	/**
@@ -1589,7 +1589,7 @@ 
 	 * @param mixed  $value     Value of site transient.
 	 * @param string $transient Transient name.
 	 */
-	return apply_filters( 'site_transient_' . $transient, $value, $transient );
+	return apply_filters('site_transient_'.$transient, $value, $transient);
 }
 
 /**
@@ -1608,7 +1608,7 @@ 
  * @param int    $expiration Optional. Time until expiration in seconds. Default 0 (no expiration).
  * @return bool False if value was not set and true if value was set.
  */
-function set_site_transient( $transient, $value, $expiration = 0 ) {
+function set_site_transient($transient, $value, $expiration = 0) {
 
 	/**
 	 * Filter the value of a specific site transient before it is set.
@@ -1621,7 +1621,7 @@ 
 	 * @param mixed  $value     New value of site transient.
 	 * @param string $transient Transient name.
 	 */
-	$value = apply_filters( 'pre_set_site_transient_' . $transient, $value, $transient );
+	$value = apply_filters('pre_set_site_transient_'.$transient, $value, $transient);
 
 	$expiration = (int) $expiration;
 
@@ -1636,24 +1636,24 @@ 
 	 * @param mixed  $value      New value of site transient.
 	 * @param string $transient  Transient name.
 	 */
-	$expiration = apply_filters( 'expiration_of_site_transient_' . $transient, $expiration, $value, $transient );
+	$expiration = apply_filters('expiration_of_site_transient_'.$transient, $expiration, $value, $transient);
 
-	if ( wp_using_ext_object_cache() ) {
-		$result = wp_cache_set( $transient, $value, 'site-transient', $expiration );
+	if (wp_using_ext_object_cache()) {
+		$result = wp_cache_set($transient, $value, 'site-transient', $expiration);
 	} else {
-		$transient_timeout = '_site_transient_timeout_' . $transient;
-		$option = '_site_transient_' . $transient;
-		if ( false === get_site_option( $option ) ) {
-			if ( $expiration )
-				add_site_option( $transient_timeout, time() + $expiration );
-			$result = add_site_option( $option, $value );
+		$transient_timeout = '_site_transient_timeout_'.$transient;
+		$option = '_site_transient_'.$transient;
+		if (false === get_site_option($option)) {
+			if ($expiration)
+				add_site_option($transient_timeout, time() + $expiration);
+			$result = add_site_option($option, $value);
 		} else {
-			if ( $expiration )
-				update_site_option( $transient_timeout, time() + $expiration );
-			$result = update_site_option( $option, $value );
+			if ($expiration)
+				update_site_option($transient_timeout, time() + $expiration);
+			$result = update_site_option($option, $value);
 		}
 	}
-	if ( $result ) {
+	if ($result) {
 
 		/**
 		 * Fires after the value for a specific site transient has been set.
@@ -1667,7 +1667,7 @@ 
 		 * @param int    $expiration Time until expiration in seconds.
 		 * @param string $transient  Transient name.
 		 */
-		do_action( 'set_site_transient_' . $transient, $value, $expiration, $transient );
+		do_action('set_site_transient_'.$transient, $value, $expiration, $transient);
 
 		/**
 		 * Fires after the value for a site transient has been set.
@@ -1678,7 +1678,7 @@ 
 		 * @param mixed  $value      Site transient value.
 		 * @param int    $expiration Time until expiration in seconds.
 		 */
-		do_action( 'setted_site_transient', $transient, $value, $expiration );
+		do_action('setted_site_transient', $transient, $value, $expiration);
 	}
 	return $result;
 }

Braces +96 added lines, -65 removed lines

@@ -31,8 +31,9 @@ 
 	global $wpdb;
 
 	$option = trim( $option );
-	if ( empty( $option ) )
-		return false;
+	if ( empty( $option ) ) {
+			return false;
+	}
 
 	/**
 	 * Filter the value of an existing option before it is retrieved.
@@ -50,11 +51,13 @@ 
 	 * @param string     $option     Option name.
 	 */
 	$pre = apply_filters( 'pre_option_' . $option, false, $option );
-	if ( false !== $pre )
-		return $pre;
+	if ( false !== $pre ) {
+			return $pre;
+	}
 
-	if ( defined( 'WP_SETUP_CONFIG' ) )
-		return false;
+	if ( defined( 'WP_SETUP_CONFIG' ) ) {
+			return false;
+	}
 
 	if ( ! wp_installing() ) {
 		// prevent non-existent options from triggering multiple queries
@@ -114,11 +117,13 @@ 
 	}
 
 	// If home is not set use siteurl.
-	if ( 'home' == $option && '' == $value )
-		return get_option( 'siteurl' );
+	if ( 'home' == $option && '' == $value ) {
+			return get_option( 'siteurl' );
+	}
 
-	if ( in_array( $option, array('siteurl', 'home', 'category_base', 'tag_base') ) )
-		$value = untrailingslashit( $value );
+	if ( in_array( $option, array('siteurl', 'home', 'category_base', 'tag_base') ) ) {
+			$value = untrailingslashit( $value );
+	}
 
 	/**
 	 * Filter the value of an existing option.
@@ -147,9 +152,10 @@ 
  * @param string $option Option name.
  */
 function wp_protect_special_option( $option ) {
-	if ( 'alloptions' === $option || 'notoptions' === $option )
-		wp_die( sprintf( __( '%s is a protected WP option and may not be modified' ), esc_html( $option ) ) );
-}
+	if ( 'alloptions' === $option || 'notoptions' === $option ) {
+			wp_die( sprintf( __( '%s is a protected WP option and may not be modified' ), esc_html( $option ) ) );
+	}
+	}
 
 /**
  * Print option value after sanitizing for forms.
@@ -174,22 +180,25 @@ 
 function wp_load_alloptions() {
 	global $wpdb;
 
-	if ( ! wp_installing() || ! is_multisite() )
-		$alloptions = wp_cache_get( 'alloptions', 'options' );
-	else
-		$alloptions = false;
+	if ( ! wp_installing() || ! is_multisite() ) {
+			$alloptions = wp_cache_get( 'alloptions', 'options' );
+	} else {
+			$alloptions = false;
+	}
 
 	if ( !$alloptions ) {
 		$suppress = $wpdb->suppress_errors();
-		if ( !$alloptions_db = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options WHERE autoload = 'yes'" ) )
-			$alloptions_db = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options" );
+		if ( !$alloptions_db = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options WHERE autoload = 'yes'" ) ) {
+					$alloptions_db = $wpdb->get_results( "SELECT option_name, option_value FROM $wpdb->options" );
+		}
 		$wpdb->suppress_errors($suppress);
 		$alloptions = array();
 		foreach ( (array) $alloptions_db as $o ) {
 			$alloptions[$o->option_name] = $o->option_value;
 		}
-		if ( ! wp_installing() || ! is_multisite() )
-			wp_cache_add( 'alloptions', $alloptions, 'options' );
+		if ( ! wp_installing() || ! is_multisite() ) {
+					wp_cache_add( 'alloptions', $alloptions, 'options' );
+		}
 	}
 
 	return $alloptions;
@@ -207,11 +216,13 @@ 
 function wp_load_core_site_options( $site_id = null ) {
 	global $wpdb;
 
-	if ( ! is_multisite() || wp_using_ext_object_cache() || wp_installing() )
-		return;
+	if ( ! is_multisite() || wp_using_ext_object_cache() || wp_installing() ) {
+			return;
+	}
 
-	if ( empty($site_id) )
-		$site_id = $wpdb->siteid;
+	if ( empty($site_id) ) {
+			$site_id = $wpdb->siteid;
+	}
 
 	$core_options = array('site_name', 'siteurl', 'active_sitewide_plugins', '_site_transient_timeout_theme_roots', '_site_transient_theme_roots', 'site_admins', 'can_compress_scripts', 'global_terms_enabled', 'ms_files_rewriting' );
 
@@ -254,13 +265,15 @@ 
 	global $wpdb;
 
 	$option = trim($option);
-	if ( empty($option) )
-		return false;
+	if ( empty($option) ) {
+			return false;
+	}
 
 	wp_protect_special_option( $option );
 
-	if ( is_object( $value ) )
-		$value = clone $value;
+	if ( is_object( $value ) ) {
+			$value = clone $value;
+	}
 
 	$value = sanitize_option( $option, $value );
 	$old_value = get_option( $option );
@@ -291,8 +304,9 @@ 
 	$value = apply_filters( 'pre_update_option', $value, $option, $old_value );
 
 	// If the new and old values are the same, no need to update.
-	if ( $value === $old_value )
-		return false;
+	if ( $value === $old_value ) {
+			return false;
+	}
 
 	/** This filter is documented in wp-includes/option.php */
 	if ( apply_filters( 'default_option_' . $option, false ) === $old_value ) {
@@ -326,8 +340,9 @@ 
 	}
 
 	$result = $wpdb->update( $wpdb->options, $update_args, array( 'option_name' => $option ) );
-	if ( ! $result )
-		return false;
+	if ( ! $result ) {
+			return false;
+	}
 
 	$notoptions = wp_cache_get( 'notoptions', 'options' );
 	if ( is_array( $notoptions ) && isset( $notoptions[$option] ) ) {
@@ -398,26 +413,30 @@ 
 function add_option( $option, $value = '', $deprecated = '', $autoload = 'yes' ) {
 	global $wpdb;
 
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '2.3' );
+	if ( !empty( $deprecated ) ) {
+			_deprecated_argument( __FUNCTION__, '2.3' );
+	}
 
 	$option = trim($option);
-	if ( empty($option) )
-		return false;
+	if ( empty($option) ) {
+			return false;
+	}
 
 	wp_protect_special_option( $option );
 
-	if ( is_object($value) )
-		$value = clone $value;
+	if ( is_object($value) ) {
+			$value = clone $value;
+	}
 
 	$value = sanitize_option( $option, $value );
 
 	// Make sure the option doesn't already exist. We can check the 'notoptions' cache before we ask for a db query
 	$notoptions = wp_cache_get( 'notoptions', 'options' );
-	if ( !is_array( $notoptions ) || !isset( $notoptions[$option] ) )
-		/** This filter is documented in wp-includes/option.php */
+	if ( !is_array( $notoptions ) || !isset( $notoptions[$option] ) ) {
+			/** This filter is documented in wp-includes/option.php */
 		if ( apply_filters( 'default_option_' . $option, false ) !== get_option( $option ) )
 			return false;
+	}
 
 	$serialized_value = maybe_serialize( $value );
 	$autoload = ( 'no' === $autoload || false === $autoload ) ? 'no' : 'yes';
@@ -433,8 +452,9 @@ 
 	do_action( 'add_option', $option, $value );
 
 	$result = $wpdb->query( $wpdb->prepare( "INSERT INTO `$wpdb->options` (`option_name`, `option_value`, `autoload`) VALUES (%s, %s, %s) ON DUPLICATE KEY UPDATE `option_name` = VALUES(`option_name`), `option_value` = VALUES(`option_value`), `autoload` = VALUES(`autoload`)", $option, $serialized_value, $autoload ) );
-	if ( ! $result )
-		return false;
+	if ( ! $result ) {
+			return false;
+	}
 
 	if ( ! wp_installing() ) {
 		if ( 'yes' == $autoload ) {
@@ -492,15 +512,17 @@ 
 	global $wpdb;
 
 	$option = trim( $option );
-	if ( empty( $option ) )
-		return false;
+	if ( empty( $option ) ) {
+			return false;
+	}
 
 	wp_protect_special_option( $option );
 
 	// Get the ID, if no ID then return
 	$row = $wpdb->get_row( $wpdb->prepare( "SELECT autoload FROM $wpdb->options WHERE option_name = %s", $option ) );
-	if ( is_null( $row ) )
-		return false;
+	if ( is_null( $row ) ) {
+			return false;
+	}
 
 	/**
 	 * Fires immediately before an option is deleted.
@@ -576,8 +598,9 @@ 
 		$option_timeout = '_transient_timeout_' . $transient;
 		$option = '_transient_' . $transient;
 		$result = delete_option( $option );
-		if ( $result )
-			delete_option( $option_timeout );
+		if ( $result ) {
+					delete_option( $option_timeout );
+		}
 	}
 
 	if ( $result ) {
@@ -625,8 +648,9 @@ 
 	 * @param string $transient     Transient name.
 	 */
 	$pre = apply_filters( 'pre_transient_' . $transient, false, $transient );
-	if ( false !== $pre )
-		return $pre;
+	if ( false !== $pre ) {
+			return $pre;
+	}
 
 	if ( wp_using_ext_object_cache() ) {
 		$value = wp_cache_get( $transient, 'transient' );
@@ -646,8 +670,9 @@ 
 			}
 		}
 
-		if ( ! isset( $value ) )
-			$value = get_option( $transient_option );
+		if ( ! isset( $value ) ) {
+					$value = get_option( $transient_option );
+		}
 	}
 
 	/**
@@ -804,8 +829,9 @@ 
 		$cookie = preg_replace( '/[^A-Za-z0-9=&_]/', '', $_COOKIE['wp-settings-' . $user_id] );
 
 		// No change or both empty
-		if ( $cookie == $settings )
-			return;
+		if ( $cookie == $settings ) {
+					return;
+		}
 
 		$last_saved = (int) get_user_option( 'user-settings-time', $user_id );
 		$current = isset( $_COOKIE['wp-settings-time-' . $user_id]) ? preg_replace( '/[^0-9]/', '', $_COOKIE['wp-settings-time-' . $user_id] ) : 0;
@@ -1504,8 +1530,9 @@ 
 		$option_timeout = '_site_transient_timeout_' . $transient;
 		$option = '_site_transient_' . $transient;
 		$result = delete_site_option( $option );
-		if ( $result )
-			delete_site_option( $option_timeout );
+		if ( $result ) {
+					delete_site_option( $option_timeout );
+		}
 	}
 	if ( $result ) {
 
@@ -1555,8 +1582,9 @@ 
 	 */
 	$pre = apply_filters( 'pre_site_transient_' . $transient, false, $transient );
 
-	if ( false !== $pre )
-		return $pre;
+	if ( false !== $pre ) {
+			return $pre;
+	}
 
 	if ( wp_using_ext_object_cache() ) {
 		$value = wp_cache_get( $transient, 'site-transient' );
@@ -1574,8 +1602,9 @@ 
 			}
 		}
 
-		if ( ! isset( $value ) )
-			$value = get_site_option( $transient_option );
+		if ( ! isset( $value ) ) {
+					$value = get_site_option( $transient_option );
+		}
 	}
 
 	/**
@@ -1644,12 +1673,14 @@ 
 		$transient_timeout = '_site_transient_timeout_' . $transient;
 		$option = '_site_transient_' . $transient;
 		if ( false === get_site_option( $option ) ) {
-			if ( $expiration )
-				add_site_option( $transient_timeout, time() + $expiration );
+			if ( $expiration ) {
+							add_site_option( $transient_timeout, time() + $expiration );
+			}
 			$result = add_site_option( $option, $value );
 		} else {
-			if ( $expiration )
-				update_site_option( $transient_timeout, time() + $expiration );
+			if ( $expiration ) {
+							update_site_option( $transient_timeout, time() + $expiration );
+			}
 			$result = update_site_option( $option, $value );
 		}
 	}

src/wp-includes/plugin.php

Doc Comments +4 added lines, -7 removed lines

@@ -98,7 +98,7 @@ 
  *                                  and functions with the same priority are executed
  *                                  in the order in which they were added to the action.
  * @param int      $accepted_args   Optional. The number of arguments the function accepts. Default 1.
- * @return true
+ * @return boolean
  */
 function add_filter( $tag, $function_to_add, $priority = 10, $accepted_args = 1 ) {
 	global $wp_filter, $merged_filters;
@@ -193,7 +193,6 @@ 
  *
  * @param string $tag     The name of the filter hook.
  * @param mixed  $value   The value on which the filters hooked to `$tag` are applied on.
- * @param mixed  $var,... Additional variables passed to the functions hooked to `$tag`.
  * @return mixed The filtered value after all hooked functions are applied to it.
  */
 function apply_filters( $tag, $value ) {
@@ -347,7 +346,7 @@ 
  *
  * @param string   $tag      The filter to remove hooks from.
  * @param int|bool $priority Optional. The priority number to remove. Default false.
- * @return true True when finished.
+ * @return boolean True when finished.
  */
 function remove_all_filters( $tag, $priority = false ) {
 	global $wp_filter, $merged_filters;
@@ -452,7 +451,7 @@ 
  *                                  and functions with the same priority are executed
  *                                  in the order in which they were added to the action.
  * @param int      $accepted_args   Optional. The number of arguments the function accepts. Default 1.
- * @return true Will always return true.
+ * @return boolean Will always return true.
  */
 function add_action($tag, $function_to_add, $priority = 10, $accepted_args = 1) {
 	return add_filter($tag, $function_to_add, $priority, $accepted_args);
@@ -476,8 +475,6 @@ 
  * @global array $wp_current_filter Stores the list of current filters with the current one last
  *
  * @param string $tag     The name of the action to be executed.
- * @param mixed  $arg,... Optional. Additional arguments which are passed on to the
- *                        functions hooked to the action. Default empty.
  */
 function do_action($tag, $arg = '') {
 	global $wp_filter, $wp_actions, $merged_filters, $wp_current_filter;
@@ -650,7 +647,7 @@ 
  *
  * @param string   $tag      The action to remove hooks from.
  * @param int|bool $priority The priority number to remove them from. Default false.
- * @return true True when finished.
+ * @return boolean True when finished.
  */
 function remove_all_actions($tag, $priority = false) {
 	return remove_all_filters($tag, $priority);

Indentation +18 added lines, -18 removed lines

@@ -1,23 +1,23 @@
 <?php
 /**
- * The plugin API is located in this file, which allows for creating actions
- * and filters and hooking functions, and methods. The functions or methods will
- * then be run when the action or filter is called.
- *
- * The API callback examples reference functions, but can be methods of classes.
- * To hook methods, you'll need to pass an array one of two ways.
- *
- * Any of the syntaxes explained in the PHP documentation for the
- * {@link http://us2.php.net/manual/en/language.pseudo-types.php#language.types.callback 'callback'}
- * type are valid.
- *
- * Also see the {@link https://codex.wordpress.org/Plugin_API Plugin API} for
- * more information and examples on how to use a lot of these functions.
- *
- * @package WordPress
- * @subpackage Plugin
- * @since 1.5.0
- */
+	 * The plugin API is located in this file, which allows for creating actions
+	 * and filters and hooking functions, and methods. The functions or methods will
+	 * then be run when the action or filter is called.
+	 *
+	 * The API callback examples reference functions, but can be methods of classes.
+	 * To hook methods, you'll need to pass an array one of two ways.
+	 *
+	 * Any of the syntaxes explained in the PHP documentation for the
+	 * {@link http://us2.php.net/manual/en/language.pseudo-types.php#language.types.callback 'callback'}
+	 * type are valid.
+	 *
+	 * Also see the {@link https://codex.wordpress.org/Plugin_API Plugin API} for
+	 * more information and examples on how to use a lot of these functions.
+	 *
+	 * @package WordPress
+	 * @subpackage Plugin
+	 * @since 1.5.0
+	 */
 
 // Initialize the filter globals.
 global $wp_filter, $wp_actions, $merged_filters, $wp_current_filter;

Spacing +132 added lines, -132 removed lines

@@ -22,16 +22,16 @@ 
 // Initialize the filter globals.
 global $wp_filter, $wp_actions, $merged_filters, $wp_current_filter;
 
-if ( ! isset( $wp_filter ) )
+if ( ! isset($wp_filter))
 	$wp_filter = array();
 
-if ( ! isset( $wp_actions ) )
+if ( ! isset($wp_actions))
 	$wp_actions = array();
 
-if ( ! isset( $merged_filters ) )
+if ( ! isset($merged_filters))
 	$merged_filters = array();
 
-if ( ! isset( $wp_current_filter ) )
+if ( ! isset($wp_current_filter))
 	$wp_current_filter = array();
 
 /**
@@ -100,12 +100,12 @@ 
  * @param int      $accepted_args   Optional. The number of arguments the function accepts. Default 1.
  * @return true
  */
-function add_filter( $tag, $function_to_add, $priority = 10, $accepted_args = 1 ) {
+function add_filter($tag, $function_to_add, $priority = 10, $accepted_args = 1) {
 	global $wp_filter, $merged_filters;
 
 	$idx = _wp_filter_build_unique_id($tag, $function_to_add, $priority);
 	$wp_filter[$tag][$priority][$idx] = array('function' => $function_to_add, 'accepted_args' => $accepted_args);
-	unset( $merged_filters[ $tag ] );
+	unset($merged_filters[$tag]);
 	return true;
 }
 
@@ -129,31 +129,31 @@ 
 	// Don't reset the internal array pointer
 	$wp_filter = $GLOBALS['wp_filter'];
 
-	$has = ! empty( $wp_filter[ $tag ] );
+	$has = ! empty($wp_filter[$tag]);
 
 	// Make sure at least one priority has a filter callback
-	if ( $has ) {
+	if ($has) {
 		$exists = false;
-		foreach ( $wp_filter[ $tag ] as $callbacks ) {
-			if ( ! empty( $callbacks ) ) {
+		foreach ($wp_filter[$tag] as $callbacks) {
+			if ( ! empty($callbacks)) {
 				$exists = true;
 				break;
 			}
 		}
 
-		if ( ! $exists ) {
+		if ( ! $exists) {
 			$has = false;
 		}
 	}
 
-	if ( false === $function_to_check || false === $has )
+	if (false === $function_to_check || false === $has)
 		return $has;
 
-	if ( !$idx = _wp_filter_build_unique_id($tag, $function_to_check, false) )
+	if ( ! $idx = _wp_filter_build_unique_id($tag, $function_to_check, false))
 		return false;
 
-	foreach ( (array) array_keys($wp_filter[$tag]) as $priority ) {
-		if ( isset($wp_filter[$tag][$priority][$idx]) )
+	foreach ((array) array_keys($wp_filter[$tag]) as $priority) {
+		if (isset($wp_filter[$tag][$priority][$idx]))
 			return $priority;
 	}
 
@@ -196,48 +196,48 @@ 
  * @param mixed  $var,... Additional variables passed to the functions hooked to `$tag`.
  * @return mixed The filtered value after all hooked functions are applied to it.
  */
-function apply_filters( $tag, $value ) {
+function apply_filters($tag, $value) {
 	global $wp_filter, $merged_filters, $wp_current_filter;
 
 	$args = array();
 
 	// Do 'all' actions first.
-	if ( isset($wp_filter['all']) ) {
+	if (isset($wp_filter['all'])) {
 		$wp_current_filter[] = $tag;
 		$args = func_get_args();
 		_wp_call_all_hook($args);
 	}
 
-	if ( !isset($wp_filter[$tag]) ) {
-		if ( isset($wp_filter['all']) )
+	if ( ! isset($wp_filter[$tag])) {
+		if (isset($wp_filter['all']))
 			array_pop($wp_current_filter);
 		return $value;
 	}
 
-	if ( !isset($wp_filter['all']) )
+	if ( ! isset($wp_filter['all']))
 		$wp_current_filter[] = $tag;
 
 	// Sort.
-	if ( !isset( $merged_filters[ $tag ] ) ) {
+	if ( ! isset($merged_filters[$tag])) {
 		ksort($wp_filter[$tag]);
-		$merged_filters[ $tag ] = true;
+		$merged_filters[$tag] = true;
 	}
 
-	reset( $wp_filter[ $tag ] );
+	reset($wp_filter[$tag]);
 
-	if ( empty($args) )
+	if (empty($args))
 		$args = func_get_args();
 
 	do {
-		foreach ( (array) current($wp_filter[$tag]) as $the_ )
-			if ( !is_null($the_['function']) ){
+		foreach ((array) current($wp_filter[$tag]) as $the_)
+			if ( ! is_null($the_['function'])) {
 				$args[1] = $value;
 				$value = call_user_func_array($the_['function'], array_slice($args, 1, (int) $the_['accepted_args']));
 			}
 
-	} while ( next($wp_filter[$tag]) !== false );
+	} while (next($wp_filter[$tag]) !== false);
 
-	array_pop( $wp_current_filter );
+	array_pop($wp_current_filter);
 
 	return $value;
 }
@@ -262,37 +262,37 @@ 
 	global $wp_filter, $merged_filters, $wp_current_filter;
 
 	// Do 'all' actions first
-	if ( isset($wp_filter['all']) ) {
+	if (isset($wp_filter['all'])) {
 		$wp_current_filter[] = $tag;
 		$all_args = func_get_args();
 		_wp_call_all_hook($all_args);
 	}
 
-	if ( !isset($wp_filter[$tag]) ) {
-		if ( isset($wp_filter['all']) )
+	if ( ! isset($wp_filter[$tag])) {
+		if (isset($wp_filter['all']))
 			array_pop($wp_current_filter);
 		return $args[0];
 	}
 
-	if ( !isset($wp_filter['all']) )
+	if ( ! isset($wp_filter['all']))
 		$wp_current_filter[] = $tag;
 
 	// Sort
-	if ( !isset( $merged_filters[ $tag ] ) ) {
+	if ( ! isset($merged_filters[$tag])) {
 		ksort($wp_filter[$tag]);
-		$merged_filters[ $tag ] = true;
+		$merged_filters[$tag] = true;
 	}
 
-	reset( $wp_filter[ $tag ] );
+	reset($wp_filter[$tag]);
 
 	do {
-		foreach ( (array) current($wp_filter[$tag]) as $the_ )
-			if ( !is_null($the_['function']) )
+		foreach ((array) current($wp_filter[$tag]) as $the_)
+			if ( ! is_null($the_['function']))
 				$args[0] = call_user_func_array($the_['function'], array_slice($args, 0, (int) $the_['accepted_args']));
 
-	} while ( next($wp_filter[$tag]) !== false );
+	} while (next($wp_filter[$tag]) !== false);
 
-	array_pop( $wp_current_filter );
+	array_pop($wp_current_filter);
 
 	return $args[0];
 }
@@ -318,20 +318,20 @@ 
  * @param int      $priority           Optional. The priority of the function. Default 10.
  * @return bool    Whether the function existed before it was removed.
  */
-function remove_filter( $tag, $function_to_remove, $priority = 10 ) {
-	$function_to_remove = _wp_filter_build_unique_id( $tag, $function_to_remove, $priority );
+function remove_filter($tag, $function_to_remove, $priority = 10) {
+	$function_to_remove = _wp_filter_build_unique_id($tag, $function_to_remove, $priority);
 
-	$r = isset( $GLOBALS['wp_filter'][ $tag ][ $priority ][ $function_to_remove ] );
+	$r = isset($GLOBALS['wp_filter'][$tag][$priority][$function_to_remove]);
 
-	if ( true === $r ) {
-		unset( $GLOBALS['wp_filter'][ $tag ][ $priority ][ $function_to_remove ] );
-		if ( empty( $GLOBALS['wp_filter'][ $tag ][ $priority ] ) ) {
-			unset( $GLOBALS['wp_filter'][ $tag ][ $priority ] );
+	if (true === $r) {
+		unset($GLOBALS['wp_filter'][$tag][$priority][$function_to_remove]);
+		if (empty($GLOBALS['wp_filter'][$tag][$priority])) {
+			unset($GLOBALS['wp_filter'][$tag][$priority]);
 		}
-		if ( empty( $GLOBALS['wp_filter'][ $tag ] ) ) {
-			$GLOBALS['wp_filter'][ $tag ] = array();
+		if (empty($GLOBALS['wp_filter'][$tag])) {
+			$GLOBALS['wp_filter'][$tag] = array();
 		}
-		unset( $GLOBALS['merged_filters'][ $tag ] );
+		unset($GLOBALS['merged_filters'][$tag]);
 	}
 
 	return $r;
@@ -349,18 +349,18 @@ 
  * @param int|bool $priority Optional. The priority number to remove. Default false.
  * @return true True when finished.
  */
-function remove_all_filters( $tag, $priority = false ) {
+function remove_all_filters($tag, $priority = false) {
 	global $wp_filter, $merged_filters;
 
-	if ( isset( $wp_filter[ $tag ]) ) {
-		if ( false === $priority ) {
-			$wp_filter[ $tag ] = array();
-		} elseif ( isset( $wp_filter[ $tag ][ $priority ] ) ) {
-			$wp_filter[ $tag ][ $priority ] = array();
+	if (isset($wp_filter[$tag])) {
+		if (false === $priority) {
+			$wp_filter[$tag] = array();
+		} elseif (isset($wp_filter[$tag][$priority])) {
+			$wp_filter[$tag][$priority] = array();
 		}
 	}
 
-	unset( $merged_filters[ $tag ] );
+	unset($merged_filters[$tag]);
 
 	return true;
 }
@@ -376,7 +376,7 @@ 
  */
 function current_filter() {
 	global $wp_current_filter;
-	return end( $wp_current_filter );
+	return end($wp_current_filter);
 }
 
 /**
@@ -411,14 +411,14 @@ 
  *                            checks if any filter is currently being run.
  * @return bool Whether the filter is currently in the stack.
  */
-function doing_filter( $filter = null ) {
+function doing_filter($filter = null) {
 	global $wp_current_filter;
 
-	if ( null === $filter ) {
-		return ! empty( $wp_current_filter );
+	if (null === $filter) {
+		return ! empty($wp_current_filter);
 	}
 
-	return in_array( $filter, $wp_current_filter );
+	return in_array($filter, $wp_current_filter);
 }
 
 /**
@@ -430,8 +430,8 @@ 
  *                            if any action is currently being run.
  * @return bool Whether the action is currently in the stack.
  */
-function doing_action( $action = null ) {
-	return doing_filter( $action );
+function doing_action($action = null) {
+	return doing_filter($action);
 }
 
 /**
@@ -482,49 +482,49 @@ 
 function do_action($tag, $arg = '') {
 	global $wp_filter, $wp_actions, $merged_filters, $wp_current_filter;
 
-	if ( ! isset($wp_actions[$tag]) )
+	if ( ! isset($wp_actions[$tag]))
 		$wp_actions[$tag] = 1;
 	else
 		++$wp_actions[$tag];
 
 	// Do 'all' actions first
-	if ( isset($wp_filter['all']) ) {
+	if (isset($wp_filter['all'])) {
 		$wp_current_filter[] = $tag;
 		$all_args = func_get_args();
 		_wp_call_all_hook($all_args);
 	}
 
-	if ( !isset($wp_filter[$tag]) ) {
-		if ( isset($wp_filter['all']) )
+	if ( ! isset($wp_filter[$tag])) {
+		if (isset($wp_filter['all']))
 			array_pop($wp_current_filter);
 		return;
 	}
 
-	if ( !isset($wp_filter['all']) )
+	if ( ! isset($wp_filter['all']))
 		$wp_current_filter[] = $tag;
 
 	$args = array();
-	if ( is_array($arg) && 1 == count($arg) && isset($arg[0]) && is_object($arg[0]) ) // array(&$this)
-		$args[] =& $arg[0];
+	if (is_array($arg) && 1 == count($arg) && isset($arg[0]) && is_object($arg[0])) // array(&$this)
+		$args[] = & $arg[0];
 	else
 		$args[] = $arg;
-	for ( $a = 2, $num = func_num_args(); $a < $num; $a++ )
+	for ($a = 2, $num = func_num_args(); $a < $num; $a++)
 		$args[] = func_get_arg($a);
 
 	// Sort
-	if ( !isset( $merged_filters[ $tag ] ) ) {
+	if ( ! isset($merged_filters[$tag])) {
 		ksort($wp_filter[$tag]);
-		$merged_filters[ $tag ] = true;
+		$merged_filters[$tag] = true;
 	}
 
-	reset( $wp_filter[ $tag ] );
+	reset($wp_filter[$tag]);
 
 	do {
-		foreach ( (array) current($wp_filter[$tag]) as $the_ )
-			if ( !is_null($the_['function']) )
+		foreach ((array) current($wp_filter[$tag]) as $the_)
+			if ( ! is_null($the_['function']))
 				call_user_func_array($the_['function'], array_slice($args, 0, (int) $the_['accepted_args']));
 
-	} while ( next($wp_filter[$tag]) !== false );
+	} while (next($wp_filter[$tag]) !== false);
 
 	array_pop($wp_current_filter);
 }
@@ -542,7 +542,7 @@ 
 function did_action($tag) {
 	global $wp_actions;
 
-	if ( ! isset( $wp_actions[ $tag ] ) )
+	if ( ! isset($wp_actions[$tag]))
 		return 0;
 
 	return $wp_actions[$tag];
@@ -566,41 +566,41 @@ 
 function do_action_ref_array($tag, $args) {
 	global $wp_filter, $wp_actions, $merged_filters, $wp_current_filter;
 
-	if ( ! isset($wp_actions[$tag]) )
+	if ( ! isset($wp_actions[$tag]))
 		$wp_actions[$tag] = 1;
 	else
 		++$wp_actions[$tag];
 
 	// Do 'all' actions first
-	if ( isset($wp_filter['all']) ) {
+	if (isset($wp_filter['all'])) {
 		$wp_current_filter[] = $tag;
 		$all_args = func_get_args();
 		_wp_call_all_hook($all_args);
 	}
 
-	if ( !isset($wp_filter[$tag]) ) {
-		if ( isset($wp_filter['all']) )
+	if ( ! isset($wp_filter[$tag])) {
+		if (isset($wp_filter['all']))
 			array_pop($wp_current_filter);
 		return;
 	}
 
-	if ( !isset($wp_filter['all']) )
+	if ( ! isset($wp_filter['all']))
 		$wp_current_filter[] = $tag;
 
 	// Sort
-	if ( !isset( $merged_filters[ $tag ] ) ) {
+	if ( ! isset($merged_filters[$tag])) {
 		ksort($wp_filter[$tag]);
-		$merged_filters[ $tag ] = true;
+		$merged_filters[$tag] = true;
 	}
 
-	reset( $wp_filter[ $tag ] );
+	reset($wp_filter[$tag]);
 
 	do {
-		foreach ( (array) current($wp_filter[$tag]) as $the_ )
-			if ( !is_null($the_['function']) )
+		foreach ((array) current($wp_filter[$tag]) as $the_)
+			if ( ! is_null($the_['function']))
 				call_user_func_array($the_['function'], array_slice($args, 0, (int) $the_['accepted_args']));
 
-	} while ( next($wp_filter[$tag]) !== false );
+	} while (next($wp_filter[$tag]) !== false);
 
 	array_pop($wp_current_filter);
 }
@@ -639,8 +639,8 @@ 
  * @param int      $priority           Optional. The priority of the function. Default 10.
  * @return bool Whether the function is removed.
  */
-function remove_action( $tag, $function_to_remove, $priority = 10 ) {
-	return remove_filter( $tag, $function_to_remove, $priority );
+function remove_action($tag, $function_to_remove, $priority = 10) {
+	return remove_filter($tag, $function_to_remove, $priority);
 }
 
 /**
@@ -672,20 +672,20 @@ 
  * @param string $file The filename of plugin.
  * @return string The name of a plugin.
  */
-function plugin_basename( $file ) {
+function plugin_basename($file) {
 	global $wp_plugin_paths;
 
-	foreach ( $wp_plugin_paths as $dir => $realdir ) {
-		if ( strpos( $file, $realdir ) === 0 ) {
-			$file = $dir . substr( $file, strlen( $realdir ) );
+	foreach ($wp_plugin_paths as $dir => $realdir) {
+		if (strpos($file, $realdir) === 0) {
+			$file = $dir.substr($file, strlen($realdir));
 		}
 	}
 
-	$file = wp_normalize_path( $file );
-	$plugin_dir = wp_normalize_path( WP_PLUGIN_DIR );
-	$mu_plugin_dir = wp_normalize_path( WPMU_PLUGIN_DIR );
+	$file = wp_normalize_path($file);
+	$plugin_dir = wp_normalize_path(WP_PLUGIN_DIR);
+	$mu_plugin_dir = wp_normalize_path(WPMU_PLUGIN_DIR);
 
-	$file = preg_replace('#^' . preg_quote($plugin_dir, '#') . '/|^' . preg_quote($mu_plugin_dir, '#') . '/#','',$file); // get relative path from plugins dir
+	$file = preg_replace('#^'.preg_quote($plugin_dir, '#').'/|^'.preg_quote($mu_plugin_dir, '#').'/#', '', $file); // get relative path from plugins dir
 	$file = trim($file, '/');
 	return $file;
 }
@@ -707,25 +707,25 @@ 
  * @param string $file Known path to the file.
  * @return bool Whether the path was able to be registered.
  */
-function wp_register_plugin_realpath( $file ) {
+function wp_register_plugin_realpath($file) {
 	global $wp_plugin_paths;
 
 	// Normalize, but store as static to avoid recalculation of a constant value
 	static $wp_plugin_path = null, $wpmu_plugin_path = null;
-	if ( ! isset( $wp_plugin_path ) ) {
-		$wp_plugin_path   = wp_normalize_path( WP_PLUGIN_DIR   );
-		$wpmu_plugin_path = wp_normalize_path( WPMU_PLUGIN_DIR );
+	if ( ! isset($wp_plugin_path)) {
+		$wp_plugin_path   = wp_normalize_path(WP_PLUGIN_DIR);
+		$wpmu_plugin_path = wp_normalize_path(WPMU_PLUGIN_DIR);
 	}
 
-	$plugin_path = wp_normalize_path( dirname( $file ) );
-	$plugin_realpath = wp_normalize_path( dirname( realpath( $file ) ) );
+	$plugin_path = wp_normalize_path(dirname($file));
+	$plugin_realpath = wp_normalize_path(dirname(realpath($file)));
 
-	if ( $plugin_path === $wp_plugin_path || $plugin_path === $wpmu_plugin_path ) {
+	if ($plugin_path === $wp_plugin_path || $plugin_path === $wpmu_plugin_path) {
 		return false;
 	}
 
-	if ( $plugin_path !== $plugin_realpath ) {
-		$wp_plugin_paths[ $plugin_path ] = $plugin_realpath;
+	if ($plugin_path !== $plugin_realpath) {
+		$wp_plugin_paths[$plugin_path] = $plugin_realpath;
 	}
 
 	return true;
@@ -739,8 +739,8 @@ 
  * @param string $file The filename of the plugin (__FILE__).
  * @return string the filesystem path of the directory that contains the plugin.
  */
-function plugin_dir_path( $file ) {
-	return trailingslashit( dirname( $file ) );
+function plugin_dir_path($file) {
+	return trailingslashit(dirname($file));
 }
 
 /**
@@ -751,8 +751,8 @@ 
  * @param string $file The filename of the plugin (__FILE__).
  * @return string the URL path of the directory that contains the plugin.
  */
-function plugin_dir_url( $file ) {
-	return trailingslashit( plugins_url( '', $file ) );
+function plugin_dir_url($file) {
+	return trailingslashit(plugins_url('', $file));
 }
 
 /**
@@ -775,7 +775,7 @@ 
  */
 function register_activation_hook($file, $function) {
 	$file = plugin_basename($file);
-	add_action('activate_' . $file, $function);
+	add_action('activate_'.$file, $function);
 }
 
 /**
@@ -798,7 +798,7 @@ 
  */
 function register_deactivation_hook($file, $function) {
 	$file = plugin_basename($file);
-	add_action('deactivate_' . $file, $function);
+	add_action('deactivate_'.$file, $function);
 }
 
 /**
@@ -827,9 +827,9 @@ 
  * @param callable $callback The callback to run when the hook is called. Must be
  *                           a static method or function.
  */
-function register_uninstall_hook( $file, $callback ) {
-	if ( is_array( $callback ) && is_object( $callback[0] ) ) {
-		_doing_it_wrong( __FUNCTION__, __( 'Only a static class method or function can be used in an uninstall hook.' ), '3.1' );
+function register_uninstall_hook($file, $callback) {
+	if (is_array($callback) && is_object($callback[0])) {
+		_doing_it_wrong(__FUNCTION__, __('Only a static class method or function can be used in an uninstall hook.'), '3.1');
 		return;
 	}
 
@@ -865,13 +865,13 @@ 
 function _wp_call_all_hook($args) {
 	global $wp_filter;
 
-	reset( $wp_filter['all'] );
+	reset($wp_filter['all']);
 	do {
-		foreach ( (array) current($wp_filter['all']) as $the_ )
-			if ( !is_null($the_['function']) )
+		foreach ((array) current($wp_filter['all']) as $the_)
+			if ( ! is_null($the_['function']))
 				call_user_func_array($the_['function'], $args);
 
-	} while ( next($wp_filter['all']) !== false );
+	} while (next($wp_filter['all']) !== false);
 }
 
 /**
@@ -912,26 +912,26 @@ 
 	global $wp_filter;
 	static $filter_id_count = 0;
 
-	if ( is_string($function) )
+	if (is_string($function))
 		return $function;
 
-	if ( is_object($function) ) {
+	if (is_object($function)) {
 		// Closures are currently implemented as objects
-		$function = array( $function, '' );
+		$function = array($function, '');
 	} else {
 		$function = (array) $function;
 	}
 
-	if (is_object($function[0]) ) {
+	if (is_object($function[0])) {
 		// Object Class Calling
-		if ( function_exists('spl_object_hash') ) {
-			return spl_object_hash($function[0]) . $function[1];
+		if (function_exists('spl_object_hash')) {
+			return spl_object_hash($function[0]).$function[1];
 		} else {
 			$obj_idx = get_class($function[0]).$function[1];
-			if ( !isset($function[0]->wp_filter_id) ) {
-				if ( false === $priority )
+			if ( ! isset($function[0]->wp_filter_id)) {
+				if (false === $priority)
 					return false;
-				$obj_idx .= isset($wp_filter[$tag][$priority]) ? count((array)$wp_filter[$tag][$priority]) : $filter_id_count;
+				$obj_idx .= isset($wp_filter[$tag][$priority]) ? count((array) $wp_filter[$tag][$priority]) : $filter_id_count;
 				$function[0]->wp_filter_id = $filter_id_count;
 				++$filter_id_count;
 			} else {
@@ -940,8 +940,8 @@ 
 
 			return $obj_idx;
 		}
-	} elseif ( is_string( $function[0] ) ) {
+	} elseif (is_string($function[0])) {
 		// Static Calling
-		return $function[0] . '::' . $function[1];
+		return $function[0].'::'.$function[1];
 	}
 }

Braces +86 added lines, -57 removed lines

@@ -22,17 +22,21 @@ 
 // Initialize the filter globals.
 global $wp_filter, $wp_actions, $merged_filters, $wp_current_filter;
 
-if ( ! isset( $wp_filter ) )
+if ( ! isset( $wp_filter ) ) {
 	$wp_filter = array();
+}
 
-if ( ! isset( $wp_actions ) )
+if ( ! isset( $wp_actions ) ) {
 	$wp_actions = array();
+}
 
-if ( ! isset( $merged_filters ) )
+if ( ! isset( $merged_filters ) ) {
 	$merged_filters = array();
+}
 
-if ( ! isset( $wp_current_filter ) )
+if ( ! isset( $wp_current_filter ) ) {
 	$wp_current_filter = array();
+}
 
 /**
  * Hook a function or method to a specific filter action.
@@ -146,15 +150,18 @@ 
 		}
 	}
 
-	if ( false === $function_to_check || false === $has )
-		return $has;
+	if ( false === $function_to_check || false === $has ) {
+			return $has;
+	}
 
-	if ( !$idx = _wp_filter_build_unique_id($tag, $function_to_check, false) )
-		return false;
+	if ( !$idx = _wp_filter_build_unique_id($tag, $function_to_check, false) ) {
+			return false;
+	}
 
 	foreach ( (array) array_keys($wp_filter[$tag]) as $priority ) {
-		if ( isset($wp_filter[$tag][$priority][$idx]) )
-			return $priority;
+		if ( isset($wp_filter[$tag][$priority][$idx]) ) {
+					return $priority;
+		}
 	}
 
 	return false;
@@ -209,13 +216,15 @@ 
 	}
 
 	if ( !isset($wp_filter[$tag]) ) {
-		if ( isset($wp_filter['all']) )
-			array_pop($wp_current_filter);
+		if ( isset($wp_filter['all']) ) {
+					array_pop($wp_current_filter);
+		}
 		return $value;
 	}
 
-	if ( !isset($wp_filter['all']) )
-		$wp_current_filter[] = $tag;
+	if ( !isset($wp_filter['all']) ) {
+			$wp_current_filter[] = $tag;
+	}
 
 	// Sort.
 	if ( !isset( $merged_filters[ $tag ] ) ) {
@@ -225,13 +234,15 @@ 
 
 	reset( $wp_filter[ $tag ] );
 
-	if ( empty($args) )
-		$args = func_get_args();
+	if ( empty($args) ) {
+			$args = func_get_args();
+	}
 
 	do {
-		foreach ( (array) current($wp_filter[$tag]) as $the_ )
-			if ( !is_null($the_['function']) ){
+		foreach ( (array) current($wp_filter[$tag]) as $the_ ) {
+					if ( !is_null($the_['function']) ){
 				$args[1] = $value;
+		}
 				$value = call_user_func_array($the_['function'], array_slice($args, 1, (int) $the_['accepted_args']));
 			}
 
@@ -269,13 +280,15 @@ 
 	}
 
 	if ( !isset($wp_filter[$tag]) ) {
-		if ( isset($wp_filter['all']) )
-			array_pop($wp_current_filter);
+		if ( isset($wp_filter['all']) ) {
+					array_pop($wp_current_filter);
+		}
 		return $args[0];
 	}
 
-	if ( !isset($wp_filter['all']) )
-		$wp_current_filter[] = $tag;
+	if ( !isset($wp_filter['all']) ) {
+			$wp_current_filter[] = $tag;
+	}
 
 	// Sort
 	if ( !isset( $merged_filters[ $tag ] ) ) {
@@ -286,9 +299,10 @@ 
 	reset( $wp_filter[ $tag ] );
 
 	do {
-		foreach ( (array) current($wp_filter[$tag]) as $the_ )
-			if ( !is_null($the_['function']) )
+		foreach ( (array) current($wp_filter[$tag]) as $the_ ) {
+					if ( !is_null($the_['function']) )
 				$args[0] = call_user_func_array($the_['function'], array_slice($args, 0, (int) $the_['accepted_args']));
+		}
 
 	} while ( next($wp_filter[$tag]) !== false );
 
@@ -482,10 +496,11 @@ 
 function do_action($tag, $arg = '') {
 	global $wp_filter, $wp_actions, $merged_filters, $wp_current_filter;
 
-	if ( ! isset($wp_actions[$tag]) )
-		$wp_actions[$tag] = 1;
-	else
-		++$wp_actions[$tag];
+	if ( ! isset($wp_actions[$tag]) ) {
+			$wp_actions[$tag] = 1;
+	} else {
+			++$wp_actions[$tag];
+	}
 
 	// Do 'all' actions first
 	if ( isset($wp_filter['all']) ) {
@@ -495,21 +510,26 @@ 
 	}
 
 	if ( !isset($wp_filter[$tag]) ) {
-		if ( isset($wp_filter['all']) )
-			array_pop($wp_current_filter);
+		if ( isset($wp_filter['all']) ) {
+					array_pop($wp_current_filter);
+		}
 		return;
 	}
 
-	if ( !isset($wp_filter['all']) )
-		$wp_current_filter[] = $tag;
+	if ( !isset($wp_filter['all']) ) {
+			$wp_current_filter[] = $tag;
+	}
 
 	$args = array();
-	if ( is_array($arg) && 1 == count($arg) && isset($arg[0]) && is_object($arg[0]) ) // array(&$this)
+	if ( is_array($arg) && 1 == count($arg) && isset($arg[0]) && is_object($arg[0]) ) {
+		// array(&$this)
 		$args[] =& $arg[0];
-	else
-		$args[] = $arg;
-	for ( $a = 2, $num = func_num_args(); $a < $num; $a++ )
-		$args[] = func_get_arg($a);
+	} else {
+			$args[] = $arg;
+	}
+	for ( $a = 2, $num = func_num_args(); $a < $num; $a++ ) {
+			$args[] = func_get_arg($a);
+	}
 
 	// Sort
 	if ( !isset( $merged_filters[ $tag ] ) ) {
@@ -520,9 +540,10 @@ 
 	reset( $wp_filter[ $tag ] );
 
 	do {
-		foreach ( (array) current($wp_filter[$tag]) as $the_ )
-			if ( !is_null($the_['function']) )
+		foreach ( (array) current($wp_filter[$tag]) as $the_ ) {
+					if ( !is_null($the_['function']) )
 				call_user_func_array($the_['function'], array_slice($args, 0, (int) $the_['accepted_args']));
+		}
 
 	} while ( next($wp_filter[$tag]) !== false );
 
@@ -542,8 +563,9 @@ 
 function did_action($tag) {
 	global $wp_actions;
 
-	if ( ! isset( $wp_actions[ $tag ] ) )
-		return 0;
+	if ( ! isset( $wp_actions[ $tag ] ) ) {
+			return 0;
+	}
 
 	return $wp_actions[$tag];
 }
@@ -566,10 +588,11 @@ 
 function do_action_ref_array($tag, $args) {
 	global $wp_filter, $wp_actions, $merged_filters, $wp_current_filter;
 
-	if ( ! isset($wp_actions[$tag]) )
-		$wp_actions[$tag] = 1;
-	else
-		++$wp_actions[$tag];
+	if ( ! isset($wp_actions[$tag]) ) {
+			$wp_actions[$tag] = 1;
+	} else {
+			++$wp_actions[$tag];
+	}
 
 	// Do 'all' actions first
 	if ( isset($wp_filter['all']) ) {
@@ -579,13 +602,15 @@ 
 	}
 
 	if ( !isset($wp_filter[$tag]) ) {
-		if ( isset($wp_filter['all']) )
-			array_pop($wp_current_filter);
+		if ( isset($wp_filter['all']) ) {
+					array_pop($wp_current_filter);
+		}
 		return;
 	}
 
-	if ( !isset($wp_filter['all']) )
-		$wp_current_filter[] = $tag;
+	if ( !isset($wp_filter['all']) ) {
+			$wp_current_filter[] = $tag;
+	}
 
 	// Sort
 	if ( !isset( $merged_filters[ $tag ] ) ) {
@@ -596,9 +621,10 @@ 
 	reset( $wp_filter[ $tag ] );
 
 	do {
-		foreach ( (array) current($wp_filter[$tag]) as $the_ )
-			if ( !is_null($the_['function']) )
+		foreach ( (array) current($wp_filter[$tag]) as $the_ ) {
+					if ( !is_null($the_['function']) )
 				call_user_func_array($the_['function'], array_slice($args, 0, (int) $the_['accepted_args']));
+		}
 
 	} while ( next($wp_filter[$tag]) !== false );
 
@@ -867,9 +893,10 @@ 
 
 	reset( $wp_filter['all'] );
 	do {
-		foreach ( (array) current($wp_filter['all']) as $the_ )
-			if ( !is_null($the_['function']) )
+		foreach ( (array) current($wp_filter['all']) as $the_ ) {
+					if ( !is_null($the_['function']) )
 				call_user_func_array($the_['function'], $args);
+		}
 
 	} while ( next($wp_filter['all']) !== false );
 }
@@ -912,8 +939,9 @@ 
 	global $wp_filter;
 	static $filter_id_count = 0;
 
-	if ( is_string($function) )
-		return $function;
+	if ( is_string($function) ) {
+			return $function;
+	}
 
 	if ( is_object($function) ) {
 		// Closures are currently implemented as objects
@@ -929,8 +957,9 @@ 
 		} else {
 			$obj_idx = get_class($function[0]).$function[1];
 			if ( !isset($function[0]->wp_filter_id) ) {
-				if ( false === $priority )
-					return false;
+				if ( false === $priority ) {
+									return false;
+				}
 				$obj_idx .= isset($wp_filter[$tag][$priority]) ? count((array)$wp_filter[$tag][$priority]) : $filter_id_count;
 				$function[0]->wp_filter_id = $filter_id_count;
 				++$filter_id_count;

src/wp-includes/pomo/po.php

Doc Comments +7 added lines, -2 removed lines

@@ -87,6 +87,7 @@ 
 	 * Text to include as a comment before the start of the PO contents
 	 *
 	 * Doesn't need to include # in the beginning of lines, these are added automatically
+	 * @param string $text
 	 */
 	function set_comment_before_headers( $text ) {
 		$this->comments_before_headers = $text;
@@ -196,6 +197,7 @@ 
 	 *
 	 * @static
 	 * @param Translation_Entry &$entry the entry to convert to po string
+	 * @param Translation_Entry $entry
 	 * @return false|string PO-style formatted string for the entry or
 	 * 	false if the entry is empty
 	 */
@@ -223,6 +225,9 @@ 
 		return implode("\n", $po);
 	}
 
+	/**
+	 * @return string
+	 */
 	public static function match_begin_and_end_newlines( $translation, $original ) {
 		if ( '' === $translation ) {
 			return $translation;
@@ -395,7 +400,7 @@ 
 	 *
 	 * @param     resource $f
 	 * @param     string   $action
-	 * @return boolean
+	 * @return boolean|string
 	 */
 	function read_line($f, $action = 'read') {
 		static $last_line = '';
@@ -435,7 +440,7 @@ 
 
 	/**
 	 * @param string $s
-	 * @return sring
+	 * @return string
 	 */
 	public static function trim_quotes($s) {
 		if ( substr($s, 0, 1) == '"') $s = substr($s, 1);

Spacing +51 added lines, -51 removed lines

@@ -7,9 +7,9 @@ 
  * @subpackage po
  */
 
-require_once dirname(__FILE__) . '/translations.php';
+require_once dirname(__FILE__).'/translations.php';
 
-if ( ! defined( 'PO_MAX_LINE_LEN' ) ) {
+if ( ! defined('PO_MAX_LINE_LEN')) {
 	define('PO_MAX_LINE_LEN', 79);
 }
 
@@ -18,7 +18,7 @@ 
 /**
  * Routines for working with PO files
  */
-if ( ! class_exists( 'PO', false ) ):
+if ( ! class_exists('PO', false)):
 class PO extends Gettext_Translations {
 
 	var $comments_before_headers = '';
@@ -30,8 +30,8 @@ 
 	 */
 	function export_headers() {
 		$header_string = '';
-		foreach($this->headers as $header => $value) {
-			$header_string.= "$header: $value\n";
+		foreach ($this->headers as $header => $value) {
+			$header_string .= "$header: $value\n";
 		}
 		$poified = PO::poify($header_string);
 		if ($this->comments_before_headers)
@@ -88,7 +88,7 @@ 
 	 *
 	 * Doesn't need to include # in the beginning of lines, these are added automatically
 	 */
-	function set_comment_before_headers( $text ) {
+	function set_comment_before_headers($text) {
 		$this->comments_before_headers = $text;
 	}
 
@@ -115,7 +115,7 @@ 
 		$po = $quote.implode("${slash}n$quote$newline$quote", explode($newline, $string)).$quote;
 		// add empty string on first line for readbility
 		if (false !== strpos($string, $newline) &&
-				(substr_count($string, $newline) > 1 || !($newline === substr($string, -strlen($newline))))) {
+				(substr_count($string, $newline) > 1 || ! ($newline === substr($string, -strlen($newline))))) {
 			$po = "$quote$quote$newline$po";
 		}
 		// remove empty strings
@@ -136,24 +136,24 @@ 
 		$lines = array_map(array('PO', 'trim_quotes'), $lines);
 		$unpoified = '';
 		$previous_is_backslash = false;
-		foreach($lines as $line) {
+		foreach ($lines as $line) {
 			preg_match_all('/./u', $line, $chars);
 			$chars = $chars[0];
-			foreach($chars as $char) {
-				if (!$previous_is_backslash) {
+			foreach ($chars as $char) {
+				if ( ! $previous_is_backslash) {
 					if ('\\' == $char)
 						$previous_is_backslash = true;
 					else
 						$unpoified .= $char;
 				} else {
 					$previous_is_backslash = false;
-					$unpoified .= isset($escapes[$char])? $escapes[$char] : $char;
+					$unpoified .= isset($escapes[$char]) ? $escapes[$char] : $char;
 				}
 			}
 		}
 
 		// Standardise the line endings on imported content, technically PO files shouldn't contain \r
-		$unpoified = str_replace( array( "\r\n", "\r" ), "\n", $unpoified );
+		$unpoified = str_replace(array("\r\n", "\r"), "\n", $unpoified);
 
 		return $unpoified;
 	}
@@ -186,7 +186,7 @@ 
 	 * @param string $char character to denote a special PO comment,
 	 * 	like :, default is a space
 	 */
-	public static function comment_block($text, $char=' ') {
+	public static function comment_block($text, $char = ' ') {
 		$text = wordwrap($text, PO_MAX_LINE_LEN - 3);
 		return PO::prepend_each_line($text, "#$char ");
 	}
@@ -200,53 +200,53 @@ 
 	 * 	false if the entry is empty
 	 */
 	public static function export_entry(&$entry) {
-		if ( null === $entry->singular || '' === $entry->singular ) return false;
+		if (null === $entry->singular || '' === $entry->singular) return false;
 		$po = array();
-		if (!empty($entry->translator_comments)) $po[] = PO::comment_block($entry->translator_comments);
-		if (!empty($entry->extracted_comments)) $po[] = PO::comment_block($entry->extracted_comments, '.');
-		if (!empty($entry->references)) $po[] = PO::comment_block(implode(' ', $entry->references), ':');
-		if (!empty($entry->flags)) $po[] = PO::comment_block(implode(", ", $entry->flags), ',');
+		if ( ! empty($entry->translator_comments)) $po[] = PO::comment_block($entry->translator_comments);
+		if ( ! empty($entry->extracted_comments)) $po[] = PO::comment_block($entry->extracted_comments, '.');
+		if ( ! empty($entry->references)) $po[] = PO::comment_block(implode(' ', $entry->references), ':');
+		if ( ! empty($entry->flags)) $po[] = PO::comment_block(implode(", ", $entry->flags), ',');
 		if ($entry->context) $po[] = 'msgctxt '.PO::poify($entry->context);
 		$po[] = 'msgid '.PO::poify($entry->singular);
-		if (!$entry->is_plural) {
-			$translation = empty($entry->translations)? '' : $entry->translations[0];
-			$translation = PO::match_begin_and_end_newlines( $translation, $entry->singular );
+		if ( ! $entry->is_plural) {
+			$translation = empty($entry->translations) ? '' : $entry->translations[0];
+			$translation = PO::match_begin_and_end_newlines($translation, $entry->singular);
 			$po[] = 'msgstr '.PO::poify($translation);
 		} else {
 			$po[] = 'msgid_plural '.PO::poify($entry->plural);
-			$translations = empty($entry->translations)? array('', '') : $entry->translations;
-			foreach($translations as $i => $translation) {
-				$translation = PO::match_begin_and_end_newlines( $translation, $entry->plural );
+			$translations = empty($entry->translations) ? array('', '') : $entry->translations;
+			foreach ($translations as $i => $translation) {
+				$translation = PO::match_begin_and_end_newlines($translation, $entry->plural);
 				$po[] = "msgstr[$i] ".PO::poify($translation);
 			}
 		}
 		return implode("\n", $po);
 	}
 
-	public static function match_begin_and_end_newlines( $translation, $original ) {
-		if ( '' === $translation ) {
+	public static function match_begin_and_end_newlines($translation, $original) {
+		if ('' === $translation) {
 			return $translation;
 		}
 
-		$original_begin = "\n" === substr( $original, 0, 1 );
-		$original_end = "\n" === substr( $original, -1 );
-		$translation_begin = "\n" === substr( $translation, 0, 1 );
-		$translation_end = "\n" === substr( $translation, -1 );
+		$original_begin = "\n" === substr($original, 0, 1);
+		$original_end = "\n" === substr($original, -1);
+		$translation_begin = "\n" === substr($translation, 0, 1);
+		$translation_end = "\n" === substr($translation, -1);
 
-		if ( $original_begin ) {
-			if ( ! $translation_begin ) {
-				$translation = "\n" . $translation;
+		if ($original_begin) {
+			if ( ! $translation_begin) {
+				$translation = "\n".$translation;
 			}
-		} elseif ( $translation_begin ) {
-			$translation = ltrim( $translation, "\n" );
+		} elseif ($translation_begin) {
+			$translation = ltrim($translation, "\n");
 		}
 
-		if ( $original_end ) {
-			if ( ! $translation_end ) {
+		if ($original_end) {
+			if ( ! $translation_end) {
 				$translation .= "\n";
 			}
-		} elseif ( $translation_end ) {
-			$translation = rtrim( $translation, "\n" );
+		} elseif ($translation_end) {
+			$translation = rtrim($translation, "\n");
 		}
 
 		return $translation;
@@ -258,11 +258,11 @@ 
 	 */
 	function import_from_file($filename) {
 		$f = fopen($filename, 'r');
-		if (!$f) return false;
+		if ( ! $f) return false;
 		$lineno = 0;
 		while (true) {
 			$res = $this->read_entry($f, $lineno);
-			if (!$res) break;
+			if ( ! $res) break;
 			if ($res['entry']->singular == '') {
 				$this->set_headers($this->make_headers($res['entry']->translations[0]));
 			} else {
@@ -270,10 +270,10 @@ 
 			}
 		}
 		PO::read_line($f, 'clear');
-		if ( false === $res ) {
+		if (false === $res) {
 			return false;
 		}
-		if ( ! $this->headers && ! $this->entries ) {
+		if ( ! $this->headers && ! $this->entries) {
 			return false;
 		}
 		return true;
@@ -294,11 +294,11 @@ 
 		while (true) {
 			$lineno++;
 			$line = PO::read_line($f);
-			if (!$line)  {
+			if ( ! $line) {
 				if (feof($f)) {
 					if ($is_final($context))
 						break;
-					elseif (!$context) // we haven't read a line and eof came
+					elseif ( ! $context) // we haven't read a line and eof came
 						return null;
 					else
 						return false;
@@ -408,8 +408,8 @@ 
 			$use_last_line = true;
 			return true;
 		}
-		$line = $use_last_line? $last_line : fgets($f);
-		$line = ( "\r\n" == substr( $line, -2 ) ) ? rtrim( $line, "\r\n" ) . "\n" : $line;
+		$line = $use_last_line ? $last_line : fgets($f);
+		$line = ("\r\n" == substr($line, -2)) ? rtrim($line, "\r\n")."\n" : $line;
 		$last_line = $line;
 		$use_last_line = false;
 		return $line;
@@ -425,11 +425,11 @@ 
 		if ('#:' == $first_two) {
 			$entry->references = array_merge($entry->references, preg_split('/\s+/', $comment));
 		} elseif ('#.' == $first_two) {
-			$entry->extracted_comments = trim($entry->extracted_comments . "\n" . $comment);
+			$entry->extracted_comments = trim($entry->extracted_comments."\n".$comment);
 		} elseif ('#,' == $first_two) {
 			$entry->flags = array_merge($entry->flags, preg_split('/,\s*/', $comment));
 		} else {
-			$entry->translator_comments = trim($entry->translator_comments . "\n" . $comment);
+			$entry->translator_comments = trim($entry->translator_comments."\n".$comment);
 		}
 	}
 
@@ -438,8 +438,8 @@ 
 	 * @return sring
 	 */
 	public static function trim_quotes($s) {
-		if ( substr($s, 0, 1) == '"') $s = substr($s, 1);
-		if ( substr($s, -1, 1) == '"') $s = substr($s, 0, -1);
+		if (substr($s, 0, 1) == '"') $s = substr($s, 1);
+		if (substr($s, -1, 1) == '"') $s = substr($s, 0, -1);
 		return $s;
 	}
 }

Braces +62 added lines, -28 removed lines

@@ -34,10 +34,11 @@ 
 			$header_string.= "$header: $value\n";
 		}
 		$poified = PO::poify($header_string);
-		if ($this->comments_before_headers)
-			$before_headers = $this->prepend_each_line(rtrim($this->comments_before_headers)."\n", '# ');
-		else
-			$before_headers = '';
+		if ($this->comments_before_headers) {
+					$before_headers = $this->prepend_each_line(rtrim($this->comments_before_headers)."\n", '# ');
+		} else {
+					$before_headers = '';
+		}
 		return rtrim("{$before_headers}msgid \"\"\nmsgstr $poified");
 	}
 
@@ -76,10 +77,14 @@ 
 	 */
 	function export_to_file($filename, $include_headers = true) {
 		$fh = fopen($filename, 'w');
-		if (false === $fh) return false;
+		if (false === $fh) {
+			return false;
+		}
 		$export = $this->export($include_headers);
 		$res = fwrite($fh, $export);
-		if (false === $res) return false;
+		if (false === $res) {
+			return false;
+		}
 		return fclose($fh);
 	}
 
@@ -141,10 +146,11 @@ 
 			$chars = $chars[0];
 			foreach($chars as $char) {
 				if (!$previous_is_backslash) {
-					if ('\\' == $char)
-						$previous_is_backslash = true;
-					else
-						$unpoified .= $char;
+					if ('\\' == $char) {
+											$previous_is_backslash = true;
+					} else {
+											$unpoified .= $char;
+					}
 				} else {
 					$previous_is_backslash = false;
 					$unpoified .= isset($escapes[$char])? $escapes[$char] : $char;
@@ -170,10 +176,14 @@ 
 		$php_with = var_export($with, true);
 		$lines = explode("\n", $string);
 		// do not prepend the string on the last empty line, artefact by explode
-		if ("\n" == substr($string, -1)) unset($lines[count($lines) - 1]);
+		if ("\n" == substr($string, -1)) {
+			unset($lines[count($lines) - 1]);
+		}
 		$res = implode("\n", array_map(create_function('$x', "return $php_with.\$x;"), $lines));
 		// give back the empty line, we ignored above
-		if ("\n" == substr($string, -1)) $res .= "\n";
+		if ("\n" == substr($string, -1)) {
+			$res .= "\n";
+		}
 		return $res;
 	}
 
@@ -200,13 +210,25 @@ 
 	 * 	false if the entry is empty
 	 */
 	public static function export_entry(&$entry) {
-		if ( null === $entry->singular || '' === $entry->singular ) return false;
+		if ( null === $entry->singular || '' === $entry->singular ) {
+			return false;
+		}
 		$po = array();
-		if (!empty($entry->translator_comments)) $po[] = PO::comment_block($entry->translator_comments);
-		if (!empty($entry->extracted_comments)) $po[] = PO::comment_block($entry->extracted_comments, '.');
-		if (!empty($entry->references)) $po[] = PO::comment_block(implode(' ', $entry->references), ':');
-		if (!empty($entry->flags)) $po[] = PO::comment_block(implode(", ", $entry->flags), ',');
-		if ($entry->context) $po[] = 'msgctxt '.PO::poify($entry->context);
+		if (!empty($entry->translator_comments)) {
+			$po[] = PO::comment_block($entry->translator_comments);
+		}
+		if (!empty($entry->extracted_comments)) {
+			$po[] = PO::comment_block($entry->extracted_comments, '.');
+		}
+		if (!empty($entry->references)) {
+			$po[] = PO::comment_block(implode(' ', $entry->references), ':');
+		}
+		if (!empty($entry->flags)) {
+			$po[] = PO::comment_block(implode(", ", $entry->flags), ',');
+		}
+		if ($entry->context) {
+			$po[] = 'msgctxt '.PO::poify($entry->context);
+		}
 		$po[] = 'msgid '.PO::poify($entry->singular);
 		if (!$entry->is_plural) {
 			$translation = empty($entry->translations)? '' : $entry->translations[0];
@@ -258,11 +280,15 @@ 
 	 */
 	function import_from_file($filename) {
 		$f = fopen($filename, 'r');
-		if (!$f) return false;
+		if (!$f) {
+			return false;
+		}
 		$lineno = 0;
 		while (true) {
 			$res = $this->read_entry($f, $lineno);
-			if (!$res) break;
+			if (!$res) {
+				break;
+			}
 			if ($res['entry']->singular == '') {
 				$this->set_headers($this->make_headers($res['entry']->translations[0]));
 			} else {
@@ -296,17 +322,21 @@ 
 			$line = PO::read_line($f);
 			if (!$line)  {
 				if (feof($f)) {
-					if ($is_final($context))
-						break;
-					elseif (!$context) // we haven't read a line and eof came
+					if ($is_final($context)) {
+											break;
+					} elseif (!$context) {
+						// we haven't read a line and eof came
 						return null;
-					else
-						return false;
+					} else {
+											return false;
+					}
 				} else {
 					return false;
 				}
 			}
-			if ($line == "\n") continue;
+			if ($line == "\n") {
+				continue;
+			}
 			$line = trim($line);
 			if (preg_match('/^#/', $line, $m)) {
 				// the comment is the start of a new entry
@@ -438,8 +468,12 @@ 
 	 * @return sring
 	 */
 	public static function trim_quotes($s) {
-		if ( substr($s, 0, 1) == '"') $s = substr($s, 1);
-		if ( substr($s, -1, 1) == '"') $s = substr($s, 0, -1);
+		if ( substr($s, 0, 1) == '"') {
+			$s = substr($s, 1);
+		}
+		if ( substr($s, -1, 1) == '"') {
+			$s = substr($s, 0, -1);
+		}
 		return $s;
 	}
 }

src/wp-includes/post-template.php

Doc Comments +9 added lines, -9 removed lines

@@ -104,7 +104,7 @@ 
  *
  * @since 0.71
  *
- * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global $post.
+ * @param integer $post Optional. Post ID or WP_Post object. Default is global $post.
  * @return string
  */
 function get_the_title( $post = 0 ) {
@@ -169,7 +169,7 @@ 
  *
  * @since 1.5.0
  *
- * @param int|WP_Post $post Optional. Post ID or post object. Default is global $post.
+ * @param integer $post Optional. Post ID or post object. Default is global $post.
  */
 function the_guid( $post = 0 ) {
 	$post = get_post( $post );
@@ -199,7 +199,7 @@ 
  *
  * @since 1.5.0
  *
- * @param int|WP_Post $post Optional. Post ID or post object. Default is global $post.
+ * @param integer $post Optional. Post ID or post object. Default is global $post.
  * @return string
  */
 function get_the_guid( $post = 0 ) {
@@ -393,7 +393,7 @@ 
  *
  * @since 2.3.0
  *
- * @param int|WP_Post $id Optional. Post ID or post object.
+ * @param integer $id Optional. Post ID or post object.
  * @return bool
  */
 function has_excerpt( $id = 0 ) {
@@ -1403,7 +1403,7 @@ 
  *
  * @since 2.0.0
  *
- * @param int|WP_Post $id Optional. Post ID or post object.
+ * @param integer $id Optional. Post ID or post object.
  * @param bool        $fullsize     Optional, default is false. Whether to use full size.
  * @param bool        $deprecated   Deprecated. Not used.
  * @param bool        $permalink    Optional, default is false. Whether to include permalink.
@@ -1424,7 +1424,7 @@ 
  * @since 2.5.0
  * @since 4.4.0 The `$id` parameter can now accept either a post ID or `WP_Post` object.
  *
- * @param int|WP_Post  $id        Optional. Post ID or post object.
+ * @param integer  $id        Optional. Post ID or post object.
  * @param string|array $size      Optional. Image size. Accepts any valid image size, or an array
  *                                of width and height values in pixels (in that order).
  *                                Default 'thumbnail'.
@@ -1528,7 +1528,7 @@ 
  *
  * @since 1.0.0
  *
- * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global $post.
+ * @param integer $post Optional. Post ID or WP_Post object. Default is global $post.
  * @return string HTML content for password form for password protected post.
  */
 function get_the_password_form( $post = 0 ) {
@@ -1563,7 +1563,7 @@ 
  * @since 2.5.0
  * @since 4.2.0 The `$template` parameter was changed to also accept an array of page templates.
  *
- * @param string|array $template The specific template name or array of templates to match.
+ * @param string $template The specific template name or array of templates to match.
  * @return bool True on success, false on failure.
  */
 function is_page_template( $template = '' ) {
@@ -1707,7 +1707,7 @@ 
  *
  * @since 2.6.0
  *
- * @param int|WP_Post $post_id Optional. Post ID or WP_Post object. Default is global $post.
+ * @param integer $post_id Optional. Post ID or WP_Post object. Default is global $post.
  * @param string      $type    'all' (default), 'revision' or 'autosave'
  */
 function wp_list_post_revisions( $post_id = 0, $type = 'all' ) {

Indentation +8 added lines, -8 removed lines

@@ -1,12 +1,12 @@ 
 <?php
 /**
- * WordPress Post Template Functions.
- *
- * Gets content for the current post in the loop.
- *
- * @package WordPress
- * @subpackage Template
- */
+	 * WordPress Post Template Functions.
+	 *
+	 * Gets content for the current post in the loop.
+	 *
+	 * @package WordPress
+	 * @subpackage Template
+	 */
 
 /**
  * Display the ID of the current item in the WordPress Loop.
@@ -1089,7 +1089,7 @@ 
 	 * @param string $output HTML output for drop down list of pages.
 	 * @param array  $r      The parsed arguments array.
 	 * @param array  $pages  List of WP_Post objects returned by `get_pages()`
- 	 */
+	 */
 	$html = apply_filters( 'wp_dropdown_pages', $output, $r, $pages );
 
 	if ( $r['echo'] ) {

Spacing +414 added lines, -414 removed lines

@@ -26,7 +26,7 @@ 
  */
 function get_the_ID() {
 	$post = get_post();
-	return ! empty( $post ) ? $post->ID : false;
+	return ! empty($post) ? $post->ID : false;
 }
 
 /**
@@ -39,15 +39,15 @@ 
  * @param bool   $echo   Optional, default to true.Whether to display or return.
  * @return string|void String if $echo parameter is false.
  */
-function the_title( $before = '', $after = '', $echo = true ) {
+function the_title($before = '', $after = '', $echo = true) {
 	$title = get_the_title();
 
-	if ( strlen($title) == 0 )
+	if (strlen($title) == 0)
 		return;
 
-	$title = $before . $title . $after;
+	$title = $before.$title.$after;
 
-	if ( $echo )
+	if ($echo)
 		echo $title;
 	else
 		return $title;
@@ -75,20 +75,20 @@ 
  * }
  * @return string|void String when echo is false.
  */
-function the_title_attribute( $args = '' ) {
-	$defaults = array( 'before' => '', 'after' =>  '', 'echo' => true, 'post' => get_post() );
-	$r = wp_parse_args( $args, $defaults );
+function the_title_attribute($args = '') {
+	$defaults = array('before' => '', 'after' =>  '', 'echo' => true, 'post' => get_post());
+	$r = wp_parse_args($args, $defaults);
 
-	$title = get_the_title( $r['post'] );
+	$title = get_the_title($r['post']);
 
-	if ( strlen( $title ) == 0 ) {
+	if (strlen($title) == 0) {
 		return;
 	}
 
-	$title = $r['before'] . $title . $r['after'];
-	$title = esc_attr( strip_tags( $title ) );
+	$title = $r['before'].$title.$r['after'];
+	$title = esc_attr(strip_tags($title));
 
-	if ( $r['echo'] ) {
+	if ($r['echo']) {
 		echo $title;
 	} else {
 		return $title;
@@ -107,14 +107,14 @@ 
  * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global $post.
  * @return string
  */
-function get_the_title( $post = 0 ) {
-	$post = get_post( $post );
+function get_the_title($post = 0) {
+	$post = get_post($post);
 
-	$title = isset( $post->post_title ) ? $post->post_title : '';
-	$id = isset( $post->ID ) ? $post->ID : 0;
+	$title = isset($post->post_title) ? $post->post_title : '';
+	$id = isset($post->ID) ? $post->ID : 0;
 
-	if ( ! is_admin() ) {
-		if ( ! empty( $post->post_password ) ) {
+	if ( ! is_admin()) {
+		if ( ! empty($post->post_password)) {
 
 			/**
 			 * Filter the text prepended to the post title for protected posts.
@@ -127,9 +127,9 @@ 
 			 *                         Default 'Protected: %s'.
 			 * @param WP_Post $post    Current post object.
 			 */
-			$protected_title_format = apply_filters( 'protected_title_format', __( 'Protected: %s' ), $post );
-			$title = sprintf( $protected_title_format, $title );
-		} elseif ( isset( $post->post_status ) && 'private' == $post->post_status ) {
+			$protected_title_format = apply_filters('protected_title_format', __('Protected: %s'), $post);
+			$title = sprintf($protected_title_format, $title);
+		} elseif (isset($post->post_status) && 'private' == $post->post_status) {
 
 			/**
 			 * Filter the text prepended to the post title of private posts.
@@ -142,8 +142,8 @@ 
 			 *                         Default 'Private: %s'.
 			 * @param WP_Post $post    Current post object.
 			 */
-			$private_title_format = apply_filters( 'private_title_format', __( 'Private: %s' ), $post );
-			$title = sprintf( $private_title_format, $title );
+			$private_title_format = apply_filters('private_title_format', __('Private: %s'), $post);
+			$title = sprintf($private_title_format, $title);
 		}
 	}
 
@@ -155,7 +155,7 @@ 
 	 * @param string $title The post title.
 	 * @param int    $id    The post ID.
 	 */
-	return apply_filters( 'the_title', $title, $id );
+	return apply_filters('the_title', $title, $id);
 }
 
 /**
@@ -171,11 +171,11 @@ 
  *
  * @param int|WP_Post $post Optional. Post ID or post object. Default is global $post.
  */
-function the_guid( $post = 0 ) {
-	$post = get_post( $post );
+function the_guid($post = 0) {
+	$post = get_post($post);
 
-	$guid = isset( $post->guid ) ? get_the_guid( $post ) : '';
-	$id   = isset( $post->ID ) ? $post->ID : 0;
+	$guid = isset($post->guid) ? get_the_guid($post) : '';
+	$id   = isset($post->ID) ? $post->ID : 0;
 
 	/**
 	 * Filter the escaped Global Unique Identifier (guid) of the post.
@@ -187,7 +187,7 @@ 
 	 * @param string $guid Escaped Global Unique Identifier (guid) of the post.
 	 * @param int    $id   The post ID.
 	 */
-	echo apply_filters( 'the_guid', $guid, $id );
+	echo apply_filters('the_guid', $guid, $id);
 }
 
 /**
@@ -202,11 +202,11 @@ 
  * @param int|WP_Post $post Optional. Post ID or post object. Default is global $post.
  * @return string
  */
-function get_the_guid( $post = 0 ) {
-	$post = get_post( $post );
+function get_the_guid($post = 0) {
+	$post = get_post($post);
 
-	$guid = isset( $post->guid ) ? $post->guid : '';
-	$id   = isset( $post->ID ) ? $post->ID : 0;
+	$guid = isset($post->guid) ? $post->guid : '';
+	$id   = isset($post->ID) ? $post->ID : 0;
 
 	/**
 	 * Filter the Global Unique Identifier (guid) of the post.
@@ -216,7 +216,7 @@ 
 	 * @param string $guid Global Unique Identifier (guid) of the post.
 	 * @param int    $id   The post ID.
 	 */
-	return apply_filters( 'get_the_guid', $guid, $id );
+	return apply_filters('get_the_guid', $guid, $id);
 }
 
 /**
@@ -227,8 +227,8 @@ 
  * @param string $more_link_text Optional. Content for when there is more text.
  * @param bool   $strip_teaser   Optional. Strip teaser content before the more text. Default is false.
  */
-function the_content( $more_link_text = null, $strip_teaser = false) {
-	$content = get_the_content( $more_link_text, $strip_teaser );
+function the_content($more_link_text = null, $strip_teaser = false) {
+	$content = get_the_content($more_link_text, $strip_teaser);
 
 	/**
 	 * Filter the post content.
@@ -237,8 +237,8 @@ 
 	 *
 	 * @param string $content Content of the current post.
 	 */
-	$content = apply_filters( 'the_content', $content );
-	$content = str_replace( ']]>', ']]>', $content );
+	$content = apply_filters('the_content', $content);
+	$content = str_replace(']]>', ']]>', $content);
 	echo $content;
 }
 
@@ -257,50 +257,50 @@ 
  * @param bool   $strip_teaser   Optional. Strip teaser content before the more text. Default is false.
  * @return string
  */
-function get_the_content( $more_link_text = null, $strip_teaser = false ) {
+function get_the_content($more_link_text = null, $strip_teaser = false) {
 	global $page, $more, $preview, $pages, $multipage;
 
 	$post = get_post();
 
-	if ( null === $more_link_text )
-		$more_link_text = __( '(more…)' );
+	if (null === $more_link_text)
+		$more_link_text = __('(more…)');
 
 	$output = '';
 	$has_teaser = false;
 
 	// If post password required and it doesn't match the cookie.
-	if ( post_password_required( $post ) )
-		return get_the_password_form( $post );
+	if (post_password_required($post))
+		return get_the_password_form($post);
 
-	if ( $page > count( $pages ) ) // if the requested page doesn't exist
-		$page = count( $pages ); // give them the highest numbered page that DOES exist
+	if ($page > count($pages)) // if the requested page doesn't exist
+		$page = count($pages); // give them the highest numbered page that DOES exist
 
 	$content = $pages[$page - 1];
-	if ( preg_match( '/<!--more(.*?)?-->/', $content, $matches ) ) {
-		$content = explode( $matches[0], $content, 2 );
-		if ( ! empty( $matches[1] ) && ! empty( $more_link_text ) )
-			$more_link_text = strip_tags( wp_kses_no_null( trim( $matches[1] ) ) );
+	if (preg_match('/<!--more(.*?)?-->/', $content, $matches)) {
+		$content = explode($matches[0], $content, 2);
+		if ( ! empty($matches[1]) && ! empty($more_link_text))
+			$more_link_text = strip_tags(wp_kses_no_null(trim($matches[1])));
 
 		$has_teaser = true;
 	} else {
-		$content = array( $content );
+		$content = array($content);
 	}
 
-	if ( false !== strpos( $post->post_content, '<!--noteaser-->' ) && ( ! $multipage || $page == 1 ) )
+	if (false !== strpos($post->post_content, '<!--noteaser-->') && ( ! $multipage || $page == 1))
 		$strip_teaser = true;
 
 	$teaser = $content[0];
 
-	if ( $more && $strip_teaser && $has_teaser )
+	if ($more && $strip_teaser && $has_teaser)
 		$teaser = '';
 
 	$output .= $teaser;
 
-	if ( count( $content ) > 1 ) {
-		if ( $more ) {
-			$output .= '<span id="more-' . $post->ID . '"></span>' . $content[1];
+	if (count($content) > 1) {
+		if ($more) {
+			$output .= '<span id="more-'.$post->ID.'"></span>'.$content[1];
 		} else {
-			if ( ! empty( $more_link_text ) )
+			if ( ! empty($more_link_text))
 
 				/**
 				 * Filter the Read More link text.
@@ -310,13 +310,13 @@ 
 				 * @param string $more_link_element Read More link element.
 				 * @param string $more_link_text    Read More text.
 				 */
-				$output .= apply_filters( 'the_content_more_link', ' <a href="' . get_permalink() . "#more-{$post->ID}\" class=\"more-link\">$more_link_text</a>", $more_link_text );
-			$output = force_balance_tags( $output );
+				$output .= apply_filters('the_content_more_link', ' <a href="'.get_permalink()."#more-{$post->ID}\" class=\"more-link\">$more_link_text</a>", $more_link_text);
+			$output = force_balance_tags($output);
 		}
 	}
 
-	if ( $preview ) // Preview fix for JavaScript bug with foreign languages.
-		$output =	preg_replace_callback( '/\%u([0-9A-F]{4})/', '_convert_urlencoded_to_entities', $output );
+	if ($preview) // Preview fix for JavaScript bug with foreign languages.
+		$output = preg_replace_callback('/\%u([0-9A-F]{4})/', '_convert_urlencoded_to_entities', $output);
 
 	return $output;
 }
@@ -330,8 +330,8 @@ 
  * @param array $match Match array from preg_replace_callback.
  * @return string
  */
-function _convert_urlencoded_to_entities( $match ) {
-	return '&#' . base_convert( $match[1], 16, 10 ) . ';';
+function _convert_urlencoded_to_entities($match) {
+	return '&#'.base_convert($match[1], 16, 10).';';
 }
 
 /**
@@ -350,7 +350,7 @@ 
 	 *
 	 * @param string $post_excerpt The post excerpt.
 	 */
-	echo apply_filters( 'the_excerpt', get_the_excerpt() );
+	echo apply_filters('the_excerpt', get_the_excerpt());
 }
 
 /**
@@ -362,18 +362,18 @@ 
  * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global $post.
  * @return string Post excerpt.
  */
-function get_the_excerpt( $post = null ) {
-	if ( is_bool( $post ) ) {
-		_deprecated_argument( __FUNCTION__, '2.3' );
+function get_the_excerpt($post = null) {
+	if (is_bool($post)) {
+		_deprecated_argument(__FUNCTION__, '2.3');
 	}
 
-	$post = get_post( $post );
-	if ( empty( $post ) ) {
+	$post = get_post($post);
+	if (empty($post)) {
 		return '';
 	}
 
-	if ( post_password_required( $post ) ) {
-		return __( 'There is no excerpt because this is a protected post.' );
+	if (post_password_required($post)) {
+		return __('There is no excerpt because this is a protected post.');
 	}
 
 	/**
@@ -385,7 +385,7 @@ 
 	 * @param string $post_excerpt The post excerpt.
 	 * @param WP_Post $post Post object.
 	 */
-	return apply_filters( 'get_the_excerpt', $post->post_excerpt, $post );
+	return apply_filters('get_the_excerpt', $post->post_excerpt, $post);
 }
 
 /**
@@ -396,9 +396,9 @@ 
  * @param int|WP_Post $id Optional. Post ID or post object.
  * @return bool
  */
-function has_excerpt( $id = 0 ) {
-	$post = get_post( $id );
-	return ( !empty( $post->post_excerpt ) );
+function has_excerpt($id = 0) {
+	$post = get_post($id);
+	return ( ! empty($post->post_excerpt));
 }
 
 /**
@@ -409,9 +409,9 @@ 
  * @param string|array $class   One or more classes to add to the class list.
  * @param int|WP_Post  $post_id Optional. Post ID or post object. Defaults to the global `$post`.
  */
-function post_class( $class = '', $post_id = null ) {
+function post_class($class = '', $post_id = null) {
 	// Separates classes with a single space, collates classes for post DIV
-	echo 'class="' . join( ' ', get_post_class( $class, $post_id ) ) . '"';
+	echo 'class="'.join(' ', get_post_class($class, $post_id)).'"';
 }
 
 /**
@@ -433,60 +433,60 @@ 
  * @param int|WP_Post  $post_id Optional. Post ID or post object.
  * @return array Array of classes.
  */
-function get_post_class( $class = '', $post_id = null ) {
-	$post = get_post( $post_id );
+function get_post_class($class = '', $post_id = null) {
+	$post = get_post($post_id);
 
 	$classes = array();
 
-	if ( $class ) {
-		if ( ! is_array( $class ) ) {
-			$class = preg_split( '#\s+#', $class );
+	if ($class) {
+		if ( ! is_array($class)) {
+			$class = preg_split('#\s+#', $class);
 		}
-		$classes = array_map( 'esc_attr', $class );
+		$classes = array_map('esc_attr', $class);
 	} else {
 		// Ensure that we always coerce class to being an array.
 		$class = array();
 	}
 
-	if ( ! $post ) {
+	if ( ! $post) {
 		return $classes;
 	}
 
-	$classes[] = 'post-' . $post->ID;
-	if ( ! is_admin() )
+	$classes[] = 'post-'.$post->ID;
+	if ( ! is_admin())
 		$classes[] = $post->post_type;
-	$classes[] = 'type-' . $post->post_type;
-	$classes[] = 'status-' . $post->post_status;
+	$classes[] = 'type-'.$post->post_type;
+	$classes[] = 'status-'.$post->post_status;
 
 	// Post Format
-	if ( post_type_supports( $post->post_type, 'post-formats' ) ) {
-		$post_format = get_post_format( $post->ID );
+	if (post_type_supports($post->post_type, 'post-formats')) {
+		$post_format = get_post_format($post->ID);
 
-		if ( $post_format && !is_wp_error($post_format) )
-			$classes[] = 'format-' . sanitize_html_class( $post_format );
+		if ($post_format && ! is_wp_error($post_format))
+			$classes[] = 'format-'.sanitize_html_class($post_format);
 		else
 			$classes[] = 'format-standard';
 	}
 
-	$post_password_required = post_password_required( $post->ID );
+	$post_password_required = post_password_required($post->ID);
 
 	// Post requires password.
-	if ( $post_password_required ) {
+	if ($post_password_required) {
 		$classes[] = 'post-password-required';
-	} elseif ( ! empty( $post->post_password ) ) {
+	} elseif ( ! empty($post->post_password)) {
 		$classes[] = 'post-password-protected';
 	}
 
 	// Post thumbnails.
-	if ( current_theme_supports( 'post-thumbnails' ) && has_post_thumbnail( $post->ID ) && ! is_attachment( $post ) && ! $post_password_required ) {
+	if (current_theme_supports('post-thumbnails') && has_post_thumbnail($post->ID) && ! is_attachment($post) && ! $post_password_required) {
 		$classes[] = 'has-post-thumbnail';
 	}
 
 	// sticky for Sticky Posts
-	if ( is_sticky( $post->ID ) ) {
-		if ( is_home() && ! is_paged() ) {
+	if (is_sticky($post->ID)) {
+		if (is_home() && ! is_paged()) {
 			$classes[] = 'sticky';
-		} elseif ( is_admin() ) {
+		} elseif (is_admin()) {
 			$classes[] = 'status-sticky';
 		}
 	}
@@ -495,30 +495,30 @@ 
 	$classes[] = 'hentry';
 
 	// All public taxonomies
-	$taxonomies = get_taxonomies( array( 'public' => true ) );
-	foreach ( (array) $taxonomies as $taxonomy ) {
-		if ( is_object_in_taxonomy( $post->post_type, $taxonomy ) ) {
-			foreach ( (array) get_the_terms( $post->ID, $taxonomy ) as $term ) {
-				if ( empty( $term->slug ) ) {
+	$taxonomies = get_taxonomies(array('public' => true));
+	foreach ((array) $taxonomies as $taxonomy) {
+		if (is_object_in_taxonomy($post->post_type, $taxonomy)) {
+			foreach ((array) get_the_terms($post->ID, $taxonomy) as $term) {
+				if (empty($term->slug)) {
 					continue;
 				}
 
-				$term_class = sanitize_html_class( $term->slug, $term->term_id );
-				if ( is_numeric( $term_class ) || ! trim( $term_class, '-' ) ) {
+				$term_class = sanitize_html_class($term->slug, $term->term_id);
+				if (is_numeric($term_class) || ! trim($term_class, '-')) {
 					$term_class = $term->term_id;
 				}
 
 				// 'post_tag' uses the 'tag' prefix for backward compatibility.
-				if ( 'post_tag' == $taxonomy ) {
-					$classes[] = 'tag-' . $term_class;
+				if ('post_tag' == $taxonomy) {
+					$classes[] = 'tag-'.$term_class;
 				} else {
-					$classes[] = sanitize_html_class( $taxonomy . '-' . $term_class, $taxonomy . '-' . $term->term_id );
+					$classes[] = sanitize_html_class($taxonomy.'-'.$term_class, $taxonomy.'-'.$term->term_id);
 				}
 			}
 		}
 	}
 
-	$classes = array_map( 'esc_attr', $classes );
+	$classes = array_map('esc_attr', $classes);
 
 	/**
 	 * Filter the list of CSS classes for the current post.
@@ -529,9 +529,9 @@ 
 	 * @param array $class   An array of additional classes added to the post.
 	 * @param int   $post_id The post ID.
 	 */
-	$classes = apply_filters( 'post_class', $classes, $class, $post->ID );
+	$classes = apply_filters('post_class', $classes, $class, $post->ID);
 
-	return array_unique( $classes );
+	return array_unique($classes);
 }
 
 /**
@@ -541,9 +541,9 @@ 
  *
  * @param string|array $class One or more classes to add to the class list.
  */
-function body_class( $class = '' ) {
+function body_class($class = '') {
 	// Separates classes with a single space, collates classes for body element
-	echo 'class="' . join( ' ', get_body_class( $class ) ) . '"';
+	echo 'class="'.join(' ', get_body_class($class)).'"';
 }
 
 /**
@@ -556,196 +556,196 @@ 
  * @param string|array $class One or more classes to add to the class list.
  * @return array Array of classes.
  */
-function get_body_class( $class = '' ) {
+function get_body_class($class = '') {
 	global $wp_query;
 
 	$classes = array();
 
-	if ( is_rtl() )
+	if (is_rtl())
 		$classes[] = 'rtl';
 
-	if ( is_front_page() )
+	if (is_front_page())
 		$classes[] = 'home';
-	if ( is_home() )
+	if (is_home())
 		$classes[] = 'blog';
-	if ( is_archive() )
+	if (is_archive())
 		$classes[] = 'archive';
-	if ( is_date() )
+	if (is_date())
 		$classes[] = 'date';
-	if ( is_search() ) {
+	if (is_search()) {
 		$classes[] = 'search';
 		$classes[] = $wp_query->posts ? 'search-results' : 'search-no-results';
 	}
-	if ( is_paged() )
+	if (is_paged())
 		$classes[] = 'paged';
-	if ( is_attachment() )
+	if (is_attachment())
 		$classes[] = 'attachment';
-	if ( is_404() )
+	if (is_404())
 		$classes[] = 'error404';
-	if ( is_singular() ) {
+	if (is_singular()) {
 		$classes[] = 'singular';
 	}
 
-	if ( is_single() ) {
+	if (is_single()) {
 		$post_id = $wp_query->get_queried_object_id();
 		$post = $wp_query->get_queried_object();
 
 		$classes[] = 'single';
-		if ( isset( $post->post_type ) ) {
-			$classes[] = 'single-' . sanitize_html_class($post->post_type, $post_id);
-			$classes[] = 'postid-' . $post_id;
+		if (isset($post->post_type)) {
+			$classes[] = 'single-'.sanitize_html_class($post->post_type, $post_id);
+			$classes[] = 'postid-'.$post_id;
 
 			// Post Format
-			if ( post_type_supports( $post->post_type, 'post-formats' ) ) {
-				$post_format = get_post_format( $post->ID );
+			if (post_type_supports($post->post_type, 'post-formats')) {
+				$post_format = get_post_format($post->ID);
 
-				if ( $post_format && !is_wp_error($post_format) )
-					$classes[] = 'single-format-' . sanitize_html_class( $post_format );
+				if ($post_format && ! is_wp_error($post_format))
+					$classes[] = 'single-format-'.sanitize_html_class($post_format);
 				else
 					$classes[] = 'single-format-standard';
 			}
 		}
 
-		if ( is_attachment() ) {
+		if (is_attachment()) {
 			$mime_type = get_post_mime_type($post_id);
-			$mime_prefix = array( 'application/', 'image/', 'text/', 'audio/', 'video/', 'music/' );
-			$classes[] = 'attachmentid-' . $post_id;
-			$classes[] = 'attachment-' . str_replace( $mime_prefix, '', $mime_type );
+			$mime_prefix = array('application/', 'image/', 'text/', 'audio/', 'video/', 'music/');
+			$classes[] = 'attachmentid-'.$post_id;
+			$classes[] = 'attachment-'.str_replace($mime_prefix, '', $mime_type);
 		}
-	} elseif ( is_archive() ) {
-		if ( is_post_type_archive() ) {
+	} elseif (is_archive()) {
+		if (is_post_type_archive()) {
 			$classes[] = 'post-type-archive';
-			$post_type = get_query_var( 'post_type' );
-			if ( is_array( $post_type ) )
-				$post_type = reset( $post_type );
-			$classes[] = 'post-type-archive-' . sanitize_html_class( $post_type );
-		} elseif ( is_author() ) {
+			$post_type = get_query_var('post_type');
+			if (is_array($post_type))
+				$post_type = reset($post_type);
+			$classes[] = 'post-type-archive-'.sanitize_html_class($post_type);
+		} elseif (is_author()) {
 			$author = $wp_query->get_queried_object();
 			$classes[] = 'author';
-			if ( isset( $author->user_nicename ) ) {
-				$classes[] = 'author-' . sanitize_html_class( $author->user_nicename, $author->ID );
-				$classes[] = 'author-' . $author->ID;
+			if (isset($author->user_nicename)) {
+				$classes[] = 'author-'.sanitize_html_class($author->user_nicename, $author->ID);
+				$classes[] = 'author-'.$author->ID;
 			}
-		} elseif ( is_category() ) {
+		} elseif (is_category()) {
 			$cat = $wp_query->get_queried_object();
 			$classes[] = 'category';
-			if ( isset( $cat->term_id ) ) {
-				$cat_class = sanitize_html_class( $cat->slug, $cat->term_id );
-				if ( is_numeric( $cat_class ) || ! trim( $cat_class, '-' ) ) {
+			if (isset($cat->term_id)) {
+				$cat_class = sanitize_html_class($cat->slug, $cat->term_id);
+				if (is_numeric($cat_class) || ! trim($cat_class, '-')) {
 					$cat_class = $cat->term_id;
 				}
 
-				$classes[] = 'category-' . $cat_class;
-				$classes[] = 'category-' . $cat->term_id;
+				$classes[] = 'category-'.$cat_class;
+				$classes[] = 'category-'.$cat->term_id;
 			}
-		} elseif ( is_tag() ) {
+		} elseif (is_tag()) {
 			$tag = $wp_query->get_queried_object();
 			$classes[] = 'tag';
-			if ( isset( $tag->term_id ) ) {
-				$tag_class = sanitize_html_class( $tag->slug, $tag->term_id );
-				if ( is_numeric( $tag_class ) || ! trim( $tag_class, '-' ) ) {
+			if (isset($tag->term_id)) {
+				$tag_class = sanitize_html_class($tag->slug, $tag->term_id);
+				if (is_numeric($tag_class) || ! trim($tag_class, '-')) {
 					$tag_class = $tag->term_id;
 				}
 
-				$classes[] = 'tag-' . $tag_class;
-				$classes[] = 'tag-' . $tag->term_id;
+				$classes[] = 'tag-'.$tag_class;
+				$classes[] = 'tag-'.$tag->term_id;
 			}
-		} elseif ( is_tax() ) {
+		} elseif (is_tax()) {
 			$term = $wp_query->get_queried_object();
-			if ( isset( $term->term_id ) ) {
-				$term_class = sanitize_html_class( $term->slug, $term->term_id );
-				if ( is_numeric( $term_class ) || ! trim( $term_class, '-' ) ) {
+			if (isset($term->term_id)) {
+				$term_class = sanitize_html_class($term->slug, $term->term_id);
+				if (is_numeric($term_class) || ! trim($term_class, '-')) {
 					$term_class = $term->term_id;
 				}
 
-				$classes[] = 'tax-' . sanitize_html_class( $term->taxonomy );
-				$classes[] = 'term-' . $term_class;
-				$classes[] = 'term-' . $term->term_id;
+				$classes[] = 'tax-'.sanitize_html_class($term->taxonomy);
+				$classes[] = 'term-'.$term_class;
+				$classes[] = 'term-'.$term->term_id;
 			}
 		}
-	} elseif ( is_page() ) {
+	} elseif (is_page()) {
 		$classes[] = 'page';
 
 		$page_id = $wp_query->get_queried_object_id();
 
 		$post = get_post($page_id);
 
-		$classes[] = 'page-id-' . $page_id;
+		$classes[] = 'page-id-'.$page_id;
 
-		if ( get_pages( array( 'parent' => $page_id, 'number' => 1 ) ) ) {
+		if (get_pages(array('parent' => $page_id, 'number' => 1))) {
 			$classes[] = 'page-parent';
 		}
 
-		if ( $post->post_parent ) {
+		if ($post->post_parent) {
 			$classes[] = 'page-child';
-			$classes[] = 'parent-pageid-' . $post->post_parent;
+			$classes[] = 'parent-pageid-'.$post->post_parent;
 		}
-		if ( is_page_template() ) {
+		if (is_page_template()) {
 			$classes[] = 'page-template';
 
-			$template_slug  = get_page_template_slug( $page_id );
-			$template_parts = explode( '/', $template_slug );
+			$template_slug  = get_page_template_slug($page_id);
+			$template_parts = explode('/', $template_slug);
 
-			foreach ( $template_parts as $part ) {
-				$classes[] = 'page-template-' . sanitize_html_class( str_replace( array( '.', '/' ), '-', basename( $part, '.php' ) ) );
+			foreach ($template_parts as $part) {
+				$classes[] = 'page-template-'.sanitize_html_class(str_replace(array('.', '/'), '-', basename($part, '.php')));
 			}
-			$classes[] = 'page-template-' . sanitize_html_class( str_replace( '.', '-', $template_slug ) );
+			$classes[] = 'page-template-'.sanitize_html_class(str_replace('.', '-', $template_slug));
 		} else {
 			$classes[] = 'page-template-default';
 		}
 	}
 
-	if ( is_user_logged_in() )
+	if (is_user_logged_in())
 		$classes[] = 'logged-in';
 
-	if ( is_admin_bar_showing() ) {
+	if (is_admin_bar_showing()) {
 		$classes[] = 'admin-bar';
 		$classes[] = 'no-customize-support';
 	}
 
-	if ( get_background_color() !== get_theme_support( 'custom-background', 'default-color' ) || get_background_image() )
+	if (get_background_color() !== get_theme_support('custom-background', 'default-color') || get_background_image())
 		$classes[] = 'custom-background';
 
-	if ( has_custom_logo() ) {
+	if (has_custom_logo()) {
 		$classes[] = 'wp-custom-logo';
 	}
 
-	$page = $wp_query->get( 'page' );
-
-	if ( ! $page || $page < 2 )
-		$page = $wp_query->get( 'paged' );
-
-	if ( $page && $page > 1 && ! is_404() ) {
-		$classes[] = 'paged-' . $page;
-
-		if ( is_single() )
-			$classes[] = 'single-paged-' . $page;
-		elseif ( is_page() )
-			$classes[] = 'page-paged-' . $page;
-		elseif ( is_category() )
-			$classes[] = 'category-paged-' . $page;
-		elseif ( is_tag() )
-			$classes[] = 'tag-paged-' . $page;
-		elseif ( is_date() )
-			$classes[] = 'date-paged-' . $page;
-		elseif ( is_author() )
-			$classes[] = 'author-paged-' . $page;
-		elseif ( is_search() )
-			$classes[] = 'search-paged-' . $page;
-		elseif ( is_post_type_archive() )
-			$classes[] = 'post-type-paged-' . $page;
+	$page = $wp_query->get('page');
+
+	if ( ! $page || $page < 2)
+		$page = $wp_query->get('paged');
+
+	if ($page && $page > 1 && ! is_404()) {
+		$classes[] = 'paged-'.$page;
+
+		if (is_single())
+			$classes[] = 'single-paged-'.$page;
+		elseif (is_page())
+			$classes[] = 'page-paged-'.$page;
+		elseif (is_category())
+			$classes[] = 'category-paged-'.$page;
+		elseif (is_tag())
+			$classes[] = 'tag-paged-'.$page;
+		elseif (is_date())
+			$classes[] = 'date-paged-'.$page;
+		elseif (is_author())
+			$classes[] = 'author-paged-'.$page;
+		elseif (is_search())
+			$classes[] = 'search-paged-'.$page;
+		elseif (is_post_type_archive())
+			$classes[] = 'post-type-paged-'.$page;
 	}
 
-	if ( ! empty( $class ) ) {
-		if ( !is_array( $class ) )
-			$class = preg_split( '#\s+#', $class );
-		$classes = array_merge( $classes, $class );
+	if ( ! empty($class)) {
+		if ( ! is_array($class))
+			$class = preg_split('#\s+#', $class);
+		$classes = array_merge($classes, $class);
 	} else {
 		// Ensure that we always coerce class to being an array.
 		$class = array();
 	}
 
-	$classes = array_map( 'esc_attr', $classes );
+	$classes = array_map('esc_attr', $classes);
 
 	/**
 	 * Filter the list of CSS body classes for the current post or page.
@@ -755,9 +755,9 @@ 
 	 * @param array $classes An array of body classes.
 	 * @param array $class   An array of additional classes added to the body.
 	 */
-	$classes = apply_filters( 'body_class', $classes, $class );
+	$classes = apply_filters('body_class', $classes, $class);
 
-	return array_unique( $classes );
+	return array_unique($classes);
 }
 
 /**
@@ -768,23 +768,23 @@ 
  * @param int|WP_Post|null $post An optional post. Global $post used if not provided.
  * @return bool false if a password is not required or the correct password cookie is present, true otherwise.
  */
-function post_password_required( $post = null ) {
+function post_password_required($post = null) {
 	$post = get_post($post);
 
-	if ( empty( $post->post_password ) )
+	if (empty($post->post_password))
 		return false;
 
-	if ( ! isset( $_COOKIE['wp-postpass_' . COOKIEHASH] ) )
+	if ( ! isset($_COOKIE['wp-postpass_'.COOKIEHASH]))
 		return true;
 
-	require_once ABSPATH . WPINC . '/class-phpass.php';
-	$hasher = new PasswordHash( 8, true );
+	require_once ABSPATH.WPINC.'/class-phpass.php';
+	$hasher = new PasswordHash(8, true);
 
-	$hash = wp_unslash( $_COOKIE[ 'wp-postpass_' . COOKIEHASH ] );
-	if ( 0 !== strpos( $hash, '$P$B' ) )
+	$hash = wp_unslash($_COOKIE['wp-postpass_'.COOKIEHASH]);
+	if (0 !== strpos($hash, '$P$B'))
 		return true;
 
-	return ! $hasher->CheckPassword( $post->post_password, $hash );
+	return ! $hasher->CheckPassword($post->post_password, $hash);
 }
 
 //
@@ -825,23 +825,23 @@ 
  * }
  * @return string Formatted output in HTML.
  */
-function wp_link_pages( $args = '' ) {
+function wp_link_pages($args = '') {
 	global $page, $numpages, $multipage, $more;
 
 	$defaults = array(
-		'before'           => '<p>' . __( 'Pages:' ),
+		'before'           => '<p>'.__('Pages:'),
 		'after'            => '</p>',
 		'link_before'      => '',
 		'link_after'       => '',
 		'next_or_number'   => 'number',
 		'separator'        => ' ',
-		'nextpagelink'     => __( 'Next page' ),
-		'previouspagelink' => __( 'Previous page' ),
+		'nextpagelink'     => __('Next page'),
+		'previouspagelink' => __('Previous page'),
 		'pagelink'         => '%',
 		'echo'             => 1
 	);
 
-	$params = wp_parse_args( $args, $defaults );
+	$params = wp_parse_args($args, $defaults);
 
 	/**
 	 * Filter the arguments used in retrieving page links for paginated posts.
@@ -850,16 +850,16 @@ 
 	 *
 	 * @param array $params An array of arguments for page links for paginated posts.
 	 */
-	$r = apply_filters( 'wp_link_pages_args', $params );
+	$r = apply_filters('wp_link_pages_args', $params);
 
 	$output = '';
-	if ( $multipage ) {
-		if ( 'number' == $r['next_or_number'] ) {
+	if ($multipage) {
+		if ('number' == $r['next_or_number']) {
 			$output .= $r['before'];
-			for ( $i = 1; $i <= $numpages; $i++ ) {
-				$link = $r['link_before'] . str_replace( '%', $i, $r['pagelink'] ) . $r['link_after'];
-				if ( $i != $page || ! $more && 1 == $page ) {
-					$link = _wp_link_page( $i ) . $link . '</a>';
+			for ($i = 1; $i <= $numpages; $i++) {
+				$link = $r['link_before'].str_replace('%', $i, $r['pagelink']).$r['link_after'];
+				if ($i != $page || ! $more && 1 == $page) {
+					$link = _wp_link_page($i).$link.'</a>';
 				}
 				/**
 				 * Filter the HTML output of individual page number links.
@@ -869,31 +869,31 @@ 
 				 * @param string $link The page number HTML output.
 				 * @param int    $i    Page number for paginated posts' page links.
 				 */
-				$link = apply_filters( 'wp_link_pages_link', $link, $i );
+				$link = apply_filters('wp_link_pages_link', $link, $i);
 
 				// Use the custom links separator beginning with the second link.
-				$output .= ( 1 === $i ) ? ' ' : $r['separator'];
+				$output .= (1 === $i) ? ' ' : $r['separator'];
 				$output .= $link;
 			}
 			$output .= $r['after'];
-		} elseif ( $more ) {
+		} elseif ($more) {
 			$output .= $r['before'];
 			$prev = $page - 1;
-			if ( $prev > 0 ) {
-				$link = _wp_link_page( $prev ) . $r['link_before'] . $r['previouspagelink'] . $r['link_after'] . '</a>';
+			if ($prev > 0) {
+				$link = _wp_link_page($prev).$r['link_before'].$r['previouspagelink'].$r['link_after'].'</a>';
 
 				/** This filter is documented in wp-includes/post-template.php */
-				$output .= apply_filters( 'wp_link_pages_link', $link, $prev );
+				$output .= apply_filters('wp_link_pages_link', $link, $prev);
 			}
 			$next = $page + 1;
-			if ( $next <= $numpages ) {
-				if ( $prev ) {
+			if ($next <= $numpages) {
+				if ($prev) {
 					$output .= $r['separator'];
 				}
-				$link = _wp_link_page( $next ) . $r['link_before'] . $r['nextpagelink'] . $r['link_after'] . '</a>';
+				$link = _wp_link_page($next).$r['link_before'].$r['nextpagelink'].$r['link_after'].'</a>';
 
 				/** This filter is documented in wp-includes/post-template.php */
-				$output .= apply_filters( 'wp_link_pages_link', $link, $next );
+				$output .= apply_filters('wp_link_pages_link', $link, $next);
 			}
 			$output .= $r['after'];
 		}
@@ -907,9 +907,9 @@ 
 	 * @param string $output HTML output of paginated posts' page links.
 	 * @param array  $args   An array of arguments.
 	 */
-	$html = apply_filters( 'wp_link_pages', $output, $args );
+	$html = apply_filters('wp_link_pages', $output, $args);
 
-	if ( $r['echo'] ) {
+	if ($r['echo']) {
 		echo $html;
 	}
 	return $html;
@@ -926,33 +926,33 @@ 
  * @param int $i Page number.
  * @return string Link.
  */
-function _wp_link_page( $i ) {
+function _wp_link_page($i) {
 	global $wp_rewrite;
 	$post = get_post();
 	$query_args = array();
 
-	if ( 1 == $i ) {
+	if (1 == $i) {
 		$url = get_permalink();
 	} else {
-		if ( '' == get_option('permalink_structure') || in_array($post->post_status, array('draft', 'pending')) )
-			$url = add_query_arg( 'page', $i, get_permalink() );
-		elseif ( 'page' == get_option('show_on_front') && get_option('page_on_front') == $post->ID )
-			$url = trailingslashit(get_permalink()) . user_trailingslashit("$wp_rewrite->pagination_base/" . $i, 'single_paged');
+		if ('' == get_option('permalink_structure') || in_array($post->post_status, array('draft', 'pending')))
+			$url = add_query_arg('page', $i, get_permalink());
+		elseif ('page' == get_option('show_on_front') && get_option('page_on_front') == $post->ID)
+			$url = trailingslashit(get_permalink()).user_trailingslashit("$wp_rewrite->pagination_base/".$i, 'single_paged');
 		else
-			$url = trailingslashit(get_permalink()) . user_trailingslashit($i, 'single_paged');
+			$url = trailingslashit(get_permalink()).user_trailingslashit($i, 'single_paged');
 	}
 
-	if ( is_preview() ) {
+	if (is_preview()) {
 
-		if ( ( 'draft' !== $post->post_status ) && isset( $_GET['preview_id'], $_GET['preview_nonce'] ) ) {
-			$query_args['preview_id'] = wp_unslash( $_GET['preview_id'] );
-			$query_args['preview_nonce'] = wp_unslash( $_GET['preview_nonce'] );
+		if (('draft' !== $post->post_status) && isset($_GET['preview_id'], $_GET['preview_nonce'])) {
+			$query_args['preview_id'] = wp_unslash($_GET['preview_id']);
+			$query_args['preview_nonce'] = wp_unslash($_GET['preview_nonce']);
 		}
 
-		$url = get_preview_post_link( $post, $query_args, $url );
+		$url = get_preview_post_link($post, $query_args, $url);
 	}
 
-	return '<a href="' . esc_url( $url ) . '">';
+	return '<a href="'.esc_url($url).'">';
 }
 
 //
@@ -967,12 +967,12 @@ 
  * @param string $key Meta data key name.
  * @return false|string|array Array of values or single value, if only one element exists. False will be returned if key does not exist.
  */
-function post_custom( $key = '' ) {
+function post_custom($key = '') {
 	$custom = get_post_custom();
 
-	if ( !isset( $custom[$key] ) )
+	if ( ! isset($custom[$key]))
 		return false;
-	elseif ( 1 == count($custom[$key]) )
+	elseif (1 == count($custom[$key]))
 		return $custom[$key][0];
 	else
 		return $custom[$key];
@@ -987,14 +987,14 @@ 
  *
  */
 function the_meta() {
-	if ( $keys = get_post_custom_keys() ) {
+	if ($keys = get_post_custom_keys()) {
 		echo "<ul class='post-meta'>\n";
-		foreach ( (array) $keys as $key ) {
+		foreach ((array) $keys as $key) {
 			$keyt = trim($key);
-			if ( is_protected_meta( $keyt, 'post' ) )
+			if (is_protected_meta($keyt, 'post'))
 				continue;
 			$values = array_map('trim', get_post_custom_values($key));
-			$value = implode($values,', ');
+			$value = implode($values, ', ');
 
 			/**
 			 * Filter the HTML output of the li element in the post custom fields list.
@@ -1005,7 +1005,7 @@ 
 			 * @param string $key   Meta key.
 			 * @param string $value Meta value.
 			 */
-			echo apply_filters( 'the_meta_key', "<li><span class='post-meta-key'>$key:</span> $value</li>\n", $key, $value );
+			echo apply_filters('the_meta_key', "<li><span class='post-meta-key'>$key:</span> $value</li>\n", $key, $value);
 		}
 		echo "</ul>\n";
 	}
@@ -1043,7 +1043,7 @@ 
  * }
  * @return string HTML content, if not displaying.
  */
-function wp_dropdown_pages( $args = '' ) {
+function wp_dropdown_pages($args = '') {
 	$defaults = array(
 		'depth' => 0, 'child_of' => 0,
 		'selected' => 0, 'echo' => 1,
@@ -1054,29 +1054,29 @@ 
 		'value_field' => 'ID',
 	);
 
-	$r = wp_parse_args( $args, $defaults );
+	$r = wp_parse_args($args, $defaults);
 
-	$pages = get_pages( $r );
+	$pages = get_pages($r);
 	$output = '';
 	// Back-compat with old system where both id and name were based on $name argument
-	if ( empty( $r['id'] ) ) {
+	if (empty($r['id'])) {
 		$r['id'] = $r['name'];
 	}
 
-	if ( ! empty( $pages ) ) {
+	if ( ! empty($pages)) {
 		$class = '';
-		if ( ! empty( $r['class'] ) ) {
-			$class = " class='" . esc_attr( $r['class'] ) . "'";
+		if ( ! empty($r['class'])) {
+			$class = " class='".esc_attr($r['class'])."'";
 		}
 
-		$output = "<select name='" . esc_attr( $r['name'] ) . "'" . $class . " id='" . esc_attr( $r['id'] ) . "'>\n";
-		if ( $r['show_option_no_change'] ) {
-			$output .= "\t<option value=\"-1\">" . $r['show_option_no_change'] . "</option>\n";
+		$output = "<select name='".esc_attr($r['name'])."'".$class." id='".esc_attr($r['id'])."'>\n";
+		if ($r['show_option_no_change']) {
+			$output .= "\t<option value=\"-1\">".$r['show_option_no_change']."</option>\n";
 		}
-		if ( $r['show_option_none'] ) {
-			$output .= "\t<option value=\"" . esc_attr( $r['option_none_value'] ) . '">' . $r['show_option_none'] . "</option>\n";
+		if ($r['show_option_none']) {
+			$output .= "\t<option value=\"".esc_attr($r['option_none_value']).'">'.$r['show_option_none']."</option>\n";
 		}
-		$output .= walk_page_dropdown_tree( $pages, $r['depth'], $r );
+		$output .= walk_page_dropdown_tree($pages, $r['depth'], $r);
 		$output .= "</select>\n";
 	}
 
@@ -1090,9 +1090,9 @@ 
 	 * @param array  $r      The parsed arguments array.
 	 * @param array  $pages  List of WP_Post objects returned by `get_pages()`
  	 */
-	$html = apply_filters( 'wp_dropdown_pages', $output, $r, $pages );
+	$html = apply_filters('wp_dropdown_pages', $output, $r, $pages);
 
-	if ( $r['echo'] ) {
+	if ($r['echo']) {
 		echo $html;
 	}
 	return $html;
@@ -1135,26 +1135,26 @@ 
  * }
  * @return string|void HTML list of pages.
  */
-function wp_list_pages( $args = '' ) {
+function wp_list_pages($args = '') {
 	$defaults = array(
 		'depth' => 0, 'show_date' => '',
-		'date_format' => get_option( 'date_format' ),
+		'date_format' => get_option('date_format'),
 		'child_of' => 0, 'exclude' => '',
-		'title_li' => __( 'Pages' ), 'echo' => 1,
+		'title_li' => __('Pages'), 'echo' => 1,
 		'authors' => '', 'sort_column' => 'menu_order, post_title',
 		'link_before' => '', 'link_after' => '', 'walker' => '',
 	);
 
-	$r = wp_parse_args( $args, $defaults );
+	$r = wp_parse_args($args, $defaults);
 
 	$output = '';
 	$current_page = 0;
 
 	// sanitize, mostly to keep spaces out
-	$r['exclude'] = preg_replace( '/[^0-9,]/', '', $r['exclude'] );
+	$r['exclude'] = preg_replace('/[^0-9,]/', '', $r['exclude']);
 
 	// Allow plugins to filter an array of excluded pages (but don't put a nullstring into the array)
-	$exclude_array = ( $r['exclude'] ) ? explode( ',', $r['exclude'] ) : array();
+	$exclude_array = ($r['exclude']) ? explode(',', $r['exclude']) : array();
 
 	/**
 	 * Filter the array of pages to exclude from the pages list.
@@ -1163,29 +1163,29 @@ 
 	 *
 	 * @param array $exclude_array An array of page IDs to exclude.
 	 */
-	$r['exclude'] = implode( ',', apply_filters( 'wp_list_pages_excludes', $exclude_array ) );
+	$r['exclude'] = implode(',', apply_filters('wp_list_pages_excludes', $exclude_array));
 
 	// Query pages.
 	$r['hierarchical'] = 0;
-	$pages = get_pages( $r );
+	$pages = get_pages($r);
 
-	if ( ! empty( $pages ) ) {
-		if ( $r['title_li'] ) {
-			$output .= '<li class="pagenav">' . $r['title_li'] . '<ul>';
+	if ( ! empty($pages)) {
+		if ($r['title_li']) {
+			$output .= '<li class="pagenav">'.$r['title_li'].'<ul>';
 		}
 		global $wp_query;
-		if ( is_page() || is_attachment() || $wp_query->is_posts_page ) {
+		if (is_page() || is_attachment() || $wp_query->is_posts_page) {
 			$current_page = get_queried_object_id();
-		} elseif ( is_singular() ) {
+		} elseif (is_singular()) {
 			$queried_object = get_queried_object();
-			if ( is_post_type_hierarchical( $queried_object->post_type ) ) {
+			if (is_post_type_hierarchical($queried_object->post_type)) {
 				$current_page = $queried_object->ID;
 			}
 		}
 
-		$output .= walk_page_tree( $pages, $r['depth'], $current_page, $r );
+		$output .= walk_page_tree($pages, $r['depth'], $current_page, $r);
 
-		if ( $r['title_li'] ) {
+		if ($r['title_li']) {
 			$output .= '</ul></li>';
 		}
 	}
@@ -1202,9 +1202,9 @@ 
 	 * @param array  $r      An array of page-listing arguments.
 	 * @param array  $pages  List of WP_Post objects returned by `get_pages()`
 	 */
-	$html = apply_filters( 'wp_list_pages', $output, $r, $pages );
+	$html = apply_filters('wp_list_pages', $output, $r, $pages);
 
-	if ( $r['echo'] ) {
+	if ($r['echo']) {
 		echo $html;
 	} else {
 		return $html;
@@ -1241,7 +1241,7 @@ 
  * }
  * @return string|void HTML menu
  */
-function wp_page_menu( $args = array() ) {
+function wp_page_menu($args = array()) {
 	$defaults = array(
 		'sort_column' => 'menu_order, post_title',
 		'menu_id'     => '',
@@ -1254,7 +1254,7 @@ 
 		'after'       => '</ul>',
 		'walker'      => '',
 	);
-	$args = wp_parse_args( $args, $defaults );
+	$args = wp_parse_args($args, $defaults);
 
 	/**
 	 * Filter the arguments used to generate a page-based menu.
@@ -1265,25 +1265,25 @@ 
 	 *
 	 * @param array $args An array of page menu arguments.
 	 */
-	$args = apply_filters( 'wp_page_menu_args', $args );
+	$args = apply_filters('wp_page_menu_args', $args);
 
 	$menu = '';
 
 	$list_args = $args;
 
 	// Show Home in the menu
-	if ( ! empty($args['show_home']) ) {
-		if ( true === $args['show_home'] || '1' === $args['show_home'] || 1 === $args['show_home'] )
+	if ( ! empty($args['show_home'])) {
+		if (true === $args['show_home'] || '1' === $args['show_home'] || 1 === $args['show_home'])
 			$text = __('Home');
 		else
 			$text = $args['show_home'];
 		$class = '';
-		if ( is_front_page() && !is_paged() )
+		if (is_front_page() && ! is_paged())
 			$class = 'class="current_page_item"';
-		$menu .= '<li ' . $class . '><a href="' . home_url( '/' ) . '">' . $args['link_before'] . $text . $args['link_after'] . '</a></li>';
+		$menu .= '<li '.$class.'><a href="'.home_url('/').'">'.$args['link_before'].$text.$args['link_after'].'</a></li>';
 		// If the front page is a page, add it to the exclude list
 		if (get_option('show_on_front') == 'page') {
-			if ( !empty( $list_args['exclude'] ) ) {
+			if ( ! empty($list_args['exclude'])) {
 				$list_args['exclude'] .= ',';
 			} else {
 				$list_args['exclude'] = '';
@@ -1294,38 +1294,38 @@ 
 
 	$list_args['echo'] = false;
 	$list_args['title_li'] = '';
-	$menu .= str_replace( array( "\r", "\n", "\t" ), '', wp_list_pages($list_args) );
+	$menu .= str_replace(array("\r", "\n", "\t"), '', wp_list_pages($list_args));
 
-	$container = sanitize_text_field( $args['container'] );
+	$container = sanitize_text_field($args['container']);
 
 	// Fallback in case `wp_nav_menu()` was called without a container.
-	if ( empty( $container ) ) {
+	if (empty($container)) {
 		$container = 'div';
 	}
 
-	if ( $menu ) {
+	if ($menu) {
 
 		// wp_nav_menu doesn't set before and after
-		if ( isset( $args['fallback_cb'] ) &&
+		if (isset($args['fallback_cb']) &&
 			'wp_page_menu' === $args['fallback_cb'] &&
-			'ul' !== $container ) {
+			'ul' !== $container) {
 			$args['before'] = '<ul>';
 			$args['after'] = '</ul>';
 		}
 
-		$menu = $args['before'] . $menu . $args['after'];
+		$menu = $args['before'].$menu.$args['after'];
 	}
 
 	$attrs = '';
-	if ( ! empty( $args['menu_id'] ) ) {
-		$attrs .= ' id="' . esc_attr( $args['menu_id'] ) . '"';
+	if ( ! empty($args['menu_id'])) {
+		$attrs .= ' id="'.esc_attr($args['menu_id']).'"';
 	}
 
-	if ( ! empty( $args['menu_class'] ) ) {
-		$attrs .= ' class="' . esc_attr( $args['menu_class'] ) . '"';
+	if ( ! empty($args['menu_class'])) {
+		$attrs .= ' class="'.esc_attr($args['menu_class']).'"';
 	}
 
-	$menu = "<{$container}{$attrs}>" . $menu . "</{$container}>\n";
+	$menu = "<{$container}{$attrs}>".$menu."</{$container}>\n";
 
 	/**
 	 * Filter the HTML output of a page-based menu.
@@ -1337,8 +1337,8 @@ 
 	 * @param string $menu The HTML output.
 	 * @param array  $args An array of arguments.
 	 */
-	$menu = apply_filters( 'wp_page_menu', $menu, $args );
-	if ( $args['echo'] )
+	$menu = apply_filters('wp_page_menu', $menu, $args);
+	if ($args['echo'])
 		echo $menu;
 	else
 		return $menu;
@@ -1360,15 +1360,15 @@ 
  * @param array $r
  * @return string
  */
-function walk_page_tree( $pages, $depth, $current_page, $r ) {
-	if ( empty($r['walker']) )
+function walk_page_tree($pages, $depth, $current_page, $r) {
+	if (empty($r['walker']))
 		$walker = new Walker_Page;
 	else
 		$walker = $r['walker'];
 
-	foreach ( (array) $pages as $page ) {
-		if ( $page->post_parent )
-			$r['pages_with_children'][ $page->post_parent ] = true;
+	foreach ((array) $pages as $page) {
+		if ($page->post_parent)
+			$r['pages_with_children'][$page->post_parent] = true;
 	}
 
 	$args = array($pages, $depth, $r, $current_page);
@@ -1386,7 +1386,7 @@ 
  */
 function walk_page_dropdown_tree() {
 	$args = func_get_args();
-	if ( empty($args[2]['walker']) ) // the user's options are the third parameter
+	if (empty($args[2]['walker'])) // the user's options are the third parameter
 		$walker = new Walker_PageDropdown;
 	else
 		$walker = $args[2]['walker'];
@@ -1408,11 +1408,11 @@ 
  * @param bool        $deprecated   Deprecated. Not used.
  * @param bool        $permalink    Optional, default is false. Whether to include permalink.
  */
-function the_attachment_link( $id = 0, $fullsize = false, $deprecated = false, $permalink = false ) {
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '2.5' );
+function the_attachment_link($id = 0, $fullsize = false, $deprecated = false, $permalink = false) {
+	if ( ! empty($deprecated))
+		_deprecated_argument(__FUNCTION__, '2.5');
 
-	if ( $fullsize )
+	if ($fullsize)
 		echo wp_get_attachment_link($id, 'full', $permalink);
 	else
 		echo wp_get_attachment_link($id, 'thumbnail', $permalink);
@@ -1435,24 +1435,24 @@ 
  * @param array|string $attr      Optional. Array or string of attributes. Default empty.
  * @return string HTML content.
  */
-function wp_get_attachment_link( $id = 0, $size = 'thumbnail', $permalink = false, $icon = false, $text = false, $attr = '' ) {
-	$_post = get_post( $id );
+function wp_get_attachment_link($id = 0, $size = 'thumbnail', $permalink = false, $icon = false, $text = false, $attr = '') {
+	$_post = get_post($id);
 
-	if ( empty( $_post ) || ( 'attachment' != $_post->post_type ) || ! $url = wp_get_attachment_url( $_post->ID ) )
-		return __( 'Missing Attachment' );
+	if (empty($_post) || ('attachment' != $_post->post_type) || ! $url = wp_get_attachment_url($_post->ID))
+		return __('Missing Attachment');
 
-	if ( $permalink )
-		$url = get_attachment_link( $_post->ID );
+	if ($permalink)
+		$url = get_attachment_link($_post->ID);
 
-	if ( $text ) {
+	if ($text) {
 		$link_text = $text;
-	} elseif ( $size && 'none' != $size ) {
-		$link_text = wp_get_attachment_image( $_post->ID, $size, $icon, $attr );
+	} elseif ($size && 'none' != $size) {
+		$link_text = wp_get_attachment_image($_post->ID, $size, $icon, $attr);
 	} else {
 		$link_text = '';
 	}
 
-	if ( trim( $link_text ) == '' )
+	if (trim($link_text) == '')
 		$link_text = $_post->post_title;
 
 	/**
@@ -1468,7 +1468,7 @@ 
 	 * @param bool         $icon      Whether to include an icon. Default false.
 	 * @param string|bool  $text      If string, will be link text. Default false.
 	 */
-	return apply_filters( 'wp_get_attachment_link', "<a href='$url'>$link_text</a>", $id, $size, $permalink, $icon, $text );
+	return apply_filters('wp_get_attachment_link', "<a href='$url'>$link_text</a>", $id, $size, $permalink, $icon, $text);
 }
 
 /**
@@ -1482,22 +1482,22 @@ 
 function prepend_attachment($content) {
 	$post = get_post();
 
-	if ( empty($post->post_type) || $post->post_type != 'attachment' )
+	if (empty($post->post_type) || $post->post_type != 'attachment')
 		return $content;
 
-	if ( wp_attachment_is( 'video', $post ) ) {
-		$meta = wp_get_attachment_metadata( get_the_ID() );
-		$atts = array( 'src' => wp_get_attachment_url() );
-		if ( ! empty( $meta['width'] ) && ! empty( $meta['height'] ) ) {
+	if (wp_attachment_is('video', $post)) {
+		$meta = wp_get_attachment_metadata(get_the_ID());
+		$atts = array('src' => wp_get_attachment_url());
+		if ( ! empty($meta['width']) && ! empty($meta['height'])) {
 			$atts['width'] = (int) $meta['width'];
 			$atts['height'] = (int) $meta['height'];
 		}
-		if ( has_post_thumbnail() ) {
-			$atts['poster'] = wp_get_attachment_url( get_post_thumbnail_id() );
+		if (has_post_thumbnail()) {
+			$atts['poster'] = wp_get_attachment_url(get_post_thumbnail_id());
 		}
-		$p = wp_video_shortcode( $atts );
-	} elseif ( wp_attachment_is( 'audio', $post ) ) {
-		$p = wp_audio_shortcode( array( 'src' => wp_get_attachment_url() ) );
+		$p = wp_video_shortcode($atts);
+	} elseif (wp_attachment_is('audio', $post)) {
+		$p = wp_audio_shortcode(array('src' => wp_get_attachment_url()));
 	} else {
 		$p = '<p class="attachment">';
 		// show the medium sized image representation of the attachment if available, and link to the raw file
@@ -1514,7 +1514,7 @@ 
 	 *
 	 * @param string $p The attachment HTML output.
 	 */
-	$p = apply_filters( 'prepend_attachment', $p );
+	$p = apply_filters('prepend_attachment', $p);
 
 	return "$p\n$content";
 }
@@ -1531,12 +1531,12 @@ 
  * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default is global $post.
  * @return string HTML content for password form for password protected post.
  */
-function get_the_password_form( $post = 0 ) {
-	$post = get_post( $post );
-	$label = 'pwbox-' . ( empty($post->ID) ? rand() : $post->ID );
-	$output = '<form action="' . esc_url( site_url( 'wp-login.php?action=postpass', 'login_post' ) ) . '" class="post-password-form" method="post">
-	<p>' . __( 'This content is password protected. To view it please enter your password below:' ) . '</p>
-	<p><label for="' . $label . '">' . __( 'Password:' ) . ' <input name="post_password" id="' . $label . '" type="password" size="20" /></label> <input type="submit" name="Submit" value="' . esc_attr_x( 'Enter', 'post password form' ) . '" /></p></form>
+function get_the_password_form($post = 0) {
+	$post = get_post($post);
+	$label = 'pwbox-'.(empty($post->ID) ? rand() : $post->ID);
+	$output = '<form action="'.esc_url(site_url('wp-login.php?action=postpass', 'login_post')).'" class="post-password-form" method="post">
+	<p>' . __('This content is password protected. To view it please enter your password below:').'</p>
+	<p><label for="' . $label.'">'.__('Password:').' <input name="post_password" id="'.$label.'" type="password" size="20" /></label> <input type="submit" name="Submit" value="'.esc_attr_x('Enter', 'post password form').'" /></p></form>
 	';
 
 	/**
@@ -1550,7 +1550,7 @@ 
 	 *
 	 * @param string $output The password form HTML output.
 	 */
-	return apply_filters( 'the_password_form', $output );
+	return apply_filters('the_password_form', $output);
 }
 
 /**
@@ -1566,27 +1566,27 @@ 
  * @param string|array $template The specific template name or array of templates to match.
  * @return bool True on success, false on failure.
  */
-function is_page_template( $template = '' ) {
-	if ( ! is_page() )
+function is_page_template($template = '') {
+	if ( ! is_page())
 		return false;
 
-	$page_template = get_page_template_slug( get_queried_object_id() );
+	$page_template = get_page_template_slug(get_queried_object_id());
 
-	if ( empty( $template ) )
+	if (empty($template))
 		return (bool) $page_template;
 
-	if ( $template == $page_template )
+	if ($template == $page_template)
 		return true;
 
-	if ( is_array( $template ) ) {
-		if ( ( in_array( 'default', $template, true ) && ! $page_template )
-			|| in_array( $page_template, $template, true )
+	if (is_array($template)) {
+		if ((in_array('default', $template, true) && ! $page_template)
+			|| in_array($page_template, $template, true)
 		) {
 			return true;
 		}
 	}
 
-	return ( 'default' === $template && ! $page_template );
+	return ('default' === $template && ! $page_template);
 }
 
 /**
@@ -1598,12 +1598,12 @@ 
  * @return string|false Page template filename. Returns an empty string when the default page template
  * 	is in use. Returns false if the post is not a page.
  */
-function get_page_template_slug( $post_id = null ) {
-	$post = get_post( $post_id );
-	if ( ! $post || 'page' != $post->post_type )
+function get_page_template_slug($post_id = null) {
+	$post = get_post($post_id);
+	if ( ! $post || 'page' != $post->post_type)
 		return false;
-	$template = get_post_meta( $post->ID, '_wp_page_template', true );
-	if ( ! $template || 'default' == $template )
+	$template = get_post_meta($post->ID, '_wp_page_template', true);
+	if ( ! $template || 'default' == $template)
 		return '';
 	return $template;
 }
@@ -1617,28 +1617,28 @@ 
  * @param bool       $link     Optional, default is true. Link to revisions's page?
  * @return string|false i18n formatted datetimestamp or localized 'Current Revision'.
  */
-function wp_post_revision_title( $revision, $link = true ) {
-	if ( !$revision = get_post( $revision ) )
+function wp_post_revision_title($revision, $link = true) {
+	if ( ! $revision = get_post($revision))
 		return $revision;
 
-	if ( !in_array( $revision->post_type, array( 'post', 'page', 'revision' ) ) )
+	if ( ! in_array($revision->post_type, array('post', 'page', 'revision')))
 		return false;
 
 	/* translators: revision date format, see http://php.net/date */
-	$datef = _x( 'F j, Y @ H:i:s', 'revision date format' );
+	$datef = _x('F j, Y @ H:i:s', 'revision date format');
 	/* translators: 1: date */
-	$autosavef = _x( '%1$s [Autosave]', 'post revision title extra' );
+	$autosavef = _x('%1$s [Autosave]', 'post revision title extra');
 	/* translators: 1: date */
-	$currentf  = _x( '%1$s [Current Revision]', 'post revision title extra' );
+	$currentf  = _x('%1$s [Current Revision]', 'post revision title extra');
 
-	$date = date_i18n( $datef, strtotime( $revision->post_modified ) );
-	if ( $link && current_user_can( 'edit_post', $revision->ID ) && $link = get_edit_post_link( $revision->ID ) )
+	$date = date_i18n($datef, strtotime($revision->post_modified));
+	if ($link && current_user_can('edit_post', $revision->ID) && $link = get_edit_post_link($revision->ID))
 		$date = "<a href='$link'>$date</a>";
 
-	if ( !wp_is_post_revision( $revision ) )
-		$date = sprintf( $currentf, $date );
-	elseif ( wp_is_post_autosave( $revision ) )
-		$date = sprintf( $autosavef, $date );
+	if ( ! wp_is_post_revision($revision))
+		$date = sprintf($currentf, $date);
+	elseif (wp_is_post_autosave($revision))
+		$date = sprintf($autosavef, $date);
 
 	return $date;
 }
@@ -1652,39 +1652,39 @@ 
  * @param bool       $link     Optional, default is true. Link to revisions's page?
  * @return string|false gravatar, user, i18n formatted datetimestamp or localized 'Current Revision'.
  */
-function wp_post_revision_title_expanded( $revision, $link = true ) {
-	if ( !$revision = get_post( $revision ) )
+function wp_post_revision_title_expanded($revision, $link = true) {
+	if ( ! $revision = get_post($revision))
 		return $revision;
 
-	if ( !in_array( $revision->post_type, array( 'post', 'page', 'revision' ) ) )
+	if ( ! in_array($revision->post_type, array('post', 'page', 'revision')))
 		return false;
 
-	$author = get_the_author_meta( 'display_name', $revision->post_author );
+	$author = get_the_author_meta('display_name', $revision->post_author);
 	/* translators: revision date format, see http://php.net/date */
-	$datef = _x( 'F j, Y @ H:i:s', 'revision date format' );
+	$datef = _x('F j, Y @ H:i:s', 'revision date format');
 
-	$gravatar = get_avatar( $revision->post_author, 24 );
+	$gravatar = get_avatar($revision->post_author, 24);
 
-	$date = date_i18n( $datef, strtotime( $revision->post_modified ) );
-	if ( $link && current_user_can( 'edit_post', $revision->ID ) && $link = get_edit_post_link( $revision->ID ) )
+	$date = date_i18n($datef, strtotime($revision->post_modified));
+	if ($link && current_user_can('edit_post', $revision->ID) && $link = get_edit_post_link($revision->ID))
 		$date = "<a href='$link'>$date</a>";
 
 	$revision_date_author = sprintf(
 		/* translators: post revision title: 1: author avatar, 2: author name, 3: time ago, 4: date */
-		_x( '%1$s %2$s, %3$s ago (%4$s)', 'post revision title' ),
+		_x('%1$s %2$s, %3$s ago (%4$s)', 'post revision title'),
 		$gravatar,
 		$author,
-		human_time_diff( strtotime( $revision->post_modified ), current_time( 'timestamp' ) ),
+		human_time_diff(strtotime($revision->post_modified), current_time('timestamp')),
 		$date
 	);
 
-	$autosavef = __( '%1$s [Autosave]' );
-	$currentf  = __( '%1$s [Current Revision]' );
+	$autosavef = __('%1$s [Autosave]');
+	$currentf  = __('%1$s [Current Revision]');
 
-	if ( !wp_is_post_revision( $revision ) )
-		$revision_date_author = sprintf( $currentf, $revision_date_author );
-	elseif ( wp_is_post_autosave( $revision ) )
-		$revision_date_author = sprintf( $autosavef, $revision_date_author );
+	if ( ! wp_is_post_revision($revision))
+		$revision_date_author = sprintf($currentf, $revision_date_author);
+	elseif (wp_is_post_autosave($revision))
+		$revision_date_author = sprintf($autosavef, $revision_date_author);
 
 	/**
 	 * Filter the formatted author and date for a revision.
@@ -1696,7 +1696,7 @@ 
 	 * @param bool    $link                 Whether to link to the revisions page, as passed into
 	 *                                      wp_post_revision_title_expanded().
 	 */
-	return apply_filters( 'wp_post_revision_title_expanded', $revision_date_author, $revision, $link );
+	return apply_filters('wp_post_revision_title_expanded', $revision_date_author, $revision, $link);
 }
 
 /**
@@ -1710,32 +1710,32 @@ 
  * @param int|WP_Post $post_id Optional. Post ID or WP_Post object. Default is global $post.
  * @param string      $type    'all' (default), 'revision' or 'autosave'
  */
-function wp_list_post_revisions( $post_id = 0, $type = 'all' ) {
-	if ( ! $post = get_post( $post_id ) )
+function wp_list_post_revisions($post_id = 0, $type = 'all') {
+	if ( ! $post = get_post($post_id))
 		return;
 
 	// $args array with (parent, format, right, left, type) deprecated since 3.6
-	if ( is_array( $type ) ) {
-		$type = ! empty( $type['type'] ) ? $type['type']  : $type;
-		_deprecated_argument( __FUNCTION__, '3.6' );
+	if (is_array($type)) {
+		$type = ! empty($type['type']) ? $type['type'] : $type;
+		_deprecated_argument(__FUNCTION__, '3.6');
 	}
 
-	if ( ! $revisions = wp_get_post_revisions( $post->ID ) )
+	if ( ! $revisions = wp_get_post_revisions($post->ID))
 		return;
 
 	$rows = '';
-	foreach ( $revisions as $revision ) {
-		if ( ! current_user_can( 'read_post', $revision->ID ) )
+	foreach ($revisions as $revision) {
+		if ( ! current_user_can('read_post', $revision->ID))
 			continue;
 
-		$is_autosave = wp_is_post_autosave( $revision );
-		if ( ( 'revision' === $type && $is_autosave ) || ( 'autosave' === $type && ! $is_autosave ) )
+		$is_autosave = wp_is_post_autosave($revision);
+		if (('revision' === $type && $is_autosave) || ('autosave' === $type && ! $is_autosave))
 			continue;
 
-		$rows .= "\t<li>" . wp_post_revision_title_expanded( $revision ) . "</li>\n";
+		$rows .= "\t<li>".wp_post_revision_title_expanded($revision)."</li>\n";
 	}
 
-	echo "<div class='hide-if-js'><p>" . __( 'JavaScript must be enabled to use this feature.' ) . "</p></div>\n";
+	echo "<div class='hide-if-js'><p>".__('JavaScript must be enabled to use this feature.')."</p></div>\n";
 
 	echo "<ul class='post-revisions hide-if-no-js'>\n";
 	echo $rows;

Braces +235 added lines, -169 removed lines

@@ -42,16 +42,18 @@ 
 function the_title( $before = '', $after = '', $echo = true ) {
 	$title = get_the_title();
 
-	if ( strlen($title) == 0 )
-		return;
+	if ( strlen($title) == 0 ) {
+			return;
+	}
 
 	$title = $before . $title . $after;
 
-	if ( $echo )
-		echo $title;
-	else
-		return $title;
-}
+	if ( $echo ) {
+			echo $title;
+	} else {
+			return $title;
+	}
+	}
 
 /**
  * Sanitize the current title when retrieving or displaying.
@@ -262,37 +264,45 @@ 
 
 	$post = get_post();
 
-	if ( null === $more_link_text )
-		$more_link_text = __( '(more…)' );
+	if ( null === $more_link_text ) {
+			$more_link_text = __( '(more…)' );
+	}
 
 	$output = '';
 	$has_teaser = false;
 
 	// If post password required and it doesn't match the cookie.
-	if ( post_password_required( $post ) )
-		return get_the_password_form( $post );
+	if ( post_password_required( $post ) ) {
+			return get_the_password_form( $post );
+	}
 
-	if ( $page > count( $pages ) ) // if the requested page doesn't exist
-		$page = count( $pages ); // give them the highest numbered page that DOES exist
+	if ( $page > count( $pages ) ) {
+		// if the requested page doesn't exist
+		$page = count( $pages );
+	}
+	// give them the highest numbered page that DOES exist
 
 	$content = $pages[$page - 1];
 	if ( preg_match( '/<!--more(.*?)?-->/', $content, $matches ) ) {
 		$content = explode( $matches[0], $content, 2 );
-		if ( ! empty( $matches[1] ) && ! empty( $more_link_text ) )
-			$more_link_text = strip_tags( wp_kses_no_null( trim( $matches[1] ) ) );
+		if ( ! empty( $matches[1] ) && ! empty( $more_link_text ) ) {
+					$more_link_text = strip_tags( wp_kses_no_null( trim( $matches[1] ) ) );
+		}
 
 		$has_teaser = true;
 	} else {
 		$content = array( $content );
 	}
 
-	if ( false !== strpos( $post->post_content, '<!--noteaser-->' ) && ( ! $multipage || $page == 1 ) )
-		$strip_teaser = true;
+	if ( false !== strpos( $post->post_content, '<!--noteaser-->' ) && ( ! $multipage || $page == 1 ) ) {
+			$strip_teaser = true;
+	}
 
 	$teaser = $content[0];
 
-	if ( $more && $strip_teaser && $has_teaser )
-		$teaser = '';
+	if ( $more && $strip_teaser && $has_teaser ) {
+			$teaser = '';
+	}
 
 	$output .= $teaser;
 
@@ -300,8 +310,8 @@ 
 		if ( $more ) {
 			$output .= '<span id="more-' . $post->ID . '"></span>' . $content[1];
 		} else {
-			if ( ! empty( $more_link_text ) )
-
+			if ( ! empty( $more_link_text ) ) {
+			
 				/**
 				 * Filter the Read More link text.
 				 *
@@ -311,12 +321,15 @@ 
 				 * @param string $more_link_text    Read More text.
 				 */
 				$output .= apply_filters( 'the_content_more_link', ' <a href="' . get_permalink() . "#more-{$post->ID}\" class=\"more-link\">$more_link_text</a>", $more_link_text );
+			}
 			$output = force_balance_tags( $output );
 		}
 	}
 
-	if ( $preview ) // Preview fix for JavaScript bug with foreign languages.
+	if ( $preview ) {
+		// Preview fix for JavaScript bug with foreign languages.
 		$output =	preg_replace_callback( '/\%u([0-9A-F]{4})/', '_convert_urlencoded_to_entities', $output );
+	}
 
 	return $output;
 }
@@ -453,8 +466,9 @@ 
 	}
 
 	$classes[] = 'post-' . $post->ID;
-	if ( ! is_admin() )
-		$classes[] = $post->post_type;
+	if ( ! is_admin() ) {
+			$classes[] = $post->post_type;
+	}
 	$classes[] = 'type-' . $post->post_type;
 	$classes[] = 'status-' . $post->post_status;
 
@@ -462,10 +476,11 @@ 
 	if ( post_type_supports( $post->post_type, 'post-formats' ) ) {
 		$post_format = get_post_format( $post->ID );
 
-		if ( $post_format && !is_wp_error($post_format) )
-			$classes[] = 'format-' . sanitize_html_class( $post_format );
-		else
-			$classes[] = 'format-standard';
+		if ( $post_format && !is_wp_error($post_format) ) {
+					$classes[] = 'format-' . sanitize_html_class( $post_format );
+		} else {
+					$classes[] = 'format-standard';
+		}
 	}
 
 	$post_password_required = post_password_required( $post->ID );
@@ -561,27 +576,35 @@ 
 
 	$classes = array();
 
-	if ( is_rtl() )
-		$classes[] = 'rtl';
-
-	if ( is_front_page() )
-		$classes[] = 'home';
-	if ( is_home() )
-		$classes[] = 'blog';
-	if ( is_archive() )
-		$classes[] = 'archive';
-	if ( is_date() )
-		$classes[] = 'date';
+	if ( is_rtl() ) {
+			$classes[] = 'rtl';
+	}
+
+	if ( is_front_page() ) {
+			$classes[] = 'home';
+	}
+	if ( is_home() ) {
+			$classes[] = 'blog';
+	}
+	if ( is_archive() ) {
+			$classes[] = 'archive';
+	}
+	if ( is_date() ) {
+			$classes[] = 'date';
+	}
 	if ( is_search() ) {
 		$classes[] = 'search';
 		$classes[] = $wp_query->posts ? 'search-results' : 'search-no-results';
 	}
-	if ( is_paged() )
-		$classes[] = 'paged';
-	if ( is_attachment() )
-		$classes[] = 'attachment';
-	if ( is_404() )
-		$classes[] = 'error404';
+	if ( is_paged() ) {
+			$classes[] = 'paged';
+	}
+	if ( is_attachment() ) {
+			$classes[] = 'attachment';
+	}
+	if ( is_404() ) {
+			$classes[] = 'error404';
+	}
 	if ( is_singular() ) {
 		$classes[] = 'singular';
 	}
@@ -599,10 +622,11 @@ 
 			if ( post_type_supports( $post->post_type, 'post-formats' ) ) {
 				$post_format = get_post_format( $post->ID );
 
-				if ( $post_format && !is_wp_error($post_format) )
-					$classes[] = 'single-format-' . sanitize_html_class( $post_format );
-				else
-					$classes[] = 'single-format-standard';
+				if ( $post_format && !is_wp_error($post_format) ) {
+									$classes[] = 'single-format-' . sanitize_html_class( $post_format );
+				} else {
+									$classes[] = 'single-format-standard';
+				}
 			}
 		}
 
@@ -616,8 +640,9 @@ 
 		if ( is_post_type_archive() ) {
 			$classes[] = 'post-type-archive';
 			$post_type = get_query_var( 'post_type' );
-			if ( is_array( $post_type ) )
-				$post_type = reset( $post_type );
+			if ( is_array( $post_type ) ) {
+							$post_type = reset( $post_type );
+			}
 			$classes[] = 'post-type-archive-' . sanitize_html_class( $post_type );
 		} elseif ( is_author() ) {
 			$author = $wp_query->get_queried_object();
@@ -695,16 +720,18 @@ 
 		}
 	}
 
-	if ( is_user_logged_in() )
-		$classes[] = 'logged-in';
+	if ( is_user_logged_in() ) {
+			$classes[] = 'logged-in';
+	}
 
 	if ( is_admin_bar_showing() ) {
 		$classes[] = 'admin-bar';
 		$classes[] = 'no-customize-support';
 	}
 
-	if ( get_background_color() !== get_theme_support( 'custom-background', 'default-color' ) || get_background_image() )
-		$classes[] = 'custom-background';
+	if ( get_background_color() !== get_theme_support( 'custom-background', 'default-color' ) || get_background_image() ) {
+			$classes[] = 'custom-background';
+	}
 
 	if ( has_custom_logo() ) {
 		$classes[] = 'wp-custom-logo';
@@ -712,33 +739,36 @@ 
 
 	$page = $wp_query->get( 'page' );
 
-	if ( ! $page || $page < 2 )
-		$page = $wp_query->get( 'paged' );
+	if ( ! $page || $page < 2 ) {
+			$page = $wp_query->get( 'paged' );
+	}
 
 	if ( $page && $page > 1 && ! is_404() ) {
 		$classes[] = 'paged-' . $page;
 
-		if ( is_single() )
-			$classes[] = 'single-paged-' . $page;
-		elseif ( is_page() )
-			$classes[] = 'page-paged-' . $page;
-		elseif ( is_category() )
-			$classes[] = 'category-paged-' . $page;
-		elseif ( is_tag() )
-			$classes[] = 'tag-paged-' . $page;
-		elseif ( is_date() )
-			$classes[] = 'date-paged-' . $page;
-		elseif ( is_author() )
-			$classes[] = 'author-paged-' . $page;
-		elseif ( is_search() )
-			$classes[] = 'search-paged-' . $page;
-		elseif ( is_post_type_archive() )
-			$classes[] = 'post-type-paged-' . $page;
+		if ( is_single() ) {
+					$classes[] = 'single-paged-' . $page;
+		} elseif ( is_page() ) {
+					$classes[] = 'page-paged-' . $page;
+		} elseif ( is_category() ) {
+					$classes[] = 'category-paged-' . $page;
+		} elseif ( is_tag() ) {
+					$classes[] = 'tag-paged-' . $page;
+		} elseif ( is_date() ) {
+					$classes[] = 'date-paged-' . $page;
+		} elseif ( is_author() ) {
+					$classes[] = 'author-paged-' . $page;
+		} elseif ( is_search() ) {
+					$classes[] = 'search-paged-' . $page;
+		} elseif ( is_post_type_archive() ) {
+					$classes[] = 'post-type-paged-' . $page;
+		}
 	}
 
 	if ( ! empty( $class ) ) {
-		if ( !is_array( $class ) )
-			$class = preg_split( '#\s+#', $class );
+		if ( !is_array( $class ) ) {
+					$class = preg_split( '#\s+#', $class );
+		}
 		$classes = array_merge( $classes, $class );
 	} else {
 		// Ensure that we always coerce class to being an array.
@@ -771,18 +801,21 @@ 
 function post_password_required( $post = null ) {
 	$post = get_post($post);
 
-	if ( empty( $post->post_password ) )
-		return false;
+	if ( empty( $post->post_password ) ) {
+			return false;
+	}
 
-	if ( ! isset( $_COOKIE['wp-postpass_' . COOKIEHASH] ) )
-		return true;
+	if ( ! isset( $_COOKIE['wp-postpass_' . COOKIEHASH] ) ) {
+			return true;
+	}
 
 	require_once ABSPATH . WPINC . '/class-phpass.php';
 	$hasher = new PasswordHash( 8, true );
 
 	$hash = wp_unslash( $_COOKIE[ 'wp-postpass_' . COOKIEHASH ] );
-	if ( 0 !== strpos( $hash, '$P$B' ) )
-		return true;
+	if ( 0 !== strpos( $hash, '$P$B' ) ) {
+			return true;
+	}
 
 	return ! $hasher->CheckPassword( $post->post_password, $hash );
 }
@@ -934,12 +967,13 @@ 
 	if ( 1 == $i ) {
 		$url = get_permalink();
 	} else {
-		if ( '' == get_option('permalink_structure') || in_array($post->post_status, array('draft', 'pending')) )
-			$url = add_query_arg( 'page', $i, get_permalink() );
-		elseif ( 'page' == get_option('show_on_front') && get_option('page_on_front') == $post->ID )
-			$url = trailingslashit(get_permalink()) . user_trailingslashit("$wp_rewrite->pagination_base/" . $i, 'single_paged');
-		else
-			$url = trailingslashit(get_permalink()) . user_trailingslashit($i, 'single_paged');
+		if ( '' == get_option('permalink_structure') || in_array($post->post_status, array('draft', 'pending')) ) {
+					$url = add_query_arg( 'page', $i, get_permalink() );
+		} elseif ( 'page' == get_option('show_on_front') && get_option('page_on_front') == $post->ID ) {
+					$url = trailingslashit(get_permalink()) . user_trailingslashit("$wp_rewrite->pagination_base/" . $i, 'single_paged');
+		} else {
+					$url = trailingslashit(get_permalink()) . user_trailingslashit($i, 'single_paged');
+		}
 	}
 
 	if ( is_preview() ) {
@@ -970,13 +1004,14 @@ 
 function post_custom( $key = '' ) {
 	$custom = get_post_custom();
 
-	if ( !isset( $custom[$key] ) )
-		return false;
-	elseif ( 1 == count($custom[$key]) )
-		return $custom[$key][0];
-	else
-		return $custom[$key];
-}
+	if ( !isset( $custom[$key] ) ) {
+			return false;
+	} elseif ( 1 == count($custom[$key]) ) {
+			return $custom[$key][0];
+	} else {
+			return $custom[$key];
+	}
+	}
 
 /**
  * Display list of post custom fields.
@@ -991,8 +1026,9 @@ 
 		echo "<ul class='post-meta'>\n";
 		foreach ( (array) $keys as $key ) {
 			$keyt = trim($key);
-			if ( is_protected_meta( $keyt, 'post' ) )
-				continue;
+			if ( is_protected_meta( $keyt, 'post' ) ) {
+							continue;
+			}
 			$values = array_map('trim', get_post_custom_values($key));
 			$value = implode($values,', ');
 
@@ -1273,13 +1309,15 @@ 
 
 	// Show Home in the menu
 	if ( ! empty($args['show_home']) ) {
-		if ( true === $args['show_home'] || '1' === $args['show_home'] || 1 === $args['show_home'] )
-			$text = __('Home');
-		else
-			$text = $args['show_home'];
+		if ( true === $args['show_home'] || '1' === $args['show_home'] || 1 === $args['show_home'] ) {
+					$text = __('Home');
+		} else {
+					$text = $args['show_home'];
+		}
 		$class = '';
-		if ( is_front_page() && !is_paged() )
-			$class = 'class="current_page_item"';
+		if ( is_front_page() && !is_paged() ) {
+					$class = 'class="current_page_item"';
+		}
 		$menu .= '<li ' . $class . '><a href="' . home_url( '/' ) . '">' . $args['link_before'] . $text . $args['link_after'] . '</a></li>';
 		// If the front page is a page, add it to the exclude list
 		if (get_option('show_on_front') == 'page') {
@@ -1338,11 +1376,12 @@ 
 	 * @param array  $args An array of arguments.
 	 */
 	$menu = apply_filters( 'wp_page_menu', $menu, $args );
-	if ( $args['echo'] )
-		echo $menu;
-	else
-		return $menu;
-}
+	if ( $args['echo'] ) {
+			echo $menu;
+	} else {
+			return $menu;
+	}
+	}
 
 //
 // Page helpers
@@ -1361,14 +1400,16 @@ 
  * @return string
  */
 function walk_page_tree( $pages, $depth, $current_page, $r ) {
-	if ( empty($r['walker']) )
-		$walker = new Walker_Page;
-	else
-		$walker = $r['walker'];
+	if ( empty($r['walker']) ) {
+			$walker = new Walker_Page;
+	} else {
+			$walker = $r['walker'];
+	}
 
 	foreach ( (array) $pages as $page ) {
-		if ( $page->post_parent )
-			$r['pages_with_children'][ $page->post_parent ] = true;
+		if ( $page->post_parent ) {
+					$r['pages_with_children'][ $page->post_parent ] = true;
+		}
 	}
 
 	$args = array($pages, $depth, $r, $current_page);
@@ -1386,10 +1427,12 @@ 
  */
 function walk_page_dropdown_tree() {
 	$args = func_get_args();
-	if ( empty($args[2]['walker']) ) // the user's options are the third parameter
+	if ( empty($args[2]['walker']) ) {
+		// the user's options are the third parameter
 		$walker = new Walker_PageDropdown;
-	else
-		$walker = $args[2]['walker'];
+	} else {
+			$walker = $args[2]['walker'];
+	}
 
 	return call_user_func_array(array($walker, 'walk'), $args);
 }
@@ -1409,14 +1452,16 @@ 
  * @param bool        $permalink    Optional, default is false. Whether to include permalink.
  */
 function the_attachment_link( $id = 0, $fullsize = false, $deprecated = false, $permalink = false ) {
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '2.5' );
+	if ( !empty( $deprecated ) ) {
+			_deprecated_argument( __FUNCTION__, '2.5' );
+	}
 
-	if ( $fullsize )
-		echo wp_get_attachment_link($id, 'full', $permalink);
-	else
-		echo wp_get_attachment_link($id, 'thumbnail', $permalink);
-}
+	if ( $fullsize ) {
+			echo wp_get_attachment_link($id, 'full', $permalink);
+	} else {
+			echo wp_get_attachment_link($id, 'thumbnail', $permalink);
+	}
+	}
 
 /**
  * Retrieve an attachment page link using an image or icon, if possible.
@@ -1438,11 +1483,13 @@ 
 function wp_get_attachment_link( $id = 0, $size = 'thumbnail', $permalink = false, $icon = false, $text = false, $attr = '' ) {
 	$_post = get_post( $id );
 
-	if ( empty( $_post ) || ( 'attachment' != $_post->post_type ) || ! $url = wp_get_attachment_url( $_post->ID ) )
-		return __( 'Missing Attachment' );
+	if ( empty( $_post ) || ( 'attachment' != $_post->post_type ) || ! $url = wp_get_attachment_url( $_post->ID ) ) {
+			return __( 'Missing Attachment' );
+	}
 
-	if ( $permalink )
-		$url = get_attachment_link( $_post->ID );
+	if ( $permalink ) {
+			$url = get_attachment_link( $_post->ID );
+	}
 
 	if ( $text ) {
 		$link_text = $text;
@@ -1452,8 +1499,9 @@ 
 		$link_text = '';
 	}
 
-	if ( trim( $link_text ) == '' )
-		$link_text = $_post->post_title;
+	if ( trim( $link_text ) == '' ) {
+			$link_text = $_post->post_title;
+	}
 
 	/**
 	 * Filter a retrieved attachment page link.
@@ -1482,8 +1530,9 @@ 
 function prepend_attachment($content) {
 	$post = get_post();
 
-	if ( empty($post->post_type) || $post->post_type != 'attachment' )
-		return $content;
+	if ( empty($post->post_type) || $post->post_type != 'attachment' ) {
+			return $content;
+	}
 
 	if ( wp_attachment_is( 'video', $post ) ) {
 		$meta = wp_get_attachment_metadata( get_the_ID() );
@@ -1567,16 +1616,19 @@ 
  * @return bool True on success, false on failure.
  */
 function is_page_template( $template = '' ) {
-	if ( ! is_page() )
-		return false;
+	if ( ! is_page() ) {
+			return false;
+	}
 
 	$page_template = get_page_template_slug( get_queried_object_id() );
 
-	if ( empty( $template ) )
-		return (bool) $page_template;
+	if ( empty( $template ) ) {
+			return (bool) $page_template;
+	}
 
-	if ( $template == $page_template )
-		return true;
+	if ( $template == $page_template ) {
+			return true;
+	}
 
 	if ( is_array( $template ) ) {
 		if ( ( in_array( 'default', $template, true ) && ! $page_template )
@@ -1600,11 +1652,13 @@ 
  */
 function get_page_template_slug( $post_id = null ) {
 	$post = get_post( $post_id );
-	if ( ! $post || 'page' != $post->post_type )
-		return false;
+	if ( ! $post || 'page' != $post->post_type ) {
+			return false;
+	}
 	$template = get_post_meta( $post->ID, '_wp_page_template', true );
-	if ( ! $template || 'default' == $template )
-		return '';
+	if ( ! $template || 'default' == $template ) {
+			return '';
+	}
 	return $template;
 }
 
@@ -1618,11 +1672,13 @@ 
  * @return string|false i18n formatted datetimestamp or localized 'Current Revision'.
  */
 function wp_post_revision_title( $revision, $link = true ) {
-	if ( !$revision = get_post( $revision ) )
-		return $revision;
+	if ( !$revision = get_post( $revision ) ) {
+			return $revision;
+	}
 
-	if ( !in_array( $revision->post_type, array( 'post', 'page', 'revision' ) ) )
-		return false;
+	if ( !in_array( $revision->post_type, array( 'post', 'page', 'revision' ) ) ) {
+			return false;
+	}
 
 	/* translators: revision date format, see http://php.net/date */
 	$datef = _x( 'F j, Y @ H:i:s', 'revision date format' );
@@ -1632,13 +1688,15 @@ 
 	$currentf  = _x( '%1$s [Current Revision]', 'post revision title extra' );
 
 	$date = date_i18n( $datef, strtotime( $revision->post_modified ) );
-	if ( $link && current_user_can( 'edit_post', $revision->ID ) && $link = get_edit_post_link( $revision->ID ) )
-		$date = "<a href='$link'>$date</a>";
+	if ( $link && current_user_can( 'edit_post', $revision->ID ) && $link = get_edit_post_link( $revision->ID ) ) {
+			$date = "<a href='$link'>$date</a>";
+	}
 
-	if ( !wp_is_post_revision( $revision ) )
-		$date = sprintf( $currentf, $date );
-	elseif ( wp_is_post_autosave( $revision ) )
-		$date = sprintf( $autosavef, $date );
+	if ( !wp_is_post_revision( $revision ) ) {
+			$date = sprintf( $currentf, $date );
+	} elseif ( wp_is_post_autosave( $revision ) ) {
+			$date = sprintf( $autosavef, $date );
+	}
 
 	return $date;
 }
@@ -1653,11 +1711,13 @@ 
  * @return string|false gravatar, user, i18n formatted datetimestamp or localized 'Current Revision'.
  */
 function wp_post_revision_title_expanded( $revision, $link = true ) {
-	if ( !$revision = get_post( $revision ) )
-		return $revision;
+	if ( !$revision = get_post( $revision ) ) {
+			return $revision;
+	}
 
-	if ( !in_array( $revision->post_type, array( 'post', 'page', 'revision' ) ) )
-		return false;
+	if ( !in_array( $revision->post_type, array( 'post', 'page', 'revision' ) ) ) {
+			return false;
+	}
 
 	$author = get_the_author_meta( 'display_name', $revision->post_author );
 	/* translators: revision date format, see http://php.net/date */
@@ -1666,8 +1726,9 @@ 
 	$gravatar = get_avatar( $revision->post_author, 24 );
 
 	$date = date_i18n( $datef, strtotime( $revision->post_modified ) );
-	if ( $link && current_user_can( 'edit_post', $revision->ID ) && $link = get_edit_post_link( $revision->ID ) )
-		$date = "<a href='$link'>$date</a>";
+	if ( $link && current_user_can( 'edit_post', $revision->ID ) && $link = get_edit_post_link( $revision->ID ) ) {
+			$date = "<a href='$link'>$date</a>";
+	}
 
 	$revision_date_author = sprintf(
 		/* translators: post revision title: 1: author avatar, 2: author name, 3: time ago, 4: date */
@@ -1681,10 +1742,11 @@ 
 	$autosavef = __( '%1$s [Autosave]' );
 	$currentf  = __( '%1$s [Current Revision]' );
 
-	if ( !wp_is_post_revision( $revision ) )
-		$revision_date_author = sprintf( $currentf, $revision_date_author );
-	elseif ( wp_is_post_autosave( $revision ) )
-		$revision_date_author = sprintf( $autosavef, $revision_date_author );
+	if ( !wp_is_post_revision( $revision ) ) {
+			$revision_date_author = sprintf( $currentf, $revision_date_author );
+	} elseif ( wp_is_post_autosave( $revision ) ) {
+			$revision_date_author = sprintf( $autosavef, $revision_date_author );
+	}
 
 	/**
 	 * Filter the formatted author and date for a revision.
@@ -1711,8 +1773,9 @@ 
  * @param string      $type    'all' (default), 'revision' or 'autosave'
  */
 function wp_list_post_revisions( $post_id = 0, $type = 'all' ) {
-	if ( ! $post = get_post( $post_id ) )
-		return;
+	if ( ! $post = get_post( $post_id ) ) {
+			return;
+	}
 
 	// $args array with (parent, format, right, left, type) deprecated since 3.6
 	if ( is_array( $type ) ) {
@@ -1720,17 +1783,20 @@ 
 		_deprecated_argument( __FUNCTION__, '3.6' );
 	}
 
-	if ( ! $revisions = wp_get_post_revisions( $post->ID ) )
-		return;
+	if ( ! $revisions = wp_get_post_revisions( $post->ID ) ) {
+			return;
+	}
 
 	$rows = '';
 	foreach ( $revisions as $revision ) {
-		if ( ! current_user_can( 'read_post', $revision->ID ) )
-			continue;
+		if ( ! current_user_can( 'read_post', $revision->ID ) ) {
+					continue;
+		}
 
 		$is_autosave = wp_is_post_autosave( $revision );
-		if ( ( 'revision' === $type && $is_autosave ) || ( 'autosave' === $type && ! $is_autosave ) )
-			continue;
+		if ( ( 'revision' === $type && $is_autosave ) || ( 'autosave' === $type && ! $is_autosave ) ) {
+					continue;
+		}
 
 		$rows .= "\t<li>" . wp_post_revision_title_expanded( $revision ) . "</li>\n";
 	}

src/wp-includes/query.php

Doc Comments +7 added lines, -7 removed lines

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

Indentation +18 added lines, -18 removed lines

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

Spacing +916 added lines, -916 removed lines

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

Braces +437 added lines, -300 removed lines

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