ntwb / wordpress

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

Doc Comments +2 added lines, -2 removed lines

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

Braces +73 added lines, -66 removed lines

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

Spacing +165 added lines, -165 removed lines

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

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

Doc Comments +4 added lines, -4 removed lines

@@ -1374,7 +1374,7 @@ 
 	 *
 	 * @since 3.7.0
 	 *
-	 * @param array $terms Terms to check.
+	 * @param string[] $terms Terms to check.
 	 * @return array Terms that are not stopwords.
 	 */
 	protected function parse_search_terms( $terms ) {
@@ -3372,7 +3372,7 @@ 
 	 * @access public
 	 *
 	 * @param string $name Property to check if set.
-	 * @return bool Whether the property is set.
+	 * @return boolean|null Whether the property is set.
 	 */
 	public function __isset( $name ) {
 		if ( in_array( $name, $this->compat_fields ) ) {
@@ -3971,8 +3971,8 @@ 
 	 * @global int             $more
 	 * @global int             $numpages
 	 *
-	 * @param WP_Post|object|int $post WP_Post instance or Post ID/object.
-	 * @return true True when finished.
+	 * @param WP_Post $post WP_Post instance or Post ID/object.
+	 * @return null|boolean True when finished.
 	 */
 	public function setup_postdata( $post ) {
 		global $id, $authordata, $currentday, $currentmonth, $page, $pages, $multipage, $more, $numpages;

Indentation +8 added lines, -8 removed lines

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

Spacing +816 added lines, -816 removed lines

@@ -482,9 +482,9 @@ 
 	 */
 	private $stopwords;
 
-	private $compat_fields = array( 'query_vars_hash', 'query_vars_changed' );
+	private $compat_fields = array('query_vars_hash', 'query_vars_changed');
 
-	private $compat_methods = array( 'init_query_flags', 'parse_tax_query' );
+	private $compat_methods = array('init_query_flags', 'parse_tax_query');
 
 	/**
 	 * Resets query flags to false.
@@ -538,10 +538,10 @@ 
 		$this->post_count = 0;
 		$this->current_post = -1;
 		$this->in_the_loop = false;
-		unset( $this->request );
-		unset( $this->post );
-		unset( $this->comments );
-		unset( $this->comment );
+		unset($this->request);
+		unset($this->post);
+		unset($this->comments);
+		unset($this->comment);
 		$this->comment_count = 0;
 		$this->current_comment = -1;
 		$this->found_posts = 0;
@@ -612,17 +612,17 @@ 
 			, 'embed'
 		);
 
-		foreach ( $keys as $key ) {
-			if ( !isset($array[$key]) )
+		foreach ($keys as $key) {
+			if ( ! isset($array[$key]))
 				$array[$key] = '';
 		}
 
-		$array_keys = array( 'category__in', 'category__not_in', 'category__and', 'post__in', 'post__not_in', 'post_name__in',
+		$array_keys = array('category__in', 'category__not_in', 'category__and', 'post__in', 'post__not_in', 'post_name__in',
 			'tag__in', 'tag__not_in', 'tag__and', 'tag_slug__in', 'tag_slug__and', 'post_parent__in', 'post_parent__not_in',
-			'author__in', 'author__not_in' );
+			'author__in', 'author__not_in');
 
-		foreach ( $array_keys as $key ) {
-			if ( !isset($array[$key]) )
+		foreach ($array_keys as $key) {
+			if ( ! isset($array[$key]))
 				$array[$key] = array();
 		}
 		return $array;
@@ -750,11 +750,11 @@ 
 	 *     @type int          $year                    The four-digit year. Default empty. Accepts any four-digit year.
 	 * }
 	 */
-	public function parse_query( $query =  '' ) {
-		if ( ! empty( $query ) ) {
+	public function parse_query($query = '') {
+		if ( ! empty($query)) {
 			$this->init();
-			$this->query = $this->query_vars = wp_parse_args( $query );
-		} elseif ( ! isset( $this->query ) ) {
+			$this->query = $this->query_vars = wp_parse_args($query);
+		} elseif ( ! isset($this->query)) {
 			$this->query = $this->query_vars;
 		}
 
@@ -762,86 +762,86 @@ 
 		$qv = &$this->query_vars;
 		$this->query_vars_changed = true;
 
-		if ( ! empty($qv['robots']) )
+		if ( ! empty($qv['robots']))
 			$this->is_robots = true;
 
-		if ( ! is_scalar( $qv['p'] ) || $qv['p'] < 0 ) {
+		if ( ! is_scalar($qv['p']) || $qv['p'] < 0) {
 			$qv['p'] = 0;
 			$qv['error'] = '404';
 		} else {
-			$qv['p'] = intval( $qv['p'] );
+			$qv['p'] = intval($qv['p']);
 		}
 
-		$qv['page_id'] =  absint($qv['page_id']);
+		$qv['page_id'] = absint($qv['page_id']);
 		$qv['year'] = absint($qv['year']);
 		$qv['monthnum'] = absint($qv['monthnum']);
 		$qv['day'] = absint($qv['day']);
 		$qv['w'] = absint($qv['w']);
-		$qv['m'] = is_scalar( $qv['m'] ) ? preg_replace( '|[^0-9]|', '', $qv['m'] ) : '';
+		$qv['m'] = is_scalar($qv['m']) ? preg_replace('|[^0-9]|', '', $qv['m']) : '';
 		$qv['paged'] = absint($qv['paged']);
-		$qv['cat'] = preg_replace( '|[^0-9,-]|', '', $qv['cat'] ); // comma separated list of positive or negative integers
-		$qv['author'] = preg_replace( '|[^0-9,-]|', '', $qv['author'] ); // comma separated list of positive or negative integers
-		$qv['pagename'] = trim( $qv['pagename'] );
-		$qv['name'] = trim( $qv['name'] );
-		$qv['title'] = trim( $qv['title'] );
-		if ( '' !== $qv['hour'] ) $qv['hour'] = absint($qv['hour']);
-		if ( '' !== $qv['minute'] ) $qv['minute'] = absint($qv['minute']);
-		if ( '' !== $qv['second'] ) $qv['second'] = absint($qv['second']);
-		if ( '' !== $qv['menu_order'] ) $qv['menu_order'] = absint($qv['menu_order']);
+		$qv['cat'] = preg_replace('|[^0-9,-]|', '', $qv['cat']); // comma separated list of positive or negative integers
+		$qv['author'] = preg_replace('|[^0-9,-]|', '', $qv['author']); // comma separated list of positive or negative integers
+		$qv['pagename'] = trim($qv['pagename']);
+		$qv['name'] = trim($qv['name']);
+		$qv['title'] = trim($qv['title']);
+		if ('' !== $qv['hour']) $qv['hour'] = absint($qv['hour']);
+		if ('' !== $qv['minute']) $qv['minute'] = absint($qv['minute']);
+		if ('' !== $qv['second']) $qv['second'] = absint($qv['second']);
+		if ('' !== $qv['menu_order']) $qv['menu_order'] = absint($qv['menu_order']);
 
 		// Fairly insane upper bound for search string lengths.
-		if ( ! is_scalar( $qv['s'] ) || ( ! empty( $qv['s'] ) && strlen( $qv['s'] ) > 1600 ) ) {
+		if ( ! is_scalar($qv['s']) || ( ! empty($qv['s']) && strlen($qv['s']) > 1600)) {
 			$qv['s'] = '';
 		}
 
 		// Compat. Map subpost to attachment.
-		if ( '' != $qv['subpost'] )
+		if ('' != $qv['subpost'])
 			$qv['attachment'] = $qv['subpost'];
-		if ( '' != $qv['subpost_id'] )
+		if ('' != $qv['subpost_id'])
 			$qv['attachment_id'] = $qv['subpost_id'];
 
 		$qv['attachment_id'] = absint($qv['attachment_id']);
 
-		if ( ('' != $qv['attachment']) || !empty($qv['attachment_id']) ) {
+		if (('' != $qv['attachment']) || ! empty($qv['attachment_id'])) {
 			$this->is_single = true;
 			$this->is_attachment = true;
-		} elseif ( '' != $qv['name'] ) {
+		} elseif ('' != $qv['name']) {
 			$this->is_single = true;
-		} elseif ( $qv['p'] ) {
+		} elseif ($qv['p']) {
 			$this->is_single = true;
-		} elseif ( ('' !== $qv['hour']) && ('' !== $qv['minute']) &&('' !== $qv['second']) && ('' != $qv['year']) && ('' != $qv['monthnum']) && ('' != $qv['day']) ) {
+		} elseif (('' !== $qv['hour']) && ('' !== $qv['minute']) && ('' !== $qv['second']) && ('' != $qv['year']) && ('' != $qv['monthnum']) && ('' != $qv['day'])) {
 			// If year, month, day, hour, minute, and second are set, a single
 			// post is being queried.
 			$this->is_single = true;
-		} elseif ( '' != $qv['static'] || '' != $qv['pagename'] || !empty($qv['page_id']) ) {
+		} elseif ('' != $qv['static'] || '' != $qv['pagename'] || ! empty($qv['page_id'])) {
 			$this->is_page = true;
 			$this->is_single = false;
 		} else {
 			// Look for archive queries. Dates, categories, authors, search, post type archives.
 
-			if ( isset( $this->query['s'] ) ) {
+			if (isset($this->query['s'])) {
 				$this->is_search = true;
 			}
 
-			if ( '' !== $qv['second'] ) {
+			if ('' !== $qv['second']) {
 				$this->is_time = true;
 				$this->is_date = true;
 			}
 
-			if ( '' !== $qv['minute'] ) {
+			if ('' !== $qv['minute']) {
 				$this->is_time = true;
 				$this->is_date = true;
 			}
 
-			if ( '' !== $qv['hour'] ) {
+			if ('' !== $qv['hour']) {
 				$this->is_time = true;
 				$this->is_date = true;
 			}
 
-			if ( $qv['day'] ) {
-				if ( ! $this->is_date ) {
-					$date = sprintf( '%04d-%02d-%02d', $qv['year'], $qv['monthnum'], $qv['day'] );
-					if ( $qv['monthnum'] && $qv['year'] && ! wp_checkdate( $qv['monthnum'], $qv['day'], $qv['year'], $date ) ) {
+			if ($qv['day']) {
+				if ( ! $this->is_date) {
+					$date = sprintf('%04d-%02d-%02d', $qv['year'], $qv['monthnum'], $qv['day']);
+					if ($qv['monthnum'] && $qv['year'] && ! wp_checkdate($qv['monthnum'], $qv['day'], $qv['year'], $date)) {
 						$qv['error'] = '404';
 					} else {
 						$this->is_day = true;
@@ -850,9 +850,9 @@ 
 				}
 			}
 
-			if ( $qv['monthnum'] ) {
-				if ( ! $this->is_date ) {
-					if ( 12 < $qv['monthnum'] ) {
+			if ($qv['monthnum']) {
+				if ( ! $this->is_date) {
+					if (12 < $qv['monthnum']) {
 						$qv['error'] = '404';
 					} else {
 						$this->is_month = true;
@@ -861,40 +861,40 @@ 
 				}
 			}
 
-			if ( $qv['year'] ) {
-				if ( ! $this->is_date ) {
+			if ($qv['year']) {
+				if ( ! $this->is_date) {
 					$this->is_year = true;
 					$this->is_date = true;
 				}
 			}
 
-			if ( $qv['m'] ) {
+			if ($qv['m']) {
 				$this->is_date = true;
-				if ( strlen($qv['m']) > 9 ) {
+				if (strlen($qv['m']) > 9) {
 					$this->is_time = true;
-				} elseif ( strlen( $qv['m'] ) > 7 ) {
+				} elseif (strlen($qv['m']) > 7) {
 					$this->is_day = true;
-				} elseif ( strlen( $qv['m'] ) > 5 ) {
+				} elseif (strlen($qv['m']) > 5) {
 					$this->is_month = true;
 				} else {
 					$this->is_year = true;
 				}
 			}
 
-			if ( '' != $qv['w'] ) {
+			if ('' != $qv['w']) {
 				$this->is_date = true;
 			}
 
 			$this->query_vars_hash = false;
-			$this->parse_tax_query( $qv );
+			$this->parse_tax_query($qv);
 
-			foreach ( $this->tax_query->queries as $tax_query ) {
-				if ( ! is_array( $tax_query ) ) {
+			foreach ($this->tax_query->queries as $tax_query) {
+				if ( ! is_array($tax_query)) {
 					continue;
 				}
 
-				if ( isset( $tax_query['operator'] ) && 'NOT IN' != $tax_query['operator'] ) {
-					switch ( $tax_query['taxonomy'] ) {
+				if (isset($tax_query['operator']) && 'NOT IN' != $tax_query['operator']) {
+					switch ($tax_query['taxonomy']) {
 						case 'category':
 							$this->is_category = true;
 							break;
@@ -906,89 +906,89 @@ 
 					}
 				}
 			}
-			unset( $tax_query );
+			unset($tax_query);
 
-			if ( empty($qv['author']) || ($qv['author'] == '0') ) {
+			if (empty($qv['author']) || ($qv['author'] == '0')) {
 				$this->is_author = false;
 			} else {
 				$this->is_author = true;
 			}
 
-			if ( '' != $qv['author_name'] )
+			if ('' != $qv['author_name'])
 				$this->is_author = true;
 
-			if ( !empty( $qv['post_type'] ) && ! is_array( $qv['post_type'] ) ) {
-				$post_type_obj = get_post_type_object( $qv['post_type'] );
-				if ( ! empty( $post_type_obj->has_archive ) )
+			if ( ! empty($qv['post_type']) && ! is_array($qv['post_type'])) {
+				$post_type_obj = get_post_type_object($qv['post_type']);
+				if ( ! empty($post_type_obj->has_archive))
 					$this->is_post_type_archive = true;
 			}
 
-			if ( $this->is_post_type_archive || $this->is_date || $this->is_author || $this->is_category || $this->is_tag || $this->is_tax )
+			if ($this->is_post_type_archive || $this->is_date || $this->is_author || $this->is_category || $this->is_tag || $this->is_tax)
 				$this->is_archive = true;
 		}
 
-		if ( '' != $qv['feed'] )
+		if ('' != $qv['feed'])
 			$this->is_feed = true;
 
-		if ( '' != $qv['embed'] ) {
+		if ('' != $qv['embed']) {
 			$this->is_embed = true;
 		}
 
-		if ( '' != $qv['tb'] )
+		if ('' != $qv['tb'])
 			$this->is_trackback = true;
 
-		if ( '' != $qv['paged'] && ( intval($qv['paged']) > 1 ) )
+		if ('' != $qv['paged'] && (intval($qv['paged']) > 1))
 			$this->is_paged = true;
 
 		// if we're previewing inside the write screen
-		if ( '' != $qv['preview'] )
+		if ('' != $qv['preview'])
 			$this->is_preview = true;
 
-		if ( is_admin() )
+		if (is_admin())
 			$this->is_admin = true;
 
-		if ( false !== strpos($qv['feed'], 'comments-') ) {
+		if (false !== strpos($qv['feed'], 'comments-')) {
 			$qv['feed'] = str_replace('comments-', '', $qv['feed']);
 			$qv['withcomments'] = 1;
 		}
 
 		$this->is_singular = $this->is_single || $this->is_page || $this->is_attachment;
 
-		if ( $this->is_feed && ( !empty($qv['withcomments']) || ( empty($qv['withoutcomments']) && $this->is_singular ) ) )
+		if ($this->is_feed && ( ! empty($qv['withcomments']) || (empty($qv['withoutcomments']) && $this->is_singular)))
 			$this->is_comment_feed = true;
 
-		if ( !( $this->is_singular || $this->is_archive || $this->is_search || $this->is_feed || ( defined( 'REST_REQUEST' ) && REST_REQUEST ) || $this->is_trackback || $this->is_404 || $this->is_admin || $this->is_robots ) )
+		if ( ! ($this->is_singular || $this->is_archive || $this->is_search || $this->is_feed || (defined('REST_REQUEST') && REST_REQUEST) || $this->is_trackback || $this->is_404 || $this->is_admin || $this->is_robots))
 			$this->is_home = true;
 
 		// Correct is_* for page_on_front and page_for_posts
-		if ( $this->is_home && 'page' == get_option('show_on_front') && get_option('page_on_front') ) {
+		if ($this->is_home && 'page' == get_option('show_on_front') && get_option('page_on_front')) {
 			$_query = wp_parse_args($this->query);
 			// pagename can be set and empty depending on matched rewrite rules. Ignore an empty pagename.
-			if ( isset($_query['pagename']) && '' == $_query['pagename'] )
+			if (isset($_query['pagename']) && '' == $_query['pagename'])
 				unset($_query['pagename']);
 
-			unset( $_query['embed'] );
+			unset($_query['embed']);
 
-			if ( empty($_query) || !array_diff( array_keys($_query), array('preview', 'page', 'paged', 'cpage') ) ) {
+			if (empty($_query) || ! array_diff(array_keys($_query), array('preview', 'page', 'paged', 'cpage'))) {
 				$this->is_page = true;
 				$this->is_home = false;
 				$qv['page_id'] = get_option('page_on_front');
 				// Correct <!--nextpage--> for page_on_front
-				if ( !empty($qv['paged']) ) {
+				if ( ! empty($qv['paged'])) {
 					$qv['page'] = $qv['paged'];
 					unset($qv['paged']);
 				}
 			}
 		}
 
-		if ( '' != $qv['pagename'] ) {
-			$this->queried_object = get_page_by_path( $qv['pagename'] );
+		if ('' != $qv['pagename']) {
+			$this->queried_object = get_page_by_path($qv['pagename']);
 
-			if ( $this->queried_object && 'attachment' == $this->queried_object->post_type ) {
-				if ( preg_match( "/^[^%]*%(?:postname)%/", get_option( 'permalink_structure' ) ) ) {
+			if ($this->queried_object && 'attachment' == $this->queried_object->post_type) {
+				if (preg_match("/^[^%]*%(?:postname)%/", get_option('permalink_structure'))) {
 					// See if we also have a post with the same slug
-					$post = get_page_by_path( $qv['pagename'], OBJECT, 'post' );
-					if ( $post ) {
+					$post = get_page_by_path($qv['pagename'], OBJECT, 'post');
+					if ($post) {
 						$this->queried_object = $post;
 						$this->is_page = false;
 						$this->is_single = true;
@@ -996,53 +996,53 @@ 
 				}
 			}
 
-			if ( ! empty( $this->queried_object ) ) {
+			if ( ! empty($this->queried_object)) {
 				$this->queried_object_id = (int) $this->queried_object->ID;
 			} else {
-				unset( $this->queried_object );
+				unset($this->queried_object);
 			}
 
-			if  ( 'page' == get_option('show_on_front') && isset($this->queried_object_id) && $this->queried_object_id == get_option('page_for_posts') ) {
+			if ('page' == get_option('show_on_front') && isset($this->queried_object_id) && $this->queried_object_id == get_option('page_for_posts')) {
 				$this->is_page = false;
 				$this->is_home = true;
 				$this->is_posts_page = true;
 			}
 		}
 
-		if ( $qv['page_id'] ) {
-			if  ( 'page' == get_option('show_on_front') && $qv['page_id'] == get_option('page_for_posts') ) {
+		if ($qv['page_id']) {
+			if ('page' == get_option('show_on_front') && $qv['page_id'] == get_option('page_for_posts')) {
 				$this->is_page = false;
 				$this->is_home = true;
 				$this->is_posts_page = true;
 			}
 		}
 
-		if ( !empty($qv['post_type']) ) {
-			if ( is_array($qv['post_type']) )
+		if ( ! empty($qv['post_type'])) {
+			if (is_array($qv['post_type']))
 				$qv['post_type'] = array_map('sanitize_key', $qv['post_type']);
 			else
 				$qv['post_type'] = sanitize_key($qv['post_type']);
 		}
 
-		if ( ! empty( $qv['post_status'] ) ) {
-			if ( is_array( $qv['post_status'] ) )
+		if ( ! empty($qv['post_status'])) {
+			if (is_array($qv['post_status']))
 				$qv['post_status'] = array_map('sanitize_key', $qv['post_status']);
 			else
 				$qv['post_status'] = preg_replace('|[^a-z0-9_,-]|', '', $qv['post_status']);
 		}
 
-		if ( $this->is_posts_page && ( ! isset($qv['withcomments']) || ! $qv['withcomments'] ) )
+		if ($this->is_posts_page && ( ! isset($qv['withcomments']) || ! $qv['withcomments']))
 			$this->is_comment_feed = false;
 
 		$this->is_singular = $this->is_single || $this->is_page || $this->is_attachment;
 		// Done correcting is_* for page_on_front and page_for_posts
 
-		if ( '404' == $qv['error'] )
+		if ('404' == $qv['error'])
 			$this->set_404();
 
-		$this->is_embed = $this->is_embed && ( $this->is_singular || $this->is_404 );
+		$this->is_embed = $this->is_embed && ($this->is_singular || $this->is_404);
 
-		$this->query_vars_hash = md5( serialize( $this->query_vars ) );
+		$this->query_vars_hash = md5(serialize($this->query_vars));
 		$this->query_vars_changed = false;
 
 		/**
@@ -1052,7 +1052,7 @@ 
 		 *
 		 * @param WP_Query &$this The WP_Query instance (passed by reference).
 		 */
-		do_action_ref_array( 'parse_query', array( &$this ) );
+		do_action_ref_array('parse_query', array(&$this));
 	}
 
 	/**
@@ -1065,77 +1065,77 @@ 
 	 *
 	 * @param array $q The query variables. Passed by reference.
 	 */
-	public function parse_tax_query( &$q ) {
-		if ( ! empty( $q['tax_query'] ) && is_array( $q['tax_query'] ) ) {
+	public function parse_tax_query(&$q) {
+		if ( ! empty($q['tax_query']) && is_array($q['tax_query'])) {
 			$tax_query = $q['tax_query'];
 		} else {
 			$tax_query = array();
 		}
 
-		if ( !empty($q['taxonomy']) && !empty($q['term']) ) {
+		if ( ! empty($q['taxonomy']) && ! empty($q['term'])) {
 			$tax_query[] = array(
 				'taxonomy' => $q['taxonomy'],
-				'terms' => array( $q['term'] ),
+				'terms' => array($q['term']),
 				'field' => 'slug',
 			);
 		}
 
-		foreach ( get_taxonomies( array() , 'objects' ) as $taxonomy => $t ) {
-			if ( 'post_tag' == $taxonomy )
-				continue;	// Handled further down in the $q['tag'] block
+		foreach (get_taxonomies(array(), 'objects') as $taxonomy => $t) {
+			if ('post_tag' == $taxonomy)
+				continue; // Handled further down in the $q['tag'] block
 
-			if ( $t->query_var && !empty( $q[$t->query_var] ) ) {
+			if ($t->query_var && ! empty($q[$t->query_var])) {
 				$tax_query_defaults = array(
 					'taxonomy' => $taxonomy,
 					'field' => 'slug',
 				);
 
- 				if ( isset( $t->rewrite['hierarchical'] ) && $t->rewrite['hierarchical'] ) {
-					$q[$t->query_var] = wp_basename( $q[$t->query_var] );
+ 				if (isset($t->rewrite['hierarchical']) && $t->rewrite['hierarchical']) {
+					$q[$t->query_var] = wp_basename($q[$t->query_var]);
 				}
 
 				$term = $q[$t->query_var];
 
-				if ( is_array( $term ) ) {
-					$term = implode( ',', $term );
+				if (is_array($term)) {
+					$term = implode(',', $term);
 				}
 
-				if ( strpos($term, '+') !== false ) {
-					$terms = preg_split( '/[+]+/', $term );
-					foreach ( $terms as $term ) {
-						$tax_query[] = array_merge( $tax_query_defaults, array(
-							'terms' => array( $term )
-						) );
+				if (strpos($term, '+') !== false) {
+					$terms = preg_split('/[+]+/', $term);
+					foreach ($terms as $term) {
+						$tax_query[] = array_merge($tax_query_defaults, array(
+							'terms' => array($term)
+						));
 					}
 				} else {
-					$tax_query[] = array_merge( $tax_query_defaults, array(
-						'terms' => preg_split( '/[,]+/', $term )
-					) );
+					$tax_query[] = array_merge($tax_query_defaults, array(
+						'terms' => preg_split('/[,]+/', $term)
+					));
 				}
 			}
 		}
 
 		// If querystring 'cat' is an array, implode it.
-		if ( is_array( $q['cat'] ) ) {
-			$q['cat'] = implode( ',', $q['cat'] );
+		if (is_array($q['cat'])) {
+			$q['cat'] = implode(',', $q['cat']);
 		}
 
 		// Category stuff
-		if ( ! empty( $q['cat'] ) && ! $this->is_singular ) {
+		if ( ! empty($q['cat']) && ! $this->is_singular) {
 			$cat_in = $cat_not_in = array();
 
-			$cat_array = preg_split( '/[,\s]+/', urldecode( $q['cat'] ) );
-			$cat_array = array_map( 'intval', $cat_array );
-			$q['cat'] = implode( ',', $cat_array );
+			$cat_array = preg_split('/[,\s]+/', urldecode($q['cat']));
+			$cat_array = array_map('intval', $cat_array);
+			$q['cat'] = implode(',', $cat_array);
 
-			foreach ( $cat_array as $cat ) {
-				if ( $cat > 0 )
+			foreach ($cat_array as $cat) {
+				if ($cat > 0)
 					$cat_in[] = $cat;
-				elseif ( $cat < 0 )
-					$cat_not_in[] = abs( $cat );
+				elseif ($cat < 0)
+					$cat_not_in[] = abs($cat);
 			}
 
-			if ( ! empty( $cat_in ) ) {
+			if ( ! empty($cat_in)) {
 				$tax_query[] = array(
 					'taxonomy' => 'category',
 					'terms' => $cat_in,
@@ -1144,7 +1144,7 @@ 
 				);
 			}
 
-			if ( ! empty( $cat_not_in ) ) {
+			if ( ! empty($cat_not_in)) {
 				$tax_query[] = array(
 					'taxonomy' => 'category',
 					'terms' => $cat_not_in,
@@ -1153,19 +1153,19 @@ 
 					'include_children' => true
 				);
 			}
-			unset( $cat_array, $cat_in, $cat_not_in );
+			unset($cat_array, $cat_in, $cat_not_in);
 		}
 
-		if ( ! empty( $q['category__and'] ) && 1 === count( (array) $q['category__and'] ) ) {
+		if ( ! empty($q['category__and']) && 1 === count((array) $q['category__and'])) {
 			$q['category__and'] = (array) $q['category__and'];
-			if ( ! isset( $q['category__in'] ) )
+			if ( ! isset($q['category__in']))
 				$q['category__in'] = array();
-			$q['category__in'][] = absint( reset( $q['category__and'] ) );
-			unset( $q['category__and'] );
+			$q['category__in'][] = absint(reset($q['category__and']));
+			unset($q['category__and']);
 		}
 
-		if ( ! empty( $q['category__in'] ) ) {
-			$q['category__in'] = array_map( 'absint', array_unique( (array) $q['category__in'] ) );
+		if ( ! empty($q['category__in'])) {
+			$q['category__in'] = array_map('absint', array_unique((array) $q['category__in']));
 			$tax_query[] = array(
 				'taxonomy' => 'category',
 				'terms' => $q['category__in'],
@@ -1174,8 +1174,8 @@ 
 			);
 		}
 
-		if ( ! empty($q['category__not_in']) ) {
-			$q['category__not_in'] = array_map( 'absint', array_unique( (array) $q['category__not_in'] ) );
+		if ( ! empty($q['category__not_in'])) {
+			$q['category__not_in'] = array_map('absint', array_unique((array) $q['category__not_in']));
 			$tax_query[] = array(
 				'taxonomy' => 'category',
 				'terms' => $q['category__not_in'],
@@ -1184,8 +1184,8 @@ 
 			);
 		}
 
-		if ( ! empty($q['category__and']) ) {
-			$q['category__and'] = array_map( 'absint', array_unique( (array) $q['category__and'] ) );
+		if ( ! empty($q['category__and'])) {
+			$q['category__and'] = array_map('absint', array_unique((array) $q['category__and']));
 			$tax_query[] = array(
 				'taxonomy' => 'category',
 				'terms' => $q['category__and'],
@@ -1196,21 +1196,21 @@ 
 		}
 
 		// If querystring 'tag' is array, implode it.
-		if ( is_array( $q['tag'] ) ) {
-			$q['tag'] = implode( ',', $q['tag'] );
+		if (is_array($q['tag'])) {
+			$q['tag'] = implode(',', $q['tag']);
 		}
 
 		// Tag stuff
-		if ( '' != $q['tag'] && !$this->is_singular && $this->query_vars_changed ) {
-			if ( strpos($q['tag'], ',') !== false ) {
+		if ('' != $q['tag'] && ! $this->is_singular && $this->query_vars_changed) {
+			if (strpos($q['tag'], ',') !== false) {
 				$tags = preg_split('/[,\r\n\t ]+/', $q['tag']);
-				foreach ( (array) $tags as $tag ) {
+				foreach ((array) $tags as $tag) {
 					$tag = sanitize_term_field('slug', $tag, 0, 'post_tag', 'db');
 					$q['tag_slug__in'][] = $tag;
 				}
-			} elseif ( preg_match('/[+\r\n\t ]+/', $q['tag'] ) || ! empty( $q['cat'] ) ) {
+			} elseif (preg_match('/[+\r\n\t ]+/', $q['tag']) || ! empty($q['cat'])) {
 				$tags = preg_split('/[+\r\n\t ]+/', $q['tag']);
-				foreach ( (array) $tags as $tag ) {
+				foreach ((array) $tags as $tag) {
 					$tag = sanitize_term_field('slug', $tag, 0, 'post_tag', 'db');
 					$q['tag_slug__and'][] = $tag;
 				}
@@ -1220,24 +1220,24 @@ 
 			}
 		}
 
-		if ( !empty($q['tag_id']) ) {
-			$q['tag_id'] = absint( $q['tag_id'] );
+		if ( ! empty($q['tag_id'])) {
+			$q['tag_id'] = absint($q['tag_id']);
 			$tax_query[] = array(
 				'taxonomy' => 'post_tag',
 				'terms' => $q['tag_id']
 			);
 		}
 
-		if ( !empty($q['tag__in']) ) {
-			$q['tag__in'] = array_map('absint', array_unique( (array) $q['tag__in'] ) );
+		if ( ! empty($q['tag__in'])) {
+			$q['tag__in'] = array_map('absint', array_unique((array) $q['tag__in']));
 			$tax_query[] = array(
 				'taxonomy' => 'post_tag',
 				'terms' => $q['tag__in']
 			);
 		}
 
-		if ( !empty($q['tag__not_in']) ) {
-			$q['tag__not_in'] = array_map('absint', array_unique( (array) $q['tag__not_in'] ) );
+		if ( ! empty($q['tag__not_in'])) {
+			$q['tag__not_in'] = array_map('absint', array_unique((array) $q['tag__not_in']));
 			$tax_query[] = array(
 				'taxonomy' => 'post_tag',
 				'terms' => $q['tag__not_in'],
@@ -1245,8 +1245,8 @@ 
 			);
 		}
 
-		if ( !empty($q['tag__and']) ) {
-			$q['tag__and'] = array_map('absint', array_unique( (array) $q['tag__and'] ) );
+		if ( ! empty($q['tag__and'])) {
+			$q['tag__and'] = array_map('absint', array_unique((array) $q['tag__and']));
 			$tax_query[] = array(
 				'taxonomy' => 'post_tag',
 				'terms' => $q['tag__and'],
@@ -1254,8 +1254,8 @@ 
 			);
 		}
 
-		if ( !empty($q['tag_slug__in']) ) {
-			$q['tag_slug__in'] = array_map('sanitize_title_for_query', array_unique( (array) $q['tag_slug__in'] ) );
+		if ( ! empty($q['tag_slug__in'])) {
+			$q['tag_slug__in'] = array_map('sanitize_title_for_query', array_unique((array) $q['tag_slug__in']));
 			$tax_query[] = array(
 				'taxonomy' => 'post_tag',
 				'terms' => $q['tag_slug__in'],
@@ -1263,8 +1263,8 @@ 
 			);
 		}
 
-		if ( !empty($q['tag_slug__and']) ) {
-			$q['tag_slug__and'] = array_map('sanitize_title_for_query', array_unique( (array) $q['tag_slug__and'] ) );
+		if ( ! empty($q['tag_slug__and'])) {
+			$q['tag_slug__and'] = array_map('sanitize_title_for_query', array_unique((array) $q['tag_slug__and']));
 			$tax_query[] = array(
 				'taxonomy' => 'post_tag',
 				'terms' => $q['tag_slug__and'],
@@ -1273,7 +1273,7 @@ 
 			);
 		}
 
-		$this->tax_query = new WP_Tax_Query( $tax_query );
+		$this->tax_query = new WP_Tax_Query($tax_query);
 
 		/**
 		 * Fires after taxonomy-related query vars have been parsed.
@@ -1282,7 +1282,7 @@ 
 		 *
 		 * @param WP_Query $this The WP_Query instance.
 		 */
-		do_action( 'parse_tax_query', $this );
+		do_action('parse_tax_query', $this);
 	}
 
 	/**
@@ -1293,33 +1293,33 @@ 
 	 * @param array $q Query variables.
 	 * @return string WHERE clause.
 	 */
-	protected function parse_search( &$q ) {
+	protected function parse_search(&$q) {
 		global $wpdb;
 
 		$search = '';
 
 		// added slashes screw with quote grouping when done early, so done later
-		$q['s'] = stripslashes( $q['s'] );
-		if ( empty( $_GET['s'] ) && $this->is_main_query() )
-			$q['s'] = urldecode( $q['s'] );
+		$q['s'] = stripslashes($q['s']);
+		if (empty($_GET['s']) && $this->is_main_query())
+			$q['s'] = urldecode($q['s']);
 		// there are no line breaks in <input /> fields
-		$q['s'] = str_replace( array( "\r", "\n" ), '', $q['s'] );
+		$q['s'] = str_replace(array("\r", "\n"), '', $q['s']);
 		$q['search_terms_count'] = 1;
-		if ( ! empty( $q['sentence'] ) ) {
-			$q['search_terms'] = array( $q['s'] );
+		if ( ! empty($q['sentence'])) {
+			$q['search_terms'] = array($q['s']);
 		} else {
-			if ( preg_match_all( '/".*?("|$)|((?<=[\t ",+])|^)[^\t ",+]+/', $q['s'], $matches ) ) {
-				$q['search_terms_count'] = count( $matches[0] );
-				$q['search_terms'] = $this->parse_search_terms( $matches[0] );
+			if (preg_match_all('/".*?("|$)|((?<=[\t ",+])|^)[^\t ",+]+/', $q['s'], $matches)) {
+				$q['search_terms_count'] = count($matches[0]);
+				$q['search_terms'] = $this->parse_search_terms($matches[0]);
 				// if the search string has only short terms or stopwords, or is 10+ terms long, match it as sentence
-				if ( empty( $q['search_terms'] ) || count( $q['search_terms'] ) > 9 )
-					$q['search_terms'] = array( $q['s'] );
+				if (empty($q['search_terms']) || count($q['search_terms']) > 9)
+					$q['search_terms'] = array($q['s']);
 			} else {
-				$q['search_terms'] = array( $q['s'] );
+				$q['search_terms'] = array($q['s']);
 			}
 		}
 
-		$n = ! empty( $q['exact'] ) ? '' : '%';
+		$n = ! empty($q['exact']) ? '' : '%';
 		$searchand = '';
 		$q['search_orderby_title'] = array();
 
@@ -1331,33 +1331,33 @@ 
 		 * @param string $exclusion_prefix The prefix. Default '-'. Returning
 		 *                                 an empty value disables exclusions.
 		 */
-		$exclusion_prefix = apply_filters( 'wp_query_search_exclusion_prefix', '-' );
+		$exclusion_prefix = apply_filters('wp_query_search_exclusion_prefix', '-');
 
-		foreach ( $q['search_terms'] as $term ) {
+		foreach ($q['search_terms'] as $term) {
 			// If there is an $exclusion_prefix, terms prefixed with it should be excluded.
-			$exclude = $exclusion_prefix && ( $exclusion_prefix === substr( $term, 0, 1 ) );
-			if ( $exclude ) {
+			$exclude = $exclusion_prefix && ($exclusion_prefix === substr($term, 0, 1));
+			if ($exclude) {
 				$like_op  = 'NOT LIKE';
 				$andor_op = 'AND';
-				$term     = substr( $term, 1 );
+				$term     = substr($term, 1);
 			} else {
 				$like_op  = 'LIKE';
 				$andor_op = 'OR';
 			}
 
-			if ( $n && ! $exclude ) {
-				$like = '%' . $wpdb->esc_like( $term ) . '%';
-				$q['search_orderby_title'][] = $wpdb->prepare( "{$wpdb->posts}.post_title LIKE %s", $like );
+			if ($n && ! $exclude) {
+				$like = '%'.$wpdb->esc_like($term).'%';
+				$q['search_orderby_title'][] = $wpdb->prepare("{$wpdb->posts}.post_title LIKE %s", $like);
 			}
 
-			$like = $n . $wpdb->esc_like( $term ) . $n;
-			$search .= $wpdb->prepare( "{$searchand}(({$wpdb->posts}.post_title $like_op %s) $andor_op ({$wpdb->posts}.post_excerpt $like_op %s) $andor_op ({$wpdb->posts}.post_content $like_op %s))", $like, $like, $like );
+			$like = $n.$wpdb->esc_like($term).$n;
+			$search .= $wpdb->prepare("{$searchand}(({$wpdb->posts}.post_title $like_op %s) $andor_op ({$wpdb->posts}.post_excerpt $like_op %s) $andor_op ({$wpdb->posts}.post_content $like_op %s))", $like, $like, $like);
 			$searchand = ' AND ';
 		}
 
-		if ( ! empty( $search ) ) {
+		if ( ! empty($search)) {
 			$search = " AND ({$search}) ";
-			if ( ! is_user_logged_in() ) {
+			if ( ! is_user_logged_in()) {
 				$search .= " AND ({$wpdb->posts}.post_password = '') ";
 			}
 		}
@@ -1377,24 +1377,24 @@ 
 	 * @param array $terms Terms to check.
 	 * @return array Terms that are not stopwords.
 	 */
-	protected function parse_search_terms( $terms ) {
-		$strtolower = function_exists( 'mb_strtolower' ) ? 'mb_strtolower' : 'strtolower';
+	protected function parse_search_terms($terms) {
+		$strtolower = function_exists('mb_strtolower') ? 'mb_strtolower' : 'strtolower';
 		$checked = array();
 
 		$stopwords = $this->get_search_stopwords();
 
-		foreach ( $terms as $term ) {
+		foreach ($terms as $term) {
 			// keep before/after spaces when term is for exact match
-			if ( preg_match( '/^".+"$/', $term ) )
-				$term = trim( $term, "\"'" );
+			if (preg_match('/^".+"$/', $term))
+				$term = trim($term, "\"'");
 			else
-				$term = trim( $term, "\"' " );
+				$term = trim($term, "\"' ");
 
 			// Avoid single A-Z and single dashes.
-			if ( ! $term || ( 1 === strlen( $term ) && preg_match( '/^[a-z\-]$/i', $term ) ) )
+			if ( ! $term || (1 === strlen($term) && preg_match('/^[a-z\-]$/i', $term)))
 				continue;
 
-			if ( in_array( call_user_func( $strtolower, $term ), $stopwords, true ) )
+			if (in_array(call_user_func($strtolower, $term), $stopwords, true))
 				continue;
 
 			$checked[] = $term;
@@ -1411,20 +1411,20 @@ 
 	 * @return array Stopwords.
 	 */
 	protected function get_search_stopwords() {
-		if ( isset( $this->stopwords ) )
+		if (isset($this->stopwords))
 			return $this->stopwords;
 
 		/* translators: This is a comma-separated list of very common words that should be excluded from a search,
 		 * like a, an, and the. These are usually called "stopwords". You should not simply translate these individual
 		 * words into your language. Instead, look for and provide commonly accepted stopwords in your language.
 		 */
-		$words = explode( ',', _x( 'about,an,are,as,at,be,by,com,for,from,how,in,is,it,of,on,or,that,the,this,to,was,what,when,where,who,will,with,www',
-			'Comma-separated list of search stopwords in your language' ) );
+		$words = explode(',', _x('about,an,are,as,at,be,by,com,for,from,how,in,is,it,of,on,or,that,the,this,to,was,what,when,where,who,will,with,www',
+			'Comma-separated list of search stopwords in your language'));
 
 		$stopwords = array();
-		foreach ( $words as $word ) {
-			$word = trim( $word, "\r\n\t " );
-			if ( $word )
+		foreach ($words as $word) {
+			$word = trim($word, "\r\n\t ");
+			if ($word)
 				$stopwords[] = $word;
 		}
 
@@ -1435,7 +1435,7 @@ 
 		 *
 		 * @param array $stopwords Stopwords.
 		 */
-		$this->stopwords = apply_filters( 'wp_search_stopwords', $stopwords );
+		$this->stopwords = apply_filters('wp_search_stopwords', $stopwords);
 		return $this->stopwords;
 	}
 
@@ -1445,47 +1445,47 @@ 
 	 * @param array $q Query variables.
 	 * @return string ORDER BY clause.
 	 */
-	protected function parse_search_order( &$q ) {
+	protected function parse_search_order(&$q) {
 		global $wpdb;
 
-		if ( $q['search_terms_count'] > 1 ) {
-			$num_terms = count( $q['search_orderby_title'] );
+		if ($q['search_terms_count'] > 1) {
+			$num_terms = count($q['search_orderby_title']);
 
 			// If the search terms contain negative queries, don't bother ordering by sentence matches.
 			$like = '';
-			if ( ! preg_match( '/(?:\s|^)\-/', $q['s'] ) ) {
-				$like = '%' . $wpdb->esc_like( $q['s'] ) . '%';
+			if ( ! preg_match('/(?:\s|^)\-/', $q['s'])) {
+				$like = '%'.$wpdb->esc_like($q['s']).'%';
 			}
 
 			$search_orderby = '';
 
 			// sentence match in 'post_title'
-			if ( $like ) {
-				$search_orderby .= $wpdb->prepare( "WHEN {$wpdb->posts}.post_title LIKE %s THEN 1 ", $like );
+			if ($like) {
+				$search_orderby .= $wpdb->prepare("WHEN {$wpdb->posts}.post_title LIKE %s THEN 1 ", $like);
 			}
 
 			// sanity limit, sort as sentence when more than 6 terms
 			// (few searches are longer than 6 terms and most titles are not)
-			if ( $num_terms < 7 ) {
+			if ($num_terms < 7) {
 				// all words in title
-				$search_orderby .= 'WHEN ' . implode( ' AND ', $q['search_orderby_title'] ) . ' THEN 2 ';
+				$search_orderby .= 'WHEN '.implode(' AND ', $q['search_orderby_title']).' THEN 2 ';
 				// any word in title, not needed when $num_terms == 1
-				if ( $num_terms > 1 )
-					$search_orderby .= 'WHEN ' . implode( ' OR ', $q['search_orderby_title'] ) . ' THEN 3 ';
+				if ($num_terms > 1)
+					$search_orderby .= 'WHEN '.implode(' OR ', $q['search_orderby_title']).' THEN 3 ';
 			}
 
 			// Sentence match in 'post_content' and 'post_excerpt'.
-			if ( $like ) {
-				$search_orderby .= $wpdb->prepare( "WHEN {$wpdb->posts}.post_excerpt LIKE %s THEN 4 ", $like );
-				$search_orderby .= $wpdb->prepare( "WHEN {$wpdb->posts}.post_content LIKE %s THEN 5 ", $like );
+			if ($like) {
+				$search_orderby .= $wpdb->prepare("WHEN {$wpdb->posts}.post_excerpt LIKE %s THEN 4 ", $like);
+				$search_orderby .= $wpdb->prepare("WHEN {$wpdb->posts}.post_content LIKE %s THEN 5 ", $like);
 			}
 
-			if ( $search_orderby ) {
-				$search_orderby = '(CASE ' . $search_orderby . 'ELSE 6 END)';
+			if ($search_orderby) {
+				$search_orderby = '(CASE '.$search_orderby.'ELSE 6 END)';
 			}
 		} else {
 			// single word or sentence search
-			$search_orderby = reset( $q['search_orderby_title'] ) . ' DESC';
+			$search_orderby = reset($q['search_orderby_title']).' DESC';
 		}
 
 		return $search_orderby;
@@ -1501,7 +1501,7 @@ 
 	 * @param string $orderby Alias for the field to order by.
 	 * @return string|false Table-prefixed value to used in the ORDER clause. False otherwise.
 	 */
-	protected function parse_orderby( $orderby ) {
+	protected function parse_orderby($orderby) {
 		global $wpdb;
 
 		// Used to filter values.
@@ -1514,32 +1514,32 @@ 
 		$primary_meta_key = '';
 		$primary_meta_query = false;
 		$meta_clauses = $this->meta_query->get_clauses();
-		if ( ! empty( $meta_clauses ) ) {
-			$primary_meta_query = reset( $meta_clauses );
+		if ( ! empty($meta_clauses)) {
+			$primary_meta_query = reset($meta_clauses);
 
-			if ( ! empty( $primary_meta_query['key'] ) ) {
+			if ( ! empty($primary_meta_query['key'])) {
 				$primary_meta_key = $primary_meta_query['key'];
 				$allowed_keys[] = $primary_meta_key;
 			}
 
 			$allowed_keys[] = 'meta_value';
 			$allowed_keys[] = 'meta_value_num';
-			$allowed_keys   = array_merge( $allowed_keys, array_keys( $meta_clauses ) );
+			$allowed_keys   = array_merge($allowed_keys, array_keys($meta_clauses));
 		}
 
 		// If RAND() contains a seed value, sanitize and add to allowed keys.
 		$rand_with_seed = false;
-		if ( preg_match( '/RAND\(([0-9]+)\)/i', $orderby, $matches ) ) {
-			$orderby = sprintf( 'RAND(%s)', intval( $matches[1] ) );
+		if (preg_match('/RAND\(([0-9]+)\)/i', $orderby, $matches)) {
+			$orderby = sprintf('RAND(%s)', intval($matches[1]));
 			$allowed_keys[] = $orderby;
 			$rand_with_seed = true;
 		}
 
-		if ( ! in_array( $orderby, $allowed_keys, true ) ) {
+		if ( ! in_array($orderby, $allowed_keys, true)) {
 			return false;
 		}
 
-		switch ( $orderby ) {
+		switch ($orderby) {
 			case 'post_name':
 			case 'post_author':
 			case 'post_date':
@@ -1557,7 +1557,7 @@ 
 				break;
 			case $primary_meta_key:
 			case 'meta_value':
-				if ( ! empty( $primary_meta_query['type'] ) ) {
+				if ( ! empty($primary_meta_query['type'])) {
 					$orderby_clause = "CAST({$primary_meta_query['alias']}.meta_value AS {$primary_meta_query['cast']})";
 				} else {
 					$orderby_clause = "{$primary_meta_query['alias']}.meta_value";
@@ -1567,15 +1567,15 @@ 
 				$orderby_clause = "{$primary_meta_query['alias']}.meta_value+0";
 				break;
 			default:
-				if ( array_key_exists( $orderby, $meta_clauses ) ) {
+				if (array_key_exists($orderby, $meta_clauses)) {
 					// $orderby corresponds to a meta_query clause.
-					$meta_clause = $meta_clauses[ $orderby ];
+					$meta_clause = $meta_clauses[$orderby];
 					$orderby_clause = "CAST({$meta_clause['alias']}.meta_value AS {$meta_clause['cast']})";
-				} elseif ( $rand_with_seed ) {
+				} elseif ($rand_with_seed) {
 					$orderby_clause = $orderby;
 				} else {
 					// Default: order by post field.
-					$orderby_clause = "{$wpdb->posts}.post_" . sanitize_key( $orderby );
+					$orderby_clause = "{$wpdb->posts}.post_".sanitize_key($orderby);
 				}
 
 				break;
@@ -1593,12 +1593,12 @@ 
 	 * @param string $order The 'order' query variable.
 	 * @return string The sanitized 'order' query variable.
 	 */
-	protected function parse_order( $order ) {
-		if ( ! is_string( $order ) || empty( $order ) ) {
+	protected function parse_order($order) {
+		if ( ! is_string($order) || empty($order)) {
 			return 'DESC';
 		}
 
-		if ( 'ASC' === strtoupper( $order ) ) {
+		if ('ASC' === strtoupper($order)) {
 			return 'ASC';
 		} else {
 			return 'DESC';
@@ -1632,9 +1632,9 @@ 
 	 * @param mixed  $default   Optional. Value to return if the query variable is not set. Default empty.
 	 * @return mixed Contents of the query variable.
 	 */
-	public function get( $query_var, $default = '' ) {
-		if ( isset( $this->query_vars[ $query_var ] ) ) {
-			return $this->query_vars[ $query_var ];
+	public function get($query_var, $default = '') {
+		if (isset($this->query_vars[$query_var])) {
+			return $this->query_vars[$query_var];
 		}
 
 		return $default;
@@ -1680,7 +1680,7 @@ 
 		 *
 		 * @param WP_Query &$this The WP_Query instance (passed by reference).
 		 */
-		do_action_ref_array( 'pre_get_posts', array( &$this ) );
+		do_action_ref_array('pre_get_posts', array(&$this));
 
 		// Shorthand.
 		$q = &$this->query_vars;
@@ -1690,11 +1690,11 @@ 
 
 		// Parse meta query
 		$this->meta_query = new WP_Meta_Query();
-		$this->meta_query->parse_query_vars( $q );
+		$this->meta_query->parse_query_vars($q);
 
 		// Set a flag if a pre_get_posts hook changed the query vars.
-		$hash = md5( serialize( $this->query_vars ) );
-		if ( $hash != $this->query_vars_hash ) {
+		$hash = md5(serialize($this->query_vars));
+		if ($hash != $this->query_vars_hash) {
 			$this->query_vars_changed = true;
 			$this->query_vars_hash = $hash;
 		}
@@ -1712,103 +1712,103 @@ 
 		$post_status_join = false;
 		$page = 1;
 
-		if ( isset( $q['caller_get_posts'] ) ) {
-			_deprecated_argument( 'WP_Query', '3.1.0',
+		if (isset($q['caller_get_posts'])) {
+			_deprecated_argument('WP_Query', '3.1.0',
 				/* translators: 1: caller_get_posts, 2: ignore_sticky_posts */
-				sprintf( __( '%1$s is deprecated. Use %2$s instead.' ),
+				sprintf(__('%1$s is deprecated. Use %2$s instead.'),
 					'<code>caller_get_posts</code>',
 					'<code>ignore_sticky_posts</code>'
 				)
 			);
 
-			if ( ! isset( $q['ignore_sticky_posts'] ) ) {
+			if ( ! isset($q['ignore_sticky_posts'])) {
 				$q['ignore_sticky_posts'] = $q['caller_get_posts'];
 			}
 		}
 
-		if ( !isset( $q['ignore_sticky_posts'] ) )
+		if ( ! isset($q['ignore_sticky_posts']))
 			$q['ignore_sticky_posts'] = false;
 
-		if ( !isset($q['suppress_filters']) )
+		if ( ! isset($q['suppress_filters']))
 			$q['suppress_filters'] = false;
 
-		if ( !isset($q['cache_results']) ) {
-			if ( wp_using_ext_object_cache() )
+		if ( ! isset($q['cache_results'])) {
+			if (wp_using_ext_object_cache())
 				$q['cache_results'] = false;
 			else
 				$q['cache_results'] = true;
 		}
 
-		if ( !isset($q['update_post_term_cache']) )
+		if ( ! isset($q['update_post_term_cache']))
 			$q['update_post_term_cache'] = true;
 
-		if ( ! isset( $q['lazy_load_term_meta'] ) ) {
+		if ( ! isset($q['lazy_load_term_meta'])) {
 			$q['lazy_load_term_meta'] = $q['update_post_term_cache'];
 		}
 
-		if ( !isset($q['update_post_meta_cache']) )
+		if ( ! isset($q['update_post_meta_cache']))
 			$q['update_post_meta_cache'] = true;
 
-		if ( !isset($q['post_type']) ) {
-			if ( $this->is_search )
+		if ( ! isset($q['post_type'])) {
+			if ($this->is_search)
 				$q['post_type'] = 'any';
 			else
 				$q['post_type'] = '';
 		}
 		$post_type = $q['post_type'];
-		if ( empty( $q['posts_per_page'] ) ) {
-			$q['posts_per_page'] = get_option( 'posts_per_page' );
+		if (empty($q['posts_per_page'])) {
+			$q['posts_per_page'] = get_option('posts_per_page');
 		}
-		if ( isset($q['showposts']) && $q['showposts'] ) {
+		if (isset($q['showposts']) && $q['showposts']) {
 			$q['showposts'] = (int) $q['showposts'];
 			$q['posts_per_page'] = $q['showposts'];
 		}
-		if ( (isset($q['posts_per_archive_page']) && $q['posts_per_archive_page'] != 0) && ($this->is_archive || $this->is_search) )
+		if ((isset($q['posts_per_archive_page']) && $q['posts_per_archive_page'] != 0) && ($this->is_archive || $this->is_search))
 			$q['posts_per_page'] = $q['posts_per_archive_page'];
-		if ( !isset($q['nopaging']) ) {
-			if ( $q['posts_per_page'] == -1 ) {
+		if ( ! isset($q['nopaging'])) {
+			if ($q['posts_per_page'] == -1) {
 				$q['nopaging'] = true;
 			} else {
 				$q['nopaging'] = false;
 			}
 		}
 
-		if ( $this->is_feed ) {
+		if ($this->is_feed) {
 			// This overrides posts_per_page.
-			if ( ! empty( $q['posts_per_rss'] ) ) {
+			if ( ! empty($q['posts_per_rss'])) {
 				$q['posts_per_page'] = $q['posts_per_rss'];
 			} else {
-				$q['posts_per_page'] = get_option( 'posts_per_rss' );
+				$q['posts_per_page'] = get_option('posts_per_rss');
 			}
 			$q['nopaging'] = false;
 		}
 		$q['posts_per_page'] = (int) $q['posts_per_page'];
-		if ( $q['posts_per_page'] < -1 )
+		if ($q['posts_per_page'] < -1)
 			$q['posts_per_page'] = abs($q['posts_per_page']);
-		elseif ( $q['posts_per_page'] == 0 )
+		elseif ($q['posts_per_page'] == 0)
 			$q['posts_per_page'] = 1;
 
-		if ( !isset($q['comments_per_page']) || $q['comments_per_page'] == 0 )
+		if ( ! isset($q['comments_per_page']) || $q['comments_per_page'] == 0)
 			$q['comments_per_page'] = get_option('comments_per_page');
 
-		if ( $this->is_home && (empty($this->query) || $q['preview'] == 'true') && ( 'page' == get_option('show_on_front') ) && get_option('page_on_front') ) {
+		if ($this->is_home && (empty($this->query) || $q['preview'] == 'true') && ('page' == get_option('show_on_front')) && get_option('page_on_front')) {
 			$this->is_page = true;
 			$this->is_home = false;
 			$q['page_id'] = get_option('page_on_front');
 		}
 
-		if ( isset($q['page']) ) {
+		if (isset($q['page'])) {
 			$q['page'] = trim($q['page'], '/');
 			$q['page'] = absint($q['page']);
 		}
 
 		// If true, forcibly turns off SQL_CALC_FOUND_ROWS even when limits are present.
-		if ( isset($q['no_found_rows']) )
+		if (isset($q['no_found_rows']))
 			$q['no_found_rows'] = (bool) $q['no_found_rows'];
 		else
 			$q['no_found_rows'] = false;
 
-		switch ( $q['fields'] ) {
+		switch ($q['fields']) {
 			case 'ids':
 				$fields = "{$wpdb->posts}.ID";
 				break;
@@ -1819,79 +1819,79 @@ 
 				$fields = "{$wpdb->posts}.*";
 		}
 
-		if ( '' !== $q['menu_order'] ) {
-			$where .= " AND {$wpdb->posts}.menu_order = " . $q['menu_order'];
+		if ('' !== $q['menu_order']) {
+			$where .= " AND {$wpdb->posts}.menu_order = ".$q['menu_order'];
 		}
 		// The "m" parameter is meant for months but accepts datetimes of varying specificity
-		if ( $q['m'] ) {
-			$where .= " AND YEAR({$wpdb->posts}.post_date)=" . substr($q['m'], 0, 4);
-			if ( strlen($q['m']) > 5 ) {
-				$where .= " AND MONTH({$wpdb->posts}.post_date)=" . substr($q['m'], 4, 2);
+		if ($q['m']) {
+			$where .= " AND YEAR({$wpdb->posts}.post_date)=".substr($q['m'], 0, 4);
+			if (strlen($q['m']) > 5) {
+				$where .= " AND MONTH({$wpdb->posts}.post_date)=".substr($q['m'], 4, 2);
 			}
-			if ( strlen($q['m']) > 7 ) {
-				$where .= " AND DAYOFMONTH({$wpdb->posts}.post_date)=" . substr($q['m'], 6, 2);
+			if (strlen($q['m']) > 7) {
+				$where .= " AND DAYOFMONTH({$wpdb->posts}.post_date)=".substr($q['m'], 6, 2);
 			}
-			if ( strlen($q['m']) > 9 ) {
-				$where .= " AND HOUR({$wpdb->posts}.post_date)=" . substr($q['m'], 8, 2);
+			if (strlen($q['m']) > 9) {
+				$where .= " AND HOUR({$wpdb->posts}.post_date)=".substr($q['m'], 8, 2);
 			}
-			if ( strlen($q['m']) > 11 ) {
-				$where .= " AND MINUTE({$wpdb->posts}.post_date)=" . substr($q['m'], 10, 2);
+			if (strlen($q['m']) > 11) {
+				$where .= " AND MINUTE({$wpdb->posts}.post_date)=".substr($q['m'], 10, 2);
 			}
-			if ( strlen($q['m']) > 13 ) {
-				$where .= " AND SECOND({$wpdb->posts}.post_date)=" . substr($q['m'], 12, 2);
+			if (strlen($q['m']) > 13) {
+				$where .= " AND SECOND({$wpdb->posts}.post_date)=".substr($q['m'], 12, 2);
 			}
 		}
 
 		// Handle the other individual date parameters
 		$date_parameters = array();
 
-		if ( '' !== $q['hour'] )
+		if ('' !== $q['hour'])
 			$date_parameters['hour'] = $q['hour'];
 
-		if ( '' !== $q['minute'] )
+		if ('' !== $q['minute'])
 			$date_parameters['minute'] = $q['minute'];
 
-		if ( '' !== $q['second'] )
+		if ('' !== $q['second'])
 			$date_parameters['second'] = $q['second'];
 
-		if ( $q['year'] )
+		if ($q['year'])
 			$date_parameters['year'] = $q['year'];
 
-		if ( $q['monthnum'] )
+		if ($q['monthnum'])
 			$date_parameters['monthnum'] = $q['monthnum'];
 
-		if ( $q['w'] )
+		if ($q['w'])
 			$date_parameters['week'] = $q['w'];
 
-		if ( $q['day'] )
+		if ($q['day'])
 			$date_parameters['day'] = $q['day'];
 
-		if ( $date_parameters ) {
-			$date_query = new WP_Date_Query( array( $date_parameters ) );
+		if ($date_parameters) {
+			$date_query = new WP_Date_Query(array($date_parameters));
 			$where .= $date_query->get_sql();
 		}
-		unset( $date_parameters, $date_query );
+		unset($date_parameters, $date_query);
 
 		// Handle complex date queries
-		if ( ! empty( $q['date_query'] ) ) {
-			$this->date_query = new WP_Date_Query( $q['date_query'] );
+		if ( ! empty($q['date_query'])) {
+			$this->date_query = new WP_Date_Query($q['date_query']);
 			$where .= $this->date_query->get_sql();
 		}
 
 
 		// If we've got a post_type AND it's not "any" post_type.
-		if ( !empty($q['post_type']) && 'any' != $q['post_type'] ) {
-			foreach ( (array)$q['post_type'] as $_post_type ) {
+		if ( ! empty($q['post_type']) && 'any' != $q['post_type']) {
+			foreach ((array) $q['post_type'] as $_post_type) {
 				$ptype_obj = get_post_type_object($_post_type);
-				if ( !$ptype_obj || !$ptype_obj->query_var || empty($q[ $ptype_obj->query_var ]) )
+				if ( ! $ptype_obj || ! $ptype_obj->query_var || empty($q[$ptype_obj->query_var]))
 					continue;
 
-				if ( ! $ptype_obj->hierarchical ) {
+				if ( ! $ptype_obj->hierarchical) {
 					// Non-hierarchical post types can directly use 'name'.
-					$q['name'] = $q[ $ptype_obj->query_var ];
+					$q['name'] = $q[$ptype_obj->query_var];
 				} else {
 					// Hierarchical post types will operate through 'pagename'.
-					$q['pagename'] = $q[ $ptype_obj->query_var ];
+					$q['pagename'] = $q[$ptype_obj->query_var];
 					$q['name'] = '';
 				}
 
@@ -1901,99 +1901,99 @@ 
 			unset($ptype_obj);
 		}
 
-		if ( '' !== $q['title'] ) {
-			$where .= $wpdb->prepare( " AND {$wpdb->posts}.post_title = %s", stripslashes( $q['title'] ) );
+		if ('' !== $q['title']) {
+			$where .= $wpdb->prepare(" AND {$wpdb->posts}.post_title = %s", stripslashes($q['title']));
 		}
 
 		// Parameters related to 'post_name'.
-		if ( '' != $q['name'] ) {
-			$q['name'] = sanitize_title_for_query( $q['name'] );
-			$where .= " AND {$wpdb->posts}.post_name = '" . $q['name'] . "'";
-		} elseif ( '' != $q['pagename'] ) {
-			if ( isset($this->queried_object_id) ) {
+		if ('' != $q['name']) {
+			$q['name'] = sanitize_title_for_query($q['name']);
+			$where .= " AND {$wpdb->posts}.post_name = '".$q['name']."'";
+		} elseif ('' != $q['pagename']) {
+			if (isset($this->queried_object_id)) {
 				$reqpage = $this->queried_object_id;
 			} else {
-				if ( 'page' != $q['post_type'] ) {
-					foreach ( (array)$q['post_type'] as $_post_type ) {
+				if ('page' != $q['post_type']) {
+					foreach ((array) $q['post_type'] as $_post_type) {
 						$ptype_obj = get_post_type_object($_post_type);
-						if ( !$ptype_obj || !$ptype_obj->hierarchical )
+						if ( ! $ptype_obj || ! $ptype_obj->hierarchical)
 							continue;
 
 						$reqpage = get_page_by_path($q['pagename'], OBJECT, $_post_type);
-						if ( $reqpage )
+						if ($reqpage)
 							break;
 					}
 					unset($ptype_obj);
 				} else {
 					$reqpage = get_page_by_path($q['pagename']);
 				}
-				if ( !empty($reqpage) )
+				if ( ! empty($reqpage))
 					$reqpage = $reqpage->ID;
 				else
 					$reqpage = 0;
 			}
 
 			$page_for_posts = get_option('page_for_posts');
-			if  ( ('page' != get_option('show_on_front') ) || empty($page_for_posts) || ( $reqpage != $page_for_posts ) ) {
-				$q['pagename'] = sanitize_title_for_query( wp_basename( $q['pagename'] ) );
+			if (('page' != get_option('show_on_front')) || empty($page_for_posts) || ($reqpage != $page_for_posts)) {
+				$q['pagename'] = sanitize_title_for_query(wp_basename($q['pagename']));
 				$q['name'] = $q['pagename'];
 				$where .= " AND ({$wpdb->posts}.ID = '$reqpage')";
-				$reqpage_obj = get_post( $reqpage );
-				if ( is_object($reqpage_obj) && 'attachment' == $reqpage_obj->post_type ) {
+				$reqpage_obj = get_post($reqpage);
+				if (is_object($reqpage_obj) && 'attachment' == $reqpage_obj->post_type) {
 					$this->is_attachment = true;
 					$post_type = $q['post_type'] = 'attachment';
 					$this->is_page = true;
 					$q['attachment_id'] = $reqpage;
 				}
 			}
-		} elseif ( '' != $q['attachment'] ) {
-			$q['attachment'] = sanitize_title_for_query( wp_basename( $q['attachment'] ) );
+		} elseif ('' != $q['attachment']) {
+			$q['attachment'] = sanitize_title_for_query(wp_basename($q['attachment']));
 			$q['name'] = $q['attachment'];
-			$where .= " AND {$wpdb->posts}.post_name = '" . $q['attachment'] . "'";
-		} elseif ( is_array( $q['post_name__in'] ) && ! empty( $q['post_name__in'] ) ) {
-			$q['post_name__in'] = array_map( 'sanitize_title_for_query', $q['post_name__in'] );
-			$post_name__in = "'" . implode( "','", $q['post_name__in'] ) . "'";
+			$where .= " AND {$wpdb->posts}.post_name = '".$q['attachment']."'";
+		} elseif (is_array($q['post_name__in']) && ! empty($q['post_name__in'])) {
+			$q['post_name__in'] = array_map('sanitize_title_for_query', $q['post_name__in']);
+			$post_name__in = "'".implode("','", $q['post_name__in'])."'";
 			$where .= " AND {$wpdb->posts}.post_name IN ($post_name__in)";
 		}
 
 		// If an attachment is requested by number, let it supersede any post number.
-		if ( $q['attachment_id'] )
+		if ($q['attachment_id'])
 			$q['p'] = absint($q['attachment_id']);
 
 		// If a post number is specified, load that post
-		if ( $q['p'] ) {
-			$where .= " AND {$wpdb->posts}.ID = " . $q['p'];
-		} elseif ( $q['post__in'] ) {
-			$post__in = implode(',', array_map( 'absint', $q['post__in'] ));
+		if ($q['p']) {
+			$where .= " AND {$wpdb->posts}.ID = ".$q['p'];
+		} elseif ($q['post__in']) {
+			$post__in = implode(',', array_map('absint', $q['post__in']));
 			$where .= " AND {$wpdb->posts}.ID IN ($post__in)";
-		} elseif ( $q['post__not_in'] ) {
-			$post__not_in = implode(',',  array_map( 'absint', $q['post__not_in'] ));
+		} elseif ($q['post__not_in']) {
+			$post__not_in = implode(',', array_map('absint', $q['post__not_in']));
 			$where .= " AND {$wpdb->posts}.ID NOT IN ($post__not_in)";
 		}
 
-		if ( is_numeric( $q['post_parent'] ) ) {
-			$where .= $wpdb->prepare( " AND {$wpdb->posts}.post_parent = %d ", $q['post_parent'] );
-		} elseif ( $q['post_parent__in'] ) {
-			$post_parent__in = implode( ',', array_map( 'absint', $q['post_parent__in'] ) );
+		if (is_numeric($q['post_parent'])) {
+			$where .= $wpdb->prepare(" AND {$wpdb->posts}.post_parent = %d ", $q['post_parent']);
+		} elseif ($q['post_parent__in']) {
+			$post_parent__in = implode(',', array_map('absint', $q['post_parent__in']));
 			$where .= " AND {$wpdb->posts}.post_parent IN ($post_parent__in)";
-		} elseif ( $q['post_parent__not_in'] ) {
-			$post_parent__not_in = implode( ',',  array_map( 'absint', $q['post_parent__not_in'] ) );
+		} elseif ($q['post_parent__not_in']) {
+			$post_parent__not_in = implode(',', array_map('absint', $q['post_parent__not_in']));
 			$where .= " AND {$wpdb->posts}.post_parent NOT IN ($post_parent__not_in)";
 		}
 
-		if ( $q['page_id'] ) {
-			if  ( ('page' != get_option('show_on_front') ) || ( $q['page_id'] != get_option('page_for_posts') ) ) {
+		if ($q['page_id']) {
+			if (('page' != get_option('show_on_front')) || ($q['page_id'] != get_option('page_for_posts'))) {
 				$q['p'] = $q['page_id'];
-				$where = " AND {$wpdb->posts}.ID = " . $q['page_id'];
+				$where = " AND {$wpdb->posts}.ID = ".$q['page_id'];
 			}
 		}
 
 		// If a search pattern is specified, load the posts that match.
-		if ( strlen( $q['s'] ) ) {
-			$search = $this->parse_search( $q );
+		if (strlen($q['s'])) {
+			$search = $this->parse_search($q);
 		}
 
-		if ( ! $q['suppress_filters'] ) {
+		if ( ! $q['suppress_filters']) {
 			/**
 			 * Filters the search SQL that is used in the WHERE clause of WP_Query.
 			 *
@@ -2002,36 +2002,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;
 			}
 		}
@@ -2040,22 +2040,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];
@@ -2068,156 +2068,156 @@ 
 			}
 
 			// 'cat', 'category_name', 'tag_id'
-			foreach ( $this->tax_query->queried_terms as $queried_taxonomy => $queried_items ) {
-				if ( empty( $queried_items['terms'][0] ) ) {
+			foreach ($this->tax_query->queried_terms as $queried_taxonomy => $queried_items) {
+				if (empty($queried_items['terms'][0])) {
 					continue;
 				}
 
-				if ( 'category' === $queried_taxonomy ) {
-					$the_cat = get_term_by( $queried_items['field'], $queried_items['terms'][0], 'category' );
-					if ( $the_cat ) {
-						$this->set( 'cat', $the_cat->term_id );
-						$this->set( 'category_name', $the_cat->slug );
+				if ('category' === $queried_taxonomy) {
+					$the_cat = get_term_by($queried_items['field'], $queried_items['terms'][0], 'category');
+					if ($the_cat) {
+						$this->set('cat', $the_cat->term_id);
+						$this->set('category_name', $the_cat->slug);
 					}
-					unset( $the_cat );
+					unset($the_cat);
 				}
 
-				if ( 'post_tag' === $queried_taxonomy ) {
-					$the_tag = get_term_by( $queried_items['field'], $queried_items['terms'][0], 'post_tag' );
-					if ( $the_tag ) {
-						$this->set( 'tag_id', $the_tag->term_id );
+				if ('post_tag' === $queried_taxonomy) {
+					$the_tag = get_term_by($queried_items['field'], $queried_items['terms'][0], 'post_tag');
+					if ($the_tag) {
+						$this->set('tag_id', $the_tag->term_id);
 					}
-					unset( $the_tag );
+					unset($the_tag);
 				}
 			}
 		}
 
-		if ( !empty( $this->tax_query->queries ) || !empty( $this->meta_query->queries ) ) {
+		if ( ! empty($this->tax_query->queries) || ! empty($this->meta_query->queries)) {
 			$groupby = "{$wpdb->posts}.ID";
 		}
 
 		// Author/user stuff
 
-		if ( ! empty( $q['author'] ) && $q['author'] != '0' ) {
-			$q['author'] = addslashes_gpc( '' . urldecode( $q['author'] ) );
-			$authors = array_unique( array_map( 'intval', preg_split( '/[,\s]+/', $q['author'] ) ) );
-			foreach ( $authors as $author ) {
+		if ( ! empty($q['author']) && $q['author'] != '0') {
+			$q['author'] = addslashes_gpc(''.urldecode($q['author']));
+			$authors = array_unique(array_map('intval', preg_split('/[,\s]+/', $q['author'])));
+			foreach ($authors as $author) {
 				$key = $author > 0 ? 'author__in' : 'author__not_in';
-				$q[$key][] = abs( $author );
+				$q[$key][] = abs($author);
 			}
-			$q['author'] = implode( ',', $authors );
+			$q['author'] = implode(',', $authors);
 		}
 
-		if ( ! empty( $q['author__not_in'] ) ) {
-			$author__not_in = implode( ',', array_map( 'absint', array_unique( (array) $q['author__not_in'] ) ) );
+		if ( ! empty($q['author__not_in'])) {
+			$author__not_in = implode(',', array_map('absint', array_unique((array) $q['author__not_in'])));
 			$where .= " AND {$wpdb->posts}.post_author NOT IN ($author__not_in) ";
-		} elseif ( ! empty( $q['author__in'] ) ) {
-			$author__in = implode( ',', array_map( 'absint', array_unique( (array) $q['author__in'] ) ) );
+		} elseif ( ! empty($q['author__in'])) {
+			$author__in = implode(',', array_map('absint', array_unique((array) $q['author__in'])));
 			$where .= " AND {$wpdb->posts}.post_author IN ($author__in) ";
 		}
 
 		// Author stuff for nice URLs
 
-		if ( '' != $q['author_name'] ) {
-			if ( strpos($q['author_name'], '/') !== false ) {
+		if ('' != $q['author_name']) {
+			if (strpos($q['author_name'], '/') !== false) {
 				$q['author_name'] = explode('/', $q['author_name']);
-				if ( $q['author_name'][ count($q['author_name'])-1 ] ) {
-					$q['author_name'] = $q['author_name'][count($q['author_name'])-1]; // no trailing slash
+				if ($q['author_name'][count($q['author_name']) - 1]) {
+					$q['author_name'] = $q['author_name'][count($q['author_name']) - 1]; // no trailing slash
 				} else {
-					$q['author_name'] = $q['author_name'][count($q['author_name'])-2]; // there was a trailing slash
+					$q['author_name'] = $q['author_name'][count($q['author_name']) - 2]; // there was a trailing slash
 				}
 			}
-			$q['author_name'] = sanitize_title_for_query( $q['author_name'] );
+			$q['author_name'] = sanitize_title_for_query($q['author_name']);
 			$q['author'] = get_user_by('slug', $q['author_name']);
-			if ( $q['author'] )
+			if ($q['author'])
 				$q['author'] = $q['author']->ID;
-			$whichauthor .= " AND ({$wpdb->posts}.post_author = " . absint($q['author']) . ')';
+			$whichauthor .= " AND ({$wpdb->posts}.post_author = ".absint($q['author']).')';
 		}
 
 		// MIME-Type stuff for attachment browsing
 
-		if ( isset( $q['post_mime_type'] ) && '' != $q['post_mime_type'] ) {
-			$whichmimetype = wp_post_mime_type_where( $q['post_mime_type'], $wpdb->posts );
+		if (isset($q['post_mime_type']) && '' != $q['post_mime_type']) {
+			$whichmimetype = wp_post_mime_type_where($q['post_mime_type'], $wpdb->posts);
 		}
-		$where .= $search . $whichauthor . $whichmimetype;
+		$where .= $search.$whichauthor.$whichmimetype;
 
-		if ( ! empty( $this->meta_query->queries ) ) {
-			$clauses = $this->meta_query->get_sql( 'post', $wpdb->posts, 'ID', $this );
+		if ( ! empty($this->meta_query->queries)) {
+			$clauses = $this->meta_query->get_sql('post', $wpdb->posts, 'ID', $this);
 			$join   .= $clauses['join'];
 			$where  .= $clauses['where'];
 		}
 
-		$rand = ( isset( $q['orderby'] ) && 'rand' === $q['orderby'] );
-		if ( ! isset( $q['order'] ) ) {
+		$rand = (isset($q['orderby']) && 'rand' === $q['orderby']);
+		if ( ! isset($q['order'])) {
 			$q['order'] = $rand ? '' : 'DESC';
 		} else {
-			$q['order'] = $rand ? '' : $this->parse_order( $q['order'] );
+			$q['order'] = $rand ? '' : $this->parse_order($q['order']);
 		}
 
 		// Order by.
-		if ( empty( $q['orderby'] ) ) {
+		if (empty($q['orderby'])) {
 			/*
 			 * Boolean false or empty array blanks out ORDER BY,
 			 * while leaving the value unset or otherwise empty sets the default.
 			 */
-			if ( isset( $q['orderby'] ) && ( is_array( $q['orderby'] ) || false === $q['orderby'] ) ) {
+			if (isset($q['orderby']) && (is_array($q['orderby']) || false === $q['orderby'])) {
 				$orderby = '';
 			} else {
-				$orderby = "{$wpdb->posts}.post_date " . $q['order'];
+				$orderby = "{$wpdb->posts}.post_date ".$q['order'];
 			}
-		} elseif ( 'none' == $q['orderby'] ) {
+		} elseif ('none' == $q['orderby']) {
 			$orderby = '';
-		} elseif ( $q['orderby'] == 'post__in' && ! empty( $post__in ) ) {
+		} elseif ($q['orderby'] == 'post__in' && ! empty($post__in)) {
 			$orderby = "FIELD( {$wpdb->posts}.ID, $post__in )";
-		} elseif ( $q['orderby'] == 'post_parent__in' && ! empty( $post_parent__in ) ) {
+		} elseif ($q['orderby'] == 'post_parent__in' && ! empty($post_parent__in)) {
 			$orderby = "FIELD( {$wpdb->posts}.post_parent, $post_parent__in )";
-		} elseif ( $q['orderby'] == 'post_name__in' && ! empty( $post_name__in ) ) {
+		} elseif ($q['orderby'] == 'post_name__in' && ! empty($post_name__in)) {
 			$orderby = "FIELD( {$wpdb->posts}.post_name, $post_name__in )";
 		} else {
 			$orderby_array = array();
-			if ( is_array( $q['orderby'] ) ) {
-				foreach ( $q['orderby'] as $_orderby => $order ) {
-					$orderby = addslashes_gpc( urldecode( $_orderby ) );
-					$parsed  = $this->parse_orderby( $orderby );
+			if (is_array($q['orderby'])) {
+				foreach ($q['orderby'] as $_orderby => $order) {
+					$orderby = addslashes_gpc(urldecode($_orderby));
+					$parsed  = $this->parse_orderby($orderby);
 
-					if ( ! $parsed ) {
+					if ( ! $parsed) {
 						continue;
 					}
 
-					$orderby_array[] = $parsed . ' ' . $this->parse_order( $order );
+					$orderby_array[] = $parsed.' '.$this->parse_order($order);
 				}
-				$orderby = implode( ', ', $orderby_array );
+				$orderby = implode(', ', $orderby_array);
 
 			} else {
-				$q['orderby'] = urldecode( $q['orderby'] );
-				$q['orderby'] = addslashes_gpc( $q['orderby'] );
+				$q['orderby'] = urldecode($q['orderby']);
+				$q['orderby'] = addslashes_gpc($q['orderby']);
 
-				foreach ( explode( ' ', $q['orderby'] ) as $i => $orderby ) {
-					$parsed = $this->parse_orderby( $orderby );
+				foreach (explode(' ', $q['orderby']) as $i => $orderby) {
+					$parsed = $this->parse_orderby($orderby);
 					// Only allow certain values for safety.
-					if ( ! $parsed ) {
+					if ( ! $parsed) {
 						continue;
 					}
 
 					$orderby_array[] = $parsed;
 				}
-				$orderby = implode( ' ' . $q['order'] . ', ', $orderby_array );
+				$orderby = implode(' '.$q['order'].', ', $orderby_array);
 
-				if ( empty( $orderby ) ) {
-					$orderby = "{$wpdb->posts}.post_date " . $q['order'];
-				} elseif ( ! empty( $q['order'] ) ) {
+				if (empty($orderby)) {
+					$orderby = "{$wpdb->posts}.post_date ".$q['order'];
+				} elseif ( ! empty($q['order'])) {
 					$orderby .= " {$q['order']}";
 				}
 			}
 		}
 
 		// Order search results by relevance only when another "orderby" is not specified in the query.
-		if ( ! empty( $q['s'] ) ) {
+		if ( ! empty($q['s'])) {
 			$search_orderby = '';
-			if ( ! empty( $q['search_orderby_title'] ) && ( empty( $q['orderby'] ) && ! $this->is_feed ) || ( isset( $q['orderby'] ) && 'relevance' === $q['orderby'] ) )
-				$search_orderby = $this->parse_search_order( $q );
+			if ( ! empty($q['search_orderby_title']) && (empty($q['orderby']) && ! $this->is_feed) || (isset($q['orderby']) && 'relevance' === $q['orderby']))
+				$search_orderby = $this->parse_search_order($q);
 
-			if ( ! $q['suppress_filters'] ) {
+			if ( ! $q['suppress_filters']) {
 				/**
 				 * Filters the ORDER BY used when ordering search results.
 				 *
@@ -2226,95 +2226,95 @@ 
 				 * @param string   $search_orderby The ORDER BY clause.
 				 * @param WP_Query $this           The current WP_Query instance.
 				 */
-				$search_orderby = apply_filters( 'posts_search_orderby', $search_orderby, $this );
+				$search_orderby = apply_filters('posts_search_orderby', $search_orderby, $this);
 			}
 
-			if ( $search_orderby )
-				$orderby = $orderby ? $search_orderby . ', ' . $orderby : $search_orderby;
+			if ($search_orderby)
+				$orderby = $orderby ? $search_orderby.', '.$orderby : $search_orderby;
 		}
 
-		if ( is_array( $post_type ) && count( $post_type ) > 1 ) {
+		if (is_array($post_type) && count($post_type) > 1) {
 			$post_type_cap = 'multiple_post_type';
 		} else {
-			if ( is_array( $post_type ) )
-				$post_type = reset( $post_type );
-			$post_type_object = get_post_type_object( $post_type );
-			if ( empty( $post_type_object ) )
+			if (is_array($post_type))
+				$post_type = reset($post_type);
+			$post_type_object = get_post_type_object($post_type);
+			if (empty($post_type_object))
 				$post_type_cap = $post_type;
 		}
 
-		if ( isset( $q['post_password'] ) ) {
-			$where .= $wpdb->prepare( " AND {$wpdb->posts}.post_password = %s", $q['post_password'] );
-			if ( empty( $q['perm'] ) ) {
+		if (isset($q['post_password'])) {
+			$where .= $wpdb->prepare(" AND {$wpdb->posts}.post_password = %s", $q['post_password']);
+			if (empty($q['perm'])) {
 				$q['perm'] = 'readable';
 			}
-		} elseif ( isset( $q['has_password'] ) ) {
-			$where .= sprintf( " AND {$wpdb->posts}.post_password %s ''", $q['has_password'] ? '!=' : '=' );
+		} elseif (isset($q['has_password'])) {
+			$where .= sprintf(" AND {$wpdb->posts}.post_password %s ''", $q['has_password'] ? '!=' : '=');
 		}
 
-		if ( ! empty( $q['comment_status'] ) ) {
-			$where .= $wpdb->prepare( " AND {$wpdb->posts}.comment_status = %s ", $q['comment_status'] );
+		if ( ! empty($q['comment_status'])) {
+			$where .= $wpdb->prepare(" AND {$wpdb->posts}.comment_status = %s ", $q['comment_status']);
 		}
 
-		if ( ! empty( $q['ping_status'] ) )  {
-			$where .= $wpdb->prepare( " AND {$wpdb->posts}.ping_status = %s ", $q['ping_status'] );
+		if ( ! empty($q['ping_status'])) {
+			$where .= $wpdb->prepare(" AND {$wpdb->posts}.ping_status = %s ", $q['ping_status']);
 		}
 
-		if ( 'any' == $post_type ) {
-			$in_search_post_types = get_post_types( array('exclude_from_search' => false) );
-			if ( empty( $in_search_post_types ) ) {
+		if ('any' == $post_type) {
+			$in_search_post_types = get_post_types(array('exclude_from_search' => false));
+			if (empty($in_search_post_types)) {
 				$where .= ' AND 1=0 ';
 			} else {
-				$where .= " AND {$wpdb->posts}.post_type IN ('" . join( "', '", array_map( 'esc_sql', $in_search_post_types ) ) . "')";
+				$where .= " AND {$wpdb->posts}.post_type IN ('".join("', '", array_map('esc_sql', $in_search_post_types))."')";
 			}
-		} elseif ( !empty( $post_type ) && is_array( $post_type ) ) {
-			$where .= " AND {$wpdb->posts}.post_type IN ('" . join("', '", esc_sql( $post_type ) ) . "')";
-		} elseif ( ! empty( $post_type ) ) {
-			$where .= $wpdb->prepare( " AND {$wpdb->posts}.post_type = %s", $post_type );
-			$post_type_object = get_post_type_object ( $post_type );
-		} elseif ( $this->is_attachment ) {
+		} elseif ( ! empty($post_type) && is_array($post_type)) {
+			$where .= " AND {$wpdb->posts}.post_type IN ('".join("', '", esc_sql($post_type))."')";
+		} elseif ( ! empty($post_type)) {
+			$where .= $wpdb->prepare(" AND {$wpdb->posts}.post_type = %s", $post_type);
+			$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'";
@@ -2323,62 +2323,62 @@ 
 				}
 			}
 
-			if ( empty($q['perm'] ) || 'readable' != $q['perm'] ) {
+			if (empty($q['perm']) || 'readable' != $q['perm']) {
 				$r_status = array_merge($r_status, $p_status);
 				unset($p_status);
 			}
 
-			if ( !empty($e_status) ) {
-				$statuswheres[] = "(" . join( ' AND ', $e_status ) . ")";
+			if ( ! empty($e_status)) {
+				$statuswheres[] = "(".join(' AND ', $e_status).")";
 			}
-			if ( !empty($r_status) ) {
-				if ( !empty($q['perm'] ) && 'editable' == $q['perm'] && !current_user_can($edit_others_cap) ) {
-					$statuswheres[] = "({$wpdb->posts}.post_author = $user_id " . "AND (" . join( ' OR ', $r_status ) . "))";
+			if ( ! empty($r_status)) {
+				if ( ! empty($q['perm']) && 'editable' == $q['perm'] && ! current_user_can($edit_others_cap)) {
+					$statuswheres[] = "({$wpdb->posts}.post_author = $user_id "."AND (".join(' OR ', $r_status)."))";
 				} else {
-					$statuswheres[] = "(" . join( ' OR ', $r_status ) . ")";
+					$statuswheres[] = "(".join(' OR ', $r_status).")";
 				}
 			}
-			if ( !empty($p_status) ) {
-				if ( !empty($q['perm'] ) && 'readable' == $q['perm'] && !current_user_can($read_private_cap) ) {
-					$statuswheres[] = "({$wpdb->posts}.post_author = $user_id " . "AND (" . join( ' OR ', $p_status ) . "))";
+			if ( ! empty($p_status)) {
+				if ( ! empty($q['perm']) && 'readable' == $q['perm'] && ! current_user_can($read_private_cap)) {
+					$statuswheres[] = "({$wpdb->posts}.post_author = $user_id "."AND (".join(' OR ', $p_status)."))";
 				} else {
-					$statuswheres[] = "(" . join( ' OR ', $p_status ) . ")";
+					$statuswheres[] = "(".join(' OR ', $p_status).")";
 				}
 			}
-			if ( $post_status_join ) {
+			if ($post_status_join) {
 				$join .= " LEFT JOIN {$wpdb->posts} AS p2 ON ({$wpdb->posts}.post_parent = p2.ID) ";
-				foreach ( $statuswheres as $index => $statuswhere ) {
-					$statuswheres[$index] = "($statuswhere OR ({$wpdb->posts}.post_status = 'inherit' AND " . str_replace( $wpdb->posts, 'p2', $statuswhere ) . "))";
+				foreach ($statuswheres as $index => $statuswhere) {
+					$statuswheres[$index] = "($statuswhere OR ({$wpdb->posts}.post_status = 'inherit' AND ".str_replace($wpdb->posts, 'p2', $statuswhere)."))";
 				}
 			}
-			$where_status = implode( ' OR ', $statuswheres );
-			if ( ! empty( $where_status ) ) {
+			$where_status = implode(' OR ', $statuswheres);
+			if ( ! empty($where_status)) {
 				$where .= " AND ($where_status)";
 			}
-		} elseif ( !$this->is_singular ) {
+		} elseif ( ! $this->is_singular) {
 			$where .= " AND ({$wpdb->posts}.post_status = 'publish'";
 
 			// Add public states.
-			$public_states = get_post_stati( array('public' => true) );
-			foreach ( (array) $public_states as $state ) {
-				if ( 'publish' == $state ) // Publish is hard-coded above.
+			$public_states = get_post_stati(array('public' => true));
+			foreach ((array) $public_states as $state) {
+				if ('publish' == $state) // Publish is hard-coded above.
 					continue;
 				$where .= " OR {$wpdb->posts}.post_status = '$state'";
 			}
 
-			if ( $this->is_admin ) {
+			if ($this->is_admin) {
 				// Add protected states that should show in the admin all list.
-				$admin_all_states = get_post_stati( array('protected' => true, 'show_in_admin_all_list' => true) );
-				foreach ( (array) $admin_all_states as $state ) {
+				$admin_all_states = get_post_stati(array('protected' => true, 'show_in_admin_all_list' => true));
+				foreach ((array) $admin_all_states as $state) {
 					$where .= " OR {$wpdb->posts}.post_status = '$state'";
 				}
 			}
 
-			if ( is_user_logged_in() ) {
+			if (is_user_logged_in()) {
 				// Add private states that are limited to viewing by the author of a post or someone who has caps to read private states.
-				$private_states = get_post_stati( array('private' => true) );
-				foreach ( (array) $private_states as $state ) {
-					$where .= current_user_can( $read_private_cap ) ? " OR {$wpdb->posts}.post_status = '$state'" : " OR {$wpdb->posts}.post_author = $user_id AND {$wpdb->posts}.post_status = '$state'";
+				$private_states = get_post_stati(array('private' => true));
+				foreach ((array) $private_states as $state) {
+					$where .= current_user_can($read_private_cap) ? " OR {$wpdb->posts}.post_status = '$state'" : " OR {$wpdb->posts}.post_author = $user_id AND {$wpdb->posts}.post_status = '$state'";
 				}
 			}
 
@@ -2389,7 +2389,7 @@ 
 		 * Apply filters on where and join prior to paging so that any
 		 * manipulations to them are reflected in the paging by day queries.
 		 */
-		if ( !$q['suppress_filters'] ) {
+		if ( ! $q['suppress_filters']) {
 			/**
 			 * Filters the WHERE clause of the query.
 			 *
@@ -2398,7 +2398,7 @@ 
 			 * @param string   $where The WHERE clause of the query.
 			 * @param WP_Query &$this The WP_Query instance (passed by reference).
 			 */
-			$where = apply_filters_ref_array( 'posts_where', array( $where, &$this ) );
+			$where = apply_filters_ref_array('posts_where', array($where, &$this));
 
 			/**
 			 * Filters the JOIN clause of the query.
@@ -2408,28 +2408,28 @@ 
 			 * @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', 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";
@@ -2439,7 +2439,7 @@ 
 				$cgroupby = '';
 			}
 
-			if ( !$q['suppress_filters'] ) {
+			if ( ! $q['suppress_filters']) {
 				/**
 				 * Filters the JOIN clause of the comments feed query before sending.
 				 *
@@ -2448,7 +2448,7 @@ 
 				 * @param string   $cjoin The JOIN clause of the query.
 				 * @param WP_Query &$this The WP_Query instance (passed by reference).
 				 */
-				$cjoin = apply_filters_ref_array( 'comment_feed_join', array( $cjoin, &$this ) );
+				$cjoin = apply_filters_ref_array('comment_feed_join', array($cjoin, &$this));
 
 				/**
 				 * Filters the WHERE clause of the comments feed query before sending.
@@ -2458,7 +2458,7 @@ 
 				 * @param string   $cwhere The WHERE clause of the query.
 				 * @param WP_Query &$this  The WP_Query instance (passed by reference).
 				 */
-				$cwhere = apply_filters_ref_array( 'comment_feed_where', array( $cwhere, &$this ) );
+				$cwhere = apply_filters_ref_array('comment_feed_where', array($cwhere, &$this));
 
 				/**
 				 * Filters the GROUP BY clause of the comments feed query before sending.
@@ -2468,7 +2468,7 @@ 
 				 * @param string   $cgroupby The GROUP BY clause of the query.
 				 * @param WP_Query &$this    The WP_Query instance (passed by reference).
 				 */
-				$cgroupby = apply_filters_ref_array( 'comment_feed_groupby', array( $cgroupby, &$this ) );
+				$cgroupby = apply_filters_ref_array('comment_feed_groupby', array($cgroupby, &$this));
 
 				/**
 				 * Filters the ORDER BY clause of the comments feed query before sending.
@@ -2478,7 +2478,7 @@ 
 				 * @param string   $corderby The ORDER BY clause of the query.
 				 * @param WP_Query &$this    The WP_Query instance (passed by reference).
 				 */
-				$corderby = apply_filters_ref_array( 'comment_feed_orderby', array( 'comment_date_gmt DESC', &$this ) );
+				$corderby = apply_filters_ref_array('comment_feed_orderby', array('comment_date_gmt DESC', &$this));
 
 				/**
 				 * Filters the LIMIT clause of the comments feed query before sending.
@@ -2488,37 +2488,37 @@ 
 				 * @param string   $climits The JOIN clause of the query.
 				 * @param WP_Query &$this   The WP_Query instance (passed by reference).
 				 */
-				$climits = apply_filters_ref_array( 'comment_feed_limits', array( 'LIMIT ' . get_option('posts_per_rss'), &$this ) );
+				$climits = apply_filters_ref_array('comment_feed_limits', array('LIMIT '.get_option('posts_per_rss'), &$this));
 			}
-			$cgroupby = ( ! empty( $cgroupby ) ) ? 'GROUP BY ' . $cgroupby : '';
-			$corderby = ( ! empty( $corderby ) ) ? 'ORDER BY ' . $corderby : '';
+			$cgroupby = ( ! empty($cgroupby)) ? 'GROUP BY '.$cgroupby : '';
+			$corderby = ( ! empty($corderby)) ? 'ORDER BY '.$corderby : '';
 
 			$comments = (array) $wpdb->get_results("SELECT $distinct {$wpdb->comments}.* FROM {$wpdb->comments} $cjoin $cwhere $cgroupby $corderby $climits");
 			// Convert to WP_Comment
-			$this->comments = array_map( 'get_comment', $comments );
+			$this->comments = array_map('get_comment', $comments);
 			$this->comment_count = count($this->comments);
 
 			$post_ids = array();
 
-			foreach ( $this->comments as $comment )
+			foreach ($this->comments as $comment)
 				$post_ids[] = (int) $comment->comment_post_ID;
 
 			$post_ids = join(',', $post_ids);
 			$join = '';
-			if ( $post_ids ) {
+			if ($post_ids) {
 				$where = "AND {$wpdb->posts}.ID IN ($post_ids) ";
 			} else {
 				$where = "AND 0";
 			}
 		}
 
-		$pieces = array( 'where', 'groupby', 'join', 'orderby', 'distinct', 'fields', 'limits' );
+		$pieces = array('where', 'groupby', 'join', 'orderby', 'distinct', 'fields', 'limits');
 
 		/*
 		 * Apply post-paging filters on where and join. Only plugins that
 		 * manipulate paging queries should use these hooks.
 		 */
-		if ( !$q['suppress_filters'] ) {
+		if ( ! $q['suppress_filters']) {
 			/**
 			 * Filters the WHERE clause of the query.
 			 *
@@ -2529,7 +2529,7 @@ 
 			 * @param string   $where The WHERE clause of the query.
 			 * @param WP_Query &$this The WP_Query instance (passed by reference).
 			 */
-			$where = apply_filters_ref_array( 'posts_where_paged', array( $where, &$this ) );
+			$where = apply_filters_ref_array('posts_where_paged', array($where, &$this));
 
 			/**
 			 * Filters the GROUP BY clause of the query.
@@ -2539,7 +2539,7 @@ 
 			 * @param string   $groupby The GROUP BY clause of the query.
 			 * @param WP_Query &$this   The WP_Query instance (passed by reference).
 			 */
-			$groupby = apply_filters_ref_array( 'posts_groupby', array( $groupby, &$this ) );
+			$groupby = apply_filters_ref_array('posts_groupby', array($groupby, &$this));
 
 			/**
 			 * Filters the JOIN clause of the query.
@@ -2551,7 +2551,7 @@ 
 			 * @param string   $join  The JOIN clause of the query.
 			 * @param WP_Query &$this The WP_Query instance (passed by reference).
 			 */
-			$join = apply_filters_ref_array( 'posts_join_paged', array( $join, &$this ) );
+			$join = apply_filters_ref_array('posts_join_paged', array($join, &$this));
 
 			/**
 			 * Filters the ORDER BY clause of the query.
@@ -2561,7 +2561,7 @@ 
 			 * @param string   $orderby The ORDER BY clause of the query.
 			 * @param WP_Query &$this   The WP_Query instance (passed by reference).
 			 */
-			$orderby = apply_filters_ref_array( 'posts_orderby', array( $orderby, &$this ) );
+			$orderby = apply_filters_ref_array('posts_orderby', array($orderby, &$this));
 
 			/**
 			 * Filters the DISTINCT clause of the query.
@@ -2571,7 +2571,7 @@ 
 			 * @param string   $distinct The DISTINCT clause of the query.
 			 * @param WP_Query &$this    The WP_Query instance (passed by reference).
 			 */
-			$distinct = apply_filters_ref_array( 'posts_distinct', array( $distinct, &$this ) );
+			$distinct = apply_filters_ref_array('posts_distinct', array($distinct, &$this));
 
 			/**
 			 * Filters the LIMIT clause of the query.
@@ -2581,7 +2581,7 @@ 
 			 * @param string   $limits The LIMIT clause of the query.
 			 * @param WP_Query &$this  The WP_Query instance (passed by reference).
 			 */
-			$limits = apply_filters_ref_array( 'post_limits', array( $limits, &$this ) );
+			$limits = apply_filters_ref_array('post_limits', array($limits, &$this));
 
 			/**
 			 * Filters the SELECT clause of the query.
@@ -2591,7 +2591,7 @@ 
 			 * @param string   $fields The SELECT clause of the query.
 			 * @param WP_Query &$this  The WP_Query instance (passed by reference).
 			 */
-			$fields = apply_filters_ref_array( 'posts_fields', array( $fields, &$this ) );
+			$fields = apply_filters_ref_array('posts_fields', array($fields, &$this));
 
 			/**
 			 * Filters all query clauses at once, for convenience.
@@ -2604,15 +2604,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'] : '';
 		}
 
 		/**
@@ -2624,13 +2624,13 @@ 
 		 *
 		 * @param string $selection The assembled selection query.
 		 */
-		do_action( 'posts_selection', $where . $groupby . $orderby . $limits . $join );
+		do_action('posts_selection', $where.$groupby.$orderby.$limits.$join);
 
 		/*
 		 * Filters again for the benefit of caching plugins.
 		 * Regular plugins should use the hooks above.
 		 */
-		if ( !$q['suppress_filters'] ) {
+		if ( ! $q['suppress_filters']) {
 			/**
 			 * Filters the WHERE clause of the query.
 			 *
@@ -2641,7 +2641,7 @@ 
 			 * @param string   $where The WHERE clause of the query.
 			 * @param WP_Query &$this The WP_Query instance (passed by reference).
 			 */
-			$where = apply_filters_ref_array( 'posts_where_request', array( $where, &$this ) );
+			$where = apply_filters_ref_array('posts_where_request', array($where, &$this));
 
 			/**
 			 * Filters the GROUP BY clause of the query.
@@ -2653,7 +2653,7 @@ 
 			 * @param string   $groupby The GROUP BY clause of the query.
 			 * @param WP_Query &$this   The WP_Query instance (passed by reference).
 			 */
-			$groupby = apply_filters_ref_array( 'posts_groupby_request', array( $groupby, &$this ) );
+			$groupby = apply_filters_ref_array('posts_groupby_request', array($groupby, &$this));
 
 			/**
 			 * Filters the JOIN clause of the query.
@@ -2665,7 +2665,7 @@ 
 			 * @param string   $join  The JOIN clause of the query.
 			 * @param WP_Query &$this The WP_Query instance (passed by reference).
 			 */
-			$join = apply_filters_ref_array( 'posts_join_request', array( $join, &$this ) );
+			$join = apply_filters_ref_array('posts_join_request', array($join, &$this));
 
 			/**
 			 * Filters the ORDER BY clause of the query.
@@ -2677,7 +2677,7 @@ 
 			 * @param string   $orderby The ORDER BY clause of the query.
 			 * @param WP_Query &$this   The WP_Query instance (passed by reference).
 			 */
-			$orderby = apply_filters_ref_array( 'posts_orderby_request', array( $orderby, &$this ) );
+			$orderby = apply_filters_ref_array('posts_orderby_request', array($orderby, &$this));
 
 			/**
 			 * Filters the DISTINCT clause of the query.
@@ -2689,7 +2689,7 @@ 
 			 * @param string   $distinct The DISTINCT clause of the query.
 			 * @param WP_Query &$this    The WP_Query instance (passed by reference).
 			 */
-			$distinct = apply_filters_ref_array( 'posts_distinct_request', array( $distinct, &$this ) );
+			$distinct = apply_filters_ref_array('posts_distinct_request', array($distinct, &$this));
 
 			/**
 			 * Filters the SELECT clause of the query.
@@ -2701,7 +2701,7 @@ 
 			 * @param string   $fields The SELECT clause of the query.
 			 * @param WP_Query &$this  The WP_Query instance (passed by reference).
 			 */
-			$fields = apply_filters_ref_array( 'posts_fields_request', array( $fields, &$this ) );
+			$fields = apply_filters_ref_array('posts_fields_request', array($fields, &$this));
 
 			/**
 			 * Filters the LIMIT clause of the query.
@@ -2713,7 +2713,7 @@ 
 			 * @param string   $limits The LIMIT clause of the query.
 			 * @param WP_Query &$this  The WP_Query instance (passed by reference).
 			 */
-			$limits = apply_filters_ref_array( 'post_limits_request', array( $limits, &$this ) );
+			$limits = apply_filters_ref_array('post_limits_request', array($limits, &$this));
 
 			/**
 			 * Filters all query clauses at once, for convenience.
@@ -2728,29 +2728,29 @@ 
 			 * @param array    $pieces The pieces of the query.
 			 * @param WP_Query &$this  The WP_Query instance (passed by reference).
 			 */
-			$clauses = (array) apply_filters_ref_array( 'posts_clauses_request', array( compact( $pieces ), &$this ) );
-
-			$where = isset( $clauses[ 'where' ] ) ? $clauses[ 'where' ] : '';
-			$groupby = isset( $clauses[ 'groupby' ] ) ? $clauses[ 'groupby' ] : '';
-			$join = isset( $clauses[ 'join' ] ) ? $clauses[ 'join' ] : '';
-			$orderby = isset( $clauses[ 'orderby' ] ) ? $clauses[ 'orderby' ] : '';
-			$distinct = isset( $clauses[ 'distinct' ] ) ? $clauses[ 'distinct' ] : '';
-			$fields = isset( $clauses[ 'fields' ] ) ? $clauses[ 'fields' ] : '';
-			$limits = isset( $clauses[ 'limits' ] ) ? $clauses[ 'limits' ] : '';
+			$clauses = (array) apply_filters_ref_array('posts_clauses_request', array(compact($pieces), &$this));
+
+			$where = isset($clauses['where']) ? $clauses['where'] : '';
+			$groupby = isset($clauses['groupby']) ? $clauses['groupby'] : '';
+			$join = isset($clauses['join']) ? $clauses['join'] : '';
+			$orderby = isset($clauses['orderby']) ? $clauses['orderby'] : '';
+			$distinct = isset($clauses['distinct']) ? $clauses['distinct'] : '';
+			$fields = isset($clauses['fields']) ? $clauses['fields'] : '';
+			$limits = isset($clauses['limits']) ? $clauses['limits'] : '';
 		}
 
-		if ( ! empty($groupby) )
-			$groupby = 'GROUP BY ' . $groupby;
-		if ( !empty( $orderby ) )
-			$orderby = 'ORDER BY ' . $orderby;
+		if ( ! empty($groupby))
+			$groupby = 'GROUP BY '.$groupby;
+		if ( ! empty($orderby))
+			$orderby = 'ORDER BY '.$orderby;
 
 		$found_rows = '';
-		if ( !$q['no_found_rows'] && !empty($limits) )
+		if ( ! $q['no_found_rows'] && ! empty($limits))
 			$found_rows = 'SQL_CALC_FOUND_ROWS';
 
 		$this->request = $old_request = "SELECT $found_rows $distinct $fields FROM {$wpdb->posts} $join WHERE 1=1 $where $groupby $orderby $limits";
 
-		if ( !$q['suppress_filters'] ) {
+		if ( ! $q['suppress_filters']) {
 			/**
 			 * Filters the completed SQL query before sending.
 			 *
@@ -2759,7 +2759,7 @@ 
 			 * @param string   $request The complete SQL query.
 			 * @param WP_Query &$this   The WP_Query instance (passed by reference).
 			 */
-			$this->request = apply_filters_ref_array( 'posts_request', array( $this->request, &$this ) );
+			$this->request = apply_filters_ref_array('posts_request', array($this->request, &$this));
 		}
 
 		/**
@@ -2778,41 +2778,41 @@ 
 		 *                          or null to allow WP to run its normal queries.
 		 * @param WP_Query   $this  The WP_Query instance, passed by reference.
 		 */
-		$this->posts = apply_filters_ref_array( 'posts_pre_query', array( null, &$this ) );
+		$this->posts = apply_filters_ref_array('posts_pre_query', array(null, &$this));
 
-		if ( 'ids' == $q['fields'] ) {
-			if ( null === $this->posts ) {
-				$this->posts = $wpdb->get_col( $this->request );
+		if ('ids' == $q['fields']) {
+			if (null === $this->posts) {
+				$this->posts = $wpdb->get_col($this->request);
 			}
 
-			$this->posts = array_map( 'intval', $this->posts );
-			$this->post_count = count( $this->posts );
-			$this->set_found_posts( $q, $limits );
+			$this->posts = array_map('intval', $this->posts);
+			$this->post_count = count($this->posts);
+			$this->set_found_posts($q, $limits);
 
 			return $this->posts;
 		}
 
-		if ( 'id=>parent' == $q['fields'] ) {
-			if ( null === $this->posts ) {
-				$this->posts = $wpdb->get_results( $this->request );
+		if ('id=>parent' == $q['fields']) {
+			if (null === $this->posts) {
+				$this->posts = $wpdb->get_results($this->request);
 			}
 
-			$this->post_count = count( $this->posts );
-			$this->set_found_posts( $q, $limits );
+			$this->post_count = count($this->posts);
+			$this->set_found_posts($q, $limits);
 
 			$r = array();
-			foreach ( $this->posts as $key => $post ) {
-				$this->posts[ $key ]->ID = (int) $post->ID;
-				$this->posts[ $key ]->post_parent = (int) $post->post_parent;
+			foreach ($this->posts as $key => $post) {
+				$this->posts[$key]->ID = (int) $post->ID;
+				$this->posts[$key]->post_parent = (int) $post->post_parent;
 
-				$r[ (int) $post->ID ] = (int) $post->post_parent;
+				$r[(int) $post->ID] = (int) $post->post_parent;
 			}
 
 			return $r;
 		}
 
-		if ( null === $this->posts ) {
-			$split_the_query = ( $old_request == $this->request && "{$wpdb->posts}.*" == $fields && !empty( $limits ) && $q['posts_per_page'] < 500 );
+		if (null === $this->posts) {
+			$split_the_query = ($old_request == $this->request && "{$wpdb->posts}.*" == $fields && ! empty($limits) && $q['posts_per_page'] < 500);
 
 			/**
 			 * Filters whether to split the query.
@@ -2826,9 +2826,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";
@@ -2841,29 +2841,29 @@ 
 				 * @param string   $request The post ID request.
 				 * @param WP_Query $this    The WP_Query instance.
 				 */
-				$this->request = apply_filters( 'posts_request_ids', $this->request, $this );
+				$this->request = apply_filters('posts_request_ids', $this->request, $this);
 
-				$ids = $wpdb->get_col( $this->request );
+				$ids = $wpdb->get_col($this->request);
 
-				if ( $ids ) {
+				if ($ids) {
 					$this->posts = $ids;
-					$this->set_found_posts( $q, $limits );
-					_prime_post_caches( $ids, $q['update_post_term_cache'], $q['update_post_meta_cache'] );
+					$this->set_found_posts($q, $limits);
+					_prime_post_caches($ids, $q['update_post_term_cache'], $q['update_post_meta_cache']);
 				} else {
 					$this->posts = array();
 				}
 			} else {
-				$this->posts = $wpdb->get_results( $this->request );
-				$this->set_found_posts( $q, $limits );
+				$this->posts = $wpdb->get_results($this->request);
+				$this->set_found_posts($q, $limits);
 			}
 		}
 
 		// Convert to WP_Post objects.
-		if ( $this->posts ) {
-			$this->posts = array_map( 'get_post', $this->posts );
+		if ($this->posts) {
+			$this->posts = array_map('get_post', $this->posts);
 		}
 
-		if ( ! $q['suppress_filters'] ) {
+		if ( ! $q['suppress_filters']) {
 			/**
 			 * Filters the raw post results array, prior to status checks.
 			 *
@@ -2872,38 +2872,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;
@@ -2911,23 +2911,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();
@@ -2935,7 +2935,7 @@ 
 				}
 			}
 
-			if ( $this->is_preview && $this->posts && current_user_can( $edit_cap, $this->posts[0]->ID ) ) {
+			if ($this->is_preview && $this->posts && current_user_can($edit_cap, $this->posts[0]->ID)) {
 				/**
 				 * Filters the single post for preview mode.
 				 *
@@ -2944,18 +2944,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);
@@ -2965,36 +2965,36 @@ 
 					$sticky_offset++;
 					// Remove post from sticky posts array
 					$offset = array_search($sticky_post->ID, $sticky_posts);
-					unset( $sticky_posts[$offset] );
+					unset($sticky_posts[$offset]);
 				}
 			}
 
 			// If any posts have been excluded specifically, Ignore those that are sticky.
-			if ( !empty($sticky_posts) && !empty($q['post__not_in']) )
+			if ( ! empty($sticky_posts) && ! empty($q['post__not_in']))
 				$sticky_posts = array_diff($sticky_posts, $q['post__not_in']);
 
 			// Fetch sticky posts that weren't in the query results
-			if ( !empty($sticky_posts) ) {
-				$stickies = get_posts( array(
+			if ( ! empty($sticky_posts)) {
+				$stickies = get_posts(array(
 					'post__in' => $sticky_posts,
 					'post_type' => $post_type,
 					'post_status' => 'publish',
 					'nopaging' => true
-				) );
+				));
 
-				foreach ( $stickies as $sticky_post ) {
-					array_splice( $this->posts, $sticky_offset, 0, array( $sticky_post ) );
+				foreach ($stickies as $sticky_post) {
+					array_splice($this->posts, $sticky_offset, 0, array($sticky_post));
 					$sticky_offset++;
 				}
 			}
 		}
 
 		// If comments have been fetched as part of the query, make sure comment meta lazy-loading is set up.
-		if ( ! empty( $this->comments ) ) {
-			wp_queue_comments_for_comment_meta_lazyload( $this->comments );
+		if ( ! empty($this->comments)) {
+			wp_queue_comments_for_comment_meta_lazyload($this->comments);
 		}
 
-		if ( ! $q['suppress_filters'] ) {
+		if ( ! $q['suppress_filters']) {
 			/**
 			 * Filters the array of retrieved posts after they've been fetched and
 			 * internally processed.
@@ -3004,27 +3004,27 @@ 
 			 * @param array    $posts The array of retrieved posts.
 			 * @param WP_Query &$this The WP_Query instance (passed by reference).
 			 */
-			$this->posts = apply_filters_ref_array( 'the_posts', array( $this->posts, &$this ) );
+			$this->posts = apply_filters_ref_array('the_posts', array($this->posts, &$this));
 		}
 
 		// Ensure that any posts added/modified via one of the filters above are
 		// of the type WP_Post and are filtered.
-		if ( $this->posts ) {
-			$this->post_count = count( $this->posts );
+		if ($this->posts) {
+			$this->post_count = count($this->posts);
 
-			$this->posts = array_map( 'get_post', $this->posts );
+			$this->posts = array_map('get_post', $this->posts);
 
-			if ( $q['cache_results'] )
+			if ($q['cache_results'])
 				update_post_caches($this->posts, $post_type, $q['update_post_term_cache'], $q['update_post_meta_cache']);
 
-			$this->post = reset( $this->posts );
+			$this->post = reset($this->posts);
 		} else {
 			$this->post_count = 0;
 			$this->posts = array();
 		}
 
-		if ( $q['lazy_load_term_meta'] ) {
-			wp_queue_posts_for_term_meta_lazyload( $this->posts );
+		if ($q['lazy_load_term_meta']) {
+			wp_queue_posts_for_term_meta_lazyload($this->posts);
 		}
 
 		return $this->posts;
@@ -3040,14 +3040,14 @@ 
 	 * @param array  $q      Query variables.
 	 * @param string $limits LIMIT clauses of the query.
 	 */
-	private function set_found_posts( $q, $limits ) {
+	private function set_found_posts($q, $limits) {
 		global $wpdb;
 		// Bail if posts is an empty array. Continue if posts is an empty string,
 		// null, or false to accommodate caching plugins that fill posts later.
-		if ( $q['no_found_rows'] || ( is_array( $this->posts ) && ! $this->posts ) )
+		if ($q['no_found_rows'] || (is_array($this->posts) && ! $this->posts))
 			return;
 
-		if ( ! empty( $limits ) ) {
+		if ( ! empty($limits)) {
 			/**
 			 * Filters the query to run for retrieving the found posts.
 			 *
@@ -3056,9 +3056,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);
 		}
 
 		/**
@@ -3069,10 +3069,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']);
 	}
 
 	/**
@@ -3106,7 +3106,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.
 			 *
@@ -3114,10 +3114,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);
 	}
 
 	/**
@@ -3131,9 +3131,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.
 			 *
@@ -3141,7 +3141,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();
 		}
@@ -3158,7 +3158,7 @@ 
 	 */
 	public function rewind_posts() {
 		$this->current_post = -1;
-		if ( $this->post_count > 0 ) {
+		if ($this->post_count > 0) {
 			$this->post = $this->posts[0];
 		}
 	}
@@ -3190,13 +3190,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');
 		}
 	}
 
@@ -3211,9 +3211,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();
 		}
 
@@ -3228,7 +3228,7 @@ 
 	 */
 	public function rewind_comments() {
 		$this->current_comment = -1;
-		if ( $this->comment_count > 0 ) {
+		if ($this->comment_count > 0) {
 			$this->comment = $this->comments[0];
 		}
 	}
@@ -3242,9 +3242,9 @@ 
 	 * @param string|array $query URL query string or array of query arguments.
 	 * @return array List of posts.
 	 */
-	public function query( $query ) {
+	public function query($query) {
 		$this->init();
-		$this->query = $this->query_vars = wp_parse_args( $query );
+		$this->query = $this->query_vars = wp_parse_args($query);
 		return $this->get_posts();
 	}
 
@@ -3261,64 +3261,64 @@ 
 	 * @return object
 	 */
 	public function get_queried_object() {
-		if ( isset($this->queried_object) )
+		if (isset($this->queried_object))
 			return $this->queried_object;
 
 		$this->queried_object = null;
 		$this->queried_object_id = null;
 
-		if ( $this->is_category || $this->is_tag || $this->is_tax ) {
-			if ( $this->is_category ) {
-				if ( $this->get( 'cat' ) ) {
-					$term = get_term( $this->get( 'cat' ), 'category' );
-				} elseif ( $this->get( 'category_name' ) ) {
-					$term = get_term_by( 'slug', $this->get( 'category_name' ), 'category' );
+		if ($this->is_category || $this->is_tag || $this->is_tax) {
+			if ($this->is_category) {
+				if ($this->get('cat')) {
+					$term = get_term($this->get('cat'), 'category');
+				} elseif ($this->get('category_name')) {
+					$term = get_term_by('slug', $this->get('category_name'), 'category');
 				}
-			} elseif ( $this->is_tag ) {
-				if ( $this->get( 'tag_id' ) ) {
-					$term = get_term( $this->get( 'tag_id' ), 'post_tag' );
-				} elseif ( $this->get( 'tag' ) ) {
-					$term = get_term_by( 'slug', $this->get( 'tag' ), 'post_tag' );
+			} elseif ($this->is_tag) {
+				if ($this->get('tag_id')) {
+					$term = get_term($this->get('tag_id'), 'post_tag');
+				} elseif ($this->get('tag')) {
+					$term = get_term_by('slug', $this->get('tag'), 'post_tag');
 				}
 			} else {
 				// For other tax queries, grab the first term from the first clause.
-				if ( ! empty( $this->tax_query->queried_terms ) ) {
-					$queried_taxonomies = array_keys( $this->tax_query->queried_terms );
-					$matched_taxonomy = reset( $queried_taxonomies );
-					$query = $this->tax_query->queried_terms[ $matched_taxonomy ];
-
-					if ( ! empty( $query['terms'] ) ) {
-						if ( 'term_id' == $query['field'] ) {
-							$term = get_term( reset( $query['terms'] ), $matched_taxonomy );
+				if ( ! empty($this->tax_query->queried_terms)) {
+					$queried_taxonomies = array_keys($this->tax_query->queried_terms);
+					$matched_taxonomy = reset($queried_taxonomies);
+					$query = $this->tax_query->queried_terms[$matched_taxonomy];
+
+					if ( ! empty($query['terms'])) {
+						if ('term_id' == $query['field']) {
+							$term = get_term(reset($query['terms']), $matched_taxonomy);
 						} else {
-							$term = get_term_by( $query['field'], reset( $query['terms'] ), $matched_taxonomy );
+							$term = get_term_by($query['field'], reset($query['terms']), $matched_taxonomy);
 						}
 					}
 				}
 			}
 
-			if ( ! empty( $term ) && ! is_wp_error( $term ) )  {
+			if ( ! empty($term) && ! is_wp_error($term)) {
 				$this->queried_object = $term;
 				$this->queried_object_id = (int) $term->term_id;
 
-				if ( $this->is_category && 'category' === $this->queried_object->taxonomy )
-					_make_cat_compat( $this->queried_object );
+				if ($this->is_category && 'category' === $this->queried_object->taxonomy)
+					_make_cat_compat($this->queried_object);
 			}
-		} elseif ( $this->is_post_type_archive ) {
-			$post_type = $this->get( 'post_type' );
-			if ( is_array( $post_type ) )
-				$post_type = reset( $post_type );
-			$this->queried_object = get_post_type_object( $post_type );
-		} elseif ( $this->is_posts_page ) {
+		} elseif ($this->is_post_type_archive) {
+			$post_type = $this->get('post_type');
+			if (is_array($post_type))
+				$post_type = reset($post_type);
+			$this->queried_object = get_post_type_object($post_type);
+		} elseif ($this->is_posts_page) {
 			$page_for_posts = get_option('page_for_posts');
-			$this->queried_object = get_post( $page_for_posts );
+			$this->queried_object = get_post($page_for_posts);
 			$this->queried_object_id = (int) $this->queried_object->ID;
-		} elseif ( $this->is_singular && ! empty( $this->post ) ) {
+		} elseif ($this->is_singular && ! empty($this->post)) {
 			$this->queried_object = $this->post;
 			$this->queried_object_id = (int) $this->post->ID;
-		} elseif ( $this->is_author ) {
+		} elseif ($this->is_author) {
 			$this->queried_object_id = (int) $this->get('author');
-			$this->queried_object = get_userdata( $this->queried_object_id );
+			$this->queried_object = get_userdata($this->queried_object_id);
 		}
 
 		return $this->queried_object;
@@ -3335,7 +3335,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;
 		}
 
@@ -3352,9 +3352,9 @@ 
 	 *
 	 * @param string|array $query URL query string or array of vars.
 	 */
-	public function __construct( $query = '' ) {
-		if ( ! empty( $query ) ) {
-			$this->query( $query );
+	public function __construct($query = '') {
+		if ( ! empty($query)) {
+			$this->query($query);
 		}
 	}
 
@@ -3367,8 +3367,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;
 		}
 	}
@@ -3382,9 +3382,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);
 		}
 	}
 
@@ -3398,9 +3398,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;
 	}
@@ -3426,16 +3426,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);
 	}
 
 	/**
@@ -3446,24 +3446,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;
@@ -3480,22 +3480,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;
@@ -3512,22 +3512,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;
@@ -3544,22 +3544,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;
@@ -3583,32 +3583,32 @@ 
 	 * @param mixed $term     Optional. Term ID, name, slug or array of Term IDs, names, and slugs.
 	 * @return bool True for custom taxonomy archive pages, false for built-in taxonomies (category and tag archives).
 	 */
-	public function is_tax( $taxonomy = '', $term = '' ) {
+	public function is_tax($taxonomy = '', $term = '') {
 		global $wp_taxonomies;
 
-		if ( !$this->is_tax )
+		if ( ! $this->is_tax)
 			return false;
 
-		if ( empty( $taxonomy ) )
+		if (empty($taxonomy))
 			return true;
 
 		$queried_object = $this->get_queried_object();
-		$tax_array = array_intersect( array_keys( $wp_taxonomies ), (array) $taxonomy );
+		$tax_array = array_intersect(array_keys($wp_taxonomies), (array) $taxonomy);
 		$term_array = (array) $term;
 
 		// Check that the taxonomy matches.
-		if ( ! ( isset( $queried_object->taxonomy ) && count( $tax_array ) && in_array( $queried_object->taxonomy, $tax_array ) ) )
+		if ( ! (isset($queried_object->taxonomy) && count($tax_array) && in_array($queried_object->taxonomy, $tax_array)))
 			return false;
 
 		// Only a Taxonomy provided.
-		if ( empty( $term ) )
+		if (empty($term))
 			return true;
 
-		return isset( $queried_object->term_id ) &&
-			count( array_intersect(
-				array( $queried_object->term_id, $queried_object->name, $queried_object->slug ),
+		return isset($queried_object->term_id) &&
+			count(array_intersect(
+				array($queried_object->term_id, $queried_object->name, $queried_object->slug),
 				$term_array
-			) );
+			));
 	}
 
 	/**
@@ -3620,7 +3620,7 @@ 
 	 * @return bool
 	 */
 	public function is_comments_popup() {
-		_deprecated_function( __FUNCTION__, '4.5.0' );
+		_deprecated_function(__FUNCTION__, '4.5.0');
 
 		return false;
 	}
@@ -3655,13 +3655,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);
 	}
 
 	/**
@@ -3693,9 +3693,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;
@@ -3746,31 +3746,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;
 				}
 			}
@@ -3839,31 +3839,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;
 				}
 			}
@@ -3886,13 +3886,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);
 	}
 
 	/**
@@ -3983,14 +3983,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;
 		}
 
@@ -4002,35 +4002,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);
 		}
 
 		/**
@@ -4045,12 +4045,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;
@@ -4067,7 +4067,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;
 	}
@@ -4080,9 +4080,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);
 		}
 	}
 
@@ -4096,8 +4096,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;
 	}
 
@@ -4111,8 +4111,8 @@ 
 	 * @param int   $comment_id
 	 * @return mixed
 	 */
-	public function lazyload_comment_meta( $check, $comment_id ) {
-		_deprecated_function( __METHOD__, '4.5.0' );
+	public function lazyload_comment_meta($check, $comment_id) {
+		_deprecated_function(__METHOD__, '4.5.0');
 		return $check;
 	}
 }

Braces +355 added lines, -242 removed lines

@@ -613,8 +613,9 @@ 
 		);
 
 		foreach ( $keys as $key ) {
-			if ( !isset($array[$key]) )
-				$array[$key] = '';
+			if ( !isset($array[$key]) ) {
+							$array[$key] = '';
+			}
 		}
 
 		$array_keys = array( 'category__in', 'category__not_in', 'category__and', 'post__in', 'post__not_in', 'post_name__in',
@@ -622,8 +623,9 @@ 
 			'author__in', 'author__not_in' );
 
 		foreach ( $array_keys as $key ) {
-			if ( !isset($array[$key]) )
-				$array[$key] = array();
+			if ( !isset($array[$key]) ) {
+							$array[$key] = array();
+			}
 		}
 		return $array;
 	}
@@ -762,8 +764,9 @@ 
 		$qv = &$this->query_vars;
 		$this->query_vars_changed = true;
 
-		if ( ! empty($qv['robots']) )
-			$this->is_robots = true;
+		if ( ! empty($qv['robots']) ) {
+					$this->is_robots = true;
+		}
 
 		if ( ! is_scalar( $qv['p'] ) || $qv['p'] < 0 ) {
 			$qv['p'] = 0;
@@ -784,10 +787,18 @@ 
 		$qv['pagename'] = trim( $qv['pagename'] );
 		$qv['name'] = trim( $qv['name'] );
 		$qv['title'] = trim( $qv['title'] );
-		if ( '' !== $qv['hour'] ) $qv['hour'] = absint($qv['hour']);
-		if ( '' !== $qv['minute'] ) $qv['minute'] = absint($qv['minute']);
-		if ( '' !== $qv['second'] ) $qv['second'] = absint($qv['second']);
-		if ( '' !== $qv['menu_order'] ) $qv['menu_order'] = absint($qv['menu_order']);
+		if ( '' !== $qv['hour'] ) {
+			$qv['hour'] = absint($qv['hour']);
+		}
+		if ( '' !== $qv['minute'] ) {
+			$qv['minute'] = absint($qv['minute']);
+		}
+		if ( '' !== $qv['second'] ) {
+			$qv['second'] = absint($qv['second']);
+		}
+		if ( '' !== $qv['menu_order'] ) {
+			$qv['menu_order'] = absint($qv['menu_order']);
+		}
 
 		// Fairly insane upper bound for search string lengths.
 		if ( ! is_scalar( $qv['s'] ) || ( ! empty( $qv['s'] ) && strlen( $qv['s'] ) > 1600 ) ) {
@@ -795,10 +806,12 @@ 
 		}
 
 		// Compat. Map subpost to attachment.
-		if ( '' != $qv['subpost'] )
-			$qv['attachment'] = $qv['subpost'];
-		if ( '' != $qv['subpost_id'] )
-			$qv['attachment_id'] = $qv['subpost_id'];
+		if ( '' != $qv['subpost'] ) {
+					$qv['attachment'] = $qv['subpost'];
+		}
+		if ( '' != $qv['subpost_id'] ) {
+					$qv['attachment_id'] = $qv['subpost_id'];
+		}
 
 		$qv['attachment_id'] = absint($qv['attachment_id']);
 
@@ -914,38 +927,46 @@ 
 				$this->is_author = true;
 			}
 
-			if ( '' != $qv['author_name'] )
-				$this->is_author = true;
+			if ( '' != $qv['author_name'] ) {
+							$this->is_author = true;
+			}
 
 			if ( !empty( $qv['post_type'] ) && ! is_array( $qv['post_type'] ) ) {
 				$post_type_obj = get_post_type_object( $qv['post_type'] );
-				if ( ! empty( $post_type_obj->has_archive ) )
-					$this->is_post_type_archive = true;
+				if ( ! empty( $post_type_obj->has_archive ) ) {
+									$this->is_post_type_archive = true;
+				}
 			}
 
-			if ( $this->is_post_type_archive || $this->is_date || $this->is_author || $this->is_category || $this->is_tag || $this->is_tax )
-				$this->is_archive = true;
+			if ( $this->is_post_type_archive || $this->is_date || $this->is_author || $this->is_category || $this->is_tag || $this->is_tax ) {
+							$this->is_archive = true;
+			}
 		}
 
-		if ( '' != $qv['feed'] )
-			$this->is_feed = true;
+		if ( '' != $qv['feed'] ) {
+					$this->is_feed = true;
+		}
 
 		if ( '' != $qv['embed'] ) {
 			$this->is_embed = true;
 		}
 
-		if ( '' != $qv['tb'] )
-			$this->is_trackback = true;
+		if ( '' != $qv['tb'] ) {
+					$this->is_trackback = true;
+		}
 
-		if ( '' != $qv['paged'] && ( intval($qv['paged']) > 1 ) )
-			$this->is_paged = true;
+		if ( '' != $qv['paged'] && ( intval($qv['paged']) > 1 ) ) {
+					$this->is_paged = true;
+		}
 
 		// if we're previewing inside the write screen
-		if ( '' != $qv['preview'] )
-			$this->is_preview = true;
+		if ( '' != $qv['preview'] ) {
+					$this->is_preview = true;
+		}
 
-		if ( is_admin() )
-			$this->is_admin = true;
+		if ( is_admin() ) {
+					$this->is_admin = true;
+		}
 
 		if ( false !== strpos($qv['feed'], 'comments-') ) {
 			$qv['feed'] = str_replace('comments-', '', $qv['feed']);
@@ -954,18 +975,21 @@ 
 
 		$this->is_singular = $this->is_single || $this->is_page || $this->is_attachment;
 
-		if ( $this->is_feed && ( !empty($qv['withcomments']) || ( empty($qv['withoutcomments']) && $this->is_singular ) ) )
-			$this->is_comment_feed = true;
+		if ( $this->is_feed && ( !empty($qv['withcomments']) || ( empty($qv['withoutcomments']) && $this->is_singular ) ) ) {
+					$this->is_comment_feed = true;
+		}
 
-		if ( !( $this->is_singular || $this->is_archive || $this->is_search || $this->is_feed || ( defined( 'REST_REQUEST' ) && REST_REQUEST ) || $this->is_trackback || $this->is_404 || $this->is_admin || $this->is_robots ) )
-			$this->is_home = true;
+		if ( !( $this->is_singular || $this->is_archive || $this->is_search || $this->is_feed || ( defined( 'REST_REQUEST' ) && REST_REQUEST ) || $this->is_trackback || $this->is_404 || $this->is_admin || $this->is_robots ) ) {
+					$this->is_home = true;
+		}
 
 		// Correct is_* for page_on_front and page_for_posts
 		if ( $this->is_home && 'page' == get_option('show_on_front') && get_option('page_on_front') ) {
 			$_query = wp_parse_args($this->query);
 			// pagename can be set and empty depending on matched rewrite rules. Ignore an empty pagename.
-			if ( isset($_query['pagename']) && '' == $_query['pagename'] )
-				unset($_query['pagename']);
+			if ( isset($_query['pagename']) && '' == $_query['pagename'] ) {
+							unset($_query['pagename']);
+			}
 
 			unset( $_query['embed'] );
 
@@ -1018,27 +1042,31 @@ 
 		}
 
 		if ( !empty($qv['post_type']) ) {
-			if ( is_array($qv['post_type']) )
-				$qv['post_type'] = array_map('sanitize_key', $qv['post_type']);
-			else
-				$qv['post_type'] = sanitize_key($qv['post_type']);
+			if ( is_array($qv['post_type']) ) {
+							$qv['post_type'] = array_map('sanitize_key', $qv['post_type']);
+			} else {
+							$qv['post_type'] = sanitize_key($qv['post_type']);
+			}
 		}
 
 		if ( ! empty( $qv['post_status'] ) ) {
-			if ( is_array( $qv['post_status'] ) )
-				$qv['post_status'] = array_map('sanitize_key', $qv['post_status']);
-			else
-				$qv['post_status'] = preg_replace('|[^a-z0-9_,-]|', '', $qv['post_status']);
+			if ( is_array( $qv['post_status'] ) ) {
+							$qv['post_status'] = array_map('sanitize_key', $qv['post_status']);
+			} else {
+							$qv['post_status'] = preg_replace('|[^a-z0-9_,-]|', '', $qv['post_status']);
+			}
 		}
 
-		if ( $this->is_posts_page && ( ! isset($qv['withcomments']) || ! $qv['withcomments'] ) )
-			$this->is_comment_feed = false;
+		if ( $this->is_posts_page && ( ! isset($qv['withcomments']) || ! $qv['withcomments'] ) ) {
+					$this->is_comment_feed = false;
+		}
 
 		$this->is_singular = $this->is_single || $this->is_page || $this->is_attachment;
 		// Done correcting is_* for page_on_front and page_for_posts
 
-		if ( '404' == $qv['error'] )
-			$this->set_404();
+		if ( '404' == $qv['error'] ) {
+					$this->set_404();
+		}
 
 		$this->is_embed = $this->is_embed && ( $this->is_singular || $this->is_404 );
 
@@ -1081,8 +1109,10 @@ 
 		}
 
 		foreach ( get_taxonomies( array() , 'objects' ) as $taxonomy => $t ) {
-			if ( 'post_tag' == $taxonomy )
-				continue;	// Handled further down in the $q['tag'] block
+			if ( 'post_tag' == $taxonomy ) {
+							continue;
+			}
+			// Handled further down in the $q['tag'] block
 
 			if ( $t->query_var && !empty( $q[$t->query_var] ) ) {
 				$tax_query_defaults = array(
@@ -1129,10 +1159,11 @@ 
 			$q['cat'] = implode( ',', $cat_array );
 
 			foreach ( $cat_array as $cat ) {
-				if ( $cat > 0 )
-					$cat_in[] = $cat;
-				elseif ( $cat < 0 )
-					$cat_not_in[] = abs( $cat );
+				if ( $cat > 0 ) {
+									$cat_in[] = $cat;
+				} elseif ( $cat < 0 ) {
+									$cat_not_in[] = abs( $cat );
+				}
 			}
 
 			if ( ! empty( $cat_in ) ) {
@@ -1158,8 +1189,9 @@ 
 
 		if ( ! empty( $q['category__and'] ) && 1 === count( (array) $q['category__and'] ) ) {
 			$q['category__and'] = (array) $q['category__and'];
-			if ( ! isset( $q['category__in'] ) )
-				$q['category__in'] = array();
+			if ( ! isset( $q['category__in'] ) ) {
+							$q['category__in'] = array();
+			}
 			$q['category__in'][] = absint( reset( $q['category__and'] ) );
 			unset( $q['category__and'] );
 		}
@@ -1300,8 +1332,9 @@ 
 
 		// added slashes screw with quote grouping when done early, so done later
 		$q['s'] = stripslashes( $q['s'] );
-		if ( empty( $_GET['s'] ) && $this->is_main_query() )
-			$q['s'] = urldecode( $q['s'] );
+		if ( empty( $_GET['s'] ) && $this->is_main_query() ) {
+					$q['s'] = urldecode( $q['s'] );
+		}
 		// there are no line breaks in <input /> fields
 		$q['s'] = str_replace( array( "\r", "\n" ), '', $q['s'] );
 		$q['search_terms_count'] = 1;
@@ -1312,8 +1345,9 @@ 
 				$q['search_terms_count'] = count( $matches[0] );
 				$q['search_terms'] = $this->parse_search_terms( $matches[0] );
 				// if the search string has only short terms or stopwords, or is 10+ terms long, match it as sentence
-				if ( empty( $q['search_terms'] ) || count( $q['search_terms'] ) > 9 )
-					$q['search_terms'] = array( $q['s'] );
+				if ( empty( $q['search_terms'] ) || count( $q['search_terms'] ) > 9 ) {
+									$q['search_terms'] = array( $q['s'] );
+				}
 			} else {
 				$q['search_terms'] = array( $q['s'] );
 			}
@@ -1385,17 +1419,20 @@ 
 
 		foreach ( $terms as $term ) {
 			// keep before/after spaces when term is for exact match
-			if ( preg_match( '/^".+"$/', $term ) )
-				$term = trim( $term, "\"'" );
-			else
-				$term = trim( $term, "\"' " );
+			if ( preg_match( '/^".+"$/', $term ) ) {
+							$term = trim( $term, "\"'" );
+			} else {
+							$term = trim( $term, "\"' " );
+			}
 
 			// Avoid single A-Z and single dashes.
-			if ( ! $term || ( 1 === strlen( $term ) && preg_match( '/^[a-z\-]$/i', $term ) ) )
-				continue;
+			if ( ! $term || ( 1 === strlen( $term ) && preg_match( '/^[a-z\-]$/i', $term ) ) ) {
+							continue;
+			}
 
-			if ( in_array( call_user_func( $strtolower, $term ), $stopwords, true ) )
-				continue;
+			if ( in_array( call_user_func( $strtolower, $term ), $stopwords, true ) ) {
+							continue;
+			}
 
 			$checked[] = $term;
 		}
@@ -1411,8 +1448,9 @@ 
 	 * @return array Stopwords.
 	 */
 	protected function get_search_stopwords() {
-		if ( isset( $this->stopwords ) )
-			return $this->stopwords;
+		if ( isset( $this->stopwords ) ) {
+					return $this->stopwords;
+		}
 
 		/* translators: This is a comma-separated list of very common words that should be excluded from a search,
 		 * like a, an, and the. These are usually called "stopwords". You should not simply translate these individual
@@ -1424,8 +1462,9 @@ 
 		$stopwords = array();
 		foreach ( $words as $word ) {
 			$word = trim( $word, "\r\n\t " );
-			if ( $word )
-				$stopwords[] = $word;
+			if ( $word ) {
+							$stopwords[] = $word;
+			}
 		}
 
 		/**
@@ -1470,8 +1509,9 @@ 
 				// all words in title
 				$search_orderby .= 'WHEN ' . implode( ' AND ', $q['search_orderby_title'] ) . ' THEN 2 ';
 				// any word in title, not needed when $num_terms == 1
-				if ( $num_terms > 1 )
-					$search_orderby .= 'WHEN ' . implode( ' OR ', $q['search_orderby_title'] ) . ' THEN 3 ';
+				if ( $num_terms > 1 ) {
+									$search_orderby .= 'WHEN ' . implode( ' OR ', $q['search_orderby_title'] ) . ' THEN 3 ';
+				}
 			}
 
 			// Sentence match in 'post_content' and 'post_excerpt'.
@@ -1726,34 +1766,40 @@ 
 			}
 		}
 
-		if ( !isset( $q['ignore_sticky_posts'] ) )
-			$q['ignore_sticky_posts'] = false;
+		if ( !isset( $q['ignore_sticky_posts'] ) ) {
+					$q['ignore_sticky_posts'] = false;
+		}
 
-		if ( !isset($q['suppress_filters']) )
-			$q['suppress_filters'] = false;
+		if ( !isset($q['suppress_filters']) ) {
+					$q['suppress_filters'] = false;
+		}
 
 		if ( !isset($q['cache_results']) ) {
-			if ( wp_using_ext_object_cache() )
-				$q['cache_results'] = false;
-			else
-				$q['cache_results'] = true;
+			if ( wp_using_ext_object_cache() ) {
+							$q['cache_results'] = false;
+			} else {
+							$q['cache_results'] = true;
+			}
 		}
 
-		if ( !isset($q['update_post_term_cache']) )
-			$q['update_post_term_cache'] = true;
+		if ( !isset($q['update_post_term_cache']) ) {
+					$q['update_post_term_cache'] = true;
+		}
 
 		if ( ! isset( $q['lazy_load_term_meta'] ) ) {
 			$q['lazy_load_term_meta'] = $q['update_post_term_cache'];
 		}
 
-		if ( !isset($q['update_post_meta_cache']) )
-			$q['update_post_meta_cache'] = true;
+		if ( !isset($q['update_post_meta_cache']) ) {
+					$q['update_post_meta_cache'] = true;
+		}
 
 		if ( !isset($q['post_type']) ) {
-			if ( $this->is_search )
-				$q['post_type'] = 'any';
-			else
-				$q['post_type'] = '';
+			if ( $this->is_search ) {
+							$q['post_type'] = 'any';
+			} else {
+							$q['post_type'] = '';
+			}
 		}
 		$post_type = $q['post_type'];
 		if ( empty( $q['posts_per_page'] ) ) {
@@ -1763,8 +1809,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;
@@ -1783,13 +1830,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;
@@ -1803,10 +1852,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':
@@ -1845,26 +1895,33 @@ 
 		// Handle the other individual date parameters
 		$date_parameters = array();
 
-		if ( '' !== $q['hour'] )
-			$date_parameters['hour'] = $q['hour'];
+		if ( '' !== $q['hour'] ) {
+					$date_parameters['hour'] = $q['hour'];
+		}
 
-		if ( '' !== $q['minute'] )
-			$date_parameters['minute'] = $q['minute'];
+		if ( '' !== $q['minute'] ) {
+					$date_parameters['minute'] = $q['minute'];
+		}
 
-		if ( '' !== $q['second'] )
-			$date_parameters['second'] = $q['second'];
+		if ( '' !== $q['second'] ) {
+					$date_parameters['second'] = $q['second'];
+		}
 
-		if ( $q['year'] )
-			$date_parameters['year'] = $q['year'];
+		if ( $q['year'] ) {
+					$date_parameters['year'] = $q['year'];
+		}
 
-		if ( $q['monthnum'] )
-			$date_parameters['monthnum'] = $q['monthnum'];
+		if ( $q['monthnum'] ) {
+					$date_parameters['monthnum'] = $q['monthnum'];
+		}
 
-		if ( $q['w'] )
-			$date_parameters['week'] = $q['w'];
+		if ( $q['w'] ) {
+					$date_parameters['week'] = $q['w'];
+		}
 
-		if ( $q['day'] )
-			$date_parameters['day'] = $q['day'];
+		if ( $q['day'] ) {
+					$date_parameters['day'] = $q['day'];
+		}
 
 		if ( $date_parameters ) {
 			$date_query = new WP_Date_Query( array( $date_parameters ) );
@@ -1883,8 +1940,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'.
@@ -1916,21 +1974,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');
@@ -1957,8 +2018,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'] ) {
@@ -2022,13 +2084,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) ) {
@@ -2129,8 +2193,9 @@ 
 			}
 			$q['author_name'] = sanitize_title_for_query( $q['author_name'] );
 			$q['author'] = get_user_by('slug', $q['author_name']);
-			if ( $q['author'] )
-				$q['author'] = $q['author']->ID;
+			if ( $q['author'] ) {
+							$q['author'] = $q['author']->ID;
+			}
 			$whichauthor .= " AND ({$wpdb->posts}.post_author = " . absint($q['author']) . ')';
 		}
 
@@ -2214,8 +2279,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'] ) {
 				/**
@@ -2229,18 +2295,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'] ) ) {
@@ -2300,8 +2369,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();
@@ -2361,8 +2431,10 @@ 
 			// Add public states.
 			$public_states = get_post_stati( array('public' => true) );
 			foreach ( (array) $public_states as $state ) {
-				if ( 'publish' == $state ) // Publish is hard-coded above.
+				if ( 'publish' == $state ) {
+					// Publish is hard-coded above.
 					continue;
+				}
 				$where .= " OR {$wpdb->posts}.post_status = '$state'";
 			}
 
@@ -2414,8 +2486,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'] ) ) {
@@ -2500,8 +2573,9 @@ 
 
 			$post_ids = array();
 
-			foreach ( $this->comments as $comment )
-				$post_ids[] = (int) $comment->comment_post_ID;
+			foreach ( $this->comments as $comment ) {
+							$post_ids[] = (int) $comment->comment_post_ID;
+			}
 
 			$post_ids = join(',', $post_ids);
 			$join = '';
@@ -2739,14 +2813,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";
 
@@ -2923,12 +3000,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();
 					}
@@ -2970,8 +3049,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) ) {
@@ -3014,8 +3094,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 {
@@ -3044,8 +3125,9 @@ 
 		global $wpdb;
 		// Bail if posts is an empty array. Continue if posts is an empty string,
 		// null, or false to accommodate caching plugins that fill posts later.
-		if ( $q['no_found_rows'] || ( is_array( $this->posts ) && ! $this->posts ) )
-			return;
+		if ( $q['no_found_rows'] || ( is_array( $this->posts ) && ! $this->posts ) ) {
+					return;
+		}
 
 		if ( ! empty( $limits ) ) {
 			/**
@@ -3071,8 +3153,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'] );
+		}
 	}
 
 	/**
@@ -3106,7 +3189,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.
 			 *
@@ -3115,6 +3199,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 );
@@ -3261,8 +3346,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;
@@ -3301,13 +3387,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');
@@ -3427,12 +3515,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 );
@@ -3481,22 +3571,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;
 	}
@@ -3513,22 +3606,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;
 	}
@@ -3545,22 +3641,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;
 	}
@@ -3586,23 +3685,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(
@@ -3656,11 +3759,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 );
 	}
 
@@ -3693,12 +3798,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;
+		}
 	}
 
 	/**
@@ -3747,11 +3853,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();
 
@@ -3840,11 +3948,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();
 
@@ -3887,8 +3997,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();
 
@@ -4003,8 +4114,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,
@@ -4025,8 +4137,9 @@ 
 			$content = str_replace( "<!--nextpage-->\n", '<!--nextpage-->', $content );
 
 			// Ignore nextpage at the beginning of the content.
-			if ( 0 === strpos( $content, '<!--nextpage-->' ) )
-				$content = substr( $content, 15 );
+			if ( 0 === strpos( $content, '<!--nextpage-->' ) ) {
+							$content = substr( $content, 15 );
+			}
 
 			$pages = explode('<!--nextpage-->', $content);
 		} else {

src/wp-includes/class-wp-text-diff-renderer-table.php

Doc Comments +1 added lines, -1 removed lines

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

Indentation +1 added lines, -1 removed lines

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

Spacing +94 added lines, -94 removed lines

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

Braces +49 added lines, -35 removed lines

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

src/wp-includes/comment.php

Doc Comments +3 added lines, -3 removed lines

@@ -796,7 +796,7 @@ 
  * @param bool   $avoid_die When true, a disallowed comment will result in the function
  *                          returning a WP_Error object, rather than executing wp_die().
  *                          Default false.
- * @return bool Whether comment flooding is occurring.
+ * @return boolean|null Whether comment flooding is occurring.
  */
 function wp_check_comment_flood( $is_flood, $ip, $email, $date, $avoid_die = false ) {
 
@@ -1636,7 +1636,7 @@ 
  *
  * @since 2.0.4
  *
- * @return array Comment author, email, url respectively.
+ * @return string Comment author, email, url respectively.
  */
 function wp_get_current_commenter() {
 	// Cookies should already be sanitized.
@@ -2830,7 +2830,7 @@ 
  *
  * @param WP_Post  $posts Post data object.
  * @param WP_Query $query Query object.
- * @return array
+ * @return WP_Post
  */
 function _close_comments_for_old_posts( $posts, $query ) {
 	if ( empty( $posts ) || ! $query->is_singular() || ! get_option( 'close_comments_for_old_posts' ) )

Spacing +566 added lines, -566 removed lines

@@ -40,15 +40,15 @@ 
 	global $wpdb;
 
 	// If manual moderation is enabled, skip all checks and return false.
-	if ( 1 == get_option('comment_moderation') )
+	if (1 == get_option('comment_moderation'))
 		return false;
 
 	/** This filter is documented in wp-includes/comment-template.php */
-	$comment = apply_filters( 'comment_text', $comment, null, array() );
+	$comment = apply_filters('comment_text', $comment, null, array());
 
 	// Check for the number of external links if a max allowed number is set.
-	if ( $max_links = get_option( 'comment_max_links' ) ) {
-		$num_links = preg_match_all( '/<a [^>]*href/i', $comment, $out );
+	if ($max_links = get_option('comment_max_links')) {
+		$num_links = preg_match_all('/<a [^>]*href/i', $comment, $out);
 
 		/**
 		 * Filters the number of links found in a comment.
@@ -60,27 +60,27 @@ 
 		 * @param string $url       Comment author's URL. Included in allowed links total.
 		 * @param string $comment   Content of the comment.
 		 */
-		$num_links = apply_filters( 'comment_max_links_url', $num_links, $url, $comment );
+		$num_links = apply_filters('comment_max_links_url', $num_links, $url, $comment);
 
 		/*
 		 * If the number of links in the comment exceeds the allowed amount,
 		 * fail the check by returning false.
 		 */
-		if ( $num_links >= $max_links )
+		if ($num_links >= $max_links)
 			return false;
 	}
 
 	$mod_keys = trim(get_option('moderation_keys'));
 
 	// If moderation 'keys' (keywords) are set, process them.
-	if ( !empty($mod_keys) ) {
-		$words = explode("\n", $mod_keys );
+	if ( ! empty($mod_keys)) {
+		$words = explode("\n", $mod_keys);
 
-		foreach ( (array) $words as $word) {
+		foreach ((array) $words as $word) {
 			$word = trim($word);
 
 			// Skip empty lines.
-			if ( empty($word) )
+			if (empty($word))
 				continue;
 
 			/*
@@ -94,12 +94,12 @@ 
 			 * fail the check for the given field by returning false.
 			 */
 			$pattern = "#$word#i";
-			if ( preg_match($pattern, $author) ) return false;
-			if ( preg_match($pattern, $email) ) return false;
-			if ( preg_match($pattern, $url) ) return false;
-			if ( preg_match($pattern, $comment) ) return false;
-			if ( preg_match($pattern, $user_ip) ) return false;
-			if ( preg_match($pattern, $user_agent) ) return false;
+			if (preg_match($pattern, $author)) return false;
+			if (preg_match($pattern, $email)) return false;
+			if (preg_match($pattern, $url)) return false;
+			if (preg_match($pattern, $comment)) return false;
+			if (preg_match($pattern, $user_ip)) return false;
+			if (preg_match($pattern, $user_agent)) return false;
 		}
 	}
 
@@ -110,17 +110,17 @@ 
 	 * as well as whether there are any moderation keywords (if set) present in the author
 	 * email address. If both checks pass, return true. Otherwise, return false.
 	 */
-	if ( 1 == get_option('comment_whitelist')) {
-		if ( 'trackback' != $comment_type && 'pingback' != $comment_type && $author != '' && $email != '' ) {
-			$comment_user = get_user_by( 'email', wp_unslash( $email ) );
-			if ( ! empty( $comment_user->ID ) ) {
-				$ok_to_comment = $wpdb->get_var( $wpdb->prepare( "SELECT comment_approved FROM $wpdb->comments WHERE user_id = %d AND comment_approved = '1' LIMIT 1", $comment_user->ID ) );
+	if (1 == get_option('comment_whitelist')) {
+		if ('trackback' != $comment_type && 'pingback' != $comment_type && $author != '' && $email != '') {
+			$comment_user = get_user_by('email', wp_unslash($email));
+			if ( ! empty($comment_user->ID)) {
+				$ok_to_comment = $wpdb->get_var($wpdb->prepare("SELECT comment_approved FROM $wpdb->comments WHERE user_id = %d AND comment_approved = '1' LIMIT 1", $comment_user->ID));
 			} else {
 				// expected_slashed ($author, $email)
-				$ok_to_comment = $wpdb->get_var( $wpdb->prepare( "SELECT comment_approved FROM $wpdb->comments WHERE comment_author = %s AND comment_author_email = %s and comment_approved = '1' LIMIT 1", $author, $email ) );
+				$ok_to_comment = $wpdb->get_var($wpdb->prepare("SELECT comment_approved FROM $wpdb->comments WHERE comment_author = %s AND comment_author_email = %s and comment_approved = '1' LIMIT 1", $author, $email));
 			}
-			if ( ( 1 == $ok_to_comment ) &&
-				( empty($mod_keys) || false === strpos( $email, $mod_keys) ) )
+			if ((1 == $ok_to_comment) &&
+				(empty($mod_keys) || false === strpos($email, $mod_keys)))
 					return true;
 			else
 				return false;
@@ -142,8 +142,8 @@ 
  * @return int|array $comments The approved comments, or number of comments if `$count`
  *                             argument is true.
  */
-function get_approved_comments( $post_id, $args = array() ) {
-	if ( ! $post_id ) {
+function get_approved_comments($post_id, $args = array()) {
+	if ( ! $post_id) {
 		return array();
 	}
 
@@ -152,10 +152,10 @@ 
 		'post_id' => $post_id,
 		'order'   => 'ASC',
 	);
-	$r = wp_parse_args( $args, $defaults );
+	$r = wp_parse_args($args, $defaults);
 
 	$query = new WP_Comment_Query;
-	return $query->query( $r );
+	return $query->query($r);
 }
 
 /**
@@ -174,20 +174,20 @@ 
  *                                       a WP_Comment object, an associative array, or a numeric array, respectively. Default OBJECT.
  * @return WP_Comment|array|null Depends on $output value.
  */
-function get_comment( &$comment = null, $output = OBJECT ) {
-	if ( empty( $comment ) && isset( $GLOBALS['comment'] ) ) {
+function get_comment(&$comment = null, $output = OBJECT) {
+	if (empty($comment) && isset($GLOBALS['comment'])) {
 		$comment = $GLOBALS['comment'];
 	}
 
-	if ( $comment instanceof WP_Comment ) {
+	if ($comment instanceof WP_Comment) {
 		$_comment = $comment;
-	} elseif ( is_object( $comment ) ) {
-		$_comment = new WP_Comment( $comment );
+	} elseif (is_object($comment)) {
+		$_comment = new WP_Comment($comment);
 	} else {
-		$_comment = WP_Comment::get_instance( $comment );
+		$_comment = WP_Comment::get_instance($comment);
 	}
 
-	if ( ! $_comment ) {
+	if ( ! $_comment) {
 		return null;
 	}
 
@@ -198,14 +198,14 @@ 
 	 *
 	 * @param mixed $_comment Comment data.
 	 */
-	$_comment = apply_filters( 'get_comment', $_comment );
+	$_comment = apply_filters('get_comment', $_comment);
 
-	if ( $output == OBJECT ) {
+	if ($output == OBJECT) {
 		return $_comment;
-	} elseif ( $output == ARRAY_A ) {
+	} elseif ($output == ARRAY_A) {
 		return $_comment->to_array();
-	} elseif ( $output == ARRAY_N ) {
-		return array_values( $_comment->to_array() );
+	} elseif ($output == ARRAY_N) {
+		return array_values($_comment->to_array());
 	}
 	return $_comment;
 }
@@ -221,9 +221,9 @@ 
  *                           for information on accepted arguments. Default empty.
  * @return int|array List of comments or number of found comments if `$count` argument is true.
  */
-function get_comments( $args = '' ) {
+function get_comments($args = '') {
 	$query = new WP_Comment_Query;
-	return $query->query( $args );
+	return $query->query($args);
 }
 
 /**
@@ -238,10 +238,10 @@ 
  */
 function get_comment_statuses() {
 	$status = array(
-		'hold'		=> __( 'Unapproved' ),
-		'approve'	=> _x( 'Approved', 'comment status' ),
-		'spam'		=> _x( 'Spam', 'comment status' ),
-		'trash'		=> _x( 'Trash', 'comment status' ),
+		'hold'		=> __('Unapproved'),
+		'approve'	=> _x('Approved', 'comment status'),
+		'spam'		=> _x('Spam', 'comment status'),
+		'trash'		=> _x('Trash', 'comment status'),
 	);
 
 	return $status;
@@ -256,8 +256,8 @@ 
  * @param string $comment_type Optional. Comment type. Default 'comment'.
  * @return string Expected return value is 'open' or 'closed'.
  */
-function get_default_comment_status( $post_type = 'post', $comment_type = 'comment' ) {
-	switch ( $comment_type ) {
+function get_default_comment_status($post_type = 'post', $comment_type = 'comment') {
+	switch ($comment_type) {
 		case 'pingback' :
 		case 'trackback' :
 			$supports = 'trackbacks';
@@ -269,10 +269,10 @@ 
 	}
 
 	// Set the status.
-	if ( 'page' === $post_type ) {
+	if ('page' === $post_type) {
 		$status = 'closed';
-	} elseif ( post_type_supports( $post_type, $supports ) ) {
-		$status = get_option( "default_{$option}_status" );
+	} elseif (post_type_supports($post_type, $supports)) {
+		$status = get_option("default_{$option}_status");
 	} else {
 		$status = 'closed';
 	}
@@ -287,7 +287,7 @@ 
 	 * @param string $post_type    Post type. Default is `post`.
 	 * @param string $comment_type Type of comment. Default is `comment`.
 	 */
-	return apply_filters( 'get_default_comment_status' , $status, $post_type, $comment_type );
+	return apply_filters('get_default_comment_status', $status, $post_type, $comment_type);
 }
 
 /**
@@ -302,33 +302,33 @@ 
  * @param string $timezone Which timezone to use in reference to 'gmt', 'blog', or 'server' locations.
  * @return string|false Last comment modified date on success, false on failure.
  */
-function get_lastcommentmodified( $timezone = 'server' ) {
+function get_lastcommentmodified($timezone = 'server') {
 	global $wpdb;
 
-	$timezone = strtolower( $timezone );
+	$timezone = strtolower($timezone);
 	$key = "lastcommentmodified:$timezone";
 
-	$comment_modified_date = wp_cache_get( $key, 'timeinfo' );
-	if ( false !== $comment_modified_date ) {
+	$comment_modified_date = wp_cache_get($key, 'timeinfo');
+	if (false !== $comment_modified_date) {
 		return $comment_modified_date;
 	}
 
-	switch ( $timezone ) {
+	switch ($timezone) {
 		case 'gmt':
-			$comment_modified_date = $wpdb->get_var( "SELECT comment_date_gmt FROM $wpdb->comments WHERE comment_approved = '1' ORDER BY comment_date_gmt DESC LIMIT 1" );
+			$comment_modified_date = $wpdb->get_var("SELECT comment_date_gmt FROM $wpdb->comments WHERE comment_approved = '1' ORDER BY comment_date_gmt DESC LIMIT 1");
 			break;
 		case 'blog':
-			$comment_modified_date = $wpdb->get_var( "SELECT comment_date FROM $wpdb->comments WHERE comment_approved = '1' ORDER BY comment_date_gmt DESC LIMIT 1" );
+			$comment_modified_date = $wpdb->get_var("SELECT comment_date FROM $wpdb->comments WHERE comment_approved = '1' ORDER BY comment_date_gmt DESC LIMIT 1");
 			break;
 		case 'server':
-			$add_seconds_server = date( 'Z' );
+			$add_seconds_server = date('Z');
 
-			$comment_modified_date = $wpdb->get_var( $wpdb->prepare( "SELECT DATE_ADD(comment_date_gmt, INTERVAL %s SECOND) FROM $wpdb->comments WHERE comment_approved = '1' ORDER BY comment_date_gmt DESC LIMIT 1", $add_seconds_server ) );
+			$comment_modified_date = $wpdb->get_var($wpdb->prepare("SELECT DATE_ADD(comment_date_gmt, INTERVAL %s SECOND) FROM $wpdb->comments WHERE comment_approved = '1' ORDER BY comment_date_gmt DESC LIMIT 1", $add_seconds_server));
 			break;
 	}
 
-	if ( $comment_modified_date ) {
-		wp_cache_set( $key, $comment_modified_date, 'timeinfo' );
+	if ($comment_modified_date) {
+		wp_cache_set($key, $comment_modified_date, 'timeinfo');
 
 		return $comment_modified_date;
 	}
@@ -349,13 +349,13 @@ 
  * @param int $post_id Optional. Comment amount in post if > 0, else total comments blog wide.
  * @return array The amount of spam, approved, awaiting moderation, and total comments.
  */
-function get_comment_count( $post_id = 0 ) {
+function get_comment_count($post_id = 0) {
 	global $wpdb;
 
 	$post_id = (int) $post_id;
 
 	$where = '';
-	if ( $post_id > 0 ) {
+	if ($post_id > 0) {
 		$where = $wpdb->prepare("WHERE comment_post_ID = %d", $post_id);
 	}
 
@@ -376,8 +376,8 @@ 
 		'all'                 => 0,
 	);
 
-	foreach ( $totals as $row ) {
-		switch ( $row['comment_approved'] ) {
+	foreach ($totals as $row) {
+		switch ($row['comment_approved']) {
 			case 'trash':
 				$comment_count['trash'] = $row['total'];
 				break;
@@ -489,20 +489,20 @@ 
  *
  * @param array $comments Array of comment objects.
  */
-function wp_queue_comments_for_comment_meta_lazyload( $comments ) {
+function wp_queue_comments_for_comment_meta_lazyload($comments) {
 	// Don't use `wp_list_pluck()` to avoid by-reference manipulation.
 	$comment_ids = array();
-	if ( is_array( $comments ) ) {
-		foreach ( $comments as $comment ) {
-			if ( $comment instanceof WP_Comment ) {
+	if (is_array($comments)) {
+		foreach ($comments as $comment) {
+			if ($comment instanceof WP_Comment) {
 				$comment_ids[] = $comment->comment_ID;
 			}
 		}
 	}
 
-	if ( $comment_ids ) {
+	if ($comment_ids) {
 		$lazyloader = wp_metadata_lazyloader();
-		$lazyloader->queue_objects( 'comment', $comment_ids );
+		$lazyloader->queue_objects('comment', $comment_ids);
 	}
 }
 
@@ -516,7 +516,7 @@ 
  * @since 3.4.0
  */
 function wp_set_comment_cookies($comment, $user) {
-	if ( $user->exists() )
+	if ($user->exists())
 		return;
 
 	/**
@@ -526,11 +526,11 @@ 
 	 *
 	 * @param int $seconds Comment cookie lifetime. Default 30000000.
 	 */
-	$comment_cookie_lifetime = apply_filters( 'comment_cookie_lifetime', 30000000 );
-	$secure = ( 'https' === parse_url( home_url(), PHP_URL_SCHEME ) );
-	setcookie( 'comment_author_' . COOKIEHASH, $comment->comment_author, time() + $comment_cookie_lifetime, COOKIEPATH, COOKIE_DOMAIN, $secure );
-	setcookie( 'comment_author_email_' . COOKIEHASH, $comment->comment_author_email, time() + $comment_cookie_lifetime, COOKIEPATH, COOKIE_DOMAIN, $secure );
-	setcookie( 'comment_author_url_' . COOKIEHASH, esc_url($comment->comment_author_url), time() + $comment_cookie_lifetime, COOKIEPATH, COOKIE_DOMAIN, $secure );
+	$comment_cookie_lifetime = apply_filters('comment_cookie_lifetime', 30000000);
+	$secure = ('https' === parse_url(home_url(), PHP_URL_SCHEME));
+	setcookie('comment_author_'.COOKIEHASH, $comment->comment_author, time() + $comment_cookie_lifetime, COOKIEPATH, COOKIE_DOMAIN, $secure);
+	setcookie('comment_author_email_'.COOKIEHASH, $comment->comment_author_email, time() + $comment_cookie_lifetime, COOKIEPATH, COOKIE_DOMAIN, $secure);
+	setcookie('comment_author_url_'.COOKIEHASH, esc_url($comment->comment_author_url), time() + $comment_cookie_lifetime, COOKIEPATH, COOKIE_DOMAIN, $secure);
 }
 
 /**
@@ -542,7 +542,7 @@ 
  * @since 2.0.4
  */
 function sanitize_comment_cookies() {
-	if ( isset( $_COOKIE['comment_author_' . COOKIEHASH] ) ) {
+	if (isset($_COOKIE['comment_author_'.COOKIEHASH])) {
 		/**
 		 * Filters the comment author's name cookie before it is set.
 		 *
@@ -553,13 +553,13 @@ 
 		 *
 		 * @param string $author_cookie The comment author name cookie.
 		 */
-		$comment_author = apply_filters( 'pre_comment_author_name', $_COOKIE['comment_author_' . COOKIEHASH] );
+		$comment_author = apply_filters('pre_comment_author_name', $_COOKIE['comment_author_'.COOKIEHASH]);
 		$comment_author = wp_unslash($comment_author);
 		$comment_author = esc_attr($comment_author);
-		$_COOKIE['comment_author_' . COOKIEHASH] = $comment_author;
+		$_COOKIE['comment_author_'.COOKIEHASH] = $comment_author;
 	}
 
-	if ( isset( $_COOKIE['comment_author_email_' . COOKIEHASH] ) ) {
+	if (isset($_COOKIE['comment_author_email_'.COOKIEHASH])) {
 		/**
 		 * Filters the comment author's email cookie before it is set.
 		 *
@@ -570,13 +570,13 @@ 
 		 *
 		 * @param string $author_email_cookie The comment author email cookie.
 		 */
-		$comment_author_email = apply_filters( 'pre_comment_author_email', $_COOKIE['comment_author_email_' . COOKIEHASH] );
+		$comment_author_email = apply_filters('pre_comment_author_email', $_COOKIE['comment_author_email_'.COOKIEHASH]);
 		$comment_author_email = wp_unslash($comment_author_email);
 		$comment_author_email = esc_attr($comment_author_email);
 		$_COOKIE['comment_author_email_'.COOKIEHASH] = $comment_author_email;
 	}
 
-	if ( isset( $_COOKIE['comment_author_url_' . COOKIEHASH] ) ) {
+	if (isset($_COOKIE['comment_author_url_'.COOKIEHASH])) {
 		/**
 		 * Filters the comment author's URL cookie before it is set.
 		 *
@@ -587,7 +587,7 @@ 
 		 *
 		 * @param string $author_url_cookie The comment author URL cookie.
 		 */
-		$comment_author_url = apply_filters( 'pre_comment_author_url', $_COOKIE['comment_author_url_' . COOKIEHASH] );
+		$comment_author_url = apply_filters('pre_comment_author_url', $_COOKIE['comment_author_url_'.COOKIEHASH]);
 		$comment_author_url = wp_unslash($comment_author_url);
 		$_COOKIE['comment_author_url_'.COOKIEHASH] = $comment_author_url;
 	}
@@ -609,29 +609,29 @@ 
  * @return int|string|WP_Error Allowed comments return the approval status (0|1|'spam').
  *                             If `$avoid_die` is true, disallowed comments return a WP_Error.
  */
-function wp_allow_comment( $commentdata, $avoid_die = false ) {
+function wp_allow_comment($commentdata, $avoid_die = false) {
 	global $wpdb;
 
 	// Simple duplicate check
 	// expected_slashed ($comment_post_ID, $comment_author, $comment_author_email, $comment_content)
 	$dupe = $wpdb->prepare(
 		"SELECT comment_ID FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_parent = %s AND comment_approved != 'trash' AND ( comment_author = %s ",
-		wp_unslash( $commentdata['comment_post_ID'] ),
-		wp_unslash( $commentdata['comment_parent'] ),
-		wp_unslash( $commentdata['comment_author'] )
+		wp_unslash($commentdata['comment_post_ID']),
+		wp_unslash($commentdata['comment_parent']),
+		wp_unslash($commentdata['comment_author'])
 	);
-	if ( $commentdata['comment_author_email'] ) {
+	if ($commentdata['comment_author_email']) {
 		$dupe .= $wpdb->prepare(
 			"AND comment_author_email = %s ",
-			wp_unslash( $commentdata['comment_author_email'] )
+			wp_unslash($commentdata['comment_author_email'])
 		);
 	}
 	$dupe .= $wpdb->prepare(
 		") AND comment_content = %s LIMIT 1",
-		wp_unslash( $commentdata['comment_content'] )
+		wp_unslash($commentdata['comment_content'])
 	);
 
-	$dupe_id = $wpdb->get_var( $dupe );
+	$dupe_id = $wpdb->get_var($dupe);
 
 	/**
 	 * Filters the ID, if any, of the duplicate comment found when creating a new comment.
@@ -643,9 +643,9 @@ 
 	 * @param int   $dupe_id     ID of the comment identified as a duplicate.
 	 * @param array $commentdata Data for the comment being created.
 	 */
-	$dupe_id = apply_filters( 'duplicate_comment_id', $dupe_id, $commentdata );
+	$dupe_id = apply_filters('duplicate_comment_id', $dupe_id, $commentdata);
 
-	if ( $dupe_id ) {
+	if ($dupe_id) {
 		/**
 		 * Fires immediately after a duplicate comment is detected.
 		 *
@@ -653,15 +653,15 @@ 
 		 *
 		 * @param array $commentdata Comment data.
 		 */
-		do_action( 'comment_duplicate_trigger', $commentdata );
-		if ( true === $avoid_die ) {
-			return new WP_Error( 'comment_duplicate', __( 'Duplicate comment detected; it looks as though you&#8217;ve already said that!' ), 409 );
+		do_action('comment_duplicate_trigger', $commentdata);
+		if (true === $avoid_die) {
+			return new WP_Error('comment_duplicate', __('Duplicate comment detected; it looks as though you&#8217;ve already said that!'), 409);
 		} else {
-			if ( wp_doing_ajax() ) {
-				die( __('Duplicate comment detected; it looks as though you&#8217;ve already said that!') );
+			if (wp_doing_ajax()) {
+				die(__('Duplicate comment detected; it looks as though you&#8217;ve already said that!'));
 			}
 
-			wp_die( __( 'Duplicate comment detected; it looks as though you&#8217;ve already said that!' ), 409 );
+			wp_die(__('Duplicate comment detected; it looks as though you&#8217;ve already said that!'), 409);
 		}
 	}
 
@@ -710,24 +710,24 @@ 
 		$avoid_die
 	);
 
-	if ( $is_flood ) {
-		return new WP_Error( 'comment_flood', __( 'You are posting comments too quickly. Slow down.' ), 429 );
+	if ($is_flood) {
+		return new WP_Error('comment_flood', __('You are posting comments too quickly. Slow down.'), 429);
 	}
 
-	if ( ! empty( $commentdata['user_id'] ) ) {
-		$user = get_userdata( $commentdata['user_id'] );
-		$post_author = $wpdb->get_var( $wpdb->prepare(
+	if ( ! empty($commentdata['user_id'])) {
+		$user = get_userdata($commentdata['user_id']);
+		$post_author = $wpdb->get_var($wpdb->prepare(
 			"SELECT post_author FROM $wpdb->posts WHERE ID = %d LIMIT 1",
 			$commentdata['comment_post_ID']
-		) );
+		));
 	}
 
-	if ( isset( $user ) && ( $commentdata['user_id'] == $post_author || $user->has_cap( 'moderate_comments' ) ) ) {
+	if (isset($user) && ($commentdata['user_id'] == $post_author || $user->has_cap('moderate_comments'))) {
 		// The author and the admins get respect.
 		$approved = 1;
 	} else {
 		// Everyone else's comments will be checked.
-		if ( check_comment(
+		if (check_comment(
 			$commentdata['comment_author'],
 			$commentdata['comment_author_email'],
 			$commentdata['comment_author_url'],
@@ -735,20 +735,20 @@ 
 			$commentdata['comment_author_IP'],
 			$commentdata['comment_agent'],
 			$commentdata['comment_type']
-		) ) {
+		)) {
 			$approved = 1;
 		} else {
 			$approved = 0;
 		}
 
-		if ( wp_blacklist_check(
+		if (wp_blacklist_check(
 			$commentdata['comment_author'],
 			$commentdata['comment_author_email'],
 			$commentdata['comment_author_url'],
 			$commentdata['comment_content'],
 			$commentdata['comment_author_IP'],
 			$commentdata['comment_agent']
-		) ) {
+		)) {
 			$approved = EMPTY_TRASH_DAYS ? 'trash' : 'spam';
 		}
 	}
@@ -761,7 +761,7 @@ 
 	 * @param bool|string $approved    The approval status. Accepts 1, 0, or 'spam'.
 	 * @param array       $commentdata Comment data.
 	 */
-	$approved = apply_filters( 'pre_comment_approved', $approved, $commentdata );
+	$approved = apply_filters('pre_comment_approved', $approved, $commentdata);
 	return $approved;
 }
 
@@ -776,7 +776,7 @@ 
  * @since 4.7.0 Converted to be an add_filter() wrapper.
  */
 function check_comment_flood_db() {
-	add_filter( 'wp_is_comment_flood', 'wp_check_comment_flood', 10, 5 );
+	add_filter('wp_is_comment_flood', 'wp_check_comment_flood', 10, 5);
 }
 
 /**
@@ -798,22 +798,22 @@ 
  *                          Default false.
  * @return bool Whether comment flooding is occurring.
  */
-function wp_check_comment_flood( $is_flood, $ip, $email, $date, $avoid_die = false ) {
+function wp_check_comment_flood($is_flood, $ip, $email, $date, $avoid_die = false) {
 
 	global $wpdb;
 
 	// Another callback has declared a flood. Trust it.
-	if ( true === $is_flood ) {
+	if (true === $is_flood) {
 		return $is_flood;
 	}
 
 	// don't throttle admins or moderators
-	if ( current_user_can( 'manage_options' ) || current_user_can( 'moderate_comments' ) ) {
+	if (current_user_can('manage_options') || current_user_can('moderate_comments')) {
 		return false;
 	}
-	$hour_ago = gmdate( 'Y-m-d H:i:s', time() - HOUR_IN_SECONDS );
+	$hour_ago = gmdate('Y-m-d H:i:s', time() - HOUR_IN_SECONDS);
 
-	if ( is_user_logged_in() ) {
+	if (is_user_logged_in()) {
 		$user = get_current_user_id();
 		$check_column = '`user_id`';
 	} else {
@@ -827,8 +827,8 @@ 
 		$user,
 		$email
 	);
-	$lasttime = $wpdb->get_var( $sql );
-	if ( $lasttime ) {
+	$lasttime = $wpdb->get_var($sql);
+	if ($lasttime) {
 		$time_lastcomment = mysql2date('U', $lasttime, false);
 		$time_newcomment  = mysql2date('U', $date, false);
 		/**
@@ -840,8 +840,8 @@ 
 		 * @param int  $time_lastcomment Timestamp of when the last comment was posted.
 		 * @param int  $time_newcomment  Timestamp of when the new comment was posted.
 		 */
-		$flood_die = apply_filters( 'comment_flood_filter', false, $time_lastcomment, $time_newcomment );
-		if ( $flood_die ) {
+		$flood_die = apply_filters('comment_flood_filter', false, $time_lastcomment, $time_newcomment);
+		if ($flood_die) {
 			/**
 			 * Fires before the comment flood message is triggered.
 			 *
@@ -850,15 +850,15 @@ 
 			 * @param int $time_lastcomment Timestamp of when the last comment was posted.
 			 * @param int $time_newcomment  Timestamp of when the new comment was posted.
 			 */
-			do_action( 'comment_flood_trigger', $time_lastcomment, $time_newcomment );
-			if ( true === $avoid_die ) {
+			do_action('comment_flood_trigger', $time_lastcomment, $time_newcomment);
+			if (true === $avoid_die) {
 				return true;
 			} else {
-				if ( wp_doing_ajax() ) {
-					die( __('You are posting comments too quickly. Slow down.') );
+				if (wp_doing_ajax()) {
+					die(__('You are posting comments too quickly. Slow down.'));
 				}
 
-				wp_die( __( 'You are posting comments too quickly. Slow down.' ), 429 );
+				wp_die(__('You are posting comments too quickly. Slow down.'), 429);
 			}
 		}
 	}
@@ -877,12 +877,12 @@ 
 function separate_comments(&$comments) {
 	$comments_by_type = array('comment' => array(), 'trackback' => array(), 'pingback' => array(), 'pings' => array());
 	$count = count($comments);
-	for ( $i = 0; $i < $count; $i++ ) {
+	for ($i = 0; $i < $count; $i++) {
 		$type = $comments[$i]->comment_type;
-		if ( empty($type) )
+		if (empty($type))
 			$type = 'comment';
 		$comments_by_type[$type][] = &$comments[$i];
-		if ( 'trackback' == $type || 'pingback' == $type )
+		if ('trackback' == $type || 'pingback' == $type)
 			$comments_by_type['pings'][] = &$comments[$i];
 	}
 
@@ -903,37 +903,37 @@ 
  * @param bool  $threaded Optional control over flat or threaded comments.
  * @return int Number of comment pages.
  */
-function get_comment_pages_count( $comments = null, $per_page = null, $threaded = null ) {
+function get_comment_pages_count($comments = null, $per_page = null, $threaded = null) {
 	global $wp_query;
 
-	if ( null === $comments && null === $per_page && null === $threaded && !empty($wp_query->max_num_comment_pages) )
+	if (null === $comments && null === $per_page && null === $threaded && ! empty($wp_query->max_num_comment_pages))
 		return $wp_query->max_num_comment_pages;
 
-	if ( ( ! $comments || ! is_array( $comments ) ) && ! empty( $wp_query->comments )  )
+	if (( ! $comments || ! is_array($comments)) && ! empty($wp_query->comments))
 		$comments = $wp_query->comments;
 
-	if ( empty($comments) )
+	if (empty($comments))
 		return 0;
 
-	if ( ! get_option( 'page_comments' ) ) {
+	if ( ! get_option('page_comments')) {
 		return 1;
 	}
 
-	if ( !isset($per_page) )
+	if ( ! isset($per_page))
 		$per_page = (int) get_query_var('comments_per_page');
-	if ( 0 === $per_page )
+	if (0 === $per_page)
 		$per_page = (int) get_option('comments_per_page');
-	if ( 0 === $per_page )
+	if (0 === $per_page)
 		return 1;
 
-	if ( !isset($threaded) )
+	if ( ! isset($threaded))
 		$threaded = get_option('thread_comments');
 
-	if ( $threaded ) {
+	if ($threaded) {
 		$walker = new Walker_Comment;
-		$count = ceil( $walker->get_number_of_root_elements( $comments ) / $per_page );
+		$count = ceil($walker->get_number_of_root_elements($comments) / $per_page);
 	} else {
-		$count = ceil( count( $comments ) / $per_page );
+		$count = ceil(count($comments) / $per_page);
 	}
 
 	return $count;
@@ -959,49 +959,49 @@ 
  * } *
  * @return int|null Comment page number or null on error.
  */
-function get_page_of_comment( $comment_ID, $args = array() ) {
+function get_page_of_comment($comment_ID, $args = array()) {
 	global $wpdb;
 
 	$page = null;
 
-	if ( !$comment = get_comment( $comment_ID ) )
+	if ( ! $comment = get_comment($comment_ID))
 		return;
 
-	$defaults = array( 'type' => 'all', 'page' => '', 'per_page' => '', 'max_depth' => '' );
-	$args = wp_parse_args( $args, $defaults );
+	$defaults = array('type' => 'all', 'page' => '', 'per_page' => '', 'max_depth' => '');
+	$args = wp_parse_args($args, $defaults);
 	$original_args = $args;
 
 	// Order of precedence: 1. `$args['per_page']`, 2. 'comments_per_page' query_var, 3. 'comments_per_page' option.
-	if ( get_option( 'page_comments' ) ) {
-		if ( '' === $args['per_page'] ) {
-			$args['per_page'] = get_query_var( 'comments_per_page' );
+	if (get_option('page_comments')) {
+		if ('' === $args['per_page']) {
+			$args['per_page'] = get_query_var('comments_per_page');
 		}
 
-		if ( '' === $args['per_page'] ) {
-			$args['per_page'] = get_option( 'comments_per_page' );
+		if ('' === $args['per_page']) {
+			$args['per_page'] = get_option('comments_per_page');
 		}
 	}
 
-	if ( empty($args['per_page']) ) {
+	if (empty($args['per_page'])) {
 		$args['per_page'] = 0;
 		$args['page'] = 0;
 	}
 
-	if ( $args['per_page'] < 1 ) {
+	if ($args['per_page'] < 1) {
 		$page = 1;
 	}
 
-	if ( null === $page ) {
-		if ( '' === $args['max_depth'] ) {
-			if ( get_option('thread_comments') )
+	if (null === $page) {
+		if ('' === $args['max_depth']) {
+			if (get_option('thread_comments'))
 				$args['max_depth'] = get_option('thread_comments_depth');
 			else
 				$args['max_depth'] = -1;
 		}
 
 		// Find this comment's top level parent if threading is enabled
-		if ( $args['max_depth'] > 1 && 0 != $comment->comment_parent )
-			return get_page_of_comment( $comment->comment_parent, $args );
+		if ($args['max_depth'] > 1 && 0 != $comment->comment_parent)
+			return get_page_of_comment($comment->comment_parent, $args);
 
 		$comment_args = array(
 			'type'       => $args['type'],
@@ -1019,15 +1019,15 @@ 
 		);
 
 		$comment_query = new WP_Comment_Query();
-		$older_comment_count = $comment_query->query( $comment_args );
+		$older_comment_count = $comment_query->query($comment_args);
 
 		// No older comments? Then it's page #1.
-		if ( 0 == $older_comment_count ) {
+		if (0 == $older_comment_count) {
 			$page = 1;
 
 		// Divide comments older than this one by comments per page to get this comment's page number
 		} else {
-			$page = ceil( ( $older_comment_count + 1 ) / $args['per_page'] );
+			$page = ceil(($older_comment_count + 1) / $args['per_page']);
 		}
 	}
 
@@ -1058,7 +1058,7 @@ 
 	 * }
 	 * @param int $comment_ID ID of the comment.
 	 */
-	return apply_filters( 'get_page_of_comment', (int) $page, $args, $original_args, $comment_ID );
+	return apply_filters('get_page_of_comment', (int) $page, $args, $original_args, $comment_ID);
 }
 
 /**
@@ -1080,28 +1080,28 @@ 
 		'comment_content'      => 65525,
 	);
 
-	if ( $wpdb->is_mysql ) {
-		foreach ( $lengths as $column => $length ) {
-			$col_length = $wpdb->get_col_length( $wpdb->comments, $column );
+	if ($wpdb->is_mysql) {
+		foreach ($lengths as $column => $length) {
+			$col_length = $wpdb->get_col_length($wpdb->comments, $column);
 			$max_length = 0;
 
 			// No point if we can't get the DB column lengths
-			if ( is_wp_error( $col_length ) ) {
+			if (is_wp_error($col_length)) {
 				break;
 			}
 
-			if ( ! is_array( $col_length ) && (int) $col_length > 0 ) {
+			if ( ! is_array($col_length) && (int) $col_length > 0) {
 				$max_length = (int) $col_length;
-			} elseif ( is_array( $col_length ) && isset( $col_length['length'] ) && intval( $col_length['length'] ) > 0 ) {
+			} elseif (is_array($col_length) && isset($col_length['length']) && intval($col_length['length']) > 0) {
 				$max_length = (int) $col_length['length'];
 
-				if ( ! empty( $col_length['type'] ) && 'byte' === $col_length['type'] ) {
+				if ( ! empty($col_length['type']) && 'byte' === $col_length['type']) {
 					$max_length = $max_length - 10;
 				}
 			}
 
-			if ( $max_length > 0 ) {
-				$lengths[ $column ] = $max_length;
+			if ($max_length > 0) {
+				$lengths[$column] = $max_length;
 			}
 		}
 	}
@@ -1113,7 +1113,7 @@ 
 	 *
 	 * @param array $lengths Associative array `'field_name' => 'maximum length'`.
 	 */
-	return apply_filters( 'wp_get_comment_fields_max_lengths', $lengths );
+	return apply_filters('wp_get_comment_fields_max_lengths', $lengths);
 }
 
 /**
@@ -1125,23 +1125,23 @@ 
  * @return WP_Error|true WP_Error when a comment field exceeds the limit,
  *                       otherwise true.
  */
-function wp_check_comment_data_max_lengths( $comment_data ) {
+function wp_check_comment_data_max_lengths($comment_data) {
 	$max_lengths = wp_get_comment_fields_max_lengths();
 
-	if ( isset( $comment_data['comment_author'] ) && mb_strlen( $comment_data['comment_author'], '8bit' ) > $max_lengths['comment_author'] ) {
-		return new WP_Error( 'comment_author_column_length', __( '<strong>ERROR</strong>: your name is too long.' ), 200 );
+	if (isset($comment_data['comment_author']) && mb_strlen($comment_data['comment_author'], '8bit') > $max_lengths['comment_author']) {
+		return new WP_Error('comment_author_column_length', __('<strong>ERROR</strong>: your name is too long.'), 200);
 	}
 
-	if ( isset( $comment_data['comment_author_email'] ) && strlen( $comment_data['comment_author_email'] ) > $max_lengths['comment_author_email'] ) {
-		return new WP_Error( 'comment_author_email_column_length', __( '<strong>ERROR</strong>: your email address is too long.' ), 200 );
+	if (isset($comment_data['comment_author_email']) && strlen($comment_data['comment_author_email']) > $max_lengths['comment_author_email']) {
+		return new WP_Error('comment_author_email_column_length', __('<strong>ERROR</strong>: your email address is too long.'), 200);
 	}
 
-	if ( isset( $comment_data['comment_author_url'] ) && strlen( $comment_data['comment_author_url'] ) > $max_lengths['comment_author_url'] ) {
-		return new WP_Error( 'comment_author_url_column_length', __( '<strong>ERROR</strong>: your url is too long.' ), 200 );
+	if (isset($comment_data['comment_author_url']) && strlen($comment_data['comment_author_url']) > $max_lengths['comment_author_url']) {
+		return new WP_Error('comment_author_url_column_length', __('<strong>ERROR</strong>: your url is too long.'), 200);
 	}
 
-	if ( isset( $comment_data['comment_content'] ) && mb_strlen( $comment_data['comment_content'], '8bit' ) > $max_lengths['comment_content'] ) {
-		return new WP_Error( 'comment_content_column_length', __( '<strong>ERROR</strong>: your comment is too long.' ), 200 );
+	if (isset($comment_data['comment_content']) && mb_strlen($comment_data['comment_content'], '8bit') > $max_lengths['comment_content']) {
+		return new WP_Error('comment_content_column_length', __('<strong>ERROR</strong>: your comment is too long.'), 200);
 	}
 
 	return true;
@@ -1173,22 +1173,22 @@ 
 	 * @param string $user_ip    Comment author's IP address.
 	 * @param string $user_agent Comment author's browser user agent.
 	 */
-	do_action( 'wp_blacklist_check', $author, $email, $url, $comment, $user_ip, $user_agent );
+	do_action('wp_blacklist_check', $author, $email, $url, $comment, $user_ip, $user_agent);
 
-	$mod_keys = trim( get_option('blacklist_keys') );
-	if ( '' == $mod_keys )
+	$mod_keys = trim(get_option('blacklist_keys'));
+	if ('' == $mod_keys)
 		return false; // If moderation keys are empty
 
 	// Ensure HTML tags are not being used to bypass the blacklist.
-	$comment_without_html = wp_strip_all_tags( $comment );
+	$comment_without_html = wp_strip_all_tags($comment);
 
-	$words = explode("\n", $mod_keys );
+	$words = explode("\n", $mod_keys);
 
-	foreach ( (array) $words as $word ) {
+	foreach ((array) $words as $word) {
 		$word = trim($word);
 
 		// Skip empty lines
-		if ( empty($word) ) { continue; }
+		if (empty($word)) { continue; }
 
 		// Do some escaping magic so that '#' chars in the
 		// spam words don't break things:
@@ -1225,7 +1225,7 @@ 
  * @param int $post_id Optional. Post ID.
  * @return object|array Comment stats.
  */
-function wp_count_comments( $post_id = 0 ) {
+function wp_count_comments($post_id = 0) {
 	$post_id = (int) $post_id;
 
 	/**
@@ -1236,22 +1236,22 @@ 
 	 * @param array $count   An empty array.
 	 * @param int   $post_id The post ID.
 	 */
-	$filtered = apply_filters( 'wp_count_comments', array(), $post_id );
-	if ( ! empty( $filtered ) ) {
+	$filtered = apply_filters('wp_count_comments', array(), $post_id);
+	if ( ! empty($filtered)) {
 		return $filtered;
 	}
 
-	$count = wp_cache_get( "comments-{$post_id}", 'counts' );
-	if ( false !== $count ) {
+	$count = wp_cache_get("comments-{$post_id}", 'counts');
+	if (false !== $count) {
 		return $count;
 	}
 
-	$stats = get_comment_count( $post_id );
+	$stats = get_comment_count($post_id);
 	$stats['moderated'] = $stats['awaiting_moderation'];
-	unset( $stats['awaiting_moderation'] );
+	unset($stats['awaiting_moderation']);
 
 	$stats_object = (object) $stats;
-	wp_cache_set( "comments-{$post_id}", $stats_object, 'counts' );
+	wp_cache_set("comments-{$post_id}", $stats_object, 'counts');
 
 	return $stats_object;
 }
@@ -1275,10 +1275,10 @@ 
  */
 function wp_delete_comment($comment_id, $force_delete = false) {
 	global $wpdb;
-	if (!$comment = get_comment($comment_id))
+	if ( ! $comment = get_comment($comment_id))
 		return false;
 
-	if ( !$force_delete && EMPTY_TRASH_DAYS && !in_array( wp_get_comment_status( $comment ), array( 'trash', 'spam' ) ) )
+	if ( ! $force_delete && EMPTY_TRASH_DAYS && ! in_array(wp_get_comment_status($comment), array('trash', 'spam')))
 		return wp_trash_comment($comment_id);
 
 	/**
@@ -1288,21 +1288,21 @@ 
 	 *
 	 * @param int $comment_id The comment ID.
 	 */
-	do_action( 'delete_comment', $comment->comment_ID );
+	do_action('delete_comment', $comment->comment_ID);
 
 	// Move children up a level.
-	$children = $wpdb->get_col( $wpdb->prepare("SELECT comment_ID FROM $wpdb->comments WHERE comment_parent = %d", $comment->comment_ID) );
-	if ( !empty($children) ) {
+	$children = $wpdb->get_col($wpdb->prepare("SELECT comment_ID FROM $wpdb->comments WHERE comment_parent = %d", $comment->comment_ID));
+	if ( ! empty($children)) {
 		$wpdb->update($wpdb->comments, array('comment_parent' => $comment->comment_parent), array('comment_parent' => $comment->comment_ID));
 		clean_comment_cache($children);
 	}
 
 	// Delete metadata
-	$meta_ids = $wpdb->get_col( $wpdb->prepare( "SELECT meta_id FROM $wpdb->commentmeta WHERE comment_id = %d", $comment->comment_ID ) );
-	foreach ( $meta_ids as $mid )
-		delete_metadata_by_mid( 'comment', $mid );
+	$meta_ids = $wpdb->get_col($wpdb->prepare("SELECT meta_id FROM $wpdb->commentmeta WHERE comment_id = %d", $comment->comment_ID));
+	foreach ($meta_ids as $mid)
+		delete_metadata_by_mid('comment', $mid);
 
-	if ( ! $wpdb->delete( $wpdb->comments, array( 'comment_ID' => $comment->comment_ID ) ) )
+	if ( ! $wpdb->delete($wpdb->comments, array('comment_ID' => $comment->comment_ID)))
 		return false;
 
 	/**
@@ -1312,16 +1312,16 @@ 
 	 *
 	 * @param int $comment_id The comment ID.
 	 */
-	do_action( 'deleted_comment', $comment->comment_ID );
+	do_action('deleted_comment', $comment->comment_ID);
 
 	$post_id = $comment->comment_post_ID;
-	if ( $post_id && $comment->comment_approved == 1 )
+	if ($post_id && $comment->comment_approved == 1)
 		wp_update_comment_count($post_id);
 
-	clean_comment_cache( $comment->comment_ID );
+	clean_comment_cache($comment->comment_ID);
 
 	/** This action is documented in wp-includes/comment.php */
-	do_action( 'wp_set_comment_status', $comment->comment_ID, 'delete' );
+	do_action('wp_set_comment_status', $comment->comment_ID, 'delete');
 
 	wp_transition_comment_status('delete', $comment->comment_approved, $comment);
 	return true;
@@ -1338,10 +1338,10 @@ 
  * @return bool True on success, false on failure.
  */
 function wp_trash_comment($comment_id) {
-	if ( !EMPTY_TRASH_DAYS )
+	if ( ! EMPTY_TRASH_DAYS)
 		return wp_delete_comment($comment_id, true);
 
-	if ( !$comment = get_comment($comment_id) )
+	if ( ! $comment = get_comment($comment_id))
 		return false;
 
 	/**
@@ -1351,13 +1351,13 @@ 
 	 *
 	 * @param int $comment_id The comment ID.
 	 */
-	do_action( 'trash_comment', $comment->comment_ID );
+	do_action('trash_comment', $comment->comment_ID);
 
-	if ( wp_set_comment_status( $comment, 'trash' ) ) {
-		delete_comment_meta( $comment->comment_ID, '_wp_trash_meta_status' );
-		delete_comment_meta( $comment->comment_ID, '_wp_trash_meta_time' );
-		add_comment_meta( $comment->comment_ID, '_wp_trash_meta_status', $comment->comment_approved );
-		add_comment_meta( $comment->comment_ID, '_wp_trash_meta_time', time() );
+	if (wp_set_comment_status($comment, 'trash')) {
+		delete_comment_meta($comment->comment_ID, '_wp_trash_meta_status');
+		delete_comment_meta($comment->comment_ID, '_wp_trash_meta_time');
+		add_comment_meta($comment->comment_ID, '_wp_trash_meta_status', $comment->comment_approved);
+		add_comment_meta($comment->comment_ID, '_wp_trash_meta_time', time());
 
 		/**
 		 * Fires immediately after a comment is sent to Trash.
@@ -1366,7 +1366,7 @@ 
 		 *
 		 * @param int $comment_id The comment ID.
 		 */
-		do_action( 'trashed_comment', $comment->comment_ID );
+		do_action('trashed_comment', $comment->comment_ID);
 		return true;
 	}
 
@@ -1382,8 +1382,8 @@ 
  * @return bool True on success, false on failure.
  */
 function wp_untrash_comment($comment_id) {
-	$comment = get_comment( $comment_id );
-	if ( ! $comment ) {
+	$comment = get_comment($comment_id);
+	if ( ! $comment) {
 		return false;
 	}
 
@@ -1394,15 +1394,15 @@ 
 	 *
 	 * @param int $comment_id The comment ID.
 	 */
-	do_action( 'untrash_comment', $comment->comment_ID );
+	do_action('untrash_comment', $comment->comment_ID);
 
-	$status = (string) get_comment_meta( $comment->comment_ID, '_wp_trash_meta_status', true );
-	if ( empty($status) )
+	$status = (string) get_comment_meta($comment->comment_ID, '_wp_trash_meta_status', true);
+	if (empty($status))
 		$status = '0';
 
-	if ( wp_set_comment_status( $comment, $status ) ) {
-		delete_comment_meta( $comment->comment_ID, '_wp_trash_meta_time' );
-		delete_comment_meta( $comment->comment_ID, '_wp_trash_meta_status' );
+	if (wp_set_comment_status($comment, $status)) {
+		delete_comment_meta($comment->comment_ID, '_wp_trash_meta_time');
+		delete_comment_meta($comment->comment_ID, '_wp_trash_meta_status');
 		/**
 		 * Fires immediately after a comment is restored from the Trash.
 		 *
@@ -1410,7 +1410,7 @@ 
 		 *
 		 * @param int $comment_id The comment ID.
 		 */
-		do_action( 'untrashed_comment', $comment->comment_ID );
+		do_action('untrashed_comment', $comment->comment_ID);
 		return true;
 	}
 
@@ -1425,9 +1425,9 @@ 
  * @param int|WP_Comment $comment_id Comment ID or WP_Comment object.
  * @return bool True on success, false on failure.
  */
-function wp_spam_comment( $comment_id ) {
-	$comment = get_comment( $comment_id );
-	if ( ! $comment ) {
+function wp_spam_comment($comment_id) {
+	$comment = get_comment($comment_id);
+	if ( ! $comment) {
 		return false;
 	}
 
@@ -1438,13 +1438,13 @@ 
 	 *
 	 * @param int $comment_id The comment ID.
 	 */
-	do_action( 'spam_comment', $comment->comment_ID );
+	do_action('spam_comment', $comment->comment_ID);
 
-	if ( wp_set_comment_status( $comment, 'spam' ) ) {
-		delete_comment_meta( $comment->comment_ID, '_wp_trash_meta_status' );
-		delete_comment_meta( $comment->comment_ID, '_wp_trash_meta_time' );
-		add_comment_meta( $comment->comment_ID, '_wp_trash_meta_status', $comment->comment_approved );
-		add_comment_meta( $comment->comment_ID, '_wp_trash_meta_time', time() );
+	if (wp_set_comment_status($comment, 'spam')) {
+		delete_comment_meta($comment->comment_ID, '_wp_trash_meta_status');
+		delete_comment_meta($comment->comment_ID, '_wp_trash_meta_time');
+		add_comment_meta($comment->comment_ID, '_wp_trash_meta_status', $comment->comment_approved);
+		add_comment_meta($comment->comment_ID, '_wp_trash_meta_time', time());
 		/**
 		 * Fires immediately after a comment is marked as Spam.
 		 *
@@ -1452,7 +1452,7 @@ 
 		 *
 		 * @param int $comment_id The comment ID.
 		 */
-		do_action( 'spammed_comment', $comment->comment_ID );
+		do_action('spammed_comment', $comment->comment_ID);
 		return true;
 	}
 
@@ -1467,9 +1467,9 @@ 
  * @param int|WP_Comment $comment_id Comment ID or WP_Comment object.
  * @return bool True on success, false on failure.
  */
-function wp_unspam_comment( $comment_id ) {
-	$comment = get_comment( $comment_id );
-	if ( ! $comment ) {
+function wp_unspam_comment($comment_id) {
+	$comment = get_comment($comment_id);
+	if ( ! $comment) {
 		return false;
 	}
 
@@ -1480,15 +1480,15 @@ 
 	 *
 	 * @param int $comment_id The comment ID.
 	 */
-	do_action( 'unspam_comment', $comment->comment_ID );
+	do_action('unspam_comment', $comment->comment_ID);
 
-	$status = (string) get_comment_meta( $comment->comment_ID, '_wp_trash_meta_status', true );
-	if ( empty($status) )
+	$status = (string) get_comment_meta($comment->comment_ID, '_wp_trash_meta_status', true);
+	if (empty($status))
 		$status = '0';
 
-	if ( wp_set_comment_status( $comment, $status ) ) {
-		delete_comment_meta( $comment->comment_ID, '_wp_trash_meta_status' );
-		delete_comment_meta( $comment->comment_ID, '_wp_trash_meta_time' );
+	if (wp_set_comment_status($comment, $status)) {
+		delete_comment_meta($comment->comment_ID, '_wp_trash_meta_status');
+		delete_comment_meta($comment->comment_ID, '_wp_trash_meta_time');
 		/**
 		 * Fires immediately after a comment is unmarked as Spam.
 		 *
@@ -1496,7 +1496,7 @@ 
 		 *
 		 * @param int $comment_id The comment ID.
 		 */
-		do_action( 'unspammed_comment', $comment->comment_ID );
+		do_action('unspammed_comment', $comment->comment_ID);
 		return true;
 	}
 
@@ -1513,20 +1513,20 @@ 
  */
 function wp_get_comment_status($comment_id) {
 	$comment = get_comment($comment_id);
-	if ( !$comment )
+	if ( ! $comment)
 		return false;
 
 	$approved = $comment->comment_approved;
 
-	if ( $approved == null )
+	if ($approved == null)
 		return false;
-	elseif ( $approved == '1' )
+	elseif ($approved == '1')
 		return 'approved';
-	elseif ( $approved == '0' )
+	elseif ($approved == '0')
 		return 'unapproved';
-	elseif ( $approved == 'spam' )
+	elseif ($approved == 'spam')
 		return 'spam';
-	elseif ( $approved == 'trash' )
+	elseif ($approved == 'trash')
 		return 'trash';
 	else
 		return false;
@@ -1562,11 +1562,11 @@ 
 		1         => 'approved',
 		'approve' => 'approved', // wp_set_comment_status() uses "approve"
 	);
-	if ( isset($comment_statuses[$new_status]) ) $new_status = $comment_statuses[$new_status];
-	if ( isset($comment_statuses[$old_status]) ) $old_status = $comment_statuses[$old_status];
+	if (isset($comment_statuses[$new_status])) $new_status = $comment_statuses[$new_status];
+	if (isset($comment_statuses[$old_status])) $old_status = $comment_statuses[$old_status];
 
 	// Call the hooks
-	if ( $new_status != $old_status ) {
+	if ($new_status != $old_status) {
 		/**
 		 * Fires when the comment status is in transition.
 		 *
@@ -1576,7 +1576,7 @@ 
 		 * @param int|string $old_status The old comment status.
 		 * @param object     $comment    The comment data.
 		 */
-		do_action( 'transition_comment_status', $new_status, $old_status, $comment );
+		do_action('transition_comment_status', $new_status, $old_status, $comment);
 		/**
 		 * Fires when the comment status is in transition from one specific status to another.
 		 *
@@ -1587,7 +1587,7 @@ 
 		 *
 		 * @param WP_Comment $comment Comment object.
 		 */
-		do_action( "comment_{$old_status}_to_{$new_status}", $comment );
+		do_action("comment_{$old_status}_to_{$new_status}", $comment);
 	}
 	/**
 	 * Fires when the status of a specific comment type is in transition.
@@ -1603,7 +1603,7 @@ 
 	 * @param int        $comment_ID The comment ID.
 	 * @param WP_Comment $comment    Comment object.
 	 */
-	do_action( "comment_{$new_status}_{$comment->comment_type}", $comment->comment_ID, $comment );
+	do_action("comment_{$new_status}_{$comment->comment_type}", $comment->comment_ID, $comment);
 }
 
 /**
@@ -1618,10 +1618,10 @@ 
  * @param string $new_status The new comment status.
  * @param string $old_status The old comment status.
  */
-function _clear_modified_cache_on_transition_comment_status( $new_status, $old_status ) {
-	if ( 'approved' === $new_status || 'approved' === $old_status ) {
-		foreach ( array( 'server', 'gmt', 'blog' ) as $timezone ) {
-			wp_cache_delete( "lastcommentmodified:$timezone", 'timeinfo' );
+function _clear_modified_cache_on_transition_comment_status($new_status, $old_status) {
+	if ('approved' === $new_status || 'approved' === $old_status) {
+		foreach (array('server', 'gmt', 'blog') as $timezone) {
+			wp_cache_delete("lastcommentmodified:$timezone", 'timeinfo');
 		}
 	}
 }
@@ -1642,15 +1642,15 @@ 
 	// Cookies should already be sanitized.
 
 	$comment_author = '';
-	if ( isset($_COOKIE['comment_author_'.COOKIEHASH]) )
+	if (isset($_COOKIE['comment_author_'.COOKIEHASH]))
 		$comment_author = $_COOKIE['comment_author_'.COOKIEHASH];
 
 	$comment_author_email = '';
-	if ( isset($_COOKIE['comment_author_email_'.COOKIEHASH]) )
+	if (isset($_COOKIE['comment_author_email_'.COOKIEHASH]))
 		$comment_author_email = $_COOKIE['comment_author_email_'.COOKIEHASH];
 
 	$comment_author_url = '';
-	if ( isset($_COOKIE['comment_author_url_'.COOKIEHASH]) )
+	if (isset($_COOKIE['comment_author_url_'.COOKIEHASH]))
 		$comment_author_url = $_COOKIE['comment_author_url_'.COOKIEHASH];
 
 	/**
@@ -1666,7 +1666,7 @@ 
 	 *     @type string $comment_author_url   The URL address of the `$comment_author`. Default empty.
 	 * }
 	 */
-	return apply_filters( 'wp_get_current_commenter', compact('comment_author', 'comment_author_email', 'comment_author_url') );
+	return apply_filters('wp_get_current_commenter', compact('comment_author', 'comment_author_email', 'comment_author_url'));
 }
 
 /**
@@ -1704,51 +1704,51 @@ 
  * }
  * @return int|false The new comment's ID on success, false on failure.
  */
-function wp_insert_comment( $commentdata ) {
+function wp_insert_comment($commentdata) {
 	global $wpdb;
-	$data = wp_unslash( $commentdata );
+	$data = wp_unslash($commentdata);
 
-	$comment_author       = ! isset( $data['comment_author'] )       ? '' : $data['comment_author'];
-	$comment_author_email = ! isset( $data['comment_author_email'] ) ? '' : $data['comment_author_email'];
-	$comment_author_url   = ! isset( $data['comment_author_url'] )   ? '' : $data['comment_author_url'];
-	$comment_author_IP    = ! isset( $data['comment_author_IP'] )    ? '' : $data['comment_author_IP'];
+	$comment_author       = ! isset($data['comment_author']) ? '' : $data['comment_author'];
+	$comment_author_email = ! isset($data['comment_author_email']) ? '' : $data['comment_author_email'];
+	$comment_author_url   = ! isset($data['comment_author_url']) ? '' : $data['comment_author_url'];
+	$comment_author_IP    = ! isset($data['comment_author_IP']) ? '' : $data['comment_author_IP'];
 
-	$comment_date     = ! isset( $data['comment_date'] )     ? current_time( 'mysql' )            : $data['comment_date'];
-	$comment_date_gmt = ! isset( $data['comment_date_gmt'] ) ? get_gmt_from_date( $comment_date ) : $data['comment_date_gmt'];
+	$comment_date     = ! isset($data['comment_date']) ? current_time('mysql') : $data['comment_date'];
+	$comment_date_gmt = ! isset($data['comment_date_gmt']) ? get_gmt_from_date($comment_date) : $data['comment_date_gmt'];
 
-	$comment_post_ID  = ! isset( $data['comment_post_ID'] )  ? 0  : $data['comment_post_ID'];
-	$comment_content  = ! isset( $data['comment_content'] )  ? '' : $data['comment_content'];
-	$comment_karma    = ! isset( $data['comment_karma'] )    ? 0  : $data['comment_karma'];
-	$comment_approved = ! isset( $data['comment_approved'] ) ? 1  : $data['comment_approved'];
-	$comment_agent    = ! isset( $data['comment_agent'] )    ? '' : $data['comment_agent'];
-	$comment_type     = ! isset( $data['comment_type'] )     ? '' : $data['comment_type'];
-	$comment_parent   = ! isset( $data['comment_parent'] )   ? 0  : $data['comment_parent'];
+	$comment_post_ID  = ! isset($data['comment_post_ID']) ? 0 : $data['comment_post_ID'];
+	$comment_content  = ! isset($data['comment_content']) ? '' : $data['comment_content'];
+	$comment_karma    = ! isset($data['comment_karma']) ? 0 : $data['comment_karma'];
+	$comment_approved = ! isset($data['comment_approved']) ? 1 : $data['comment_approved'];
+	$comment_agent    = ! isset($data['comment_agent']) ? '' : $data['comment_agent'];
+	$comment_type     = ! isset($data['comment_type']) ? '' : $data['comment_type'];
+	$comment_parent   = ! isset($data['comment_parent']) ? 0 : $data['comment_parent'];
 
-	$user_id  = ! isset( $data['user_id'] ) ? 0 : $data['user_id'];
+	$user_id = ! isset($data['user_id']) ? 0 : $data['user_id'];
 
-	$compacted = compact( 'comment_post_ID', 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_author_IP', 'comment_date', 'comment_date_gmt', 'comment_content', 'comment_karma', 'comment_approved', 'comment_agent', 'comment_type', 'comment_parent', 'user_id' );
-	if ( ! $wpdb->insert( $wpdb->comments, $compacted ) ) {
+	$compacted = compact('comment_post_ID', 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_author_IP', 'comment_date', 'comment_date_gmt', 'comment_content', 'comment_karma', 'comment_approved', 'comment_agent', 'comment_type', 'comment_parent', 'user_id');
+	if ( ! $wpdb->insert($wpdb->comments, $compacted)) {
 		return false;
 	}
 
 	$id = (int) $wpdb->insert_id;
 
-	if ( $comment_approved == 1 ) {
-		wp_update_comment_count( $comment_post_ID );
+	if ($comment_approved == 1) {
+		wp_update_comment_count($comment_post_ID);
 
-		foreach ( array( 'server', 'gmt', 'blog' ) as $timezone ) {
-			wp_cache_delete( "lastcommentmodified:$timezone", 'timeinfo' );
+		foreach (array('server', 'gmt', 'blog') as $timezone) {
+			wp_cache_delete("lastcommentmodified:$timezone", 'timeinfo');
 		}
 	}
 
-	clean_comment_cache( $id );
+	clean_comment_cache($id);
 
-	$comment = get_comment( $id );
+	$comment = get_comment($id);
 
 	// If metadata is provided, store it.
-	if ( isset( $commentdata['comment_meta'] ) && is_array( $commentdata['comment_meta'] ) ) {
-		foreach ( $commentdata['comment_meta'] as $meta_key => $meta_value ) {
-			add_comment_meta( $comment->comment_ID, $meta_key, $meta_value, true );
+	if (isset($commentdata['comment_meta']) && is_array($commentdata['comment_meta'])) {
+		foreach ($commentdata['comment_meta'] as $meta_key => $meta_value) {
+			add_comment_meta($comment->comment_ID, $meta_key, $meta_value, true);
 		}
 	}
 
@@ -1760,7 +1760,7 @@ 
 	 * @param int        $id      The comment ID.
 	 * @param WP_Comment $comment Comment object.
 	 */
-	do_action( 'wp_insert_comment', $id, $comment );
+	do_action('wp_insert_comment', $id, $comment);
 
 	return $id;
 }
@@ -1778,7 +1778,7 @@ 
  * @return array Parsed comment information.
  */
 function wp_filter_comment($commentdata) {
-	if ( isset( $commentdata['user_ID'] ) ) {
+	if (isset($commentdata['user_ID'])) {
 		/**
 		 * Filters the comment author's user id before it is set.
 		 *
@@ -1789,10 +1789,10 @@ 
 		 *
 		 * @param int $user_ID The comment author's user ID.
 		 */
-		$commentdata['user_id'] = apply_filters( 'pre_user_id', $commentdata['user_ID'] );
-	} elseif ( isset( $commentdata['user_id'] ) ) {
+		$commentdata['user_id'] = apply_filters('pre_user_id', $commentdata['user_ID']);
+	} elseif (isset($commentdata['user_id'])) {
 		/** This filter is documented in wp-includes/comment.php */
-		$commentdata['user_id'] = apply_filters( 'pre_user_id', $commentdata['user_id'] );
+		$commentdata['user_id'] = apply_filters('pre_user_id', $commentdata['user_id']);
 	}
 
 	/**
@@ -1802,9 +1802,9 @@ 
 	 *
 	 * @param string $comment_agent The comment author's browser user agent.
 	 */
-	$commentdata['comment_agent'] = apply_filters( 'pre_comment_user_agent', ( isset( $commentdata['comment_agent'] ) ? $commentdata['comment_agent'] : '' ) );
+	$commentdata['comment_agent'] = apply_filters('pre_comment_user_agent', (isset($commentdata['comment_agent']) ? $commentdata['comment_agent'] : ''));
 	/** This filter is documented in wp-includes/comment.php */
-	$commentdata['comment_author'] = apply_filters( 'pre_comment_author_name', $commentdata['comment_author'] );
+	$commentdata['comment_author'] = apply_filters('pre_comment_author_name', $commentdata['comment_author']);
 	/**
 	 * Filters the comment content before it is set.
 	 *
@@ -1812,7 +1812,7 @@ 
 	 *
 	 * @param string $comment_content The comment content.
 	 */
-	$commentdata['comment_content'] = apply_filters( 'pre_comment_content', $commentdata['comment_content'] );
+	$commentdata['comment_content'] = apply_filters('pre_comment_content', $commentdata['comment_content']);
 	/**
 	 * Filters the comment author's IP before it is set.
 	 *
@@ -1820,11 +1820,11 @@ 
 	 *
 	 * @param string $comment_author_ip The comment author's IP.
 	 */
-	$commentdata['comment_author_IP'] = apply_filters( 'pre_comment_user_ip', $commentdata['comment_author_IP'] );
+	$commentdata['comment_author_IP'] = apply_filters('pre_comment_user_ip', $commentdata['comment_author_IP']);
 	/** This filter is documented in wp-includes/comment.php */
-	$commentdata['comment_author_url'] = apply_filters( 'pre_comment_author_url', $commentdata['comment_author_url'] );
+	$commentdata['comment_author_url'] = apply_filters('pre_comment_author_url', $commentdata['comment_author_url']);
 	/** This filter is documented in wp-includes/comment.php */
-	$commentdata['comment_author_email'] = apply_filters( 'pre_comment_author_email', $commentdata['comment_author_email'] );
+	$commentdata['comment_author_email'] = apply_filters('pre_comment_author_email', $commentdata['comment_author_email']);
 	$commentdata['filtered'] = true;
 	return $commentdata;
 }
@@ -1840,9 +1840,9 @@ 
  * @return bool Whether comment should be blocked.
  */
 function wp_throttle_comment_flood($block, $time_lastcomment, $time_newcomment) {
-	if ( $block ) // a plugin has already blocked... we'll let that decision stand
+	if ($block) // a plugin has already blocked... we'll let that decision stand
 		return $block;
-	if ( ($time_newcomment - $time_lastcomment) < 15 )
+	if (($time_newcomment - $time_lastcomment) < 15)
 		return true;
 	return false;
 }
@@ -1891,14 +1891,14 @@ 
  *                        executing wp_die()? Default false.
  * @return int|false|WP_Error The ID of the comment on success, false or WP_Error on failure.
  */
-function wp_new_comment( $commentdata, $avoid_die = false ) {
+function wp_new_comment($commentdata, $avoid_die = false) {
 	global $wpdb;
 
-	if ( isset( $commentdata['user_ID'] ) ) {
+	if (isset($commentdata['user_ID'])) {
 		$commentdata['user_id'] = $commentdata['user_ID'] = (int) $commentdata['user_ID'];
 	}
 
-	$prefiltered_user_id = ( isset( $commentdata['user_id'] ) ) ? (int) $commentdata['user_id'] : 0;
+	$prefiltered_user_id = (isset($commentdata['user_id'])) ? (int) $commentdata['user_id'] : 0;
 
 	/**
 	 * Filters a comment's data before it is sanitized and inserted into the database.
@@ -1907,63 +1907,63 @@ 
 	 *
 	 * @param array $commentdata Comment data.
 	 */
-	$commentdata = apply_filters( 'preprocess_comment', $commentdata );
+	$commentdata = apply_filters('preprocess_comment', $commentdata);
 
 	$commentdata['comment_post_ID'] = (int) $commentdata['comment_post_ID'];
-	if ( isset( $commentdata['user_ID'] ) && $prefiltered_user_id !== (int) $commentdata['user_ID'] ) {
+	if (isset($commentdata['user_ID']) && $prefiltered_user_id !== (int) $commentdata['user_ID']) {
 		$commentdata['user_id'] = $commentdata['user_ID'] = (int) $commentdata['user_ID'];
-	} elseif ( isset( $commentdata['user_id'] ) ) {
+	} elseif (isset($commentdata['user_id'])) {
 		$commentdata['user_id'] = (int) $commentdata['user_id'];
 	}
 
 	$commentdata['comment_parent'] = isset($commentdata['comment_parent']) ? absint($commentdata['comment_parent']) : 0;
-	$parent_status = ( 0 < $commentdata['comment_parent'] ) ? wp_get_comment_status($commentdata['comment_parent']) : '';
-	$commentdata['comment_parent'] = ( 'approved' == $parent_status || 'unapproved' == $parent_status ) ? $commentdata['comment_parent'] : 0;
+	$parent_status = (0 < $commentdata['comment_parent']) ? wp_get_comment_status($commentdata['comment_parent']) : '';
+	$commentdata['comment_parent'] = ('approved' == $parent_status || 'unapproved' == $parent_status) ? $commentdata['comment_parent'] : 0;
 
-	if ( ! isset( $commentdata['comment_author_IP'] ) ) {
+	if ( ! isset($commentdata['comment_author_IP'])) {
 		$commentdata['comment_author_IP'] = $_SERVER['REMOTE_ADDR'];
 	}
-	$commentdata['comment_author_IP'] = preg_replace( '/[^0-9a-fA-F:., ]/', '', $commentdata['comment_author_IP'] );
+	$commentdata['comment_author_IP'] = preg_replace('/[^0-9a-fA-F:., ]/', '', $commentdata['comment_author_IP']);
 
-	if ( ! isset( $commentdata['comment_agent'] ) ) {
-		$commentdata['comment_agent'] = isset( $_SERVER['HTTP_USER_AGENT'] ) ? $_SERVER['HTTP_USER_AGENT']: '';
+	if ( ! isset($commentdata['comment_agent'])) {
+		$commentdata['comment_agent'] = isset($_SERVER['HTTP_USER_AGENT']) ? $_SERVER['HTTP_USER_AGENT'] : '';
 	}
-	$commentdata['comment_agent'] = substr( $commentdata['comment_agent'], 0, 254 );
+	$commentdata['comment_agent'] = substr($commentdata['comment_agent'], 0, 254);
 
-	if ( empty( $commentdata['comment_date'] ) ) {
+	if (empty($commentdata['comment_date'])) {
 		$commentdata['comment_date'] = current_time('mysql');
 	}
 
-	if ( empty( $commentdata['comment_date_gmt'] ) ) {
-		$commentdata['comment_date_gmt'] = current_time( 'mysql', 1 );
+	if (empty($commentdata['comment_date_gmt'])) {
+		$commentdata['comment_date_gmt'] = current_time('mysql', 1);
 	}
 
 	$commentdata = wp_filter_comment($commentdata);
 
-	$commentdata['comment_approved'] = wp_allow_comment( $commentdata, $avoid_die );
-	if ( is_wp_error( $commentdata['comment_approved'] ) ) {
+	$commentdata['comment_approved'] = wp_allow_comment($commentdata, $avoid_die);
+	if (is_wp_error($commentdata['comment_approved'])) {
 		return $commentdata['comment_approved'];
 	}
 
 	$comment_ID = wp_insert_comment($commentdata);
-	if ( ! $comment_ID ) {
-		$fields = array( 'comment_author', 'comment_author_email', 'comment_author_url', 'comment_content' );
+	if ( ! $comment_ID) {
+		$fields = array('comment_author', 'comment_author_email', 'comment_author_url', 'comment_content');
 
-		foreach ( $fields as $field ) {
-			if ( isset( $commentdata[ $field ] ) ) {
-				$commentdata[ $field ] = $wpdb->strip_invalid_text_for_column( $wpdb->comments, $field, $commentdata[ $field ] );
+		foreach ($fields as $field) {
+			if (isset($commentdata[$field])) {
+				$commentdata[$field] = $wpdb->strip_invalid_text_for_column($wpdb->comments, $field, $commentdata[$field]);
 			}
 		}
 
-		$commentdata = wp_filter_comment( $commentdata );
+		$commentdata = wp_filter_comment($commentdata);
 
-		$commentdata['comment_approved'] = wp_allow_comment( $commentdata, $avoid_die );
-		if ( is_wp_error( $commentdata['comment_approved'] ) ) {
+		$commentdata['comment_approved'] = wp_allow_comment($commentdata, $avoid_die);
+		if (is_wp_error($commentdata['comment_approved'])) {
 			return $commentdata['comment_approved'];
 		}
 
-		$comment_ID = wp_insert_comment( $commentdata );
-		if ( ! $comment_ID ) {
+		$comment_ID = wp_insert_comment($commentdata);
+		if ( ! $comment_ID) {
 			return false;
 		}
 	}
@@ -1978,7 +1978,7 @@ 
 	 * @param int|string $comment_approved 1 if the comment is approved, 0 if not, 'spam' if spam.
 	 * @param array      $commentdata      Comment data.
 	 */
-	do_action( 'comment_post', $comment_ID, $commentdata['comment_approved'], $commentdata );
+	do_action('comment_post', $comment_ID, $commentdata['comment_approved'], $commentdata);
 
 	return $comment_ID;
 }
@@ -1991,20 +1991,20 @@ 
  * @param int $comment_ID ID of the comment.
  * @return bool True on success, false on failure.
  */
-function wp_new_comment_notify_moderator( $comment_ID ) {
-	$comment = get_comment( $comment_ID );
+function wp_new_comment_notify_moderator($comment_ID) {
+	$comment = get_comment($comment_ID);
 
 	// Only send notifications for pending comments.
-	$maybe_notify = ( '0' == $comment->comment_approved );
+	$maybe_notify = ('0' == $comment->comment_approved);
 
 	/** This filter is documented in wp-includes/comment.php */
-	$maybe_notify = apply_filters( 'notify_moderator', $maybe_notify, $comment_ID );
+	$maybe_notify = apply_filters('notify_moderator', $maybe_notify, $comment_ID);
 
-	if ( ! $maybe_notify ) {
+	if ( ! $maybe_notify) {
 		return false;
 	}
 
-	return wp_notify_moderator( $comment_ID );
+	return wp_notify_moderator($comment_ID);
 }
 
 /**
@@ -2018,10 +2018,10 @@ 
  * @param int $comment_ID Comment ID.
  * @return bool True on success, false on failure.
  */
-function wp_new_comment_notify_postauthor( $comment_ID ) {
-	$comment = get_comment( $comment_ID );
+function wp_new_comment_notify_postauthor($comment_ID) {
+	$comment = get_comment($comment_ID);
 
-	$maybe_notify = get_option( 'comments_notify' );
+	$maybe_notify = get_option('comments_notify');
 
 	/**
 	 * Filters whether to send the post author new comment notification emails,
@@ -2032,22 +2032,22 @@ 
 	 * @param bool $maybe_notify Whether to notify the post author about the new comment.
 	 * @param int  $comment_ID   The ID of the comment for the notification.
 	 */
-	$maybe_notify = apply_filters( 'notify_post_author', $maybe_notify, $comment_ID );
+	$maybe_notify = apply_filters('notify_post_author', $maybe_notify, $comment_ID);
 
 	/*
 	 * wp_notify_postauthor() checks if notifying the author of their own comment.
 	 * By default, it won't, but filters can override this.
 	 */
-	if ( ! $maybe_notify ) {
+	if ( ! $maybe_notify) {
 		return false;
 	}
 
 	// Only send notifications for approved comments.
-	if ( ! isset( $comment->comment_approved ) || '1' != $comment->comment_approved ) {
+	if ( ! isset($comment->comment_approved) || '1' != $comment->comment_approved) {
 		return false;
 	}
 
-	return wp_notify_postauthor( $comment_ID );
+	return wp_notify_postauthor($comment_ID);
 }
 
 /**
@@ -2068,7 +2068,7 @@ 
 function wp_set_comment_status($comment_id, $comment_status, $wp_error = false) {
 	global $wpdb;
 
-	switch ( $comment_status ) {
+	switch ($comment_status) {
 		case 'hold':
 		case '0':
 			$status = '0';
@@ -2076,7 +2076,7 @@ 
 		case 'approve':
 		case '1':
 			$status = '1';
-			add_action( 'wp_set_comment_status', 'wp_new_comment_notify_postauthor' );
+			add_action('wp_set_comment_status', 'wp_new_comment_notify_postauthor');
 			break;
 		case 'spam':
 			$status = 'spam';
@@ -2090,16 +2090,16 @@ 
 
 	$comment_old = clone get_comment($comment_id);
 
-	if ( !$wpdb->update( $wpdb->comments, array('comment_approved' => $status), array( 'comment_ID' => $comment_old->comment_ID ) ) ) {
-		if ( $wp_error )
+	if ( ! $wpdb->update($wpdb->comments, array('comment_approved' => $status), array('comment_ID' => $comment_old->comment_ID))) {
+		if ($wp_error)
 			return new WP_Error('db_update_error', __('Could not update comment status'), $wpdb->last_error);
 		else
 			return false;
 	}
 
-	clean_comment_cache( $comment_old->comment_ID );
+	clean_comment_cache($comment_old->comment_ID);
 
-	$comment = get_comment( $comment_old->comment_ID );
+	$comment = get_comment($comment_old->comment_ID);
 
 	/**
 	 * Fires immediately before transitioning a comment's status from one to another
@@ -2111,7 +2111,7 @@ 
 	 * @param string|bool $comment_status Current comment status. Possible values include
 	 *                                    'hold', 'approve', 'spam', 'trash', or false.
 	 */
-	do_action( 'wp_set_comment_status', $comment->comment_ID, $comment_status );
+	do_action('wp_set_comment_status', $comment->comment_ID, $comment_status);
 
 	wp_transition_comment_status($comment_status, $comment_old->comment_approved, $comment);
 
@@ -2137,12 +2137,12 @@ 
 
 	// First, get all of the original fields
 	$comment = get_comment($commentarr['comment_ID'], ARRAY_A);
-	if ( empty( $comment ) ) {
+	if (empty($comment)) {
 		return 0;
 	}
 
 	// Make sure that the comment post ID is valid (if specified).
-	if ( ! empty( $commentarr['comment_post_ID'] ) && ! get_post( $commentarr['comment_post_ID'] ) ) {
+	if ( ! empty($commentarr['comment_post_ID']) && ! get_post($commentarr['comment_post_ID'])) {
 		return 0;
 	}
 
@@ -2154,10 +2154,10 @@ 
 	// Merge old and new fields with new fields overwriting old ones.
 	$commentarr = array_merge($comment, $commentarr);
 
-	$commentarr = wp_filter_comment( $commentarr );
+	$commentarr = wp_filter_comment($commentarr);
 
 	// Now extract the merged array.
-	$data = wp_unslash( $commentarr );
+	$data = wp_unslash($commentarr);
 
 	/**
 	 * Filters the comment content before it is updated in the database.
@@ -2166,15 +2166,15 @@ 
 	 *
 	 * @param string $comment_content The comment data.
 	 */
-	$data['comment_content'] = apply_filters( 'comment_save_pre', $data['comment_content'] );
+	$data['comment_content'] = apply_filters('comment_save_pre', $data['comment_content']);
 
-	$data['comment_date_gmt'] = get_gmt_from_date( $data['comment_date'] );
+	$data['comment_date_gmt'] = get_gmt_from_date($data['comment_date']);
 
-	if ( ! isset( $data['comment_approved'] ) ) {
+	if ( ! isset($data['comment_approved'])) {
 		$data['comment_approved'] = 1;
-	} elseif ( 'hold' == $data['comment_approved'] ) {
+	} elseif ('hold' == $data['comment_approved']) {
 		$data['comment_approved'] = 0;
-	} elseif ( 'approve' == $data['comment_approved'] ) {
+	} elseif ('approve' == $data['comment_approved']) {
 		$data['comment_approved'] = 1;
 	}
 
@@ -2192,15 +2192,15 @@ 
 	 * @param array $comment    The old, unslashed comment data.
 	 * @param array $commentarr The new, raw comment data.
 	 */
-	$data = apply_filters( 'wp_update_comment_data', $data, $comment, $commentarr );
+	$data = apply_filters('wp_update_comment_data', $data, $comment, $commentarr);
 
-	$keys = array( 'comment_post_ID', 'comment_content', 'comment_author', 'comment_author_email', 'comment_approved', 'comment_karma', 'comment_author_url', 'comment_date', 'comment_date_gmt', 'comment_type', 'comment_parent', 'user_id', 'comment_agent', 'comment_author_IP' );
-	$data = wp_array_slice_assoc( $data, $keys );
+	$keys = array('comment_post_ID', 'comment_content', 'comment_author', 'comment_author_email', 'comment_approved', 'comment_karma', 'comment_author_url', 'comment_date', 'comment_date_gmt', 'comment_type', 'comment_parent', 'user_id', 'comment_agent', 'comment_author_IP');
+	$data = wp_array_slice_assoc($data, $keys);
 
-	$rval = $wpdb->update( $wpdb->comments, $data, compact( 'comment_ID' ) );
+	$rval = $wpdb->update($wpdb->comments, $data, compact('comment_ID'));
 
-	clean_comment_cache( $comment_ID );
-	wp_update_comment_count( $comment_post_ID );
+	clean_comment_cache($comment_ID);
+	wp_update_comment_count($comment_post_ID);
 	/**
 	 * Fires immediately after a comment is updated in the database.
 	 *
@@ -2212,7 +2212,7 @@ 
 	 * @param int   $comment_ID The comment ID.
 	 * @param array $data       Comment data.
 	 */
-	do_action( 'edit_comment', $comment_ID, $data );
+	do_action('edit_comment', $comment_ID, $data);
 	$comment = get_comment($comment_ID);
 	wp_transition_comment_status($comment->comment_approved, $old_status, $comment);
 	return $rval;
@@ -2232,14 +2232,14 @@ 
  * @param bool $defer
  * @return bool
  */
-function wp_defer_comment_counting($defer=null) {
+function wp_defer_comment_counting($defer = null) {
 	static $_defer = false;
 
-	if ( is_bool($defer) ) {
+	if (is_bool($defer)) {
 		$_defer = $defer;
 		// flush any deferred counts
-		if ( !$defer )
-			wp_update_comment_count( null, true );
+		if ( ! $defer)
+			wp_update_comment_count(null, true);
 	}
 
 	return $_defer;
@@ -2267,26 +2267,26 @@ 
  * @return bool|void True on success, false on failure or if post with ID does
  *                   not exist.
  */
-function wp_update_comment_count($post_id, $do_deferred=false) {
+function wp_update_comment_count($post_id, $do_deferred = false) {
 	static $_deferred = array();
 
-	if ( empty( $post_id ) && ! $do_deferred ) {
+	if (empty($post_id) && ! $do_deferred) {
 		return false;
 	}
 
-	if ( $do_deferred ) {
+	if ($do_deferred) {
 		$_deferred = array_unique($_deferred);
-		foreach ( $_deferred as $i => $_post_id ) {
+		foreach ($_deferred as $i => $_post_id) {
 			wp_update_comment_count_now($_post_id);
-			unset( $_deferred[$i] ); /** @todo Move this outside of the foreach and reset $_deferred to an array instead */
+			unset($_deferred[$i]); /** @todo Move this outside of the foreach and reset $_deferred to an array instead */
 		}
 	}
 
-	if ( wp_defer_comment_counting() ) {
+	if (wp_defer_comment_counting()) {
 		$_deferred[] = $post_id;
 		return true;
 	}
-	elseif ( $post_id ) {
+	elseif ($post_id) {
 		return wp_update_comment_count_now($post_id);
 	}
 
@@ -2305,13 +2305,13 @@ 
 function wp_update_comment_count_now($post_id) {
 	global $wpdb;
 	$post_id = (int) $post_id;
-	if ( !$post_id )
+	if ( ! $post_id)
 		return false;
 
-	wp_cache_delete( 'comments-0', 'counts' );
-	wp_cache_delete( "comments-{$post_id}", 'counts' );
+	wp_cache_delete('comments-0', 'counts');
+	wp_cache_delete("comments-{$post_id}", 'counts');
 
-	if ( !$post = get_post($post_id) )
+	if ( ! $post = get_post($post_id))
 		return false;
 
 	$old = (int) $post->comment_count;
@@ -2325,17 +2325,17 @@ 
 	 * @param int $old     The old comment count.
 	 * @param int $post_id Post ID.
 	 */
-	$new = apply_filters( 'pre_wp_update_comment_count_now', null, $old, $post_id );
+	$new = apply_filters('pre_wp_update_comment_count_now', null, $old, $post_id);
 
-	if ( is_null( $new ) ) {
-		$new = (int) $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_approved = '1'", $post_id ) );
+	if (is_null($new)) {
+		$new = (int) $wpdb->get_var($wpdb->prepare("SELECT COUNT(*) FROM $wpdb->comments WHERE comment_post_ID = %d AND comment_approved = '1'", $post_id));
 	} else {
 		$new = (int) $new;
 	}
 
-	$wpdb->update( $wpdb->posts, array('comment_count' => $new), array('ID' => $post_id) );
+	$wpdb->update($wpdb->posts, array('comment_count' => $new), array('ID' => $post_id));
 
-	clean_post_cache( $post );
+	clean_post_cache($post);
 
 	/**
 	 * Fires immediately after a post's comment count is updated in the database.
@@ -2346,9 +2346,9 @@ 
 	 * @param int $new     The new comment count.
 	 * @param int $old     The old comment count.
 	 */
-	do_action( 'wp_update_comment_count', $post_id, $new, $old );
+	do_action('wp_update_comment_count', $post_id, $new, $old);
 	/** This action is documented in wp-includes/post.php */
-	do_action( 'edit_post', $post_id, $post );
+	do_action('edit_post', $post_id, $post);
 
 	return true;
 }
@@ -2370,9 +2370,9 @@ 
  * @param int $deprecated Not Used.
  * @return false|string False on failure, string containing URI on success.
  */
-function discover_pingback_server_uri( $url, $deprecated = '' ) {
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '2.7.0' );
+function discover_pingback_server_uri($url, $deprecated = '') {
+	if ( ! empty($deprecated))
+		_deprecated_argument(__FUNCTION__, '2.7.0');
 
 	$pingback_str_dquote = 'rel="pingback"';
 	$pingback_str_squote = 'rel=\'pingback\'';
@@ -2380,47 +2380,47 @@ 
 	/** @todo Should use Filter Extension or custom preg_match instead. */
 	$parsed_url = parse_url($url);
 
-	if ( ! isset( $parsed_url['host'] ) ) // Not a URL. This should never happen.
+	if ( ! isset($parsed_url['host'])) // Not a URL. This should never happen.
 		return false;
 
 	//Do not search for a pingback server on our own uploads
 	$uploads_dir = wp_get_upload_dir();
-	if ( 0 === strpos($url, $uploads_dir['baseurl']) )
+	if (0 === strpos($url, $uploads_dir['baseurl']))
 		return false;
 
-	$response = wp_safe_remote_head( $url, array( 'timeout' => 2, 'httpversion' => '1.0' ) );
+	$response = wp_safe_remote_head($url, array('timeout' => 2, 'httpversion' => '1.0'));
 
-	if ( is_wp_error( $response ) )
+	if (is_wp_error($response))
 		return false;
 
-	if ( wp_remote_retrieve_header( $response, 'x-pingback' ) )
-		return wp_remote_retrieve_header( $response, 'x-pingback' );
+	if (wp_remote_retrieve_header($response, 'x-pingback'))
+		return wp_remote_retrieve_header($response, 'x-pingback');
 
 	// Not an (x)html, sgml, or xml page, no use going further.
-	if ( preg_match('#(image|audio|video|model)/#is', wp_remote_retrieve_header( $response, 'content-type' )) )
+	if (preg_match('#(image|audio|video|model)/#is', wp_remote_retrieve_header($response, 'content-type')))
 		return false;
 
 	// Now do a GET since we're going to look in the html headers (and we're sure it's not a binary file)
-	$response = wp_safe_remote_get( $url, array( 'timeout' => 2, 'httpversion' => '1.0' ) );
+	$response = wp_safe_remote_get($url, array('timeout' => 2, 'httpversion' => '1.0'));
 
-	if ( is_wp_error( $response ) )
+	if (is_wp_error($response))
 		return false;
 
-	$contents = wp_remote_retrieve_body( $response );
+	$contents = wp_remote_retrieve_body($response);
 
 	$pingback_link_offset_dquote = strpos($contents, $pingback_str_dquote);
 	$pingback_link_offset_squote = strpos($contents, $pingback_str_squote);
-	if ( $pingback_link_offset_dquote || $pingback_link_offset_squote ) {
+	if ($pingback_link_offset_dquote || $pingback_link_offset_squote) {
 		$quote = ($pingback_link_offset_dquote) ? '"' : '\'';
-		$pingback_link_offset = ($quote=='"') ? $pingback_link_offset_dquote : $pingback_link_offset_squote;
+		$pingback_link_offset = ($quote == '"') ? $pingback_link_offset_dquote : $pingback_link_offset_squote;
 		$pingback_href_pos = @strpos($contents, 'href=', $pingback_link_offset);
-		$pingback_href_start = $pingback_href_pos+6;
+		$pingback_href_start = $pingback_href_pos + 6;
 		$pingback_href_end = @strpos($contents, $quote, $pingback_href_start);
 		$pingback_server_url_len = $pingback_href_end - $pingback_href_start;
 		$pingback_server_url = substr($contents, $pingback_href_start, $pingback_server_url_len);
 
 		// We may find rel="pingback" but an incomplete pingback URL
-		if ( $pingback_server_url_len > 0 ) { // We got it!
+		if ($pingback_server_url_len > 0) { // We got it!
 			return $pingback_server_url;
 		}
 	}
@@ -2440,20 +2440,20 @@ 
 
 	// Do pingbacks
 	while ($ping = $wpdb->get_row("SELECT ID, post_content, meta_id FROM {$wpdb->posts}, {$wpdb->postmeta} WHERE {$wpdb->posts}.ID = {$wpdb->postmeta}.post_id AND {$wpdb->postmeta}.meta_key = '_pingme' LIMIT 1")) {
-		delete_metadata_by_mid( 'post', $ping->meta_id );
-		pingback( $ping->post_content, $ping->ID );
+		delete_metadata_by_mid('post', $ping->meta_id);
+		pingback($ping->post_content, $ping->ID);
 	}
 
 	// Do Enclosures
 	while ($enclosure = $wpdb->get_row("SELECT ID, post_content, meta_id FROM {$wpdb->posts}, {$wpdb->postmeta} WHERE {$wpdb->posts}.ID = {$wpdb->postmeta}.post_id AND {$wpdb->postmeta}.meta_key = '_encloseme' LIMIT 1")) {
-		delete_metadata_by_mid( 'post', $enclosure->meta_id );
-		do_enclose( $enclosure->post_content, $enclosure->ID );
+		delete_metadata_by_mid('post', $enclosure->meta_id);
+		do_enclose($enclosure->post_content, $enclosure->ID);
 	}
 
 	// Do Trackbacks
 	$trackbacks = $wpdb->get_col("SELECT ID FROM $wpdb->posts WHERE to_ping <> '' AND post_status = 'publish'");
-	if ( is_array($trackbacks) )
-		foreach ( $trackbacks as $trackback )
+	if (is_array($trackbacks))
+		foreach ($trackbacks as $trackback)
 			do_trackbacks($trackback);
 
 	//Do Update Services/Generic Pings
@@ -2470,44 +2470,44 @@ 
  *
  * @param int|WP_Post $post_id Post object or ID to do trackbacks on.
  */
-function do_trackbacks( $post_id ) {
+function do_trackbacks($post_id) {
 	global $wpdb;
-	$post = get_post( $post_id );
-	if ( ! $post ) {
+	$post = get_post($post_id);
+	if ( ! $post) {
 		return false;
 	}
 
-	$to_ping = get_to_ping( $post );
-	$pinged  = get_pung( $post );
-	if ( empty( $to_ping ) ) {
-		$wpdb->update($wpdb->posts, array( 'to_ping' => '' ), array( 'ID' => $post->ID ) );
+	$to_ping = get_to_ping($post);
+	$pinged  = get_pung($post);
+	if (empty($to_ping)) {
+		$wpdb->update($wpdb->posts, array('to_ping' => ''), array('ID' => $post->ID));
 		return;
 	}
 
-	if ( empty($post->post_excerpt) ) {
+	if (empty($post->post_excerpt)) {
 		/** This filter is documented in wp-includes/post-template.php */
-		$excerpt = apply_filters( 'the_content', $post->post_content, $post->ID );
+		$excerpt = apply_filters('the_content', $post->post_content, $post->ID);
 	} else {
 		/** This filter is documented in wp-includes/post-template.php */
-		$excerpt = apply_filters( 'the_excerpt', $post->post_excerpt );
+		$excerpt = apply_filters('the_excerpt', $post->post_excerpt);
 	}
 
 	$excerpt = str_replace(']]>', ']]&gt;', $excerpt);
 	$excerpt = wp_html_excerpt($excerpt, 252, '&#8230;');
 
 	/** This filter is documented in wp-includes/post-template.php */
-	$post_title = apply_filters( 'the_title', $post->post_title, $post->ID );
+	$post_title = apply_filters('the_title', $post->post_title, $post->ID);
 	$post_title = strip_tags($post_title);
 
-	if ( $to_ping ) {
-		foreach ( (array) $to_ping as $tb_ping ) {
+	if ($to_ping) {
+		foreach ((array) $to_ping as $tb_ping) {
 			$tb_ping = trim($tb_ping);
-			if ( !in_array($tb_ping, $pinged) ) {
-				trackback( $tb_ping, $post_title, $excerpt, $post->ID );
+			if ( ! in_array($tb_ping, $pinged)) {
+				trackback($tb_ping, $post_title, $excerpt, $post->ID);
 				$pinged[] = $tb_ping;
 			} else {
-				$wpdb->query( $wpdb->prepare( "UPDATE $wpdb->posts SET to_ping = TRIM(REPLACE(to_ping, %s,
-					'')) WHERE ID = %d", $tb_ping, $post->ID ) );
+				$wpdb->query($wpdb->prepare("UPDATE $wpdb->posts SET to_ping = TRIM(REPLACE(to_ping, %s,
+					'')) WHERE ID = %d", $tb_ping, $post->ID));
 			}
 		}
 	}
@@ -2521,13 +2521,13 @@ 
  * @param int $post_id Post ID.
  * @return int Same as Post ID from parameter
  */
-function generic_ping( $post_id = 0 ) {
+function generic_ping($post_id = 0) {
 	$services = get_option('ping_sites');
 
 	$services = explode("\n", $services);
-	foreach ( (array) $services as $service ) {
+	foreach ((array) $services as $service) {
 		$service = trim($service);
-		if ( '' != $service )
+		if ('' != $service)
 			weblog_ping($service);
 	}
 
@@ -2543,27 +2543,27 @@ 
  * @param string $content Post content to check for links. If empty will retrieve from post.
  * @param int|WP_Post $post_id Post Object or ID.
  */
-function pingback( $content, $post_id ) {
-	include_once( ABSPATH . WPINC . '/class-IXR.php' );
-	include_once( ABSPATH . WPINC . '/class-wp-http-ixr-client.php' );
+function pingback($content, $post_id) {
+	include_once(ABSPATH.WPINC.'/class-IXR.php');
+	include_once(ABSPATH.WPINC.'/class-wp-http-ixr-client.php');
 
 	// original code by Mort (http://mort.mine.nu:8080)
 	$post_links = array();
 
-	$post = get_post( $post_id );
-	if ( ! $post ) {
+	$post = get_post($post_id);
+	if ( ! $post) {
 		return;
 	}
 
-	$pung = get_pung( $post );
+	$pung = get_pung($post);
 
-	if ( empty( $content ) ) {
+	if (empty($content)) {
 		$content = $post->post_content;
 	}
 
 	// Step 1
 	// Parsing the post, external links (if any) are stored in the $post_links array
-	$post_links_temp = wp_extract_urls( $content );
+	$post_links_temp = wp_extract_urls($content);
 
 	// Step 2.
 	// Walking thru the links array
@@ -2574,19 +2574,19 @@ 
 	// http://dummy-weblog.org/post.php
 	// We don't wanna ping first and second types, even if they have a valid <link/>
 
-	foreach ( (array) $post_links_temp as $link_test ) :
-		if ( ! in_array( $link_test, $pung ) && ( url_to_postid( $link_test ) != $post->ID ) // If we haven't pung it already and it isn't a link to itself
-				&& !is_local_attachment($link_test) ) : // Also, let's never ping local attachments.
-			if ( $test = @parse_url($link_test) ) {
-				if ( isset($test['query']) )
+	foreach ((array) $post_links_temp as $link_test) :
+		if ( ! in_array($link_test, $pung) && (url_to_postid($link_test) != $post->ID) // If we haven't pung it already and it isn't a link to itself
+				&& ! is_local_attachment($link_test)) : // Also, let's never ping local attachments.
+			if ($test = @parse_url($link_test)) {
+				if (isset($test['query']))
 					$post_links[] = $link_test;
-				elseif ( isset( $test['path'] ) && ( $test['path'] != '/' ) && ( $test['path'] != '' ) )
+				elseif (isset($test['path']) && ($test['path'] != '/') && ($test['path'] != ''))
 					$post_links[] = $link_test;
 			}
 		endif;
 	endforeach;
 
-	$post_links = array_unique( $post_links );
+	$post_links = array_unique($post_links);
 	/**
 	 * Fires just before pinging back links found in a post.
 	 *
@@ -2596,15 +2596,15 @@ 
 	 * @param array &$pung       Whether a link has already been pinged, passed by reference.
 	 * @param int   $post_ID     The post ID.
 	 */
-	do_action_ref_array( 'pre_ping', array( &$post_links, &$pung, $post->ID ) );
+	do_action_ref_array('pre_ping', array(&$post_links, &$pung, $post->ID));
 
-	foreach ( (array) $post_links as $pagelinkedto ) {
-		$pingback_server_url = discover_pingback_server_uri( $pagelinkedto );
+	foreach ((array) $post_links as $pagelinkedto) {
+		$pingback_server_url = discover_pingback_server_uri($pagelinkedto);
 
-		if ( $pingback_server_url ) {
-			@ set_time_limit( 60 );
+		if ($pingback_server_url) {
+			@ set_time_limit(60);
 			// Now, the RPC call
-			$pagelinkedfrom = get_permalink( $post );
+			$pagelinkedfrom = get_permalink($post);
 
 			// using a timeout of 3 seconds should be enough to cover slow servers
 			$client = new WP_HTTP_IXR_Client($pingback_server_url);
@@ -2621,12 +2621,12 @@ 
 			 * @param string $pagelinkedto        URL of page linked to.
 			 * @param string $pagelinkedfrom      URL of page linked from.
 			 */
-			$client->useragent = apply_filters( 'pingback_useragent', $client->useragent . ' -- WordPress/' . get_bloginfo( 'version' ), $client->useragent, $pingback_server_url, $pagelinkedto, $pagelinkedfrom );
+			$client->useragent = apply_filters('pingback_useragent', $client->useragent.' -- WordPress/'.get_bloginfo('version'), $client->useragent, $pingback_server_url, $pagelinkedto, $pagelinkedfrom);
 			// when set to true, this outputs debug messages by itself
 			$client->debug = false;
 
-			if ( $client->query('pingback.ping', $pagelinkedfrom, $pagelinkedto) || ( isset($client->error->code) && 48 == $client->error->code ) ) // Already registered
-				add_ping( $post, $pagelinkedto );
+			if ($client->query('pingback.ping', $pagelinkedfrom, $pagelinkedto) || (isset($client->error->code) && 48 == $client->error->code)) // Already registered
+				add_ping($post, $pagelinkedto);
 		}
 	}
 }
@@ -2640,7 +2640,7 @@ 
  * @return mixed Empty string if blog is not public, returns $sites, if site is public.
  */
 function privacy_ping_filter($sites) {
-	if ( '0' != get_option('blog_public') )
+	if ('0' != get_option('blog_public'))
 		return $sites;
 	else
 		return '';
@@ -2664,7 +2664,7 @@ 
 function trackback($trackback_url, $title, $excerpt, $ID) {
 	global $wpdb;
 
-	if ( empty($trackback_url) )
+	if (empty($trackback_url))
 		return;
 
 	$options = array();
@@ -2676,13 +2676,13 @@ 
 		'excerpt' => $excerpt
 	);
 
-	$response = wp_safe_remote_post( $trackback_url, $options );
+	$response = wp_safe_remote_post($trackback_url, $options);
 
-	if ( is_wp_error( $response ) )
+	if (is_wp_error($response))
 		return;
 
-	$wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET pinged = CONCAT(pinged, '\n', %s) WHERE ID = %d", $trackback_url, $ID) );
-	return $wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET to_ping = TRIM(REPLACE(to_ping, %s, '')) WHERE ID = %d", $trackback_url, $ID) );
+	$wpdb->query($wpdb->prepare("UPDATE $wpdb->posts SET pinged = CONCAT(pinged, '\n', %s) WHERE ID = %d", $trackback_url, $ID));
+	return $wpdb->query($wpdb->prepare("UPDATE $wpdb->posts SET to_ping = TRIM(REPLACE(to_ping, %s, '')) WHERE ID = %d", $trackback_url, $ID));
 }
 
 /**
@@ -2694,18 +2694,18 @@ 
  * @param string $path Path to send the ping.
  */
 function weblog_ping($server = '', $path = '') {
-	include_once( ABSPATH . WPINC . '/class-IXR.php' );
-	include_once( ABSPATH . WPINC . '/class-wp-http-ixr-client.php' );
+	include_once(ABSPATH.WPINC.'/class-IXR.php');
+	include_once(ABSPATH.WPINC.'/class-wp-http-ixr-client.php');
 
 	// using a timeout of 3 seconds should be enough to cover slow servers
-	$client = new WP_HTTP_IXR_Client($server, ((!strlen(trim($path)) || ('/' == $path)) ? false : $path));
+	$client = new WP_HTTP_IXR_Client($server, (( ! strlen(trim($path)) || ('/' == $path)) ? false : $path));
 	$client->timeout = 3;
-	$client->useragent .= ' -- WordPress/' . get_bloginfo( 'version' );
+	$client->useragent .= ' -- WordPress/'.get_bloginfo('version');
 
 	// when set to true, this outputs debug messages by itself
 	$client->debug = false;
-	$home = trailingslashit( home_url() );
-	if ( !$client->query('weblogUpdates.extendedPing', get_option('blogname'), $home, get_bloginfo('rss2_url') ) ) // then try a normal ping
+	$home = trailingslashit(home_url());
+	if ( ! $client->query('weblogUpdates.extendedPing', get_option('blogname'), $home, get_bloginfo('rss2_url'))) // then try a normal ping
 		$client->query('weblogUpdates.ping', get_option('blogname'), $home);
 }
 
@@ -2718,8 +2718,8 @@ 
  * @param string $source_uri
  * @return string
  */
-function pingback_ping_source_uri( $source_uri ) {
-	return (string) wp_http_validate_url( $source_uri );
+function pingback_ping_source_uri($source_uri) {
+	return (string) wp_http_validate_url($source_uri);
 }
 
 /**
@@ -2734,10 +2734,10 @@ 
  * @param IXR_Error $ixr_error
  * @return IXR_Error
  */
-function xmlrpc_pingback_error( $ixr_error ) {
-	if ( $ixr_error->code === 48 )
+function xmlrpc_pingback_error($ixr_error) {
+	if ($ixr_error->code === 48)
 		return $ixr_error;
-	return new IXR_Error( 0, '' );
+	return new IXR_Error(0, '');
 }
 
 //
@@ -2752,8 +2752,8 @@ 
  * @param int|array $ids Comment ID or an array of comment IDs to remove from cache.
  */
 function clean_comment_cache($ids) {
-	foreach ( (array) $ids as $id ) {
-		wp_cache_delete( $id, 'comment' );
+	foreach ((array) $ids as $id) {
+		wp_cache_delete($id, 'comment');
 
 		/**
 		 * Fires immediately after a comment has been removed from the object cache.
@@ -2762,10 +2762,10 @@ 
 		 *
 		 * @param int $id Comment ID.
 		 */
-		do_action( 'clean_comment_cache', $id );
+		do_action('clean_comment_cache', $id);
 	}
 
-	wp_cache_set( 'last_changed', microtime(), 'comment' );
+	wp_cache_set('last_changed', microtime(), 'comment');
 }
 
 /**
@@ -2781,17 +2781,17 @@ 
  * @param array $comments          Array of comment row objects
  * @param bool  $update_meta_cache Whether to update commentmeta cache. Default true.
  */
-function update_comment_cache( $comments, $update_meta_cache = true ) {
-	foreach ( (array) $comments as $comment )
+function update_comment_cache($comments, $update_meta_cache = true) {
+	foreach ((array) $comments as $comment)
 		wp_cache_add($comment->comment_ID, $comment, 'comment');
 
-	if ( $update_meta_cache ) {
+	if ($update_meta_cache) {
 		// Avoid `wp_list_pluck()` in case `$comments` is passed by reference.
 		$comment_ids = array();
-		foreach ( $comments as $comment ) {
+		foreach ($comments as $comment) {
 			$comment_ids[] = $comment->comment_ID;
 		}
-		update_meta_cache( 'comment', $comment_ids );
+		update_meta_cache('comment', $comment_ids);
 	}
 }
 
@@ -2807,14 +2807,14 @@ 
  * @param array $comment_ids       Array of comment IDs.
  * @param bool  $update_meta_cache Optional. Whether to update the meta cache. Default true.
  */
-function _prime_comment_caches( $comment_ids, $update_meta_cache = true ) {
+function _prime_comment_caches($comment_ids, $update_meta_cache = true) {
 	global $wpdb;
 
-	$non_cached_ids = _get_non_cached_ids( $comment_ids, 'comment' );
-	if ( !empty( $non_cached_ids ) ) {
-		$fresh_comments = $wpdb->get_results( sprintf( "SELECT $wpdb->comments.* FROM $wpdb->comments WHERE comment_ID IN (%s)", join( ",", array_map( 'intval', $non_cached_ids ) ) ) );
+	$non_cached_ids = _get_non_cached_ids($comment_ids, 'comment');
+	if ( ! empty($non_cached_ids)) {
+		$fresh_comments = $wpdb->get_results(sprintf("SELECT $wpdb->comments.* FROM $wpdb->comments WHERE comment_ID IN (%s)", join(",", array_map('intval', $non_cached_ids))));
 
-		update_comment_cache( $fresh_comments, $update_meta_cache );
+		update_comment_cache($fresh_comments, $update_meta_cache);
 	}
 }
 
@@ -2832,8 +2832,8 @@ 
  * @param WP_Query $query Query object.
  * @return array
  */
-function _close_comments_for_old_posts( $posts, $query ) {
-	if ( empty( $posts ) || ! $query->is_singular() || ! get_option( 'close_comments_for_old_posts' ) )
+function _close_comments_for_old_posts($posts, $query) {
+	if (empty($posts) || ! $query->is_singular() || ! get_option('close_comments_for_old_posts'))
 		return $posts;
 
 	/**
@@ -2843,15 +2843,15 @@ 
 	 *
 	 * @param array $post_types An array of registered post types. Default array with 'post'.
 	 */
-	$post_types = apply_filters( 'close_comments_for_post_types', array( 'post' ) );
-	if ( ! in_array( $posts[0]->post_type, $post_types ) )
+	$post_types = apply_filters('close_comments_for_post_types', array('post'));
+	if ( ! in_array($posts[0]->post_type, $post_types))
 		return $posts;
 
-	$days_old = (int) get_option( 'close_comments_days_old' );
-	if ( ! $days_old )
+	$days_old = (int) get_option('close_comments_days_old');
+	if ( ! $days_old)
 		return $posts;
 
-	if ( time() - strtotime( $posts[0]->post_date_gmt ) > ( $days_old * DAY_IN_SECONDS ) ) {
+	if (time() - strtotime($posts[0]->post_date_gmt) > ($days_old * DAY_IN_SECONDS)) {
 		$posts[0]->comment_status = 'closed';
 		$posts[0]->ping_status = 'closed';
 	}
@@ -2869,30 +2869,30 @@ 
  * @param int $post_id Post ID
  * @return bool $open
  */
-function _close_comments_for_old_post( $open, $post_id ) {
-	if ( ! $open )
+function _close_comments_for_old_post($open, $post_id) {
+	if ( ! $open)
 		return $open;
 
-	if ( !get_option('close_comments_for_old_posts') )
+	if ( ! get_option('close_comments_for_old_posts'))
 		return $open;
 
 	$days_old = (int) get_option('close_comments_days_old');
-	if ( !$days_old )
+	if ( ! $days_old)
 		return $open;
 
 	$post = get_post($post_id);
 
 	/** This filter is documented in wp-includes/comment.php */
-	$post_types = apply_filters( 'close_comments_for_post_types', array( 'post' ) );
-	if ( ! in_array( $post->post_type, $post_types ) )
+	$post_types = apply_filters('close_comments_for_post_types', array('post'));
+	if ( ! in_array($post->post_type, $post_types))
 		return $open;
 
 	// Undated drafts should not show up as comments closed.
-	if ( '0000-00-00 00:00:00' === $post->post_date_gmt ) {
+	if ('0000-00-00 00:00:00' === $post->post_date_gmt) {
 		return $open;
 	}
 
-	if ( time() - strtotime( $post->post_date_gmt ) > ( $days_old * DAY_IN_SECONDS ) )
+	if (time() - strtotime($post->post_date_gmt) > ($days_old * DAY_IN_SECONDS))
 		return false;
 
 	return $open;
@@ -2919,33 +2919,33 @@ 
  * }
  * @return WP_Comment|WP_Error A WP_Comment object on success, a WP_Error object on failure.
  */
-function wp_handle_comment_submission( $comment_data ) {
+function wp_handle_comment_submission($comment_data) {
 
 	$comment_post_ID = $comment_parent = 0;
 	$comment_author = $comment_author_email = $comment_author_url = $comment_content = null;
 
-	if ( isset( $comment_data['comment_post_ID'] ) ) {
+	if (isset($comment_data['comment_post_ID'])) {
 		$comment_post_ID = (int) $comment_data['comment_post_ID'];
 	}
-	if ( isset( $comment_data['author'] ) && is_string( $comment_data['author'] ) ) {
-		$comment_author = trim( strip_tags( $comment_data['author'] ) );
+	if (isset($comment_data['author']) && is_string($comment_data['author'])) {
+		$comment_author = trim(strip_tags($comment_data['author']));
 	}
-	if ( isset( $comment_data['email'] ) && is_string( $comment_data['email'] ) ) {
-		$comment_author_email = trim( $comment_data['email'] );
+	if (isset($comment_data['email']) && is_string($comment_data['email'])) {
+		$comment_author_email = trim($comment_data['email']);
 	}
-	if ( isset( $comment_data['url'] ) && is_string( $comment_data['url'] ) ) {
-		$comment_author_url = trim( $comment_data['url'] );
+	if (isset($comment_data['url']) && is_string($comment_data['url'])) {
+		$comment_author_url = trim($comment_data['url']);
 	}
-	if ( isset( $comment_data['comment'] ) && is_string( $comment_data['comment'] ) ) {
-		$comment_content = trim( $comment_data['comment'] );
+	if (isset($comment_data['comment']) && is_string($comment_data['comment'])) {
+		$comment_content = trim($comment_data['comment']);
 	}
-	if ( isset( $comment_data['comment_parent'] ) ) {
-		$comment_parent = absint( $comment_data['comment_parent'] );
+	if (isset($comment_data['comment_parent'])) {
+		$comment_parent = absint($comment_data['comment_parent']);
 	}
 
-	$post = get_post( $comment_post_ID );
+	$post = get_post($comment_post_ID);
 
-	if ( empty( $post->comment_status ) ) {
+	if (empty($post->comment_status)) {
 
 		/**
 		 * Fires when a comment is attempted on a post that does not exist.
@@ -2954,22 +2954,22 @@ 
 		 *
 		 * @param int $comment_post_ID Post ID.
 		 */
-		do_action( 'comment_id_not_found', $comment_post_ID );
+		do_action('comment_id_not_found', $comment_post_ID);
 
-		return new WP_Error( 'comment_id_not_found' );
+		return new WP_Error('comment_id_not_found');
 
 	}
 
 	// get_post_status() will get the parent status for attachments.
-	$status = get_post_status( $post );
+	$status = get_post_status($post);
 
-	if ( ( 'private' == $status ) && ! current_user_can( 'read_post', $comment_post_ID ) ) {
-		return new WP_Error( 'comment_id_not_found' );
+	if (('private' == $status) && ! current_user_can('read_post', $comment_post_ID)) {
+		return new WP_Error('comment_id_not_found');
 	}
 
-	$status_obj = get_post_status_object( $status );
+	$status_obj = get_post_status_object($status);
 
-	if ( ! comments_open( $comment_post_ID ) ) {
+	if ( ! comments_open($comment_post_ID)) {
 
 		/**
 		 * Fires when a comment is attempted on a post that has comments closed.
@@ -2978,11 +2978,11 @@ 
 		 *
 		 * @param int $comment_post_ID Post ID.
 		 */
-		do_action( 'comment_closed', $comment_post_ID );
+		do_action('comment_closed', $comment_post_ID);
 
-		return new WP_Error( 'comment_closed', __( 'Sorry, comments are closed for this item.' ), 403 );
+		return new WP_Error('comment_closed', __('Sorry, comments are closed for this item.'), 403);
 
-	} elseif ( 'trash' == $status ) {
+	} elseif ('trash' == $status) {
 
 		/**
 		 * Fires when a comment is attempted on a trashed post.
@@ -2991,11 +2991,11 @@ 
 		 *
 		 * @param int $comment_post_ID Post ID.
 		 */
-		do_action( 'comment_on_trash', $comment_post_ID );
+		do_action('comment_on_trash', $comment_post_ID);
 
-		return new WP_Error( 'comment_on_trash' );
+		return new WP_Error('comment_on_trash');
 
-	} elseif ( ! $status_obj->public && ! $status_obj->private ) {
+	} elseif ( ! $status_obj->public && ! $status_obj->private) {
 
 		/**
 		 * Fires when a comment is attempted on a post in draft mode.
@@ -3004,15 +3004,15 @@ 
 		 *
 		 * @param int $comment_post_ID Post ID.
 		 */
-		do_action( 'comment_on_draft', $comment_post_ID );
+		do_action('comment_on_draft', $comment_post_ID);
 		
-		if ( current_user_can( 'read_post', $comment_post_ID ) ) {
-			return new WP_Error( 'comment_on_draft', __( 'Sorry, comments are not allowed for this item.' ), 403 );
+		if (current_user_can('read_post', $comment_post_ID)) {
+			return new WP_Error('comment_on_draft', __('Sorry, comments are not allowed for this item.'), 403);
 		} else {
-			return new WP_Error( 'comment_on_draft' );
+			return new WP_Error('comment_on_draft');
 		}
 
-	} elseif ( post_password_required( $comment_post_ID ) ) {
+	} elseif (post_password_required($comment_post_ID)) {
 
 		/**
 		 * Fires when a comment is attempted on a password-protected post.
@@ -3021,9 +3021,9 @@ 
 		 *
 		 * @param int $comment_post_ID Post ID.
 		 */
-		do_action( 'comment_on_password_protected', $comment_post_ID );
+		do_action('comment_on_password_protected', $comment_post_ID);
 
-		return new WP_Error( 'comment_on_password_protected' );
+		return new WP_Error('comment_on_password_protected');
 
 	} else {
 
@@ -3034,46 +3034,46 @@ 
 		 *
 		 * @param int $comment_post_ID Post ID.
 		 */
-		do_action( 'pre_comment_on_post', $comment_post_ID );
+		do_action('pre_comment_on_post', $comment_post_ID);
 
 	}
 
 	// If the user is logged in
 	$user = wp_get_current_user();
-	if ( $user->exists() ) {
-		if ( empty( $user->display_name ) ) {
-			$user->display_name=$user->user_login;
+	if ($user->exists()) {
+		if (empty($user->display_name)) {
+			$user->display_name = $user->user_login;
 		}
 		$comment_author       = $user->display_name;
 		$comment_author_email = $user->user_email;
 		$comment_author_url   = $user->user_url;
 		$user_ID              = $user->ID;
-		if ( current_user_can( 'unfiltered_html' ) ) {
-			if ( ! isset( $comment_data['_wp_unfiltered_html_comment'] )
-				|| ! wp_verify_nonce( $comment_data['_wp_unfiltered_html_comment'], 'unfiltered-html-comment_' . $comment_post_ID )
+		if (current_user_can('unfiltered_html')) {
+			if ( ! isset($comment_data['_wp_unfiltered_html_comment'])
+				|| ! wp_verify_nonce($comment_data['_wp_unfiltered_html_comment'], 'unfiltered-html-comment_'.$comment_post_ID)
 			) {
 				kses_remove_filters(); // start with a clean slate
 				kses_init_filters(); // set up the filters
 			}
 		}
 	} else {
-		if ( get_option( 'comment_registration' ) ) {
-			return new WP_Error( 'not_logged_in', __( 'Sorry, you must be logged in to comment.' ), 403 );
+		if (get_option('comment_registration')) {
+			return new WP_Error('not_logged_in', __('Sorry, you must be logged in to comment.'), 403);
 		}
 	}
 
 	$comment_type = '';
 
-	if ( get_option( 'require_name_email' ) && ! $user->exists() ) {
-		if ( '' == $comment_author_email || '' == $comment_author ) {
-			return new WP_Error( 'require_name_email', __( '<strong>ERROR</strong>: please fill the required fields (name, email).' ), 200 );
-		} elseif ( ! is_email( $comment_author_email ) ) {
-			return new WP_Error( 'require_valid_email', __( '<strong>ERROR</strong>: please enter a valid email address.' ), 200 );
+	if (get_option('require_name_email') && ! $user->exists()) {
+		if ('' == $comment_author_email || '' == $comment_author) {
+			return new WP_Error('require_name_email', __('<strong>ERROR</strong>: please fill the required fields (name, email).'), 200);
+		} elseif ( ! is_email($comment_author_email)) {
+			return new WP_Error('require_valid_email', __('<strong>ERROR</strong>: please enter a valid email address.'), 200);
 		}
 	}
 
-	if ( '' == $comment_content ) {
-		return new WP_Error( 'require_valid_comment', __( '<strong>ERROR</strong>: please type a comment.' ), 200 );
+	if ('' == $comment_content) {
+		return new WP_Error('require_valid_comment', __('<strong>ERROR</strong>: please type a comment.'), 200);
 	}
 
 	$commentdata = compact(
@@ -3087,19 +3087,19 @@ 
 		'user_ID'
 	);
 
-	$check_max_lengths = wp_check_comment_data_max_lengths( $commentdata );
-	if ( is_wp_error( $check_max_lengths ) ) {
+	$check_max_lengths = wp_check_comment_data_max_lengths($commentdata);
+	if (is_wp_error($check_max_lengths)) {
 		return $check_max_lengths;
 	}
 
-	$comment_id = wp_new_comment( wp_slash( $commentdata ), true );
-	if ( is_wp_error( $comment_id ) ) {
+	$comment_id = wp_new_comment(wp_slash($commentdata), true);
+	if (is_wp_error($comment_id)) {
 		return $comment_id;
 	}
 
-	if ( ! $comment_id ) {
-		return new WP_Error( 'comment_save_error', __( '<strong>ERROR</strong>: The comment could not be saved. Please try again later.' ), 500 );
+	if ( ! $comment_id) {
+		return new WP_Error('comment_save_error', __('<strong>ERROR</strong>: The comment could not be saved. Please try again later.'), 500);
 	}
 
-	return get_comment( $comment_id );
+	return get_comment($comment_id);
 }

Braces +241 added lines, -157 removed lines

@@ -40,8 +40,9 @@ 
 	global $wpdb;
 
 	// If manual moderation is enabled, skip all checks and return false.
-	if ( 1 == get_option('comment_moderation') )
-		return false;
+	if ( 1 == get_option('comment_moderation') ) {
+			return false;
+	}
 
 	/** This filter is documented in wp-includes/comment-template.php */
 	$comment = apply_filters( 'comment_text', $comment, null, array() );
@@ -66,8 +67,9 @@ 
 		 * If the number of links in the comment exceeds the allowed amount,
 		 * fail the check by returning false.
 		 */
-		if ( $num_links >= $max_links )
-			return false;
+		if ( $num_links >= $max_links ) {
+					return false;
+		}
 	}
 
 	$mod_keys = trim(get_option('moderation_keys'));
@@ -80,8 +82,9 @@ 
 			$word = trim($word);
 
 			// Skip empty lines.
-			if ( empty($word) )
-				continue;
+			if ( empty($word) ) {
+							continue;
+			}
 
 			/*
 			 * Do some escaping magic so that '#' (number of) characters in the spam
@@ -94,12 +97,24 @@ 
 			 * fail the check for the given field by returning false.
 			 */
 			$pattern = "#$word#i";
-			if ( preg_match($pattern, $author) ) return false;
-			if ( preg_match($pattern, $email) ) return false;
-			if ( preg_match($pattern, $url) ) return false;
-			if ( preg_match($pattern, $comment) ) return false;
-			if ( preg_match($pattern, $user_ip) ) return false;
-			if ( preg_match($pattern, $user_agent) ) return false;
+			if ( preg_match($pattern, $author) ) {
+				return false;
+			}
+			if ( preg_match($pattern, $email) ) {
+				return false;
+			}
+			if ( preg_match($pattern, $url) ) {
+				return false;
+			}
+			if ( preg_match($pattern, $comment) ) {
+				return false;
+			}
+			if ( preg_match($pattern, $user_ip) ) {
+				return false;
+			}
+			if ( preg_match($pattern, $user_agent) ) {
+				return false;
+			}
 		}
 	}
 
@@ -120,10 +135,11 @@ 
 				$ok_to_comment = $wpdb->get_var( $wpdb->prepare( "SELECT comment_approved FROM $wpdb->comments WHERE comment_author = %s AND comment_author_email = %s and comment_approved = '1' LIMIT 1", $author, $email ) );
 			}
 			if ( ( 1 == $ok_to_comment ) &&
-				( empty($mod_keys) || false === strpos( $email, $mod_keys) ) )
-					return true;
-			else
-				return false;
+				( empty($mod_keys) || false === strpos( $email, $mod_keys) ) ) {
+								return true;
+			} else {
+							return false;
+			}
 		} else {
 			return false;
 		}
@@ -516,8 +532,9 @@ 
  * @since 3.4.0
  */
 function wp_set_comment_cookies($comment, $user) {
-	if ( $user->exists() )
-		return;
+	if ( $user->exists() ) {
+			return;
+	}
 
 	/**
 	 * Filters the lifetime of the comment cookie in seconds.
@@ -879,11 +896,13 @@ 
 	$count = count($comments);
 	for ( $i = 0; $i < $count; $i++ ) {
 		$type = $comments[$i]->comment_type;
-		if ( empty($type) )
-			$type = 'comment';
+		if ( empty($type) ) {
+					$type = 'comment';
+		}
 		$comments_by_type[$type][] = &$comments[$i];
-		if ( 'trackback' == $type || 'pingback' == $type )
-			$comments_by_type['pings'][] = &$comments[$i];
+		if ( 'trackback' == $type || 'pingback' == $type ) {
+					$comments_by_type['pings'][] = &$comments[$i];
+		}
 	}
 
 	return $comments_by_type;
@@ -906,28 +925,35 @@ 
 function get_comment_pages_count( $comments = null, $per_page = null, $threaded = null ) {
 	global $wp_query;
 
-	if ( null === $comments && null === $per_page && null === $threaded && !empty($wp_query->max_num_comment_pages) )
-		return $wp_query->max_num_comment_pages;
+	if ( null === $comments && null === $per_page && null === $threaded && !empty($wp_query->max_num_comment_pages) ) {
+			return $wp_query->max_num_comment_pages;
+	}
 
-	if ( ( ! $comments || ! is_array( $comments ) ) && ! empty( $wp_query->comments )  )
-		$comments = $wp_query->comments;
+	if ( ( ! $comments || ! is_array( $comments ) ) && ! empty( $wp_query->comments )  ) {
+			$comments = $wp_query->comments;
+	}
 
-	if ( empty($comments) )
-		return 0;
+	if ( empty($comments) ) {
+			return 0;
+	}
 
 	if ( ! get_option( 'page_comments' ) ) {
 		return 1;
 	}
 
-	if ( !isset($per_page) )
-		$per_page = (int) get_query_var('comments_per_page');
-	if ( 0 === $per_page )
-		$per_page = (int) get_option('comments_per_page');
-	if ( 0 === $per_page )
-		return 1;
+	if ( !isset($per_page) ) {
+			$per_page = (int) get_query_var('comments_per_page');
+	}
+	if ( 0 === $per_page ) {
+			$per_page = (int) get_option('comments_per_page');
+	}
+	if ( 0 === $per_page ) {
+			return 1;
+	}
 
-	if ( !isset($threaded) )
-		$threaded = get_option('thread_comments');
+	if ( !isset($threaded) ) {
+			$threaded = get_option('thread_comments');
+	}
 
 	if ( $threaded ) {
 		$walker = new Walker_Comment;
@@ -964,8 +990,9 @@ 
 
 	$page = null;
 
-	if ( !$comment = get_comment( $comment_ID ) )
-		return;
+	if ( !$comment = get_comment( $comment_ID ) ) {
+			return;
+	}
 
 	$defaults = array( 'type' => 'all', 'page' => '', 'per_page' => '', 'max_depth' => '' );
 	$args = wp_parse_args( $args, $defaults );
@@ -993,15 +1020,17 @@ 
 
 	if ( null === $page ) {
 		if ( '' === $args['max_depth'] ) {
-			if ( get_option('thread_comments') )
-				$args['max_depth'] = get_option('thread_comments_depth');
-			else
-				$args['max_depth'] = -1;
+			if ( get_option('thread_comments') ) {
+							$args['max_depth'] = get_option('thread_comments_depth');
+			} else {
+							$args['max_depth'] = -1;
+			}
 		}
 
 		// Find this comment's top level parent if threading is enabled
-		if ( $args['max_depth'] > 1 && 0 != $comment->comment_parent )
-			return get_page_of_comment( $comment->comment_parent, $args );
+		if ( $args['max_depth'] > 1 && 0 != $comment->comment_parent ) {
+					return get_page_of_comment( $comment->comment_parent, $args );
+		}
 
 		$comment_args = array(
 			'type'       => $args['type'],
@@ -1176,8 +1205,10 @@ 
 	do_action( 'wp_blacklist_check', $author, $email, $url, $comment, $user_ip, $user_agent );
 
 	$mod_keys = trim( get_option('blacklist_keys') );
-	if ( '' == $mod_keys )
-		return false; // If moderation keys are empty
+	if ( '' == $mod_keys ) {
+			return false;
+	}
+	// If moderation keys are empty
 
 	// Ensure HTML tags are not being used to bypass the blacklist.
 	$comment_without_html = wp_strip_all_tags( $comment );
@@ -1203,8 +1234,9 @@ 
 			|| preg_match($pattern, $comment_without_html)
 			|| preg_match($pattern, $user_ip)
 			|| preg_match($pattern, $user_agent)
-		 )
-			return true;
+		 ) {
+					return true;
+		}
 	}
 	return false;
 }
@@ -1275,11 +1307,13 @@ 
  */
 function wp_delete_comment($comment_id, $force_delete = false) {
 	global $wpdb;
-	if (!$comment = get_comment($comment_id))
-		return false;
+	if (!$comment = get_comment($comment_id)) {
+			return false;
+	}
 
-	if ( !$force_delete && EMPTY_TRASH_DAYS && !in_array( wp_get_comment_status( $comment ), array( 'trash', 'spam' ) ) )
-		return wp_trash_comment($comment_id);
+	if ( !$force_delete && EMPTY_TRASH_DAYS && !in_array( wp_get_comment_status( $comment ), array( 'trash', 'spam' ) ) ) {
+			return wp_trash_comment($comment_id);
+	}
 
 	/**
 	 * Fires immediately before a comment is deleted from the database.
@@ -1299,11 +1333,13 @@ 
 
 	// Delete metadata
 	$meta_ids = $wpdb->get_col( $wpdb->prepare( "SELECT meta_id FROM $wpdb->commentmeta WHERE comment_id = %d", $comment->comment_ID ) );
-	foreach ( $meta_ids as $mid )
-		delete_metadata_by_mid( 'comment', $mid );
+	foreach ( $meta_ids as $mid ) {
+			delete_metadata_by_mid( 'comment', $mid );
+	}
 
-	if ( ! $wpdb->delete( $wpdb->comments, array( 'comment_ID' => $comment->comment_ID ) ) )
-		return false;
+	if ( ! $wpdb->delete( $wpdb->comments, array( 'comment_ID' => $comment->comment_ID ) ) ) {
+			return false;
+	}
 
 	/**
 	 * Fires immediately after a comment is deleted from the database.
@@ -1315,8 +1351,9 @@ 
 	do_action( 'deleted_comment', $comment->comment_ID );
 
 	$post_id = $comment->comment_post_ID;
-	if ( $post_id && $comment->comment_approved == 1 )
-		wp_update_comment_count($post_id);
+	if ( $post_id && $comment->comment_approved == 1 ) {
+			wp_update_comment_count($post_id);
+	}
 
 	clean_comment_cache( $comment->comment_ID );
 
@@ -1338,11 +1375,13 @@ 
  * @return bool True on success, false on failure.
  */
 function wp_trash_comment($comment_id) {
-	if ( !EMPTY_TRASH_DAYS )
-		return wp_delete_comment($comment_id, true);
+	if ( !EMPTY_TRASH_DAYS ) {
+			return wp_delete_comment($comment_id, true);
+	}
 
-	if ( !$comment = get_comment($comment_id) )
-		return false;
+	if ( !$comment = get_comment($comment_id) ) {
+			return false;
+	}
 
 	/**
 	 * Fires immediately before a comment is sent to the Trash.
@@ -1397,8 +1436,9 @@ 
 	do_action( 'untrash_comment', $comment->comment_ID );
 
 	$status = (string) get_comment_meta( $comment->comment_ID, '_wp_trash_meta_status', true );
-	if ( empty($status) )
-		$status = '0';
+	if ( empty($status) ) {
+			$status = '0';
+	}
 
 	if ( wp_set_comment_status( $comment, $status ) ) {
 		delete_comment_meta( $comment->comment_ID, '_wp_trash_meta_time' );
@@ -1483,8 +1523,9 @@ 
 	do_action( 'unspam_comment', $comment->comment_ID );
 
 	$status = (string) get_comment_meta( $comment->comment_ID, '_wp_trash_meta_status', true );
-	if ( empty($status) )
-		$status = '0';
+	if ( empty($status) ) {
+			$status = '0';
+	}
 
 	if ( wp_set_comment_status( $comment, $status ) ) {
 		delete_comment_meta( $comment->comment_ID, '_wp_trash_meta_status' );
@@ -1513,24 +1554,26 @@ 
  */
 function wp_get_comment_status($comment_id) {
 	$comment = get_comment($comment_id);
-	if ( !$comment )
-		return false;
+	if ( !$comment ) {
+			return false;
+	}
 
 	$approved = $comment->comment_approved;
 
-	if ( $approved == null )
-		return false;
-	elseif ( $approved == '1' )
-		return 'approved';
-	elseif ( $approved == '0' )
-		return 'unapproved';
-	elseif ( $approved == 'spam' )
-		return 'spam';
-	elseif ( $approved == 'trash' )
-		return 'trash';
-	else
-		return false;
-}
+	if ( $approved == null ) {
+			return false;
+	} elseif ( $approved == '1' ) {
+			return 'approved';
+	} elseif ( $approved == '0' ) {
+			return 'unapproved';
+	} elseif ( $approved == 'spam' ) {
+			return 'spam';
+	} elseif ( $approved == 'trash' ) {
+			return 'trash';
+	} else {
+			return false;
+	}
+	}
 
 /**
  * Call hooks for when a comment status transition occurs.
@@ -1562,8 +1605,12 @@ 
 		1         => 'approved',
 		'approve' => 'approved', // wp_set_comment_status() uses "approve"
 	);
-	if ( isset($comment_statuses[$new_status]) ) $new_status = $comment_statuses[$new_status];
-	if ( isset($comment_statuses[$old_status]) ) $old_status = $comment_statuses[$old_status];
+	if ( isset($comment_statuses[$new_status]) ) {
+		$new_status = $comment_statuses[$new_status];
+	}
+	if ( isset($comment_statuses[$old_status]) ) {
+		$old_status = $comment_statuses[$old_status];
+	}
 
 	// Call the hooks
 	if ( $new_status != $old_status ) {
@@ -1642,16 +1689,19 @@ 
 	// Cookies should already be sanitized.
 
 	$comment_author = '';
-	if ( isset($_COOKIE['comment_author_'.COOKIEHASH]) )
-		$comment_author = $_COOKIE['comment_author_'.COOKIEHASH];
+	if ( isset($_COOKIE['comment_author_'.COOKIEHASH]) ) {
+			$comment_author = $_COOKIE['comment_author_'.COOKIEHASH];
+	}
 
 	$comment_author_email = '';
-	if ( isset($_COOKIE['comment_author_email_'.COOKIEHASH]) )
-		$comment_author_email = $_COOKIE['comment_author_email_'.COOKIEHASH];
+	if ( isset($_COOKIE['comment_author_email_'.COOKIEHASH]) ) {
+			$comment_author_email = $_COOKIE['comment_author_email_'.COOKIEHASH];
+	}
 
 	$comment_author_url = '';
-	if ( isset($_COOKIE['comment_author_url_'.COOKIEHASH]) )
-		$comment_author_url = $_COOKIE['comment_author_url_'.COOKIEHASH];
+	if ( isset($_COOKIE['comment_author_url_'.COOKIEHASH]) ) {
+			$comment_author_url = $_COOKIE['comment_author_url_'.COOKIEHASH];
+	}
 
 	/**
 	 * Filters the current commenter's name, email, and URL.
@@ -1840,10 +1890,13 @@ 
  * @return bool Whether comment should be blocked.
  */
 function wp_throttle_comment_flood($block, $time_lastcomment, $time_newcomment) {
-	if ( $block ) // a plugin has already blocked... we'll let that decision stand
+	if ( $block ) {
+		// a plugin has already blocked... we'll let that decision stand
 		return $block;
-	if ( ($time_newcomment - $time_lastcomment) < 15 )
-		return true;
+	}
+	if ( ($time_newcomment - $time_lastcomment) < 15 ) {
+			return true;
+	}
 	return false;
 }
 
@@ -2091,10 +2144,11 @@ 
 	$comment_old = clone get_comment($comment_id);
 
 	if ( !$wpdb->update( $wpdb->comments, array('comment_approved' => $status), array( 'comment_ID' => $comment_old->comment_ID ) ) ) {
-		if ( $wp_error )
-			return new WP_Error('db_update_error', __('Could not update comment status'), $wpdb->last_error);
-		else
-			return false;
+		if ( $wp_error ) {
+					return new WP_Error('db_update_error', __('Could not update comment status'), $wpdb->last_error);
+		} else {
+					return false;
+		}
 	}
 
 	clean_comment_cache( $comment_old->comment_ID );
@@ -2238,8 +2292,9 @@ 
 	if ( is_bool($defer) ) {
 		$_defer = $defer;
 		// flush any deferred counts
-		if ( !$defer )
-			wp_update_comment_count( null, true );
+		if ( !$defer ) {
+					wp_update_comment_count( null, true );
+		}
 	}
 
 	return $_defer;
@@ -2285,8 +2340,7 @@ 
 	if ( wp_defer_comment_counting() ) {
 		$_deferred[] = $post_id;
 		return true;
-	}
-	elseif ( $post_id ) {
+	} elseif ( $post_id ) {
 		return wp_update_comment_count_now($post_id);
 	}
 
@@ -2305,14 +2359,16 @@ 
 function wp_update_comment_count_now($post_id) {
 	global $wpdb;
 	$post_id = (int) $post_id;
-	if ( !$post_id )
-		return false;
+	if ( !$post_id ) {
+			return false;
+	}
 
 	wp_cache_delete( 'comments-0', 'counts' );
 	wp_cache_delete( "comments-{$post_id}", 'counts' );
 
-	if ( !$post = get_post($post_id) )
-		return false;
+	if ( !$post = get_post($post_id) ) {
+			return false;
+	}
 
 	$old = (int) $post->comment_count;
 
@@ -2371,8 +2427,9 @@ 
  * @return false|string False on failure, string containing URI on success.
  */
 function discover_pingback_server_uri( $url, $deprecated = '' ) {
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '2.7.0' );
+	if ( !empty( $deprecated ) ) {
+			_deprecated_argument( __FUNCTION__, '2.7.0' );
+	}
 
 	$pingback_str_dquote = 'rel="pingback"';
 	$pingback_str_squote = 'rel=\'pingback\'';
@@ -2380,31 +2437,38 @@ 
 	/** @todo Should use Filter Extension or custom preg_match instead. */
 	$parsed_url = parse_url($url);
 
-	if ( ! isset( $parsed_url['host'] ) ) // Not a URL. This should never happen.
+	if ( ! isset( $parsed_url['host'] ) ) {
+		// Not a URL. This should never happen.
 		return false;
+	}
 
 	//Do not search for a pingback server on our own uploads
 	$uploads_dir = wp_get_upload_dir();
-	if ( 0 === strpos($url, $uploads_dir['baseurl']) )
-		return false;
+	if ( 0 === strpos($url, $uploads_dir['baseurl']) ) {
+			return false;
+	}
 
 	$response = wp_safe_remote_head( $url, array( 'timeout' => 2, 'httpversion' => '1.0' ) );
 
-	if ( is_wp_error( $response ) )
-		return false;
+	if ( is_wp_error( $response ) ) {
+			return false;
+	}
 
-	if ( wp_remote_retrieve_header( $response, 'x-pingback' ) )
-		return wp_remote_retrieve_header( $response, 'x-pingback' );
+	if ( wp_remote_retrieve_header( $response, 'x-pingback' ) ) {
+			return wp_remote_retrieve_header( $response, 'x-pingback' );
+	}
 
 	// Not an (x)html, sgml, or xml page, no use going further.
-	if ( preg_match('#(image|audio|video|model)/#is', wp_remote_retrieve_header( $response, 'content-type' )) )
-		return false;
+	if ( preg_match('#(image|audio|video|model)/#is', wp_remote_retrieve_header( $response, 'content-type' )) ) {
+			return false;
+	}
 
 	// Now do a GET since we're going to look in the html headers (and we're sure it's not a binary file)
 	$response = wp_safe_remote_get( $url, array( 'timeout' => 2, 'httpversion' => '1.0' ) );
 
-	if ( is_wp_error( $response ) )
-		return false;
+	if ( is_wp_error( $response ) ) {
+			return false;
+	}
 
 	$contents = wp_remote_retrieve_body( $response );
 
@@ -2452,9 +2516,10 @@ 
 
 	// Do Trackbacks
 	$trackbacks = $wpdb->get_col("SELECT ID FROM $wpdb->posts WHERE to_ping <> '' AND post_status = 'publish'");
-	if ( is_array($trackbacks) )
-		foreach ( $trackbacks as $trackback )
+	if ( is_array($trackbacks) ) {
+			foreach ( $trackbacks as $trackback )
 			do_trackbacks($trackback);
+	}
 
 	//Do Update Services/Generic Pings
 	generic_ping();
@@ -2527,8 +2592,9 @@ 
 	$services = explode("\n", $services);
 	foreach ( (array) $services as $service ) {
 		$service = trim($service);
-		if ( '' != $service )
-			weblog_ping($service);
+		if ( '' != $service ) {
+					weblog_ping($service);
+		}
 	}
 
 	return $post_id;
@@ -2578,10 +2644,11 @@ 
 		if ( ! in_array( $link_test, $pung ) && ( url_to_postid( $link_test ) != $post->ID ) // If we haven't pung it already and it isn't a link to itself
 				&& !is_local_attachment($link_test) ) : // Also, let's never ping local attachments.
 			if ( $test = @parse_url($link_test) ) {
-				if ( isset($test['query']) )
-					$post_links[] = $link_test;
-				elseif ( isset( $test['path'] ) && ( $test['path'] != '/' ) && ( $test['path'] != '' ) )
-					$post_links[] = $link_test;
+				if ( isset($test['query']) ) {
+									$post_links[] = $link_test;
+				} elseif ( isset( $test['path'] ) && ( $test['path'] != '/' ) && ( $test['path'] != '' ) ) {
+									$post_links[] = $link_test;
+				}
 			}
 		endif;
 	endforeach;
@@ -2625,8 +2692,10 @@ 
 			// when set to true, this outputs debug messages by itself
 			$client->debug = false;
 
-			if ( $client->query('pingback.ping', $pagelinkedfrom, $pagelinkedto) || ( isset($client->error->code) && 48 == $client->error->code ) ) // Already registered
+			if ( $client->query('pingback.ping', $pagelinkedfrom, $pagelinkedto) || ( isset($client->error->code) && 48 == $client->error->code ) ) {
+				// Already registered
 				add_ping( $post, $pagelinkedto );
+			}
 		}
 	}
 }
@@ -2640,11 +2709,12 @@ 
  * @return mixed Empty string if blog is not public, returns $sites, if site is public.
  */
 function privacy_ping_filter($sites) {
-	if ( '0' != get_option('blog_public') )
-		return $sites;
-	else
-		return '';
-}
+	if ( '0' != get_option('blog_public') ) {
+			return $sites;
+	} else {
+			return '';
+	}
+	}
 
 /**
  * Send a Trackback.
@@ -2664,8 +2734,9 @@ 
 function trackback($trackback_url, $title, $excerpt, $ID) {
 	global $wpdb;
 
-	if ( empty($trackback_url) )
-		return;
+	if ( empty($trackback_url) ) {
+			return;
+	}
 
 	$options = array();
 	$options['timeout'] = 10;
@@ -2678,8 +2749,9 @@ 
 
 	$response = wp_safe_remote_post( $trackback_url, $options );
 
-	if ( is_wp_error( $response ) )
-		return;
+	if ( is_wp_error( $response ) ) {
+			return;
+	}
 
 	$wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET pinged = CONCAT(pinged, '\n', %s) WHERE ID = %d", $trackback_url, $ID) );
 	return $wpdb->query( $wpdb->prepare("UPDATE $wpdb->posts SET to_ping = TRIM(REPLACE(to_ping, %s, '')) WHERE ID = %d", $trackback_url, $ID) );
@@ -2705,9 +2777,11 @@ 
 	// when set to true, this outputs debug messages by itself
 	$client->debug = false;
 	$home = trailingslashit( home_url() );
-	if ( !$client->query('weblogUpdates.extendedPing', get_option('blogname'), $home, get_bloginfo('rss2_url') ) ) // then try a normal ping
+	if ( !$client->query('weblogUpdates.extendedPing', get_option('blogname'), $home, get_bloginfo('rss2_url') ) ) {
+		// then try a normal ping
 		$client->query('weblogUpdates.ping', get_option('blogname'), $home);
-}
+	}
+	}
 
 /**
  * Default filter attached to pingback_ping_source_uri to validate the pingback's Source URI
@@ -2735,8 +2809,9 @@ 
  * @return IXR_Error
  */
 function xmlrpc_pingback_error( $ixr_error ) {
-	if ( $ixr_error->code === 48 )
-		return $ixr_error;
+	if ( $ixr_error->code === 48 ) {
+			return $ixr_error;
+	}
 	return new IXR_Error( 0, '' );
 }
 
@@ -2782,8 +2857,9 @@ 
  * @param bool  $update_meta_cache Whether to update commentmeta cache. Default true.
  */
 function update_comment_cache( $comments, $update_meta_cache = true ) {
-	foreach ( (array) $comments as $comment )
-		wp_cache_add($comment->comment_ID, $comment, 'comment');
+	foreach ( (array) $comments as $comment ) {
+			wp_cache_add($comment->comment_ID, $comment, 'comment');
+	}
 
 	if ( $update_meta_cache ) {
 		// Avoid `wp_list_pluck()` in case `$comments` is passed by reference.
@@ -2833,8 +2909,9 @@ 
  * @return array
  */
 function _close_comments_for_old_posts( $posts, $query ) {
-	if ( empty( $posts ) || ! $query->is_singular() || ! get_option( 'close_comments_for_old_posts' ) )
-		return $posts;
+	if ( empty( $posts ) || ! $query->is_singular() || ! get_option( 'close_comments_for_old_posts' ) ) {
+			return $posts;
+	}
 
 	/**
 	 * Filters the list of post types to automatically close comments for.
@@ -2844,12 +2921,14 @@ 
 	 * @param array $post_types An array of registered post types. Default array with 'post'.
 	 */
 	$post_types = apply_filters( 'close_comments_for_post_types', array( 'post' ) );
-	if ( ! in_array( $posts[0]->post_type, $post_types ) )
-		return $posts;
+	if ( ! in_array( $posts[0]->post_type, $post_types ) ) {
+			return $posts;
+	}
 
 	$days_old = (int) get_option( 'close_comments_days_old' );
-	if ( ! $days_old )
-		return $posts;
+	if ( ! $days_old ) {
+			return $posts;
+	}
 
 	if ( time() - strtotime( $posts[0]->post_date_gmt ) > ( $days_old * DAY_IN_SECONDS ) ) {
 		$posts[0]->comment_status = 'closed';
@@ -2870,30 +2949,35 @@ 
  * @return bool $open
  */
 function _close_comments_for_old_post( $open, $post_id ) {
-	if ( ! $open )
-		return $open;
+	if ( ! $open ) {
+			return $open;
+	}
 
-	if ( !get_option('close_comments_for_old_posts') )
-		return $open;
+	if ( !get_option('close_comments_for_old_posts') ) {
+			return $open;
+	}
 
 	$days_old = (int) get_option('close_comments_days_old');
-	if ( !$days_old )
-		return $open;
+	if ( !$days_old ) {
+			return $open;
+	}
 
 	$post = get_post($post_id);
 
 	/** This filter is documented in wp-includes/comment.php */
 	$post_types = apply_filters( 'close_comments_for_post_types', array( 'post' ) );
-	if ( ! in_array( $post->post_type, $post_types ) )
-		return $open;
+	if ( ! in_array( $post->post_type, $post_types ) ) {
+			return $open;
+	}
 
 	// Undated drafts should not show up as comments closed.
 	if ( '0000-00-00 00:00:00' === $post->post_date_gmt ) {
 		return $open;
 	}
 
-	if ( time() - strtotime( $post->post_date_gmt ) > ( $days_old * DAY_IN_SECONDS ) )
-		return false;
+	if ( time() - strtotime( $post->post_date_gmt ) > ( $days_old * DAY_IN_SECONDS ) ) {
+			return false;
+	}
 
 	return $open;
 }

src/wp-includes/http.php

Doc Comments +1 added lines, -1 removed lines

@@ -721,7 +721,7 @@
  * @see   http://php.net/manual/en/url.constants.php
  *
  * @param int $constant PHP_URL_* constant.
- * @return string|bool The named key or false.
+ * @return string|false The named key or false.
  */
 function _wp_translate_php_url_constant_to_key( $constant ) {
 	$translation = array(

Braces +60 added lines, -39 removed lines

@@ -255,8 +255,9 @@ 
  * @return int|string The response code as an integer. Empty string on incorrect parameter given.
  */
 function wp_remote_retrieve_response_code( $response ) {
-	if ( is_wp_error($response) || ! isset($response['response']) || ! is_array($response['response']))
-		return '';
+	if ( is_wp_error($response) || ! isset($response['response']) || ! is_array($response['response'])) {
+			return '';
+	}
 
 	return $response['response']['code'];
 }
@@ -272,8 +273,9 @@ 
  * @return string The response message. Empty string on incorrect parameter given.
  */
 function wp_remote_retrieve_response_message( $response ) {
-	if ( is_wp_error($response) || ! isset($response['response']) || ! is_array($response['response']))
-		return '';
+	if ( is_wp_error($response) || ! isset($response['response']) || ! is_array($response['response'])) {
+			return '';
+	}
 
 	return $response['response']['message'];
 }
@@ -287,8 +289,9 @@ 
  * @return string The body of the response. Empty string if no body or incorrect parameter given.
  */
 function wp_remote_retrieve_body( $response ) {
-	if ( is_wp_error($response) || ! isset($response['body']) )
-		return '';
+	if ( is_wp_error($response) || ! isset($response['body']) ) {
+			return '';
+	}
 
 	return $response['body'];
 }
@@ -395,8 +398,9 @@ 
  */
 function get_http_origin() {
 	$origin = '';
-	if ( ! empty ( $_SERVER[ 'HTTP_ORIGIN' ] ) )
-		$origin = $_SERVER[ 'HTTP_ORIGIN' ];
+	if ( ! empty ( $_SERVER[ 'HTTP_ORIGIN' ] ) ) {
+			$origin = $_SERVER[ 'HTTP_ORIGIN' ];
+	}
 
 	/**
 	 * Change the origin of an HTTP request.
@@ -454,11 +458,13 @@ 
 function is_allowed_http_origin( $origin = null ) {
 	$origin_arg = $origin;
 
-	if ( null === $origin )
-		$origin = get_http_origin();
+	if ( null === $origin ) {
+			$origin = get_http_origin();
+	}
 
-	if ( $origin && ! in_array( $origin, get_allowed_http_origins() ) )
-		$origin = '';
+	if ( $origin && ! in_array( $origin, get_allowed_http_origins() ) ) {
+			$origin = '';
+	}
 
 	/**
 	 * Change the allowed HTTP origin result.
@@ -490,8 +496,9 @@ 
 	if ( is_allowed_http_origin( $origin ) ) {
 		@header( 'Access-Control-Allow-Origin: ' .  $origin );
 		@header( 'Access-Control-Allow-Credentials: true' );
-		if ( 'OPTIONS' === $_SERVER['REQUEST_METHOD'] )
-			exit;
+		if ( 'OPTIONS' === $_SERVER['REQUEST_METHOD'] ) {
+					exit;
+		}
 		return $origin;
 	}
 
@@ -514,18 +521,22 @@ 
 function wp_http_validate_url( $url ) {
 	$original_url = $url;
 	$url = wp_kses_bad_protocol( $url, array( 'http', 'https' ) );
-	if ( ! $url || strtolower( $url ) !== strtolower( $original_url ) )
-		return false;
+	if ( ! $url || strtolower( $url ) !== strtolower( $original_url ) ) {
+			return false;
+	}
 
 	$parsed_url = @parse_url( $url );
-	if ( ! $parsed_url || empty( $parsed_url['host'] ) )
-		return false;
+	if ( ! $parsed_url || empty( $parsed_url['host'] ) ) {
+			return false;
+	}
 
-	if ( isset( $parsed_url['user'] ) || isset( $parsed_url['pass'] ) )
-		return false;
+	if ( isset( $parsed_url['user'] ) || isset( $parsed_url['pass'] ) ) {
+			return false;
+	}
 
-	if ( false !== strpbrk( $parsed_url['host'], ':#?[]' ) )
-		return false;
+	if ( false !== strpbrk( $parsed_url['host'], ':#?[]' ) ) {
+			return false;
+	}
 
 	$parsed_home = @parse_url( get_option( 'home' ) );
 
@@ -541,8 +552,10 @@ 
 			$ip = $host;
 		} else {
 			$ip = gethostbyname( $host );
-			if ( $ip === $host ) // Error condition for gethostbyname()
+			if ( $ip === $host ) {
+				// Error condition for gethostbyname()
 				$ip = false;
+			}
 		}
 		if ( $ip ) {
 			$parts = array_map( 'intval', explode( '.', $ip ) );
@@ -562,21 +575,25 @@ 
 				 * @param string $host IP of the requested host.
 				 * @param string $url  URL of the requested host.
 				 */
-				if ( ! apply_filters( 'http_request_host_is_external', false, $host, $url ) )
-					return false;
+				if ( ! apply_filters( 'http_request_host_is_external', false, $host, $url ) ) {
+									return false;
+				}
 			}
 		}
 	}
 
-	if ( empty( $parsed_url['port'] ) )
-		return $url;
+	if ( empty( $parsed_url['port'] ) ) {
+			return $url;
+	}
 
 	$port = $parsed_url['port'];
-	if ( 80 === $port || 443 === $port || 8080 === $port )
-		return $url;
+	if ( 80 === $port || 443 === $port || 8080 === $port ) {
+			return $url;
+	}
 
-	if ( $parsed_home && $same_host && isset( $parsed_home['port'] ) && $parsed_home['port'] === $port )
-		return $url;
+	if ( $parsed_home && $same_host && isset( $parsed_home['port'] ) && $parsed_home['port'] === $port ) {
+			return $url;
+	}
 
 	return false;
 }
@@ -593,8 +610,9 @@ 
  * @return bool
  */
 function allowed_http_request_hosts( $is_external, $host ) {
-	if ( ! $is_external && wp_validate_redirect( 'http://' . $host ) )
-		$is_external = true;
+	if ( ! $is_external && wp_validate_redirect( 'http://' . $host ) ) {
+			$is_external = true;
+	}
 	return $is_external;
 }
 
@@ -615,12 +633,15 @@ 
 function ms_allowed_http_request_hosts( $is_external, $host ) {
 	global $wpdb;
 	static $queried = array();
-	if ( $is_external )
-		return $is_external;
-	if ( $host === get_network()->domain )
-		return true;
-	if ( isset( $queried[ $host ] ) )
-		return $queried[ $host ];
+	if ( $is_external ) {
+			return $is_external;
+	}
+	if ( $host === get_network()->domain ) {
+			return true;
+	}
+	if ( isset( $queried[ $host ] ) ) {
+			return $queried[ $host ];
+	}
 	$queried[ $host ] = (bool) $wpdb->get_var( $wpdb->prepare( "SELECT domain FROM $wpdb->blogs WHERE domain = %s LIMIT 1", $host ) );
 	return $queried[ $host ];
 }

Spacing +116 added lines, -116 removed lines

@@ -22,7 +22,7 @@ 
 function _wp_http_get_object() {
 	static $http = null;
 
-	if ( is_null( $http ) ) {
+	if (is_null($http)) {
 		$http = new WP_Http();
 	}
 	return $http;
@@ -43,10 +43,10 @@ 
  * @param array  $args Optional. Request arguments. Default empty array.
  * @return WP_Error|array The response or WP_Error on failure.
  */
-function wp_safe_remote_request( $url, $args = array() ) {
+function wp_safe_remote_request($url, $args = array()) {
 	$args['reject_unsafe_urls'] = true;
 	$http = _wp_http_get_object();
-	return $http->request( $url, $args );
+	return $http->request($url, $args);
 }
 
 /**
@@ -64,10 +64,10 @@ 
  * @param array  $args Optional. Request arguments. Default empty array.
  * @return WP_Error|array The response or WP_Error on failure.
  */
-function wp_safe_remote_get( $url, $args = array() ) {
+function wp_safe_remote_get($url, $args = array()) {
 	$args['reject_unsafe_urls'] = true;
 	$http = _wp_http_get_object();
-	return $http->get( $url, $args );
+	return $http->get($url, $args);
 }
 
 /**
@@ -85,10 +85,10 @@ 
  * @param array  $args Optional. Request arguments. Default empty array.
  * @return WP_Error|array The response or WP_Error on failure.
  */
-function wp_safe_remote_post( $url, $args = array() ) {
+function wp_safe_remote_post($url, $args = array()) {
 	$args['reject_unsafe_urls'] = true;
 	$http = _wp_http_get_object();
-	return $http->post( $url, $args );
+	return $http->post($url, $args);
 }
 
 /**
@@ -106,10 +106,10 @@ 
  * @param array $args Optional. Request arguments. Default empty array.
  * @return WP_Error|array The response or WP_Error on failure.
  */
-function wp_safe_remote_head( $url, $args = array() ) {
+function wp_safe_remote_head($url, $args = array()) {
 	$args['reject_unsafe_urls'] = true;
 	$http = _wp_http_get_object();
-	return $http->head( $url, $args );
+	return $http->head($url, $args);
 }
 
 /**
@@ -150,7 +150,7 @@ 
  */
 function wp_remote_request($url, $args = array()) {
 	$http = _wp_http_get_object();
-	return $http->request( $url, $args );
+	return $http->request($url, $args);
 }
 
 /**
@@ -167,7 +167,7 @@ 
  */
 function wp_remote_get($url, $args = array()) {
 	$http = _wp_http_get_object();
-	return $http->get( $url, $args );
+	return $http->get($url, $args);
 }
 
 /**
@@ -184,7 +184,7 @@ 
  */
 function wp_remote_post($url, $args = array()) {
 	$http = _wp_http_get_object();
-	return $http->post( $url, $args );
+	return $http->post($url, $args);
 }
 
 /**
@@ -201,7 +201,7 @@ 
  */
 function wp_remote_head($url, $args = array()) {
 	$http = _wp_http_get_object();
-	return $http->head( $url, $args );
+	return $http->head($url, $args);
 }
 
 /**
@@ -215,8 +215,8 @@ 
  * @param array $response HTTP response.
  * @return array|\Requests_Utility_CaseInsensitiveDictionary The headers of the response. Empty array if incorrect parameter given.
  */
-function wp_remote_retrieve_headers( $response ) {
-	if ( is_wp_error( $response ) || ! isset( $response['headers'] ) ) {
+function wp_remote_retrieve_headers($response) {
+	if (is_wp_error($response) || ! isset($response['headers'])) {
 		return array();
 	}
 
@@ -232,12 +232,12 @@ 
  * @param string $header Header name to retrieve value from.
  * @return string The header value. Empty string on if incorrect parameter given, or if the header doesn't exist.
  */
-function wp_remote_retrieve_header( $response, $header ) {
-	if ( is_wp_error( $response ) || ! isset( $response['headers'] ) ) {
+function wp_remote_retrieve_header($response, $header) {
+	if (is_wp_error($response) || ! isset($response['headers'])) {
 		return '';
 	}
 
-	if ( isset( $response['headers'][ $header ] ) ) {
+	if (isset($response['headers'][$header])) {
 		return $response['headers'][$header];
 	}
 
@@ -254,8 +254,8 @@ 
  * @param array $response HTTP response.
  * @return int|string The response code as an integer. Empty string on incorrect parameter given.
  */
-function wp_remote_retrieve_response_code( $response ) {
-	if ( is_wp_error($response) || ! isset($response['response']) || ! is_array($response['response']))
+function wp_remote_retrieve_response_code($response) {
+	if (is_wp_error($response) || ! isset($response['response']) || ! is_array($response['response']))
 		return '';
 
 	return $response['response']['code'];
@@ -271,8 +271,8 @@ 
  * @param array $response HTTP response.
  * @return string The response message. Empty string on incorrect parameter given.
  */
-function wp_remote_retrieve_response_message( $response ) {
-	if ( is_wp_error($response) || ! isset($response['response']) || ! is_array($response['response']))
+function wp_remote_retrieve_response_message($response) {
+	if (is_wp_error($response) || ! isset($response['response']) || ! is_array($response['response']))
 		return '';
 
 	return $response['response']['message'];
@@ -286,8 +286,8 @@ 
  * @param array $response HTTP response.
  * @return string The body of the response. Empty string if no body or incorrect parameter given.
  */
-function wp_remote_retrieve_body( $response ) {
-	if ( is_wp_error($response) || ! isset($response['body']) )
+function wp_remote_retrieve_body($response) {
+	if (is_wp_error($response) || ! isset($response['body']))
 		return '';
 
 	return $response['body'];
@@ -301,8 +301,8 @@ 
  * @param array $response HTTP response.
  * @return array An array of `WP_Http_Cookie` objects from the response. Empty array if there are none, or the response is a WP_Error.
  */
-function wp_remote_retrieve_cookies( $response ) {
-	if ( is_wp_error( $response ) || empty( $response['cookies'] ) ) {
+function wp_remote_retrieve_cookies($response) {
+	if (is_wp_error($response) || empty($response['cookies'])) {
 		return array();
 	}
 
@@ -318,15 +318,15 @@ 
  * @param string $name     The name of the cookie to retrieve.
  * @return WP_Http_Cookie|string The `WP_Http_Cookie` object. Empty string if the cookie isn't present in the response.
  */
-function wp_remote_retrieve_cookie( $response, $name ) {
-	$cookies = wp_remote_retrieve_cookies( $response );
+function wp_remote_retrieve_cookie($response, $name) {
+	$cookies = wp_remote_retrieve_cookies($response);
 
-	if ( empty( $cookies ) ) {
+	if (empty($cookies)) {
 		return '';
 	}
 
-	foreach ( $cookies as $cookie ) {
-		if ( $cookie->name === $name ) {
+	foreach ($cookies as $cookie) {
+		if ($cookie->name === $name) {
 			return $cookie;
 		}
 	}
@@ -343,10 +343,10 @@ 
  * @param string $name     The name of the cookie to retrieve.
  * @return string The value of the cookie. Empty string if the cookie isn't present in the response.
  */
-function wp_remote_retrieve_cookie_value( $response, $name ) {
-	$cookie = wp_remote_retrieve_cookie( $response, $name );
+function wp_remote_retrieve_cookie_value($response, $name) {
+	$cookie = wp_remote_retrieve_cookie($response, $name);
 
-	if ( ! is_a( $cookie, 'WP_Http_Cookie' ) ) {
+	if ( ! is_a($cookie, 'WP_Http_Cookie')) {
 		return '';
 	}
 
@@ -364,26 +364,26 @@ 
  *
  * @return bool
  */
-function wp_http_supports( $capabilities = array(), $url = null ) {
+function wp_http_supports($capabilities = array(), $url = null) {
 	$http = _wp_http_get_object();
 
-	$capabilities = wp_parse_args( $capabilities );
+	$capabilities = wp_parse_args($capabilities);
 
-	$count = count( $capabilities );
+	$count = count($capabilities);
 
 	// If we have a numeric $capabilities array, spoof a wp_remote_request() associative $args array
-	if ( $count && count( array_filter( array_keys( $capabilities ), 'is_numeric' ) ) == $count ) {
-		$capabilities = array_combine( array_values( $capabilities ), array_fill( 0, $count, true ) );
+	if ($count && count(array_filter(array_keys($capabilities), 'is_numeric')) == $count) {
+		$capabilities = array_combine(array_values($capabilities), array_fill(0, $count, true));
 	}
 
-	if ( $url && !isset( $capabilities['ssl'] ) ) {
-		$scheme = parse_url( $url, PHP_URL_SCHEME );
-		if ( 'https' == $scheme || 'ssl' == $scheme ) {
+	if ($url && ! isset($capabilities['ssl'])) {
+		$scheme = parse_url($url, PHP_URL_SCHEME);
+		if ('https' == $scheme || 'ssl' == $scheme) {
 			$capabilities['ssl'] = true;
 		}
 	}
 
-	return (bool) $http->_get_first_available_transport( $capabilities );
+	return (bool) $http->_get_first_available_transport($capabilities);
 }
 
 /**
@@ -395,8 +395,8 @@ 
  */
 function get_http_origin() {
 	$origin = '';
-	if ( ! empty ( $_SERVER[ 'HTTP_ORIGIN' ] ) )
-		$origin = $_SERVER[ 'HTTP_ORIGIN' ];
+	if ( ! empty ($_SERVER['HTTP_ORIGIN']))
+		$origin = $_SERVER['HTTP_ORIGIN'];
 
 	/**
 	 * Change the origin of an HTTP request.
@@ -405,7 +405,7 @@ 
 	 *
 	 * @param string $origin The original origin for the request.
 	 */
-	return apply_filters( 'http_origin', $origin );
+	return apply_filters('http_origin', $origin);
 }
 
 /**
@@ -416,16 +416,16 @@ 
  * @return array Array of origin URLs.
  */
 function get_allowed_http_origins() {
-	$admin_origin = parse_url( admin_url() );
-	$home_origin = parse_url( home_url() );
+	$admin_origin = parse_url(admin_url());
+	$home_origin = parse_url(home_url());
 
 	// @todo preserve port?
-	$allowed_origins = array_unique( array(
-		'http://' . $admin_origin[ 'host' ],
-		'https://' . $admin_origin[ 'host' ],
-		'http://' . $home_origin[ 'host' ],
-		'https://' . $home_origin[ 'host' ],
-	) );
+	$allowed_origins = array_unique(array(
+		'http://'.$admin_origin['host'],
+		'https://'.$admin_origin['host'],
+		'http://'.$home_origin['host'],
+		'https://'.$home_origin['host'],
+	));
 
 	/**
 	 * Change the origin types allowed for HTTP requests.
@@ -440,7 +440,7 @@ 
 	 *     @type string Secure URL for home origin.
 	 * }
 	 */
-	return apply_filters( 'allowed_http_origins' , $allowed_origins );
+	return apply_filters('allowed_http_origins', $allowed_origins);
 }
 
 /**
@@ -451,13 +451,13 @@ 
  * @param null|string $origin Origin URL. If not provided, the value of get_http_origin() is used.
  * @return string Origin URL if allowed, empty string if not.
  */
-function is_allowed_http_origin( $origin = null ) {
+function is_allowed_http_origin($origin = null) {
 	$origin_arg = $origin;
 
-	if ( null === $origin )
+	if (null === $origin)
 		$origin = get_http_origin();
 
-	if ( $origin && ! in_array( $origin, get_allowed_http_origins() ) )
+	if ($origin && ! in_array($origin, get_allowed_http_origins()))
 		$origin = '';
 
 	/**
@@ -468,7 +468,7 @@ 
 	 * @param string $origin     Origin URL if allowed, empty string if not.
 	 * @param string $origin_arg Original origin string passed into is_allowed_http_origin function.
 	 */
-	return apply_filters( 'allowed_http_origin', $origin, $origin_arg );
+	return apply_filters('allowed_http_origin', $origin, $origin_arg);
 }
 
 /**
@@ -487,16 +487,16 @@ 
 function send_origin_headers() {
 	$origin = get_http_origin();
 
-	if ( is_allowed_http_origin( $origin ) ) {
-		@header( 'Access-Control-Allow-Origin: ' .  $origin );
-		@header( 'Access-Control-Allow-Credentials: true' );
-		if ( 'OPTIONS' === $_SERVER['REQUEST_METHOD'] )
+	if (is_allowed_http_origin($origin)) {
+		@header('Access-Control-Allow-Origin: '.$origin);
+		@header('Access-Control-Allow-Credentials: true');
+		if ('OPTIONS' === $_SERVER['REQUEST_METHOD'])
 			exit;
 		return $origin;
 	}
 
-	if ( 'OPTIONS' === $_SERVER['REQUEST_METHOD'] ) {
-		status_header( 403 );
+	if ('OPTIONS' === $_SERVER['REQUEST_METHOD']) {
+		status_header(403);
 		exit;
 	}
 
@@ -511,44 +511,44 @@ 
  * @param string $url
  * @return false|string URL or false on failure.
  */
-function wp_http_validate_url( $url ) {
+function wp_http_validate_url($url) {
 	$original_url = $url;
-	$url = wp_kses_bad_protocol( $url, array( 'http', 'https' ) );
-	if ( ! $url || strtolower( $url ) !== strtolower( $original_url ) )
+	$url = wp_kses_bad_protocol($url, array('http', 'https'));
+	if ( ! $url || strtolower($url) !== strtolower($original_url))
 		return false;
 
-	$parsed_url = @parse_url( $url );
-	if ( ! $parsed_url || empty( $parsed_url['host'] ) )
+	$parsed_url = @parse_url($url);
+	if ( ! $parsed_url || empty($parsed_url['host']))
 		return false;
 
-	if ( isset( $parsed_url['user'] ) || isset( $parsed_url['pass'] ) )
+	if (isset($parsed_url['user']) || isset($parsed_url['pass']))
 		return false;
 
-	if ( false !== strpbrk( $parsed_url['host'], ':#?[]' ) )
+	if (false !== strpbrk($parsed_url['host'], ':#?[]'))
 		return false;
 
-	$parsed_home = @parse_url( get_option( 'home' ) );
+	$parsed_home = @parse_url(get_option('home'));
 
-	if ( isset( $parsed_home['host'] ) ) {
-		$same_host = ( strtolower( $parsed_home['host'] ) === strtolower( $parsed_url['host'] ) || 'localhost' === strtolower( $parsed_url['host'] ) );
+	if (isset($parsed_home['host'])) {
+		$same_host = (strtolower($parsed_home['host']) === strtolower($parsed_url['host']) || 'localhost' === strtolower($parsed_url['host']));
 	} else {
 		$same_host = false;
 	}
 
-	if ( ! $same_host ) {
-		$host = trim( $parsed_url['host'], '.' );
-		if ( preg_match( '#^(([1-9]?\d|1\d\d|25[0-5]|2[0-4]\d)\.){3}([1-9]?\d|1\d\d|25[0-5]|2[0-4]\d)$#', $host ) ) {
+	if ( ! $same_host) {
+		$host = trim($parsed_url['host'], '.');
+		if (preg_match('#^(([1-9]?\d|1\d\d|25[0-5]|2[0-4]\d)\.){3}([1-9]?\d|1\d\d|25[0-5]|2[0-4]\d)$#', $host)) {
 			$ip = $host;
 		} else {
-			$ip = gethostbyname( $host );
-			if ( $ip === $host ) // Error condition for gethostbyname()
+			$ip = gethostbyname($host);
+			if ($ip === $host) // Error condition for gethostbyname()
 				$ip = false;
 		}
-		if ( $ip ) {
-			$parts = array_map( 'intval', explode( '.', $ip ) );
-			if ( 127 === $parts[0] || 10 === $parts[0] || 0 === $parts[0]
-				|| ( 172 === $parts[0] && 16 <= $parts[1] && 31 >= $parts[1] )
-				|| ( 192 === $parts[0] && 168 === $parts[1] )
+		if ($ip) {
+			$parts = array_map('intval', explode('.', $ip));
+			if (127 === $parts[0] || 10 === $parts[0] || 0 === $parts[0]
+				|| (172 === $parts[0] && 16 <= $parts[1] && 31 >= $parts[1])
+				|| (192 === $parts[0] && 168 === $parts[1])
 			) {
 				// If host appears local, reject unless specifically allowed.
 				/**
@@ -562,20 +562,20 @@ 
 				 * @param string $host IP of the requested host.
 				 * @param string $url  URL of the requested host.
 				 */
-				if ( ! apply_filters( 'http_request_host_is_external', false, $host, $url ) )
+				if ( ! apply_filters('http_request_host_is_external', false, $host, $url))
 					return false;
 			}
 		}
 	}
 
-	if ( empty( $parsed_url['port'] ) )
+	if (empty($parsed_url['port']))
 		return $url;
 
 	$port = $parsed_url['port'];
-	if ( 80 === $port || 443 === $port || 8080 === $port )
+	if (80 === $port || 443 === $port || 8080 === $port)
 		return $url;
 
-	if ( $parsed_home && $same_host && isset( $parsed_home['port'] ) && $parsed_home['port'] === $port )
+	if ($parsed_home && $same_host && isset($parsed_home['port']) && $parsed_home['port'] === $port)
 		return $url;
 
 	return false;
@@ -592,8 +592,8 @@ 
  * @param string $host
  * @return bool
  */
-function allowed_http_request_hosts( $is_external, $host ) {
-	if ( ! $is_external && wp_validate_redirect( 'http://' . $host ) )
+function allowed_http_request_hosts($is_external, $host) {
+	if ( ! $is_external && wp_validate_redirect('http://'.$host))
 		$is_external = true;
 	return $is_external;
 }
@@ -612,17 +612,17 @@ 
  * @param string $host
  * @return bool
  */
-function ms_allowed_http_request_hosts( $is_external, $host ) {
+function ms_allowed_http_request_hosts($is_external, $host) {
 	global $wpdb;
 	static $queried = array();
-	if ( $is_external )
+	if ($is_external)
 		return $is_external;
-	if ( $host === get_network()->domain )
+	if ($host === get_network()->domain)
 		return true;
-	if ( isset( $queried[ $host ] ) )
-		return $queried[ $host ];
-	$queried[ $host ] = (bool) $wpdb->get_var( $wpdb->prepare( "SELECT domain FROM $wpdb->blogs WHERE domain = %s LIMIT 1", $host ) );
-	return $queried[ $host ];
+	if (isset($queried[$host]))
+		return $queried[$host];
+	$queried[$host] = (bool) $wpdb->get_var($wpdb->prepare("SELECT domain FROM $wpdb->blogs WHERE domain = %s LIMIT 1", $host));
+	return $queried[$host];
 }
 
 /**
@@ -653,32 +653,32 @@ 
  *               doesn't exist in the given URL; a string or - in the case of
  *               PHP_URL_PORT - integer when it does. See parse_url()'s return values.
  */
-function wp_parse_url( $url, $component = -1 ) {
+function wp_parse_url($url, $component = -1) {
 	$to_unset = array();
-	$url = strval( $url );
+	$url = strval($url);
 
-	if ( '//' === substr( $url, 0, 2 ) ) {
+	if ('//' === substr($url, 0, 2)) {
 		$to_unset[] = 'scheme';
-		$url = 'placeholder:' . $url;
-	} elseif ( '/' === substr( $url, 0, 1 ) ) {
+		$url = 'placeholder:'.$url;
+	} elseif ('/' === substr($url, 0, 1)) {
 		$to_unset[] = 'scheme';
 		$to_unset[] = 'host';
-		$url = 'placeholder://placeholder' . $url;
+		$url = 'placeholder://placeholder'.$url;
 	}
 
-	$parts = @parse_url( $url );
+	$parts = @parse_url($url);
 
-	if ( false === $parts ) {
+	if (false === $parts) {
 		// Parsing failure.
 		return $parts;
 	}
 
 	// Remove the placeholder values.
-	foreach ( $to_unset as $key ) {
-		unset( $parts[ $key ] );
+	foreach ($to_unset as $key) {
+		unset($parts[$key]);
 	}
 
-	return _get_component_from_parsed_url_array( $parts, $component );
+	return _get_component_from_parsed_url_array($parts, $component);
 }
 
 /**
@@ -698,14 +698,14 @@ 
  *               doesn't exist in the given URL; a string or - in the case of
  *               PHP_URL_PORT - integer when it does. See parse_url()'s return values.
  */
-function _get_component_from_parsed_url_array( $url_parts, $component = -1 ) {
+function _get_component_from_parsed_url_array($url_parts, $component = -1) {
 	if ( -1 === $component ) {
 		return $url_parts;
 	}
 
-	$key = _wp_translate_php_url_constant_to_key( $component );
-	if ( false !== $key && is_array( $url_parts ) && isset( $url_parts[ $key ] ) ) {
-		return $url_parts[ $key ];
+	$key = _wp_translate_php_url_constant_to_key($component);
+	if (false !== $key && is_array($url_parts) && isset($url_parts[$key])) {
+		return $url_parts[$key];
 	} else {
 		return null;
 	}
@@ -723,7 +723,7 @@ 
  * @param int $constant PHP_URL_* constant.
  * @return string|bool The named key or false.
  */
-function _wp_translate_php_url_constant_to_key( $constant ) {
+function _wp_translate_php_url_constant_to_key($constant) {
 	$translation = array(
 		PHP_URL_SCHEME   => 'scheme',
 		PHP_URL_HOST     => 'host',
@@ -735,8 +735,8 @@ 
 		PHP_URL_FRAGMENT => 'fragment',
 	);
 
-	if ( isset( $translation[ $constant ] ) ) {
-		return $translation[ $constant ];
+	if (isset($translation[$constant])) {
+		return $translation[$constant];
 	} else {
 		return false;
 	}

src/wp-includes/IXR/class-IXR-introspectionserver.php

Doc Comments +6 added lines

@@ -1048,6 +1048,12 @@
 		self::__construct();
 	}
 
+    /**
+     * @param string $method
+     * @param string $callback
+     * @param string[] $args
+     * @param string $help
+     */
     function addCallback($method, $callback, $args, $help)
     {
         $this->callbacks[$method] = $callback;

Indentation +145 added lines, -145 removed lines

@@ -8,45 +8,45 @@ 
  */
 class IXR_IntrospectionServer extends IXR_Server
 {
-    var $signatures;
-    var $help;
+	var $signatures;
+	var $help;
 
 	/**
 	 * PHP5 constructor.
 	 */
-    function __construct()
-    {
-        $this->setCallbacks();
-        $this->setCapabilities();
-        $this->capabilities['introspection'] = array(
-            'specUrl' => 'http://xmlrpc.usefulinc.com/doc/reserved.html',
-            'specVersion' => 1
-        );
-        $this->addCallback(
-            'system.methodSignature',
-            'this:methodSignature',
-            array('array', 'string'),
-            'Returns an array describing the return type and required parameters of a method'
-        );
-        $this->addCallback(
-            'system.getCapabilities',
-            'this:getCapabilities',
-            array('struct'),
-            'Returns a struct describing the XML-RPC specifications supported by this server'
-        );
-        $this->addCallback(
-            'system.listMethods',
-            'this:listMethods',
-            array('array'),
-            'Returns an array of available methods on this server'
-        );
-        $this->addCallback(
-            'system.methodHelp',
-            'this:methodHelp',
-            array('string', 'string'),
-            'Returns a documentation string for the specified method'
-        );
-    }
+	function __construct()
+	{
+		$this->setCallbacks();
+		$this->setCapabilities();
+		$this->capabilities['introspection'] = array(
+			'specUrl' => 'http://xmlrpc.usefulinc.com/doc/reserved.html',
+			'specVersion' => 1
+		);
+		$this->addCallback(
+			'system.methodSignature',
+			'this:methodSignature',
+			array('array', 'string'),
+			'Returns an array describing the return type and required parameters of a method'
+		);
+		$this->addCallback(
+			'system.getCapabilities',
+			'this:getCapabilities',
+			array('struct'),
+			'Returns a struct describing the XML-RPC specifications supported by this server'
+		);
+		$this->addCallback(
+			'system.listMethods',
+			'this:listMethods',
+			array('array'),
+			'Returns an array of available methods on this server'
+		);
+		$this->addCallback(
+			'system.methodHelp',
+			'this:methodHelp',
+			array('string', 'string'),
+			'Returns a documentation string for the specified method'
+		);
+	}
 
 	/**
 	 * PHP4 constructor.
@@ -55,120 +55,120 @@ 
 		self::__construct();
 	}
 
-    function addCallback($method, $callback, $args, $help)
-    {
-        $this->callbacks[$method] = $callback;
-        $this->signatures[$method] = $args;
-        $this->help[$method] = $help;
-    }
+	function addCallback($method, $callback, $args, $help)
+	{
+		$this->callbacks[$method] = $callback;
+		$this->signatures[$method] = $args;
+		$this->help[$method] = $help;
+	}
 
-    function call($methodname, $args)
-    {
-        // Make sure it's in an array
-        if ($args && !is_array($args)) {
-            $args = array($args);
-        }
+	function call($methodname, $args)
+	{
+		// Make sure it's in an array
+		if ($args && !is_array($args)) {
+			$args = array($args);
+		}
 
-        // Over-rides default call method, adds signature check
-        if (!$this->hasMethod($methodname)) {
-            return new IXR_Error(-32601, 'server error. requested method "'.$this->message->methodName.'" not specified.');
-        }
-        $method = $this->callbacks[$methodname];
-        $signature = $this->signatures[$methodname];
-        $returnType = array_shift($signature);
+		// Over-rides default call method, adds signature check
+		if (!$this->hasMethod($methodname)) {
+			return new IXR_Error(-32601, 'server error. requested method "'.$this->message->methodName.'" not specified.');
+		}
+		$method = $this->callbacks[$methodname];
+		$signature = $this->signatures[$methodname];
+		$returnType = array_shift($signature);
 
-        // Check the number of arguments
-        if (count($args) != count($signature)) {
-            return new IXR_Error(-32602, 'server error. wrong number of method parameters');
-        }
+		// Check the number of arguments
+		if (count($args) != count($signature)) {
+			return new IXR_Error(-32602, 'server error. wrong number of method parameters');
+		}
 
-        // Check the argument types
-        $ok = true;
-        $argsbackup = $args;
-        for ($i = 0, $j = count($args); $i < $j; $i++) {
-            $arg = array_shift($args);
-            $type = array_shift($signature);
-            switch ($type) {
-                case 'int':
-                case 'i4':
-                    if (is_array($arg) || !is_int($arg)) {
-                        $ok = false;
-                    }
-                    break;
-                case 'base64':
-                case 'string':
-                    if (!is_string($arg)) {
-                        $ok = false;
-                    }
-                    break;
-                case 'boolean':
-                    if ($arg !== false && $arg !== true) {
-                        $ok = false;
-                    }
-                    break;
-                case 'float':
-                case 'double':
-                    if (!is_float($arg)) {
-                        $ok = false;
-                    }
-                    break;
-                case 'date':
-                case 'dateTime.iso8601':
-                    if (!is_a($arg, 'IXR_Date')) {
-                        $ok = false;
-                    }
-                    break;
-            }
-            if (!$ok) {
-                return new IXR_Error(-32602, 'server error. invalid method parameters');
-            }
-        }
-        // It passed the test - run the "real" method call
-        return parent::call($methodname, $argsbackup);
-    }
+		// Check the argument types
+		$ok = true;
+		$argsbackup = $args;
+		for ($i = 0, $j = count($args); $i < $j; $i++) {
+			$arg = array_shift($args);
+			$type = array_shift($signature);
+			switch ($type) {
+				case 'int':
+				case 'i4':
+					if (is_array($arg) || !is_int($arg)) {
+						$ok = false;
+					}
+					break;
+				case 'base64':
+				case 'string':
+					if (!is_string($arg)) {
+						$ok = false;
+					}
+					break;
+				case 'boolean':
+					if ($arg !== false && $arg !== true) {
+						$ok = false;
+					}
+					break;
+				case 'float':
+				case 'double':
+					if (!is_float($arg)) {
+						$ok = false;
+					}
+					break;
+				case 'date':
+				case 'dateTime.iso8601':
+					if (!is_a($arg, 'IXR_Date')) {
+						$ok = false;
+					}
+					break;
+			}
+			if (!$ok) {
+				return new IXR_Error(-32602, 'server error. invalid method parameters');
+			}
+		}
+		// It passed the test - run the "real" method call
+		return parent::call($methodname, $argsbackup);
+	}
 
-    function methodSignature($method)
-    {
-        if (!$this->hasMethod($method)) {
-            return new IXR_Error(-32601, 'server error. requested method "'.$method.'" not specified.');
-        }
-        // We should be returning an array of types
-        $types = $this->signatures[$method];
-        $return = array();
-        foreach ($types as $type) {
-            switch ($type) {
-                case 'string':
-                    $return[] = 'string';
-                    break;
-                case 'int':
-                case 'i4':
-                    $return[] = 42;
-                    break;
-                case 'double':
-                    $return[] = 3.1415;
-                    break;
-                case 'dateTime.iso8601':
-                    $return[] = new IXR_Date(time());
-                    break;
-                case 'boolean':
-                    $return[] = true;
-                    break;
-                case 'base64':
-                    $return[] = new IXR_Base64('base64');
-                    break;
-                case 'array':
-                    $return[] = array('array');
-                    break;
-                case 'struct':
-                    $return[] = array('struct' => 'struct');
-                    break;
-            }
-        }
-        return $return;
-    }
+	function methodSignature($method)
+	{
+		if (!$this->hasMethod($method)) {
+			return new IXR_Error(-32601, 'server error. requested method "'.$method.'" not specified.');
+		}
+		// We should be returning an array of types
+		$types = $this->signatures[$method];
+		$return = array();
+		foreach ($types as $type) {
+			switch ($type) {
+				case 'string':
+					$return[] = 'string';
+					break;
+				case 'int':
+				case 'i4':
+					$return[] = 42;
+					break;
+				case 'double':
+					$return[] = 3.1415;
+					break;
+				case 'dateTime.iso8601':
+					$return[] = new IXR_Date(time());
+					break;
+				case 'boolean':
+					$return[] = true;
+					break;
+				case 'base64':
+					$return[] = new IXR_Base64('base64');
+					break;
+				case 'array':
+					$return[] = array('array');
+					break;
+				case 'struct':
+					$return[] = array('struct' => 'struct');
+					break;
+			}
+		}
+		return $return;
+	}
 
-    function methodHelp($method)
-    {
-        return $this->help[$method];
-    }
+	function methodHelp($method)
+	{
+		return $this->help[$method];
+	}
 }

Spacing +8 added lines, -8 removed lines

@@ -65,12 +65,12 @@ 
     function call($methodname, $args)
     {
         // Make sure it's in an array
-        if ($args && !is_array($args)) {
+        if ($args && ! is_array($args)) {
             $args = array($args);
         }
 
         // Over-rides default call method, adds signature check
-        if (!$this->hasMethod($methodname)) {
+        if ( ! $this->hasMethod($methodname)) {
             return new IXR_Error(-32601, 'server error. requested method "'.$this->message->methodName.'" not specified.');
         }
         $method = $this->callbacks[$methodname];
@@ -91,13 +91,13 @@ 
             switch ($type) {
                 case 'int':
                 case 'i4':
-                    if (is_array($arg) || !is_int($arg)) {
+                    if (is_array($arg) || ! is_int($arg)) {
                         $ok = false;
                     }
                     break;
                 case 'base64':
                 case 'string':
-                    if (!is_string($arg)) {
+                    if ( ! is_string($arg)) {
                         $ok = false;
                     }
                     break;
@@ -108,18 +108,18 @@ 
                     break;
                 case 'float':
                 case 'double':
-                    if (!is_float($arg)) {
+                    if ( ! is_float($arg)) {
                         $ok = false;
                     }
                     break;
                 case 'date':
                 case 'dateTime.iso8601':
-                    if (!is_a($arg, 'IXR_Date')) {
+                    if ( ! is_a($arg, 'IXR_Date')) {
                         $ok = false;
                     }
                     break;
             }
-            if (!$ok) {
+            if ( ! $ok) {
                 return new IXR_Error(-32602, 'server error. invalid method parameters');
             }
         }
@@ -129,7 +129,7 @@ 
 
     function methodSignature($method)
     {
-        if (!$this->hasMethod($method)) {
+        if ( ! $this->hasMethod($method)) {
             return new IXR_Error(-32601, 'server error. requested method "'.$method.'" not specified.');
         }
         // We should be returning an array of types

src/wp-includes/ms-functions.php

Doc Comments +1 added lines, -1 removed lines

@@ -2191,7 +2191,7 @@
  *
  * @staticvar bool $forced_content
  *
- * @param bool $force
+ * @param string|boolean $force
  * @return bool True if forced, false if not forced.
  */
 function force_ssl_content( $force = '' ) {

Indentation +2 added lines, -2 removed lines

@@ -1607,7 +1607,7 @@ 
 	$current_network = get_network();
 
 	/**
- 	 * Filters whether to bypass the welcome email after user activation.
+	 * Filters whether to bypass the welcome email after user activation.
 	 *
 	 * Returning false disables the welcome email.
 	 *
@@ -2134,7 +2134,7 @@ 
  * @return bool
  */
 function is_user_spammy( $user = null ) {
-    if ( ! ( $user instanceof WP_User ) ) {
+	if ( ! ( $user instanceof WP_User ) ) {
 		if ( $user ) {
 			$user = get_user_by( 'login', $user );
 		} else {

Spacing +526 added lines, -526 removed lines

@@ -39,45 +39,45 @@ 
  * @param int $user_id The unique ID of the user
  * @return WP_Site|void The blog object
  */
-function get_active_blog_for_user( $user_id ) {
+function get_active_blog_for_user($user_id) {
 	global $wpdb;
-	$blogs = get_blogs_of_user( $user_id );
-	if ( empty( $blogs ) )
+	$blogs = get_blogs_of_user($user_id);
+	if (empty($blogs))
 		return;
 
-	if ( !is_multisite() )
+	if ( ! is_multisite())
 		return $blogs[$wpdb->blogid];
 
-	$primary_blog = get_user_meta( $user_id, 'primary_blog', true );
+	$primary_blog = get_user_meta($user_id, 'primary_blog', true);
 	$first_blog = current($blogs);
-	if ( false !== $primary_blog ) {
-		if ( ! isset( $blogs[ $primary_blog ] ) ) {
-			update_user_meta( $user_id, 'primary_blog', $first_blog->userblog_id );
-			$primary = get_site( $first_blog->userblog_id );
+	if (false !== $primary_blog) {
+		if ( ! isset($blogs[$primary_blog])) {
+			update_user_meta($user_id, 'primary_blog', $first_blog->userblog_id);
+			$primary = get_site($first_blog->userblog_id);
 		} else {
-			$primary = get_site( $primary_blog );
+			$primary = get_site($primary_blog);
 		}
 	} else {
 		//TODO Review this call to add_user_to_blog too - to get here the user must have a role on this blog?
-		add_user_to_blog( $first_blog->userblog_id, $user_id, 'subscriber' );
-		update_user_meta( $user_id, 'primary_blog', $first_blog->userblog_id );
+		add_user_to_blog($first_blog->userblog_id, $user_id, 'subscriber');
+		update_user_meta($user_id, 'primary_blog', $first_blog->userblog_id);
 		$primary = $first_blog;
 	}
 
-	if ( ( ! is_object( $primary ) ) || ( $primary->archived == 1 || $primary->spam == 1 || $primary->deleted == 1 ) ) {
-		$blogs = get_blogs_of_user( $user_id, true ); // if a user's primary blog is shut down, check their other blogs.
+	if (( ! is_object($primary)) || ($primary->archived == 1 || $primary->spam == 1 || $primary->deleted == 1)) {
+		$blogs = get_blogs_of_user($user_id, true); // if a user's primary blog is shut down, check their other blogs.
 		$ret = false;
-		if ( is_array( $blogs ) && count( $blogs ) > 0 ) {
-			foreach ( (array) $blogs as $blog_id => $blog ) {
-				if ( $blog->site_id != $wpdb->siteid )
+		if (is_array($blogs) && count($blogs) > 0) {
+			foreach ((array) $blogs as $blog_id => $blog) {
+				if ($blog->site_id != $wpdb->siteid)
 					continue;
-				$details = get_site( $blog_id );
-				if ( is_object( $details ) && $details->archived == 0 && $details->spam == 0 && $details->deleted == 0 ) {
+				$details = get_site($blog_id);
+				if (is_object($details) && $details->archived == 0 && $details->spam == 0 && $details->deleted == 0) {
 					$ret = $blog;
-					if ( get_user_meta( $user_id , 'primary_blog', true ) != $blog_id )
-						update_user_meta( $user_id, 'primary_blog', $blog_id );
-					if ( !get_user_meta($user_id , 'source_domain', true) )
-						update_user_meta( $user_id, 'source_domain', $blog->domain );
+					if (get_user_meta($user_id, 'primary_blog', true) != $blog_id)
+						update_user_meta($user_id, 'primary_blog', $blog_id);
+					if ( ! get_user_meta($user_id, 'source_domain', true))
+						update_user_meta($user_id, 'source_domain', $blog->domain);
 					break;
 				}
 			}
@@ -101,8 +101,8 @@ 
  * @param int|null $network_id ID of the network. Default is the current network.
  * @return int Number of active users on the network.
  */
-function get_user_count( $network_id = null ) {
-	return get_network_option( $network_id, 'user_count' );
+function get_user_count($network_id = null) {
+	return get_network_option($network_id, 'user_count');
 }
 
 /**
@@ -117,8 +117,8 @@ 
  * @param int|null $network_id ID of the network. Default is the current network.
  * @return int Number of active sites on the network.
  */
-function get_blog_count( $network_id = null ) {
-	return get_network_option( $network_id, 'blog_count' );
+function get_blog_count($network_id = null) {
+	return get_network_option($network_id, 'blog_count');
 }
 
 /**
@@ -130,9 +130,9 @@ 
  * @param int $post_id ID of the post you're looking for.
  * @return WP_Post|null WP_Post on success or null on failure
  */
-function get_blog_post( $blog_id, $post_id ) {
-	switch_to_blog( $blog_id );
-	$post = get_post( $post_id );
+function get_blog_post($blog_id, $post_id) {
+	switch_to_blog($blog_id);
+	$post = get_post($post_id);
 	restore_current_blog();
 
 	return $post;
@@ -150,20 +150,20 @@ 
  * @param string $role    The role you want the user to have
  * @return true|WP_Error
  */
-function add_user_to_blog( $blog_id, $user_id, $role ) {
+function add_user_to_blog($blog_id, $user_id, $role) {
 	switch_to_blog($blog_id);
 
-	$user = get_userdata( $user_id );
+	$user = get_userdata($user_id);
 
-	if ( ! $user ) {
+	if ( ! $user) {
 		restore_current_blog();
-		return new WP_Error( 'user_does_not_exist', __( 'The requested user does not exist.' ) );
+		return new WP_Error('user_does_not_exist', __('The requested user does not exist.'));
 	}
 
-	if ( !get_user_meta($user_id, 'primary_blog', true) ) {
+	if ( ! get_user_meta($user_id, 'primary_blog', true)) {
 		update_user_meta($user_id, 'primary_blog', $blog_id);
-		$site = get_site( $blog_id );
-		update_user_meta( $user_id, 'source_domain', $site->domain );
+		$site = get_site($blog_id);
+		update_user_meta($user_id, 'source_domain', $site->domain);
 	}
 
 	$user->set_role($role);
@@ -177,9 +177,9 @@ 
 	 * @param string $role    User role.
 	 * @param int    $blog_id Blog ID.
 	 */
-	do_action( 'add_user_to_blog', $user_id, $role, $blog_id );
-	wp_cache_delete( $user_id, 'users' );
-	wp_cache_delete( $blog_id . '_user_count', 'blog-details' );
+	do_action('add_user_to_blog', $user_id, $role, $blog_id);
+	wp_cache_delete($user_id, 'users');
+	wp_cache_delete($blog_id.'_user_count', 'blog-details');
 	restore_current_blog();
 	return true;
 }
@@ -214,17 +214,17 @@ 
 	 * @param int $user_id User ID.
 	 * @param int $blog_id Blog ID.
 	 */
-	do_action( 'remove_user_from_blog', $user_id, $blog_id );
+	do_action('remove_user_from_blog', $user_id, $blog_id);
 
 	// If being removed from the primary blog, set a new primary if the user is assigned
 	// to multiple blogs.
 	$primary_blog = get_user_meta($user_id, 'primary_blog', true);
-	if ( $primary_blog == $blog_id ) {
+	if ($primary_blog == $blog_id) {
 		$new_id = '';
 		$new_domain = '';
 		$blogs = get_blogs_of_user($user_id);
-		foreach ( (array) $blogs as $blog ) {
-			if ( $blog->userblog_id == $blog_id )
+		foreach ((array) $blogs as $blog) {
+			if ($blog->userblog_id == $blog_id)
 				continue;
 			$new_id = $blog->userblog_id;
 			$new_domain = $blog->domain;
@@ -236,8 +236,8 @@ 
 	}
 
 	// wp_revoke_user($user_id);
-	$user = get_userdata( $user_id );
-	if ( ! $user ) {
+	$user = get_userdata($user_id);
+	if ( ! $user) {
 		restore_current_blog();
 		return new WP_Error('user_does_not_exist', __('That user does not exist.'));
 	}
@@ -245,24 +245,24 @@ 
 	$user->remove_all_caps();
 
 	$blogs = get_blogs_of_user($user_id);
-	if ( count($blogs) == 0 ) {
+	if (count($blogs) == 0) {
 		update_user_meta($user_id, 'primary_blog', '');
 		update_user_meta($user_id, 'source_domain', '');
 	}
 
-	if ( $reassign != '' ) {
+	if ($reassign != '') {
 		$reassign = (int) $reassign;
-		$post_ids = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_author = %d", $user_id ) );
-		$link_ids = $wpdb->get_col( $wpdb->prepare( "SELECT link_id FROM $wpdb->links WHERE link_owner = %d", $user_id ) );
+		$post_ids = $wpdb->get_col($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_author = %d", $user_id));
+		$link_ids = $wpdb->get_col($wpdb->prepare("SELECT link_id FROM $wpdb->links WHERE link_owner = %d", $user_id));
 
-		if ( ! empty( $post_ids ) ) {
-			$wpdb->query( $wpdb->prepare( "UPDATE $wpdb->posts SET post_author = %d WHERE post_author = %d", $reassign, $user_id ) );
-			array_walk( $post_ids, 'clean_post_cache' );
+		if ( ! empty($post_ids)) {
+			$wpdb->query($wpdb->prepare("UPDATE $wpdb->posts SET post_author = %d WHERE post_author = %d", $reassign, $user_id));
+			array_walk($post_ids, 'clean_post_cache');
 		}
 
-		if ( ! empty( $link_ids ) ) {
-			$wpdb->query( $wpdb->prepare( "UPDATE $wpdb->links SET link_owner = %d WHERE link_owner = %d", $reassign, $user_id ) );
-			array_walk( $link_ids, 'clean_bookmark_cache' );
+		if ( ! empty($link_ids)) {
+			$wpdb->query($wpdb->prepare("UPDATE $wpdb->links SET link_owner = %d WHERE link_owner = %d", $reassign, $user_id));
+			array_walk($link_ids, 'clean_bookmark_cache');
 		}
 	}
 
@@ -280,9 +280,9 @@ 
  * @param int $post_id ID of the desired post.
  * @return string The post's permalink
  */
-function get_blog_permalink( $blog_id, $post_id ) {
-	switch_to_blog( $blog_id );
-	$link = get_permalink( $post_id );
+function get_blog_permalink($blog_id, $post_id) {
+	switch_to_blog($blog_id);
+	$link = get_permalink($post_id);
 	restore_current_blog();
 
 	return $link;
@@ -304,14 +304,14 @@ 
  * @param string $path   Optional. Not required for subdomain installations.
  * @return int 0 if no blog found, otherwise the ID of the matching blog
  */
-function get_blog_id_from_url( $domain, $path = '/' ) {
-	$domain = strtolower( $domain );
-	$path = strtolower( $path );
-	$id = wp_cache_get( md5( $domain . $path ), 'blog-id-cache' );
+function get_blog_id_from_url($domain, $path = '/') {
+	$domain = strtolower($domain);
+	$path = strtolower($path);
+	$id = wp_cache_get(md5($domain.$path), 'blog-id-cache');
 
-	if ( $id == -1 ) // blog does not exist
+	if ($id == -1) // blog does not exist
 		return 0;
-	elseif ( $id )
+	elseif ($id)
 		return (int) $id;
 
 	$args = array(
@@ -319,15 +319,15 @@ 
 		'path' => $path,
 		'fields' => 'ids',
 	);
-	$result = get_sites( $args );
-	$id = array_shift( $result );
+	$result = get_sites($args);
+	$id = array_shift($result);
 
-	if ( ! $id ) {
-		wp_cache_set( md5( $domain . $path ), -1, 'blog-id-cache' );
+	if ( ! $id) {
+		wp_cache_set(md5($domain.$path), -1, 'blog-id-cache');
 		return 0;
 	}
 
-	wp_cache_set( md5( $domain . $path ), $id, 'blog-id-cache' );
+	wp_cache_set(md5($domain.$path), $id, 'blog-id-cache');
 
 	return $id;
 }
@@ -347,30 +347,30 @@ 
  * @param string $user_email The email provided by the user at registration.
  * @return bool Returns true when the email address is banned.
  */
-function is_email_address_unsafe( $user_email ) {
-	$banned_names = get_site_option( 'banned_email_domains' );
-	if ( $banned_names && ! is_array( $banned_names ) )
-		$banned_names = explode( "\n", $banned_names );
+function is_email_address_unsafe($user_email) {
+	$banned_names = get_site_option('banned_email_domains');
+	if ($banned_names && ! is_array($banned_names))
+		$banned_names = explode("\n", $banned_names);
 
 	$is_email_address_unsafe = false;
 
-	if ( $banned_names && is_array( $banned_names ) && false !== strpos( $user_email, '@', 1 ) ) {
-		$banned_names = array_map( 'strtolower', $banned_names );
-		$normalized_email = strtolower( $user_email );
+	if ($banned_names && is_array($banned_names) && false !== strpos($user_email, '@', 1)) {
+		$banned_names = array_map('strtolower', $banned_names);
+		$normalized_email = strtolower($user_email);
 
-		list( $email_local_part, $email_domain ) = explode( '@', $normalized_email );
+		list($email_local_part, $email_domain) = explode('@', $normalized_email);
 
-		foreach ( $banned_names as $banned_domain ) {
-			if ( ! $banned_domain )
+		foreach ($banned_names as $banned_domain) {
+			if ( ! $banned_domain)
 				continue;
 
-			if ( $email_domain == $banned_domain ) {
+			if ($email_domain == $banned_domain) {
 				$is_email_address_unsafe = true;
 				break;
 			}
 
 			$dotted_domain = ".$banned_domain";
-			if ( $dotted_domain === substr( $normalized_email, -strlen( $dotted_domain ) ) ) {
+			if ($dotted_domain === substr($normalized_email, -strlen($dotted_domain))) {
 				$is_email_address_unsafe = true;
 				break;
 			}
@@ -385,7 +385,7 @@ 
 	 * @param bool   $is_email_address_unsafe Whether the email address is "unsafe". Default false.
 	 * @param string $user_email              User email address.
 	 */
-	return apply_filters( 'is_email_address_unsafe', $is_email_address_unsafe, $user_email );
+	return apply_filters('is_email_address_unsafe', $is_email_address_unsafe, $user_email);
 }
 
 /**
@@ -414,86 +414,86 @@ 
 	$errors = new WP_Error();
 
 	$orig_username = $user_name;
-	$user_name = preg_replace( '/\s+/', '', sanitize_user( $user_name, true ) );
+	$user_name = preg_replace('/\s+/', '', sanitize_user($user_name, true));
 
-	if ( $user_name != $orig_username || preg_match( '/[^a-z0-9]/', $user_name ) ) {
-		$errors->add( 'user_name', __( 'Usernames can only contain lowercase letters (a-z) and numbers.' ) );
+	if ($user_name != $orig_username || preg_match('/[^a-z0-9]/', $user_name)) {
+		$errors->add('user_name', __('Usernames can only contain lowercase letters (a-z) and numbers.'));
 		$user_name = $orig_username;
 	}
 
-	$user_email = sanitize_email( $user_email );
+	$user_email = sanitize_email($user_email);
 
-	if ( empty( $user_name ) )
-	   	$errors->add('user_name', __( 'Please enter a username.' ) );
+	if (empty($user_name))
+	   	$errors->add('user_name', __('Please enter a username.'));
 
-	$illegal_names = get_site_option( 'illegal_names' );
-	if ( ! is_array( $illegal_names ) ) {
-		$illegal_names = array(  'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator' );
-		add_site_option( 'illegal_names', $illegal_names );
+	$illegal_names = get_site_option('illegal_names');
+	if ( ! is_array($illegal_names)) {
+		$illegal_names = array('www', 'web', 'root', 'admin', 'main', 'invite', 'administrator');
+		add_site_option('illegal_names', $illegal_names);
 	}
-	if ( in_array( $user_name, $illegal_names ) ) {
-		$errors->add( 'user_name',  __( 'Sorry, that username is not allowed.' ) );
+	if (in_array($user_name, $illegal_names)) {
+		$errors->add('user_name', __('Sorry, that username is not allowed.'));
 	}
 
 	/** This filter is documented in wp-includes/user.php */
-	$illegal_logins = (array) apply_filters( 'illegal_user_logins', array() );
+	$illegal_logins = (array) apply_filters('illegal_user_logins', array());
 
-	if ( in_array( strtolower( $user_name ), array_map( 'strtolower', $illegal_logins ) ) ) {
-		$errors->add( 'user_name',  __( 'Sorry, that username is not allowed.' ) );
+	if (in_array(strtolower($user_name), array_map('strtolower', $illegal_logins))) {
+		$errors->add('user_name', __('Sorry, that username is not allowed.'));
 	}
 
-	if ( ! is_email( $user_email ) ) {
-		$errors->add( 'user_email', __( 'Please enter a valid email address.' ) );
-	} elseif ( is_email_address_unsafe( $user_email ) ) {
-		$errors->add( 'user_email', __( 'You cannot use that email address to signup. We are having problems with them blocking some of our email. Please use another email provider.' ) );
+	if ( ! is_email($user_email)) {
+		$errors->add('user_email', __('Please enter a valid email address.'));
+	} elseif (is_email_address_unsafe($user_email)) {
+		$errors->add('user_email', __('You cannot use that email address to signup. We are having problems with them blocking some of our email. Please use another email provider.'));
 	}
 
-	if ( strlen( $user_name ) < 4 )
-		$errors->add('user_name',  __( 'Username must be at least 4 characters.' ) );
+	if (strlen($user_name) < 4)
+		$errors->add('user_name', __('Username must be at least 4 characters.'));
 
-	if ( strlen( $user_name ) > 60 ) {
-		$errors->add( 'user_name', __( 'Username may not be longer than 60 characters.' ) );
+	if (strlen($user_name) > 60) {
+		$errors->add('user_name', __('Username may not be longer than 60 characters.'));
 	}
 
 	// all numeric?
-	if ( preg_match( '/^[0-9]*$/', $user_name ) )
+	if (preg_match('/^[0-9]*$/', $user_name))
 		$errors->add('user_name', __('Sorry, usernames must have letters too!'));
 
-	$limited_email_domains = get_site_option( 'limited_email_domains' );
-	if ( is_array( $limited_email_domains ) && ! empty( $limited_email_domains ) ) {
-		$emaildomain = substr( $user_email, 1 + strpos( $user_email, '@' ) );
-		if ( ! in_array( $emaildomain, $limited_email_domains ) ) {
+	$limited_email_domains = get_site_option('limited_email_domains');
+	if (is_array($limited_email_domains) && ! empty($limited_email_domains)) {
+		$emaildomain = substr($user_email, 1 + strpos($user_email, '@'));
+		if ( ! in_array($emaildomain, $limited_email_domains)) {
 			$errors->add('user_email', __('Sorry, that email address is not allowed!'));
 		}
 	}
 
 	// Check if the username has been used already.
-	if ( username_exists($user_name) )
-		$errors->add( 'user_name', __( 'Sorry, that username already exists!' ) );
+	if (username_exists($user_name))
+		$errors->add('user_name', __('Sorry, that username already exists!'));
 
 	// Check if the email address has been used already.
-	if ( email_exists($user_email) )
-		$errors->add( 'user_email', __( 'Sorry, that email address is already used!' ) );
+	if (email_exists($user_email))
+		$errors->add('user_email', __('Sorry, that email address is already used!'));
 
 	// Has someone already signed up for this username?
-	$signup = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->signups WHERE user_login = %s", $user_name) );
-	if ( $signup != null ) {
-		$registered_at =  mysql2date('U', $signup->registered);
-		$now = current_time( 'timestamp', true );
+	$signup = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->signups WHERE user_login = %s", $user_name));
+	if ($signup != null) {
+		$registered_at = mysql2date('U', $signup->registered);
+		$now = current_time('timestamp', true);
 		$diff = $now - $registered_at;
 		// If registered more than two days ago, cancel registration and let this signup go through.
-		if ( $diff > 2 * DAY_IN_SECONDS )
-			$wpdb->delete( $wpdb->signups, array( 'user_login' => $user_name ) );
+		if ($diff > 2 * DAY_IN_SECONDS)
+			$wpdb->delete($wpdb->signups, array('user_login' => $user_name));
 		else
 			$errors->add('user_name', __('That username is currently reserved but may be available in a couple of days.'));
 	}
 
-	$signup = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->signups WHERE user_email = %s", $user_email) );
-	if ( $signup != null ) {
-		$diff = current_time( 'timestamp', true ) - mysql2date('U', $signup->registered);
+	$signup = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->signups WHERE user_email = %s", $user_email));
+	if ($signup != null) {
+		$diff = current_time('timestamp', true) - mysql2date('U', $signup->registered);
 		// If registered more than two days ago, cancel registration and let this signup go through.
-		if ( $diff > 2 * DAY_IN_SECONDS )
-			$wpdb->delete( $wpdb->signups, array( 'user_email' => $user_email ) );
+		if ($diff > 2 * DAY_IN_SECONDS)
+			$wpdb->delete($wpdb->signups, array('user_email' => $user_email));
 		else
 			$errors->add('user_email', __('That email address has already been used. Please check your inbox for an activation email. It will become available in a couple of days if you do nothing.'));
 	}
@@ -517,7 +517,7 @@ 
 	 *     @type WP_Error $errors        WP_Error object containing any errors found.
 	 * }
 	 */
-	return apply_filters( 'wpmu_validate_user_signup', $result );
+	return apply_filters('wpmu_validate_user_signup', $result);
 }
 
 /**
@@ -544,38 +544,38 @@ 
  * @param WP_User|string $user       Optional. The user object to check against the new site name.
  * @return array Contains the new site data and error messages.
  */
-function wpmu_validate_blog_signup( $blogname, $blog_title, $user = '' ) {
+function wpmu_validate_blog_signup($blogname, $blog_title, $user = '') {
 	global $wpdb, $domain;
 
 	$current_network = get_network();
 	$base = $current_network->path;
 
-	$blog_title = strip_tags( $blog_title );
+	$blog_title = strip_tags($blog_title);
 
 	$errors = new WP_Error();
-	$illegal_names = get_site_option( 'illegal_names' );
-	if ( $illegal_names == false ) {
-		$illegal_names = array( 'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator' );
-		add_site_option( 'illegal_names', $illegal_names );
+	$illegal_names = get_site_option('illegal_names');
+	if ($illegal_names == false) {
+		$illegal_names = array('www', 'web', 'root', 'admin', 'main', 'invite', 'administrator');
+		add_site_option('illegal_names', $illegal_names);
 	}
 
 	/*
 	 * On sub dir installs, some names are so illegal, only a filter can
 	 * spring them from jail.
 	 */
-	if ( ! is_subdomain_install() ) {
-		$illegal_names = array_merge( $illegal_names, get_subdirectory_reserved_names() );
+	if ( ! is_subdomain_install()) {
+		$illegal_names = array_merge($illegal_names, get_subdirectory_reserved_names());
 	}
 
-	if ( empty( $blogname ) )
-		$errors->add('blogname', __( 'Please enter a site name.' ) );
+	if (empty($blogname))
+		$errors->add('blogname', __('Please enter a site name.'));
 
-	if ( preg_match( '/[^a-z0-9]+/', $blogname ) ) {
-		$errors->add( 'blogname', __( 'Site names can only contain lowercase letters (a-z) and numbers.' ) );
+	if (preg_match('/[^a-z0-9]+/', $blogname)) {
+		$errors->add('blogname', __('Site names can only contain lowercase letters (a-z) and numbers.'));
 	}
 
-	if ( in_array( $blogname, $illegal_names ) )
-		$errors->add('blogname',  __( 'That name is not allowed.' ) );
+	if (in_array($blogname, $illegal_names))
+		$errors->add('blogname', __('That name is not allowed.'));
 
 	/**
 	 * Filters the minimum site name length required when validating a site signup.
@@ -584,19 +584,19 @@ 
 	 *
 	 * @param int $length The minimum site name length. Default 4.
 	 */
-	$minimum_site_name_length = apply_filters( 'minimum_site_name_length', 4 );
+	$minimum_site_name_length = apply_filters('minimum_site_name_length', 4);
 
-	if ( strlen( $blogname ) < $minimum_site_name_length ) {
+	if (strlen($blogname) < $minimum_site_name_length) {
 		/* translators: %s: minimum site name length */
-		$errors->add( 'blogname', sprintf( _n( 'Site name must be at least %s character.', 'Site name must be at least %s characters.', $minimum_site_name_length ), number_format_i18n( $minimum_site_name_length ) ) );
+		$errors->add('blogname', sprintf(_n('Site name must be at least %s character.', 'Site name must be at least %s characters.', $minimum_site_name_length), number_format_i18n($minimum_site_name_length)));
 	}
 
 	// do not allow users to create a blog that conflicts with a page on the main blog.
-	if ( !is_subdomain_install() && $wpdb->get_var( $wpdb->prepare( "SELECT post_name FROM " . $wpdb->get_blog_prefix( $current_network->site_id ) . "posts WHERE post_type = 'page' AND post_name = %s", $blogname ) ) )
-		$errors->add( 'blogname', __( 'Sorry, you may not use that site name.' ) );
+	if ( ! is_subdomain_install() && $wpdb->get_var($wpdb->prepare("SELECT post_name FROM ".$wpdb->get_blog_prefix($current_network->site_id)."posts WHERE post_type = 'page' AND post_name = %s", $blogname)))
+		$errors->add('blogname', __('Sorry, you may not use that site name.'));
 
 	// all numeric?
-	if ( preg_match( '/^[0-9]*$/', $blogname ) )
+	if (preg_match('/^[0-9]*$/', $blogname))
 		$errors->add('blogname', __('Sorry, site names must have letters too!'));
 
 	/**
@@ -609,36 +609,36 @@ 
 	 *
 	 * @param string $blogname Site name.
 	 */
-	$blogname = apply_filters( 'newblogname', $blogname );
+	$blogname = apply_filters('newblogname', $blogname);
 
-	$blog_title = wp_unslash(  $blog_title );
+	$blog_title = wp_unslash($blog_title);
 
-	if ( empty( $blog_title ) )
-		$errors->add('blog_title', __( 'Please enter a site title.' ) );
+	if (empty($blog_title))
+		$errors->add('blog_title', __('Please enter a site title.'));
 
 	// Check if the domain/path has been used already.
-	if ( is_subdomain_install() ) {
-		$mydomain = $blogname . '.' . preg_replace( '|^www\.|', '', $domain );
+	if (is_subdomain_install()) {
+		$mydomain = $blogname.'.'.preg_replace('|^www\.|', '', $domain);
 		$path = $base;
 	} else {
 		$mydomain = "$domain";
 		$path = $base.$blogname.'/';
 	}
-	if ( domain_exists($mydomain, $path, $current_network->id) )
-		$errors->add( 'blogname', __( 'Sorry, that site already exists!' ) );
+	if (domain_exists($mydomain, $path, $current_network->id))
+		$errors->add('blogname', __('Sorry, that site already exists!'));
 
-	if ( username_exists( $blogname ) ) {
-		if ( ! is_object( $user ) || ( is_object($user) && ( $user->user_login != $blogname ) ) )
-			$errors->add( 'blogname', __( 'Sorry, that site is reserved!' ) );
+	if (username_exists($blogname)) {
+		if ( ! is_object($user) || (is_object($user) && ($user->user_login != $blogname)))
+			$errors->add('blogname', __('Sorry, that site is reserved!'));
 	}
 
 	// Has someone already signed up for this domain?
-	$signup = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->signups WHERE domain = %s AND path = %s", $mydomain, $path) ); // TODO: Check email too?
-	if ( ! empty($signup) ) {
-		$diff = current_time( 'timestamp', true ) - mysql2date('U', $signup->registered);
+	$signup = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->signups WHERE domain = %s AND path = %s", $mydomain, $path)); // TODO: Check email too?
+	if ( ! empty($signup)) {
+		$diff = current_time('timestamp', true) - mysql2date('U', $signup->registered);
 		// If registered more than two days ago, cancel registration and let this signup go through.
-		if ( $diff > 2 * DAY_IN_SECONDS )
-			$wpdb->delete( $wpdb->signups, array( 'domain' => $mydomain , 'path' => $path ) );
+		if ($diff > 2 * DAY_IN_SECONDS)
+			$wpdb->delete($wpdb->signups, array('domain' => $mydomain, 'path' => $path));
 		else
 			$errors->add('blogname', __('That site is currently reserved but may be available in a couple days.'));
 	}
@@ -661,7 +661,7 @@ 
 	 *     @type WP_Error       $errors     WP_Error containing any errors found.
 	 * }
 	 */
-	return apply_filters( 'wpmu_validate_blog_signup', $result );
+	return apply_filters('wpmu_validate_blog_signup', $result);
 }
 
 /**
@@ -678,10 +678,10 @@ 
  * @param string $user_email The user's email address.
  * @param array  $meta       Optional. Signup meta data. By default, contains the requested privacy setting and lang_id.
  */
-function wpmu_signup_blog( $domain, $path, $title, $user, $user_email, $meta = array() )  {
+function wpmu_signup_blog($domain, $path, $title, $user, $user_email, $meta = array()) {
 	global $wpdb;
 
-	$key = substr( md5( time() . wp_rand() . $domain ), 0, 16 );
+	$key = substr(md5(time().wp_rand().$domain), 0, 16);
 
 	/**
 	 * Filters the metadata for a site signup.
@@ -698,9 +698,9 @@ 
 	 * @param string $user_email The user's email address.
 	 * @param string $key        The user's activation key.
 	 */
-	$meta = apply_filters( 'signup_site_meta', $meta, $domain, $path, $title, $user, $user_email, $key );
+	$meta = apply_filters('signup_site_meta', $meta, $domain, $path, $title, $user, $user_email, $key);
 
-	$wpdb->insert( $wpdb->signups, array(
+	$wpdb->insert($wpdb->signups, array(
 		'domain' => $domain,
 		'path' => $path,
 		'title' => $title,
@@ -708,8 +708,8 @@ 
 		'user_email' => $user_email,
 		'registered' => current_time('mysql', true),
 		'activation_key' => $key,
-		'meta' => serialize( $meta )
-	) );
+		'meta' => serialize($meta)
+	));
 
 	/**
 	 * Fires after site signup information has been written to the database.
@@ -724,7 +724,7 @@ 
 	 * @param string $key        The user's activation key.
 	 * @param array  $meta       Signup meta data. By default, contains the requested privacy setting and lang_id.
 	 */
-	do_action( 'after_signup_site', $domain, $path, $title, $user, $user_email, $key, $meta );
+	do_action('after_signup_site', $domain, $path, $title, $user, $user_email, $key, $meta);
 }
 
 /**
@@ -741,13 +741,13 @@ 
  * @param string $user_email The user's email address.
  * @param array  $meta       Optional. Signup meta data. Default empty array.
  */
-function wpmu_signup_user( $user, $user_email, $meta = array() ) {
+function wpmu_signup_user($user, $user_email, $meta = array()) {
 	global $wpdb;
 
 	// Format data
-	$user = preg_replace( '/\s+/', '', sanitize_user( $user, true ) );
-	$user_email = sanitize_email( $user_email );
-	$key = substr( md5( time() . wp_rand() . $user_email ), 0, 16 );
+	$user = preg_replace('/\s+/', '', sanitize_user($user, true));
+	$user_email = sanitize_email($user_email);
+	$key = substr(md5(time().wp_rand().$user_email), 0, 16);
 
 	/**
 	 * Filters the metadata for a user signup.
@@ -761,9 +761,9 @@ 
 	 * @param string $user_email The user's email address.
 	 * @param string $key        The user's activation key.
 	 */
-	$meta = apply_filters( 'signup_user_meta', $meta, $user, $user_email, $key );
+	$meta = apply_filters('signup_user_meta', $meta, $user, $user_email, $key);
 
-	$wpdb->insert( $wpdb->signups, array(
+	$wpdb->insert($wpdb->signups, array(
 		'domain' => '',
 		'path' => '',
 		'title' => '',
@@ -771,8 +771,8 @@ 
 		'user_email' => $user_email,
 		'registered' => current_time('mysql', true),
 		'activation_key' => $key,
-		'meta' => serialize( $meta )
-	) );
+		'meta' => serialize($meta)
+	));
 
 	/**
 	 * Fires after a user's signup information has been written to the database.
@@ -784,7 +784,7 @@ 
 	 * @param string $key        The user's activation key.
 	 * @param array  $meta       Signup meta data. Default empty array.
 	 */
-	do_action( 'after_signup_user', $user, $user_email, $key, $meta );
+	do_action('after_signup_user', $user, $user_email, $key, $meta);
 }
 
 /**
@@ -811,7 +811,7 @@ 
  * @param array  $meta       Optional. Signup meta data. By default, contains the requested privacy setting and lang_id.
  * @return bool
  */
-function wpmu_signup_blog_notification( $domain, $path, $title, $user_login, $user_email, $key, $meta = array() ) {
+function wpmu_signup_blog_notification($domain, $path, $title, $user_login, $user_email, $key, $meta = array()) {
 	/**
 	 * Filters whether to bypass the new site email notification.
 	 *
@@ -825,25 +825,25 @@ 
 	 * @param string      $key        Activation key created in wpmu_signup_blog().
 	 * @param array       $meta       Signup meta data. By default, contains the requested privacy setting and lang_id.
 	 */
-	if ( ! apply_filters( 'wpmu_signup_blog_notification', $domain, $path, $title, $user_login, $user_email, $key, $meta ) ) {
+	if ( ! apply_filters('wpmu_signup_blog_notification', $domain, $path, $title, $user_login, $user_email, $key, $meta)) {
 		return false;
 	}
 
 	// Send email with activation link.
-	if ( !is_subdomain_install() || get_current_network_id() != 1 )
+	if ( ! is_subdomain_install() || get_current_network_id() != 1)
 		$activate_url = network_site_url("wp-activate.php?key=$key");
 	else
 		$activate_url = "http://{$domain}{$path}wp-activate.php?key=$key"; // @todo use *_url() API
 
 	$activate_url = esc_url($activate_url);
-	$admin_email = get_site_option( 'admin_email' );
-	if ( $admin_email == '' )
-		$admin_email = 'support@' . $_SERVER['SERVER_NAME'];
-	$from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
-	$message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
+	$admin_email = get_site_option('admin_email');
+	if ($admin_email == '')
+		$admin_email = 'support@'.$_SERVER['SERVER_NAME'];
+	$from_name = get_site_option('site_name') == '' ? 'WordPress' : esc_html(get_site_option('site_name'));
+	$message_headers = "From: \"{$from_name}\" <{$admin_email}>\n"."Content-Type: text/plain; charset=\"".get_option('blog_charset')."\"\n";
 
-	$user = get_user_by( 'login', $user_login );
-	$switched_locale = switch_to_locale( get_user_locale( $user ) );
+	$user = get_user_by('login', $user_login);
+	$switched_locale = switch_to_locale(get_user_locale($user));
 
 	$message = sprintf(
 		/**
@@ -862,12 +862,12 @@ 
 		 * @param string $key        Activation key created in wpmu_signup_blog().
 		 * @param array  $meta       Signup meta data. By default, contains the requested privacy setting and lang_id.
 		 */
-		apply_filters( 'wpmu_signup_blog_notification_email',
-			__( "To activate your blog, please click the following link:\n\n%s\n\nAfter you activate, you will receive *another email* with your login.\n\nAfter you activate, you can visit your site here:\n\n%s" ),
+		apply_filters('wpmu_signup_blog_notification_email',
+			__("To activate your blog, please click the following link:\n\n%s\n\nAfter you activate, you will receive *another email* with your login.\n\nAfter you activate, you can visit your site here:\n\n%s"),
 			$domain, $path, $title, $user_login, $user_email, $key, $meta
 		),
 		$activate_url,
-		esc_url( "http://{$domain}{$path}" ),
+		esc_url("http://{$domain}{$path}"),
 		$key
 	);
 	// TODO: Don't hard code activation link.
@@ -886,17 +886,17 @@ 
 		 * @param string $key        Activation key created in wpmu_signup_blog().
 		 * @param array  $meta       Signup meta data. By default, contains the requested privacy setting and lang_id.
 		 */
-		apply_filters( 'wpmu_signup_blog_notification_subject',
+		apply_filters('wpmu_signup_blog_notification_subject',
 			/* translators: New site notification email subject. 1: Network name, 2: New site URL */
-			_x( '[%1$s] Activate %2$s', 'New site notification email subject' ),
+			_x('[%1$s] Activate %2$s', 'New site notification email subject'),
 			$domain, $path, $title, $user_login, $user_email, $key, $meta
 		),
 		$from_name,
-		esc_url( 'http://' . $domain . $path )
+		esc_url('http://'.$domain.$path)
 	);
-	wp_mail( $user_email, wp_specialchars_decode( $subject ), $message, $message_headers );
+	wp_mail($user_email, wp_specialchars_decode($subject), $message, $message_headers);
 
-	if ( $switched_locale ) {
+	if ($switched_locale) {
 		restore_previous_locale();
 	}
 
@@ -924,7 +924,7 @@ 
  * @param array  $meta       Optional. Signup meta data. Default empty array.
  * @return bool
  */
-function wpmu_signup_user_notification( $user_login, $user_email, $key, $meta = array() ) {
+function wpmu_signup_user_notification($user_login, $user_email, $key, $meta = array()) {
 	/**
 	 * Filters whether to bypass the email notification for new user sign-up.
 	 *
@@ -935,18 +935,18 @@ 
 	 * @param string $key        Activation key created in wpmu_signup_user().
 	 * @param array  $meta       Signup meta data. Default empty array.
 	 */
-	if ( ! apply_filters( 'wpmu_signup_user_notification', $user_login, $user_email, $key, $meta ) )
+	if ( ! apply_filters('wpmu_signup_user_notification', $user_login, $user_email, $key, $meta))
 		return false;
 
-	$user = get_user_by( 'login', $user_login );
-	$switched_locale = switch_to_locale( get_user_locale( $user ) );
+	$user = get_user_by('login', $user_login);
+	$switched_locale = switch_to_locale(get_user_locale($user));
 
 	// Send email with activation link.
-	$admin_email = get_site_option( 'admin_email' );
-	if ( $admin_email == '' )
-		$admin_email = 'support@' . $_SERVER['SERVER_NAME'];
-	$from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
-	$message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
+	$admin_email = get_site_option('admin_email');
+	if ($admin_email == '')
+		$admin_email = 'support@'.$_SERVER['SERVER_NAME'];
+	$from_name = get_site_option('site_name') == '' ? 'WordPress' : esc_html(get_site_option('site_name'));
+	$message_headers = "From: \"{$from_name}\" <{$admin_email}>\n"."Content-Type: text/plain; charset=\"".get_option('blog_charset')."\"\n";
 	$message = sprintf(
 		/**
 		 * Filters the content of the notification email for new user sign-up.
@@ -961,11 +961,11 @@ 
 		 * @param string $key        Activation key created in wpmu_signup_user().
 		 * @param array  $meta       Signup meta data. Default empty array.
 		 */
-		apply_filters( 'wpmu_signup_user_notification_email',
-			__( "To activate your user, please click the following link:\n\n%s\n\nAfter you activate, you will receive *another email* with your login." ),
+		apply_filters('wpmu_signup_user_notification_email',
+			__("To activate your user, please click the following link:\n\n%s\n\nAfter you activate, you will receive *another email* with your login."),
 			$user_login, $user_email, $key, $meta
 		),
-		site_url( "wp-activate.php?key=$key" )
+		site_url("wp-activate.php?key=$key")
 	);
 	// TODO: Don't hard code activation link.
 	$subject = sprintf(
@@ -980,17 +980,17 @@ 
 		 * @param string $key        Activation key created in wpmu_signup_user().
 		 * @param array  $meta       Signup meta data. Default empty array.
 		 */
-		apply_filters( 'wpmu_signup_user_notification_subject',
+		apply_filters('wpmu_signup_user_notification_subject',
 			/* translators: New user notification email subject. 1: Network name, 2: New user login */
-			_x( '[%1$s] Activate %2$s', 'New user notification email subject' ),
+			_x('[%1$s] Activate %2$s', 'New user notification email subject'),
 			$user_login, $user_email, $key, $meta
 		),
 		$from_name,
 		$user_login
 	);
-	wp_mail( $user_email, wp_specialchars_decode( $subject ), $message, $message_headers );
+	wp_mail($user_email, wp_specialchars_decode($subject), $message, $message_headers);
 
-	if ( $switched_locale ) {
+	if ($switched_locale) {
 		restore_previous_locale();
 	}
 
@@ -1015,38 +1015,38 @@ 
 function wpmu_activate_signup($key) {
 	global $wpdb;
 
-	$signup = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->signups WHERE activation_key = %s", $key) );
+	$signup = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->signups WHERE activation_key = %s", $key));
 
-	if ( empty( $signup ) )
-		return new WP_Error( 'invalid_key', __( 'Invalid activation key.' ) );
+	if (empty($signup))
+		return new WP_Error('invalid_key', __('Invalid activation key.'));
 
-	if ( $signup->active ) {
-		if ( empty( $signup->domain ) )
-			return new WP_Error( 'already_active', __( 'The user is already active.' ), $signup );
+	if ($signup->active) {
+		if (empty($signup->domain))
+			return new WP_Error('already_active', __('The user is already active.'), $signup);
 		else
-			return new WP_Error( 'already_active', __( 'The site is already active.' ), $signup );
+			return new WP_Error('already_active', __('The site is already active.'), $signup);
 	}
 
 	$meta = maybe_unserialize($signup->meta);
-	$password = wp_generate_password( 12, false );
+	$password = wp_generate_password(12, false);
 
 	$user_id = username_exists($signup->user_login);
 
-	if ( ! $user_id )
+	if ( ! $user_id)
 		$user_id = wpmu_create_user($signup->user_login, $password, $signup->user_email);
 	else
 		$user_already_exists = true;
 
-	if ( ! $user_id )
+	if ( ! $user_id)
 		return new WP_Error('create_user', __('Could not create user'), $signup);
 
 	$now = current_time('mysql', true);
 
-	if ( empty($signup->domain) ) {
-		$wpdb->update( $wpdb->signups, array('active' => 1, 'activated' => $now), array('activation_key' => $key) );
+	if (empty($signup->domain)) {
+		$wpdb->update($wpdb->signups, array('active' => 1, 'activated' => $now), array('activation_key' => $key));
 
-		if ( isset( $user_already_exists ) )
-			return new WP_Error( 'user_already_exists', __( 'That username is already activated.' ), $signup);
+		if (isset($user_already_exists))
+			return new WP_Error('user_already_exists', __('That username is already activated.'), $signup);
 
 		/**
 		 * Fires immediately after a new user is activated.
@@ -1057,24 +1057,24 @@ 
 		 * @param int   $password User password.
 		 * @param array $meta     Signup meta data.
 		 */
-		do_action( 'wpmu_activate_user', $user_id, $password, $meta );
-		return array( 'user_id' => $user_id, 'password' => $password, 'meta' => $meta );
+		do_action('wpmu_activate_user', $user_id, $password, $meta);
+		return array('user_id' => $user_id, 'password' => $password, 'meta' => $meta);
 	}
 
-	$blog_id = wpmu_create_blog( $signup->domain, $signup->path, $signup->title, $user_id, $meta, $wpdb->siteid );
+	$blog_id = wpmu_create_blog($signup->domain, $signup->path, $signup->title, $user_id, $meta, $wpdb->siteid);
 
 	// TODO: What to do if we create a user but cannot create a blog?
-	if ( is_wp_error($blog_id) ) {
+	if (is_wp_error($blog_id)) {
 		// If blog is taken, that means a previous attempt to activate this blog failed in between creating the blog and
 		// setting the activation flag. Let's just set the active flag and instruct the user to reset their password.
-		if ( 'blog_taken' == $blog_id->get_error_code() ) {
-			$blog_id->add_data( $signup );
-			$wpdb->update( $wpdb->signups, array( 'active' => 1, 'activated' => $now ), array( 'activation_key' => $key ) );
+		if ('blog_taken' == $blog_id->get_error_code()) {
+			$blog_id->add_data($signup);
+			$wpdb->update($wpdb->signups, array('active' => 1, 'activated' => $now), array('activation_key' => $key));
 		}
 		return $blog_id;
 	}
 
-	$wpdb->update( $wpdb->signups, array('active' => 1, 'activated' => $now), array('activation_key' => $key) );
+	$wpdb->update($wpdb->signups, array('active' => 1, 'activated' => $now), array('activation_key' => $key));
 	/**
 	 * Fires immediately after a site is activated.
 	 *
@@ -1086,7 +1086,7 @@ 
 	 * @param string $signup_title  Site title.
 	 * @param array  $meta          Signup meta data. By default, contains the requested privacy setting and lang_id.
 	 */
-	do_action( 'wpmu_activate_blog', $blog_id, $user_id, $password, $signup->title, $meta );
+	do_action('wpmu_activate_blog', $blog_id, $user_id, $password, $signup->title, $meta);
 
 	return array('blog_id' => $blog_id, 'user_id' => $user_id, 'password' => $password, 'title' => $signup->title, 'meta' => $meta);
 }
@@ -1106,16 +1106,16 @@ 
  * @param string $email     The new user's email address.
  * @return int|false Returns false on failure, or int $user_id on success
  */
-function wpmu_create_user( $user_name, $password, $email ) {
-	$user_name = preg_replace( '/\s+/', '', sanitize_user( $user_name, true ) );
+function wpmu_create_user($user_name, $password, $email) {
+	$user_name = preg_replace('/\s+/', '', sanitize_user($user_name, true));
 
-	$user_id = wp_create_user( $user_name, $password, $email );
-	if ( is_wp_error( $user_id ) )
+	$user_id = wp_create_user($user_name, $password, $email);
+	if (is_wp_error($user_id))
 		return false;
 
 	// Newly created users have no roles or caps until they are added to a blog.
-	delete_user_option( $user_id, 'capabilities' );
-	delete_user_option( $user_id, 'user_level' );
+	delete_user_option($user_id, 'capabilities');
+	delete_user_option($user_id, 'user_level');
 
 	/**
 	 * Fires immediately after a new user is created.
@@ -1124,7 +1124,7 @@ 
 	 *
 	 * @param int $user_id User ID.
 	 */
-	do_action( 'wpmu_new_user', $user_id );
+	do_action('wpmu_new_user', $user_id);
 
 	return $user_id;
 }
@@ -1151,33 +1151,33 @@ 
  * @param int    $site_id Optional. Only relevant on multi-network installs.
  * @return int|WP_Error Returns WP_Error object on failure, int $blog_id on success
  */
-function wpmu_create_blog( $domain, $path, $title, $user_id, $meta = array(), $site_id = 1 ) {
+function wpmu_create_blog($domain, $path, $title, $user_id, $meta = array(), $site_id = 1) {
 	$defaults = array(
 		'public' => 0,
-		'WPLANG' => get_site_option( 'WPLANG' ),
+		'WPLANG' => get_site_option('WPLANG'),
 	);
-	$meta = wp_parse_args( $meta, $defaults );
+	$meta = wp_parse_args($meta, $defaults);
 
-	$domain = preg_replace( '/\s+/', '', sanitize_user( $domain, true ) );
+	$domain = preg_replace('/\s+/', '', sanitize_user($domain, true));
 
-	if ( is_subdomain_install() )
-		$domain = str_replace( '@', '', $domain );
+	if (is_subdomain_install())
+		$domain = str_replace('@', '', $domain);
 
-	$title = strip_tags( $title );
+	$title = strip_tags($title);
 	$user_id = (int) $user_id;
 
-	if ( empty($path) )
+	if (empty($path))
 		$path = '/';
 
 	// Check if the domain has been used already. We should return an error message.
-	if ( domain_exists($domain, $path, $site_id) )
-		return new WP_Error( 'blog_taken', __( 'Sorry, that site already exists!' ) );
+	if (domain_exists($domain, $path, $site_id))
+		return new WP_Error('blog_taken', __('Sorry, that site already exists!'));
 
-	if ( ! wp_installing() ) {
-		wp_installing( true );
+	if ( ! wp_installing()) {
+		wp_installing(true);
 	}
 
-	if ( ! $blog_id = insert_blog($domain, $path, $site_id) )
+	if ( ! $blog_id = insert_blog($domain, $path, $site_id))
 		return new WP_Error('insert_blog', __('Could not create site.'));
 
 	switch_to_blog($blog_id);
@@ -1186,17 +1186,17 @@ 
 
 	add_user_to_blog($blog_id, $user_id, 'administrator');
 
-	foreach ( $meta as $key => $value ) {
-		if ( in_array( $key, array( 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id' ) ) )
-			update_blog_status( $blog_id, $key, $value );
+	foreach ($meta as $key => $value) {
+		if (in_array($key, array('public', 'archived', 'mature', 'spam', 'deleted', 'lang_id')))
+			update_blog_status($blog_id, $key, $value);
 		else
-			update_option( $key, $value );
+			update_option($key, $value);
 	}
 
-	update_option( 'blog_public', (int) $meta['public'] );
+	update_option('blog_public', (int) $meta['public']);
 
-	if ( ! is_super_admin( $user_id ) && ! get_user_meta( $user_id, 'primary_blog', true ) )
-		update_user_meta( $user_id, 'primary_blog', $blog_id );
+	if ( ! is_super_admin($user_id) && ! get_user_meta($user_id, 'primary_blog', true))
+		update_user_meta($user_id, 'primary_blog', $blog_id);
 
 	restore_current_blog();
 	/**
@@ -1211,9 +1211,9 @@ 
 	 * @param int    $site_id Site ID. Only relevant on multi-network installs.
 	 * @param array  $meta    Meta data. Used to set initial site options.
 	 */
-	do_action( 'wpmu_new_blog', $blog_id, $user_id, $domain, $path, $site_id, $meta );
+	do_action('wpmu_new_blog', $blog_id, $user_id, $domain, $path, $site_id, $meta);
 
-	wp_cache_set( 'last_changed', microtime(), 'sites' );
+	wp_cache_set('last_changed', microtime(), 'sites');
 
 	return $blog_id;
 }
@@ -1230,27 +1230,27 @@ 
  * @param string $deprecated Not used.
  * @return bool
  */
-function newblog_notify_siteadmin( $blog_id, $deprecated = '' ) {
-	if ( get_site_option( 'registrationnotification' ) != 'yes' )
+function newblog_notify_siteadmin($blog_id, $deprecated = '') {
+	if (get_site_option('registrationnotification') != 'yes')
 		return false;
 
-	$email = get_site_option( 'admin_email' );
-	if ( is_email($email) == false )
+	$email = get_site_option('admin_email');
+	if (is_email($email) == false)
 		return false;
 
 	$options_site_url = esc_url(network_admin_url('settings.php'));
 
-	switch_to_blog( $blog_id );
-	$blogname = get_option( 'blogname' );
+	switch_to_blog($blog_id);
+	$blogname = get_option('blogname');
 	$siteurl = site_url();
 	restore_current_blog();
 
 	/* translators: New site notification email. 1: Site URL, 2: User IP address, 3: Settings screen URL */
-	$msg = sprintf( __( 'New Site: %1$s
+	$msg = sprintf(__('New Site: %1$s
 URL: %2$s
 Remote IP: %3$s
 
-Disable these notifications: %4$s' ), $blogname, $siteurl, wp_unslash( $_SERVER['REMOTE_ADDR'] ), $options_site_url);
+Disable these notifications: %4$s' ), $blogname, $siteurl, wp_unslash($_SERVER['REMOTE_ADDR']), $options_site_url);
 	/**
 	 * Filters the message body of the new site activation email sent
 	 * to the network administrator.
@@ -1259,9 +1259,9 @@ 
 	 *
 	 * @param string $msg Email body.
 	 */
-	$msg = apply_filters( 'newblog_notify_siteadmin', $msg );
+	$msg = apply_filters('newblog_notify_siteadmin', $msg);
 
-	wp_mail( $email, sprintf( __( 'New Site Registration: %s' ), $siteurl ), $msg );
+	wp_mail($email, sprintf(__('New Site Registration: %s'), $siteurl), $msg);
 	return true;
 }
 
@@ -1276,23 +1276,23 @@ 
  * @param int $user_id The new user's ID.
  * @return bool
  */
-function newuser_notify_siteadmin( $user_id ) {
-	if ( get_site_option( 'registrationnotification' ) != 'yes' )
+function newuser_notify_siteadmin($user_id) {
+	if (get_site_option('registrationnotification') != 'yes')
 		return false;
 
-	$email = get_site_option( 'admin_email' );
+	$email = get_site_option('admin_email');
 
-	if ( is_email($email) == false )
+	if (is_email($email) == false)
 		return false;
 
-	$user = get_userdata( $user_id );
+	$user = get_userdata($user_id);
 
 	$options_site_url = esc_url(network_admin_url('settings.php'));
 	/* translators: New user notification email. 1: User login, 2: User IP address, 3: Settings screen URL */
 	$msg = sprintf(__('New User: %1$s
 Remote IP: %2$s
 
-Disable these notifications: %3$s'), $user->user_login, wp_unslash( $_SERVER['REMOTE_ADDR'] ), $options_site_url);
+Disable these notifications: %3$s'), $user->user_login, wp_unslash($_SERVER['REMOTE_ADDR']), $options_site_url);
 
 	/**
 	 * Filters the message body of the new user activation email sent
@@ -1303,8 +1303,8 @@ 
 	 * @param string  $msg  Email body.
 	 * @param WP_User $user WP_User instance of the new user.
 	 */
-	$msg = apply_filters( 'newuser_notify_siteadmin', $msg, $user );
-	wp_mail( $email, sprintf(__('New User Registration: %s'), $user->user_login), $msg );
+	$msg = apply_filters('newuser_notify_siteadmin', $msg, $user);
+	wp_mail($email, sprintf(__('New User Registration: %s'), $user->user_login), $msg);
 	return true;
 }
 
@@ -1324,15 +1324,15 @@ 
  * @return int
  */
 function domain_exists($domain, $path, $site_id = 1) {
-	$path = trailingslashit( $path );
+	$path = trailingslashit($path);
 	$args = array(
 		'network_id' => $site_id,
 		'domain' => $domain,
 		'path' => $path,
 		'fields' => 'ids',
 	);
-	$result = get_sites( $args );
-	$result = array_shift( $result );
+	$result = get_sites($args);
+	$result = array_shift($result);
 
 	/**
 	 * Filters whether a blogname is taken.
@@ -1344,7 +1344,7 @@ 
 	 * @param string   $path    Path to be checked.
 	 * @param int      $site_id Site ID. Relevant only on multi-network installs.
 	 */
-	return apply_filters( 'domain_exists', $result, $domain, $path, $site_id );
+	return apply_filters('domain_exists', $result, $domain, $path, $site_id);
 }
 
 /**
@@ -1368,14 +1368,14 @@ 
 	$path = trailingslashit($path);
 	$site_id = (int) $site_id;
 
-	$result = $wpdb->insert( $wpdb->blogs, array('site_id' => $site_id, 'domain' => $domain, 'path' => $path, 'registered' => current_time('mysql')) );
-	if ( ! $result )
+	$result = $wpdb->insert($wpdb->blogs, array('site_id' => $site_id, 'domain' => $domain, 'path' => $path, 'registered' => current_time('mysql')));
+	if ( ! $result)
 		return false;
 
 	$blog_id = $wpdb->insert_id;
-	refresh_blog_details( $blog_id );
+	refresh_blog_details($blog_id);
 
-	wp_maybe_update_network_site_counts( $site_id );
+	wp_maybe_update_network_site_counts($site_id);
 
 	return $blog_id;
 }
@@ -1395,57 +1395,57 @@ 
  * @param int    $blog_id    The value returned by insert_blog().
  * @param string $blog_title The title of the new site.
  */
-function install_blog( $blog_id, $blog_title = '' ) {
+function install_blog($blog_id, $blog_title = '') {
 	global $wpdb, $wp_roles;
 
 	// Cast for security
 	$blog_id = (int) $blog_id;
 
-	require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+	require_once(ABSPATH.'wp-admin/includes/upgrade.php');
 
 	$suppress = $wpdb->suppress_errors();
-	if ( $wpdb->get_results( "DESCRIBE {$wpdb->posts}" ) )
-		die( '<h1>' . __( 'Already Installed' ) . '</h1><p>' . __( 'You appear to have already installed WordPress. To reinstall please clear your old database tables first.' ) . '</p></body></html>' );
-	$wpdb->suppress_errors( $suppress );
+	if ($wpdb->get_results("DESCRIBE {$wpdb->posts}"))
+		die('<h1>'.__('Already Installed').'</h1><p>'.__('You appear to have already installed WordPress. To reinstall please clear your old database tables first.').'</p></body></html>');
+	$wpdb->suppress_errors($suppress);
 
-	$url = get_blogaddress_by_id( $blog_id );
+	$url = get_blogaddress_by_id($blog_id);
 
 	// Set everything up
-	make_db_current_silent( 'blog' );
+	make_db_current_silent('blog');
 	populate_options();
 	populate_roles();
 
 	// populate_roles() clears previous role definitions so we start over.
 	$wp_roles = new WP_Roles();
 
-	$siteurl = $home = untrailingslashit( $url );
+	$siteurl = $home = untrailingslashit($url);
 
-	if ( ! is_subdomain_install() ) {
+	if ( ! is_subdomain_install()) {
 
- 		if ( 'https' === parse_url( get_site_option( 'siteurl' ), PHP_URL_SCHEME ) ) {
- 			$siteurl = set_url_scheme( $siteurl, 'https' );
+ 		if ('https' === parse_url(get_site_option('siteurl'), PHP_URL_SCHEME)) {
+ 			$siteurl = set_url_scheme($siteurl, 'https');
  		}
- 		if ( 'https' === parse_url( get_home_url( get_network()->site_id ), PHP_URL_SCHEME ) ) {
- 			$home = set_url_scheme( $home, 'https' );
+ 		if ('https' === parse_url(get_home_url(get_network()->site_id), PHP_URL_SCHEME)) {
+ 			$home = set_url_scheme($home, 'https');
  		}
 
 	}
 
-	update_option( 'siteurl', $siteurl );
-	update_option( 'home', $home );
+	update_option('siteurl', $siteurl);
+	update_option('home', $home);
 
-	if ( get_site_option( 'ms_files_rewriting' ) )
-		update_option( 'upload_path', UPLOADBLOGSDIR . "/$blog_id/files" );
+	if (get_site_option('ms_files_rewriting'))
+		update_option('upload_path', UPLOADBLOGSDIR."/$blog_id/files");
 	else
-		update_option( 'upload_path', get_blog_option( get_network()->site_id, 'upload_path' ) );
+		update_option('upload_path', get_blog_option(get_network()->site_id, 'upload_path'));
 
-	update_option( 'blogname', wp_unslash( $blog_title ) );
-	update_option( 'admin_email', '' );
+	update_option('blogname', wp_unslash($blog_title));
+	update_option('admin_email', '');
 
 	// remove all perms
 	$table_prefix = $wpdb->get_blog_prefix();
-	delete_metadata( 'user', 0, $table_prefix . 'user_level',   null, true ); // delete all
-	delete_metadata( 'user', 0, $table_prefix . 'capabilities', null, true ); // delete all
+	delete_metadata('user', 0, $table_prefix.'user_level', null, true); // delete all
+	delete_metadata('user', 0, $table_prefix.'capabilities', null, true); // delete all
 }
 
 /**
@@ -1465,13 +1465,13 @@ 
 function install_blog_defaults($blog_id, $user_id) {
 	global $wpdb;
 
-	require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+	require_once(ABSPATH.'wp-admin/includes/upgrade.php');
 
 	$suppress = $wpdb->suppress_errors();
 
 	wp_install_defaults($user_id);
 
-	$wpdb->suppress_errors( $suppress );
+	$wpdb->suppress_errors($suppress);
 }
 
 /**
@@ -1491,7 +1491,7 @@ 
  * @param array  $meta     Optional. Signup meta data. By default, contains the requested privacy setting and lang_id.
  * @return bool
  */
-function wpmu_welcome_notification( $blog_id, $user_id, $password, $title, $meta = array() ) {
+function wpmu_welcome_notification($blog_id, $user_id, $password, $title, $meta = array()) {
 	$current_network = get_network();
 
 	/**
@@ -1507,17 +1507,17 @@ 
 	 * @param string   $title    Site title.
 	 * @param array    $meta     Signup meta data. By default, contains the requested privacy setting and lang_id.
 	 */
-	if ( ! apply_filters( 'wpmu_welcome_notification', $blog_id, $user_id, $password, $title, $meta ) )
+	if ( ! apply_filters('wpmu_welcome_notification', $blog_id, $user_id, $password, $title, $meta))
 		return false;
 
-	$user = get_userdata( $user_id );
+	$user = get_userdata($user_id);
 
-	$switched_locale = switch_to_locale( get_user_locale( $user ) );
+	$switched_locale = switch_to_locale(get_user_locale($user));
 
-	$welcome_email = get_site_option( 'welcome_email' );
-	if ( $welcome_email == false ) {
+	$welcome_email = get_site_option('welcome_email');
+	if ($welcome_email == false) {
 		/* translators: Do not translate USERNAME, SITE_NAME, BLOG_URL, PASSWORD: those are placeholders. */
-		$welcome_email = __( 'Howdy USERNAME,
+		$welcome_email = __('Howdy USERNAME,
 
 Your new SITE_NAME site has been successfully set up at:
 BLOG_URL
@@ -1535,11 +1535,11 @@ 
 
 	$url = get_blogaddress_by_id($blog_id);
 
-	$welcome_email = str_replace( 'SITE_NAME', $current_network->site_name, $welcome_email );
-	$welcome_email = str_replace( 'BLOG_TITLE', $title, $welcome_email );
-	$welcome_email = str_replace( 'BLOG_URL', $url, $welcome_email );
-	$welcome_email = str_replace( 'USERNAME', $user->user_login, $welcome_email );
-	$welcome_email = str_replace( 'PASSWORD', $password, $welcome_email );
+	$welcome_email = str_replace('SITE_NAME', $current_network->site_name, $welcome_email);
+	$welcome_email = str_replace('BLOG_TITLE', $title, $welcome_email);
+	$welcome_email = str_replace('BLOG_URL', $url, $welcome_email);
+	$welcome_email = str_replace('USERNAME', $user->user_login, $welcome_email);
+	$welcome_email = str_replace('PASSWORD', $password, $welcome_email);
 
 	/**
 	 * Filters the content of the welcome email after site activation.
@@ -1555,21 +1555,21 @@ 
 	 * @param string $title         Site title.
 	 * @param array  $meta          Signup meta data. By default, contains the requested privacy setting and lang_id.
 	 */
-	$welcome_email = apply_filters( 'update_welcome_email', $welcome_email, $blog_id, $user_id, $password, $title, $meta );
-	$admin_email = get_site_option( 'admin_email' );
+	$welcome_email = apply_filters('update_welcome_email', $welcome_email, $blog_id, $user_id, $password, $title, $meta);
+	$admin_email = get_site_option('admin_email');
 
-	if ( $admin_email == '' )
-		$admin_email = 'support@' . $_SERVER['SERVER_NAME'];
+	if ($admin_email == '')
+		$admin_email = 'support@'.$_SERVER['SERVER_NAME'];
 
-	$from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
-	$message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
+	$from_name = get_site_option('site_name') == '' ? 'WordPress' : esc_html(get_site_option('site_name'));
+	$message_headers = "From: \"{$from_name}\" <{$admin_email}>\n"."Content-Type: text/plain; charset=\"".get_option('blog_charset')."\"\n";
 	$message = $welcome_email;
 
-	if ( empty( $current_network->site_name ) )
+	if (empty($current_network->site_name))
 		$current_network->site_name = 'WordPress';
 
 	/* translators: New site notification email subject. 1: Network name, 2: New site name */
-	$subject = __( 'New %1$s Site: %2$s' );
+	$subject = __('New %1$s Site: %2$s');
 
 	/**
 	 * Filters the subject of the welcome email after site activation.
@@ -1578,10 +1578,10 @@ 
 	 *
 	 * @param string $subject Subject of the email.
 	 */
-	$subject = apply_filters( 'update_welcome_subject', sprintf( $subject, $current_network->site_name, wp_unslash( $title ) ) );
-	wp_mail( $user->user_email, wp_specialchars_decode( $subject ), $message, $message_headers );
+	$subject = apply_filters('update_welcome_subject', sprintf($subject, $current_network->site_name, wp_unslash($title)));
+	wp_mail($user->user_email, wp_specialchars_decode($subject), $message, $message_headers);
 
-	if ( $switched_locale ) {
+	if ($switched_locale) {
 		restore_previous_locale();
 	}
 
@@ -1603,7 +1603,7 @@ 
  * @param array  $meta     Optional. Signup meta data. Default empty array.
  * @return bool
  */
-function wpmu_welcome_user_notification( $user_id, $password, $meta = array() ) {
+function wpmu_welcome_user_notification($user_id, $password, $meta = array()) {
 	$current_network = get_network();
 
 	/**
@@ -1617,14 +1617,14 @@ 
 	 * @param string $password User password.
 	 * @param array  $meta     Signup meta data. Default empty array.
 	 */
-	if ( ! apply_filters( 'wpmu_welcome_user_notification', $user_id, $password, $meta ) )
+	if ( ! apply_filters('wpmu_welcome_user_notification', $user_id, $password, $meta))
 		return false;
 
-	$welcome_email = get_site_option( 'welcome_user_email' );
+	$welcome_email = get_site_option('welcome_user_email');
 
-	$user = get_userdata( $user_id );
+	$user = get_userdata($user_id);
 
-	$switched_locale = switch_to_locale( get_user_locale( $user ) );
+	$switched_locale = switch_to_locale(get_user_locale($user));
 
 	/**
 	 * Filters the content of the welcome email after user activation.
@@ -1638,26 +1638,26 @@ 
 	 * @param string $password      User password.
 	 * @param array  $meta          Signup meta data. Default empty array.
 	 */
-	$welcome_email = apply_filters( 'update_welcome_user_email', $welcome_email, $user_id, $password, $meta );
-	$welcome_email = str_replace( 'SITE_NAME', $current_network->site_name, $welcome_email );
-	$welcome_email = str_replace( 'USERNAME', $user->user_login, $welcome_email );
-	$welcome_email = str_replace( 'PASSWORD', $password, $welcome_email );
-	$welcome_email = str_replace( 'LOGINLINK', wp_login_url(), $welcome_email );
+	$welcome_email = apply_filters('update_welcome_user_email', $welcome_email, $user_id, $password, $meta);
+	$welcome_email = str_replace('SITE_NAME', $current_network->site_name, $welcome_email);
+	$welcome_email = str_replace('USERNAME', $user->user_login, $welcome_email);
+	$welcome_email = str_replace('PASSWORD', $password, $welcome_email);
+	$welcome_email = str_replace('LOGINLINK', wp_login_url(), $welcome_email);
 
-	$admin_email = get_site_option( 'admin_email' );
+	$admin_email = get_site_option('admin_email');
 
-	if ( $admin_email == '' )
-		$admin_email = 'support@' . $_SERVER['SERVER_NAME'];
+	if ($admin_email == '')
+		$admin_email = 'support@'.$_SERVER['SERVER_NAME'];
 
-	$from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
-	$message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
+	$from_name = get_site_option('site_name') == '' ? 'WordPress' : esc_html(get_site_option('site_name'));
+	$message_headers = "From: \"{$from_name}\" <{$admin_email}>\n"."Content-Type: text/plain; charset=\"".get_option('blog_charset')."\"\n";
 	$message = $welcome_email;
 
-	if ( empty( $current_network->site_name ) )
+	if (empty($current_network->site_name))
 		$current_network->site_name = 'WordPress';
 
 	/* translators: New user notification email subject. 1: Network name, 2: New user login */
-	$subject = __( 'New %1$s User: %2$s' );
+	$subject = __('New %1$s User: %2$s');
 
 	/**
 	 * Filters the subject of the welcome email after user activation.
@@ -1666,10 +1666,10 @@ 
 	 *
 	 * @param string $subject Subject of the email.
 	 */
-	$subject = apply_filters( 'update_welcome_user_subject', sprintf( $subject, $current_network->site_name, $user->user_login) );
-	wp_mail( $user->user_email, wp_specialchars_decode( $subject ), $message, $message_headers );
+	$subject = apply_filters('update_welcome_user_subject', sprintf($subject, $current_network->site_name, $user->user_login));
+	wp_mail($user->user_email, wp_specialchars_decode($subject), $message, $message_headers);
 
-	if ( $switched_locale ) {
+	if ($switched_locale) {
 		restore_previous_locale();
 	}
 
@@ -1708,26 +1708,26 @@ 
  * @param int $user_id
  * @return array Contains the blog_id, post_id, post_date_gmt, and post_gmt_ts
  */
-function get_most_recent_post_of_user( $user_id ) {
+function get_most_recent_post_of_user($user_id) {
 	global $wpdb;
 
-	$user_blogs = get_blogs_of_user( (int) $user_id );
+	$user_blogs = get_blogs_of_user((int) $user_id);
 	$most_recent_post = array();
 
 	// Walk through each blog and get the most recent post
 	// published by $user_id
-	foreach ( (array) $user_blogs as $blog ) {
-		$prefix = $wpdb->get_blog_prefix( $blog->userblog_id );
-		$recent_post = $wpdb->get_row( $wpdb->prepare("SELECT ID, post_date_gmt FROM {$prefix}posts WHERE post_author = %d AND post_type = 'post' AND post_status = 'publish' ORDER BY post_date_gmt DESC LIMIT 1", $user_id ), ARRAY_A);
+	foreach ((array) $user_blogs as $blog) {
+		$prefix = $wpdb->get_blog_prefix($blog->userblog_id);
+		$recent_post = $wpdb->get_row($wpdb->prepare("SELECT ID, post_date_gmt FROM {$prefix}posts WHERE post_author = %d AND post_type = 'post' AND post_status = 'publish' ORDER BY post_date_gmt DESC LIMIT 1", $user_id), ARRAY_A);
 
 		// Make sure we found a post
-		if ( isset($recent_post['ID']) ) {
+		if (isset($recent_post['ID'])) {
 			$post_gmt_ts = strtotime($recent_post['post_date_gmt']);
 
 			// If this is the first post checked or if this post is
 			// newer than the current recent post, make it the new
 			// most recent post.
-			if ( !isset($most_recent_post['post_gmt_ts']) || ( $post_gmt_ts > $most_recent_post['post_gmt_ts'] ) ) {
+			if ( ! isset($most_recent_post['post_gmt_ts']) || ($post_gmt_ts > $most_recent_post['post_gmt_ts'])) {
 				$most_recent_post = array(
 					'blog_id'		=> $blog->userblog_id,
 					'post_id'		=> $recent_post['ID'],
@@ -1754,24 +1754,24 @@ 
  * @param string $directory Full path of a directory.
  * @return int Size of the directory in MB.
  */
-function get_dirsize( $directory ) {
-	$dirsize = get_transient( 'dirsize_cache' );
-	if ( is_array( $dirsize ) && isset( $dirsize[ $directory ][ 'size' ] ) )
-		return $dirsize[ $directory ][ 'size' ];
+function get_dirsize($directory) {
+	$dirsize = get_transient('dirsize_cache');
+	if (is_array($dirsize) && isset($dirsize[$directory]['size']))
+		return $dirsize[$directory]['size'];
 
-	if ( ! is_array( $dirsize ) )
+	if ( ! is_array($dirsize))
 		$dirsize = array();
 
 	// Exclude individual site directories from the total when checking the main site,
 	// as they are subdirectories and should not be counted.
-	if ( is_main_site() ) {
-		$dirsize[ $directory ][ 'size' ] = recurse_dirsize( $directory, $directory . '/sites' );
+	if (is_main_site()) {
+		$dirsize[$directory]['size'] = recurse_dirsize($directory, $directory.'/sites');
 	} else {
-		$dirsize[ $directory ][ 'size' ] = recurse_dirsize( $directory );
+		$dirsize[$directory]['size'] = recurse_dirsize($directory);
 	}
 
-	set_transient( 'dirsize_cache', $dirsize, HOUR_IN_SECONDS );
-	return $dirsize[ $directory ][ 'size' ];
+	set_transient('dirsize_cache', $dirsize, HOUR_IN_SECONDS);
+	return $dirsize[$directory]['size'];
 }
 
 /**
@@ -1787,23 +1787,23 @@ 
  * @param string $exclude   Optional. Full path of a subdirectory to exclude from the total.
  * @return int|false Size in MB if a valid directory. False if not.
  */
-function recurse_dirsize( $directory, $exclude = null ) {
+function recurse_dirsize($directory, $exclude = null) {
 	$size = 0;
 
-	$directory = untrailingslashit( $directory );
+	$directory = untrailingslashit($directory);
 
-	if ( ! file_exists( $directory ) || ! is_dir( $directory ) || ! is_readable( $directory ) || $directory === $exclude ) {
+	if ( ! file_exists($directory) || ! is_dir($directory) || ! is_readable($directory) || $directory === $exclude) {
 		return false;
 	}
 
 	if ($handle = opendir($directory)) {
-		while(($file = readdir($handle)) !== false) {
+		while (($file = readdir($handle)) !== false) {
 			$path = $directory.'/'.$file;
 			if ($file != '.' && $file != '..') {
 				if (is_file($path)) {
 					$size += filesize($path);
 				} elseif (is_dir($path)) {
-					$handlesize = recurse_dirsize( $path, $exclude );
+					$handlesize = recurse_dirsize($path, $exclude);
 					if ($handlesize > 0)
 						$size += $handlesize;
 				}
@@ -1828,12 +1828,12 @@ 
  * @param array $mimes
  * @return array
  */
-function check_upload_mimes( $mimes ) {
-	$site_exts = explode( ' ', get_site_option( 'upload_filetypes', 'jpg jpeg png gif' ) );
+function check_upload_mimes($mimes) {
+	$site_exts = explode(' ', get_site_option('upload_filetypes', 'jpg jpeg png gif'));
 	$site_mimes = array();
-	foreach ( $site_exts as $ext ) {
-		foreach ( $mimes as $ext_pattern => $mime ) {
-			if ( $ext != '' && strpos( $ext_pattern, $ext ) !== false )
+	foreach ($site_exts as $ext) {
+		foreach ($mimes as $ext_pattern => $mime) {
+			if ($ext != '' && strpos($ext_pattern, $ext) !== false)
 				$site_mimes[$ext_pattern] = $mime;
 		}
 	}
@@ -1854,9 +1854,9 @@ 
  *
  * @param string $deprecated Not used.
  */
-function update_posts_count( $deprecated = '' ) {
+function update_posts_count($deprecated = '') {
 	global $wpdb;
-	update_option( 'post_count', (int) $wpdb->get_var( "SELECT COUNT(ID) FROM {$wpdb->posts} WHERE post_status = 'publish' and post_type = 'post'" ) );
+	update_option('post_count', (int) $wpdb->get_var("SELECT COUNT(ID) FROM {$wpdb->posts} WHERE post_status = 'publish' and post_type = 'post'"));
 }
 
 /**
@@ -1869,11 +1869,11 @@ 
  * @param int $blog_id
  * @param int $user_id
  */
-function wpmu_log_new_registrations( $blog_id, $user_id ) {
+function wpmu_log_new_registrations($blog_id, $user_id) {
 	global $wpdb;
-	$user = get_userdata( (int) $user_id );
-	if ( $user )
-		$wpdb->insert( $wpdb->registration_log, array('email' => $user->user_email, 'IP' => preg_replace( '/[^0-9., ]/', '', wp_unslash( $_SERVER['REMOTE_ADDR'] ) ), 'blog_id' => $blog_id, 'date_registered' => current_time('mysql')) );
+	$user = get_userdata((int) $user_id);
+	if ($user)
+		$wpdb->insert($wpdb->registration_log, array('email' => $user->user_email, 'IP' => preg_replace('/[^0-9., ]/', '', wp_unslash($_SERVER['REMOTE_ADDR'])), 'blog_id' => $blog_id, 'date_registered' => current_time('mysql')));
 }
 
 /**
@@ -1890,61 +1890,61 @@ 
  * @param string $deprecated Not used.
  * @return int An ID from the global terms table mapped from $term_id.
  */
-function global_terms( $term_id, $deprecated = '' ) {
+function global_terms($term_id, $deprecated = '') {
 	global $wpdb;
 	static $global_terms_recurse = null;
 
-	if ( !global_terms_enabled() )
+	if ( ! global_terms_enabled())
 		return $term_id;
 
 	// prevent a race condition
 	$recurse_start = false;
-	if ( $global_terms_recurse === null ) {
+	if ($global_terms_recurse === null) {
 		$recurse_start = true;
 		$global_terms_recurse = 1;
-	} elseif ( 10 < $global_terms_recurse++ ) {
+	} elseif (10 < $global_terms_recurse++) {
 		return $term_id;
 	}
 
-	$term_id = intval( $term_id );
-	$c = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->terms WHERE term_id = %d", $term_id ) );
+	$term_id = intval($term_id);
+	$c = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->terms WHERE term_id = %d", $term_id));
 
-	$global_id = $wpdb->get_var( $wpdb->prepare( "SELECT cat_ID FROM $wpdb->sitecategories WHERE category_nicename = %s", $c->slug ) );
-	if ( $global_id == null ) {
-		$used_global_id = $wpdb->get_var( $wpdb->prepare( "SELECT cat_ID FROM $wpdb->sitecategories WHERE cat_ID = %d", $c->term_id ) );
-		if ( null == $used_global_id ) {
-			$wpdb->insert( $wpdb->sitecategories, array( 'cat_ID' => $term_id, 'cat_name' => $c->name, 'category_nicename' => $c->slug ) );
+	$global_id = $wpdb->get_var($wpdb->prepare("SELECT cat_ID FROM $wpdb->sitecategories WHERE category_nicename = %s", $c->slug));
+	if ($global_id == null) {
+		$used_global_id = $wpdb->get_var($wpdb->prepare("SELECT cat_ID FROM $wpdb->sitecategories WHERE cat_ID = %d", $c->term_id));
+		if (null == $used_global_id) {
+			$wpdb->insert($wpdb->sitecategories, array('cat_ID' => $term_id, 'cat_name' => $c->name, 'category_nicename' => $c->slug));
 			$global_id = $wpdb->insert_id;
-			if ( empty( $global_id ) )
+			if (empty($global_id))
 				return $term_id;
 		} else {
-			$max_global_id = $wpdb->get_var( "SELECT MAX(cat_ID) FROM $wpdb->sitecategories" );
-			$max_local_id = $wpdb->get_var( "SELECT MAX(term_id) FROM $wpdb->terms" );
-			$new_global_id = max( $max_global_id, $max_local_id ) + mt_rand( 100, 400 );
-			$wpdb->insert( $wpdb->sitecategories, array( 'cat_ID' => $new_global_id, 'cat_name' => $c->name, 'category_nicename' => $c->slug ) );
+			$max_global_id = $wpdb->get_var("SELECT MAX(cat_ID) FROM $wpdb->sitecategories");
+			$max_local_id = $wpdb->get_var("SELECT MAX(term_id) FROM $wpdb->terms");
+			$new_global_id = max($max_global_id, $max_local_id) + mt_rand(100, 400);
+			$wpdb->insert($wpdb->sitecategories, array('cat_ID' => $new_global_id, 'cat_name' => $c->name, 'category_nicename' => $c->slug));
 			$global_id = $wpdb->insert_id;
 		}
-	} elseif ( $global_id != $term_id ) {
-		$local_id = $wpdb->get_var( $wpdb->prepare( "SELECT term_id FROM $wpdb->terms WHERE term_id = %d", $global_id ) );
-		if ( null != $local_id ) {
-			global_terms( $local_id );
-			if ( 10 < $global_terms_recurse ) {
+	} elseif ($global_id != $term_id) {
+		$local_id = $wpdb->get_var($wpdb->prepare("SELECT term_id FROM $wpdb->terms WHERE term_id = %d", $global_id));
+		if (null != $local_id) {
+			global_terms($local_id);
+			if (10 < $global_terms_recurse) {
 				$global_id = $term_id;
 			}
 		}
 	}
 
-	if ( $global_id != $term_id ) {
-		if ( get_option( 'default_category' ) == $term_id )
-			update_option( 'default_category', $global_id );
+	if ($global_id != $term_id) {
+		if (get_option('default_category') == $term_id)
+			update_option('default_category', $global_id);
 
-		$wpdb->update( $wpdb->terms, array('term_id' => $global_id), array('term_id' => $term_id) );
-		$wpdb->update( $wpdb->term_taxonomy, array('term_id' => $global_id), array('term_id' => $term_id) );
-		$wpdb->update( $wpdb->term_taxonomy, array('parent' => $global_id), array('parent' => $term_id) );
+		$wpdb->update($wpdb->terms, array('term_id' => $global_id), array('term_id' => $term_id));
+		$wpdb->update($wpdb->term_taxonomy, array('term_id' => $global_id), array('term_id' => $term_id));
+		$wpdb->update($wpdb->term_taxonomy, array('parent' => $global_id), array('parent' => $term_id));
 
 		clean_term_cache($term_id);
 	}
-	if ( $recurse_start )
+	if ($recurse_start)
 		$global_terms_recurse = null;
 
 	return $global_id;
@@ -1959,8 +1959,8 @@ 
  * @param array|string $deprecated Not used.
  * @return array The current site's domain
  */
-function redirect_this_site( $deprecated = '' ) {
-	return array( get_network()->domain );
+function redirect_this_site($deprecated = '') {
+	return array(get_network()->domain);
 }
 
 /**
@@ -1973,12 +1973,12 @@ 
  * @param array $upload
  * @return string|array If the upload is under the size limit, $upload is returned. Otherwise returns an error message.
  */
-function upload_is_file_too_big( $upload ) {
-	if ( ! is_array( $upload ) || defined( 'WP_IMPORTING' ) || get_site_option( 'upload_space_check_disabled' ) )
+function upload_is_file_too_big($upload) {
+	if ( ! is_array($upload) || defined('WP_IMPORTING') || get_site_option('upload_space_check_disabled'))
 		return $upload;
 
-	if ( strlen( $upload['bits'] )  > ( KB_IN_BYTES * get_site_option( 'fileupload_maxk', 1500 ) ) ) {
-		return sprintf( __( 'This file is too big. Files must be less than %d KB in size.' ) . '<br />', get_site_option( 'fileupload_maxk', 1500 ) );
+	if (strlen($upload['bits']) > (KB_IN_BYTES * get_site_option('fileupload_maxk', 1500))) {
+		return sprintf(__('This file is too big. Files must be less than %d KB in size.').'<br />', get_site_option('fileupload_maxk', 1500));
 	}
 
 	return $upload;
@@ -1992,7 +1992,7 @@ 
 function signup_nonce_fields() {
 	$id = mt_rand();
 	echo "<input type='hidden' name='signup_form_id' value='{$id}' />";
-	wp_nonce_field('signup_form_' . $id, '_signup_form', false);
+	wp_nonce_field('signup_form_'.$id, '_signup_form', false);
 }
 
 /**
@@ -2003,12 +2003,12 @@ 
  * @param array $result
  * @return array
  */
-function signup_nonce_check( $result ) {
-	if ( !strpos( $_SERVER[ 'PHP_SELF' ], 'wp-signup.php' ) )
+function signup_nonce_check($result) {
+	if ( ! strpos($_SERVER['PHP_SELF'], 'wp-signup.php'))
 		return $result;
 
-	if ( wp_create_nonce('signup_form_' . $_POST[ 'signup_form_id' ]) != $_POST['_signup_form'] )
-		wp_die( __( 'Please try again.' ) );
+	if (wp_create_nonce('signup_form_'.$_POST['signup_form_id']) != $_POST['_signup_form'])
+		wp_die(__('Please try again.'));
 
 	return $result;
 }
@@ -2028,10 +2028,10 @@ 
 	 *
 	 * @param string $no_blog_redirect The redirect URL defined in NOBLOGREDIRECT.
 	 */
-	if ( is_main_site() && is_404() && defined( 'NOBLOGREDIRECT' ) && ( $destination = apply_filters( 'blog_redirect_404', NOBLOGREDIRECT ) ) ) {
-		if ( $destination == '%siteurl%' )
+	if (is_main_site() && is_404() && defined('NOBLOGREDIRECT') && ($destination = apply_filters('blog_redirect_404', NOBLOGREDIRECT))) {
+		if ($destination == '%siteurl%')
 			$destination = network_home_url();
-		wp_redirect( $destination );
+		wp_redirect($destination);
 		exit();
 	}
 }
@@ -2046,23 +2046,23 @@ 
  * @since MU
  */
 function maybe_add_existing_user_to_blog() {
-	if ( false === strpos( $_SERVER[ 'REQUEST_URI' ], '/newbloguser/' ) )
+	if (false === strpos($_SERVER['REQUEST_URI'], '/newbloguser/'))
 		return;
 
-	$parts = explode( '/', $_SERVER[ 'REQUEST_URI' ] );
-	$key = array_pop( $parts );
+	$parts = explode('/', $_SERVER['REQUEST_URI']);
+	$key = array_pop($parts);
 
-	if ( $key == '' )
-		$key = array_pop( $parts );
+	if ($key == '')
+		$key = array_pop($parts);
 
-	$details = get_option( 'new_user_' . $key );
-	if ( !empty( $details ) )
-		delete_option( 'new_user_' . $key );
+	$details = get_option('new_user_'.$key);
+	if ( ! empty($details))
+		delete_option('new_user_'.$key);
 
-	if ( empty( $details ) || is_wp_error( add_existing_user_to_blog( $details ) ) )
-		wp_die( sprintf(__('An error occurred adding you to this site. Back to the <a href="%s">homepage</a>.'), home_url() ) );
+	if (empty($details) || is_wp_error(add_existing_user_to_blog($details)))
+		wp_die(sprintf(__('An error occurred adding you to this site. Back to the <a href="%s">homepage</a>.'), home_url()));
 
-	wp_die( sprintf( __( 'You have been added to this site. Please visit the <a href="%s">homepage</a> or <a href="%s">log in</a> using your username and password.' ), home_url(), admin_url() ), __( 'WordPress &rsaquo; Success' ), array( 'response' => 200 ) );
+	wp_die(sprintf(__('You have been added to this site. Please visit the <a href="%s">homepage</a> or <a href="%s">log in</a> using your username and password.'), home_url(), admin_url()), __('WordPress &rsaquo; Success'), array('response' => 200));
 }
 
 /**
@@ -2073,10 +2073,10 @@ 
  * @param array $details
  * @return true|WP_Error|void
  */
-function add_existing_user_to_blog( $details = false ) {
-	if ( is_array( $details ) ) {
+function add_existing_user_to_blog($details = false) {
+	if (is_array($details)) {
 		$blog_id = get_current_blog_id();
-		$result = add_user_to_blog( $blog_id, $details[ 'user_id' ], $details[ 'role' ] );
+		$result = add_user_to_blog($blog_id, $details['user_id'], $details['role']);
 		/**
 		 * Fires immediately after an existing user is added to a site.
 		 *
@@ -2085,7 +2085,7 @@ 
 		 * @param int   $user_id User ID.
 		 * @param mixed $result  True on success or a WP_Error object if the user doesn't exist.
 		 */
-		do_action( 'added_existing_user', $details['user_id'], $result );
+		do_action('added_existing_user', $details['user_id'], $result);
 		return $result;
 	}
 }
@@ -2103,13 +2103,13 @@ 
  * @param mixed $password Ignored.
  * @param array $meta
  */
-function add_new_user_to_blog( $user_id, $password, $meta ) {
-	if ( !empty( $meta[ 'add_to_blog' ] ) ) {
-		$blog_id = $meta[ 'add_to_blog' ];
-		$role = $meta[ 'new_role' ];
+function add_new_user_to_blog($user_id, $password, $meta) {
+	if ( ! empty($meta['add_to_blog'])) {
+		$blog_id = $meta['add_to_blog'];
+		$role = $meta['new_role'];
 		remove_user_from_blog($user_id, get_network()->site_id); // remove user from main blog.
-		add_user_to_blog( $blog_id, $user_id, $role );
-		update_user_meta( $user_id, 'primary_blog', $blog_id );
+		add_user_to_blog($blog_id, $user_id, $role);
+		update_user_meta($user_id, 'primary_blog', $blog_id);
 	}
 }
 
@@ -2120,7 +2120,7 @@ 
  *
  * @param PHPMailer $phpmailer The PHPMailer instance, passed by reference.
  */
-function fix_phpmailer_messageid( $phpmailer ) {
+function fix_phpmailer_messageid($phpmailer) {
 	$phpmailer->Hostname = get_network()->domain;
 }
 
@@ -2133,16 +2133,16 @@ 
  * 	                           or user login name as a string.
  * @return bool
  */
-function is_user_spammy( $user = null ) {
-    if ( ! ( $user instanceof WP_User ) ) {
-		if ( $user ) {
-			$user = get_user_by( 'login', $user );
+function is_user_spammy($user = null) {
+    if ( ! ($user instanceof WP_User)) {
+		if ($user) {
+			$user = get_user_by('login', $user);
 		} else {
 			$user = wp_get_current_user();
 		}
 	}
 
-	return $user && isset( $user->spam ) && 1 == $user->spam;
+	return $user && isset($user->spam) && 1 == $user->spam;
 }
 
 /**
@@ -2155,8 +2155,8 @@ 
  * @param int $old_value
  * @param int $value     The new public value
  */
-function update_blog_public( $old_value, $value ) {
-	update_blog_status( get_current_blog_id(), 'public', (int) $value );
+function update_blog_public($old_value, $value) {
+	update_blog_status(get_current_blog_id(), 'public', (int) $value);
 }
 
 /**
@@ -2171,16 +2171,16 @@ 
  * @param int    $blog_id Optional. Defaults to current blog.
  * @return bool
  */
-function is_user_option_local( $key, $user_id = 0, $blog_id = 0 ) {
+function is_user_option_local($key, $user_id = 0, $blog_id = 0) {
 	global $wpdb;
 
 	$current_user = wp_get_current_user();
-	if ( $blog_id == 0 ) {
+	if ($blog_id == 0) {
 		$blog_id = $wpdb->blogid;
 	}
-	$local_key = $wpdb->get_blog_prefix( $blog_id ) . $key;
+	$local_key = $wpdb->get_blog_prefix($blog_id).$key;
 
-	return isset( $current_user->$local_key );
+	return isset($current_user->$local_key);
 }
 
 /**
@@ -2192,7 +2192,7 @@ 
  */
 function users_can_register_signup_filter() {
 	$registration = get_site_option('registration');
-	return ( $registration == 'all' || $registration == 'user' );
+	return ($registration == 'all' || $registration == 'user');
 }
 
 /**
@@ -2203,12 +2203,12 @@ 
  * @param string $text
  * @return string
  */
-function welcome_user_msg_filter( $text ) {
-	if ( !$text ) {
-		remove_filter( 'site_option_welcome_user_email', 'welcome_user_msg_filter' );
+function welcome_user_msg_filter($text) {
+	if ( ! $text) {
+		remove_filter('site_option_welcome_user_email', 'welcome_user_msg_filter');
 
 		/* translators: Do not translate USERNAME, PASSWORD, LOGINLINK, SITE_NAME: those are placeholders. */
-		$text = __( 'Howdy USERNAME,
+		$text = __('Howdy USERNAME,
 
 Your new account is set up.
 
@@ -2220,7 +2220,7 @@ 
 Thanks!
 
 --The Team @ SITE_NAME' );
-		update_site_option( 'welcome_user_email', $text );
+		update_site_option('welcome_user_email', $text);
 	}
 	return $text;
 }
@@ -2235,10 +2235,10 @@ 
  * @param bool $force
  * @return bool True if forced, false if not forced.
  */
-function force_ssl_content( $force = '' ) {
+function force_ssl_content($force = '') {
 	static $forced_content = false;
 
-	if ( '' != $force ) {
+	if ('' != $force) {
 		$old_forced = $forced_content;
 		$forced_content = $force;
 		return $old_forced;
@@ -2257,12 +2257,12 @@ 
  * @param string $url URL
  * @return string URL with https as the scheme
  */
-function filter_SSL( $url ) {
-	if ( ! is_string( $url ) )
-		return get_bloginfo( 'url' ); // Return home blog url with proper scheme
+function filter_SSL($url) {
+	if ( ! is_string($url))
+		return get_bloginfo('url'); // Return home blog url with proper scheme
 
-	if ( force_ssl_content() && is_ssl() )
-		$url = set_url_scheme( $url, 'https' );
+	if (force_ssl_content() && is_ssl())
+		$url = set_url_scheme($url, 'https');
 
 	return $url;
 }
@@ -2273,10 +2273,10 @@ 
  * @since 3.1.0
  */
 function wp_schedule_update_network_counts() {
-	if ( !is_main_site() )
+	if ( ! is_main_site())
 		return;
 
-	if ( ! wp_next_scheduled('update_network_counts') && ! wp_installing() )
+	if ( ! wp_next_scheduled('update_network_counts') && ! wp_installing())
 		wp_schedule_event(time(), 'twicedaily', 'update_network_counts');
 }
 
@@ -2288,9 +2288,9 @@ 
  *
  * @param int|null $network_id ID of the network. Default is the current network.
  */
-function wp_update_network_counts( $network_id = null ) {
-	wp_update_network_user_counts( $network_id );
-	wp_update_network_site_counts( $network_id );
+function wp_update_network_counts($network_id = null) {
+	wp_update_network_user_counts($network_id);
+	wp_update_network_site_counts($network_id);
 }
 
 /**
@@ -2304,8 +2304,8 @@ 
  *
  * @param int|null $network_id ID of the network. Default is the current network.
  */
-function wp_maybe_update_network_site_counts( $network_id = null ) {
-	$is_small_network = ! wp_is_large_network( 'sites', $network_id );
+function wp_maybe_update_network_site_counts($network_id = null) {
+	$is_small_network = ! wp_is_large_network('sites', $network_id);
 
 	/**
 	 * Filters whether to update network site or user counts when a new site is created.
@@ -2317,10 +2317,10 @@ 
 	 * @param bool   $small_network Whether the network is considered small.
 	 * @param string $context       Context. Either 'users' or 'sites'.
 	 */
-	if ( ! apply_filters( 'enable_live_network_counts', $is_small_network, 'sites' ) )
+	if ( ! apply_filters('enable_live_network_counts', $is_small_network, 'sites'))
 		return;
 
-	wp_update_network_site_counts( $network_id );
+	wp_update_network_site_counts($network_id);
 }
 
 /**
@@ -2334,14 +2334,14 @@ 
  *
  * @param int|null $network_id ID of the network. Default is the current network.
  */
-function wp_maybe_update_network_user_counts( $network_id = null ) {
-	$is_small_network = ! wp_is_large_network( 'users', $network_id );
+function wp_maybe_update_network_user_counts($network_id = null) {
+	$is_small_network = ! wp_is_large_network('users', $network_id);
 
 	/** This filter is documented in wp-includes/ms-functions.php */
-	if ( ! apply_filters( 'enable_live_network_counts', $is_small_network, 'users' ) )
+	if ( ! apply_filters('enable_live_network_counts', $is_small_network, 'users'))
 		return;
 
-	wp_update_network_user_counts( $network_id );
+	wp_update_network_user_counts($network_id);
 }
 
 /**
@@ -2352,21 +2352,21 @@ 
  *
  * @param int|null $network_id ID of the network. Default is the current network.
  */
-function wp_update_network_site_counts( $network_id = null ) {
+function wp_update_network_site_counts($network_id = null) {
 	$network_id = (int) $network_id;
-	if ( ! $network_id ) {
+	if ( ! $network_id) {
 		$network_id = get_current_network_id();
 	}
 
-	$count = get_sites( array(
+	$count = get_sites(array(
 		'network_id' => $network_id,
 		'spam'       => 0,
 		'deleted'    => 0,
 		'archived'   => 0,
 		'count'      => true,
-	) );
+	));
 
-	update_network_option( $network_id, 'blog_count', $count );
+	update_network_option($network_id, 'blog_count', $count);
 }
 
 /**
@@ -2379,11 +2379,11 @@ 
  *
  * @param int|null $network_id ID of the network. Default is the current network.
  */
-function wp_update_network_user_counts( $network_id = null ) {
+function wp_update_network_user_counts($network_id = null) {
 	global $wpdb;
 
-	$count = $wpdb->get_var( "SELECT COUNT(ID) as c FROM $wpdb->users WHERE spam = '0' AND deleted = '0'" );
-	update_network_option( $network_id, 'user_count', $count );
+	$count = $wpdb->get_var("SELECT COUNT(ID) as c FROM $wpdb->users WHERE spam = '0' AND deleted = '0'");
+	update_network_option($network_id, 'user_count', $count);
 }
 
 /**
@@ -2401,10 +2401,10 @@ 
 	 *
 	 * @param int|bool $space_used The amount of used space, in megabytes. Default false.
 	 */
-	$space_used = apply_filters( 'pre_get_space_used', false );
-	if ( false === $space_used ) {
+	$space_used = apply_filters('pre_get_space_used', false);
+	if (false === $space_used) {
 		$upload_dir = wp_upload_dir();
-		$space_used = get_dirsize( $upload_dir['basedir'] ) / MB_IN_BYTES;
+		$space_used = get_dirsize($upload_dir['basedir']) / MB_IN_BYTES;
 	}
 
 	return $space_used;
@@ -2418,12 +2418,12 @@ 
  * @return int Quota in megabytes
  */
 function get_space_allowed() {
-	$space_allowed = get_option( 'blog_upload_space' );
+	$space_allowed = get_option('blog_upload_space');
 
-	if ( ! is_numeric( $space_allowed ) )
-		$space_allowed = get_site_option( 'blog_upload_space' );
+	if ( ! is_numeric($space_allowed))
+		$space_allowed = get_site_option('blog_upload_space');
 
-	if ( ! is_numeric( $space_allowed ) )
+	if ( ! is_numeric($space_allowed))
 		$space_allowed = 100;
 
 	/**
@@ -2433,7 +2433,7 @@ 
 	 *
 	 * @param int $space_allowed Upload quota in megabytes for the current blog.
 	 */
-	return apply_filters( 'get_space_allowed', $space_allowed );
+	return apply_filters('get_space_allowed', $space_allowed);
 }
 
 /**
@@ -2445,16 +2445,16 @@ 
  */
 function get_upload_space_available() {
 	$allowed = get_space_allowed();
-	if ( $allowed < 0 ) {
+	if ($allowed < 0) {
 		$allowed = 0;
 	}
 	$space_allowed = $allowed * MB_IN_BYTES;
-	if ( get_site_option( 'upload_space_check_disabled' ) )
+	if (get_site_option('upload_space_check_disabled'))
 		return $space_allowed;
 
 	$space_used = get_space_used() * MB_IN_BYTES;
 
-	if ( ( $space_allowed - $space_used ) <= 0 )
+	if (($space_allowed - $space_used) <= 0)
 		return 0;
 
 	return $space_allowed - $space_used;
@@ -2467,7 +2467,7 @@ 
  * @return bool True if space is available, false otherwise.
  */
 function is_upload_space_available() {
-	if ( get_site_option( 'upload_space_check_disabled' ) )
+	if (get_site_option('upload_space_check_disabled'))
 		return true;
 
 	return (bool) get_upload_space_available();
@@ -2481,12 +2481,12 @@ 
  * @param  int $size Upload size limit in bytes.
  * @return int       Upload size limit in bytes.
  */
-function upload_size_limit_filter( $size ) {
-	$fileupload_maxk = KB_IN_BYTES * get_site_option( 'fileupload_maxk', 1500 );
-	if ( get_site_option( 'upload_space_check_disabled' ) )
-		return min( $size, $fileupload_maxk );
+function upload_size_limit_filter($size) {
+	$fileupload_maxk = KB_IN_BYTES * get_site_option('fileupload_maxk', 1500);
+	if (get_site_option('upload_space_check_disabled'))
+		return min($size, $fileupload_maxk);
 
-	return min( $size, $fileupload_maxk, get_upload_space_available() );
+	return min($size, $fileupload_maxk, get_upload_space_available());
 }
 
 /**
@@ -2502,14 +2502,14 @@ 
  * @param int|null $network_id ID of the network. Default is the current network.
  * @return bool True if the network meets the criteria for large. False otherwise.
  */
-function wp_is_large_network( $using = 'sites', $network_id = null ) {
+function wp_is_large_network($using = 'sites', $network_id = null) {
 	$network_id = (int) $network_id;
-	if ( ! $network_id ) {
+	if ( ! $network_id) {
 		$network_id = get_current_network_id();
 	}
 
-	if ( 'users' == $using ) {
-		$count = get_user_count( $network_id );
+	if ('users' == $using) {
+		$count = get_user_count($network_id);
 		/**
 		 * Filters whether the network is considered large.
 		 *
@@ -2521,12 +2521,12 @@ 
 		 * @param int    $count            The count of items for the component.
 		 * @param int    $network_id       The ID of the network being checked.
 		 */
-		return apply_filters( 'wp_is_large_network', $count > 10000, 'users', $count, $network_id );
+		return apply_filters('wp_is_large_network', $count > 10000, 'users', $count, $network_id);
 	}
 
-	$count = get_blog_count( $network_id );
+	$count = get_blog_count($network_id);
 	/** This filter is documented in wp-includes/ms-functions.php */
-	return apply_filters( 'wp_is_large_network', $count > 10000, 'sites', $count, $network_id );
+	return apply_filters('wp_is_large_network', $count > 10000, 'sites', $count, $network_id);
 }
 
 /**
@@ -2551,5 +2551,5 @@ 
 	 *
 	 * @param array $subdirectory_reserved_names Array of reserved names.
 	 */
-	return apply_filters( 'subdirectory_reserved_names', $names );
+	return apply_filters('subdirectory_reserved_names', $names);
 }

Braces +268 added lines, -183 removed lines

@@ -42,11 +42,13 @@ 
 function get_active_blog_for_user( $user_id ) {
 	global $wpdb;
 	$blogs = get_blogs_of_user( $user_id );
-	if ( empty( $blogs ) )
-		return;
+	if ( empty( $blogs ) ) {
+			return;
+	}
 
-	if ( !is_multisite() )
-		return $blogs[$wpdb->blogid];
+	if ( !is_multisite() ) {
+			return $blogs[$wpdb->blogid];
+	}
 
 	$primary_blog = get_user_meta( $user_id, 'primary_blog', true );
 	$first_blog = current($blogs);
@@ -69,15 +71,18 @@ 
 		$ret = false;
 		if ( is_array( $blogs ) && count( $blogs ) > 0 ) {
 			foreach ( (array) $blogs as $blog_id => $blog ) {
-				if ( $blog->site_id != $wpdb->siteid )
-					continue;
+				if ( $blog->site_id != $wpdb->siteid ) {
+									continue;
+				}
 				$details = get_site( $blog_id );
 				if ( is_object( $details ) && $details->archived == 0 && $details->spam == 0 && $details->deleted == 0 ) {
 					$ret = $blog;
-					if ( get_user_meta( $user_id , 'primary_blog', true ) != $blog_id )
-						update_user_meta( $user_id, 'primary_blog', $blog_id );
-					if ( !get_user_meta($user_id , 'source_domain', true) )
-						update_user_meta( $user_id, 'source_domain', $blog->domain );
+					if ( get_user_meta( $user_id , 'primary_blog', true ) != $blog_id ) {
+											update_user_meta( $user_id, 'primary_blog', $blog_id );
+					}
+					if ( !get_user_meta($user_id , 'source_domain', true) ) {
+											update_user_meta( $user_id, 'source_domain', $blog->domain );
+					}
 					break;
 				}
 			}
@@ -224,8 +229,9 @@ 
 		$new_domain = '';
 		$blogs = get_blogs_of_user($user_id);
 		foreach ( (array) $blogs as $blog ) {
-			if ( $blog->userblog_id == $blog_id )
-				continue;
+			if ( $blog->userblog_id == $blog_id ) {
+							continue;
+			}
 			$new_id = $blog->userblog_id;
 			$new_domain = $blog->domain;
 			break;
@@ -309,10 +315,12 @@ 
 	$path = strtolower( $path );
 	$id = wp_cache_get( md5( $domain . $path ), 'blog-id-cache' );
 
-	if ( $id == -1 ) // blog does not exist
+	if ( $id == -1 ) {
+		// blog does not exist
 		return 0;
-	elseif ( $id )
-		return (int) $id;
+	} elseif ( $id ) {
+			return (int) $id;
+	}
 
 	$args = array(
 		'domain' => $domain,
@@ -349,8 +357,9 @@ 
  */
 function is_email_address_unsafe( $user_email ) {
 	$banned_names = get_site_option( 'banned_email_domains' );
-	if ( $banned_names && ! is_array( $banned_names ) )
-		$banned_names = explode( "\n", $banned_names );
+	if ( $banned_names && ! is_array( $banned_names ) ) {
+			$banned_names = explode( "\n", $banned_names );
+	}
 
 	$is_email_address_unsafe = false;
 
@@ -361,8 +370,9 @@ 
 		list( $email_local_part, $email_domain ) = explode( '@', $normalized_email );
 
 		foreach ( $banned_names as $banned_domain ) {
-			if ( ! $banned_domain )
-				continue;
+			if ( ! $banned_domain ) {
+							continue;
+			}
 
 			if ( $email_domain == $banned_domain ) {
 				$is_email_address_unsafe = true;
@@ -423,8 +433,9 @@ 
 
 	$user_email = sanitize_email( $user_email );
 
-	if ( empty( $user_name ) )
-	   	$errors->add('user_name', __( 'Please enter a username.' ) );
+	if ( empty( $user_name ) ) {
+		   	$errors->add('user_name', __( 'Please enter a username.' ) );
+	}
 
 	$illegal_names = get_site_option( 'illegal_names' );
 	if ( ! is_array( $illegal_names ) ) {
@@ -448,16 +459,18 @@ 
 		$errors->add( 'user_email', __( 'You cannot use that email address to signup. We are having problems with them blocking some of our email. Please use another email provider.' ) );
 	}
 
-	if ( strlen( $user_name ) < 4 )
-		$errors->add('user_name',  __( 'Username must be at least 4 characters.' ) );
+	if ( strlen( $user_name ) < 4 ) {
+			$errors->add('user_name',  __( 'Username must be at least 4 characters.' ) );
+	}
 
 	if ( strlen( $user_name ) > 60 ) {
 		$errors->add( 'user_name', __( 'Username may not be longer than 60 characters.' ) );
 	}
 
 	// all numeric?
-	if ( preg_match( '/^[0-9]*$/', $user_name ) )
-		$errors->add('user_name', __('Sorry, usernames must have letters too!'));
+	if ( preg_match( '/^[0-9]*$/', $user_name ) ) {
+			$errors->add('user_name', __('Sorry, usernames must have letters too!'));
+	}
 
 	$limited_email_domains = get_site_option( 'limited_email_domains' );
 	if ( is_array( $limited_email_domains ) && ! empty( $limited_email_domains ) ) {
@@ -468,12 +481,14 @@ 
 	}
 
 	// Check if the username has been used already.
-	if ( username_exists($user_name) )
-		$errors->add( 'user_name', __( 'Sorry, that username already exists!' ) );
+	if ( username_exists($user_name) ) {
+			$errors->add( 'user_name', __( 'Sorry, that username already exists!' ) );
+	}
 
 	// Check if the email address has been used already.
-	if ( email_exists($user_email) )
-		$errors->add( 'user_email', __( 'Sorry, that email address is already used!' ) );
+	if ( email_exists($user_email) ) {
+			$errors->add( 'user_email', __( 'Sorry, that email address is already used!' ) );
+	}
 
 	// Has someone already signed up for this username?
 	$signup = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->signups WHERE user_login = %s", $user_name) );
@@ -482,20 +497,22 @@ 
 		$now = current_time( 'timestamp', true );
 		$diff = $now - $registered_at;
 		// If registered more than two days ago, cancel registration and let this signup go through.
-		if ( $diff > 2 * DAY_IN_SECONDS )
-			$wpdb->delete( $wpdb->signups, array( 'user_login' => $user_name ) );
-		else
-			$errors->add('user_name', __('That username is currently reserved but may be available in a couple of days.'));
+		if ( $diff > 2 * DAY_IN_SECONDS ) {
+					$wpdb->delete( $wpdb->signups, array( 'user_login' => $user_name ) );
+		} else {
+					$errors->add('user_name', __('That username is currently reserved but may be available in a couple of days.'));
+		}
 	}
 
 	$signup = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->signups WHERE user_email = %s", $user_email) );
 	if ( $signup != null ) {
 		$diff = current_time( 'timestamp', true ) - mysql2date('U', $signup->registered);
 		// If registered more than two days ago, cancel registration and let this signup go through.
-		if ( $diff > 2 * DAY_IN_SECONDS )
-			$wpdb->delete( $wpdb->signups, array( 'user_email' => $user_email ) );
-		else
-			$errors->add('user_email', __('That email address has already been used. Please check your inbox for an activation email. It will become available in a couple of days if you do nothing.'));
+		if ( $diff > 2 * DAY_IN_SECONDS ) {
+					$wpdb->delete( $wpdb->signups, array( 'user_email' => $user_email ) );
+		} else {
+					$errors->add('user_email', __('That email address has already been used. Please check your inbox for an activation email. It will become available in a couple of days if you do nothing.'));
+		}
 	}
 
 	$result = array('user_name' => $user_name, 'orig_username' => $orig_username, 'user_email' => $user_email, 'errors' => $errors);
@@ -567,15 +584,17 @@ 
 		$illegal_names = array_merge( $illegal_names, get_subdirectory_reserved_names() );
 	}
 
-	if ( empty( $blogname ) )
-		$errors->add('blogname', __( 'Please enter a site name.' ) );
+	if ( empty( $blogname ) ) {
+			$errors->add('blogname', __( 'Please enter a site name.' ) );
+	}
 
 	if ( preg_match( '/[^a-z0-9]+/', $blogname ) ) {
 		$errors->add( 'blogname', __( 'Site names can only contain lowercase letters (a-z) and numbers.' ) );
 	}
 
-	if ( in_array( $blogname, $illegal_names ) )
-		$errors->add('blogname',  __( 'That name is not allowed.' ) );
+	if ( in_array( $blogname, $illegal_names ) ) {
+			$errors->add('blogname',  __( 'That name is not allowed.' ) );
+	}
 
 	/**
 	 * Filters the minimum site name length required when validating a site signup.
@@ -592,12 +611,14 @@ 
 	}
 
 	// do not allow users to create a blog that conflicts with a page on the main blog.
-	if ( !is_subdomain_install() && $wpdb->get_var( $wpdb->prepare( "SELECT post_name FROM " . $wpdb->get_blog_prefix( $current_network->site_id ) . "posts WHERE post_type = 'page' AND post_name = %s", $blogname ) ) )
-		$errors->add( 'blogname', __( 'Sorry, you may not use that site name.' ) );
+	if ( !is_subdomain_install() && $wpdb->get_var( $wpdb->prepare( "SELECT post_name FROM " . $wpdb->get_blog_prefix( $current_network->site_id ) . "posts WHERE post_type = 'page' AND post_name = %s", $blogname ) ) ) {
+			$errors->add( 'blogname', __( 'Sorry, you may not use that site name.' ) );
+	}
 
 	// all numeric?
-	if ( preg_match( '/^[0-9]*$/', $blogname ) )
-		$errors->add('blogname', __('Sorry, site names must have letters too!'));
+	if ( preg_match( '/^[0-9]*$/', $blogname ) ) {
+			$errors->add('blogname', __('Sorry, site names must have letters too!'));
+	}
 
 	/**
 	 * Filters the new site name during registration.
@@ -613,8 +634,9 @@ 
 
 	$blog_title = wp_unslash(  $blog_title );
 
-	if ( empty( $blog_title ) )
-		$errors->add('blog_title', __( 'Please enter a site title.' ) );
+	if ( empty( $blog_title ) ) {
+			$errors->add('blog_title', __( 'Please enter a site title.' ) );
+	}
 
 	// Check if the domain/path has been used already.
 	if ( is_subdomain_install() ) {
@@ -624,12 +646,14 @@ 
 		$mydomain = "$domain";
 		$path = $base.$blogname.'/';
 	}
-	if ( domain_exists($mydomain, $path, $current_network->id) )
-		$errors->add( 'blogname', __( 'Sorry, that site already exists!' ) );
+	if ( domain_exists($mydomain, $path, $current_network->id) ) {
+			$errors->add( 'blogname', __( 'Sorry, that site already exists!' ) );
+	}
 
 	if ( username_exists( $blogname ) ) {
-		if ( ! is_object( $user ) || ( is_object($user) && ( $user->user_login != $blogname ) ) )
-			$errors->add( 'blogname', __( 'Sorry, that site is reserved!' ) );
+		if ( ! is_object( $user ) || ( is_object($user) && ( $user->user_login != $blogname ) ) ) {
+					$errors->add( 'blogname', __( 'Sorry, that site is reserved!' ) );
+		}
 	}
 
 	// Has someone already signed up for this domain?
@@ -637,10 +661,11 @@ 
 	if ( ! empty($signup) ) {
 		$diff = current_time( 'timestamp', true ) - mysql2date('U', $signup->registered);
 		// If registered more than two days ago, cancel registration and let this signup go through.
-		if ( $diff > 2 * DAY_IN_SECONDS )
-			$wpdb->delete( $wpdb->signups, array( 'domain' => $mydomain , 'path' => $path ) );
-		else
-			$errors->add('blogname', __('That site is currently reserved but may be available in a couple days.'));
+		if ( $diff > 2 * DAY_IN_SECONDS ) {
+					$wpdb->delete( $wpdb->signups, array( 'domain' => $mydomain , 'path' => $path ) );
+		} else {
+					$errors->add('blogname', __('That site is currently reserved but may be available in a couple days.'));
+		}
 	}
 
 	$result = array('domain' => $mydomain, 'path' => $path, 'blogname' => $blogname, 'blog_title' => $blog_title, 'user' => $user, 'errors' => $errors);
@@ -830,15 +855,18 @@ 
 	}
 
 	// Send email with activation link.
-	if ( !is_subdomain_install() || get_current_network_id() != 1 )
-		$activate_url = network_site_url("wp-activate.php?key=$key");
-	else
-		$activate_url = "http://{$domain}{$path}wp-activate.php?key=$key"; // @todo use *_url() API
+	if ( !is_subdomain_install() || get_current_network_id() != 1 ) {
+			$activate_url = network_site_url("wp-activate.php?key=$key");
+	} else {
+			$activate_url = "http://{$domain}{$path}wp-activate.php?key=$key";
+	}
+	// @todo use *_url() API
 
 	$activate_url = esc_url($activate_url);
 	$admin_email = get_site_option( 'admin_email' );
-	if ( $admin_email == '' )
-		$admin_email = 'support@' . $_SERVER['SERVER_NAME'];
+	if ( $admin_email == '' ) {
+			$admin_email = 'support@' . $_SERVER['SERVER_NAME'];
+	}
 	$from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
 	$message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
 
@@ -935,16 +963,18 @@ 
 	 * @param string $key        Activation key created in wpmu_signup_user().
 	 * @param array  $meta       Signup meta data. Default empty array.
 	 */
-	if ( ! apply_filters( 'wpmu_signup_user_notification', $user_login, $user_email, $key, $meta ) )
-		return false;
+	if ( ! apply_filters( 'wpmu_signup_user_notification', $user_login, $user_email, $key, $meta ) ) {
+			return false;
+	}
 
 	$user = get_user_by( 'login', $user_login );
 	$switched_locale = switch_to_locale( get_user_locale( $user ) );
 
 	// Send email with activation link.
 	$admin_email = get_site_option( 'admin_email' );
-	if ( $admin_email == '' )
-		$admin_email = 'support@' . $_SERVER['SERVER_NAME'];
+	if ( $admin_email == '' ) {
+			$admin_email = 'support@' . $_SERVER['SERVER_NAME'];
+	}
 	$from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
 	$message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
 	$message = sprintf(
@@ -1017,14 +1047,16 @@ 
 
 	$signup = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->signups WHERE activation_key = %s", $key) );
 
-	if ( empty( $signup ) )
-		return new WP_Error( 'invalid_key', __( 'Invalid activation key.' ) );
+	if ( empty( $signup ) ) {
+			return new WP_Error( 'invalid_key', __( 'Invalid activation key.' ) );
+	}
 
 	if ( $signup->active ) {
-		if ( empty( $signup->domain ) )
-			return new WP_Error( 'already_active', __( 'The user is already active.' ), $signup );
-		else
-			return new WP_Error( 'already_active', __( 'The site is already active.' ), $signup );
+		if ( empty( $signup->domain ) ) {
+					return new WP_Error( 'already_active', __( 'The user is already active.' ), $signup );
+		} else {
+					return new WP_Error( 'already_active', __( 'The site is already active.' ), $signup );
+		}
 	}
 
 	$meta = maybe_unserialize($signup->meta);
@@ -1032,21 +1064,24 @@ 
 
 	$user_id = username_exists($signup->user_login);
 
-	if ( ! $user_id )
-		$user_id = wpmu_create_user($signup->user_login, $password, $signup->user_email);
-	else
-		$user_already_exists = true;
+	if ( ! $user_id ) {
+			$user_id = wpmu_create_user($signup->user_login, $password, $signup->user_email);
+	} else {
+			$user_already_exists = true;
+	}
 
-	if ( ! $user_id )
-		return new WP_Error('create_user', __('Could not create user'), $signup);
+	if ( ! $user_id ) {
+			return new WP_Error('create_user', __('Could not create user'), $signup);
+	}
 
 	$now = current_time('mysql', true);
 
 	if ( empty($signup->domain) ) {
 		$wpdb->update( $wpdb->signups, array('active' => 1, 'activated' => $now), array('activation_key' => $key) );
 
-		if ( isset( $user_already_exists ) )
-			return new WP_Error( 'user_already_exists', __( 'That username is already activated.' ), $signup);
+		if ( isset( $user_already_exists ) ) {
+					return new WP_Error( 'user_already_exists', __( 'That username is already activated.' ), $signup);
+		}
 
 		/**
 		 * Fires immediately after a new user is activated.
@@ -1110,8 +1145,9 @@ 
 	$user_name = preg_replace( '/\s+/', '', sanitize_user( $user_name, true ) );
 
 	$user_id = wp_create_user( $user_name, $password, $email );
-	if ( is_wp_error( $user_id ) )
-		return false;
+	if ( is_wp_error( $user_id ) ) {
+			return false;
+	}
 
 	// Newly created users have no roles or caps until they are added to a blog.
 	delete_user_option( $user_id, 'capabilities' );
@@ -1160,25 +1196,29 @@ 
 
 	$domain = preg_replace( '/\s+/', '', sanitize_user( $domain, true ) );
 
-	if ( is_subdomain_install() )
-		$domain = str_replace( '@', '', $domain );
+	if ( is_subdomain_install() ) {
+			$domain = str_replace( '@', '', $domain );
+	}
 
 	$title = strip_tags( $title );
 	$user_id = (int) $user_id;
 
-	if ( empty($path) )
-		$path = '/';
+	if ( empty($path) ) {
+			$path = '/';
+	}
 
 	// Check if the domain has been used already. We should return an error message.
-	if ( domain_exists($domain, $path, $site_id) )
-		return new WP_Error( 'blog_taken', __( 'Sorry, that site already exists!' ) );
+	if ( domain_exists($domain, $path, $site_id) ) {
+			return new WP_Error( 'blog_taken', __( 'Sorry, that site already exists!' ) );
+	}
 
 	if ( ! wp_installing() ) {
 		wp_installing( true );
 	}
 
-	if ( ! $blog_id = insert_blog($domain, $path, $site_id) )
-		return new WP_Error('insert_blog', __('Could not create site.'));
+	if ( ! $blog_id = insert_blog($domain, $path, $site_id) ) {
+			return new WP_Error('insert_blog', __('Could not create site.'));
+	}
 
 	switch_to_blog($blog_id);
 	install_blog($blog_id, $title);
@@ -1187,16 +1227,18 @@ 
 	add_user_to_blog($blog_id, $user_id, 'administrator');
 
 	foreach ( $meta as $key => $value ) {
-		if ( in_array( $key, array( 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id' ) ) )
-			update_blog_status( $blog_id, $key, $value );
-		else
-			update_option( $key, $value );
+		if ( in_array( $key, array( 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id' ) ) ) {
+					update_blog_status( $blog_id, $key, $value );
+		} else {
+					update_option( $key, $value );
+		}
 	}
 
 	update_option( 'blog_public', (int) $meta['public'] );
 
-	if ( ! is_super_admin( $user_id ) && ! get_user_meta( $user_id, 'primary_blog', true ) )
-		update_user_meta( $user_id, 'primary_blog', $blog_id );
+	if ( ! is_super_admin( $user_id ) && ! get_user_meta( $user_id, 'primary_blog', true ) ) {
+			update_user_meta( $user_id, 'primary_blog', $blog_id );
+	}
 
 	restore_current_blog();
 	/**
@@ -1231,12 +1273,14 @@ 
  * @return bool
  */
 function newblog_notify_siteadmin( $blog_id, $deprecated = '' ) {
-	if ( get_site_option( 'registrationnotification' ) != 'yes' )
-		return false;
+	if ( get_site_option( 'registrationnotification' ) != 'yes' ) {
+			return false;
+	}
 
 	$email = get_site_option( 'admin_email' );
-	if ( is_email($email) == false )
-		return false;
+	if ( is_email($email) == false ) {
+			return false;
+	}
 
 	$options_site_url = esc_url(network_admin_url('settings.php'));
 
@@ -1277,13 +1321,15 @@ 
  * @return bool
  */
 function newuser_notify_siteadmin( $user_id ) {
-	if ( get_site_option( 'registrationnotification' ) != 'yes' )
-		return false;
+	if ( get_site_option( 'registrationnotification' ) != 'yes' ) {
+			return false;
+	}
 
 	$email = get_site_option( 'admin_email' );
 
-	if ( is_email($email) == false )
-		return false;
+	if ( is_email($email) == false ) {
+			return false;
+	}
 
 	$user = get_userdata( $user_id );
 
@@ -1369,8 +1415,9 @@ 
 	$site_id = (int) $site_id;
 
 	$result = $wpdb->insert( $wpdb->blogs, array('site_id' => $site_id, 'domain' => $domain, 'path' => $path, 'registered' => current_time('mysql')) );
-	if ( ! $result )
-		return false;
+	if ( ! $result ) {
+			return false;
+	}
 
 	$blog_id = $wpdb->insert_id;
 	refresh_blog_details( $blog_id );
@@ -1404,8 +1451,9 @@ 
 	require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
 
 	$suppress = $wpdb->suppress_errors();
-	if ( $wpdb->get_results( "DESCRIBE {$wpdb->posts}" ) )
-		die( '<h1>' . __( 'Already Installed' ) . '</h1><p>' . __( 'You appear to have already installed WordPress. To reinstall please clear your old database tables first.' ) . '</p></body></html>' );
+	if ( $wpdb->get_results( "DESCRIBE {$wpdb->posts}" ) ) {
+			die( '<h1>' . __( 'Already Installed' ) . '</h1><p>' . __( 'You appear to have already installed WordPress. To reinstall please clear your old database tables first.' ) . '</p></body></html>' );
+	}
 	$wpdb->suppress_errors( $suppress );
 
 	$url = get_blogaddress_by_id( $blog_id );
@@ -1434,10 +1482,11 @@ 
 	update_option( 'siteurl', $siteurl );
 	update_option( 'home', $home );
 
-	if ( get_site_option( 'ms_files_rewriting' ) )
-		update_option( 'upload_path', UPLOADBLOGSDIR . "/$blog_id/files" );
-	else
-		update_option( 'upload_path', get_blog_option( get_network()->site_id, 'upload_path' ) );
+	if ( get_site_option( 'ms_files_rewriting' ) ) {
+			update_option( 'upload_path', UPLOADBLOGSDIR . "/$blog_id/files" );
+	} else {
+			update_option( 'upload_path', get_blog_option( get_network()->site_id, 'upload_path' ) );
+	}
 
 	update_option( 'blogname', wp_unslash( $blog_title ) );
 	update_option( 'admin_email', '' );
@@ -1507,8 +1556,9 @@ 
 	 * @param string   $title    Site title.
 	 * @param array    $meta     Signup meta data. By default, contains the requested privacy setting and lang_id.
 	 */
-	if ( ! apply_filters( 'wpmu_welcome_notification', $blog_id, $user_id, $password, $title, $meta ) )
-		return false;
+	if ( ! apply_filters( 'wpmu_welcome_notification', $blog_id, $user_id, $password, $title, $meta ) ) {
+			return false;
+	}
 
 	$user = get_userdata( $user_id );
 
@@ -1558,15 +1608,17 @@ 
 	$welcome_email = apply_filters( 'update_welcome_email', $welcome_email, $blog_id, $user_id, $password, $title, $meta );
 	$admin_email = get_site_option( 'admin_email' );
 
-	if ( $admin_email == '' )
-		$admin_email = 'support@' . $_SERVER['SERVER_NAME'];
+	if ( $admin_email == '' ) {
+			$admin_email = 'support@' . $_SERVER['SERVER_NAME'];
+	}
 
 	$from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
 	$message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
 	$message = $welcome_email;
 
-	if ( empty( $current_network->site_name ) )
-		$current_network->site_name = 'WordPress';
+	if ( empty( $current_network->site_name ) ) {
+			$current_network->site_name = 'WordPress';
+	}
 
 	/* translators: New site notification email subject. 1: Network name, 2: New site name */
 	$subject = __( 'New %1$s Site: %2$s' );
@@ -1617,8 +1669,9 @@ 
 	 * @param string $password User password.
 	 * @param array  $meta     Signup meta data. Default empty array.
 	 */
-	if ( ! apply_filters( 'wpmu_welcome_user_notification', $user_id, $password, $meta ) )
-		return false;
+	if ( ! apply_filters( 'wpmu_welcome_user_notification', $user_id, $password, $meta ) ) {
+			return false;
+	}
 
 	$welcome_email = get_site_option( 'welcome_user_email' );
 
@@ -1646,15 +1699,17 @@ 
 
 	$admin_email = get_site_option( 'admin_email' );
 
-	if ( $admin_email == '' )
-		$admin_email = 'support@' . $_SERVER['SERVER_NAME'];
+	if ( $admin_email == '' ) {
+			$admin_email = 'support@' . $_SERVER['SERVER_NAME'];
+	}
 
 	$from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
 	$message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
 	$message = $welcome_email;
 
-	if ( empty( $current_network->site_name ) )
-		$current_network->site_name = 'WordPress';
+	if ( empty( $current_network->site_name ) ) {
+			$current_network->site_name = 'WordPress';
+	}
 
 	/* translators: New user notification email subject. 1: Network name, 2: New user login */
 	$subject = __( 'New %1$s User: %2$s' );
@@ -1756,11 +1811,13 @@ 
  */
 function get_dirsize( $directory ) {
 	$dirsize = get_transient( 'dirsize_cache' );
-	if ( is_array( $dirsize ) && isset( $dirsize[ $directory ][ 'size' ] ) )
-		return $dirsize[ $directory ][ 'size' ];
+	if ( is_array( $dirsize ) && isset( $dirsize[ $directory ][ 'size' ] ) ) {
+			return $dirsize[ $directory ][ 'size' ];
+	}
 
-	if ( ! is_array( $dirsize ) )
-		$dirsize = array();
+	if ( ! is_array( $dirsize ) ) {
+			$dirsize = array();
+	}
 
 	// Exclude individual site directories from the total when checking the main site,
 	// as they are subdirectories and should not be counted.
@@ -1804,8 +1861,9 @@ 
 					$size += filesize($path);
 				} elseif (is_dir($path)) {
 					$handlesize = recurse_dirsize( $path, $exclude );
-					if ($handlesize > 0)
-						$size += $handlesize;
+					if ($handlesize > 0) {
+											$size += $handlesize;
+					}
 				}
 			}
 		}
@@ -1833,8 +1891,9 @@ 
 	$site_mimes = array();
 	foreach ( $site_exts as $ext ) {
 		foreach ( $mimes as $ext_pattern => $mime ) {
-			if ( $ext != '' && strpos( $ext_pattern, $ext ) !== false )
-				$site_mimes[$ext_pattern] = $mime;
+			if ( $ext != '' && strpos( $ext_pattern, $ext ) !== false ) {
+							$site_mimes[$ext_pattern] = $mime;
+			}
 		}
 	}
 	return $site_mimes;
@@ -1872,9 +1931,10 @@ 
 function wpmu_log_new_registrations( $blog_id, $user_id ) {
 	global $wpdb;
 	$user = get_userdata( (int) $user_id );
-	if ( $user )
-		$wpdb->insert( $wpdb->registration_log, array('email' => $user->user_email, 'IP' => preg_replace( '/[^0-9., ]/', '', wp_unslash( $_SERVER['REMOTE_ADDR'] ) ), 'blog_id' => $blog_id, 'date_registered' => current_time('mysql')) );
-}
+	if ( $user ) {
+			$wpdb->insert( $wpdb->registration_log, array('email' => $user->user_email, 'IP' => preg_replace( '/[^0-9., ]/', '', wp_unslash( $_SERVER['REMOTE_ADDR'] ) ), 'blog_id' => $blog_id, 'date_registered' => current_time('mysql')) );
+	}
+	}
 
 /**
  * Maintains a canonical list of terms by syncing terms created for each blog with the global terms table.
@@ -1894,8 +1954,9 @@ 
 	global $wpdb;
 	static $global_terms_recurse = null;
 
-	if ( !global_terms_enabled() )
-		return $term_id;
+	if ( !global_terms_enabled() ) {
+			return $term_id;
+	}
 
 	// prevent a race condition
 	$recurse_start = false;
@@ -1915,8 +1976,9 @@ 
 		if ( null == $used_global_id ) {
 			$wpdb->insert( $wpdb->sitecategories, array( 'cat_ID' => $term_id, 'cat_name' => $c->name, 'category_nicename' => $c->slug ) );
 			$global_id = $wpdb->insert_id;
-			if ( empty( $global_id ) )
-				return $term_id;
+			if ( empty( $global_id ) ) {
+							return $term_id;
+			}
 		} else {
 			$max_global_id = $wpdb->get_var( "SELECT MAX(cat_ID) FROM $wpdb->sitecategories" );
 			$max_local_id = $wpdb->get_var( "SELECT MAX(term_id) FROM $wpdb->terms" );
@@ -1935,8 +1997,9 @@ 
 	}
 
 	if ( $global_id != $term_id ) {
-		if ( get_option( 'default_category' ) == $term_id )
-			update_option( 'default_category', $global_id );
+		if ( get_option( 'default_category' ) == $term_id ) {
+					update_option( 'default_category', $global_id );
+		}
 
 		$wpdb->update( $wpdb->terms, array('term_id' => $global_id), array('term_id' => $term_id) );
 		$wpdb->update( $wpdb->term_taxonomy, array('term_id' => $global_id), array('term_id' => $term_id) );
@@ -1944,8 +2007,9 @@ 
 
 		clean_term_cache($term_id);
 	}
-	if ( $recurse_start )
-		$global_terms_recurse = null;
+	if ( $recurse_start ) {
+			$global_terms_recurse = null;
+	}
 
 	return $global_id;
 }
@@ -1974,8 +2038,9 @@ 
  * @return string|array If the upload is under the size limit, $upload is returned. Otherwise returns an error message.
  */
 function upload_is_file_too_big( $upload ) {
-	if ( ! is_array( $upload ) || defined( 'WP_IMPORTING' ) || get_site_option( 'upload_space_check_disabled' ) )
-		return $upload;
+	if ( ! is_array( $upload ) || defined( 'WP_IMPORTING' ) || get_site_option( 'upload_space_check_disabled' ) ) {
+			return $upload;
+	}
 
 	if ( strlen( $upload['bits'] )  > ( KB_IN_BYTES * get_site_option( 'fileupload_maxk', 1500 ) ) ) {
 		return sprintf( __( 'This file is too big. Files must be less than %d KB in size.' ) . '<br />', get_site_option( 'fileupload_maxk', 1500 ) );
@@ -2004,11 +2069,13 @@ 
  * @return array
  */
 function signup_nonce_check( $result ) {
-	if ( !strpos( $_SERVER[ 'PHP_SELF' ], 'wp-signup.php' ) )
-		return $result;
+	if ( !strpos( $_SERVER[ 'PHP_SELF' ], 'wp-signup.php' ) ) {
+			return $result;
+	}
 
-	if ( wp_create_nonce('signup_form_' . $_POST[ 'signup_form_id' ]) != $_POST['_signup_form'] )
-		wp_die( __( 'Please try again.' ) );
+	if ( wp_create_nonce('signup_form_' . $_POST[ 'signup_form_id' ]) != $_POST['_signup_form'] ) {
+			wp_die( __( 'Please try again.' ) );
+	}
 
 	return $result;
 }
@@ -2029,8 +2096,9 @@ 
 	 * @param string $no_blog_redirect The redirect URL defined in NOBLOGREDIRECT.
 	 */
 	if ( is_main_site() && is_404() && defined( 'NOBLOGREDIRECT' ) && ( $destination = apply_filters( 'blog_redirect_404', NOBLOGREDIRECT ) ) ) {
-		if ( $destination == '%siteurl%' )
-			$destination = network_home_url();
+		if ( $destination == '%siteurl%' ) {
+					$destination = network_home_url();
+		}
 		wp_redirect( $destination );
 		exit();
 	}
@@ -2046,21 +2114,25 @@ 
  * @since MU
  */
 function maybe_add_existing_user_to_blog() {
-	if ( false === strpos( $_SERVER[ 'REQUEST_URI' ], '/newbloguser/' ) )
-		return;
+	if ( false === strpos( $_SERVER[ 'REQUEST_URI' ], '/newbloguser/' ) ) {
+			return;
+	}
 
 	$parts = explode( '/', $_SERVER[ 'REQUEST_URI' ] );
 	$key = array_pop( $parts );
 
-	if ( $key == '' )
-		$key = array_pop( $parts );
+	if ( $key == '' ) {
+			$key = array_pop( $parts );
+	}
 
 	$details = get_option( 'new_user_' . $key );
-	if ( !empty( $details ) )
-		delete_option( 'new_user_' . $key );
+	if ( !empty( $details ) ) {
+			delete_option( 'new_user_' . $key );
+	}
 
-	if ( empty( $details ) || is_wp_error( add_existing_user_to_blog( $details ) ) )
-		wp_die( sprintf(__('An error occurred adding you to this site. Back to the <a href="%s">homepage</a>.'), home_url() ) );
+	if ( empty( $details ) || is_wp_error( add_existing_user_to_blog( $details ) ) ) {
+			wp_die( sprintf(__('An error occurred adding you to this site. Back to the <a href="%s">homepage</a>.'), home_url() ) );
+	}
 
 	wp_die( sprintf( __( 'You have been added to this site. Please visit the <a href="%s">homepage</a> or <a href="%s">log in</a> using your username and password.' ), home_url(), admin_url() ), __( 'WordPress &rsaquo; Success' ), array( 'response' => 200 ) );
 }
@@ -2258,11 +2330,14 @@ 
  * @return string URL with https as the scheme
  */
 function filter_SSL( $url ) {
-	if ( ! is_string( $url ) )
-		return get_bloginfo( 'url' ); // Return home blog url with proper scheme
+	if ( ! is_string( $url ) ) {
+			return get_bloginfo( 'url' );
+	}
+	// Return home blog url with proper scheme
 
-	if ( force_ssl_content() && is_ssl() )
-		$url = set_url_scheme( $url, 'https' );
+	if ( force_ssl_content() && is_ssl() ) {
+			$url = set_url_scheme( $url, 'https' );
+	}
 
 	return $url;
 }
@@ -2273,12 +2348,14 @@ 
  * @since 3.1.0
  */
 function wp_schedule_update_network_counts() {
-	if ( !is_main_site() )
-		return;
+	if ( !is_main_site() ) {
+			return;
+	}
 
-	if ( ! wp_next_scheduled('update_network_counts') && ! wp_installing() )
-		wp_schedule_event(time(), 'twicedaily', 'update_network_counts');
-}
+	if ( ! wp_next_scheduled('update_network_counts') && ! wp_installing() ) {
+			wp_schedule_event(time(), 'twicedaily', 'update_network_counts');
+	}
+	}
 
 /**
  * Update the network-wide counts for the current network.
@@ -2317,8 +2394,9 @@ 
 	 * @param bool   $small_network Whether the network is considered small.
 	 * @param string $context       Context. Either 'users' or 'sites'.
 	 */
-	if ( ! apply_filters( 'enable_live_network_counts', $is_small_network, 'sites' ) )
-		return;
+	if ( ! apply_filters( 'enable_live_network_counts', $is_small_network, 'sites' ) ) {
+			return;
+	}
 
 	wp_update_network_site_counts( $network_id );
 }
@@ -2338,8 +2416,9 @@ 
 	$is_small_network = ! wp_is_large_network( 'users', $network_id );
 
 	/** This filter is documented in wp-includes/ms-functions.php */
-	if ( ! apply_filters( 'enable_live_network_counts', $is_small_network, 'users' ) )
-		return;
+	if ( ! apply_filters( 'enable_live_network_counts', $is_small_network, 'users' ) ) {
+			return;
+	}
 
 	wp_update_network_user_counts( $network_id );
 }
@@ -2420,11 +2499,13 @@ 
 function get_space_allowed() {
 	$space_allowed = get_option( 'blog_upload_space' );
 
-	if ( ! is_numeric( $space_allowed ) )
-		$space_allowed = get_site_option( 'blog_upload_space' );
+	if ( ! is_numeric( $space_allowed ) ) {
+			$space_allowed = get_site_option( 'blog_upload_space' );
+	}
 
-	if ( ! is_numeric( $space_allowed ) )
-		$space_allowed = 100;
+	if ( ! is_numeric( $space_allowed ) ) {
+			$space_allowed = 100;
+	}
 
 	/**
 	 * Filters the upload quota for the current site.
@@ -2449,13 +2530,15 @@ 
 		$allowed = 0;
 	}
 	$space_allowed = $allowed * MB_IN_BYTES;
-	if ( get_site_option( 'upload_space_check_disabled' ) )
-		return $space_allowed;
+	if ( get_site_option( 'upload_space_check_disabled' ) ) {
+			return $space_allowed;
+	}
 
 	$space_used = get_space_used() * MB_IN_BYTES;
 
-	if ( ( $space_allowed - $space_used ) <= 0 )
-		return 0;
+	if ( ( $space_allowed - $space_used ) <= 0 ) {
+			return 0;
+	}
 
 	return $space_allowed - $space_used;
 }
@@ -2467,8 +2550,9 @@ 
  * @return bool True if space is available, false otherwise.
  */
 function is_upload_space_available() {
-	if ( get_site_option( 'upload_space_check_disabled' ) )
-		return true;
+	if ( get_site_option( 'upload_space_check_disabled' ) ) {
+			return true;
+	}
 
 	return (bool) get_upload_space_available();
 }
@@ -2483,8 +2567,9 @@ 
  */
 function upload_size_limit_filter( $size ) {
 	$fileupload_maxk = KB_IN_BYTES * get_site_option( 'fileupload_maxk', 1500 );
-	if ( get_site_option( 'upload_space_check_disabled' ) )
-		return min( $size, $fileupload_maxk );
+	if ( get_site_option( 'upload_space_check_disabled' ) ) {
+			return min( $size, $fileupload_maxk );
+	}
 
 	return min( $size, $fileupload_maxk, get_upload_space_available() );
 }

src/wp-includes/option.php

Doc Comments +1 added lines, -1 removed lines

@@ -1867,7 +1867,7 @@
  * @param string $option_group A settings group name. Should correspond to a whitelisted option key name.
  * 	Default whitelisted option key names include "general," "discussion," and "reading," among others.
  * @param string $option_name The name of an option to sanitize and save.
- * @param array  $args {
+ * @param callable  $args {
  *     Data used to describe the setting when registered.
  *
  *     @type string   $type              The type of data associated with this setting.

Braces +93 added lines, -63 removed lines

@@ -31,8 +31,9 @@ 
 	global $wpdb;
 
 	$option = trim( $option );
-	if ( empty( $option ) )
-		return false;
+	if ( empty( $option ) ) {
+			return false;
+	}
 
 	/**
 	 * Filters 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;
+	}
 
 	// Distinguish between `false` as a default, and not passing one.
 	$passed_default = func_num_args() > 1;
@@ -119,11 +122,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 );
+	}
 
 	/**
 	 * Filters the value of an existing option.
@@ -152,9 +157,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.
@@ -179,22 +185,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;
@@ -212,11 +221,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' );
 
@@ -259,13 +270,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 );
@@ -340,8 +353,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] ) ) {
@@ -412,26 +426,30 @@ 
 function add_option( $option, $value = '', $deprecated = '', $autoload = 'yes' ) {
 	global $wpdb;
 
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '2.3.0' );
+	if ( !empty( $deprecated ) ) {
+			_deprecated_argument( __FUNCTION__, '2.3.0' );
+	}
 
 	$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, $option, false ) !== get_option( $option ) )
 			return false;
+	}
 
 	$serialized_value = maybe_serialize( $value );
 	$autoload = ( 'no' === $autoload || false === $autoload ) ? 'no' : 'yes';
@@ -447,8 +465,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 ) {
@@ -506,15 +525,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.
@@ -590,8 +611,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 ) {
@@ -639,8 +661,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' );
@@ -660,8 +683,9 @@ 
 			}
 		}
 
-		if ( ! isset( $value ) )
-			$value = get_option( $transient_option );
+		if ( ! isset( $value ) ) {
+					$value = get_option( $transient_option );
+		}
 	}
 
 	/**
@@ -818,8 +842,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;
@@ -1542,8 +1567,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 ) {
 
@@ -1593,8 +1619,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' );
@@ -1612,8 +1639,9 @@ 
 			}
 		}
 
-		if ( ! isset( $value ) )
-			$value = get_site_option( $transient_option );
+		if ( ! isset( $value ) ) {
+					$value = get_site_option( $transient_option );
+		}
 	}
 
 	/**
@@ -1682,12 +1710,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 );
 		}
 	}

Spacing +443 added lines, -443 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,20 +49,20 @@ 
 	 *                               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;
 
 	// Distinguish between `false` as a default, and not passing one.
 	$passed_default = func_num_args() > 1;
 
-	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])) {
 			/**
 			 * Filters the default value for an option.
 			 *
@@ -77,53 +77,53 @@ 
 			 * @param string $option  Option name.
 			 * @param bool   $passed_default Was `get_option()` passed a default value?
 			 */
-			return apply_filters( "default_option_{$option}", $default, $option, $passed_default );
+			return apply_filters("default_option_{$option}", $default, $option, $passed_default);
 		}
 
 		$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, $passed_default );
+					return apply_filters("default_option_{$option}", $default, $option, $passed_default);
 				}
 			}
 		}
 	} 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, $passed_default );
+			return apply_filters("default_option_{$option}", $default, $option, $passed_default);
 		}
 	}
 
 	// 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);
 
 	/**
 	 * Filters the value of an existing option.
@@ -138,7 +138,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);
 }
 
 /**
@@ -151,9 +151,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)));
 }
 
 /**
@@ -163,8 +163,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));
 }
 
 /**
@@ -179,22 +179,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;
@@ -209,26 +209,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');
 	}
 }
 
@@ -255,20 +255,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);
 
 	/**
 	 * Filters a specific option before its value is (maybe) serialized and updated.
@@ -282,7 +282,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);
 
 	/**
 	 * Filters an option before its value is (maybe) serialized and updated.
@@ -293,7 +293,7 @@ 
 	 * @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.
@@ -304,21 +304,21 @@ 
 	 *
 	 * See https://core.trac.wordpress.org/ticket/38903
 	 */
-	if ( $value === $old_value || maybe_serialize( $value ) === maybe_serialize( $old_value ) ) {
+	if ($value === $old_value || maybe_serialize($value) === maybe_serialize($old_value)) {
 		return false;
 	}
 
 	/** This filter is documented in wp-includes/option.php */
-	if ( apply_filters( "default_option_{$option}", false, $option, false ) === $old_value ) {
+	if (apply_filters("default_option_{$option}", false, $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.
@@ -329,33 +329,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');
 		}
 	}
 
@@ -371,7 +371,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.
@@ -382,7 +382,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;
 }
 
@@ -409,32 +409,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.0' );
+	if ( ! empty($deprecated))
+		_deprecated_argument(__FUNCTION__, '2.3.0');
 
 	$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, $option, false ) !== get_option( $option ) )
+		if (apply_filters("default_option_{$option}", false, $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.
@@ -444,27 +444,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');
 	}
 
 	/**
@@ -478,7 +478,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.
@@ -488,7 +488,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;
 }
 
@@ -502,18 +502,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;
 
 	/**
@@ -523,21 +523,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.
@@ -548,7 +548,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.
@@ -557,7 +557,7 @@ 
 		 *
 		 * @param string $option Name of the deleted option.
 		 */
-		do_action( 'deleted_option', $option );
+		do_action('deleted_option', $option);
 		return true;
 	}
 	return false;
@@ -571,7 +571,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.
@@ -582,19 +582,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.
@@ -603,7 +603,7 @@ 
 		 *
 		 * @param string $transient Deleted transient name.
 		 */
-		do_action( 'deleted_transient', $transient );
+		do_action('deleted_transient', $transient);
 	}
 
 	return $result;
@@ -620,7 +620,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) {
 
 	/**
 	 * Filters the value of an existing transient.
@@ -638,30 +638,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);
 	}
 
 	/**
@@ -675,7 +675,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);
 }
 
 /**
@@ -693,7 +693,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;
 
@@ -710,7 +710,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);
 
 	/**
 	 * Filters the expiration for a transient before its value is set.
@@ -723,41 +723,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.
@@ -772,7 +772,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.
@@ -784,7 +784,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;
 }
@@ -800,43 +800,43 @@ 
  */
 function wp_user_settings() {
 
-	if ( ! is_admin() || wp_doing_ajax() ) {
+	if ( ! is_admin() || wp_doing_ajax()) {
 		return;
 	}
 
-	if ( ! $user_id = get_current_user_id() ) {
+	if ( ! $user_id = get_current_user_id()) {
 		return;
 	}
 
-	if ( ! is_user_member_of_blog() ) {
+	if ( ! 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;
 }
 
 /**
@@ -848,10 +848,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;
 }
 
 /**
@@ -867,15 +867,15 @@ 
  * @param string $value The value for the setting.
  * @return bool|null True if set successfully, false if not. Null if the current user can't be established.
  */
-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);
 }
 
 /**
@@ -890,8 +890,8 @@ 
  * @param string $names The name or array of names of the setting to be deleted.
  * @return bool|null True if deleted successfully, false if not. Null if the current user can't be established.
  */
-function delete_user_setting( $names ) {
-	if ( headers_sent() ) {
+function delete_user_setting($names) {
+	if (headers_sent()) {
 		return false;
 	}
 
@@ -899,15 +899,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;
@@ -925,27 +925,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);
 		}
 	}
 
@@ -965,32 +965,32 @@ 
  * @return bool|null False if the current user can't be found, null if the current
  *                   user is not a super admin or a member of the site, otherwise true.
  */
-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_user_member_of_blog() ) {
+	if ( ! 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;
 }
@@ -1001,12 +1001,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);
 }
 
 /**
@@ -1023,8 +1023,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);
 }
 
 /**
@@ -1041,8 +1041,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);
 }
 
 /**
@@ -1056,8 +1056,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);
 }
 
 /**
@@ -1072,8 +1072,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);
 }
 
 /**
@@ -1090,17 +1090,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;
 
-	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 ) {
+	if ( ! $network_id) {
 		$network_id = get_current_network_id();
 	}
 
@@ -1121,17 +1121,17 @@ 
 	 * @param string $option     Option name.
 	 * @param int    $network_id ID of the network.
 	 */
-	$pre = apply_filters( "pre_site_option_{$option}", false, $option, $network_id );
+	$pre = apply_filters("pre_site_option_{$option}", false, $option, $network_id);
 
-	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])) {
 
 		/**
 		 * Filters a specific default network option.
@@ -1147,34 +1147,34 @@ 
 		 * @param string $option     Option name.
 		 * @param int    $network_id ID of the network.
 		 */
-		return apply_filters( "default_site_option_{$option}", $default, $option, $network_id );
+		return apply_filters("default_site_option_{$option}", $default, $option, $network_id);
 	}
 
-	if ( ! is_multisite() ) {
+	if ( ! is_multisite()) {
 		/** This filter is documented in wp-includes/option.php */
-		$default = apply_filters( 'default_site_option_' . $option, $default, $option, $network_id );
-		$value = get_option( $option, $default );
+		$default = apply_filters('default_site_option_'.$option, $default, $option, $network_id);
+		$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, $network_id );
+				$value = apply_filters('default_site_option_'.$option, $default, $option, $network_id);
 			}
 		}
 	}
@@ -1193,7 +1193,7 @@ 
 	 * @param string $option     Option name.
 	 * @param int    $network_id ID of the network.
 	 */
-	return apply_filters( "site_option_{$option}", $value, $option, $network_id );
+	return apply_filters("site_option_{$option}", $value, $option, $network_id);
 }
 
 /**
@@ -1212,21 +1212,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;
 
-	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 ) {
+	if ( ! $network_id) {
 		$network_id = get_current_network_id();
 	}
 
-	wp_protect_special_option( $option );
+	wp_protect_special_option($option);
 
 	/**
 	 * Filters the value of a specific network option before it is added.
@@ -1242,43 +1242,43 @@ 
 	 * @param string $option     Option name.
 	 * @param int    $network_id ID of the network.
 	 */
-	$value = apply_filters( "pre_add_site_option_{$option}", $value, $option, $network_id );
+	$value = apply_filters("pre_add_site_option_{$option}", $value, $option, $network_id);
 
 	$notoptions_key = "$network_id:notoptions";
 
-	if ( ! is_multisite() ) {
-		$result = add_option( $option, $value, '', 'no' );
+	if ( ! is_multisite()) {
+		$result = add_option($option, $value, '', 'no');
 	} 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.
@@ -1293,7 +1293,7 @@ 
 		 * @param mixed  $value      Value of the network option.
 		 * @param int    $network_id ID of the network.
 		 */
-		do_action( "add_site_option_{$option}", $option, $value, $network_id );
+		do_action("add_site_option_{$option}", $option, $value, $network_id);
 
 		/**
 		 * Fires after a network option has been successfully added.
@@ -1305,7 +1305,7 @@ 
 		 * @param mixed  $value      Value of the network option.
 		 * @param int    $network_id ID of the network.
 		 */
-		do_action( 'add_site_option', $option, $value, $network_id );
+		do_action('add_site_option', $option, $value, $network_id);
 
 		return true;
 	}
@@ -1326,17 +1326,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;
 
-	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 ) {
+	if ( ! $network_id) {
 		$network_id = get_current_network_id();
 	}
 
@@ -1352,22 +1352,22 @@ 
 	 * @param string $option     Option name.
 	 * @param int    $network_id ID of the network.
 	 */
-	do_action( "pre_delete_site_option_{$option}", $option, $network_id );
+	do_action("pre_delete_site_option_{$option}", $option, $network_id);
 
-	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.
@@ -1381,7 +1381,7 @@ 
 		 * @param string $option     Name of the network option.
 		 * @param int    $network_id ID of the network.
 		 */
-		do_action( "delete_site_option_{$option}", $option, $network_id );
+		do_action("delete_site_option_{$option}", $option, $network_id);
 
 		/**
 		 * Fires after a network option has been deleted.
@@ -1392,7 +1392,7 @@ 
 		 * @param string $option     Name of the network option.
 		 * @param int    $network_id ID of the network.
 		 */
-		do_action( 'delete_site_option', $option, $network_id );
+		do_action('delete_site_option', $option, $network_id);
 
 		return true;
 	}
@@ -1414,23 +1414,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;
 
-	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 ) {
+	if ( ! $network_id) {
 		$network_id = get_current_network_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);
 
 	/**
 	 * Filters a specific network option before its value is updated.
@@ -1447,38 +1447,38 @@ 
 	 * @param string $option     Option name.
 	 * @param int    $network_id ID of the network.
 	 */
-	$value = apply_filters( "pre_update_site_option_{$option}", $value, $old_value, $option, $network_id );
+	$value = apply_filters("pre_update_site_option_{$option}", $value, $old_value, $option, $network_id);
 
-	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, 'no' );
+	if ( ! is_multisite()) {
+		$result = update_option($option, $value, 'no');
 	} 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.
@@ -1494,7 +1494,7 @@ 
 		 * @param mixed  $old_value  Old value of the network option.
 		 * @param int    $network_id ID of the network.
 		 */
-		do_action( "update_site_option_{$option}", $option, $value, $old_value, $network_id );
+		do_action("update_site_option_{$option}", $option, $value, $old_value, $network_id);
 
 		/**
 		 * Fires after the value of a network option has been successfully updated.
@@ -1507,7 +1507,7 @@ 
 		 * @param mixed  $old_value  Old value of the network option.
 		 * @param int    $network_id ID of the network.
 		 */
-		do_action( 'update_site_option', $option, $value, $old_value, $network_id );
+		do_action('update_site_option', $option, $value, $old_value, $network_id);
 
 		return true;
 	}
@@ -1523,7 +1523,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.
@@ -1534,18 +1534,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.
@@ -1554,7 +1554,7 @@ 
 		 *
 		 * @param string $transient Deleted transient name.
 		 */
-		do_action( 'deleted_site_transient', $transient );
+		do_action('deleted_site_transient', $transient);
 	}
 
 	return $result;
@@ -1573,7 +1573,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) {
 
 	/**
 	 * Filters the value of an existing site transient.
@@ -1591,29 +1591,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);
 	}
 
 	/**
@@ -1627,7 +1627,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);
 }
 
 /**
@@ -1646,7 +1646,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) {
 
 	/**
 	 * Filters the value of a specific site transient before it is set.
@@ -1659,7 +1659,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;
 
@@ -1674,24 +1674,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.
@@ -1705,7 +1705,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.
@@ -1716,7 +1716,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;
 }
@@ -1730,24 +1730,24 @@ 
  * @since 4.7.0
  */
 function register_initial_settings() {
-	register_setting( 'general', 'blogname', array(
+	register_setting('general', 'blogname', array(
 		'show_in_rest' => array(
 			'name' => 'title',
 		),
 		'type'         => 'string',
-		'description'  => __( 'Site title.' ),
-	) );
+		'description'  => __('Site title.'),
+	));
 
-	register_setting( 'general', 'blogdescription', array(
+	register_setting('general', 'blogdescription', array(
 		'show_in_rest' => array(
 			'name' => 'description',
 		),
 		'type'         => 'string',
-		'description'  => __( 'Site tagline.' ),
-	) );
+		'description'  => __('Site tagline.'),
+	));
 
-	if ( ! is_multisite() ) {
-		register_setting( 'general', 'siteurl', array(
+	if ( ! is_multisite()) {
+		register_setting('general', 'siteurl', array(
 			'show_in_rest' => array(
 				'name'    => 'url',
 				'schema'  => array(
@@ -1755,12 +1755,12 @@ 
 				),
 			),
 			'type'         => 'string',
-			'description'  => __( 'Site URL.' ),
-		) );
+			'description'  => __('Site URL.'),
+		));
 	}
 
-	if ( ! is_multisite() ) {
-		register_setting( 'general', 'admin_email', array(
+	if ( ! is_multisite()) {
+		register_setting('general', 'admin_email', array(
 			'show_in_rest' => array(
 				'name'    => 'email',
 				'schema'  => array(
@@ -1768,90 +1768,90 @@ 
 				),
 			),
 			'type'         => 'string',
-			'description'  => __( 'This address is used for admin purposes, like new user notification.' ),
-		) );
+			'description'  => __('This address is used for admin purposes, like new user notification.'),
+		));
 	}
 
-	register_setting( 'general', 'timezone_string', array(
+	register_setting('general', 'timezone_string', array(
 		'show_in_rest' => array(
 			'name' => 'timezone',
 		),
 		'type'         => 'string',
-		'description'  => __( 'A city in the same timezone as you.' ),
-	) );
+		'description'  => __('A city in the same timezone as you.'),
+	));
 
-	register_setting( 'general', 'date_format', array(
+	register_setting('general', 'date_format', array(
 		'show_in_rest' => true,
 		'type'         => 'string',
-		'description'  => __( 'A date format for all date strings.' ),
-	) );
+		'description'  => __('A date format for all date strings.'),
+	));
 
-	register_setting( 'general', 'time_format', array(
+	register_setting('general', 'time_format', array(
 		'show_in_rest' => true,
 		'type'         => 'string',
-		'description'  => __( 'A time format for all time strings.' ),
-	) );
+		'description'  => __('A time format for all time strings.'),
+	));
 
-	register_setting( 'general', 'start_of_week', array(
+	register_setting('general', 'start_of_week', array(
 		'show_in_rest' => true,
 		'type'         => 'integer',
-		'description'  => __( 'A day number of the week that the week should start on.' ),
-	) );
+		'description'  => __('A day number of the week that the week should start on.'),
+	));
 
-	register_setting( 'general', 'WPLANG', array(
+	register_setting('general', 'WPLANG', array(
 		'show_in_rest' => array(
 			'name' => 'language',
 		),
 		'type'         => 'string',
-		'description'  => __( 'WordPress locale code.' ),
+		'description'  => __('WordPress locale code.'),
 		'default'      => 'en_US',
-	) );
+	));
 
-	register_setting( 'writing', 'use_smilies', array(
+	register_setting('writing', 'use_smilies', array(
 		'show_in_rest' => true,
 		'type'         => 'boolean',
-		'description'  => __( 'Convert emoticons like :-) and :-P to graphics on display.' ),
+		'description'  => __('Convert emoticons like :-) and :-P to graphics on display.'),
 		'default'      => true,
-	) );
+	));
 
-	register_setting( 'writing', 'default_category', array(
+	register_setting('writing', 'default_category', array(
 		'show_in_rest' => true,
 		'type'         => 'integer',
-		'description'  => __( 'Default post category.' ),
-	) );
+		'description'  => __('Default post category.'),
+	));
 
-	register_setting( 'writing', 'default_post_format', array(
+	register_setting('writing', 'default_post_format', array(
 		'show_in_rest' => true,
 		'type'         => 'string',
-		'description'  => __( 'Default post format.' ),
-	) );
+		'description'  => __('Default post format.'),
+	));
 
-	register_setting( 'reading', 'posts_per_page', array(
+	register_setting('reading', 'posts_per_page', array(
 		'show_in_rest' => true,
 		'type'         => 'integer',
-		'description'  => __( 'Blog pages show at most.' ),
+		'description'  => __('Blog pages show at most.'),
 		'default'      => 10,
-	) );
+	));
 
-	register_setting( 'discussion', 'default_ping_status', array(
+	register_setting('discussion', 'default_ping_status', array(
 		'show_in_rest' => array(
 			'schema'   => array(
-				'enum' => array( 'open', 'closed' ),
+				'enum' => array('open', 'closed'),
 			),
 		),
 		'type'         => 'string',
-		'description'  => __( 'Allow link notifications from other blogs (pingbacks and trackbacks) on new articles.' ),
-	) );
+		'description'  => __('Allow link notifications from other blogs (pingbacks and trackbacks) on new articles.'),
+	));
 
-	register_setting( 'discussion', 'default_comment_status', array(
+	register_setting('discussion', 'default_comment_status', array(
 		'show_in_rest' => array(
 			'schema'   => array(
-				'enum' => array( 'open', 'closed' ),
+				'enum' => array('open', 'closed'),
 			),
 		),
 		'type'         => 'string',
-		'description'  => __( 'Allow people to post comments on new articles.' ),
-	) );
+		'description'  => __('Allow people to post comments on new articles.'),
+	));
 
 }
 
@@ -1878,7 +1878,7 @@ 
  *     @type mixed    $default           Default value when calling `get_option()`.
  * }
  */
-function register_setting( $option_group, $option_name, $args = array() ) {
+function register_setting($option_group, $option_name, $args = array()) {
 	global $new_whitelist_options, $wp_registered_settings;
 
 	$defaults = array(
@@ -1890,7 +1890,7 @@ 
 	);
 
 	// Back-compat: old sanitize callback is added.
-	if ( is_callable( $args ) ) {
+	if (is_callable($args)) {
 		$args = array(
 			'sanitize_callback' => $args,
 		);
@@ -1906,42 +1906,42 @@ 
 	 * @param string $option_group Setting group.
 	 * @param string $option_name  Setting name.
 	 */
-	$args = apply_filters( 'register_setting_args', $args, $defaults, $option_group, $option_name );
-	$args = wp_parse_args( $args, $defaults );
+	$args = apply_filters('register_setting_args', $args, $defaults, $option_group, $option_name);
+	$args = wp_parse_args($args, $defaults);
 
-	if ( ! is_array( $wp_registered_settings ) ) {
+	if ( ! is_array($wp_registered_settings)) {
 		$wp_registered_settings = array();
 	}
 
-	if ( 'misc' == $option_group ) {
-		_deprecated_argument( __FUNCTION__, '3.0.0',
+	if ('misc' == $option_group) {
+		_deprecated_argument(__FUNCTION__, '3.0.0',
 			/* translators: %s: misc */
-			sprintf( __( 'The "%s" options group has been removed. Use another settings group.' ),
+			sprintf(__('The "%s" options group has been removed. Use another settings group.'),
 				'misc'
 			)
 		);
 		$option_group = 'general';
 	}
 
-	if ( 'privacy' == $option_group ) {
-		_deprecated_argument( __FUNCTION__, '3.5.0',
+	if ('privacy' == $option_group) {
+		_deprecated_argument(__FUNCTION__, '3.5.0',
 			/* translators: %s: privacy */
-			sprintf( __( 'The "%s" options group has been removed. Use another settings group.' ),
+			sprintf(__('The "%s" options group has been removed. Use another settings group.'),
 				'privacy'
 			)
 		);
 		$option_group = 'reading';
 	}
 
-	$new_whitelist_options[ $option_group ][] = $option_name;
-	if ( ! empty( $args['sanitize_callback'] ) ) {
-		add_filter( "sanitize_option_{$option_name}", $args['sanitize_callback'] );
+	$new_whitelist_options[$option_group][] = $option_name;
+	if ( ! empty($args['sanitize_callback'])) {
+		add_filter("sanitize_option_{$option_name}", $args['sanitize_callback']);
 	}
-	if ( array_key_exists( 'default', $args ) ) {
-		add_filter( "default_option_{$option_name}", 'filter_default_option', 10, 3 );
+	if (array_key_exists('default', $args)) {
+		add_filter("default_option_{$option_name}", 'filter_default_option', 10, 3);
 	}
 
-	$wp_registered_settings[ $option_name ] = $args;
+	$wp_registered_settings[$option_name] = $args;
 }
 
 /**
@@ -1956,51 +1956,51 @@ 
  * @param string   $option_name       The name of the option to unregister.
  * @param callable $deprecated        Deprecated.
  */
-function unregister_setting( $option_group, $option_name, $deprecated = '' ) {
+function unregister_setting($option_group, $option_name, $deprecated = '') {
 	global $new_whitelist_options, $wp_registered_settings;
 
-	if ( 'misc' == $option_group ) {
-		_deprecated_argument( __FUNCTION__, '3.0.0',
+	if ('misc' == $option_group) {
+		_deprecated_argument(__FUNCTION__, '3.0.0',
 			/* translators: %s: misc */
-			sprintf( __( 'The "%s" options group has been removed. Use another settings group.' ),
+			sprintf(__('The "%s" options group has been removed. Use another settings group.'),
 				'misc'
 			)
 		);
 		$option_group = 'general';
 	}
 
-	if ( 'privacy' == $option_group ) {
-		_deprecated_argument( __FUNCTION__, '3.5.0',
+	if ('privacy' == $option_group) {
+		_deprecated_argument(__FUNCTION__, '3.5.0',
 			/* translators: %s: privacy */
-			sprintf( __( 'The "%s" options group has been removed. Use another settings group.' ),
+			sprintf(__('The "%s" options group has been removed. Use another settings group.'),
 				'privacy'
 			)
 		);
 		$option_group = 'reading';
 	}
 
-	$pos = array_search( $option_name, (array) $new_whitelist_options[ $option_group ] );
-	if ( $pos !== false ) {
-		unset( $new_whitelist_options[ $option_group ][ $pos ] );
+	$pos = array_search($option_name, (array) $new_whitelist_options[$option_group]);
+	if ($pos !== false) {
+		unset($new_whitelist_options[$option_group][$pos]);
 	}
-	if ( '' !== $deprecated ) {
-		_deprecated_argument( __FUNCTION__, '4.7.0',
+	if ('' !== $deprecated) {
+		_deprecated_argument(__FUNCTION__, '4.7.0',
 			/* translators: 1: $sanitize_callback, 2: register_setting() */
-			sprintf( __( '%1$s is deprecated. The callback from %2$s is used instead.' ),
+			sprintf(__('%1$s is deprecated. The callback from %2$s is used instead.'),
 				'<code>$sanitize_callback</code>',
 				'<code>register_setting()</code>'
 			)
 		);
-		remove_filter( "sanitize_option_{$option_name}", $deprecated );
+		remove_filter("sanitize_option_{$option_name}", $deprecated);
 	}
 
-	if ( isset( $wp_registered_settings[ $option_name ] ) ) {
+	if (isset($wp_registered_settings[$option_name])) {
 		// Remove the sanitize callback if one was set during registration.
-		if ( ! empty( $wp_registered_settings[ $option_name ]['sanitize_callback'] ) ) {
-			remove_filter( "sanitize_option_{$option_name}", $wp_registered_settings[ $option_name ]['sanitize_callback'] );
+		if ( ! empty($wp_registered_settings[$option_name]['sanitize_callback'])) {
+			remove_filter("sanitize_option_{$option_name}", $wp_registered_settings[$option_name]['sanitize_callback']);
 		}
 
-		unset( $wp_registered_settings[ $option_name ] );
+		unset($wp_registered_settings[$option_name]);
 	}
 }
 
@@ -2014,7 +2014,7 @@ 
 function get_registered_settings() {
 	global $wp_registered_settings;
 
-	if ( ! is_array( $wp_registered_settings ) ) {
+	if ( ! is_array($wp_registered_settings)) {
 		return array();
 	}
 
@@ -2034,15 +2034,15 @@ 
  * @param bool $passed_default Was `get_option()` passed a default value?
  * @return mixed Filtered default value.
  */
-function filter_default_option( $default, $option, $passed_default ) {
-	if ( $passed_default ) {
+function filter_default_option($default, $option, $passed_default) {
+	if ($passed_default) {
 		return $default;
 	}
 
 	$registered = get_registered_settings();
-	if ( empty( $registered[ $option ] ) ) {
+	if (empty($registered[$option])) {
 		return $default;
 	}
 
-	return $registered[ $option ]['default'];
+	return $registered[$option]['default'];
 }

src/wp-includes/query.php

Doc Comments +3 added lines, -3 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 integer  $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 = '' ) {
@@ -286,8 +286,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 True for custom taxonomy archive pages, false for built-in taxonomies (category and tag archives).
  */
 function is_tax( $taxonomy = '', $term = '' ) {

Spacing +110 added lines, -110 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);
 }
 
 /**
@@ -127,7 +127,7 @@ 
 function wp_reset_postdata() {
 	global $wp_query;
 
-	if ( isset( $wp_query ) ) {
+	if (isset($wp_query)) {
 		$wp_query->reset_postdata();
 	}
 }
@@ -150,8 +150,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.0' );
+	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.0');
 		return false;
 	}
 
@@ -168,15 +168,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.0' );
+	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.0');
 		return false;
 	}
 
-	return $wp_query->is_post_type_archive( $post_types );
+	return $wp_query->is_post_type_archive($post_types);
 }
 
 /**
@@ -189,15 +189,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.0' );
+	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.0');
 		return false;
 	}
 
-	return $wp_query->is_attachment( $attachment );
+	return $wp_query->is_attachment($attachment);
 }
 
 /**
@@ -213,15 +213,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.0' );
+	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.0');
 		return false;
 	}
 
-	return $wp_query->is_author( $author );
+	return $wp_query->is_author($author);
 }
 
 /**
@@ -237,15 +237,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.0' );
+	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.0');
 		return false;
 	}
 
-	return $wp_query->is_category( $category );
+	return $wp_query->is_category($category);
 }
 
 /**
@@ -261,15 +261,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.0' );
+	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.0');
 		return false;
 	}
 
-	return $wp_query->is_tag( $tag );
+	return $wp_query->is_tag($tag);
 }
 
 /**
@@ -290,15 +290,15 @@ 
  * @param int|string|array $term     Optional. Term ID, name, slug or array of Term IDs, names, and slugs.
  * @return bool True for custom taxonomy archive pages, false for built-in taxonomies (category and tag archives).
  */
-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.0' );
+	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.0');
 		return false;
 	}
 
-	return $wp_query->is_tax( $taxonomy, $term );
+	return $wp_query->is_tax($taxonomy, $term);
 }
 
 /**
@@ -313,8 +313,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.0' );
+	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.0');
 		return false;
 	}
 
@@ -333,8 +333,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.0' );
+	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.0');
 		return false;
 	}
 
@@ -351,15 +351,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.0' );
+	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.0');
 		return false;
 	}
 
-	return $wp_query->is_feed( $feeds );
+	return $wp_query->is_feed($feeds);
 }
 
 /**
@@ -374,8 +374,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.0' );
+	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.0');
 		return false;
 	}
 
@@ -403,8 +403,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.0' );
+	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.0');
 		return false;
 	}
 
@@ -432,8 +432,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.0' );
+	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.0');
 		return false;
 	}
 
@@ -452,8 +452,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.0' );
+	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.0');
 		return false;
 	}
 
@@ -476,15 +476,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.0' );
+	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.0');
 		return false;
 	}
 
-	return $wp_query->is_page( $page );
+	return $wp_query->is_page($page);
 }
 
 /**
@@ -499,8 +499,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.0' );
+	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.0');
 		return false;
 	}
 
@@ -519,8 +519,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.0' );
+	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.0');
 		return false;
 	}
 
@@ -539,8 +539,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.0' );
+	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.0');
 		return false;
 	}
 
@@ -559,8 +559,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.0' );
+	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.0');
 		return false;
 	}
 
@@ -585,15 +585,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.0' );
+	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.0');
 		return false;
 	}
 
-	return $wp_query->is_single( $post );
+	return $wp_query->is_single($post);
 }
 
 /**
@@ -612,15 +612,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.0' );
+	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.0');
 		return false;
 	}
 
-	return $wp_query->is_singular( $post_types );
+	return $wp_query->is_singular($post_types);
 }
 
 /**
@@ -635,8 +635,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.0' );
+	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.0');
 		return false;
 	}
 
@@ -655,8 +655,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.0' );
+	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.0');
 		return false;
 	}
 
@@ -675,8 +675,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.0' );
+	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.0');
 		return false;
 	}
 
@@ -695,8 +695,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.0' );
+	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.0');
 		return false;
 	}
 
@@ -715,8 +715,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.0' );
+	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.0');
 		return false;
 	}
 
@@ -733,16 +733,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.0' );
+		_doing_it_wrong(__FUNCTION__, $message, '3.7.0');
 	}
 
 	global $wp_query;
@@ -847,58 +847,58 @@ 
  * @global wpdb $wpdb WordPress database abstraction object.
  */
 function wp_old_slug_redirect() {
-	if ( is_404() && '' !== get_query_var( 'name' ) ) {
+	if (is_404() && '' !== get_query_var('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 ( get_query_var( 'pagename' ) ) {
+		} elseif (get_query_var('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, get_query_var( 'name' ) );
+		$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, get_query_var('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 ( get_query_var( 'year' ) ) {
-			$query .= $wpdb->prepare(" AND YEAR(post_date) = %d", get_query_var( 'year' ) );
+		if (get_query_var('year')) {
+			$query .= $wpdb->prepare(" AND YEAR(post_date) = %d", get_query_var('year'));
 		}
-		if ( get_query_var( 'monthnum' ) ) {
-			$query .= $wpdb->prepare(" AND MONTH(post_date) = %d", get_query_var( 'monthnum' ) );
+		if (get_query_var('monthnum')) {
+			$query .= $wpdb->prepare(" AND MONTH(post_date) = %d", get_query_var('monthnum'));
 		}
-		if ( get_query_var( 'day' ) ) {
-			$query .= $wpdb->prepare(" AND DAYOFMONTH(post_date) = %d", get_query_var( 'day' ) );
+		if (get_query_var('day')) {
+			$query .= $wpdb->prepare(" AND DAYOFMONTH(post_date) = %d", get_query_var('day'));
 		}
 
-		$id = (int) $wpdb->get_var( $query );
+		$id = (int) $wpdb->get_var($query);
 
-		if ( ! $id ) {
+		if ( ! $id) {
 			return;
 		}
 
-		$link = get_permalink( $id );
+		$link = get_permalink($id);
 
-		if ( get_query_var( 'paged' ) > 1 ) {
-			$link = user_trailingslashit( trailingslashit( $link ) . 'page/' . get_query_var( 'paged' ) );
-		} elseif( is_embed() ) {
-			$link = user_trailingslashit( trailingslashit( $link ) . 'embed' );
+		if (get_query_var('paged') > 1) {
+			$link = user_trailingslashit(trailingslashit($link).'page/'.get_query_var('paged'));
+		} elseif (is_embed()) {
+			$link = user_trailingslashit(trailingslashit($link).'embed');
 		}
 
 		/**
@@ -908,13 +908,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;
 	}
 }
@@ -930,11 +930,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;