ntwb / wordpress

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

Spacing +131 added lines, -131 removed lines

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

src/wp-includes/query.php

Spacing +915 added lines, -915 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;
@@ -1316,9 +1316,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.
@@ -1372,10 +1372,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;
@@ -1446,17 +1446,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;
@@ -1580,11 +1580,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;
 		}
 
@@ -1592,80 +1592,80 @@ 
 		$qv = &$this->query_vars;
 		$this->query_vars_changed = true;
 
-		if ( ! empty($qv['robots']) )
+		if ( ! empty($qv['robots']))
 			$this->is_robots = true;
 
-		$qv['p'] =  absint($qv['p']);
-		$qv['page_id'] =  absint($qv['page_id']);
+		$qv['p'] = absint($qv['p']);
+		$qv['page_id'] = absint($qv['page_id']);
 		$qv['year'] = absint($qv['year']);
 		$qv['monthnum'] = absint($qv['monthnum']);
 		$qv['day'] = absint($qv['day']);
 		$qv['w'] = absint($qv['w']);
-		$qv['m'] = 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;
@@ -1674,9 +1674,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;
@@ -1685,40 +1685,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;
@@ -1730,89 +1730,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;
@@ -1820,53 +1820,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;
 
 		/**
@@ -1876,7 +1876,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));
 	}
 
 	/**
@@ -1889,77 +1889,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,
@@ -1968,7 +1968,7 @@ 
 				);
 			}
 
-			if ( ! empty( $cat_not_in ) ) {
+			if ( ! empty($cat_not_in)) {
 				$tax_query[] = array(
 					'taxonomy' => 'category',
 					'terms' => $cat_not_in,
@@ -1977,19 +1977,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'],
@@ -1998,8 +1998,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'],
@@ -2008,8 +2008,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'],
@@ -2020,21 +2020,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;
 				}
@@ -2044,24 +2044,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'],
@@ -2069,8 +2069,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'],
@@ -2078,8 +2078,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'],
@@ -2087,8 +2087,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'],
@@ -2097,7 +2097,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.
@@ -2106,7 +2106,7 @@ 
 		 *
 		 * @param WP_Query $this The WP_Query instance.
 		 */
-		do_action( 'parse_tax_query', $this );
+		do_action('parse_tax_query', $this);
 	}
 
 	/**
@@ -2119,60 +2119,60 @@ 
 	 * @param array $q Query variables.
 	 * @return string WHERE clause.
 	 */
-	protected function parse_search( &$q ) {
+	protected function parse_search(&$q) {
 		global $wpdb;
 
 		$search = '';
 
 		// added slashes screw with quote grouping when done early, so done later
-		$q['s'] = stripslashes( $q['s'] );
-		if ( empty( $_GET['s'] ) && $this->is_main_query() )
-			$q['s'] = urldecode( $q['s'] );
+		$q['s'] = stripslashes($q['s']);
+		if (empty($_GET['s']) && $this->is_main_query())
+			$q['s'] = urldecode($q['s']);
 		// there are no line breaks in <input /> fields
-		$q['s'] = str_replace( array( "\r", "\n" ), '', $q['s'] );
+		$q['s'] = str_replace(array("\r", "\n"), '', $q['s']);
 		$q['search_terms_count'] = 1;
-		if ( ! empty( $q['sentence'] ) ) {
-			$q['search_terms'] = array( $q['s'] );
+		if ( ! empty($q['sentence'])) {
+			$q['search_terms'] = array($q['s']);
 		} else {
-			if ( preg_match_all( '/".*?("|$)|((?<=[\t ",+])|^)[^\t ",+]+/', $q['s'], $matches ) ) {
-				$q['search_terms_count'] = count( $matches[0] );
-				$q['search_terms'] = $this->parse_search_terms( $matches[0] );
+			if (preg_match_all('/".*?("|$)|((?<=[\t ",+])|^)[^\t ",+]+/', $q['s'], $matches)) {
+				$q['search_terms_count'] = count($matches[0]);
+				$q['search_terms'] = $this->parse_search_terms($matches[0]);
 				// if the search string has only short terms or stopwords, or is 10+ terms long, match it as sentence
-				if ( empty( $q['search_terms'] ) || count( $q['search_terms'] ) > 9 )
-					$q['search_terms'] = array( $q['s'] );
+				if (empty($q['search_terms']) || count($q['search_terms']) > 9)
+					$q['search_terms'] = array($q['s']);
 			} else {
-				$q['search_terms'] = array( $q['s'] );
+				$q['search_terms'] = array($q['s']);
 			}
 		}
 
-		$n = ! empty( $q['exact'] ) ? '' : '%';
+		$n = ! empty($q['exact']) ? '' : '%';
 		$searchand = '';
 		$q['search_orderby_title'] = array();
-		foreach ( $q['search_terms'] as $term ) {
+		foreach ($q['search_terms'] as $term) {
 			// Terms prefixed with '-' should be excluded.
-			$include = '-' !== substr( $term, 0, 1 );
-			if ( $include ) {
+			$include = '-' !== substr($term, 0, 1);
+			if ($include) {
 				$like_op  = 'LIKE';
 				$andor_op = 'OR';
 			} else {
 				$like_op  = 'NOT LIKE';
 				$andor_op = 'AND';
-				$term     = substr( $term, 1 );
+				$term     = substr($term, 1);
 			}
 
-			if ( $n && $include ) {
-				$like = '%' . $wpdb->esc_like( $term ) . '%';
-				$q['search_orderby_title'][] = $wpdb->prepare( "$wpdb->posts.post_title LIKE %s", $like );
+			if ($n && $include) {
+				$like = '%'.$wpdb->esc_like($term).'%';
+				$q['search_orderby_title'][] = $wpdb->prepare("$wpdb->posts.post_title LIKE %s", $like);
 			}
 
-			$like = $n . $wpdb->esc_like( $term ) . $n;
-			$search .= $wpdb->prepare( "{$searchand}(($wpdb->posts.post_title $like_op %s) $andor_op ($wpdb->posts.post_excerpt $like_op %s) $andor_op ($wpdb->posts.post_content $like_op %s))", $like, $like, $like );
+			$like = $n.$wpdb->esc_like($term).$n;
+			$search .= $wpdb->prepare("{$searchand}(($wpdb->posts.post_title $like_op %s) $andor_op ($wpdb->posts.post_excerpt $like_op %s) $andor_op ($wpdb->posts.post_content $like_op %s))", $like, $like, $like);
 			$searchand = ' AND ';
 		}
 
-		if ( ! empty( $search ) ) {
+		if ( ! empty($search)) {
 			$search = " AND ({$search}) ";
-			if ( ! is_user_logged_in() )
+			if ( ! is_user_logged_in())
 				$search .= " AND ($wpdb->posts.post_password = '') ";
 		}
 
@@ -2191,24 +2191,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;
@@ -2225,20 +2225,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;
 		}
 
@@ -2249,7 +2249,7 @@ 
 		 *
 		 * @param array $stopwords Stopwords.
 		 */
-		$this->stopwords = apply_filters( 'wp_search_stopwords', $stopwords );
+		$this->stopwords = apply_filters('wp_search_stopwords', $stopwords);
 		return $this->stopwords;
 	}
 
@@ -2261,47 +2261,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;
@@ -2319,7 +2319,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.
@@ -2332,32 +2332,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':
@@ -2375,7 +2375,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";
@@ -2385,15 +2385,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;
@@ -2411,12 +2411,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';
@@ -2450,9 +2450,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;
@@ -2500,7 +2500,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;
@@ -2510,11 +2510,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;
 		}
@@ -2532,95 +2532,95 @@ 
 		$post_status_join = false;
 		$page = 1;
 
-		if ( isset( $q['caller_get_posts'] ) ) {
-			_deprecated_argument( 'WP_Query', '3.1.0', __( '"caller_get_posts" is deprecated. Use "ignore_sticky_posts" instead.' ) );
-			if ( !isset( $q['ignore_sticky_posts'] ) )
+		if (isset($q['caller_get_posts'])) {
+			_deprecated_argument('WP_Query', '3.1.0', __('"caller_get_posts" is deprecated. Use "ignore_sticky_posts" instead.'));
+			if ( ! isset($q['ignore_sticky_posts']))
 				$q['ignore_sticky_posts'] = $q['caller_get_posts'];
 		}
 
-		if ( !isset( $q['ignore_sticky_posts'] ) )
+		if ( ! isset($q['ignore_sticky_posts']))
 			$q['ignore_sticky_posts'] = false;
 
-		if ( !isset($q['suppress_filters']) )
+		if ( ! isset($q['suppress_filters']))
 			$q['suppress_filters'] = false;
 
-		if ( !isset($q['cache_results']) ) {
-			if ( wp_using_ext_object_cache() )
+		if ( ! isset($q['cache_results'])) {
+			if (wp_using_ext_object_cache())
 				$q['cache_results'] = false;
 			else
 				$q['cache_results'] = true;
 		}
 
-		if ( !isset($q['update_post_term_cache']) )
+		if ( ! isset($q['update_post_term_cache']))
 			$q['update_post_term_cache'] = true;
 
-		if ( ! isset( $q['lazy_load_term_meta'] ) ) {
+		if ( ! isset($q['lazy_load_term_meta'])) {
 			$q['lazy_load_term_meta'] = $q['update_post_term_cache'];
 		}
 
-		if ( !isset($q['update_post_meta_cache']) )
+		if ( ! isset($q['update_post_meta_cache']))
 			$q['update_post_meta_cache'] = true;
 
-		if ( !isset($q['post_type']) ) {
-			if ( $this->is_search )
+		if ( ! isset($q['post_type'])) {
+			if ($this->is_search)
 				$q['post_type'] = 'any';
 			else
 				$q['post_type'] = '';
 		}
 		$post_type = $q['post_type'];
-		if ( empty( $q['posts_per_page'] ) ) {
-			$q['posts_per_page'] = get_option( 'posts_per_page' );
+		if (empty($q['posts_per_page'])) {
+			$q['posts_per_page'] = get_option('posts_per_page');
 		}
-		if ( isset($q['showposts']) && $q['showposts'] ) {
+		if (isset($q['showposts']) && $q['showposts']) {
 			$q['showposts'] = (int) $q['showposts'];
 			$q['posts_per_page'] = $q['showposts'];
 		}
-		if ( (isset($q['posts_per_archive_page']) && $q['posts_per_archive_page'] != 0) && ($this->is_archive || $this->is_search) )
+		if ((isset($q['posts_per_archive_page']) && $q['posts_per_archive_page'] != 0) && ($this->is_archive || $this->is_search))
 			$q['posts_per_page'] = $q['posts_per_archive_page'];
-		if ( !isset($q['nopaging']) ) {
-			if ( $q['posts_per_page'] == -1 ) {
+		if ( ! isset($q['nopaging'])) {
+			if ($q['posts_per_page'] == -1) {
 				$q['nopaging'] = true;
 			} else {
 				$q['nopaging'] = false;
 			}
 		}
 
-		if ( $this->is_feed ) {
+		if ($this->is_feed) {
 			// This overrides posts_per_page.
-			if ( ! empty( $q['posts_per_rss'] ) ) {
+			if ( ! empty($q['posts_per_rss'])) {
 				$q['posts_per_page'] = $q['posts_per_rss'];
 			} else {
-				$q['posts_per_page'] = get_option( 'posts_per_rss' );
+				$q['posts_per_page'] = get_option('posts_per_rss');
 			}
 			$q['nopaging'] = false;
 		}
 		$q['posts_per_page'] = (int) $q['posts_per_page'];
-		if ( $q['posts_per_page'] < -1 )
+		if ($q['posts_per_page'] < -1)
 			$q['posts_per_page'] = abs($q['posts_per_page']);
-		elseif ( $q['posts_per_page'] == 0 )
+		elseif ($q['posts_per_page'] == 0)
 			$q['posts_per_page'] = 1;
 
-		if ( !isset($q['comments_per_page']) || $q['comments_per_page'] == 0 )
+		if ( ! isset($q['comments_per_page']) || $q['comments_per_page'] == 0)
 			$q['comments_per_page'] = get_option('comments_per_page');
 
-		if ( $this->is_home && (empty($this->query) || $q['preview'] == 'true') && ( 'page' == get_option('show_on_front') ) && get_option('page_on_front') ) {
+		if ($this->is_home && (empty($this->query) || $q['preview'] == 'true') && ('page' == get_option('show_on_front')) && get_option('page_on_front')) {
 			$this->is_page = true;
 			$this->is_home = false;
 			$q['page_id'] = get_option('page_on_front');
 		}
 
-		if ( isset($q['page']) ) {
+		if (isset($q['page'])) {
 			$q['page'] = trim($q['page'], '/');
 			$q['page'] = absint($q['page']);
 		}
 
 		// If true, forcibly turns off SQL_CALC_FOUND_ROWS even when limits are present.
-		if ( isset($q['no_found_rows']) )
+		if (isset($q['no_found_rows']))
 			$q['no_found_rows'] = (bool) $q['no_found_rows'];
 		else
 			$q['no_found_rows'] = false;
 
-		switch ( $q['fields'] ) {
+		switch ($q['fields']) {
 			case 'ids':
 				$fields = "$wpdb->posts.ID";
 				break;
@@ -2631,74 +2631,74 @@ 
 				$fields = "$wpdb->posts.*";
 		}
 
-		if ( '' !== $q['menu_order'] )
-			$where .= " AND $wpdb->posts.menu_order = " . $q['menu_order'];
+		if ('' !== $q['menu_order'])
+			$where .= " AND $wpdb->posts.menu_order = ".$q['menu_order'];
 
 		// The "m" parameter is meant for months but accepts datetimes of varying specificity
-		if ( $q['m'] ) {
-			$where .= " AND YEAR($wpdb->posts.post_date)=" . substr($q['m'], 0, 4);
-			if ( strlen($q['m']) > 5 )
-				$where .= " AND MONTH($wpdb->posts.post_date)=" . substr($q['m'], 4, 2);
-			if ( strlen($q['m']) > 7 )
-				$where .= " AND DAYOFMONTH($wpdb->posts.post_date)=" . substr($q['m'], 6, 2);
-			if ( strlen($q['m']) > 9 )
-				$where .= " AND HOUR($wpdb->posts.post_date)=" . substr($q['m'], 8, 2);
-			if ( strlen($q['m']) > 11 )
-				$where .= " AND MINUTE($wpdb->posts.post_date)=" . substr($q['m'], 10, 2);
-			if ( strlen($q['m']) > 13 )
-				$where .= " AND SECOND($wpdb->posts.post_date)=" . substr($q['m'], 12, 2);
+		if ($q['m']) {
+			$where .= " AND YEAR($wpdb->posts.post_date)=".substr($q['m'], 0, 4);
+			if (strlen($q['m']) > 5)
+				$where .= " AND MONTH($wpdb->posts.post_date)=".substr($q['m'], 4, 2);
+			if (strlen($q['m']) > 7)
+				$where .= " AND DAYOFMONTH($wpdb->posts.post_date)=".substr($q['m'], 6, 2);
+			if (strlen($q['m']) > 9)
+				$where .= " AND HOUR($wpdb->posts.post_date)=".substr($q['m'], 8, 2);
+			if (strlen($q['m']) > 11)
+				$where .= " AND MINUTE($wpdb->posts.post_date)=".substr($q['m'], 10, 2);
+			if (strlen($q['m']) > 13)
+				$where .= " AND SECOND($wpdb->posts.post_date)=".substr($q['m'], 12, 2);
 		}
 
 		// Handle the other individual date parameters
 		$date_parameters = array();
 
-		if ( '' !== $q['hour'] )
+		if ('' !== $q['hour'])
 			$date_parameters['hour'] = $q['hour'];
 
-		if ( '' !== $q['minute'] )
+		if ('' !== $q['minute'])
 			$date_parameters['minute'] = $q['minute'];
 
-		if ( '' !== $q['second'] )
+		if ('' !== $q['second'])
 			$date_parameters['second'] = $q['second'];
 
-		if ( $q['year'] )
+		if ($q['year'])
 			$date_parameters['year'] = $q['year'];
 
-		if ( $q['monthnum'] )
+		if ($q['monthnum'])
 			$date_parameters['monthnum'] = $q['monthnum'];
 
-		if ( $q['w'] )
+		if ($q['w'])
 			$date_parameters['week'] = $q['w'];
 
-		if ( $q['day'] )
+		if ($q['day'])
 			$date_parameters['day'] = $q['day'];
 
-		if ( $date_parameters ) {
-			$date_query = new WP_Date_Query( array( $date_parameters ) );
+		if ($date_parameters) {
+			$date_query = new WP_Date_Query(array($date_parameters));
 			$where .= $date_query->get_sql();
 		}
-		unset( $date_parameters, $date_query );
+		unset($date_parameters, $date_query);
 
 		// Handle complex date queries
-		if ( ! empty( $q['date_query'] ) ) {
-			$this->date_query = new WP_Date_Query( $q['date_query'] );
+		if ( ! empty($q['date_query'])) {
+			$this->date_query = new WP_Date_Query($q['date_query']);
 			$where .= $this->date_query->get_sql();
 		}
 
 
 		// If we've got a post_type AND it's not "any" post_type.
-		if ( !empty($q['post_type']) && 'any' != $q['post_type'] ) {
-			foreach ( (array)$q['post_type'] as $_post_type ) {
+		if ( ! empty($q['post_type']) && 'any' != $q['post_type']) {
+			foreach ((array) $q['post_type'] as $_post_type) {
 				$ptype_obj = get_post_type_object($_post_type);
-				if ( !$ptype_obj || !$ptype_obj->query_var || empty($q[ $ptype_obj->query_var ]) )
+				if ( ! $ptype_obj || ! $ptype_obj->query_var || empty($q[$ptype_obj->query_var]))
 					continue;
 
-				if ( ! $ptype_obj->hierarchical ) {
+				if ( ! $ptype_obj->hierarchical) {
 					// Non-hierarchical post types can directly use 'name'.
-					$q['name'] = $q[ $ptype_obj->query_var ];
+					$q['name'] = $q[$ptype_obj->query_var];
 				} else {
 					// Hierarchical post types will operate through 'pagename'.
-					$q['pagename'] = $q[ $ptype_obj->query_var ];
+					$q['pagename'] = $q[$ptype_obj->query_var];
 					$q['name'] = '';
 				}
 
@@ -2708,99 +2708,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.
 			 *
@@ -2809,36 +2809,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;
 			}
 		}
@@ -2847,22 +2847,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];
@@ -2875,156 +2875,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.
 				 *
@@ -3033,94 +3033,94 @@ 
 				 * @param string   $search_orderby The ORDER BY clause.
 				 * @param WP_Query $this           The current WP_Query instance.
 				 */
-				$search_orderby = apply_filters( 'posts_search_orderby', $search_orderby, $this );
+				$search_orderby = apply_filters('posts_search_orderby', $search_orderby, $this);
 			}
 
-			if ( $search_orderby )
-				$orderby = $orderby ? $search_orderby . ', ' . $orderby : $search_orderby;
+			if ($search_orderby)
+				$orderby = $orderby ? $search_orderby.', '.$orderby : $search_orderby;
 		}
 
-		if ( is_array( $post_type ) && count( $post_type ) > 1 ) {
+		if (is_array($post_type) && count($post_type) > 1) {
 			$post_type_cap = 'multiple_post_type';
 		} else {
-			if ( is_array( $post_type ) )
-				$post_type = reset( $post_type );
-			$post_type_object = get_post_type_object( $post_type );
-			if ( empty( $post_type_object ) )
+			if (is_array($post_type))
+				$post_type = reset($post_type);
+			$post_type_object = get_post_type_object($post_type);
+			if (empty($post_type_object))
 				$post_type_cap = $post_type;
 		}
 
-		if ( isset( $q['post_password'] ) ) {
-			$where .= $wpdb->prepare( " AND $wpdb->posts.post_password = %s", $q['post_password'] );
-			if ( empty( $q['perm'] ) ) {
+		if (isset($q['post_password'])) {
+			$where .= $wpdb->prepare(" AND $wpdb->posts.post_password = %s", $q['post_password']);
+			if (empty($q['perm'])) {
 				$q['perm'] = 'readable';
 			}
-		} elseif ( isset( $q['has_password'] ) ) {
-			$where .= sprintf( " AND $wpdb->posts.post_password %s ''", $q['has_password'] ? '!=' : '=' );
+		} elseif (isset($q['has_password'])) {
+			$where .= sprintf(" AND $wpdb->posts.post_password %s ''", $q['has_password'] ? '!=' : '=');
 		}
 
-		if ( ! empty( $q['comment_status'] ) ) {
-			$where .= $wpdb->prepare( " AND $wpdb->posts.comment_status = %s ", $q['comment_status'] );
+		if ( ! empty($q['comment_status'])) {
+			$where .= $wpdb->prepare(" AND $wpdb->posts.comment_status = %s ", $q['comment_status']);
 		}
 
-		if ( ! empty( $q['ping_status'] ) )  {
-			$where .= $wpdb->prepare( " AND $wpdb->posts.ping_status = %s ", $q['ping_status'] );
+		if ( ! empty($q['ping_status'])) {
+			$where .= $wpdb->prepare(" AND $wpdb->posts.ping_status = %s ", $q['ping_status']);
 		}
 
-		if ( 'any' == $post_type ) {
-			$in_search_post_types = get_post_types( array('exclude_from_search' => false) );
-			if ( empty( $in_search_post_types ) )
+		if ('any' == $post_type) {
+			$in_search_post_types = get_post_types(array('exclude_from_search' => false));
+			if (empty($in_search_post_types))
 				$where .= ' AND 1=0 ';
 			else
-				$where .= " AND $wpdb->posts.post_type IN ('" . join("', '", $in_search_post_types ) . "')";
-		} elseif ( !empty( $post_type ) && is_array( $post_type ) ) {
-			$where .= " AND $wpdb->posts.post_type IN ('" . join("', '", $post_type) . "')";
-		} elseif ( ! empty( $post_type ) ) {
+				$where .= " AND $wpdb->posts.post_type IN ('".join("', '", $in_search_post_types)."')";
+		} elseif ( ! empty($post_type) && is_array($post_type)) {
+			$where .= " AND $wpdb->posts.post_type IN ('".join("', '", $post_type)."')";
+		} elseif ( ! empty($post_type)) {
 			$where .= " AND $wpdb->posts.post_type = '$post_type'";
-			$post_type_object = get_post_type_object ( $post_type );
-		} elseif ( $this->is_attachment ) {
+			$post_type_object = get_post_type_object($post_type);
+		} elseif ($this->is_attachment) {
 			$where .= " AND $wpdb->posts.post_type = 'attachment'";
-			$post_type_object = get_post_type_object ( 'attachment' );
-		} elseif ( $this->is_page ) {
+			$post_type_object = get_post_type_object('attachment');
+		} elseif ($this->is_page) {
 			$where .= " AND $wpdb->posts.post_type = 'page'";
-			$post_type_object = get_post_type_object ( 'page' );
+			$post_type_object = get_post_type_object('page');
 		} else {
 			$where .= " AND $wpdb->posts.post_type = 'post'";
-			$post_type_object = get_post_type_object ( 'post' );
+			$post_type_object = get_post_type_object('post');
 		}
 
 		$edit_cap = 'edit_post';
 		$read_cap = 'read_post';
 
-		if ( ! empty( $post_type_object ) ) {
+		if ( ! empty($post_type_object)) {
 			$edit_others_cap = $post_type_object->cap->edit_others_posts;
 			$read_private_cap = $post_type_object->cap->read_private_posts;
 		} else {
-			$edit_others_cap = 'edit_others_' . $post_type_cap . 's';
-			$read_private_cap = 'read_private_' . $post_type_cap . 's';
+			$edit_others_cap = 'edit_others_'.$post_type_cap.'s';
+			$read_private_cap = 'read_private_'.$post_type_cap.'s';
 		}
 
 		$user_id = get_current_user_id();
 
 		$q_status = array();
-		if ( ! empty( $q['post_status'] ) ) {
+		if ( ! empty($q['post_status'])) {
 			$statuswheres = array();
 			$q_status = $q['post_status'];
-			if ( ! is_array( $q_status ) )
+			if ( ! is_array($q_status))
 				$q_status = explode(',', $q_status);
 			$r_status = array();
 			$p_status = array();
 			$e_status = array();
-			if ( in_array( 'any', $q_status ) ) {
-				foreach ( get_post_stati( array( 'exclude_from_search' => true ) ) as $status ) {
-					if ( ! in_array( $status, $q_status ) ) {
+			if (in_array('any', $q_status)) {
+				foreach (get_post_stati(array('exclude_from_search' => true)) as $status) {
+					if ( ! in_array($status, $q_status)) {
 						$e_status[] = "$wpdb->posts.post_status <> '$status'";
 					}
 				}
 			} else {
-				foreach ( get_post_stati() as $status ) {
-					if ( in_array( $status, $q_status ) ) {
-						if ( 'private' == $status )
+				foreach (get_post_stati() as $status) {
+					if (in_array($status, $q_status)) {
+						if ('private' == $status)
 							$p_status[] = "$wpdb->posts.post_status = '$status'";
 						else
 							$r_status[] = "$wpdb->posts.post_status = '$status'";
@@ -3128,58 +3128,58 @@ 
 				}
 			}
 
-			if ( empty($q['perm'] ) || 'readable' != $q['perm'] ) {
+			if (empty($q['perm']) || 'readable' != $q['perm']) {
 				$r_status = array_merge($r_status, $p_status);
 				unset($p_status);
 			}
 
-			if ( !empty($e_status) ) {
-				$statuswheres[] = "(" . join( ' AND ', $e_status ) . ")";
+			if ( ! empty($e_status)) {
+				$statuswheres[] = "(".join(' AND ', $e_status).")";
 			}
-			if ( !empty($r_status) ) {
-				if ( !empty($q['perm'] ) && 'editable' == $q['perm'] && !current_user_can($edit_others_cap) )
-					$statuswheres[] = "($wpdb->posts.post_author = $user_id " . "AND (" . join( ' OR ', $r_status ) . "))";
+			if ( ! empty($r_status)) {
+				if ( ! empty($q['perm']) && 'editable' == $q['perm'] && ! current_user_can($edit_others_cap))
+					$statuswheres[] = "($wpdb->posts.post_author = $user_id "."AND (".join(' OR ', $r_status)."))";
 				else
-					$statuswheres[] = "(" . join( ' OR ', $r_status ) . ")";
+					$statuswheres[] = "(".join(' OR ', $r_status).")";
 			}
-			if ( !empty($p_status) ) {
-				if ( !empty($q['perm'] ) && 'readable' == $q['perm'] && !current_user_can($read_private_cap) )
-					$statuswheres[] = "($wpdb->posts.post_author = $user_id " . "AND (" . join( ' OR ', $p_status ) . "))";
+			if ( ! empty($p_status)) {
+				if ( ! empty($q['perm']) && 'readable' == $q['perm'] && ! current_user_can($read_private_cap))
+					$statuswheres[] = "($wpdb->posts.post_author = $user_id "."AND (".join(' OR ', $p_status)."))";
 				else
-					$statuswheres[] = "(" . join( ' OR ', $p_status ) . ")";
+					$statuswheres[] = "(".join(' OR ', $p_status).")";
 			}
-			if ( $post_status_join ) {
+			if ($post_status_join) {
 				$join .= " LEFT JOIN $wpdb->posts AS p2 ON ($wpdb->posts.post_parent = p2.ID) ";
-				foreach ( $statuswheres as $index => $statuswhere )
-					$statuswheres[$index] = "($statuswhere OR ($wpdb->posts.post_status = 'inherit' AND " . str_replace($wpdb->posts, 'p2', $statuswhere) . "))";
+				foreach ($statuswheres as $index => $statuswhere)
+					$statuswheres[$index] = "($statuswhere OR ($wpdb->posts.post_status = 'inherit' AND ".str_replace($wpdb->posts, 'p2', $statuswhere)."))";
 			}
-			$where_status = implode( ' OR ', $statuswheres );
-			if ( ! empty( $where_status ) ) {
+			$where_status = implode(' OR ', $statuswheres);
+			if ( ! empty($where_status)) {
 				$where .= " AND ($where_status)";
 			}
-		} elseif ( !$this->is_singular ) {
+		} elseif ( ! $this->is_singular) {
 			$where .= " AND ($wpdb->posts.post_status = 'publish'";
 
 			// Add public states.
-			$public_states = get_post_stati( array('public' => true) );
-			foreach ( (array) $public_states as $state ) {
-				if ( 'publish' == $state ) // Publish is hard-coded above.
+			$public_states = get_post_stati(array('public' => true));
+			foreach ((array) $public_states as $state) {
+				if ('publish' == $state) // Publish is hard-coded above.
 					continue;
 				$where .= " OR $wpdb->posts.post_status = '$state'";
 			}
 
-			if ( $this->is_admin ) {
+			if ($this->is_admin) {
 				// Add protected states that should show in the admin all list.
-				$admin_all_states = get_post_stati( array('protected' => true, 'show_in_admin_all_list' => true) );
-				foreach ( (array) $admin_all_states as $state )
+				$admin_all_states = get_post_stati(array('protected' => true, 'show_in_admin_all_list' => true));
+				foreach ((array) $admin_all_states as $state)
 					$where .= " OR $wpdb->posts.post_status = '$state'";
 			}
 
-			if ( is_user_logged_in() ) {
+			if (is_user_logged_in()) {
 				// Add private states that are limited to viewing by the author of a post or someone who has caps to read private states.
-				$private_states = get_post_stati( array('private' => true) );
-				foreach ( (array) $private_states as $state )
-					$where .= current_user_can( $read_private_cap ) ? " OR $wpdb->posts.post_status = '$state'" : " OR $wpdb->posts.post_author = $user_id AND $wpdb->posts.post_status = '$state'";
+				$private_states = get_post_stati(array('private' => true));
+				foreach ((array) $private_states as $state)
+					$where .= current_user_can($read_private_cap) ? " OR $wpdb->posts.post_status = '$state'" : " OR $wpdb->posts.post_author = $user_id AND $wpdb->posts.post_status = '$state'";
 			}
 
 			$where .= ')';
@@ -3189,7 +3189,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.
 			 *
@@ -3198,7 +3198,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.
@@ -3208,28 +3208,28 @@ 
 			 * @param string   $where The JOIN clause of the query.
 			 * @param WP_Query &$this The WP_Query instance (passed by reference).
 			 */
-			$join = apply_filters_ref_array( 'posts_join', array( $join, &$this ) );
+			$join = apply_filters_ref_array('posts_join', array($join, &$this));
 		}
 
 		// Paging
-		if ( empty($q['nopaging']) && !$this->is_singular ) {
+		if (empty($q['nopaging']) && ! $this->is_singular) {
 			$page = absint($q['paged']);
-			if ( !$page )
+			if ( ! $page)
 				$page = 1;
 
 			// If 'offset' is provided, it takes precedence over 'paged'.
-			if ( isset( $q['offset'] ) && is_numeric( $q['offset'] ) ) {
-				$q['offset'] = absint( $q['offset'] );
-				$pgstrt = $q['offset'] . ', ';
+			if (isset($q['offset']) && is_numeric($q['offset'])) {
+				$q['offset'] = absint($q['offset']);
+				$pgstrt = $q['offset'].', ';
 			} else {
-				$pgstrt = absint( ( $page - 1 ) * $q['posts_per_page'] ) . ', ';
+				$pgstrt = absint(($page - 1) * $q['posts_per_page']).', ';
 			}
-			$limits = 'LIMIT ' . $pgstrt . $q['posts_per_page'];
+			$limits = 'LIMIT '.$pgstrt.$q['posts_per_page'];
 		}
 
 		// Comments feeds
-		if ( $this->is_comment_feed && ! $this->is_singular ) {
-			if ( $this->is_archive || $this->is_search ) {
+		if ($this->is_comment_feed && ! $this->is_singular) {
+			if ($this->is_archive || $this->is_search) {
 				$cjoin = "JOIN $wpdb->posts ON ($wpdb->comments.comment_post_ID = $wpdb->posts.ID) $join ";
 				$cwhere = "WHERE comment_approved = '1' $where";
 				$cgroupby = "$wpdb->comments.comment_id";
@@ -3239,7 +3239,7 @@ 
 				$cgroupby = '';
 			}
 
-			if ( !$q['suppress_filters'] ) {
+			if ( ! $q['suppress_filters']) {
 				/**
 				 * Filters the JOIN clause of the comments feed query before sending.
 				 *
@@ -3248,7 +3248,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.
@@ -3258,7 +3258,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.
@@ -3268,7 +3268,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.
@@ -3278,7 +3278,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.
@@ -3288,36 +3288,36 @@ 
 				 * @param string   $climits The JOIN clause of the query.
 				 * @param WP_Query &$this   The WP_Query instance (passed by reference).
 				 */
-				$climits = apply_filters_ref_array( 'comment_feed_limits', array( 'LIMIT ' . get_option('posts_per_rss'), &$this ) );
+				$climits = apply_filters_ref_array('comment_feed_limits', array('LIMIT '.get_option('posts_per_rss'), &$this));
 			}
-			$cgroupby = ( ! empty( $cgroupby ) ) ? 'GROUP BY ' . $cgroupby : '';
-			$corderby = ( ! empty( $corderby ) ) ? 'ORDER BY ' . $corderby : '';
+			$cgroupby = ( ! empty($cgroupby)) ? 'GROUP BY '.$cgroupby : '';
+			$corderby = ( ! empty($corderby)) ? 'ORDER BY '.$corderby : '';
 
 			$comments = (array) $wpdb->get_results("SELECT $distinct $wpdb->comments.* FROM $wpdb->comments $cjoin $cwhere $cgroupby $corderby $climits");
 			// Convert to WP_Comment
-			$this->comments = array_map( 'get_comment', $comments );
+			$this->comments = array_map('get_comment', $comments);
 			$this->comment_count = count($this->comments);
 
 			$post_ids = array();
 
-			foreach ( $this->comments as $comment )
+			foreach ($this->comments as $comment)
 				$post_ids[] = (int) $comment->comment_post_ID;
 
 			$post_ids = join(',', $post_ids);
 			$join = '';
-			if ( $post_ids )
+			if ($post_ids)
 				$where = "AND $wpdb->posts.ID IN ($post_ids) ";
 			else
 				$where = "AND 0";
 		}
 
-		$pieces = array( 'where', 'groupby', 'join', 'orderby', 'distinct', 'fields', 'limits' );
+		$pieces = array('where', 'groupby', 'join', 'orderby', 'distinct', 'fields', 'limits');
 
 		/*
 		 * Apply post-paging filters on where and join. Only plugins that
 		 * manipulate paging queries should use these hooks.
 		 */
-		if ( !$q['suppress_filters'] ) {
+		if ( ! $q['suppress_filters']) {
 			/**
 			 * Filters the WHERE clause of the query.
 			 *
@@ -3328,7 +3328,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.
@@ -3338,7 +3338,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.
@@ -3350,7 +3350,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.
@@ -3360,7 +3360,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.
@@ -3370,7 +3370,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.
@@ -3380,7 +3380,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.
@@ -3390,7 +3390,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.
@@ -3403,15 +3403,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'] : '';
 		}
 
 		/**
@@ -3423,13 +3423,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.
 			 *
@@ -3440,7 +3440,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.
@@ -3452,7 +3452,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.
@@ -3464,7 +3464,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.
@@ -3476,7 +3476,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.
@@ -3488,7 +3488,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.
@@ -3500,7 +3500,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.
@@ -3512,7 +3512,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.
@@ -3527,29 +3527,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.
 			 *
@@ -3558,7 +3558,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));
 		}
 
 		/**
@@ -3577,41 +3577,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.
@@ -3625,9 +3625,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";
@@ -3640,29 +3640,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.
 			 *
@@ -3671,38 +3671,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;
@@ -3710,23 +3710,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();
@@ -3734,7 +3734,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.
 				 *
@@ -3743,18 +3743,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);
@@ -3764,36 +3764,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.
@@ -3803,27 +3803,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;
@@ -3841,15 +3841,15 @@ 
 	 * @param array  $q      Query variables.
 	 * @param string $limits LIMIT clauses of the query.
 	 */
-	private function set_found_posts( $q, $limits ) {
+	private function set_found_posts($q, $limits) {
 		global $wpdb;
 
 		// Bail if posts is an empty array. Continue if posts is an empty string,
 		// null, or false to accommodate caching plugins that fill posts later.
-		if ( $q['no_found_rows'] || ( is_array( $this->posts ) && ! $this->posts ) )
+		if ($q['no_found_rows'] || (is_array($this->posts) && ! $this->posts))
 			return;
 
-		if ( ! empty( $limits ) ) {
+		if ( ! empty($limits)) {
 			/**
 			 * Filters the query to run for retrieving the found posts.
 			 *
@@ -3858,9 +3858,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);
 		}
 
 		/**
@@ -3871,10 +3871,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']);
 	}
 
 	/**
@@ -3908,7 +3908,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.
 			 *
@@ -3916,10 +3916,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);
 	}
 
 	/**
@@ -3933,9 +3933,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.
 			 *
@@ -3943,7 +3943,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();
 		}
@@ -3960,7 +3960,7 @@ 
 	 */
 	public function rewind_posts() {
 		$this->current_post = -1;
-		if ( $this->post_count > 0 ) {
+		if ($this->post_count > 0) {
 			$this->post = $this->posts[0];
 		}
 	}
@@ -3992,13 +3992,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');
 		}
 	}
 
@@ -4013,9 +4013,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();
 		}
 
@@ -4030,7 +4030,7 @@ 
 	 */
 	public function rewind_comments() {
 		$this->current_comment = -1;
-		if ( $this->comment_count > 0 ) {
+		if ($this->comment_count > 0) {
 			$this->comment = $this->comments[0];
 		}
 	}
@@ -4044,9 +4044,9 @@ 
 	 * @param string $query URL query string.
 	 * @return array List of posts.
 	 */
-	public function query( $query ) {
+	public function query($query) {
 		$this->init();
-		$this->query = $this->query_vars = wp_parse_args( $query );
+		$this->query = $this->query_vars = wp_parse_args($query);
 		return $this->get_posts();
 	}
 
@@ -4063,66 +4063,66 @@ 
 	 * @return object
 	 */
 	public function get_queried_object() {
-		if ( isset($this->queried_object) )
+		if (isset($this->queried_object))
 			return $this->queried_object;
 
 		$this->queried_object = null;
 		$this->queried_object_id = null;
 
-		if ( $this->is_category || $this->is_tag || $this->is_tax ) {
-			if ( $this->is_category ) {
-				if ( $this->get( 'cat' ) ) {
-					$term = get_term( $this->get( 'cat' ), 'category' );
-				} elseif ( $this->get( 'category_name' ) ) {
-					$term = get_term_by( 'slug', $this->get( 'category_name' ), 'category' );
+		if ($this->is_category || $this->is_tag || $this->is_tax) {
+			if ($this->is_category) {
+				if ($this->get('cat')) {
+					$term = get_term($this->get('cat'), 'category');
+				} elseif ($this->get('category_name')) {
+					$term = get_term_by('slug', $this->get('category_name'), 'category');
 				}
-			} elseif ( $this->is_tag ) {
-				if ( $this->get( 'tag_id' ) ) {
-					$term = get_term( $this->get( 'tag_id' ), 'post_tag' );
-				} elseif ( $this->get( 'tag' ) ) {
-					$term = get_term_by( 'slug', $this->get( 'tag' ), 'post_tag' );
+			} elseif ($this->is_tag) {
+				if ($this->get('tag_id')) {
+					$term = get_term($this->get('tag_id'), 'post_tag');
+				} elseif ($this->get('tag')) {
+					$term = get_term_by('slug', $this->get('tag'), 'post_tag');
 				}
 			} else {
 				// For other tax queries, grab the first term from the first clause.
-				$tax_query_in_and = wp_list_filter( $this->tax_query->queried_terms, array( 'operator' => 'NOT IN' ), 'NOT' );
+				$tax_query_in_and = wp_list_filter($this->tax_query->queried_terms, array('operator' => 'NOT IN'), 'NOT');
 
-				if ( ! empty( $tax_query_in_and ) ) {
-					$queried_taxonomies = array_keys( $tax_query_in_and );
-					$matched_taxonomy = reset( $queried_taxonomies );
-					$query = $tax_query_in_and[ $matched_taxonomy ];
+				if ( ! empty($tax_query_in_and)) {
+					$queried_taxonomies = array_keys($tax_query_in_and);
+					$matched_taxonomy = reset($queried_taxonomies);
+					$query = $tax_query_in_and[$matched_taxonomy];
 
-					if ( $query['terms'] ) {
-						if ( 'term_id' == $query['field'] ) {
-							$term = get_term( reset( $query['terms'] ), $matched_taxonomy );
+					if ($query['terms']) {
+						if ('term_id' == $query['field']) {
+							$term = get_term(reset($query['terms']), $matched_taxonomy);
 						} else {
-							$term = get_term_by( $query['field'], reset( $query['terms'] ), $matched_taxonomy );
+							$term = get_term_by($query['field'], reset($query['terms']), $matched_taxonomy);
 						}
 					}
 				}
 			}
 
-			if ( ! empty( $term ) && ! is_wp_error( $term ) )  {
+			if ( ! empty($term) && ! is_wp_error($term)) {
 				$this->queried_object = $term;
 				$this->queried_object_id = (int) $term->term_id;
 
-				if ( $this->is_category && 'category' === $this->queried_object->taxonomy )
-					_make_cat_compat( $this->queried_object );
+				if ($this->is_category && 'category' === $this->queried_object->taxonomy)
+					_make_cat_compat($this->queried_object);
 			}
-		} elseif ( $this->is_post_type_archive ) {
-			$post_type = $this->get( 'post_type' );
-			if ( is_array( $post_type ) )
-				$post_type = reset( $post_type );
-			$this->queried_object = get_post_type_object( $post_type );
-		} elseif ( $this->is_posts_page ) {
+		} elseif ($this->is_post_type_archive) {
+			$post_type = $this->get('post_type');
+			if (is_array($post_type))
+				$post_type = reset($post_type);
+			$this->queried_object = get_post_type_object($post_type);
+		} elseif ($this->is_posts_page) {
 			$page_for_posts = get_option('page_for_posts');
-			$this->queried_object = get_post( $page_for_posts );
+			$this->queried_object = get_post($page_for_posts);
 			$this->queried_object_id = (int) $this->queried_object->ID;
-		} elseif ( $this->is_singular && ! empty( $this->post ) ) {
+		} elseif ($this->is_singular && ! empty($this->post)) {
 			$this->queried_object = $this->post;
 			$this->queried_object_id = (int) $this->post->ID;
-		} elseif ( $this->is_author ) {
+		} elseif ($this->is_author) {
 			$this->queried_object_id = (int) $this->get('author');
-			$this->queried_object = get_userdata( $this->queried_object_id );
+			$this->queried_object = get_userdata($this->queried_object_id);
 		}
 
 		return $this->queried_object;
@@ -4139,7 +4139,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;
 		}
 
@@ -4157,7 +4157,7 @@ 
 	 * @param string|array $query URL query string or array of vars.
 	 */
 	public function __construct($query = '') {
-		if ( ! empty($query) ) {
+		if ( ! empty($query)) {
 			$this->query($query);
 		}
 	}
@@ -4171,8 +4171,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;
 		}
 	}
@@ -4186,9 +4186,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);
 		}
 	}
 
@@ -4202,9 +4202,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;
 	}
@@ -4230,16 +4230,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);
 	}
 
 	/**
@@ -4250,24 +4250,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;
@@ -4284,22 +4284,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;
@@ -4316,22 +4316,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;
@@ -4348,22 +4348,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;
@@ -4387,32 +4387,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
-			) );
+			));
 	}
 
 	/**
@@ -4424,7 +4424,7 @@ 
 	 * @return bool
 	 */
 	public function is_comments_popup() {
-		_deprecated_function( __FUNCTION__, '4.5.0' );
+		_deprecated_function(__FUNCTION__, '4.5.0');
 
 		return false;
 	}
@@ -4459,13 +4459,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);
 	}
 
 	/**
@@ -4497,9 +4497,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;
@@ -4550,31 +4550,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;
 				}
 			}
@@ -4643,31 +4643,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;
 				}
 			}
@@ -4689,13 +4689,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);
 	}
 
 	/**
@@ -4786,14 +4786,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;
 		}
 
@@ -4805,35 +4805,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);
 		}
 
 		/**
@@ -4848,12 +4848,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;
@@ -4870,7 +4870,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;
 	}
@@ -4883,9 +4883,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);
 		}
 	}
 
@@ -4899,8 +4899,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;
 	}
 
@@ -4914,8 +4914,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;
 	}
 }
@@ -4933,52 +4933,52 @@ 
 function wp_old_slug_redirect() {
 	global $wp_query;
 
-	if ( is_404() && '' !== $wp_query->query_vars['name'] ) :
+	if (is_404() && '' !== $wp_query->query_vars['name']) :
 		global $wpdb;
 
 		// Guess the current post_type based on the query vars.
-		if ( get_query_var( 'post_type' ) ) {
-			$post_type = get_query_var( 'post_type' );
-		} elseif ( get_query_var( 'attachment' ) ) {
+		if (get_query_var('post_type')) {
+			$post_type = get_query_var('post_type');
+		} elseif (get_query_var('attachment')) {
 			$post_type = 'attachment';
-		} elseif ( ! empty( $wp_query->query_vars['pagename'] ) ) {
+		} elseif ( ! empty($wp_query->query_vars['pagename'])) {
 			$post_type = 'page';
 		} else {
 			$post_type = 'post';
 		}
 
-		if ( is_array( $post_type ) ) {
-			if ( count( $post_type ) > 1 )
+		if (is_array($post_type)) {
+			if (count($post_type) > 1)
 				return;
-			$post_type = reset( $post_type );
+			$post_type = reset($post_type);
 		}
 
 		// Do not attempt redirect for hierarchical post types
-		if ( is_post_type_hierarchical( $post_type ) )
+		if (is_post_type_hierarchical($post_type))
 			return;
 
 		$query = $wpdb->prepare("SELECT post_id FROM $wpdb->postmeta, $wpdb->posts WHERE ID = post_id AND post_type = %s AND meta_key = '_wp_old_slug' AND meta_value = %s", $post_type, $wp_query->query_vars['name']);
 
 		// if year, monthnum, or day have been specified, make our query more precise
 		// just in case there are multiple identical _wp_old_slug values
-		if ( '' != $wp_query->query_vars['year'] )
+		if ('' != $wp_query->query_vars['year'])
 			$query .= $wpdb->prepare(" AND YEAR(post_date) = %d", $wp_query->query_vars['year']);
-		if ( '' != $wp_query->query_vars['monthnum'] )
+		if ('' != $wp_query->query_vars['monthnum'])
 			$query .= $wpdb->prepare(" AND MONTH(post_date) = %d", $wp_query->query_vars['monthnum']);
-		if ( '' != $wp_query->query_vars['day'] )
+		if ('' != $wp_query->query_vars['day'])
 			$query .= $wpdb->prepare(" AND DAYOFMONTH(post_date) = %d", $wp_query->query_vars['day']);
 
 		$id = (int) $wpdb->get_var($query);
 
-		if ( ! $id )
+		if ( ! $id)
 			return;
 
-		$link = get_permalink( $id );
+		$link = get_permalink($id);
 
-		if ( isset( $GLOBALS['wp_query']->query_vars['paged'] ) && $GLOBALS['wp_query']->query_vars['paged'] > 1 ) {
-			$link = user_trailingslashit( trailingslashit( $link ) . 'page/' . $GLOBALS['wp_query']->query_vars['paged'] );
-		} elseif( is_embed() ) {
-			$link = user_trailingslashit( trailingslashit( $link ) . 'embed' );
+		if (isset($GLOBALS['wp_query']->query_vars['paged']) && $GLOBALS['wp_query']->query_vars['paged'] > 1) {
+			$link = user_trailingslashit(trailingslashit($link).'page/'.$GLOBALS['wp_query']->query_vars['paged']);
+		} elseif (is_embed()) {
+			$link = user_trailingslashit(trailingslashit($link).'embed');
 		}
 
 		/**
@@ -4988,13 +4988,13 @@ 
 		 *
 		 * @param string $link The redirect URL.
 		 */
-		$link = apply_filters( 'old_slug_redirect_url', $link );
+		$link = apply_filters('old_slug_redirect_url', $link);
 
-		if ( ! $link ) {
+		if ( ! $link) {
 			return;
 		}
 
-		wp_redirect( $link, 301 ); // Permanent redirect
+		wp_redirect($link, 301); // Permanent redirect
 		exit;
 	endif;
 }
@@ -5010,11 +5010,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;

src/wp-includes/capabilities.php

Switch Indentation +290 added lines, -290 removed lines

@@ -31,226 +31,226 @@ 
 	$caps = array();
 
 	switch ( $cap ) {
-	case 'remove_user':
-		$caps[] = 'remove_users';
-		break;
-	case 'promote_user':
-	case 'add_users':
-		$caps[] = 'promote_users';
-		break;
-	case 'edit_user':
-	case 'edit_users':
-		// Allow user to edit itself
-		if ( 'edit_user' == $cap && isset( $args[0] ) && $user_id == $args[0] )
+		case 'remove_user':
+			$caps[] = 'remove_users';
 			break;
-
-		// In multisite the user must have manage_network_users caps. If editing a super admin, the user must be a super admin.
-		if ( is_multisite() && ( ( ! is_super_admin( $user_id ) && 'edit_user' === $cap && is_super_admin( $args[0] ) ) || ! user_can( $user_id, 'manage_network_users' ) ) ) {
-			$caps[] = 'do_not_allow';
-		} else {
-			$caps[] = 'edit_users'; // edit_user maps to edit_users.
-		}
-		break;
-	case 'delete_post':
-	case 'delete_page':
-		$post = get_post( $args[0] );
-		if ( ! $post ) {
-			$caps[] = 'do_not_allow';
+		case 'promote_user':
+		case 'add_users':
+			$caps[] = 'promote_users';
 			break;
-		}
+		case 'edit_user':
+		case 'edit_users':
+			// Allow user to edit itself
+			if ( 'edit_user' == $cap && isset( $args[0] ) && $user_id == $args[0] )
+				break;
 
-		if ( 'revision' == $post->post_type ) {
-			$post = get_post( $post->post_parent );
+			// In multisite the user must have manage_network_users caps. If editing a super admin, the user must be a super admin.
+			if ( is_multisite() && ( ( ! is_super_admin( $user_id ) && 'edit_user' === $cap && is_super_admin( $args[0] ) ) || ! user_can( $user_id, 'manage_network_users' ) ) ) {
+				$caps[] = 'do_not_allow';
+			} else {
+				$caps[] = 'edit_users'; // edit_user maps to edit_users.
+			}
+			break;
+		case 'delete_post':
+		case 'delete_page':
+			$post = get_post( $args[0] );
 			if ( ! $post ) {
 				$caps[] = 'do_not_allow';
 				break;
 			}
-		}
 
-		$post_type = get_post_type_object( $post->post_type );
-		if ( ! $post_type ) {
-			/* translators: 1: post type, 2: capability name */
-			_doing_it_wrong( __FUNCTION__, sprintf( __( 'The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.' ), $post->post_type, $cap ), '4.4.0' );
-			$caps[] = 'edit_others_posts';
-			break;
-		}
+			if ( 'revision' == $post->post_type ) {
+				$post = get_post( $post->post_parent );
+				if ( ! $post ) {
+					$caps[] = 'do_not_allow';
+					break;
+				}
+			}
 
-		if ( ! $post_type->map_meta_cap ) {
-			$caps[] = $post_type->cap->$cap;
-			// Prior to 3.1 we would re-call map_meta_cap here.
-			if ( 'delete_post' == $cap )
-				$cap = $post_type->cap->$cap;
-			break;
-		}
+			$post_type = get_post_type_object( $post->post_type );
+			if ( ! $post_type ) {
+				/* translators: 1: post type, 2: capability name */
+				_doing_it_wrong( __FUNCTION__, sprintf( __( 'The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.' ), $post->post_type, $cap ), '4.4.0' );
+				$caps[] = 'edit_others_posts';
+				break;
+			}
 
-		// If the post author is set and the user is the author...
-		if ( $post->post_author && $user_id == $post->post_author ) {
-			// If the post is published or scheduled...
-			if ( in_array( $post->post_status, array( 'publish', 'future' ), true ) ) {
-				$caps[] = $post_type->cap->delete_published_posts;
-			} elseif ( 'trash' == $post->post_status ) {
-				$status = get_post_meta( $post->ID, '_wp_trash_meta_status', true );
-				if ( in_array( $status, array( 'publish', 'future' ), true ) ) {
+			if ( ! $post_type->map_meta_cap ) {
+				$caps[] = $post_type->cap->$cap;
+				// Prior to 3.1 we would re-call map_meta_cap here.
+				if ( 'delete_post' == $cap )
+					$cap = $post_type->cap->$cap;
+				break;
+			}
+
+			// If the post author is set and the user is the author...
+			if ( $post->post_author && $user_id == $post->post_author ) {
+				// If the post is published or scheduled...
+				if ( in_array( $post->post_status, array( 'publish', 'future' ), true ) ) {
 					$caps[] = $post_type->cap->delete_published_posts;
+				} elseif ( 'trash' == $post->post_status ) {
+					$status = get_post_meta( $post->ID, '_wp_trash_meta_status', true );
+					if ( in_array( $status, array( 'publish', 'future' ), true ) ) {
+						$caps[] = $post_type->cap->delete_published_posts;
+					} else {
+						$caps[] = $post_type->cap->delete_posts;
+					}
 				} else {
+					// If the post is draft...
 					$caps[] = $post_type->cap->delete_posts;
 				}
 			} else {
-				// If the post is draft...
-				$caps[] = $post_type->cap->delete_posts;
-			}
-		} else {
-			// The user is trying to edit someone else's post.
-			$caps[] = $post_type->cap->delete_others_posts;
-			// The post is published or scheduled, extra cap required.
-			if ( in_array( $post->post_status, array( 'publish', 'future' ), true ) ) {
-				$caps[] = $post_type->cap->delete_published_posts;
-			} elseif ( 'private' == $post->post_status ) {
-				$caps[] = $post_type->cap->delete_private_posts;
+				// The user is trying to edit someone else's post.
+				$caps[] = $post_type->cap->delete_others_posts;
+				// The post is published or scheduled, extra cap required.
+				if ( in_array( $post->post_status, array( 'publish', 'future' ), true ) ) {
+					$caps[] = $post_type->cap->delete_published_posts;
+				} elseif ( 'private' == $post->post_status ) {
+					$caps[] = $post_type->cap->delete_private_posts;
+				}
 			}
-		}
-		break;
-		// edit_post breaks down to edit_posts, edit_published_posts, or
-		// edit_others_posts
-	case 'edit_post':
-	case 'edit_page':
-		$post = get_post( $args[0] );
-		if ( ! $post ) {
-			$caps[] = 'do_not_allow';
 			break;
-		}
-
-		if ( 'revision' == $post->post_type ) {
-			$post = get_post( $post->post_parent );
+			// edit_post breaks down to edit_posts, edit_published_posts, or
+			// edit_others_posts
+		case 'edit_post':
+		case 'edit_page':
+			$post = get_post( $args[0] );
 			if ( ! $post ) {
 				$caps[] = 'do_not_allow';
 				break;
 			}
-		}
 
-		$post_type = get_post_type_object( $post->post_type );
-		if ( ! $post_type ) {
-			/* translators: 1: post type, 2: capability name */
-			_doing_it_wrong( __FUNCTION__, sprintf( __( 'The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.' ), $post->post_type, $cap ), '4.4.0' );
-			$caps[] = 'edit_others_posts';
-			break;
-		}
+			if ( 'revision' == $post->post_type ) {
+				$post = get_post( $post->post_parent );
+				if ( ! $post ) {
+					$caps[] = 'do_not_allow';
+					break;
+				}
+			}
 
-		if ( ! $post_type->map_meta_cap ) {
-			$caps[] = $post_type->cap->$cap;
-			// Prior to 3.1 we would re-call map_meta_cap here.
-			if ( 'edit_post' == $cap )
-				$cap = $post_type->cap->$cap;
-			break;
-		}
+			$post_type = get_post_type_object( $post->post_type );
+			if ( ! $post_type ) {
+				/* translators: 1: post type, 2: capability name */
+				_doing_it_wrong( __FUNCTION__, sprintf( __( 'The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.' ), $post->post_type, $cap ), '4.4.0' );
+				$caps[] = 'edit_others_posts';
+				break;
+			}
 
-		// If the post author is set and the user is the author...
-		if ( $post->post_author && $user_id == $post->post_author ) {
-			// If the post is published or scheduled...
-			if ( in_array( $post->post_status, array( 'publish', 'future' ), true ) ) {
-				$caps[] = $post_type->cap->edit_published_posts;
-			} elseif ( 'trash' == $post->post_status ) {
-				$status = get_post_meta( $post->ID, '_wp_trash_meta_status', true );
-				if ( in_array( $status, array( 'publish', 'future' ), true ) ) {
+			if ( ! $post_type->map_meta_cap ) {
+				$caps[] = $post_type->cap->$cap;
+				// Prior to 3.1 we would re-call map_meta_cap here.
+				if ( 'edit_post' == $cap )
+					$cap = $post_type->cap->$cap;
+				break;
+			}
+
+			// If the post author is set and the user is the author...
+			if ( $post->post_author && $user_id == $post->post_author ) {
+				// If the post is published or scheduled...
+				if ( in_array( $post->post_status, array( 'publish', 'future' ), true ) ) {
 					$caps[] = $post_type->cap->edit_published_posts;
+				} elseif ( 'trash' == $post->post_status ) {
+					$status = get_post_meta( $post->ID, '_wp_trash_meta_status', true );
+					if ( in_array( $status, array( 'publish', 'future' ), true ) ) {
+						$caps[] = $post_type->cap->edit_published_posts;
+					} else {
+						$caps[] = $post_type->cap->edit_posts;
+					}
 				} else {
+					// If the post is draft...
 					$caps[] = $post_type->cap->edit_posts;
 				}
 			} else {
-				// If the post is draft...
-				$caps[] = $post_type->cap->edit_posts;
-			}
-		} else {
-			// The user is trying to edit someone else's post.
-			$caps[] = $post_type->cap->edit_others_posts;
-			// The post is published or scheduled, extra cap required.
-			if ( in_array( $post->post_status, array( 'publish', 'future' ), true ) ) {
-				$caps[] = $post_type->cap->edit_published_posts;
-			} elseif ( 'private' == $post->post_status ) {
-				$caps[] = $post_type->cap->edit_private_posts;
+				// The user is trying to edit someone else's post.
+				$caps[] = $post_type->cap->edit_others_posts;
+				// The post is published or scheduled, extra cap required.
+				if ( in_array( $post->post_status, array( 'publish', 'future' ), true ) ) {
+					$caps[] = $post_type->cap->edit_published_posts;
+				} elseif ( 'private' == $post->post_status ) {
+					$caps[] = $post_type->cap->edit_private_posts;
+				}
 			}
-		}
-		break;
-	case 'read_post':
-	case 'read_page':
-		$post = get_post( $args[0] );
-		if ( ! $post ) {
-			$caps[] = 'do_not_allow';
 			break;
-		}
-
-		if ( 'revision' == $post->post_type ) {
-			$post = get_post( $post->post_parent );
+		case 'read_post':
+		case 'read_page':
+			$post = get_post( $args[0] );
 			if ( ! $post ) {
 				$caps[] = 'do_not_allow';
 				break;
 			}
-		}
 
-		$post_type = get_post_type_object( $post->post_type );
-		if ( ! $post_type ) {
-			/* translators: 1: post type, 2: capability name */
-			_doing_it_wrong( __FUNCTION__, sprintf( __( 'The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.' ), $post->post_type, $cap ), '4.4.0' );
-			$caps[] = 'edit_others_posts';
-			break;
-		}
+			if ( 'revision' == $post->post_type ) {
+				$post = get_post( $post->post_parent );
+				if ( ! $post ) {
+					$caps[] = 'do_not_allow';
+					break;
+				}
+			}
 
-		if ( ! $post_type->map_meta_cap ) {
-			$caps[] = $post_type->cap->$cap;
-			// Prior to 3.1 we would re-call map_meta_cap here.
-			if ( 'read_post' == $cap )
-				$cap = $post_type->cap->$cap;
-			break;
-		}
+			$post_type = get_post_type_object( $post->post_type );
+			if ( ! $post_type ) {
+				/* translators: 1: post type, 2: capability name */
+				_doing_it_wrong( __FUNCTION__, sprintf( __( 'The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.' ), $post->post_type, $cap ), '4.4.0' );
+				$caps[] = 'edit_others_posts';
+				break;
+			}
 
-		$status_obj = get_post_status_object( $post->post_status );
-		if ( $status_obj->public ) {
-			$caps[] = $post_type->cap->read;
-			break;
-		}
+			if ( ! $post_type->map_meta_cap ) {
+				$caps[] = $post_type->cap->$cap;
+				// Prior to 3.1 we would re-call map_meta_cap here.
+				if ( 'read_post' == $cap )
+					$cap = $post_type->cap->$cap;
+				break;
+			}
 
-		if ( $post->post_author && $user_id == $post->post_author ) {
-			$caps[] = $post_type->cap->read;
-		} elseif ( $status_obj->private ) {
-			$caps[] = $post_type->cap->read_private_posts;
-		} else {
-			$caps = map_meta_cap( 'edit_post', $user_id, $post->ID );
-		}
-		break;
-	case 'publish_post':
-		$post = get_post( $args[0] );
-		if ( ! $post ) {
-			$caps[] = 'do_not_allow';
-			break;
-		}
+			$status_obj = get_post_status_object( $post->post_status );
+			if ( $status_obj->public ) {
+				$caps[] = $post_type->cap->read;
+				break;
+			}
 
-		$post_type = get_post_type_object( $post->post_type );
-		if ( ! $post_type ) {
-			/* translators: 1: post type, 2: capability name */
-			_doing_it_wrong( __FUNCTION__, sprintf( __( 'The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.' ), $post->post_type, $cap ), '4.4.0' );
-			$caps[] = 'edit_others_posts';
+			if ( $post->post_author && $user_id == $post->post_author ) {
+				$caps[] = $post_type->cap->read;
+			} elseif ( $status_obj->private ) {
+				$caps[] = $post_type->cap->read_private_posts;
+			} else {
+				$caps = map_meta_cap( 'edit_post', $user_id, $post->ID );
+			}
 			break;
-		}
+		case 'publish_post':
+			$post = get_post( $args[0] );
+			if ( ! $post ) {
+				$caps[] = 'do_not_allow';
+				break;
+			}
+
+			$post_type = get_post_type_object( $post->post_type );
+			if ( ! $post_type ) {
+				/* translators: 1: post type, 2: capability name */
+				_doing_it_wrong( __FUNCTION__, sprintf( __( 'The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.' ), $post->post_type, $cap ), '4.4.0' );
+				$caps[] = 'edit_others_posts';
+				break;
+			}
 
-		$caps[] = $post_type->cap->publish_posts;
-		break;
-	case 'edit_post_meta':
-	case 'delete_post_meta':
-	case 'add_post_meta':
-		$post = get_post( $args[0] );
-		if ( ! $post ) {
-			$caps[] = 'do_not_allow';
+			$caps[] = $post_type->cap->publish_posts;
 			break;
-		}
+		case 'edit_post_meta':
+		case 'delete_post_meta':
+		case 'add_post_meta':
+			$post = get_post( $args[0] );
+			if ( ! $post ) {
+				$caps[] = 'do_not_allow';
+				break;
+			}
 
-		$post_type = get_post_type( $post );
+			$post_type = get_post_type( $post );
 
-		$caps = map_meta_cap( 'edit_post', $user_id, $post->ID );
+			$caps = map_meta_cap( 'edit_post', $user_id, $post->ID );
 
-		$meta_key = isset( $args[ 1 ] ) ? $args[ 1 ] : false;
+			$meta_key = isset( $args[ 1 ] ) ? $args[ 1 ] : false;
 
-		if ( $meta_key && ( has_filter( "auth_post_meta_{$meta_key}" ) || has_filter( "auth_post_{$post_type}_meta_{$meta_key}" ) ) ) {
-			/**
+			if ( $meta_key && ( has_filter( "auth_post_meta_{$meta_key}" ) || has_filter( "auth_post_{$post_type}_meta_{$meta_key}" ) ) ) {
+				/**
 			 * Filters whether the user is allowed to add post meta to a post.
 			 *
 			 * The dynamic portion of the hook name, `$meta_key`, refers to the
@@ -265,9 +265,9 @@ 
 			 * @param string $cap      Capability name.
 			 * @param array  $caps     User capabilities.
 			 */
-			$allowed = apply_filters( "auth_post_meta_{$meta_key}", false, $meta_key, $post->ID, $user_id, $cap, $caps );
+				$allowed = apply_filters( "auth_post_meta_{$meta_key}", false, $meta_key, $post->ID, $user_id, $cap, $caps );
 
-			/**
+				/**
 			 * Filters whether the user is allowed to add post meta to a post of a given type.
 			 *
 			 * The dynamic portions of the hook name, `$meta_key` and `$post_type`,
@@ -282,131 +282,131 @@ 
 			 * @param string $cap      Capability name.
 			 * @param array  $caps     User capabilities.
 			 */
-			$allowed = apply_filters( "auth_post_{$post_type}_meta_{$meta_key}", $allowed, $meta_key, $post->ID, $user_id, $cap, $caps );
+				$allowed = apply_filters( "auth_post_{$post_type}_meta_{$meta_key}", $allowed, $meta_key, $post->ID, $user_id, $cap, $caps );
 
-			if ( ! $allowed )
+				if ( ! $allowed )
+					$caps[] = $cap;
+			} elseif ( $meta_key && is_protected_meta( $meta_key, 'post' ) ) {
 				$caps[] = $cap;
-		} elseif ( $meta_key && is_protected_meta( $meta_key, 'post' ) ) {
-			$caps[] = $cap;
-		}
-		break;
-	case 'edit_comment':
-		$comment = get_comment( $args[0] );
-		if ( ! $comment ) {
-			$caps[] = 'do_not_allow';
+			}
 			break;
-		}
+		case 'edit_comment':
+			$comment = get_comment( $args[0] );
+			if ( ! $comment ) {
+				$caps[] = 'do_not_allow';
+				break;
+			}
 
-		$post = get_post( $comment->comment_post_ID );
+			$post = get_post( $comment->comment_post_ID );
 
-		/*
+			/*
 		 * If the post doesn't exist, we have an orphaned comment.
 		 * Fall back to the edit_posts capability, instead.
 		 */
-		if ( $post ) {
-			$caps = map_meta_cap( 'edit_post', $user_id, $post->ID );
-		} else {
-			$caps = map_meta_cap( 'edit_posts', $user_id );
-		}
-		break;
-	case 'unfiltered_upload':
-		if ( defined('ALLOW_UNFILTERED_UPLOADS') && ALLOW_UNFILTERED_UPLOADS && ( !is_multisite() || is_super_admin( $user_id ) )  )
-			$caps[] = $cap;
-		else
-			$caps[] = 'do_not_allow';
-		break;
-	case 'unfiltered_html' :
-		// Disallow unfiltered_html for all users, even admins and super admins.
-		if ( defined( 'DISALLOW_UNFILTERED_HTML' ) && DISALLOW_UNFILTERED_HTML )
-			$caps[] = 'do_not_allow';
-		elseif ( is_multisite() && ! is_super_admin( $user_id ) )
-			$caps[] = 'do_not_allow';
-		else
-			$caps[] = $cap;
-		break;
-	case 'edit_files':
-	case 'edit_plugins':
-	case 'edit_themes':
-		// Disallow the file editors.
-		if ( defined( 'DISALLOW_FILE_EDIT' ) && DISALLOW_FILE_EDIT )
-			$caps[] = 'do_not_allow';
-		elseif ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS )
-			$caps[] = 'do_not_allow';
-		elseif ( is_multisite() && ! is_super_admin( $user_id ) )
-			$caps[] = 'do_not_allow';
-		else
-			$caps[] = $cap;
-		break;
-	case 'update_plugins':
-	case 'delete_plugins':
-	case 'install_plugins':
-	case 'upload_plugins':
-	case 'update_themes':
-	case 'delete_themes':
-	case 'install_themes':
-	case 'upload_themes':
-	case 'update_core':
-		// Disallow anything that creates, deletes, or updates core, plugin, or theme files.
-		// Files in uploads are excepted.
-		if ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS ) {
-			$caps[] = 'do_not_allow';
-		} elseif ( is_multisite() && ! is_super_admin( $user_id ) ) {
-			$caps[] = 'do_not_allow';
-		} elseif ( 'upload_themes' === $cap ) {
-			$caps[] = 'install_themes';
-		} elseif ( 'upload_plugins' === $cap ) {
-			$caps[] = 'install_plugins';
-		} else {
-			$caps[] = $cap;
-		}
-		break;
-	case 'activate_plugins':
-		$caps[] = $cap;
-		if ( is_multisite() ) {
-			// update_, install_, and delete_ are handled above with is_super_admin().
-			$menu_perms = get_site_option( 'menu_items', array() );
-			if ( empty( $menu_perms['plugins'] ) )
-				$caps[] = 'manage_network_plugins';
-		}
-		break;
-	case 'delete_user':
-	case 'delete_users':
-		// If multisite only super admins can delete users.
-		if ( is_multisite() && ! is_super_admin( $user_id ) )
-			$caps[] = 'do_not_allow';
-		else
-			$caps[] = 'delete_users'; // delete_user maps to delete_users.
-		break;
-	case 'create_users':
-		if ( !is_multisite() )
-			$caps[] = $cap;
-		elseif ( is_super_admin( $user_id ) || get_site_option( 'add_new_users' ) )
-			$caps[] = $cap;
-		else
-			$caps[] = 'do_not_allow';
-		break;
-	case 'manage_links' :
-		if ( get_option( 'link_manager_enabled' ) )
+			if ( $post ) {
+				$caps = map_meta_cap( 'edit_post', $user_id, $post->ID );
+			} else {
+				$caps = map_meta_cap( 'edit_posts', $user_id );
+			}
+			break;
+		case 'unfiltered_upload':
+			if ( defined('ALLOW_UNFILTERED_UPLOADS') && ALLOW_UNFILTERED_UPLOADS && ( !is_multisite() || is_super_admin( $user_id ) )  )
+				$caps[] = $cap;
+			else
+				$caps[] = 'do_not_allow';
+			break;
+		case 'unfiltered_html' :
+			// Disallow unfiltered_html for all users, even admins and super admins.
+			if ( defined( 'DISALLOW_UNFILTERED_HTML' ) && DISALLOW_UNFILTERED_HTML )
+				$caps[] = 'do_not_allow';
+			elseif ( is_multisite() && ! is_super_admin( $user_id ) )
+				$caps[] = 'do_not_allow';
+			else
+				$caps[] = $cap;
+			break;
+		case 'edit_files':
+		case 'edit_plugins':
+		case 'edit_themes':
+			// Disallow the file editors.
+			if ( defined( 'DISALLOW_FILE_EDIT' ) && DISALLOW_FILE_EDIT )
+				$caps[] = 'do_not_allow';
+			elseif ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS )
+				$caps[] = 'do_not_allow';
+			elseif ( is_multisite() && ! is_super_admin( $user_id ) )
+				$caps[] = 'do_not_allow';
+			else
+				$caps[] = $cap;
+			break;
+		case 'update_plugins':
+		case 'delete_plugins':
+		case 'install_plugins':
+		case 'upload_plugins':
+		case 'update_themes':
+		case 'delete_themes':
+		case 'install_themes':
+		case 'upload_themes':
+		case 'update_core':
+			// Disallow anything that creates, deletes, or updates core, plugin, or theme files.
+			// Files in uploads are excepted.
+			if ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS ) {
+				$caps[] = 'do_not_allow';
+			} elseif ( is_multisite() && ! is_super_admin( $user_id ) ) {
+				$caps[] = 'do_not_allow';
+			} elseif ( 'upload_themes' === $cap ) {
+				$caps[] = 'install_themes';
+			} elseif ( 'upload_plugins' === $cap ) {
+				$caps[] = 'install_plugins';
+			} else {
+				$caps[] = $cap;
+			}
+			break;
+		case 'activate_plugins':
 			$caps[] = $cap;
-		else
-			$caps[] = 'do_not_allow';
-		break;
-	case 'customize' :
-		$caps[] = 'edit_theme_options';
-		break;
-	case 'delete_site':
-		$caps[] = 'manage_options';
-		break;
-	default:
-		// Handle meta capabilities for custom post types.
-		global $post_type_meta_caps;
-		if ( isset( $post_type_meta_caps[ $cap ] ) ) {
-			$args = array_merge( array( $post_type_meta_caps[ $cap ], $user_id ), $args );
-			return call_user_func_array( 'map_meta_cap', $args );
-		}
+			if ( is_multisite() ) {
+				// update_, install_, and delete_ are handled above with is_super_admin().
+				$menu_perms = get_site_option( 'menu_items', array() );
+				if ( empty( $menu_perms['plugins'] ) )
+					$caps[] = 'manage_network_plugins';
+			}
+			break;
+		case 'delete_user':
+		case 'delete_users':
+			// If multisite only super admins can delete users.
+			if ( is_multisite() && ! is_super_admin( $user_id ) )
+				$caps[] = 'do_not_allow';
+			else
+				$caps[] = 'delete_users'; // delete_user maps to delete_users.
+			break;
+		case 'create_users':
+			if ( !is_multisite() )
+				$caps[] = $cap;
+			elseif ( is_super_admin( $user_id ) || get_site_option( 'add_new_users' ) )
+				$caps[] = $cap;
+			else
+				$caps[] = 'do_not_allow';
+			break;
+		case 'manage_links' :
+			if ( get_option( 'link_manager_enabled' ) )
+				$caps[] = $cap;
+			else
+				$caps[] = 'do_not_allow';
+			break;
+		case 'customize' :
+			$caps[] = 'edit_theme_options';
+			break;
+		case 'delete_site':
+			$caps[] = 'manage_options';
+			break;
+		default:
+			// Handle meta capabilities for custom post types.
+			global $post_type_meta_caps;
+			if ( isset( $post_type_meta_caps[ $cap ] ) ) {
+				$args = array_merge( array( $post_type_meta_caps[ $cap ], $user_id ), $args );
+				return call_user_func_array( 'map_meta_cap', $args );
+			}
 
-		// If no meta caps match, return the original cap.
-		$caps[] = $cap;
+			// If no meta caps match, return the original cap.
+			$caps[] = $cap;
 	}
 
 	/**

Spacing +158 added lines, -158 removed lines

@@ -26,11 +26,11 @@ 
  *                          'edit_others_posts', etc. The parameter is accessed via func_get_args().
  * @return array Actual capabilities for meta capability.
  */
-function map_meta_cap( $cap, $user_id ) {
-	$args = array_slice( func_get_args(), 2 );
+function map_meta_cap($cap, $user_id) {
+	$args = array_slice(func_get_args(), 2);
 	$caps = array();
 
-	switch ( $cap ) {
+	switch ($cap) {
 	case 'remove_user':
 		$caps[] = 'remove_users';
 		break;
@@ -41,11 +41,11 @@ 
 	case 'edit_user':
 	case 'edit_users':
 		// Allow user to edit itself
-		if ( 'edit_user' == $cap && isset( $args[0] ) && $user_id == $args[0] )
+		if ('edit_user' == $cap && isset($args[0]) && $user_id == $args[0])
 			break;
 
 		// In multisite the user must have manage_network_users caps. If editing a super admin, the user must be a super admin.
-		if ( is_multisite() && ( ( ! is_super_admin( $user_id ) && 'edit_user' === $cap && is_super_admin( $args[0] ) ) || ! user_can( $user_id, 'manage_network_users' ) ) ) {
+		if (is_multisite() && (( ! is_super_admin($user_id) && 'edit_user' === $cap && is_super_admin($args[0])) || ! user_can($user_id, 'manage_network_users'))) {
 			$caps[] = 'do_not_allow';
 		} else {
 			$caps[] = 'edit_users'; // edit_user maps to edit_users.
@@ -53,44 +53,44 @@ 
 		break;
 	case 'delete_post':
 	case 'delete_page':
-		$post = get_post( $args[0] );
-		if ( ! $post ) {
+		$post = get_post($args[0]);
+		if ( ! $post) {
 			$caps[] = 'do_not_allow';
 			break;
 		}
 
-		if ( 'revision' == $post->post_type ) {
-			$post = get_post( $post->post_parent );
-			if ( ! $post ) {
+		if ('revision' == $post->post_type) {
+			$post = get_post($post->post_parent);
+			if ( ! $post) {
 				$caps[] = 'do_not_allow';
 				break;
 			}
 		}
 
-		$post_type = get_post_type_object( $post->post_type );
-		if ( ! $post_type ) {
+		$post_type = get_post_type_object($post->post_type);
+		if ( ! $post_type) {
 			/* translators: 1: post type, 2: capability name */
-			_doing_it_wrong( __FUNCTION__, sprintf( __( 'The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.' ), $post->post_type, $cap ), '4.4.0' );
+			_doing_it_wrong(__FUNCTION__, sprintf(__('The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.'), $post->post_type, $cap), '4.4.0');
 			$caps[] = 'edit_others_posts';
 			break;
 		}
 
-		if ( ! $post_type->map_meta_cap ) {
+		if ( ! $post_type->map_meta_cap) {
 			$caps[] = $post_type->cap->$cap;
 			// Prior to 3.1 we would re-call map_meta_cap here.
-			if ( 'delete_post' == $cap )
+			if ('delete_post' == $cap)
 				$cap = $post_type->cap->$cap;
 			break;
 		}
 
 		// If the post author is set and the user is the author...
-		if ( $post->post_author && $user_id == $post->post_author ) {
+		if ($post->post_author && $user_id == $post->post_author) {
 			// If the post is published or scheduled...
-			if ( in_array( $post->post_status, array( 'publish', 'future' ), true ) ) {
+			if (in_array($post->post_status, array('publish', 'future'), true)) {
 				$caps[] = $post_type->cap->delete_published_posts;
-			} elseif ( 'trash' == $post->post_status ) {
-				$status = get_post_meta( $post->ID, '_wp_trash_meta_status', true );
-				if ( in_array( $status, array( 'publish', 'future' ), true ) ) {
+			} elseif ('trash' == $post->post_status) {
+				$status = get_post_meta($post->ID, '_wp_trash_meta_status', true);
+				if (in_array($status, array('publish', 'future'), true)) {
 					$caps[] = $post_type->cap->delete_published_posts;
 				} else {
 					$caps[] = $post_type->cap->delete_posts;
@@ -103,9 +103,9 @@ 
 			// The user is trying to edit someone else's post.
 			$caps[] = $post_type->cap->delete_others_posts;
 			// The post is published or scheduled, extra cap required.
-			if ( in_array( $post->post_status, array( 'publish', 'future' ), true ) ) {
+			if (in_array($post->post_status, array('publish', 'future'), true)) {
 				$caps[] = $post_type->cap->delete_published_posts;
-			} elseif ( 'private' == $post->post_status ) {
+			} elseif ('private' == $post->post_status) {
 				$caps[] = $post_type->cap->delete_private_posts;
 			}
 		}
@@ -114,44 +114,44 @@ 
 		// edit_others_posts
 	case 'edit_post':
 	case 'edit_page':
-		$post = get_post( $args[0] );
-		if ( ! $post ) {
+		$post = get_post($args[0]);
+		if ( ! $post) {
 			$caps[] = 'do_not_allow';
 			break;
 		}
 
-		if ( 'revision' == $post->post_type ) {
-			$post = get_post( $post->post_parent );
-			if ( ! $post ) {
+		if ('revision' == $post->post_type) {
+			$post = get_post($post->post_parent);
+			if ( ! $post) {
 				$caps[] = 'do_not_allow';
 				break;
 			}
 		}
 
-		$post_type = get_post_type_object( $post->post_type );
-		if ( ! $post_type ) {
+		$post_type = get_post_type_object($post->post_type);
+		if ( ! $post_type) {
 			/* translators: 1: post type, 2: capability name */
-			_doing_it_wrong( __FUNCTION__, sprintf( __( 'The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.' ), $post->post_type, $cap ), '4.4.0' );
+			_doing_it_wrong(__FUNCTION__, sprintf(__('The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.'), $post->post_type, $cap), '4.4.0');
 			$caps[] = 'edit_others_posts';
 			break;
 		}
 
-		if ( ! $post_type->map_meta_cap ) {
+		if ( ! $post_type->map_meta_cap) {
 			$caps[] = $post_type->cap->$cap;
 			// Prior to 3.1 we would re-call map_meta_cap here.
-			if ( 'edit_post' == $cap )
+			if ('edit_post' == $cap)
 				$cap = $post_type->cap->$cap;
 			break;
 		}
 
 		// If the post author is set and the user is the author...
-		if ( $post->post_author && $user_id == $post->post_author ) {
+		if ($post->post_author && $user_id == $post->post_author) {
 			// If the post is published or scheduled...
-			if ( in_array( $post->post_status, array( 'publish', 'future' ), true ) ) {
+			if (in_array($post->post_status, array('publish', 'future'), true)) {
 				$caps[] = $post_type->cap->edit_published_posts;
-			} elseif ( 'trash' == $post->post_status ) {
-				$status = get_post_meta( $post->ID, '_wp_trash_meta_status', true );
-				if ( in_array( $status, array( 'publish', 'future' ), true ) ) {
+			} elseif ('trash' == $post->post_status) {
+				$status = get_post_meta($post->ID, '_wp_trash_meta_status', true);
+				if (in_array($status, array('publish', 'future'), true)) {
 					$caps[] = $post_type->cap->edit_published_posts;
 				} else {
 					$caps[] = $post_type->cap->edit_posts;
@@ -164,70 +164,70 @@ 
 			// The user is trying to edit someone else's post.
 			$caps[] = $post_type->cap->edit_others_posts;
 			// The post is published or scheduled, extra cap required.
-			if ( in_array( $post->post_status, array( 'publish', 'future' ), true ) ) {
+			if (in_array($post->post_status, array('publish', 'future'), true)) {
 				$caps[] = $post_type->cap->edit_published_posts;
-			} elseif ( 'private' == $post->post_status ) {
+			} elseif ('private' == $post->post_status) {
 				$caps[] = $post_type->cap->edit_private_posts;
 			}
 		}
 		break;
 	case 'read_post':
 	case 'read_page':
-		$post = get_post( $args[0] );
-		if ( ! $post ) {
+		$post = get_post($args[0]);
+		if ( ! $post) {
 			$caps[] = 'do_not_allow';
 			break;
 		}
 
-		if ( 'revision' == $post->post_type ) {
-			$post = get_post( $post->post_parent );
-			if ( ! $post ) {
+		if ('revision' == $post->post_type) {
+			$post = get_post($post->post_parent);
+			if ( ! $post) {
 				$caps[] = 'do_not_allow';
 				break;
 			}
 		}
 
-		$post_type = get_post_type_object( $post->post_type );
-		if ( ! $post_type ) {
+		$post_type = get_post_type_object($post->post_type);
+		if ( ! $post_type) {
 			/* translators: 1: post type, 2: capability name */
-			_doing_it_wrong( __FUNCTION__, sprintf( __( 'The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.' ), $post->post_type, $cap ), '4.4.0' );
+			_doing_it_wrong(__FUNCTION__, sprintf(__('The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.'), $post->post_type, $cap), '4.4.0');
 			$caps[] = 'edit_others_posts';
 			break;
 		}
 
-		if ( ! $post_type->map_meta_cap ) {
+		if ( ! $post_type->map_meta_cap) {
 			$caps[] = $post_type->cap->$cap;
 			// Prior to 3.1 we would re-call map_meta_cap here.
-			if ( 'read_post' == $cap )
+			if ('read_post' == $cap)
 				$cap = $post_type->cap->$cap;
 			break;
 		}
 
-		$status_obj = get_post_status_object( $post->post_status );
-		if ( $status_obj->public ) {
+		$status_obj = get_post_status_object($post->post_status);
+		if ($status_obj->public) {
 			$caps[] = $post_type->cap->read;
 			break;
 		}
 
-		if ( $post->post_author && $user_id == $post->post_author ) {
+		if ($post->post_author && $user_id == $post->post_author) {
 			$caps[] = $post_type->cap->read;
-		} elseif ( $status_obj->private ) {
+		} elseif ($status_obj->private) {
 			$caps[] = $post_type->cap->read_private_posts;
 		} else {
-			$caps = map_meta_cap( 'edit_post', $user_id, $post->ID );
+			$caps = map_meta_cap('edit_post', $user_id, $post->ID);
 		}
 		break;
 	case 'publish_post':
-		$post = get_post( $args[0] );
-		if ( ! $post ) {
+		$post = get_post($args[0]);
+		if ( ! $post) {
 			$caps[] = 'do_not_allow';
 			break;
 		}
 
-		$post_type = get_post_type_object( $post->post_type );
-		if ( ! $post_type ) {
+		$post_type = get_post_type_object($post->post_type);
+		if ( ! $post_type) {
 			/* translators: 1: post type, 2: capability name */
-			_doing_it_wrong( __FUNCTION__, sprintf( __( 'The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.' ), $post->post_type, $cap ), '4.4.0' );
+			_doing_it_wrong(__FUNCTION__, sprintf(__('The post type %1$s is not registered, so it may not be reliable to check the capability "%2$s" against a post of that type.'), $post->post_type, $cap), '4.4.0');
 			$caps[] = 'edit_others_posts';
 			break;
 		}
@@ -237,19 +237,19 @@ 
 	case 'edit_post_meta':
 	case 'delete_post_meta':
 	case 'add_post_meta':
-		$post = get_post( $args[0] );
-		if ( ! $post ) {
+		$post = get_post($args[0]);
+		if ( ! $post) {
 			$caps[] = 'do_not_allow';
 			break;
 		}
 
-		$post_type = get_post_type( $post );
+		$post_type = get_post_type($post);
 
-		$caps = map_meta_cap( 'edit_post', $user_id, $post->ID );
+		$caps = map_meta_cap('edit_post', $user_id, $post->ID);
 
-		$meta_key = isset( $args[ 1 ] ) ? $args[ 1 ] : false;
+		$meta_key = isset($args[1]) ? $args[1] : false;
 
-		if ( $meta_key && ( has_filter( "auth_post_meta_{$meta_key}" ) || has_filter( "auth_post_{$post_type}_meta_{$meta_key}" ) ) ) {
+		if ($meta_key && (has_filter("auth_post_meta_{$meta_key}") || has_filter("auth_post_{$post_type}_meta_{$meta_key}"))) {
 			/**
 			 * Filters whether the user is allowed to add post meta to a post.
 			 *
@@ -265,7 +265,7 @@ 
 			 * @param string $cap      Capability name.
 			 * @param array  $caps     User capabilities.
 			 */
-			$allowed = apply_filters( "auth_post_meta_{$meta_key}", false, $meta_key, $post->ID, $user_id, $cap, $caps );
+			$allowed = apply_filters("auth_post_meta_{$meta_key}", false, $meta_key, $post->ID, $user_id, $cap, $caps);
 
 			/**
 			 * Filters whether the user is allowed to add post meta to a post of a given type.
@@ -282,44 +282,44 @@ 
 			 * @param string $cap      Capability name.
 			 * @param array  $caps     User capabilities.
 			 */
-			$allowed = apply_filters( "auth_post_{$post_type}_meta_{$meta_key}", $allowed, $meta_key, $post->ID, $user_id, $cap, $caps );
+			$allowed = apply_filters("auth_post_{$post_type}_meta_{$meta_key}", $allowed, $meta_key, $post->ID, $user_id, $cap, $caps);
 
-			if ( ! $allowed )
+			if ( ! $allowed)
 				$caps[] = $cap;
-		} elseif ( $meta_key && is_protected_meta( $meta_key, 'post' ) ) {
+		} elseif ($meta_key && is_protected_meta($meta_key, 'post')) {
 			$caps[] = $cap;
 		}
 		break;
 	case 'edit_comment':
-		$comment = get_comment( $args[0] );
-		if ( ! $comment ) {
+		$comment = get_comment($args[0]);
+		if ( ! $comment) {
 			$caps[] = 'do_not_allow';
 			break;
 		}
 
-		$post = get_post( $comment->comment_post_ID );
+		$post = get_post($comment->comment_post_ID);
 
 		/*
 		 * If the post doesn't exist, we have an orphaned comment.
 		 * Fall back to the edit_posts capability, instead.
 		 */
-		if ( $post ) {
-			$caps = map_meta_cap( 'edit_post', $user_id, $post->ID );
+		if ($post) {
+			$caps = map_meta_cap('edit_post', $user_id, $post->ID);
 		} else {
-			$caps = map_meta_cap( 'edit_posts', $user_id );
+			$caps = map_meta_cap('edit_posts', $user_id);
 		}
 		break;
 	case 'unfiltered_upload':
-		if ( defined('ALLOW_UNFILTERED_UPLOADS') && ALLOW_UNFILTERED_UPLOADS && ( !is_multisite() || is_super_admin( $user_id ) )  )
+		if (defined('ALLOW_UNFILTERED_UPLOADS') && ALLOW_UNFILTERED_UPLOADS && ( ! is_multisite() || is_super_admin($user_id)))
 			$caps[] = $cap;
 		else
 			$caps[] = 'do_not_allow';
 		break;
 	case 'unfiltered_html' :
 		// Disallow unfiltered_html for all users, even admins and super admins.
-		if ( defined( 'DISALLOW_UNFILTERED_HTML' ) && DISALLOW_UNFILTERED_HTML )
+		if (defined('DISALLOW_UNFILTERED_HTML') && DISALLOW_UNFILTERED_HTML)
 			$caps[] = 'do_not_allow';
-		elseif ( is_multisite() && ! is_super_admin( $user_id ) )
+		elseif (is_multisite() && ! is_super_admin($user_id))
 			$caps[] = 'do_not_allow';
 		else
 			$caps[] = $cap;
@@ -328,11 +328,11 @@ 
 	case 'edit_plugins':
 	case 'edit_themes':
 		// Disallow the file editors.
-		if ( defined( 'DISALLOW_FILE_EDIT' ) && DISALLOW_FILE_EDIT )
+		if (defined('DISALLOW_FILE_EDIT') && DISALLOW_FILE_EDIT)
 			$caps[] = 'do_not_allow';
-		elseif ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS )
+		elseif (defined('DISALLOW_FILE_MODS') && DISALLOW_FILE_MODS)
 			$caps[] = 'do_not_allow';
-		elseif ( is_multisite() && ! is_super_admin( $user_id ) )
+		elseif (is_multisite() && ! is_super_admin($user_id))
 			$caps[] = 'do_not_allow';
 		else
 			$caps[] = $cap;
@@ -348,13 +348,13 @@ 
 	case 'update_core':
 		// Disallow anything that creates, deletes, or updates core, plugin, or theme files.
 		// Files in uploads are excepted.
-		if ( defined( 'DISALLOW_FILE_MODS' ) && DISALLOW_FILE_MODS ) {
+		if (defined('DISALLOW_FILE_MODS') && DISALLOW_FILE_MODS) {
 			$caps[] = 'do_not_allow';
-		} elseif ( is_multisite() && ! is_super_admin( $user_id ) ) {
+		} elseif (is_multisite() && ! is_super_admin($user_id)) {
 			$caps[] = 'do_not_allow';
-		} elseif ( 'upload_themes' === $cap ) {
+		} elseif ('upload_themes' === $cap) {
 			$caps[] = 'install_themes';
-		} elseif ( 'upload_plugins' === $cap ) {
+		} elseif ('upload_plugins' === $cap) {
 			$caps[] = 'install_plugins';
 		} else {
 			$caps[] = $cap;
@@ -362,31 +362,31 @@ 
 		break;
 	case 'activate_plugins':
 		$caps[] = $cap;
-		if ( is_multisite() ) {
+		if (is_multisite()) {
 			// update_, install_, and delete_ are handled above with is_super_admin().
-			$menu_perms = get_site_option( 'menu_items', array() );
-			if ( empty( $menu_perms['plugins'] ) )
+			$menu_perms = get_site_option('menu_items', array());
+			if (empty($menu_perms['plugins']))
 				$caps[] = 'manage_network_plugins';
 		}
 		break;
 	case 'delete_user':
 	case 'delete_users':
 		// If multisite only super admins can delete users.
-		if ( is_multisite() && ! is_super_admin( $user_id ) )
+		if (is_multisite() && ! is_super_admin($user_id))
 			$caps[] = 'do_not_allow';
 		else
 			$caps[] = 'delete_users'; // delete_user maps to delete_users.
 		break;
 	case 'create_users':
-		if ( !is_multisite() )
+		if ( ! is_multisite())
 			$caps[] = $cap;
-		elseif ( is_super_admin( $user_id ) || get_site_option( 'add_new_users' ) )
+		elseif (is_super_admin($user_id) || get_site_option('add_new_users'))
 			$caps[] = $cap;
 		else
 			$caps[] = 'do_not_allow';
 		break;
 	case 'manage_links' :
-		if ( get_option( 'link_manager_enabled' ) )
+		if (get_option('link_manager_enabled'))
 			$caps[] = $cap;
 		else
 			$caps[] = 'do_not_allow';
@@ -400,9 +400,9 @@ 
 	default:
 		// Handle meta capabilities for custom post types.
 		global $post_type_meta_caps;
-		if ( isset( $post_type_meta_caps[ $cap ] ) ) {
-			$args = array_merge( array( $post_type_meta_caps[ $cap ], $user_id ), $args );
-			return call_user_func_array( 'map_meta_cap', $args );
+		if (isset($post_type_meta_caps[$cap])) {
+			$args = array_merge(array($post_type_meta_caps[$cap], $user_id), $args);
+			return call_user_func_array('map_meta_cap', $args);
 		}
 
 		// If no meta caps match, return the original cap.
@@ -419,7 +419,7 @@ 
 	 * @param int    $user_id The user ID.
 	 * @param array  $args    Adds the context to the cap. Typically the object ID.
 	 */
-	return apply_filters( 'map_meta_cap', $caps, $cap, $user_id, $args );
+	return apply_filters('map_meta_cap', $caps, $cap, $user_id, $args);
 }
 
 /**
@@ -444,16 +444,16 @@ 
  * @return bool Whether the current user has the given capability. If `$capability` is a meta cap and `$object_id` is
  *              passed, whether the current user has the given meta capability for the given object.
  */
-function current_user_can( $capability ) {
+function current_user_can($capability) {
 	$current_user = wp_get_current_user();
 
-	if ( empty( $current_user ) )
+	if (empty($current_user))
 		return false;
 
-	$args = array_slice( func_get_args(), 1 );
-	$args = array_merge( array( $capability ), $args );
+	$args = array_slice(func_get_args(), 1);
+	$args = array_merge(array($capability), $args);
 
-	return call_user_func_array( array( $current_user, 'has_cap' ), $args );
+	return call_user_func_array(array($current_user, 'has_cap'), $args);
 }
 
 /**
@@ -465,24 +465,24 @@ 
  * @param string $capability Capability or role name.
  * @return bool
  */
-function current_user_can_for_blog( $blog_id, $capability ) {
-	$switched = is_multisite() ? switch_to_blog( $blog_id ) : false;
+function current_user_can_for_blog($blog_id, $capability) {
+	$switched = is_multisite() ? switch_to_blog($blog_id) : false;
 
 	$current_user = wp_get_current_user();
 
-	if ( empty( $current_user ) ) {
-		if ( $switched ) {
+	if (empty($current_user)) {
+		if ($switched) {
 			restore_current_blog();
 		}
 		return false;
 	}
 
-	$args = array_slice( func_get_args(), 2 );
-	$args = array_merge( array( $capability ), $args );
+	$args = array_slice(func_get_args(), 2);
+	$args = array_merge(array($capability), $args);
 
-	$can = call_user_func_array( array( $current_user, 'has_cap' ), $args );
+	$can = call_user_func_array(array($current_user, 'has_cap'), $args);
 
-	if ( $switched ) {
+	if ($switched) {
 		restore_current_blog();
 	}
 
@@ -498,19 +498,19 @@ 
  * @param string $capability Capability or role name.
  * @return bool
  */
-function author_can( $post, $capability ) {
-	if ( !$post = get_post($post) )
+function author_can($post, $capability) {
+	if ( ! $post = get_post($post))
 		return false;
 
-	$author = get_userdata( $post->post_author );
+	$author = get_userdata($post->post_author);
 
-	if ( ! $author )
+	if ( ! $author)
 		return false;
 
-	$args = array_slice( func_get_args(), 2 );
-	$args = array_merge( array( $capability ), $args );
+	$args = array_slice(func_get_args(), 2);
+	$args = array_merge(array($capability), $args);
 
-	return call_user_func_array( array( $author, 'has_cap' ), $args );
+	return call_user_func_array(array($author, 'has_cap'), $args);
 }
 
 /**
@@ -522,17 +522,17 @@ 
  * @param string $capability Capability or role name.
  * @return bool
  */
-function user_can( $user, $capability ) {
-	if ( ! is_object( $user ) )
-		$user = get_userdata( $user );
+function user_can($user, $capability) {
+	if ( ! is_object($user))
+		$user = get_userdata($user);
 
-	if ( ! $user || ! $user->exists() )
+	if ( ! $user || ! $user->exists())
 		return false;
 
-	$args = array_slice( func_get_args(), 2 );
-	$args = array_merge( array( $capability ), $args );
+	$args = array_slice(func_get_args(), 2);
+	$args = array_merge(array($capability), $args);
 
-	return call_user_func_array( array( $user, 'has_cap' ), $args );
+	return call_user_func_array(array($user, 'has_cap'), $args);
 }
 
 /**
@@ -547,7 +547,7 @@ 
 function wp_roles() {
 	global $wp_roles;
 
-	if ( ! isset( $wp_roles ) ) {
+	if ( ! isset($wp_roles)) {
 		$wp_roles = new WP_Roles();
 	}
 	return $wp_roles;
@@ -561,8 +561,8 @@ 
  * @param string $role Role name.
  * @return WP_Role|null WP_Role object if found, null if the role does not exist.
  */
-function get_role( $role ) {
-	return wp_roles()->get_role( $role );
+function get_role($role) {
+	return wp_roles()->get_role($role);
 }
 
 /**
@@ -575,11 +575,11 @@ 
  * @param array $capabilities List of capabilities, e.g. array( 'edit_posts' => true, 'delete_posts' => false );
  * @return WP_Role|null WP_Role object if role is added, null if already exists.
  */
-function add_role( $role, $display_name, $capabilities = array() ) {
-	if ( empty( $role ) ) {
+function add_role($role, $display_name, $capabilities = array()) {
+	if (empty($role)) {
 		return;
 	}
-	return wp_roles()->add_role( $role, $display_name, $capabilities );
+	return wp_roles()->add_role($role, $display_name, $capabilities);
 }
 
 /**
@@ -589,8 +589,8 @@ 
  *
  * @param string $role Role name.
  */
-function remove_role( $role ) {
-	wp_roles()->remove_role( $role );
+function remove_role($role) {
+	wp_roles()->remove_role($role);
 }
 
 /**
@@ -605,10 +605,10 @@ 
 function get_super_admins() {
 	global $super_admins;
 
-	if ( isset($super_admins) )
+	if (isset($super_admins))
 		return $super_admins;
 	else
-		return get_site_option( 'site_admins', array('admin') );
+		return get_site_option('site_admins', array('admin'));
 }
 
 /**
@@ -619,21 +619,21 @@ 
  * @param int $user_id (Optional) The ID of a user. Defaults to the current user.
  * @return bool True if the user is a site admin.
  */
-function is_super_admin( $user_id = false ) {
-	if ( ! $user_id || $user_id == get_current_user_id() )
+function is_super_admin($user_id = false) {
+	if ( ! $user_id || $user_id == get_current_user_id())
 		$user = wp_get_current_user();
 	else
-		$user = get_userdata( $user_id );
+		$user = get_userdata($user_id);
 
-	if ( ! $user || ! $user->exists() )
+	if ( ! $user || ! $user->exists())
 		return false;
 
-	if ( is_multisite() ) {
+	if (is_multisite()) {
 		$super_admins = get_super_admins();
-		if ( is_array( $super_admins ) && in_array( $user->user_login, $super_admins ) )
+		if (is_array($super_admins) && in_array($user->user_login, $super_admins))
 			return true;
 	} else {
-		if ( $user->has_cap('delete_users') )
+		if ($user->has_cap('delete_users'))
 			return true;
 	}
 
@@ -651,9 +651,9 @@ 
  * @return bool True on success, false on failure. This can fail when the user is
  *              already a super admin or when the `$super_admins` global is defined.
  */
-function grant_super_admin( $user_id ) {
+function grant_super_admin($user_id) {
 	// If global super_admins override is defined, there is nothing to do here.
-	if ( isset( $GLOBALS['super_admins'] ) || ! is_multisite() ) {
+	if (isset($GLOBALS['super_admins']) || ! is_multisite()) {
 		return false;
 	}
 
@@ -664,15 +664,15 @@ 
 	 *
 	 * @param int $user_id ID of the user that is about to be granted Super Admin privileges.
 	 */
-	do_action( 'grant_super_admin', $user_id );
+	do_action('grant_super_admin', $user_id);
 
 	// Directly fetch site_admins instead of using get_super_admins()
-	$super_admins = get_site_option( 'site_admins', array( 'admin' ) );
+	$super_admins = get_site_option('site_admins', array('admin'));
 
-	$user = get_userdata( $user_id );
-	if ( $user && ! in_array( $user->user_login, $super_admins ) ) {
+	$user = get_userdata($user_id);
+	if ($user && ! in_array($user->user_login, $super_admins)) {
 		$super_admins[] = $user->user_login;
-		update_site_option( 'site_admins' , $super_admins );
+		update_site_option('site_admins', $super_admins);
 
 		/**
 		 * Fires after the user is granted Super Admin privileges.
@@ -681,7 +681,7 @@ 
 		 *
 		 * @param int $user_id ID of the user that was granted Super Admin privileges.
 		 */
-		do_action( 'granted_super_admin', $user_id );
+		do_action('granted_super_admin', $user_id);
 		return true;
 	}
 	return false;
@@ -698,9 +698,9 @@ 
  * @return bool True on success, false on failure. This can fail when the user's email
  *              is the network admin email or when the `$super_admins` global is defined.
  */
-function revoke_super_admin( $user_id ) {
+function revoke_super_admin($user_id) {
 	// If global super_admins override is defined, there is nothing to do here.
-	if ( isset( $GLOBALS['super_admins'] ) || ! is_multisite() ) {
+	if (isset($GLOBALS['super_admins']) || ! is_multisite()) {
 		return false;
 	}
 
@@ -711,16 +711,16 @@ 
 	 *
 	 * @param int $user_id ID of the user Super Admin privileges are being revoked from.
 	 */
-	do_action( 'revoke_super_admin', $user_id );
+	do_action('revoke_super_admin', $user_id);
 
 	// Directly fetch site_admins instead of using get_super_admins()
-	$super_admins = get_site_option( 'site_admins', array( 'admin' ) );
+	$super_admins = get_site_option('site_admins', array('admin'));
 
-	$user = get_userdata( $user_id );
-	if ( $user && 0 !== strcasecmp( $user->user_email, get_site_option( 'admin_email' ) ) ) {
-		if ( false !== ( $key = array_search( $user->user_login, $super_admins ) ) ) {
-			unset( $super_admins[$key] );
-			update_site_option( 'site_admins', $super_admins );
+	$user = get_userdata($user_id);
+	if ($user && 0 !== strcasecmp($user->user_email, get_site_option('admin_email'))) {
+		if (false !== ($key = array_search($user->user_login, $super_admins))) {
+			unset($super_admins[$key]);
+			update_site_option('site_admins', $super_admins);
 
 			/**
 			 * Fires after the user's Super Admin privileges are revoked.
@@ -729,7 +729,7 @@ 
 			 *
 			 * @param int $user_id ID of the user Super Admin privileges were revoked from.
 			 */
-			do_action( 'revoked_super_admin', $user_id );
+			do_action('revoked_super_admin', $user_id);
 			return true;
 		}
 	}

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

Spacing +36 added lines, -36 removed lines

@@ -19,7 +19,7 @@ 
  */
 function wp_styles() {
 	global $wp_styles;
-	if ( ! ( $wp_styles instanceof WP_Styles ) ) {
+	if ( ! ($wp_styles instanceof WP_Styles)) {
 		$wp_styles = new WP_Styles();
 	}
 	return $wp_styles;
@@ -39,8 +39,8 @@ 
  * @param string|bool|array $handles Styles to be printed. Default 'false'.
  * @return array On success, a processed array of WP_Dependencies items; otherwise, an empty array.
  */
-function wp_print_styles( $handles = false ) {
-	if ( '' === $handles ) { // for wp_head
+function wp_print_styles($handles = false) {
+	if ('' === $handles) { // for wp_head
 		$handles = false;
 	}
 	/**
@@ -48,20 +48,20 @@ 
 	 *
 	 * @since 2.6.0
 	 */
-	if ( ! $handles ) {
-		do_action( 'wp_print_styles' );
+	if ( ! $handles) {
+		do_action('wp_print_styles');
 	}
 
-	_wp_scripts_maybe_doing_it_wrong( __FUNCTION__ );
+	_wp_scripts_maybe_doing_it_wrong(__FUNCTION__);
 
 	global $wp_styles;
-	if ( ! ( $wp_styles instanceof WP_Styles ) ) {
-		if ( ! $handles ) {
+	if ( ! ($wp_styles instanceof WP_Styles)) {
+		if ( ! $handles) {
 			return array(); // No need to instantiate if nothing is there.
 		}
 	}
 
-	return wp_styles()->do_items( $handles );
+	return wp_styles()->do_items($handles);
 }
 
 /**
@@ -80,20 +80,20 @@ 
  * @param string $data   String containing the CSS styles to be added.
  * @return bool True on success, false on failure.
  */
-function wp_add_inline_style( $handle, $data ) {
-	_wp_scripts_maybe_doing_it_wrong( __FUNCTION__ );
+function wp_add_inline_style($handle, $data) {
+	_wp_scripts_maybe_doing_it_wrong(__FUNCTION__);
 
-	if ( false !== stripos( $data, '</style>' ) ) {
-		_doing_it_wrong( __FUNCTION__, sprintf(
+	if (false !== stripos($data, '</style>')) {
+		_doing_it_wrong(__FUNCTION__, sprintf(
 			/* translators: 1: <style>, 2: wp_add_inline_style() */
-			__( 'Do not pass %1$s tags to %2$s.' ),
+			__('Do not pass %1$s tags to %2$s.'),
 			'<code>&lt;style&gt;</code>',
 			'<code>wp_add_inline_style()</code>'
-		), '3.7.0' );
-		$data = trim( preg_replace( '#<style[^>]*>(.*)</style>#is', '$1', $data ) );
+		), '3.7.0');
+		$data = trim(preg_replace('#<style[^>]*>(.*)</style>#is', '$1', $data));
 	}
 
-	return wp_styles()->add_inline_style( $handle, $data );
+	return wp_styles()->add_inline_style($handle, $data);
 }
 
 /**
@@ -117,10 +117,10 @@ 
  *                                 '(orientation: portrait)' and '(max-width: 640px)'.
  * @return bool Whether the style has been registered. True on success, false on failure.
  */
-function wp_register_style( $handle, $src, $deps = array(), $ver = false, $media = 'all' ) {
-	_wp_scripts_maybe_doing_it_wrong( __FUNCTION__ );
+function wp_register_style($handle, $src, $deps = array(), $ver = false, $media = 'all') {
+	_wp_scripts_maybe_doing_it_wrong(__FUNCTION__);
 
-	return wp_styles()->add( $handle, $src, $deps, $ver, $media );
+	return wp_styles()->add($handle, $src, $deps, $ver, $media);
 }
 
 /**
@@ -132,10 +132,10 @@ 
  *
  * @param string $handle Name of the stylesheet to be removed.
  */
-function wp_deregister_style( $handle ) {
-	_wp_scripts_maybe_doing_it_wrong( __FUNCTION__ );
+function wp_deregister_style($handle) {
+	_wp_scripts_maybe_doing_it_wrong(__FUNCTION__);
 
-	wp_styles()->remove( $handle );
+	wp_styles()->remove($handle);
 }
 
 /**
@@ -160,16 +160,16 @@ 
  *                                 Default 'all'. Accepts media types like 'all', 'print' and 'screen', or media queries like
  *                                 '(orientation: portrait)' and '(max-width: 640px)'.
  */
-function wp_enqueue_style( $handle, $src = false, $deps = array(), $ver = false, $media = 'all' ) {
-	_wp_scripts_maybe_doing_it_wrong( __FUNCTION__ );
+function wp_enqueue_style($handle, $src = false, $deps = array(), $ver = false, $media = 'all') {
+	_wp_scripts_maybe_doing_it_wrong(__FUNCTION__);
 
 	$wp_styles = wp_styles();
 
-	if ( $src ) {
+	if ($src) {
 		$_handle = explode('?', $handle);
-		$wp_styles->add( $_handle[0], $src, $deps, $ver, $media );
+		$wp_styles->add($_handle[0], $src, $deps, $ver, $media);
 	}
-	$wp_styles->enqueue( $handle );
+	$wp_styles->enqueue($handle);
 }
 
 /**
@@ -181,10 +181,10 @@ 
  *
  * @param string $handle Name of the stylesheet to be removed.
  */
-function wp_dequeue_style( $handle ) {
-	_wp_scripts_maybe_doing_it_wrong( __FUNCTION__ );
+function wp_dequeue_style($handle) {
+	_wp_scripts_maybe_doing_it_wrong(__FUNCTION__);
 
-	wp_styles()->dequeue( $handle );
+	wp_styles()->dequeue($handle);
 }
 
 /**
@@ -197,10 +197,10 @@ 
  *                       Accepts 'enqueued', 'registered', 'queue', 'to_do', and 'done'.
  * @return bool Whether style is queued.
  */
-function wp_style_is( $handle, $list = 'enqueued' ) {
-	_wp_scripts_maybe_doing_it_wrong( __FUNCTION__ );
+function wp_style_is($handle, $list = 'enqueued') {
+	_wp_scripts_maybe_doing_it_wrong(__FUNCTION__);
 
-	return (bool) wp_styles()->query( $handle, $list );
+	return (bool) wp_styles()->query($handle, $list);
 }
 
 /**
@@ -225,6 +225,6 @@ 
  * @param mixed  $value  String containing the CSS data to be added.
  * @return bool True on success, false on failure.
  */
-function wp_style_add_data( $handle, $key, $value ) {
-	return wp_styles()->add_data( $handle, $key, $value );
+function wp_style_add_data($handle, $key, $value) {
+	return wp_styles()->add_data($handle, $key, $value);
 }

src/wp-includes/class-snoopy.php

Spacing +254 added lines, -254 removed lines

@@ -3,9 +3,9 @@ 
 /**
  * Deprecated. Use WP_HTTP (http.php) instead.
  */
-_deprecated_file( basename( __FILE__ ), '3.0.0', WPINC . '/http.php' );
+_deprecated_file(basename(__FILE__), '3.0.0', WPINC.'/http.php');
 
-if ( ! class_exists( 'Snoopy', false ) ) :
+if ( ! class_exists('Snoopy', false)) :
 /*************************************************
 
 Snoopy - the PHP net client
@@ -41,54 +41,54 @@ 
 
 	/* user definable vars */
 
-	var $host			=	"www.php.net";		// host name we are connecting to
-	var $port			=	80;					// port we are connecting to
-	var $proxy_host		=	"";					// proxy host to use
-	var $proxy_port		=	"";					// proxy port to use
-	var $proxy_user		=	"";					// proxy user to use
-	var $proxy_pass		=	"";					// proxy password to use
+	var $host			= "www.php.net"; // host name we are connecting to
+	var $port			= 80; // port we are connecting to
+	var $proxy_host		= ""; // proxy host to use
+	var $proxy_port		= ""; // proxy port to use
+	var $proxy_user		= ""; // proxy user to use
+	var $proxy_pass		= ""; // proxy password to use
 
-	var $agent			=	"Snoopy v1.2.4";	// agent we masquerade as
-	var	$referer		=	"";					// referer info to pass
-	var $cookies		=	array();			// array of cookies to pass
+	var $agent = "Snoopy v1.2.4"; // agent we masquerade as
+	var	$referer		= ""; // referer info to pass
+	var $cookies		= array(); // array of cookies to pass
 												// $cookies["username"]="joe";
-	var	$rawheaders		=	array();			// array of raw headers to send
+	var	$rawheaders = array(); // array of raw headers to send
 												// $rawheaders["Content-type"]="text/html";
 
-	var $maxredirs		=	5;					// http redirection depth maximum. 0 = disallow
-	var $lastredirectaddr	=	"";				// contains address of last redirected address
-	var	$offsiteok		=	true;				// allows redirection off-site
-	var $maxframes		=	0;					// frame content depth maximum. 0 = disallow
-	var $expandlinks	=	true;				// expand links to fully qualified URLs.
+	var $maxredirs		= 5; // http redirection depth maximum. 0 = disallow
+	var $lastredirectaddr = ""; // contains address of last redirected address
+	var	$offsiteok		= true; // allows redirection off-site
+	var $maxframes		= 0; // frame content depth maximum. 0 = disallow
+	var $expandlinks	= true; // expand links to fully qualified URLs.
 												// this only applies to fetchlinks()
 												// submitlinks(), and submittext()
-	var $passcookies	=	true;				// pass set cookies back through redirects
+	var $passcookies	= true; // pass set cookies back through redirects
 												// NOTE: this currently does not respect
 												// dates, domains or paths.
 
-	var	$user			=	"";					// user for http authentication
-	var	$pass			=	"";					// password for http authentication
+	var	$user			= ""; // user for http authentication
+	var	$pass			= ""; // password for http authentication
 
 	// http accept types
-	var $accept			=	"image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*";
+	var $accept			= "image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, */*";
 
-	var $results		=	"";					// where the content is put
+	var $results		= ""; // where the content is put
 
-	var $error			=	"";					// error messages sent here
-	var	$response_code	=	"";					// response code returned from server
-	var	$headers		=	array();			// headers returned from server sent here
-	var	$maxlength		=	500000;				// max return data length (body)
-	var $read_timeout	=	0;					// timeout on read operations, in seconds
+	var $error = ""; // error messages sent here
+	var	$response_code = ""; // response code returned from server
+	var	$headers = array(); // headers returned from server sent here
+	var	$maxlength = 500000; // max return data length (body)
+	var $read_timeout = 0; // timeout on read operations, in seconds
 												// supported only since PHP 4 Beta 4
 												// set to 0 to disallow timeouts
-	var $timed_out		=	false;				// if a read operation timed out
-	var	$status			=	0;					// http request status
+	var $timed_out = false; // if a read operation timed out
+	var	$status = 0; // http request status
 
-	var $temp_dir		=	"/tmp";				// temporary directory that the webserver
+	var $temp_dir = "/tmp"; // temporary directory that the webserver
 												// has permission to write to.
 												// under Windows, this should be C:\temp
 
-	var	$curl_path		=	"/usr/local/bin/curl";
+	var	$curl_path = "/usr/local/bin/curl";
 												// Snoopy will use cURL for fetching
 												// SSL content if a full system path to
 												// the cURL binary is supplied here.
@@ -102,20 +102,20 @@ 
 
 	/**** Private variables ****/
 
-	var	$_maxlinelen	=	4096;				// max line length (headers)
+	var	$_maxlinelen	= 4096; // max line length (headers)
 
-	var $_httpmethod	=	"GET";				// default http request method
-	var $_httpversion	=	"HTTP/1.0";			// default http request version
-	var $_submit_method	=	"POST";				// default submit method
-	var $_submit_type	=	"application/x-www-form-urlencoded";	// default submit type
-	var $_mime_boundary	=   "";					// MIME boundary for multipart/form-data submit type
-	var $_redirectaddr	=	false;				// will be set if page fetched is a redirect
-	var $_redirectdepth	=	0;					// increments on an http redirect
-	var $_frameurls		= 	array();			// frame src urls
-	var $_framedepth	=	0;					// increments on frame depth
+	var $_httpmethod	= "GET"; // default http request method
+	var $_httpversion	= "HTTP/1.0"; // default http request version
+	var $_submit_method	= "POST"; // default submit method
+	var $_submit_type	= "application/x-www-form-urlencoded"; // default submit type
+	var $_mime_boundary	= ""; // MIME boundary for multipart/form-data submit type
+	var $_redirectaddr = false; // will be set if page fetched is a redirect
+	var $_redirectdepth	= 0; // increments on an http redirect
+	var $_frameurls		= array(); // frame src urls
+	var $_framedepth	= 0; // increments on frame depth
 
-	var $_isproxy		=	false;				// set if using a proxy server
-	var $_fp_timeout	=	30;					// timeout for socket connection
+	var $_isproxy = false; // set if using a proxy server
+	var $_fp_timeout	= 30; // timeout for socket connection
 
 /*======================================================================*\
 	Function:	fetch
@@ -131,27 +131,27 @@ 
 
 		//preg_match("|^([^:]+)://([^:/]+)(:[\d]+)*(.*)|",$URI,$URI_PARTS);
 		$URI_PARTS = parse_url($URI);
-		if (!empty($URI_PARTS["user"]))
+		if ( ! empty($URI_PARTS["user"]))
 			$this->user = $URI_PARTS["user"];
-		if (!empty($URI_PARTS["pass"]))
+		if ( ! empty($URI_PARTS["pass"]))
 			$this->pass = $URI_PARTS["pass"];
 		if (empty($URI_PARTS["query"]))
 			$URI_PARTS["query"] = '';
 		if (empty($URI_PARTS["path"]))
 			$URI_PARTS["path"] = '';
 
-		switch(strtolower($URI_PARTS["scheme"]))
+		switch (strtolower($URI_PARTS["scheme"]))
 		{
 			case "http":
 				$this->host = $URI_PARTS["host"];
-				if(!empty($URI_PARTS["port"]))
+				if ( ! empty($URI_PARTS["port"]))
 					$this->port = $URI_PARTS["port"];
-				if($this->_connect($fp))
+				if ($this->_connect($fp))
 				{
-					if($this->_isproxy)
+					if ($this->_isproxy)
 					{
 						// using proxy, send entire URI
-						$this->_httprequest($URI,$fp,$URI,$this->_httpmethod);
+						$this->_httprequest($URI, $fp, $URI, $this->_httpmethod);
 					}
 					else
 					{
@@ -162,30 +162,30 @@ 
 
 					$this->_disconnect($fp);
 
-					if($this->_redirectaddr)
+					if ($this->_redirectaddr)
 					{
 						/* url was redirected, check if we've hit the max depth */
-						if($this->maxredirs > $this->_redirectdepth)
+						if ($this->maxredirs > $this->_redirectdepth)
 						{
 							// only follow redirect if it's on this site, or offsiteok is true
-							if(preg_match("|^http://".preg_quote($this->host)."|i",$this->_redirectaddr) || $this->offsiteok)
+							if (preg_match("|^http://".preg_quote($this->host)."|i", $this->_redirectaddr) || $this->offsiteok)
 							{
 								/* follow the redirect */
 								$this->_redirectdepth++;
-								$this->lastredirectaddr=$this->_redirectaddr;
+								$this->lastredirectaddr = $this->_redirectaddr;
 								$this->fetch($this->_redirectaddr);
 							}
 						}
 					}
 
-					if($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0)
+					if ($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0)
 					{
 						$frameurls = $this->_frameurls;
 						$this->_frameurls = array();
 
-						while(list(,$frameurl) = each($frameurls))
+						while (list(,$frameurl) = each($frameurls))
 						{
-							if($this->_framedepth < $this->maxframes)
+							if ($this->_framedepth < $this->maxframes)
 							{
 								$this->fetch($frameurl);
 								$this->_framedepth++;
@@ -202,18 +202,18 @@ 
 				return true;
 				break;
 			case "https":
-				if(!$this->curl_path)
+				if ( ! $this->curl_path)
 					return false;
-				if(function_exists("is_executable"))
-				    if (!is_executable($this->curl_path))
+				if (function_exists("is_executable"))
+				    if ( ! is_executable($this->curl_path))
 				        return false;
 				$this->host = $URI_PARTS["host"];
-				if(!empty($URI_PARTS["port"]))
+				if ( ! empty($URI_PARTS["port"]))
 					$this->port = $URI_PARTS["port"];
-				if($this->_isproxy)
+				if ($this->_isproxy)
 				{
 					// using proxy, send entire URI
-					$this->_httpsrequest($URI,$URI,$this->_httpmethod);
+					$this->_httpsrequest($URI, $URI, $this->_httpmethod);
 				}
 				else
 				{
@@ -222,30 +222,30 @@ 
 					$this->_httpsrequest($path, $URI, $this->_httpmethod);
 				}
 
-				if($this->_redirectaddr)
+				if ($this->_redirectaddr)
 				{
 					/* url was redirected, check if we've hit the max depth */
-					if($this->maxredirs > $this->_redirectdepth)
+					if ($this->maxredirs > $this->_redirectdepth)
 					{
 						// only follow redirect if it's on this site, or offsiteok is true
-						if(preg_match("|^http://".preg_quote($this->host)."|i",$this->_redirectaddr) || $this->offsiteok)
+						if (preg_match("|^http://".preg_quote($this->host)."|i", $this->_redirectaddr) || $this->offsiteok)
 						{
 							/* follow the redirect */
 							$this->_redirectdepth++;
-							$this->lastredirectaddr=$this->_redirectaddr;
+							$this->lastredirectaddr = $this->_redirectaddr;
 							$this->fetch($this->_redirectaddr);
 						}
 					}
 				}
 
-				if($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0)
+				if ($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0)
 				{
 					$frameurls = $this->_frameurls;
 					$this->_frameurls = array();
 
-					while(list(,$frameurl) = each($frameurls))
+					while (list(,$frameurl) = each($frameurls))
 					{
-						if($this->_framedepth < $this->maxframes)
+						if ($this->_framedepth < $this->maxframes)
 						{
 							$this->fetch($frameurl);
 							$this->_framedepth++;
@@ -258,7 +258,7 @@ 
 				break;
 			default:
 				// not a valid protocol
-				$this->error	=	'Invalid protocol "'.$URI_PARTS["scheme"].'"\n';
+				$this->error = 'Invalid protocol "'.$URI_PARTS["scheme"].'"\n';
 				return false;
 				break;
 		}
@@ -276,34 +276,34 @@ 
 	Output:		$this->results	the text output from the post
 \*======================================================================*/
 
-	function submit($URI, $formvars="", $formfiles="")
+	function submit($URI, $formvars = "", $formfiles = "")
 	{
 		unset($postdata);
 
 		$postdata = $this->_prepare_post_body($formvars, $formfiles);
 
 		$URI_PARTS = parse_url($URI);
-		if (!empty($URI_PARTS["user"]))
+		if ( ! empty($URI_PARTS["user"]))
 			$this->user = $URI_PARTS["user"];
-		if (!empty($URI_PARTS["pass"]))
+		if ( ! empty($URI_PARTS["pass"]))
 			$this->pass = $URI_PARTS["pass"];
 		if (empty($URI_PARTS["query"]))
 			$URI_PARTS["query"] = '';
 		if (empty($URI_PARTS["path"]))
 			$URI_PARTS["path"] = '';
 
-		switch(strtolower($URI_PARTS["scheme"]))
+		switch (strtolower($URI_PARTS["scheme"]))
 		{
 			case "http":
 				$this->host = $URI_PARTS["host"];
-				if(!empty($URI_PARTS["port"]))
+				if ( ! empty($URI_PARTS["port"]))
 					$this->port = $URI_PARTS["port"];
-				if($this->_connect($fp))
+				if ($this->_connect($fp))
 				{
-					if($this->_isproxy)
+					if ($this->_isproxy)
 					{
 						// using proxy, send entire URI
-						$this->_httprequest($URI,$fp,$URI,$this->_submit_method,$this->_submit_type,$postdata);
+						$this->_httprequest($URI, $fp, $URI, $this->_submit_method, $this->_submit_type, $postdata);
 					}
 					else
 					{
@@ -314,36 +314,36 @@ 
 
 					$this->_disconnect($fp);
 
-					if($this->_redirectaddr)
+					if ($this->_redirectaddr)
 					{
 						/* url was redirected, check if we've hit the max depth */
-						if($this->maxredirs > $this->_redirectdepth)
+						if ($this->maxredirs > $this->_redirectdepth)
 						{
-							if(!preg_match("|^".$URI_PARTS["scheme"]."://|", $this->_redirectaddr))
-								$this->_redirectaddr = $this->_expandlinks($this->_redirectaddr,$URI_PARTS["scheme"]."://".$URI_PARTS["host"]);
+							if ( ! preg_match("|^".$URI_PARTS["scheme"]."://|", $this->_redirectaddr))
+								$this->_redirectaddr = $this->_expandlinks($this->_redirectaddr, $URI_PARTS["scheme"]."://".$URI_PARTS["host"]);
 
 							// only follow redirect if it's on this site, or offsiteok is true
-							if(preg_match("|^http://".preg_quote($this->host)."|i",$this->_redirectaddr) || $this->offsiteok)
+							if (preg_match("|^http://".preg_quote($this->host)."|i", $this->_redirectaddr) || $this->offsiteok)
 							{
 								/* follow the redirect */
 								$this->_redirectdepth++;
-								$this->lastredirectaddr=$this->_redirectaddr;
-								if( strpos( $this->_redirectaddr, "?" ) > 0 )
+								$this->lastredirectaddr = $this->_redirectaddr;
+								if (strpos($this->_redirectaddr, "?") > 0)
 									$this->fetch($this->_redirectaddr); // the redirect has changed the request method from post to get
 								else
-									$this->submit($this->_redirectaddr,$formvars, $formfiles);
+									$this->submit($this->_redirectaddr, $formvars, $formfiles);
 							}
 						}
 					}
 
-					if($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0)
+					if ($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0)
 					{
 						$frameurls = $this->_frameurls;
 						$this->_frameurls = array();
 
-						while(list(,$frameurl) = each($frameurls))
+						while (list(,$frameurl) = each($frameurls))
 						{
-							if($this->_framedepth < $this->maxframes)
+							if ($this->_framedepth < $this->maxframes)
 							{
 								$this->fetch($frameurl);
 								$this->_framedepth++;
@@ -361,15 +361,15 @@ 
 				return true;
 				break;
 			case "https":
-				if(!$this->curl_path)
+				if ( ! $this->curl_path)
 					return false;
-				if(function_exists("is_executable"))
-				    if (!is_executable($this->curl_path))
+				if (function_exists("is_executable"))
+				    if ( ! is_executable($this->curl_path))
 				        return false;
 				$this->host = $URI_PARTS["host"];
-				if(!empty($URI_PARTS["port"]))
+				if ( ! empty($URI_PARTS["port"]))
 					$this->port = $URI_PARTS["port"];
-				if($this->_isproxy)
+				if ($this->_isproxy)
 				{
 					// using proxy, send entire URI
 					$this->_httpsrequest($URI, $URI, $this->_submit_method, $this->_submit_type, $postdata);
@@ -381,36 +381,36 @@ 
 					$this->_httpsrequest($path, $URI, $this->_submit_method, $this->_submit_type, $postdata);
 				}
 
-				if($this->_redirectaddr)
+				if ($this->_redirectaddr)
 				{
 					/* url was redirected, check if we've hit the max depth */
-					if($this->maxredirs > $this->_redirectdepth)
+					if ($this->maxredirs > $this->_redirectdepth)
 					{
-						if(!preg_match("|^".$URI_PARTS["scheme"]."://|", $this->_redirectaddr))
-							$this->_redirectaddr = $this->_expandlinks($this->_redirectaddr,$URI_PARTS["scheme"]."://".$URI_PARTS["host"]);
+						if ( ! preg_match("|^".$URI_PARTS["scheme"]."://|", $this->_redirectaddr))
+							$this->_redirectaddr = $this->_expandlinks($this->_redirectaddr, $URI_PARTS["scheme"]."://".$URI_PARTS["host"]);
 
 						// only follow redirect if it's on this site, or offsiteok is true
-						if(preg_match("|^http://".preg_quote($this->host)."|i",$this->_redirectaddr) || $this->offsiteok)
+						if (preg_match("|^http://".preg_quote($this->host)."|i", $this->_redirectaddr) || $this->offsiteok)
 						{
 							/* follow the redirect */
 							$this->_redirectdepth++;
-							$this->lastredirectaddr=$this->_redirectaddr;
-							if( strpos( $this->_redirectaddr, "?" ) > 0 )
+							$this->lastredirectaddr = $this->_redirectaddr;
+							if (strpos($this->_redirectaddr, "?") > 0)
 								$this->fetch($this->_redirectaddr); // the redirect has changed the request method from post to get
 							else
-								$this->submit($this->_redirectaddr,$formvars, $formfiles);
+								$this->submit($this->_redirectaddr, $formvars, $formfiles);
 						}
 					}
 				}
 
-				if($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0)
+				if ($this->_framedepth < $this->maxframes && count($this->_frameurls) > 0)
 				{
 					$frameurls = $this->_frameurls;
 					$this->_frameurls = array();
 
-					while(list(,$frameurl) = each($frameurls))
+					while (list(,$frameurl) = each($frameurls))
 					{
-						if($this->_framedepth < $this->maxframes)
+						if ($this->_framedepth < $this->maxframes)
 						{
 							$this->fetch($frameurl);
 							$this->_framedepth++;
@@ -424,7 +424,7 @@ 
 
 			default:
 				// not a valid protocol
-				$this->error	=	'Invalid protocol "'.$URI_PARTS["scheme"].'"\n';
+				$this->error = 'Invalid protocol "'.$URI_PARTS["scheme"].'"\n';
 				return false;
 				break;
 		}
@@ -442,17 +442,17 @@ 
 	{
 		if ($this->fetch($URI))
 		{
-			if($this->lastredirectaddr)
+			if ($this->lastredirectaddr)
 				$URI = $this->lastredirectaddr;
-			if(is_array($this->results))
+			if (is_array($this->results))
 			{
-				for($x=0;$x<count($this->results);$x++)
+				for ($x = 0; $x < count($this->results); $x++)
 					$this->results[$x] = $this->_striplinks($this->results[$x]);
 			}
 			else
 				$this->results = $this->_striplinks($this->results);
 
-			if($this->expandlinks)
+			if ($this->expandlinks)
 				$this->results = $this->_expandlinks($this->results, $URI);
 			return true;
 		}
@@ -473,9 +473,9 @@ 
 		if ($this->fetch($URI))
 		{
 
-			if(is_array($this->results))
+			if (is_array($this->results))
 			{
-				for($x=0;$x<count($this->results);$x++)
+				for ($x = 0; $x < count($this->results); $x++)
 					$this->results[$x] = $this->_stripform($this->results[$x]);
 			}
 			else
@@ -497,11 +497,11 @@ 
 
 	function fetchtext($URI)
 	{
-		if($this->fetch($URI))
+		if ($this->fetch($URI))
 		{
-			if(is_array($this->results))
+			if (is_array($this->results))
 			{
-				for($x=0;$x<count($this->results);$x++)
+				for ($x = 0; $x < count($this->results); $x++)
 					$this->results[$x] = $this->_striptext($this->results[$x]);
 			}
 			else
@@ -519,26 +519,26 @@ 
 	Output:		$this->results	an array of the links from the post
 \*======================================================================*/
 
-	function submitlinks($URI, $formvars="", $formfiles="")
+	function submitlinks($URI, $formvars = "", $formfiles = "")
 	{
-		if($this->submit($URI,$formvars, $formfiles))
+		if ($this->submit($URI, $formvars, $formfiles))
 		{
-			if($this->lastredirectaddr)
+			if ($this->lastredirectaddr)
 				$URI = $this->lastredirectaddr;
-			if(is_array($this->results))
+			if (is_array($this->results))
 			{
-				for($x=0;$x<count($this->results);$x++)
+				for ($x = 0; $x < count($this->results); $x++)
 				{
 					$this->results[$x] = $this->_striplinks($this->results[$x]);
-					if($this->expandlinks)
-						$this->results[$x] = $this->_expandlinks($this->results[$x],$URI);
+					if ($this->expandlinks)
+						$this->results[$x] = $this->_expandlinks($this->results[$x], $URI);
 				}
 			}
 			else
 			{
 				$this->results = $this->_striplinks($this->results);
-				if($this->expandlinks)
-					$this->results = $this->_expandlinks($this->results,$URI);
+				if ($this->expandlinks)
+					$this->results = $this->_expandlinks($this->results, $URI);
 			}
 			return true;
 		}
@@ -555,24 +555,24 @@ 
 
 	function submittext($URI, $formvars = "", $formfiles = "")
 	{
-		if($this->submit($URI,$formvars, $formfiles))
+		if ($this->submit($URI, $formvars, $formfiles))
 		{
-			if($this->lastredirectaddr)
+			if ($this->lastredirectaddr)
 				$URI = $this->lastredirectaddr;
-			if(is_array($this->results))
+			if (is_array($this->results))
 			{
-				for($x=0;$x<count($this->results);$x++)
+				for ($x = 0; $x < count($this->results); $x++)
 				{
 					$this->results[$x] = $this->_striptext($this->results[$x]);
-					if($this->expandlinks)
-						$this->results[$x] = $this->_expandlinks($this->results[$x],$URI);
+					if ($this->expandlinks)
+						$this->results[$x] = $this->_expandlinks($this->results[$x], $URI);
 				}
 			}
 			else
 			{
 				$this->results = $this->_striptext($this->results);
-				if($this->expandlinks)
-					$this->results = $this->_expandlinks($this->results,$URI);
+				if ($this->expandlinks)
+					$this->results = $this->_expandlinks($this->results, $URI);
 			}
 			return true;
 		}
@@ -624,20 +624,20 @@ 
 						([\"\'])?					# find single or double quote
 						(?(1) (.*?)\\1 | ([^\s\>]+))		# if quote found, match up to next matching
 													# quote, otherwise match up to next space
-						'isx",$document,$links);
+						'isx",$document, $links);
 
 
 		// catenate the non-empty matches from the conditional subpattern
 
-		while(list($key,$val) = each($links[2]))
+		while (list($key, $val) = each($links[2]))
 		{
-			if(!empty($val))
+			if ( ! empty($val))
 				$match[] = $val;
 		}
 
-		while(list($key,$val) = each($links[3]))
+		while (list($key, $val) = each($links[3]))
 		{
-			if(!empty($val))
+			if ( ! empty($val))
 				$match[] = $val;
 		}
 
@@ -654,10 +654,10 @@ 
 
 	function _stripform($document)
 	{
-		preg_match_all("'<\/?(FORM|INPUT|SELECT|TEXTAREA|(OPTION))[^<>]*>(?(2)(.*(?=<\/?(option|select)[^<>]*>[\r\n]*)|(?=[\r\n]*))|(?=[\r\n]*))'Usi",$document,$elements);
+		preg_match_all("'<\/?(FORM|INPUT|SELECT|TEXTAREA|(OPTION))[^<>]*>(?(2)(.*(?=<\/?(option|select)[^<>]*>[\r\n]*)|(?=[\r\n]*))|(?=[\r\n]*))'Usi", $document, $elements);
 
 		// catenate the matches
-		$match = implode("\r\n",$elements[0]);
+		$match = implode("\r\n", $elements[0]);
 
 		// return the links
 		return $match;
@@ -679,11 +679,11 @@ 
 		// so, list your entities one by one here. I included some of the
 		// more common ones.
 
-		$search = array("'<script[^>]*?>.*?</script>'si",	// strip out javascript
-						"'<[\/\!]*?[^<>]*?>'si",			// strip out html tags
-						"'([\r\n])[\s]+'",					// strip out white space
-						"'&(quot|#34|#034|#x22);'i",		// replace html entities
-						"'&(amp|#38|#038|#x26);'i",			// added hexadecimal values
+		$search = array("'<script[^>]*?>.*?</script>'si", // strip out javascript
+						"'<[\/\!]*?[^<>]*?>'si", // strip out html tags
+						"'([\r\n])[\s]+'", // strip out white space
+						"'&(quot|#34|#034|#x22);'i", // replace html entities
+						"'&(amp|#38|#038|#x26);'i", // added hexadecimal values
 						"'&(lt|#60|#060|#x3c);'i",
 						"'&(gt|#62|#062|#x3e);'i",
 						"'&(nbsp|#160|#xa0);'i",
@@ -694,8 +694,8 @@ 
 						"'&(reg|#174);'i",
 						"'&(deg|#176);'i",
 						"'&(#39|#039|#x27);'",
-						"'&(euro|#8364);'i",				// europe
-						"'&a(uml|UML);'",					// german
+						"'&(euro|#8364);'i", // europe
+						"'&a(uml|UML);'", // german
 						"'&o(uml|UML);'",
 						"'&u(uml|UML);'",
 						"'&A(uml|UML);'",
@@ -703,7 +703,7 @@ 
 						"'&U(uml|UML);'",
 						"'&szlig;'i",
 						);
-		$replace = array(	"",
+		$replace = array("",
 							"",
 							"\\1",
 							"\"",
@@ -728,7 +728,7 @@ 
 							chr(0xDF), // ANSI &szlig;
 						);
 
-		$text = preg_replace($search,$replace,$document);
+		$text = preg_replace($search, $replace, $document);
 
 		return $text;
 	}
@@ -741,32 +741,32 @@ 
 	Output:		$expandedLinks	the expanded links
 \*======================================================================*/
 
-	function _expandlinks($links,$URI)
+	function _expandlinks($links, $URI)
 	{
 
-		preg_match("/^[^\?]+/",$URI,$match);
+		preg_match("/^[^\?]+/", $URI, $match);
 
-		$match = preg_replace("|/[^\/\.]+\.[^\/\.]+$|","",$match[0]);
-		$match = preg_replace("|/$|","",$match);
+		$match = preg_replace("|/[^\/\.]+\.[^\/\.]+$|", "", $match[0]);
+		$match = preg_replace("|/$|", "", $match);
 		$match_part = parse_url($match);
 		$match_root =
 		$match_part["scheme"]."://".$match_part["host"];
 
-		$search = array( 	"|^http://".preg_quote($this->host)."|i",
+		$search = array("|^http://".preg_quote($this->host)."|i",
 							"|^(\/)|i",
 							"|^(?!http://)(?!mailto:)|i",
 							"|/\./|",
 							"|/[^\/]+/\.\./|"
 						);
 
-		$replace = array(	"",
+		$replace = array("",
 							$match_root."/",
 							$match."/",
 							"/",
 							"/"
 						);
 
-		$expandedLinks = preg_replace($search,$replace,$links);
+		$expandedLinks = preg_replace($search, $replace, $links);
 
 		return $expandedLinks;
 	}
@@ -781,63 +781,63 @@ 
 	Output:
 \*======================================================================*/
 
-	function _httprequest($url,$fp,$URI,$http_method,$content_type="",$body="")
+	function _httprequest($url, $fp, $URI, $http_method, $content_type = "", $body = "")
 	{
 		$cookie_headers = '';
-		if($this->passcookies && $this->_redirectaddr)
+		if ($this->passcookies && $this->_redirectaddr)
 			$this->setcookies();
 
 		$URI_PARTS = parse_url($URI);
-		if(empty($url))
+		if (empty($url))
 			$url = "/";
 		$headers = $http_method." ".$url." ".$this->_httpversion."\r\n";
-		if(!empty($this->agent))
+		if ( ! empty($this->agent))
 			$headers .= "User-Agent: ".$this->agent."\r\n";
-		if(!empty($this->host) && !isset($this->rawheaders['Host'])) {
+		if ( ! empty($this->host) && ! isset($this->rawheaders['Host'])) {
 			$headers .= "Host: ".$this->host;
-			if(!empty($this->port) && $this->port != 80)
+			if ( ! empty($this->port) && $this->port != 80)
 				$headers .= ":".$this->port;
 			$headers .= "\r\n";
 		}
-		if(!empty($this->accept))
+		if ( ! empty($this->accept))
 			$headers .= "Accept: ".$this->accept."\r\n";
-		if(!empty($this->referer))
+		if ( ! empty($this->referer))
 			$headers .= "Referer: ".$this->referer."\r\n";
-		if(!empty($this->cookies))
+		if ( ! empty($this->cookies))
 		{
-			if(!is_array($this->cookies))
-				$this->cookies = (array)$this->cookies;
+			if ( ! is_array($this->cookies))
+				$this->cookies = (array) $this->cookies;
 
 			reset($this->cookies);
-			if ( count($this->cookies) > 0 ) {
+			if (count($this->cookies) > 0) {
 				$cookie_headers .= 'Cookie: ';
-				foreach ( $this->cookies as $cookieKey => $cookieVal ) {
+				foreach ($this->cookies as $cookieKey => $cookieVal) {
 				$cookie_headers .= $cookieKey."=".urlencode($cookieVal)."; ";
 				}
-				$headers .= substr($cookie_headers,0,-2) . "\r\n";
+				$headers .= substr($cookie_headers, 0, -2)."\r\n";
 			}
 		}
-		if(!empty($this->rawheaders))
+		if ( ! empty($this->rawheaders))
 		{
-			if(!is_array($this->rawheaders))
-				$this->rawheaders = (array)$this->rawheaders;
-			while(list($headerKey,$headerVal) = each($this->rawheaders))
+			if ( ! is_array($this->rawheaders))
+				$this->rawheaders = (array) $this->rawheaders;
+			while (list($headerKey, $headerVal) = each($this->rawheaders))
 				$headers .= $headerKey.": ".$headerVal."\r\n";
 		}
-		if(!empty($content_type)) {
+		if ( ! empty($content_type)) {
 			$headers .= "Content-type: $content_type";
 			if ($content_type == "multipart/form-data")
 				$headers .= "; boundary=".$this->_mime_boundary;
 			$headers .= "\r\n";
 		}
-		if(!empty($body))
+		if ( ! empty($body))
 			$headers .= "Content-length: ".strlen($body)."\r\n";
-		if(!empty($this->user) || !empty($this->pass))
+		if ( ! empty($this->user) || ! empty($this->pass))
 			$headers .= "Authorization: Basic ".base64_encode($this->user.":".$this->pass)."\r\n";
 
 		//add proxy auth headers
-		if(!empty($this->proxy_user))
-			$headers .= 'Proxy-Authorization: ' . 'Basic ' . base64_encode($this->proxy_user . ':' . $this->proxy_pass)."\r\n";
+		if ( ! empty($this->proxy_user))
+			$headers .= 'Proxy-Authorization: '.'Basic '.base64_encode($this->proxy_user.':'.$this->proxy_pass)."\r\n";
 
 
 		$headers .= "\r\n";
@@ -847,34 +847,34 @@ 
 			socket_set_timeout($fp, $this->read_timeout);
 		$this->timed_out = false;
 
-		fwrite($fp,$headers.$body,strlen($headers.$body));
+		fwrite($fp, $headers.$body, strlen($headers.$body));
 
 		$this->_redirectaddr = false;
 		unset($this->headers);
 
-		while($currentHeader = fgets($fp,$this->_maxlinelen))
+		while ($currentHeader = fgets($fp, $this->_maxlinelen))
 		{
 			if ($this->read_timeout > 0 && $this->_check_timeout($fp))
 			{
-				$this->status=-100;
+				$this->status = -100;
 				return false;
 			}
 
-			if($currentHeader == "\r\n")
+			if ($currentHeader == "\r\n")
 				break;
 
 			// if a header begins with Location: or URI:, set the redirect
-			if(preg_match("/^(Location:|URI:)/i",$currentHeader))
+			if (preg_match("/^(Location:|URI:)/i", $currentHeader))
 			{
 				// get URL portion of the redirect
-				preg_match("/^(Location:|URI:)[ ]+(.*)/i",chop($currentHeader),$matches);
+				preg_match("/^(Location:|URI:)[ ]+(.*)/i", chop($currentHeader), $matches);
 				// look for :// in the Location header to see if hostname is included
-				if(!preg_match("|\:\/\/|",$matches[2]))
+				if ( ! preg_match("|\:\/\/|", $matches[2]))
 				{
 					// no host in the path, so prepend
 					$this->_redirectaddr = $URI_PARTS["scheme"]."://".$this->host.":".$this->port;
 					// eliminate double slash
-					if(!preg_match("|^/|",$matches[2]))
+					if ( ! preg_match("|^/|", $matches[2]))
 							$this->_redirectaddr .= "/".$matches[2];
 					else
 							$this->_redirectaddr .= $matches[2];
@@ -883,11 +883,11 @@ 
 					$this->_redirectaddr = $matches[2];
 			}
 
-			if(preg_match("|^HTTP/|",$currentHeader))
+			if (preg_match("|^HTTP/|", $currentHeader))
 			{
-                if(preg_match("|^HTTP/[^\s]*\s(.*?)\s|",$currentHeader, $status))
+                if (preg_match("|^HTTP/[^\s]*\s(.*?)\s|", $currentHeader, $status))
 				{
-					$this->status= $status[1];
+					$this->status = $status[1];
                 }
 				$this->response_code = $currentHeader;
 			}
@@ -902,31 +902,31 @@ 
         		break;
     		}
     		$results .= $_data;
-		} while(true);
+		} while (true);
 
 		if ($this->read_timeout > 0 && $this->_check_timeout($fp))
 		{
-			$this->status=-100;
+			$this->status = -100;
 			return false;
 		}
 
 		// check if there is a redirect meta tag
 
-		if(preg_match("'<meta[\s]*http-equiv[^>]*?content[\s]*=[\s]*[\"\']?\d+;[\s]*URL[\s]*=[\s]*([^\"\']*?)[\"\']?>'i",$results,$match))
+		if (preg_match("'<meta[\s]*http-equiv[^>]*?content[\s]*=[\s]*[\"\']?\d+;[\s]*URL[\s]*=[\s]*([^\"\']*?)[\"\']?>'i", $results, $match))
 
 		{
-			$this->_redirectaddr = $this->_expandlinks($match[1],$URI);
+			$this->_redirectaddr = $this->_expandlinks($match[1], $URI);
 		}
 
 		// have we hit our frame depth and is there frame src to fetch?
-		if(($this->_framedepth < $this->maxframes) && preg_match_all("'<frame\s+.*src[\s]*=[\'\"]?([^\'\"\>]+)'i",$results,$match))
+		if (($this->_framedepth < $this->maxframes) && preg_match_all("'<frame\s+.*src[\s]*=[\'\"]?([^\'\"\>]+)'i", $results, $match))
 		{
 			$this->results[] = $results;
-			for($x=0; $x<count($match[1]); $x++)
-				$this->_frameurls[] = $this->_expandlinks($match[1][$x],$URI_PARTS["scheme"]."://".$this->host);
+			for ($x = 0; $x < count($match[1]); $x++)
+				$this->_frameurls[] = $this->_expandlinks($match[1][$x], $URI_PARTS["scheme"]."://".$this->host);
 		}
 		// have we already fetched framed content?
-		elseif(is_array($this->results))
+		elseif (is_array($this->results))
 			$this->results[] = $results;
 		// no framed content
 		else
@@ -944,108 +944,108 @@ 
 	Output:
 \*======================================================================*/
 
-	function _httpsrequest($url,$URI,$http_method,$content_type="",$body="")
+	function _httpsrequest($url, $URI, $http_method, $content_type = "", $body = "")
 	{
-		if($this->passcookies && $this->_redirectaddr)
+		if ($this->passcookies && $this->_redirectaddr)
 			$this->setcookies();
 
 		$headers = array();
 
 		$URI_PARTS = parse_url($URI);
-		if(empty($url))
+		if (empty($url))
 			$url = "/";
 		// GET ... header not needed for curl
 		//$headers[] = $http_method." ".$url." ".$this->_httpversion;
-		if(!empty($this->agent))
+		if ( ! empty($this->agent))
 			$headers[] = "User-Agent: ".$this->agent;
-		if(!empty($this->host))
-			if(!empty($this->port))
+		if ( ! empty($this->host))
+			if ( ! empty($this->port))
 				$headers[] = "Host: ".$this->host.":".$this->port;
 			else
 				$headers[] = "Host: ".$this->host;
-		if(!empty($this->accept))
+		if ( ! empty($this->accept))
 			$headers[] = "Accept: ".$this->accept;
-		if(!empty($this->referer))
+		if ( ! empty($this->referer))
 			$headers[] = "Referer: ".$this->referer;
-		if(!empty($this->cookies))
+		if ( ! empty($this->cookies))
 		{
-			if(!is_array($this->cookies))
-				$this->cookies = (array)$this->cookies;
+			if ( ! is_array($this->cookies))
+				$this->cookies = (array) $this->cookies;
 
 			reset($this->cookies);
-			if ( count($this->cookies) > 0 ) {
+			if (count($this->cookies) > 0) {
 				$cookie_str = 'Cookie: ';
-				foreach ( $this->cookies as $cookieKey => $cookieVal ) {
+				foreach ($this->cookies as $cookieKey => $cookieVal) {
 				$cookie_str .= $cookieKey."=".urlencode($cookieVal)."; ";
 				}
-				$headers[] = substr($cookie_str,0,-2);
+				$headers[] = substr($cookie_str, 0, -2);
 			}
 		}
-		if(!empty($this->rawheaders))
+		if ( ! empty($this->rawheaders))
 		{
-			if(!is_array($this->rawheaders))
-				$this->rawheaders = (array)$this->rawheaders;
-			while(list($headerKey,$headerVal) = each($this->rawheaders))
+			if ( ! is_array($this->rawheaders))
+				$this->rawheaders = (array) $this->rawheaders;
+			while (list($headerKey, $headerVal) = each($this->rawheaders))
 				$headers[] = $headerKey.": ".$headerVal;
 		}
-		if(!empty($content_type)) {
+		if ( ! empty($content_type)) {
 			if ($content_type == "multipart/form-data")
 				$headers[] = "Content-type: $content_type; boundary=".$this->_mime_boundary;
 			else
 				$headers[] = "Content-type: $content_type";
 		}
-		if(!empty($body))
+		if ( ! empty($body))
 			$headers[] = "Content-length: ".strlen($body);
-		if(!empty($this->user) || !empty($this->pass))
+		if ( ! empty($this->user) || ! empty($this->pass))
 			$headers[] = "Authorization: BASIC ".base64_encode($this->user.":".$this->pass);
 
-		$headerfile = tempnam( $this->temp_dir, "sno" );
-		$cmdline_params = '-k -D ' . escapeshellarg( $headerfile );
+		$headerfile = tempnam($this->temp_dir, "sno");
+		$cmdline_params = '-k -D '.escapeshellarg($headerfile);
 
-		foreach ( $headers as $header ) {
-			$cmdline_params .= ' -H ' . escapeshellarg( $header );
+		foreach ($headers as $header) {
+			$cmdline_params .= ' -H '.escapeshellarg($header);
 		}
 
-		if ( ! empty( $body ) ) {
-			$cmdline_params .= ' -d ' . escapeshellarg( $body );
+		if ( ! empty($body)) {
+			$cmdline_params .= ' -d '.escapeshellarg($body);
 		}
 
-		if ( $this->read_timeout > 0 ) {
-			$cmdline_params .= ' -m ' . escapeshellarg( $this->read_timeout );
+		if ($this->read_timeout > 0) {
+			$cmdline_params .= ' -m '.escapeshellarg($this->read_timeout);
 		}
 
 
-		exec( $this->curl_path . ' ' . $cmdline_params . ' ' . escapeshellarg( $URI ), $results, $return );
+		exec($this->curl_path.' '.$cmdline_params.' '.escapeshellarg($URI), $results, $return);
 
-		if($return)
+		if ($return)
 		{
 			$this->error = "Error: cURL could not retrieve the document, error $return.";
 			return false;
 		}
 
 
-		$results = implode("\r\n",$results);
+		$results = implode("\r\n", $results);
 
 		$result_headers = file("$headerfile");
 
 		$this->_redirectaddr = false;
 		unset($this->headers);
 
-		for($currentHeader = 0; $currentHeader < count($result_headers); $currentHeader++)
+		for ($currentHeader = 0; $currentHeader < count($result_headers); $currentHeader++)
 		{
 
 			// if a header begins with Location: or URI:, set the redirect
-			if(preg_match("/^(Location: |URI: )/i",$result_headers[$currentHeader]))
+			if (preg_match("/^(Location: |URI: )/i", $result_headers[$currentHeader]))
 			{
 				// get URL portion of the redirect
-				preg_match("/^(Location: |URI:)\s+(.*)/",chop($result_headers[$currentHeader]),$matches);
+				preg_match("/^(Location: |URI:)\s+(.*)/", chop($result_headers[$currentHeader]), $matches);
 				// look for :// in the Location header to see if hostname is included
-				if(!preg_match("|\:\/\/|",$matches[2]))
+				if ( ! preg_match("|\:\/\/|", $matches[2]))
 				{
 					// no host in the path, so prepend
 					$this->_redirectaddr = $URI_PARTS["scheme"]."://".$this->host.":".$this->port;
 					// eliminate double slash
-					if(!preg_match("|^/|",$matches[2]))
+					if ( ! preg_match("|^/|", $matches[2]))
 							$this->_redirectaddr .= "/".$matches[2];
 					else
 							$this->_redirectaddr .= $matches[2];
@@ -1054,7 +1054,7 @@ 
 					$this->_redirectaddr = $matches[2];
 			}
 
-			if(preg_match("|^HTTP/|",$result_headers[$currentHeader]))
+			if (preg_match("|^HTTP/|", $result_headers[$currentHeader]))
 				$this->response_code = $result_headers[$currentHeader];
 
 			$this->headers[] = $result_headers[$currentHeader];
@@ -1062,20 +1062,20 @@ 
 
 		// check if there is a redirect meta tag
 
-		if(preg_match("'<meta[\s]*http-equiv[^>]*?content[\s]*=[\s]*[\"\']?\d+;[\s]*URL[\s]*=[\s]*([^\"\']*?)[\"\']?>'i",$results,$match))
+		if (preg_match("'<meta[\s]*http-equiv[^>]*?content[\s]*=[\s]*[\"\']?\d+;[\s]*URL[\s]*=[\s]*([^\"\']*?)[\"\']?>'i", $results, $match))
 		{
-			$this->_redirectaddr = $this->_expandlinks($match[1],$URI);
+			$this->_redirectaddr = $this->_expandlinks($match[1], $URI);
 		}
 
 		// have we hit our frame depth and is there frame src to fetch?
-		if(($this->_framedepth < $this->maxframes) && preg_match_all("'<frame\s+.*src[\s]*=[\'\"]?([^\'\"\>]+)'i",$results,$match))
+		if (($this->_framedepth < $this->maxframes) && preg_match_all("'<frame\s+.*src[\s]*=[\'\"]?([^\'\"\>]+)'i", $results, $match))
 		{
 			$this->results[] = $results;
-			for($x=0; $x<count($match[1]); $x++)
-				$this->_frameurls[] = $this->_expandlinks($match[1][$x],$URI_PARTS["scheme"]."://".$this->host);
+			for ($x = 0; $x < count($match[1]); $x++)
+				$this->_frameurls[] = $this->_expandlinks($match[1][$x], $URI_PARTS["scheme"]."://".$this->host);
 		}
 		// have we already fetched framed content?
-		elseif(is_array($this->results))
+		elseif (is_array($this->results))
 			$this->results[] = $results;
 		// no framed content
 		else
@@ -1093,9 +1093,9 @@ 
 
 	function setcookies()
 	{
-		for($x=0; $x<count($this->headers); $x++)
+		for ($x = 0; $x < count($this->headers); $x++)
 		{
-		if(preg_match('/^set-cookie:[\s]+([^=]+)=([^;]+)/i', $this->headers[$x],$match))
+		if (preg_match('/^set-cookie:[\s]+([^=]+)=([^;]+)/i', $this->headers[$x], $match))
 			$this->cookies[$match[1]] = urldecode($match[2]);
 		}
 	}
@@ -1127,7 +1127,7 @@ 
 
 	function _connect(&$fp)
 	{
-		if(!empty($this->proxy_host) && !empty($this->proxy_port))
+		if ( ! empty($this->proxy_host) && ! empty($this->proxy_port))
 			{
 				$this->_isproxy = true;
 
@@ -1142,7 +1142,7 @@ 
 
 		$this->status = 0;
 
-		if($fp = fsockopen(
+		if ($fp = fsockopen(
 					$host,
 					$port,
 					$errno,
@@ -1158,16 +1158,16 @@ 
 		{
 			// socket connection failed
 			$this->status = $errno;
-			switch($errno)
+			switch ($errno)
 			{
 				case -3:
-					$this->error="socket creation failed (-3)";
+					$this->error = "socket creation failed (-3)";
 				case -4:
-					$this->error="dns lookup failure (-4)";
+					$this->error = "dns lookup failure (-4)";
 				case -5:
-					$this->error="connection refused or timed out (-5)";
+					$this->error = "connection refused or timed out (-5)";
 				default:
-					$this->error="connection failed (".$errno.")";
+					$this->error = "connection failed (".$errno.")";
 			}
 			return false;
 		}
@@ -1204,7 +1204,7 @@ 
 		switch ($this->_submit_type) {
 			case "application/x-www-form-urlencoded":
 				reset($formvars);
-				while(list($key,$val) = each($formvars)) {
+				while (list($key, $val) = each($formvars)) {
 					if (is_array($val) || is_object($val)) {
 						while (list($cur_key, $cur_val) = each($val)) {
 							$postdata .= urlencode($key)."[]=".urlencode($cur_val)."&";
@@ -1218,7 +1218,7 @@ 
 				$this->_mime_boundary = "Snoopy".md5(uniqid(microtime()));
 
 				reset($formvars);
-				while(list($key,$val) = each($formvars)) {
+				while (list($key, $val) = each($formvars)) {
 					if (is_array($val) || is_object($val)) {
 						while (list($cur_key, $cur_val) = each($val)) {
 							$postdata .= "--".$this->_mime_boundary."\r\n";
@@ -1236,7 +1236,7 @@ 
 				while (list($field_name, $file_names) = each($formfiles)) {
 					settype($file_names, "array");
 					while (list(, $file_name) = each($file_names)) {
-						if (!is_readable($file_name)) continue;
+						if ( ! is_readable($file_name)) continue;
 
 						$fp = fopen($file_name, "r");
 						$file_content = fread($fp, filesize($file_name));

src/wp-includes/load.php

Spacing +202 added lines, -202 removed lines

@@ -16,7 +16,7 @@ 
  */
 function wp_get_server_protocol() {
 	$protocol = $_SERVER['SERVER_PROTOCOL'];
-	if ( ! in_array( $protocol, array( 'HTTP/1.1', 'HTTP/2', 'HTTP/2.0' ) ) ) {
+	if ( ! in_array($protocol, array('HTTP/1.1', 'HTTP/2', 'HTTP/2.0'))) {
 		$protocol = 'HTTP/1.0';
 	}
 	return $protocol;
@@ -29,19 +29,19 @@ 
  * @access private
  */
 function wp_unregister_GLOBALS() {
-	if ( !ini_get( 'register_globals' ) )
+	if ( ! ini_get('register_globals'))
 		return;
 
-	if ( isset( $_REQUEST['GLOBALS'] ) )
-		die( 'GLOBALS overwrite attempt detected' );
+	if (isset($_REQUEST['GLOBALS']))
+		die('GLOBALS overwrite attempt detected');
 
 	// Variables that shouldn't be unset
-	$no_unset = array( 'GLOBALS', '_GET', '_POST', '_COOKIE', '_REQUEST', '_SERVER', '_ENV', '_FILES', 'table_prefix' );
+	$no_unset = array('GLOBALS', '_GET', '_POST', '_COOKIE', '_REQUEST', '_SERVER', '_ENV', '_FILES', 'table_prefix');
 
-	$input = array_merge( $_GET, $_POST, $_COOKIE, $_SERVER, $_ENV, $_FILES, isset( $_SESSION ) && is_array( $_SESSION ) ? $_SESSION : array() );
-	foreach ( $input as $k => $v )
-		if ( !in_array( $k, $no_unset ) && isset( $GLOBALS[$k] ) ) {
-			unset( $GLOBALS[$k] );
+	$input = array_merge($_GET, $_POST, $_COOKIE, $_SERVER, $_ENV, $_FILES, isset($_SESSION) && is_array($_SESSION) ? $_SESSION : array());
+	foreach ($input as $k => $v)
+		if ( ! in_array($k, $no_unset) && isset($GLOBALS[$k])) {
+			unset($GLOBALS[$k]);
 		}
 }
 
@@ -62,50 +62,50 @@ 
 		'REQUEST_URI' => '',
 	);
 
-	$_SERVER = array_merge( $default_server_values, $_SERVER );
+	$_SERVER = array_merge($default_server_values, $_SERVER);
 
 	// Fix for IIS when running with PHP ISAPI
-	if ( empty( $_SERVER['REQUEST_URI'] ) || ( PHP_SAPI != 'cgi-fcgi' && preg_match( '/^Microsoft-IIS\//', $_SERVER['SERVER_SOFTWARE'] ) ) ) {
+	if (empty($_SERVER['REQUEST_URI']) || (PHP_SAPI != 'cgi-fcgi' && preg_match('/^Microsoft-IIS\//', $_SERVER['SERVER_SOFTWARE']))) {
 
 		// IIS Mod-Rewrite
-		if ( isset( $_SERVER['HTTP_X_ORIGINAL_URL'] ) ) {
+		if (isset($_SERVER['HTTP_X_ORIGINAL_URL'])) {
 			$_SERVER['REQUEST_URI'] = $_SERVER['HTTP_X_ORIGINAL_URL'];
 		}
 		// IIS Isapi_Rewrite
-		elseif ( isset( $_SERVER['HTTP_X_REWRITE_URL'] ) ) {
+		elseif (isset($_SERVER['HTTP_X_REWRITE_URL'])) {
 			$_SERVER['REQUEST_URI'] = $_SERVER['HTTP_X_REWRITE_URL'];
 		} else {
 			// Use ORIG_PATH_INFO if there is no PATH_INFO
-			if ( !isset( $_SERVER['PATH_INFO'] ) && isset( $_SERVER['ORIG_PATH_INFO'] ) )
+			if ( ! isset($_SERVER['PATH_INFO']) && isset($_SERVER['ORIG_PATH_INFO']))
 				$_SERVER['PATH_INFO'] = $_SERVER['ORIG_PATH_INFO'];
 
 			// Some IIS + PHP configurations puts the script-name in the path-info (No need to append it twice)
-			if ( isset( $_SERVER['PATH_INFO'] ) ) {
-				if ( $_SERVER['PATH_INFO'] == $_SERVER['SCRIPT_NAME'] )
+			if (isset($_SERVER['PATH_INFO'])) {
+				if ($_SERVER['PATH_INFO'] == $_SERVER['SCRIPT_NAME'])
 					$_SERVER['REQUEST_URI'] = $_SERVER['PATH_INFO'];
 				else
-					$_SERVER['REQUEST_URI'] = $_SERVER['SCRIPT_NAME'] . $_SERVER['PATH_INFO'];
+					$_SERVER['REQUEST_URI'] = $_SERVER['SCRIPT_NAME'].$_SERVER['PATH_INFO'];
 			}
 
 			// Append the query string if it exists and isn't null
-			if ( ! empty( $_SERVER['QUERY_STRING'] ) ) {
-				$_SERVER['REQUEST_URI'] .= '?' . $_SERVER['QUERY_STRING'];
+			if ( ! empty($_SERVER['QUERY_STRING'])) {
+				$_SERVER['REQUEST_URI'] .= '?'.$_SERVER['QUERY_STRING'];
 			}
 		}
 	}
 
 	// Fix for PHP as CGI hosts that set SCRIPT_FILENAME to something ending in php.cgi for all requests
-	if ( isset( $_SERVER['SCRIPT_FILENAME'] ) && ( strpos( $_SERVER['SCRIPT_FILENAME'], 'php.cgi' ) == strlen( $_SERVER['SCRIPT_FILENAME'] ) - 7 ) )
+	if (isset($_SERVER['SCRIPT_FILENAME']) && (strpos($_SERVER['SCRIPT_FILENAME'], 'php.cgi') == strlen($_SERVER['SCRIPT_FILENAME']) - 7))
 		$_SERVER['SCRIPT_FILENAME'] = $_SERVER['PATH_TRANSLATED'];
 
 	// Fix for Dreamhost and other PHP as CGI hosts
-	if ( strpos( $_SERVER['SCRIPT_NAME'], 'php.cgi' ) !== false )
-		unset( $_SERVER['PATH_INFO'] );
+	if (strpos($_SERVER['SCRIPT_NAME'], 'php.cgi') !== false)
+		unset($_SERVER['PATH_INFO']);
 
 	// Fix empty PHP_SELF
 	$PHP_SELF = $_SERVER['PHP_SELF'];
-	if ( empty( $PHP_SELF ) )
-		$_SERVER['PHP_SELF'] = $PHP_SELF = preg_replace( '/(\?.*)?$/', '', $_SERVER["REQUEST_URI"] );
+	if (empty($PHP_SELF))
+		$_SERVER['PHP_SELF'] = $PHP_SELF = preg_replace('/(\?.*)?$/', '', $_SERVER["REQUEST_URI"]);
 }
 
 /**
@@ -124,22 +124,22 @@ 
 	global $required_php_version, $wp_version;
 	$php_version = phpversion();
 
-	if ( version_compare( $required_php_version, $php_version, '>' ) ) {
+	if (version_compare($required_php_version, $php_version, '>')) {
 		wp_load_translations_early();
 
 		$protocol = wp_get_server_protocol();
-		header( sprintf( '%s 500 Internal Server Error', $protocol ), true, 500 );
-		header( 'Content-Type: text/html; charset=utf-8' );
-		die( sprintf( __( 'Your server is running PHP version %1$s but WordPress %2$s requires at least %3$s.' ), $php_version, $wp_version, $required_php_version ) );
+		header(sprintf('%s 500 Internal Server Error', $protocol), true, 500);
+		header('Content-Type: text/html; charset=utf-8');
+		die(sprintf(__('Your server is running PHP version %1$s but WordPress %2$s requires at least %3$s.'), $php_version, $wp_version, $required_php_version));
 	}
 
-	if ( ! extension_loaded( 'mysql' ) && ! extension_loaded( 'mysqli' ) && ! extension_loaded( 'mysqlnd' ) && ! file_exists( WP_CONTENT_DIR . '/db.php' ) ) {
+	if ( ! extension_loaded('mysql') && ! extension_loaded('mysqli') && ! extension_loaded('mysqlnd') && ! file_exists(WP_CONTENT_DIR.'/db.php')) {
 		wp_load_translations_early();
 
 		$protocol = wp_get_server_protocol();
-		header( sprintf( '%s 500 Internal Server Error', $protocol ), true, 500 );
-		header( 'Content-Type: text/html; charset=utf-8' );
-		die( __( 'Your PHP installation appears to be missing the MySQL extension which is required by WordPress.' ) );
+		header(sprintf('%s 500 Internal Server Error', $protocol), true, 500);
+		header('Content-Type: text/html; charset=utf-8');
+		die(__('Your PHP installation appears to be missing the MySQL extension which is required by WordPress.'));
 	}
 }
 
@@ -151,7 +151,7 @@ 
  * @since 3.0.0
  */
 function wp_favicon_request() {
-	if ( '/favicon.ico' == $_SERVER['REQUEST_URI'] ) {
+	if ('/favicon.ico' == $_SERVER['REQUEST_URI']) {
 		header('Content-Type: image/vnd.microsoft.icon');
 		exit;
 	}
@@ -174,14 +174,14 @@ 
  * @global int $upgrading the unix timestamp marking when upgrading WordPress began.
  */
 function wp_maintenance() {
-	if ( ! file_exists( ABSPATH . '.maintenance' ) || wp_installing() )
+	if ( ! file_exists(ABSPATH.'.maintenance') || wp_installing())
 		return;
 
 	global $upgrading;
 
-	include( ABSPATH . '.maintenance' );
+	include(ABSPATH.'.maintenance');
 	// If the $upgrading timestamp is older than 10 minutes, don't die.
-	if ( ( time() - $upgrading ) >= 600 )
+	if ((time() - $upgrading) >= 600)
 		return;
 
 	/**
@@ -197,31 +197,31 @@ 
 	 * @param bool $enable_checks Whether to enable maintenance mode. Default true.
 	 * @param int  $upgrading     The timestamp set in the .maintenance file.
 	 */
-	if ( ! apply_filters( 'enable_maintenance_mode', true, $upgrading ) ) {
+	if ( ! apply_filters('enable_maintenance_mode', true, $upgrading)) {
 		return;
 	}
 
-	if ( file_exists( WP_CONTENT_DIR . '/maintenance.php' ) ) {
-		require_once( WP_CONTENT_DIR . '/maintenance.php' );
+	if (file_exists(WP_CONTENT_DIR.'/maintenance.php')) {
+		require_once(WP_CONTENT_DIR.'/maintenance.php');
 		die();
 	}
 
 	wp_load_translations_early();
 
 	$protocol = wp_get_server_protocol();
-	header( "$protocol 503 Service Unavailable", true, 503 );
-	header( 'Content-Type: text/html; charset=utf-8' );
-	header( 'Retry-After: 600' );
+	header("$protocol 503 Service Unavailable", true, 503);
+	header('Content-Type: text/html; charset=utf-8');
+	header('Retry-After: 600');
 ?>
 	<!DOCTYPE html>
-	<html xmlns="http://www.w3.org/1999/xhtml"<?php if ( is_rtl() ) echo ' dir="rtl"'; ?>>
+	<html xmlns="http://www.w3.org/1999/xhtml"<?php if (is_rtl()) echo ' dir="rtl"'; ?>>
 	<head>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-		<title><?php _e( 'Maintenance' ); ?></title>
+		<title><?php _e('Maintenance'); ?></title>
 
 	</head>
 	<body>
-		<h1><?php _e( 'Briefly unavailable for scheduled maintenance. Check back in a minute.' ); ?></h1>
+		<h1><?php _e('Briefly unavailable for scheduled maintenance. Check back in a minute.'); ?></h1>
 	</body>
 	</html>
 <?php
@@ -241,7 +241,7 @@ 
  */
 function timer_start() {
 	global $timestart;
-	$timestart = microtime( true );
+	$timestart = microtime(true);
 	return true;
 }
 
@@ -260,12 +260,12 @@ 
  * @return string The "second.microsecond" finished time calculation. The number is formatted
  *                for human consumption, both localized and rounded.
  */
-function timer_stop( $display = 0, $precision = 3 ) {
+function timer_stop($display = 0, $precision = 3) {
 	global $timestart, $timeend;
-	$timeend = microtime( true );
+	$timeend = microtime(true);
 	$timetotal = $timeend - $timestart;
-	$r = ( function_exists( 'number_format_i18n' ) ) ? number_format_i18n( $timetotal, $precision ) : number_format( $timetotal, $precision );
-	if ( $display )
+	$r = (function_exists('number_format_i18n')) ? number_format_i18n($timetotal, $precision) : number_format($timetotal, $precision);
+	if ($display)
 		echo $r;
 	return $r;
 }
@@ -314,28 +314,28 @@ 
 	 *
 	 * @param bool $enable_debug_mode Whether to enable debug mode checks to occur. Default true.
 	 */
-	if ( ! apply_filters( 'enable_wp_debug_mode_checks', true ) ){
+	if ( ! apply_filters('enable_wp_debug_mode_checks', true)) {
 		return;
 	}
 
-	if ( WP_DEBUG ) {
-		error_reporting( E_ALL );
+	if (WP_DEBUG) {
+		error_reporting(E_ALL);
 
-		if ( WP_DEBUG_DISPLAY )
-			ini_set( 'display_errors', 1 );
-		elseif ( null !== WP_DEBUG_DISPLAY )
-			ini_set( 'display_errors', 0 );
+		if (WP_DEBUG_DISPLAY)
+			ini_set('display_errors', 1);
+		elseif (null !== WP_DEBUG_DISPLAY)
+			ini_set('display_errors', 0);
 
-		if ( WP_DEBUG_LOG ) {
-			ini_set( 'log_errors', 1 );
-			ini_set( 'error_log', WP_CONTENT_DIR . '/debug.log' );
+		if (WP_DEBUG_LOG) {
+			ini_set('log_errors', 1);
+			ini_set('error_log', WP_CONTENT_DIR.'/debug.log');
 		}
 	} else {
-		error_reporting( E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR );
+		error_reporting(E_CORE_ERROR | E_CORE_WARNING | E_COMPILE_ERROR | E_ERROR | E_WARNING | E_PARSE | E_USER_ERROR | E_USER_WARNING | E_RECOVERABLE_ERROR);
 	}
 
-	if ( defined( 'XMLRPC_REQUEST' ) || defined( 'REST_REQUEST' ) || ( defined( 'DOING_AJAX' ) && DOING_AJAX ) ) {
-		@ini_set( 'display_errors', 0 );
+	if (defined('XMLRPC_REQUEST') || defined('REST_REQUEST') || (defined('DOING_AJAX') && DOING_AJAX)) {
+		@ini_set('display_errors', 0);
 	}
 }
 
@@ -353,8 +353,8 @@ 
  * @access private
  */
 function wp_set_lang_dir() {
-	if ( !defined( 'WP_LANG_DIR' ) ) {
-		if ( file_exists( WP_CONTENT_DIR . '/languages' ) && @is_dir( WP_CONTENT_DIR . '/languages' ) || !@is_dir(ABSPATH . WPINC . '/languages') ) {
+	if ( ! defined('WP_LANG_DIR')) {
+		if (file_exists(WP_CONTENT_DIR.'/languages') && @is_dir(WP_CONTENT_DIR.'/languages') || ! @is_dir(ABSPATH.WPINC.'/languages')) {
 			/**
 			 * Server path of the language directory.
 			 *
@@ -362,10 +362,10 @@ 
 			 *
 			 * @since 2.1.0
 			 */
-			define( 'WP_LANG_DIR', WP_CONTENT_DIR . '/languages' );
-			if ( !defined( 'LANGDIR' ) ) {
+			define('WP_LANG_DIR', WP_CONTENT_DIR.'/languages');
+			if ( ! defined('LANGDIR')) {
 				// Old static relative path maintained for limited backward compatibility - won't work in some cases.
-				define( 'LANGDIR', 'wp-content/languages' );
+				define('LANGDIR', 'wp-content/languages');
 			}
 		} else {
 			/**
@@ -375,10 +375,10 @@ 
 			 *
 			 * @since 2.1.0
 			 */
-			define( 'WP_LANG_DIR', ABSPATH . WPINC . '/languages' );
-			if ( !defined( 'LANGDIR' ) ) {
+			define('WP_LANG_DIR', ABSPATH.WPINC.'/languages');
+			if ( ! defined('LANGDIR')) {
 				// Old relative path maintained for backward compatibility.
-				define( 'LANGDIR', WPINC . '/languages' );
+				define('LANGDIR', WPINC.'/languages');
 			}
 		}
 	}
@@ -394,14 +394,14 @@ 
 function require_wp_db() {
 	global $wpdb;
 
-	require_once( ABSPATH . WPINC . '/wp-db.php' );
-	if ( file_exists( WP_CONTENT_DIR . '/db.php' ) )
-		require_once( WP_CONTENT_DIR . '/db.php' );
+	require_once(ABSPATH.WPINC.'/wp-db.php');
+	if (file_exists(WP_CONTENT_DIR.'/db.php'))
+		require_once(WP_CONTENT_DIR.'/db.php');
 
-	if ( isset( $wpdb ) )
+	if (isset($wpdb))
 		return;
 
-	$wpdb = new wpdb( DB_USER, DB_PASSWORD, DB_NAME, DB_HOST );
+	$wpdb = new wpdb(DB_USER, DB_PASSWORD, DB_NAME, DB_HOST);
 }
 
 /**
@@ -418,24 +418,24 @@ 
  */
 function wp_set_wpdb_vars() {
 	global $wpdb, $table_prefix;
-	if ( !empty( $wpdb->error ) )
+	if ( ! empty($wpdb->error))
 		dead_db();
 
-	$wpdb->field_types = array( 'post_author' => '%d', 'post_parent' => '%d', 'menu_order' => '%d', 'term_id' => '%d', 'term_group' => '%d', 'term_taxonomy_id' => '%d',
-		'parent' => '%d', 'count' => '%d','object_id' => '%d', 'term_order' => '%d', 'ID' => '%d', 'comment_ID' => '%d', 'comment_post_ID' => '%d', 'comment_parent' => '%d',
+	$wpdb->field_types = array('post_author' => '%d', 'post_parent' => '%d', 'menu_order' => '%d', 'term_id' => '%d', 'term_group' => '%d', 'term_taxonomy_id' => '%d',
+		'parent' => '%d', 'count' => '%d', 'object_id' => '%d', 'term_order' => '%d', 'ID' => '%d', 'comment_ID' => '%d', 'comment_post_ID' => '%d', 'comment_parent' => '%d',
 		'user_id' => '%d', 'link_id' => '%d', 'link_owner' => '%d', 'link_rating' => '%d', 'option_id' => '%d', 'blog_id' => '%d', 'meta_id' => '%d', 'post_id' => '%d',
 		'user_status' => '%d', 'umeta_id' => '%d', 'comment_karma' => '%d', 'comment_count' => '%d',
 		// multisite:
 		'active' => '%d', 'cat_id' => '%d', 'deleted' => '%d', 'lang_id' => '%d', 'mature' => '%d', 'public' => '%d', 'site_id' => '%d', 'spam' => '%d',
 	);
 
-	$prefix = $wpdb->set_prefix( $table_prefix );
+	$prefix = $wpdb->set_prefix($table_prefix);
 
-	if ( is_wp_error( $prefix ) ) {
+	if (is_wp_error($prefix)) {
 		wp_load_translations_early();
 		wp_die(
 			/* translators: 1: $table_prefix 2: wp-config.php */
-			sprintf( __( '<strong>ERROR</strong>: %1$s in %2$s can only contain numbers, letters, and underscores.' ),
+			sprintf(__('<strong>ERROR</strong>: %1$s in %2$s can only contain numbers, letters, and underscores.'),
 				'<code>$table_prefix</code>',
 				'<code>wp-config.php</code>'
 			)
@@ -454,10 +454,10 @@ 
  * @param bool $using Whether external object cache is being used.
  * @return bool The current 'using' setting.
  */
-function wp_using_ext_object_cache( $using = null ) {
+function wp_using_ext_object_cache($using = null) {
 	global $_wp_using_ext_object_cache;
 	$current_using = $_wp_using_ext_object_cache;
-	if ( null !== $using )
+	if (null !== $using)
 		$_wp_using_ext_object_cache = $using;
 	return $current_using;
 }
@@ -477,40 +477,40 @@ 
 	global $blog_id;
 
 	$first_init = false;
- 	if ( ! function_exists( 'wp_cache_init' ) ) {
-		if ( file_exists( WP_CONTENT_DIR . '/object-cache.php' ) ) {
-			require_once ( WP_CONTENT_DIR . '/object-cache.php' );
-			if ( function_exists( 'wp_cache_init' ) )
-				wp_using_ext_object_cache( true );
+ 	if ( ! function_exists('wp_cache_init')) {
+		if (file_exists(WP_CONTENT_DIR.'/object-cache.php')) {
+			require_once (WP_CONTENT_DIR.'/object-cache.php');
+			if (function_exists('wp_cache_init'))
+				wp_using_ext_object_cache(true);
 		}
 
 		$first_init = true;
-	} elseif ( ! wp_using_ext_object_cache() && file_exists( WP_CONTENT_DIR . '/object-cache.php' ) ) {
+	} elseif ( ! wp_using_ext_object_cache() && file_exists(WP_CONTENT_DIR.'/object-cache.php')) {
 		/*
 		 * Sometimes advanced-cache.php can load object-cache.php before
 		 * it is loaded here. This breaks the function_exists check above
 		 * and can result in `$_wp_using_ext_object_cache` being set
 		 * incorrectly. Double check if an external cache exists.
 		 */
-		wp_using_ext_object_cache( true );
+		wp_using_ext_object_cache(true);
 	}
 
-	if ( ! wp_using_ext_object_cache() )
-		require_once ( ABSPATH . WPINC . '/cache.php' );
+	if ( ! wp_using_ext_object_cache())
+		require_once (ABSPATH.WPINC.'/cache.php');
 
 	/*
 	 * If cache supports reset, reset instead of init if already
 	 * initialized. Reset signals to the cache that global IDs
 	 * have changed and it may need to update keys and cleanup caches.
 	 */
-	if ( ! $first_init && function_exists( 'wp_cache_switch_to_blog' ) )
-		wp_cache_switch_to_blog( $blog_id );
-	elseif ( function_exists( 'wp_cache_init' ) )
+	if ( ! $first_init && function_exists('wp_cache_switch_to_blog'))
+		wp_cache_switch_to_blog($blog_id);
+	elseif (function_exists('wp_cache_init'))
 		wp_cache_init();
 
-	if ( function_exists( 'wp_cache_add_global_groups' ) ) {
-		wp_cache_add_global_groups( array( 'users', 'userlogins', 'usermeta', 'user_meta', 'useremail', 'userslugs', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'site-details', 'rss', 'global-posts', 'blog-id-cache', 'networks', 'sites' ) );
-		wp_cache_add_non_persistent_groups( array( 'counts', 'plugins' ) );
+	if (function_exists('wp_cache_add_global_groups')) {
+		wp_cache_add_global_groups(array('users', 'userlogins', 'usermeta', 'user_meta', 'useremail', 'userslugs', 'site-transient', 'site-options', 'site-lookup', 'blog-lookup', 'blog-details', 'site-details', 'rss', 'global-posts', 'blog-id-cache', 'networks', 'sites'));
+		wp_cache_add_non_persistent_groups(array('counts', 'plugins'));
 	}
 }
 
@@ -523,22 +523,22 @@ 
  * @access private
  */
 function wp_not_installed() {
-	if ( is_multisite() ) {
-		if ( ! is_blog_installed() && ! wp_installing() ) {
+	if (is_multisite()) {
+		if ( ! is_blog_installed() && ! wp_installing()) {
 			nocache_headers();
 
-			wp_die( __( 'The site you have requested is not installed properly. Please contact the system administrator.' ) );
+			wp_die(__('The site you have requested is not installed properly. Please contact the system administrator.'));
 		}
-	} elseif ( ! is_blog_installed() && ! wp_installing() ) {
+	} elseif ( ! is_blog_installed() && ! wp_installing()) {
 		nocache_headers();
 
-		require( ABSPATH . WPINC . '/kses.php' );
-		require( ABSPATH . WPINC . '/pluggable.php' );
-		require( ABSPATH . WPINC . '/formatting.php' );
+		require(ABSPATH.WPINC.'/kses.php');
+		require(ABSPATH.WPINC.'/pluggable.php');
+		require(ABSPATH.WPINC.'/formatting.php');
 
-		$link = wp_guess_url() . '/wp-admin/install.php';
+		$link = wp_guess_url().'/wp-admin/install.php';
 
-		wp_redirect( $link );
+		wp_redirect($link);
 		die();
 	}
 }
@@ -557,16 +557,16 @@ 
  */
 function wp_get_mu_plugins() {
 	$mu_plugins = array();
-	if ( !is_dir( WPMU_PLUGIN_DIR ) )
+	if ( ! is_dir(WPMU_PLUGIN_DIR))
 		return $mu_plugins;
-	if ( ! $dh = opendir( WPMU_PLUGIN_DIR ) )
+	if ( ! $dh = opendir(WPMU_PLUGIN_DIR))
 		return $mu_plugins;
-	while ( ( $plugin = readdir( $dh ) ) !== false ) {
-		if ( substr( $plugin, -4 ) == '.php' )
-			$mu_plugins[] = WPMU_PLUGIN_DIR . '/' . $plugin;
+	while (($plugin = readdir($dh)) !== false) {
+		if (substr($plugin, -4) == '.php')
+			$mu_plugins[] = WPMU_PLUGIN_DIR.'/'.$plugin;
 	}
-	closedir( $dh );
-	sort( $mu_plugins );
+	closedir($dh);
+	sort($mu_plugins);
 
 	return $mu_plugins;
 }
@@ -587,27 +587,27 @@ 
  */
 function wp_get_active_and_valid_plugins() {
 	$plugins = array();
-	$active_plugins = (array) get_option( 'active_plugins', array() );
+	$active_plugins = (array) get_option('active_plugins', array());
 
 	// Check for hacks file if the option is enabled
-	if ( get_option( 'hack_file' ) && file_exists( ABSPATH . 'my-hacks.php' ) ) {
-		_deprecated_file( 'my-hacks.php', '1.5.0' );
-		array_unshift( $plugins, ABSPATH . 'my-hacks.php' );
+	if (get_option('hack_file') && file_exists(ABSPATH.'my-hacks.php')) {
+		_deprecated_file('my-hacks.php', '1.5.0');
+		array_unshift($plugins, ABSPATH.'my-hacks.php');
 	}
 
-	if ( empty( $active_plugins ) || wp_installing() )
+	if (empty($active_plugins) || wp_installing())
 		return $plugins;
 
 	$network_plugins = is_multisite() ? wp_get_active_network_plugins() : false;
 
-	foreach ( $active_plugins as $plugin ) {
-		if ( ! validate_file( $plugin ) // $plugin must validate as file
-			&& '.php' == substr( $plugin, -4 ) // $plugin must end with '.php'
-			&& file_exists( WP_PLUGIN_DIR . '/' . $plugin ) // $plugin must exist
+	foreach ($active_plugins as $plugin) {
+		if ( ! validate_file($plugin) // $plugin must validate as file
+			&& '.php' == substr($plugin, -4) // $plugin must end with '.php'
+			&& file_exists(WP_PLUGIN_DIR.'/'.$plugin) // $plugin must exist
 			// not already included as a network plugin
-			&& ( ! $network_plugins || ! in_array( WP_PLUGIN_DIR . '/' . $plugin, $network_plugins ) )
+			&& ( ! $network_plugins || ! in_array(WP_PLUGIN_DIR.'/'.$plugin, $network_plugins))
 			)
-		$plugins[] = WP_PLUGIN_DIR . '/' . $plugin;
+		$plugins[] = WP_PLUGIN_DIR.'/'.$plugin;
 	}
 	return $plugins;
 }
@@ -622,10 +622,10 @@ 
  * @access private
  */
 function wp_set_internal_encoding() {
-	if ( function_exists( 'mb_internal_encoding' ) ) {
-		$charset = get_option( 'blog_charset' );
-		if ( ! $charset || ! @mb_internal_encoding( $charset ) )
-			mb_internal_encoding( 'UTF-8' );
+	if (function_exists('mb_internal_encoding')) {
+		$charset = get_option('blog_charset');
+		if ( ! $charset || ! @mb_internal_encoding($charset))
+			mb_internal_encoding('UTF-8');
 	}
 }
 
@@ -640,20 +640,20 @@ 
  */
 function wp_magic_quotes() {
 	// If already slashed, strip.
-	if ( get_magic_quotes_gpc() ) {
-		$_GET    = stripslashes_deep( $_GET    );
-		$_POST   = stripslashes_deep( $_POST   );
-		$_COOKIE = stripslashes_deep( $_COOKIE );
+	if (get_magic_quotes_gpc()) {
+		$_GET    = stripslashes_deep($_GET);
+		$_POST   = stripslashes_deep($_POST);
+		$_COOKIE = stripslashes_deep($_COOKIE);
 	}
 
 	// Escape with wpdb.
-	$_GET    = add_magic_quotes( $_GET    );
-	$_POST   = add_magic_quotes( $_POST   );
-	$_COOKIE = add_magic_quotes( $_COOKIE );
-	$_SERVER = add_magic_quotes( $_SERVER );
+	$_GET    = add_magic_quotes($_GET);
+	$_POST   = add_magic_quotes($_POST);
+	$_COOKIE = add_magic_quotes($_COOKIE);
+	$_SERVER = add_magic_quotes($_SERVER);
 
 	// Force REQUEST to be GET + POST.
-	$_REQUEST = array_merge( $_GET, $_POST );
+	$_REQUEST = array_merge($_GET, $_POST);
 }
 
 /**
@@ -668,7 +668,7 @@ 
 	 *
 	 * @since 1.2.0
 	 */
-	do_action( 'shutdown' );
+	do_action('shutdown');
 
 	wp_cache_close();
 }
@@ -682,9 +682,9 @@ 
  * @param object $object The object to clone.
  * @return object The cloned object.
  */
-function wp_clone( $object ) {
+function wp_clone($object) {
 	// Use parens for clone to accommodate PHP 4. See #17880
-	return clone( $object );
+	return clone($object);
 }
 
 /**
@@ -700,9 +700,9 @@ 
  * @return bool True if inside WordPress administration interface, false otherwise.
  */
 function is_admin() {
-	if ( isset( $GLOBALS['current_screen'] ) )
+	if (isset($GLOBALS['current_screen']))
 		return $GLOBALS['current_screen']->in_admin();
-	elseif ( defined( 'WP_ADMIN' ) )
+	elseif (defined('WP_ADMIN'))
 		return WP_ADMIN;
 
 	return false;
@@ -723,9 +723,9 @@ 
  * @return bool True if inside WordPress blog administration pages.
  */
 function is_blog_admin() {
-	if ( isset( $GLOBALS['current_screen'] ) )
-		return $GLOBALS['current_screen']->in_admin( 'site' );
-	elseif ( defined( 'WP_BLOG_ADMIN' ) )
+	if (isset($GLOBALS['current_screen']))
+		return $GLOBALS['current_screen']->in_admin('site');
+	elseif (defined('WP_BLOG_ADMIN'))
 		return WP_BLOG_ADMIN;
 
 	return false;
@@ -746,9 +746,9 @@ 
  * @return bool True if inside WordPress network administration pages.
  */
 function is_network_admin() {
-	if ( isset( $GLOBALS['current_screen'] ) )
-		return $GLOBALS['current_screen']->in_admin( 'network' );
-	elseif ( defined( 'WP_NETWORK_ADMIN' ) )
+	if (isset($GLOBALS['current_screen']))
+		return $GLOBALS['current_screen']->in_admin('network');
+	elseif (defined('WP_NETWORK_ADMIN'))
 		return WP_NETWORK_ADMIN;
 
 	return false;
@@ -770,9 +770,9 @@ 
  * @return bool True if inside WordPress user administration pages.
  */
 function is_user_admin() {
-	if ( isset( $GLOBALS['current_screen'] ) )
-		return $GLOBALS['current_screen']->in_admin( 'user' );
-	elseif ( defined( 'WP_USER_ADMIN' ) )
+	if (isset($GLOBALS['current_screen']))
+		return $GLOBALS['current_screen']->in_admin('user');
+	elseif (defined('WP_USER_ADMIN'))
 		return WP_USER_ADMIN;
 
 	return false;
@@ -786,10 +786,10 @@ 
  * @return bool True if Multisite is enabled, false otherwise.
  */
 function is_multisite() {
-	if ( defined( 'MULTISITE' ) )
+	if (defined('MULTISITE'))
 		return MULTISITE;
 
-	if ( defined( 'SUBDOMAIN_INSTALL' ) || defined( 'VHOST' ) || defined( 'SUNRISE' ) )
+	if (defined('SUBDOMAIN_INSTALL') || defined('VHOST') || defined('SUNRISE'))
 		return true;
 
 	return false;
@@ -819,17 +819,17 @@ 
  * @return int The ID of the current network.
  */
 function get_current_network_id() {
-	if ( ! is_multisite() ) {
+	if ( ! is_multisite()) {
 		return 1;
 	}
 
 	$current_site = get_current_site();
 
-	if ( ! isset( $current_site->id ) ) {
+	if ( ! isset($current_site->id)) {
 		return get_main_network_id();
 	}
 
-	return absint( $current_site->id );
+	return absint($current_site->id);
 }
 
 /**
@@ -854,62 +854,62 @@ 
 	global $text_direction, $wp_locale;
 
 	static $loaded = false;
-	if ( $loaded )
+	if ($loaded)
 		return;
 	$loaded = true;
 
-	if ( function_exists( 'did_action' ) && did_action( 'init' ) )
+	if (function_exists('did_action') && did_action('init'))
 		return;
 
 	// We need $wp_local_package
-	require ABSPATH . WPINC . '/version.php';
+	require ABSPATH.WPINC.'/version.php';
 
 	// Translation and localization
-	require_once ABSPATH . WPINC . '/pomo/mo.php';
-	require_once ABSPATH . WPINC . '/l10n.php';
-	require_once ABSPATH . WPINC . '/locale.php';
+	require_once ABSPATH.WPINC.'/pomo/mo.php';
+	require_once ABSPATH.WPINC.'/l10n.php';
+	require_once ABSPATH.WPINC.'/locale.php';
 
 	// General libraries
-	require_once ABSPATH . WPINC . '/plugin.php';
+	require_once ABSPATH.WPINC.'/plugin.php';
 
 	$locales = $locations = array();
 
-	while ( true ) {
-		if ( defined( 'WPLANG' ) ) {
-			if ( '' == WPLANG )
+	while (true) {
+		if (defined('WPLANG')) {
+			if ('' == WPLANG)
 				break;
 			$locales[] = WPLANG;
 		}
 
-		if ( isset( $wp_local_package ) )
+		if (isset($wp_local_package))
 			$locales[] = $wp_local_package;
 
-		if ( ! $locales )
+		if ( ! $locales)
 			break;
 
-		if ( defined( 'WP_LANG_DIR' ) && @is_dir( WP_LANG_DIR ) )
+		if (defined('WP_LANG_DIR') && @is_dir(WP_LANG_DIR))
 			$locations[] = WP_LANG_DIR;
 
-		if ( defined( 'WP_CONTENT_DIR' ) && @is_dir( WP_CONTENT_DIR . '/languages' ) )
-			$locations[] = WP_CONTENT_DIR . '/languages';
+		if (defined('WP_CONTENT_DIR') && @is_dir(WP_CONTENT_DIR.'/languages'))
+			$locations[] = WP_CONTENT_DIR.'/languages';
 
-		if ( @is_dir( ABSPATH . 'wp-content/languages' ) )
-			$locations[] = ABSPATH . 'wp-content/languages';
+		if (@is_dir(ABSPATH.'wp-content/languages'))
+			$locations[] = ABSPATH.'wp-content/languages';
 
-		if ( @is_dir( ABSPATH . WPINC . '/languages' ) )
-			$locations[] = ABSPATH . WPINC . '/languages';
+		if (@is_dir(ABSPATH.WPINC.'/languages'))
+			$locations[] = ABSPATH.WPINC.'/languages';
 
-		if ( ! $locations )
+		if ( ! $locations)
 			break;
 
-		$locations = array_unique( $locations );
+		$locations = array_unique($locations);
 
-		foreach ( $locales as $locale ) {
-			foreach ( $locations as $location ) {
-				if ( file_exists( $location . '/' . $locale . '.mo' ) ) {
-					load_textdomain( 'default', $location . '/' . $locale . '.mo' );
-					if ( defined( 'WP_SETUP_CONFIG' ) && file_exists( $location . '/admin-' . $locale . '.mo' ) )
-						load_textdomain( 'default', $location . '/admin-' . $locale . '.mo' );
+		foreach ($locales as $locale) {
+			foreach ($locations as $location) {
+				if (file_exists($location.'/'.$locale.'.mo')) {
+					load_textdomain('default', $location.'/'.$locale.'.mo');
+					if (defined('WP_SETUP_CONFIG') && file_exists($location.'/admin-'.$locale.'.mo'))
+						load_textdomain('default', $location.'/admin-'.$locale.'.mo');
 					break 2;
 				}
 			}
@@ -935,15 +935,15 @@ 
  * @return bool True if WP is installing, otherwise false. When a `$is_installing` is passed, the function will
  *              report whether WP was in installing mode prior to the change to `$is_installing`.
  */
-function wp_installing( $is_installing = null ) {
+function wp_installing($is_installing = null) {
 	static $installing = null;
 
 	// Support for the `WP_INSTALLING` constant, defined before WP is loaded.
-	if ( is_null( $installing ) ) {
-		$installing = defined( 'WP_INSTALLING' ) && WP_INSTALLING;
+	if (is_null($installing)) {
+		$installing = defined('WP_INSTALLING') && WP_INSTALLING;
 	}
 
-	if ( ! is_null( $is_installing ) ) {
+	if ( ! is_null($is_installing)) {
 		$old_installing = $installing;
 		$installing = $is_installing;
 		return (bool) $old_installing;
@@ -961,15 +961,15 @@ 
  * @return bool True if SSL, otherwise false.
  */
 function is_ssl() {
-	if ( isset( $_SERVER['HTTPS'] ) ) {
-		if ( 'on' == strtolower( $_SERVER['HTTPS'] ) ) {
+	if (isset($_SERVER['HTTPS'])) {
+		if ('on' == strtolower($_SERVER['HTTPS'])) {
 			return true;
 		}
 
-		if ( '1' == $_SERVER['HTTPS'] ) {
+		if ('1' == $_SERVER['HTTPS']) {
 			return true;
 		}
-	} elseif ( isset($_SERVER['SERVER_PORT'] ) && ( '443' == $_SERVER['SERVER_PORT'] ) ) {
+	} elseif (isset($_SERVER['SERVER_PORT']) && ('443' == $_SERVER['SERVER_PORT'])) {
 		return true;
 	}
 	return false;
@@ -987,20 +987,20 @@ 
  * @param string $value A (PHP ini) byte value, either shorthand or ordinary.
  * @return int An integer byte value.
  */
-function wp_convert_hr_to_bytes( $value ) {
-	$value = strtolower( trim( $value ) );
+function wp_convert_hr_to_bytes($value) {
+	$value = strtolower(trim($value));
 	$bytes = (int) $value;
 
-	if ( false !== strpos( $value, 'g' ) ) {
+	if (false !== strpos($value, 'g')) {
 		$bytes *= GB_IN_BYTES;
-	} elseif ( false !== strpos( $value, 'm' ) ) {
+	} elseif (false !== strpos($value, 'm')) {
 		$bytes *= MB_IN_BYTES;
-	} elseif ( false !== strpos( $value, 'k' ) ) {
+	} elseif (false !== strpos($value, 'k')) {
 		$bytes *= KB_IN_BYTES;
 	}
 
 	// Deal with large (float) values which run into the maximum integer size.
-	return min( $bytes, PHP_INT_MAX );
+	return min($bytes, PHP_INT_MAX);
 }
 
 /**
@@ -1013,15 +1013,15 @@ 
  * @param string $setting The name of the ini setting to check.
  * @return bool True if the value is changeable at runtime. False otherwise.
  */
-function wp_is_ini_value_changeable( $setting ) {
+function wp_is_ini_value_changeable($setting) {
 	static $ini_all;
 
-	if ( ! isset( $ini_all ) ) {
+	if ( ! isset($ini_all)) {
 		$ini_all = ini_get_all();
 	}
 
 	// Bit operator to workaround https://bugs.php.net/bug.php?id=44936 which changes access level to 63 in PHP 5.2.6 - 5.2.17.
-	if ( isset( $ini_all[ $setting ]['access'] ) && ( INI_ALL === ( $ini_all[ $setting ]['access'] & 7 ) || INI_USER === ( $ini_all[ $setting ]['access'] & 7 ) ) ) {
+	if (isset($ini_all[$setting]['access']) && (INI_ALL === ($ini_all[$setting]['access'] & 7) || INI_USER === ($ini_all[$setting]['access'] & 7))) {
 		return true;
 	}
 

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

Spacing +110 added lines, -110 removed lines

@@ -50,7 +50,7 @@ 
 	 * @access private
 	 * @var string
 	 */
-	private static $no_results = array( 'join' => array( '' ), 'where' => array( '0 = 1' ) );
+	private static $no_results = array('join' => array(''), 'where' => array('0 = 1'));
 
 	/**
 	 * A flat list of table aliases used in the JOIN clauses.
@@ -118,14 +118,14 @@ 
 	 *     }
 	 * }
 	 */
-	public function __construct( $tax_query ) {
-		if ( isset( $tax_query['relation'] ) ) {
-			$this->relation = $this->sanitize_relation( $tax_query['relation'] );
+	public function __construct($tax_query) {
+		if (isset($tax_query['relation'])) {
+			$this->relation = $this->sanitize_relation($tax_query['relation']);
 		} else {
 			$this->relation = 'AND';
 		}
 
-		$this->queries = $this->sanitize_query( $tax_query );
+		$this->queries = $this->sanitize_query($tax_query);
 	}
 
 	/**
@@ -140,7 +140,7 @@ 
 	 * @param array $queries Array of queries clauses.
 	 * @return array Sanitized array of query clauses.
 	 */
-	public function sanitize_query( $queries ) {
+	public function sanitize_query($queries) {
 		$cleaned_query = array();
 
 		$defaults = array(
@@ -151,14 +151,14 @@ 
 			'include_children' => true,
 		);
 
-		foreach ( $queries as $key => $query ) {
-			if ( 'relation' === $key ) {
-				$cleaned_query['relation'] = $this->sanitize_relation( $query );
+		foreach ($queries as $key => $query) {
+			if ('relation' === $key) {
+				$cleaned_query['relation'] = $this->sanitize_relation($query);
 
 			// First-order clause.
-			} elseif ( self::is_first_order_clause( $query ) ) {
+			} elseif (self::is_first_order_clause($query)) {
 
-				$cleaned_clause = array_merge( $defaults, $query );
+				$cleaned_clause = array_merge($defaults, $query);
 				$cleaned_clause['terms'] = (array) $cleaned_clause['terms'];
 				$cleaned_query[] = $cleaned_clause;
 
@@ -166,32 +166,32 @@ 
 				 * Keep a copy of the clause in the flate
 				 * $queried_terms array, for use in WP_Query.
 				 */
-				if ( ! empty( $cleaned_clause['taxonomy'] ) && 'NOT IN' !== $cleaned_clause['operator'] ) {
+				if ( ! empty($cleaned_clause['taxonomy']) && 'NOT IN' !== $cleaned_clause['operator']) {
 					$taxonomy = $cleaned_clause['taxonomy'];
-					if ( ! isset( $this->queried_terms[ $taxonomy ] ) ) {
-						$this->queried_terms[ $taxonomy ] = array();
+					if ( ! isset($this->queried_terms[$taxonomy])) {
+						$this->queried_terms[$taxonomy] = array();
 					}
 
 					/*
 					 * Backward compatibility: Only store the first
 					 * 'terms' and 'field' found for a given taxonomy.
 					 */
-					if ( ! empty( $cleaned_clause['terms'] ) && ! isset( $this->queried_terms[ $taxonomy ]['terms'] ) ) {
-						$this->queried_terms[ $taxonomy ]['terms'] = $cleaned_clause['terms'];
+					if ( ! empty($cleaned_clause['terms']) && ! isset($this->queried_terms[$taxonomy]['terms'])) {
+						$this->queried_terms[$taxonomy]['terms'] = $cleaned_clause['terms'];
 					}
 
-					if ( ! empty( $cleaned_clause['field'] ) && ! isset( $this->queried_terms[ $taxonomy ]['field'] ) ) {
-						$this->queried_terms[ $taxonomy ]['field'] = $cleaned_clause['field'];
+					if ( ! empty($cleaned_clause['field']) && ! isset($this->queried_terms[$taxonomy]['field'])) {
+						$this->queried_terms[$taxonomy]['field'] = $cleaned_clause['field'];
 					}
 				}
 
 			// Otherwise, it's a nested query, so we recurse.
-			} elseif ( is_array( $query ) ) {
-				$cleaned_subquery = $this->sanitize_query( $query );
+			} elseif (is_array($query)) {
+				$cleaned_subquery = $this->sanitize_query($query);
 
-				if ( ! empty( $cleaned_subquery ) ) {
+				if ( ! empty($cleaned_subquery)) {
 					// All queries with children must have a relation.
-					if ( ! isset( $cleaned_subquery['relation'] ) ) {
+					if ( ! isset($cleaned_subquery['relation'])) {
 						$cleaned_subquery['relation'] = 'AND';
 					}
 
@@ -212,8 +212,8 @@ 
 	 * @param string $relation Raw relation key from the query argument.
 	 * @return string Sanitized relation ('AND' or 'OR').
 	 */
-	public function sanitize_relation( $relation ) {
-		if ( 'OR' === strtoupper( $relation ) ) {
+	public function sanitize_relation($relation) {
+		if ('OR' === strtoupper($relation)) {
 			return 'OR';
 		} else {
 			return 'AND';
@@ -237,8 +237,8 @@ 
 	 * @param array $query Tax query arguments.
 	 * @return bool Whether the query clause is a first-order clause.
 	 */
-	protected static function is_first_order_clause( $query ) {
-		return is_array( $query ) && ( empty( $query ) || array_key_exists( 'terms', $query ) || array_key_exists( 'taxonomy', $query ) || array_key_exists( 'include_children', $query ) || array_key_exists( 'field', $query ) || array_key_exists( 'operator', $query ) );
+	protected static function is_first_order_clause($query) {
+		return is_array($query) && (empty($query) || array_key_exists('terms', $query) || array_key_exists('taxonomy', $query) || array_key_exists('include_children', $query) || array_key_exists('field', $query) || array_key_exists('operator', $query));
 	}
 
 	/**
@@ -258,7 +258,7 @@ 
 	 *     @type string $where SQL fragment to append to the main WHERE clause.
 	 * }
 	 */
-	public function get_sql( $primary_table, $primary_id_column ) {
+	public function get_sql($primary_table, $primary_id_column) {
 		$this->primary_table = $primary_table;
 		$this->primary_id_column = $primary_id_column;
 
@@ -287,10 +287,10 @@ 
 		 * To keep $this->queries unaltered, pass a copy.
 		 */
 		$queries = $this->queries;
-		$sql = $this->get_sql_for_query( $queries );
+		$sql = $this->get_sql_for_query($queries);
 
-		if ( ! empty( $sql['where'] ) ) {
-			$sql['where'] = ' AND ' . $sql['where'];
+		if ( ! empty($sql['where'])) {
+			$sql['where'] = ' AND '.$sql['where'];
 		}
 
 		return $sql;
@@ -315,7 +315,7 @@ 
 	 *     @type string $where SQL fragment to append to the main WHERE clause.
 	 * }
 	 */
-	protected function get_sql_for_query( &$query, $depth = 0 ) {
+	protected function get_sql_for_query(&$query, $depth = 0) {
 		$sql_chunks = array(
 			'join'  => array(),
 			'where' => array(),
@@ -327,32 +327,32 @@ 
 		);
 
 		$indent = '';
-		for ( $i = 0; $i < $depth; $i++ ) {
+		for ($i = 0; $i < $depth; $i++) {
 			$indent .= "  ";
 		}
 
-		foreach ( $query as $key => &$clause ) {
-			if ( 'relation' === $key ) {
+		foreach ($query as $key => &$clause) {
+			if ('relation' === $key) {
 				$relation = $query['relation'];
-			} elseif ( is_array( $clause ) ) {
+			} elseif (is_array($clause)) {
 
 				// This is a first-order clause.
-				if ( $this->is_first_order_clause( $clause ) ) {
-					$clause_sql = $this->get_sql_for_clause( $clause, $query );
+				if ($this->is_first_order_clause($clause)) {
+					$clause_sql = $this->get_sql_for_clause($clause, $query);
 
-					$where_count = count( $clause_sql['where'] );
-					if ( ! $where_count ) {
+					$where_count = count($clause_sql['where']);
+					if ( ! $where_count) {
 						$sql_chunks['where'][] = '';
-					} elseif ( 1 === $where_count ) {
+					} elseif (1 === $where_count) {
 						$sql_chunks['where'][] = $clause_sql['where'][0];
 					} else {
-						$sql_chunks['where'][] = '( ' . implode( ' AND ', $clause_sql['where'] ) . ' )';
+						$sql_chunks['where'][] = '( '.implode(' AND ', $clause_sql['where']).' )';
 					}
 
-					$sql_chunks['join'] = array_merge( $sql_chunks['join'], $clause_sql['join'] );
+					$sql_chunks['join'] = array_merge($sql_chunks['join'], $clause_sql['join']);
 				// This is a subquery, so we recurse.
 				} else {
-					$clause_sql = $this->get_sql_for_query( $clause, $depth + 1 );
+					$clause_sql = $this->get_sql_for_query($clause, $depth + 1);
 
 					$sql_chunks['where'][] = $clause_sql['where'];
 					$sql_chunks['join'][]  = $clause_sql['join'];
@@ -361,21 +361,21 @@ 
 		}
 
 		// Filter to remove empties.
-		$sql_chunks['join']  = array_filter( $sql_chunks['join'] );
-		$sql_chunks['where'] = array_filter( $sql_chunks['where'] );
+		$sql_chunks['join']  = array_filter($sql_chunks['join']);
+		$sql_chunks['where'] = array_filter($sql_chunks['where']);
 
-		if ( empty( $relation ) ) {
+		if (empty($relation)) {
 			$relation = 'AND';
 		}
 
 		// Filter duplicate JOIN clauses and combine into a single string.
-		if ( ! empty( $sql_chunks['join'] ) ) {
-			$sql['join'] = implode( ' ', array_unique( $sql_chunks['join'] ) );
+		if ( ! empty($sql_chunks['join'])) {
+			$sql['join'] = implode(' ', array_unique($sql_chunks['join']));
 		}
 
 		// Generate a single WHERE clause with proper brackets and indentation.
-		if ( ! empty( $sql_chunks['where'] ) ) {
-			$sql['where'] = '( ' . "\n  " . $indent . implode( ' ' . "\n  " . $indent . $relation . ' ' . "\n  " . $indent, $sql_chunks['where'] ) . "\n" . $indent . ')';
+		if ( ! empty($sql_chunks['where'])) {
+			$sql['where'] = '( '."\n  ".$indent.implode(' '."\n  ".$indent.$relation.' '."\n  ".$indent, $sql_chunks['where'])."\n".$indent.')';
 		}
 
 		return $sql;
@@ -398,7 +398,7 @@ 
 	 *     @type string $where SQL fragment to append to the main WHERE clause.
 	 * }
 	 */
-	public function get_sql_for_clause( &$clause, $parent_query ) {
+	public function get_sql_for_clause(&$clause, $parent_query) {
 		global $wpdb;
 
 		$sql = array(
@@ -408,31 +408,31 @@ 
 
 		$join = $where = '';
 
-		$this->clean_query( $clause );
+		$this->clean_query($clause);
 
-		if ( is_wp_error( $clause ) ) {
+		if (is_wp_error($clause)) {
 			return self::$no_results;
 		}
 
 		$terms = $clause['terms'];
-		$operator = strtoupper( $clause['operator'] );
+		$operator = strtoupper($clause['operator']);
 
-		if ( 'IN' == $operator ) {
+		if ('IN' == $operator) {
 
-			if ( empty( $terms ) ) {
+			if (empty($terms)) {
 				return self::$no_results;
 			}
 
-			$terms = implode( ',', $terms );
+			$terms = implode(',', $terms);
 
 			/*
 			 * Before creating another table join, see if this clause has a
 			 * sibling with an existing join that can be shared.
 			 */
-			$alias = $this->find_compatible_table_alias( $clause, $parent_query );
-			if ( false === $alias ) {
-				$i = count( $this->table_aliases );
-				$alias = $i ? 'tt' . $i : $wpdb->term_relationships;
+			$alias = $this->find_compatible_table_alias($clause, $parent_query);
+			if (false === $alias) {
+				$i = count($this->table_aliases);
+				$alias = $i ? 'tt'.$i : $wpdb->term_relationships;
 
 				// Store the alias as part of a flat array to build future iterators.
 				$this->table_aliases[] = $alias;
@@ -448,13 +448,13 @@ 
 
 			$where = "$alias.term_taxonomy_id $operator ($terms)";
 
-		} elseif ( 'NOT IN' == $operator ) {
+		} elseif ('NOT IN' == $operator) {
 
-			if ( empty( $terms ) ) {
+			if (empty($terms)) {
 				return $sql;
 			}
 
-			$terms = implode( ',', $terms );
+			$terms = implode(',', $terms);
 
 			$where = "$this->primary_table.$this->primary_id_column NOT IN (
 				SELECT object_id
@@ -462,15 +462,15 @@ 
 				WHERE term_taxonomy_id IN ($terms)
 			)";
 
-		} elseif ( 'AND' == $operator ) {
+		} elseif ('AND' == $operator) {
 
-			if ( empty( $terms ) ) {
+			if (empty($terms)) {
 				return $sql;
 			}
 
-			$num_terms = count( $terms );
+			$num_terms = count($terms);
 
-			$terms = implode( ',', $terms );
+			$terms = implode(',', $terms);
 
 			$where = "(
 				SELECT COUNT(1)
@@ -479,16 +479,16 @@ 
 				AND object_id = $this->primary_table.$this->primary_id_column
 			) = $num_terms";
 
-		} elseif ( 'NOT EXISTS' === $operator || 'EXISTS' === $operator ) {
+		} elseif ('NOT EXISTS' === $operator || 'EXISTS' === $operator) {
 
-			$where = $wpdb->prepare( "$operator (
+			$where = $wpdb->prepare("$operator (
 				SELECT 1
 				FROM $wpdb->term_relationships
 				INNER JOIN $wpdb->term_taxonomy
 				ON $wpdb->term_taxonomy.term_taxonomy_id = $wpdb->term_relationships.term_taxonomy_id
 				WHERE $wpdb->term_taxonomy.taxonomy = %s
 				AND $wpdb->term_relationships.object_id = $this->primary_table.$this->primary_id_column
-			)", $clause['taxonomy'] );
+			)", $clause['taxonomy']);
 
 		}
 
@@ -517,32 +517,32 @@ 
 	 * @param array       $parent_query Parent query of $clause.
 	 * @return string|false Table alias if found, otherwise false.
 	 */
-	protected function find_compatible_table_alias( $clause, $parent_query ) {
+	protected function find_compatible_table_alias($clause, $parent_query) {
 		$alias = false;
 
 		// Sanity check. Only IN queries use the JOIN syntax .
-		if ( ! isset( $clause['operator'] ) || 'IN' !== $clause['operator'] ) {
+		if ( ! isset($clause['operator']) || 'IN' !== $clause['operator']) {
 			return $alias;
 		}
 
 		// Since we're only checking IN queries, we're only concerned with OR relations.
-		if ( ! isset( $parent_query['relation'] ) || 'OR' !== $parent_query['relation'] ) {
+		if ( ! isset($parent_query['relation']) || 'OR' !== $parent_query['relation']) {
 			return $alias;
 		}
 
-		$compatible_operators = array( 'IN' );
+		$compatible_operators = array('IN');
 
-		foreach ( $parent_query as $sibling ) {
-			if ( ! is_array( $sibling ) || ! $this->is_first_order_clause( $sibling ) ) {
+		foreach ($parent_query as $sibling) {
+			if ( ! is_array($sibling) || ! $this->is_first_order_clause($sibling)) {
 				continue;
 			}
 
-			if ( empty( $sibling['alias'] ) || empty( $sibling['operator'] ) ) {
+			if (empty($sibling['alias']) || empty($sibling['operator'])) {
 				continue;
 			}
 
 			// The sibling must both have compatible operator to share its alias.
-			if ( in_array( strtoupper( $sibling['operator'] ), $compatible_operators ) ) {
+			if (in_array(strtoupper($sibling['operator']), $compatible_operators)) {
 				$alias = $sibling['alias'];
 				break;
 			}
@@ -559,37 +559,37 @@ 
 	 *
 	 * @param array $query The single query. Passed by reference.
 	 */
-	private function clean_query( &$query ) {
-		if ( empty( $query['taxonomy'] ) ) {
-			if ( 'term_taxonomy_id' !== $query['field'] ) {
-				$query = new WP_Error( 'invalid_taxonomy', __( 'Invalid taxonomy.' ) );
+	private function clean_query(&$query) {
+		if (empty($query['taxonomy'])) {
+			if ('term_taxonomy_id' !== $query['field']) {
+				$query = new WP_Error('invalid_taxonomy', __('Invalid taxonomy.'));
 				return;
 			}
 
 			// so long as there are shared terms, include_children requires that a taxonomy is set
 			$query['include_children'] = false;
-		} elseif ( ! taxonomy_exists( $query['taxonomy'] ) ) {
-			$query = new WP_Error( 'invalid_taxonomy', __( 'Invalid taxonomy.' ) );
+		} elseif ( ! taxonomy_exists($query['taxonomy'])) {
+			$query = new WP_Error('invalid_taxonomy', __('Invalid taxonomy.'));
 			return;
 		}
 
-		$query['terms'] = array_unique( (array) $query['terms'] );
+		$query['terms'] = array_unique((array) $query['terms']);
 
-		if ( is_taxonomy_hierarchical( $query['taxonomy'] ) && $query['include_children'] ) {
-			$this->transform_query( $query, 'term_id' );
+		if (is_taxonomy_hierarchical($query['taxonomy']) && $query['include_children']) {
+			$this->transform_query($query, 'term_id');
 
-			if ( is_wp_error( $query ) )
+			if (is_wp_error($query))
 				return;
 
 			$children = array();
-			foreach ( $query['terms'] as $term ) {
-				$children = array_merge( $children, get_term_children( $term, $query['taxonomy'] ) );
+			foreach ($query['terms'] as $term) {
+				$children = array_merge($children, get_term_children($term, $query['taxonomy']));
 				$children[] = $term;
 			}
 			$query['terms'] = $children;
 		}
 
-		$this->transform_query( $query, 'term_taxonomy_id' );
+		$this->transform_query($query, 'term_taxonomy_id');
 	}
 
 	/**
@@ -603,59 +603,59 @@ 
 	 * @param string $resulting_field The resulting field. Accepts 'slug', 'name', 'term_taxonomy_id',
 	 *                                or 'term_id'. Default 'term_id'.
 	 */
-	public function transform_query( &$query, $resulting_field ) {
+	public function transform_query(&$query, $resulting_field) {
 		global $wpdb;
 
-		if ( empty( $query['terms'] ) )
+		if (empty($query['terms']))
 			return;
 
-		if ( $query['field'] == $resulting_field )
+		if ($query['field'] == $resulting_field)
 			return;
 
-		$resulting_field = sanitize_key( $resulting_field );
+		$resulting_field = sanitize_key($resulting_field);
 
-		switch ( $query['field'] ) {
+		switch ($query['field']) {
 			case 'slug':
 			case 'name':
-				foreach ( $query['terms'] as &$term ) {
+				foreach ($query['terms'] as &$term) {
 					/*
 					 * 0 is the $term_id parameter. We don't have a term ID yet, but it doesn't
 					 * matter because `sanitize_term_field()` ignores the $term_id param when the
 					 * context is 'db'.
 					 */
-					$term = "'" . esc_sql( sanitize_term_field( $query['field'], $term, 0, $query['taxonomy'], 'db' ) ) . "'";
+					$term = "'".esc_sql(sanitize_term_field($query['field'], $term, 0, $query['taxonomy'], 'db'))."'";
 				}
 
-				$terms = implode( ",", $query['terms'] );
+				$terms = implode(",", $query['terms']);
 
-				$terms = $wpdb->get_col( "
+				$terms = $wpdb->get_col("
 					SELECT $wpdb->term_taxonomy.$resulting_field
 					FROM $wpdb->term_taxonomy
 					INNER JOIN $wpdb->terms USING (term_id)
 					WHERE taxonomy = '{$query['taxonomy']}'
 					AND $wpdb->terms.{$query['field']} IN ($terms)
-				" );
+				");
 				break;
 			case 'term_taxonomy_id':
-				$terms = implode( ',', array_map( 'intval', $query['terms'] ) );
-				$terms = $wpdb->get_col( "
+				$terms = implode(',', array_map('intval', $query['terms']));
+				$terms = $wpdb->get_col("
 					SELECT $resulting_field
 					FROM $wpdb->term_taxonomy
 					WHERE term_taxonomy_id IN ($terms)
-				" );
+				");
 				break;
 			default:
-				$terms = implode( ',', array_map( 'intval', $query['terms'] ) );
-				$terms = $wpdb->get_col( "
+				$terms = implode(',', array_map('intval', $query['terms']));
+				$terms = $wpdb->get_col("
 					SELECT $resulting_field
 					FROM $wpdb->term_taxonomy
 					WHERE taxonomy = '{$query['taxonomy']}'
 					AND term_id IN ($terms)
-				" );
+				");
 		}
 
-		if ( 'AND' == $query['operator'] && count( $terms ) < count( $query['terms'] ) ) {
-			$query = new WP_Error( 'inexistent_terms', __( 'Inexistent terms.' ) );
+		if ('AND' == $query['operator'] && count($terms) < count($query['terms'])) {
+			$query = new WP_Error('inexistent_terms', __('Inexistent terms.'));
 			return;
 		}
 

src/wp-includes/ms-settings.php

Spacing +34 added lines, -34 removed lines

@@ -23,19 +23,19 @@ 
 global $current_site, $current_blog;
 
 /** WP_Network class */
-require_once( ABSPATH . WPINC . '/class-wp-network.php' );
+require_once(ABSPATH.WPINC.'/class-wp-network.php');
 
 /** WP_Site class */
-require_once( ABSPATH . WPINC . '/class-wp-site.php' );
+require_once(ABSPATH.WPINC.'/class-wp-site.php');
 
 /** Multisite loader */
-require_once( ABSPATH . WPINC . '/ms-load.php' );
+require_once(ABSPATH.WPINC.'/ms-load.php');
 
 /** Default Multisite constants */
-require_once( ABSPATH . WPINC . '/ms-default-constants.php' );
+require_once(ABSPATH.WPINC.'/ms-default-constants.php');
 
-if ( defined( 'SUNRISE' ) ) {
-	include_once( WP_CONTENT_DIR . '/sunrise.php' );
+if (defined('SUNRISE')) {
+	include_once(WP_CONTENT_DIR.'/sunrise.php');
 }
 
 /** Check for and define SUBDOMAIN_INSTALL and the deprecated VHOST constant. */
@@ -43,50 +43,50 @@ 
 
 // This block will process a request if the current network or current site objects
 // have not been populated in the global scope through something like `sunrise.php`.
-if ( !isset( $current_site ) || !isset( $current_blog ) ) {
-
-	$domain = strtolower( stripslashes( $_SERVER['HTTP_HOST'] ) );
-	if ( substr( $domain, -3 ) == ':80' ) {
-		$domain = substr( $domain, 0, -3 );
-		$_SERVER['HTTP_HOST'] = substr( $_SERVER['HTTP_HOST'], 0, -3 );
-	} elseif ( substr( $domain, -4 ) == ':443' ) {
-		$domain = substr( $domain, 0, -4 );
-		$_SERVER['HTTP_HOST'] = substr( $_SERVER['HTTP_HOST'], 0, -4 );
+if ( ! isset($current_site) || ! isset($current_blog)) {
+
+	$domain = strtolower(stripslashes($_SERVER['HTTP_HOST']));
+	if (substr($domain, -3) == ':80') {
+		$domain = substr($domain, 0, -3);
+		$_SERVER['HTTP_HOST'] = substr($_SERVER['HTTP_HOST'], 0, -3);
+	} elseif (substr($domain, -4) == ':443') {
+		$domain = substr($domain, 0, -4);
+		$_SERVER['HTTP_HOST'] = substr($_SERVER['HTTP_HOST'], 0, -4);
 	}
 
-	$path = stripslashes( $_SERVER['REQUEST_URI'] );
-	if ( is_admin() ) {
-		$path = preg_replace( '#(.*)/wp-admin/.*#', '$1/', $path );
+	$path = stripslashes($_SERVER['REQUEST_URI']);
+	if (is_admin()) {
+		$path = preg_replace('#(.*)/wp-admin/.*#', '$1/', $path);
 	}
-	list( $path ) = explode( '?', $path );
+	list($path) = explode('?', $path);
 
-	$bootstrap_result = ms_load_current_site_and_network( $domain, $path, is_subdomain_install() );
+	$bootstrap_result = ms_load_current_site_and_network($domain, $path, is_subdomain_install());
 
-	if ( true === $bootstrap_result ) {
+	if (true === $bootstrap_result) {
 		// `$current_blog` and `$current_site are now populated.
-	} elseif ( false === $bootstrap_result ) {
-		ms_not_installed( $domain, $path );
+	} elseif (false === $bootstrap_result) {
+		ms_not_installed($domain, $path);
 	} else {
-		header( 'Location: ' . $bootstrap_result );
+		header('Location: '.$bootstrap_result);
 		exit;
 	}
-	unset( $bootstrap_result );
+	unset($bootstrap_result);
 
 	$blog_id = $current_blog->blog_id;
 	$public  = $current_blog->public;
 
-	if ( empty( $current_blog->site_id ) ) {
+	if (empty($current_blog->site_id)) {
 		// This dates to [MU134] and shouldn't be relevant anymore,
 		// but it could be possible for arguments passed to insert_blog() etc.
 		$current_blog->site_id = 1;
 	}
 
 	$site_id = $current_blog->site_id;
-	wp_load_core_site_options( $site_id );
+	wp_load_core_site_options($site_id);
 }
 
-$wpdb->set_prefix( $table_prefix, false ); // $table_prefix can be set in sunrise.php
-$wpdb->set_blog_id( $current_blog->blog_id, $current_blog->site_id );
+$wpdb->set_prefix($table_prefix, false); // $table_prefix can be set in sunrise.php
+$wpdb->set_blog_id($current_blog->blog_id, $current_blog->site_id);
 $table_prefix = $wpdb->get_blog_prefix();
 $_wp_switched_stack = array();
 $switched = false;
@@ -94,12 +94,12 @@ 
 // need to init cache again after blog_id is set
 wp_start_object_cache();
 
-if ( ! $current_site instanceof WP_Network ) {
-	$current_site = new WP_Network( $current_site );
+if ( ! $current_site instanceof WP_Network) {
+	$current_site = new WP_Network($current_site);
 }
 
-if ( ! $current_blog instanceof WP_Site ) {
-	$current_blog = new WP_Site( $current_blog );
+if ( ! $current_blog instanceof WP_Site) {
+	$current_blog = new WP_Site($current_blog);
 }
 
 // Define upload directory constants
@@ -111,4 +111,4 @@ 
  *
  * @since 4.6.0
  */
-do_action( 'ms_loaded' );
+do_action('ms_loaded');

src/wp-includes/link-template.php

Spacing +800 added lines, -800 removed lines

@@ -14,7 +14,7 @@ 
  *
  * @param int|WP_Post $post Optional. Post ID or post object. Default is the global `$post`.
  */
-function the_permalink( $post = 0 ) {
+function the_permalink($post = 0) {
 	/**
 	 * Filters the display of the permalink for the current post.
 	 *
@@ -24,7 +24,7 @@ 
 	 * @param string      $permalink The permalink for the current post.
 	 * @param int|WP_Post $post      Post ID, WP_Post object, or 0. Default 0.
 	 */
-	echo esc_url( apply_filters( 'the_permalink', get_permalink( $post ), $post ) );
+	echo esc_url(apply_filters('the_permalink', get_permalink($post), $post));
 }
 
 /**
@@ -46,7 +46,7 @@ 
  */
 function user_trailingslashit($string, $type_of_url = '') {
 	global $wp_rewrite;
-	if ( $wp_rewrite->use_trailing_slashes )
+	if ($wp_rewrite->use_trailing_slashes)
 		$string = trailingslashit($string);
 	else
 		$string = untrailingslashit($string);
@@ -61,7 +61,7 @@ 
 	 *                            'single_feed', 'single_paged', 'feed', 'category', 'page', 'year',
 	 *                            'month', 'day', 'paged', 'post_type_archive'.
 	 */
-	return apply_filters( 'user_trailingslashit', $string, $type_of_url );
+	return apply_filters('user_trailingslashit', $string, $type_of_url);
 }
 
 /**
@@ -74,16 +74,16 @@ 
  *
  * @param string $mode Optional. Permalink mode. Accepts 'title' or 'id'. Default 'id'.
  */
-function permalink_anchor( $mode = 'id' ) {
+function permalink_anchor($mode = 'id') {
 	$post = get_post();
-	switch ( strtolower( $mode ) ) {
+	switch (strtolower($mode)) {
 		case 'title':
-			$title = sanitize_title( $post->post_title ) . '-' . $post->ID;
+			$title = sanitize_title($post->post_title).'-'.$post->ID;
 			echo '<a id="'.$title.'"></a>';
 			break;
 		case 'id':
 		default:
-			echo '<a id="post-' . $post->ID . '"></a>';
+			echo '<a id="post-'.$post->ID.'"></a>';
 			break;
 	}
 }
@@ -102,8 +102,8 @@ 
  *
  * @return string|false The permalink URL or false if post does not exist.
  */
-function get_the_permalink( $post = 0, $leavename = false ) {
-	return get_permalink( $post, $leavename );
+function get_the_permalink($post = 0, $leavename = false) {
+	return get_permalink($post, $leavename);
 }
 
 /**
@@ -115,7 +115,7 @@ 
  * @param bool        $leavename Optional. Whether to keep post name or page name. Default false.
  * @return string|false The permalink URL or false if post does not exist.
  */
-function get_permalink( $post = 0, $leavename = false ) {
+function get_permalink($post = 0, $leavename = false) {
 	$rewritecode = array(
 		'%year%',
 		'%monthnum%',
@@ -123,28 +123,28 @@ 
 		'%hour%',
 		'%minute%',
 		'%second%',
-		$leavename? '' : '%postname%',
+		$leavename ? '' : '%postname%',
 		'%post_id%',
 		'%category%',
 		'%author%',
-		$leavename? '' : '%pagename%',
+		$leavename ? '' : '%pagename%',
 	);
 
-	if ( is_object( $post ) && isset( $post->filter ) && 'sample' == $post->filter ) {
+	if (is_object($post) && isset($post->filter) && 'sample' == $post->filter) {
 		$sample = true;
 	} else {
-		$post = get_post( $post );
+		$post = get_post($post);
 		$sample = false;
 	}
 
-	if ( empty($post->ID) )
+	if (empty($post->ID))
 		return false;
 
-	if ( $post->post_type == 'page' )
+	if ($post->post_type == 'page')
 		return get_page_link($post, $leavename, $sample);
-	elseif ( $post->post_type == 'attachment' )
-		return get_attachment_link( $post, $leavename );
-	elseif ( in_array($post->post_type, get_post_types( array('_builtin' => false) ) ) )
+	elseif ($post->post_type == 'attachment')
+		return get_attachment_link($post, $leavename);
+	elseif (in_array($post->post_type, get_post_types(array('_builtin' => false))))
 		return get_post_permalink($post, $leavename, $sample);
 
 	$permalink = get_option('permalink_structure');
@@ -160,15 +160,15 @@ 
 	 * @param WP_Post $post      The post in question.
 	 * @param bool    $leavename Whether to keep the post name.
 	 */
-	$permalink = apply_filters( 'pre_post_link', $permalink, $post, $leavename );
+	$permalink = apply_filters('pre_post_link', $permalink, $post, $leavename);
 
-	if ( '' != $permalink && !in_array( $post->post_status, array( 'draft', 'pending', 'auto-draft', 'future' ) ) ) {
+	if ('' != $permalink && ! in_array($post->post_status, array('draft', 'pending', 'auto-draft', 'future'))) {
 		$unixtime = strtotime($post->post_date);
 
 		$category = '';
-		if ( strpos($permalink, '%category%') !== false ) {
+		if (strpos($permalink, '%category%') !== false) {
 			$cats = get_the_category($post->ID);
-			if ( $cats ) {
+			if ($cats) {
 				usort($cats, '_usort_terms_by_ID'); // order by ID
 
 				/**
@@ -180,30 +180,30 @@ 
 				 * @param array    $cats Array of all categories associated with the post.
 				 * @param WP_Post  $post The post in question.
 				 */
-				$category_object = apply_filters( 'post_link_category', $cats[0], $cats, $post );
+				$category_object = apply_filters('post_link_category', $cats[0], $cats, $post);
 
-				$category_object = get_term( $category_object, 'category' );
+				$category_object = get_term($category_object, 'category');
 				$category = $category_object->slug;
-				if ( $parent = $category_object->parent )
-					$category = get_category_parents($parent, false, '/', true) . $category;
+				if ($parent = $category_object->parent)
+					$category = get_category_parents($parent, false, '/', true).$category;
 			}
 			// show default category in permalinks, without
 			// having to assign it explicitly
-			if ( empty($category) ) {
-				$default_category = get_term( get_option( 'default_category' ), 'category' );
-				if ( $default_category && ! is_wp_error( $default_category ) ) {
+			if (empty($category)) {
+				$default_category = get_term(get_option('default_category'), 'category');
+				if ($default_category && ! is_wp_error($default_category)) {
 					$category = $default_category->slug;
 				}
 			}
 		}
 
 		$author = '';
-		if ( strpos($permalink, '%author%') !== false ) {
+		if (strpos($permalink, '%author%') !== false) {
 			$authordata = get_userdata($post->post_author);
 			$author = $authordata->user_nicename;
 		}
 
-		$date = explode(" ",date('Y m d H i s', $unixtime));
+		$date = explode(" ", date('Y m d H i s', $unixtime));
 		$rewritereplace =
 		array(
 			$date[0],
@@ -218,10 +218,10 @@ 
 			$author,
 			$post->post_name,
 		);
-		$permalink = home_url( str_replace($rewritecode, $rewritereplace, $permalink) );
+		$permalink = home_url(str_replace($rewritecode, $rewritereplace, $permalink));
 		$permalink = user_trailingslashit($permalink, 'single');
 	} else { // if they're not using the fancy permalink option
-		$permalink = home_url('?p=' . $post->ID);
+		$permalink = home_url('?p='.$post->ID);
 	}
 
 	/**
@@ -235,7 +235,7 @@ 
 	 * @param WP_Post $post      The post in question.
 	 * @param bool    $leavename Whether to keep the post name.
 	 */
-	return apply_filters( 'post_link', $permalink, $post, $leavename );
+	return apply_filters('post_link', $permalink, $post, $leavename);
 }
 
 /**
@@ -250,33 +250,33 @@ 
  * @param bool $sample    Optional, defaults to false. Is it a sample permalink. Default false.
  * @return string|WP_Error The post permalink.
  */
-function get_post_permalink( $id = 0, $leavename = false, $sample = false ) {
+function get_post_permalink($id = 0, $leavename = false, $sample = false) {
 	global $wp_rewrite;
 
 	$post = get_post($id);
 
-	if ( is_wp_error( $post ) )
+	if (is_wp_error($post))
 		return $post;
 
 	$post_link = $wp_rewrite->get_extra_permastruct($post->post_type);
 
 	$slug = $post->post_name;
 
-	$draft_or_pending = get_post_status( $id ) && in_array( get_post_status( $id ), array( 'draft', 'pending', 'auto-draft', 'future' ) );
+	$draft_or_pending = get_post_status($id) && in_array(get_post_status($id), array('draft', 'pending', 'auto-draft', 'future'));
 
 	$post_type = get_post_type_object($post->post_type);
 
-	if ( $post_type->hierarchical ) {
-		$slug = get_page_uri( $id );
+	if ($post_type->hierarchical) {
+		$slug = get_page_uri($id);
 	}
 
-	if ( !empty($post_link) && ( !$draft_or_pending || $sample ) ) {
-		if ( ! $leavename ) {
+	if ( ! empty($post_link) && ( ! $draft_or_pending || $sample)) {
+		if ( ! $leavename) {
 			$post_link = str_replace("%$post->post_type%", $slug, $post_link);
 		}
-		$post_link = home_url( user_trailingslashit($post_link) );
+		$post_link = home_url(user_trailingslashit($post_link));
 	} else {
-		if ( $post_type->query_var && ( isset($post->post_status) && !$draft_or_pending ) )
+		if ($post_type->query_var && (isset($post->post_status) && ! $draft_or_pending))
 			$post_link = add_query_arg($post_type->query_var, $slug, '');
 		else
 			$post_link = add_query_arg(array('post_type' => $post->post_type, 'p' => $post->ID), '');
@@ -293,7 +293,7 @@ 
 	 * @param bool    $leavename Whether to keep the post name.
 	 * @param bool    $sample    Is it a sample permalink.
 	 */
-	return apply_filters( 'post_type_link', $post_link, $post, $leavename, $sample );
+	return apply_filters('post_type_link', $post_link, $post, $leavename, $sample);
 }
 
 /**
@@ -309,13 +309,13 @@ 
  *                               Default false.
  * @return string The page permalink.
  */
-function get_page_link( $post = false, $leavename = false, $sample = false ) {
-	$post = get_post( $post );
+function get_page_link($post = false, $leavename = false, $sample = false) {
+	$post = get_post($post);
 
-	if ( 'page' == get_option( 'show_on_front' ) && $post->ID == get_option( 'page_on_front' ) )
+	if ('page' == get_option('show_on_front') && $post->ID == get_option('page_on_front'))
 		$link = home_url('/');
 	else
-		$link = _get_page_link( $post, $leavename, $sample );
+		$link = _get_page_link($post, $leavename, $sample);
 
 	/**
 	 * Filters the permalink for a page.
@@ -326,7 +326,7 @@ 
 	 * @param int    $post_id The ID of the page.
 	 * @param bool   $sample  Is it a sample permalink.
 	 */
-	return apply_filters( 'page_link', $link, $post->ID, $sample );
+	return apply_filters('page_link', $link, $post->ID, $sample);
 }
 
 /**
@@ -345,24 +345,24 @@ 
  *                               Default false.
  * @return string The page permalink.
  */
-function _get_page_link( $post = false, $leavename = false, $sample = false ) {
+function _get_page_link($post = false, $leavename = false, $sample = false) {
 	global $wp_rewrite;
 
-	$post = get_post( $post );
+	$post = get_post($post);
 
-	$draft_or_pending = in_array( $post->post_status, array( 'draft', 'pending', 'auto-draft' ) );
+	$draft_or_pending = in_array($post->post_status, array('draft', 'pending', 'auto-draft'));
 
 	$link = $wp_rewrite->get_page_permastruct();
 
-	if ( !empty($link) && ( ( isset($post->post_status) && !$draft_or_pending ) || $sample ) ) {
-		if ( ! $leavename ) {
-			$link = str_replace('%pagename%', get_page_uri( $post ), $link);
+	if ( ! empty($link) && ((isset($post->post_status) && ! $draft_or_pending) || $sample)) {
+		if ( ! $leavename) {
+			$link = str_replace('%pagename%', get_page_uri($post), $link);
 		}
 
 		$link = home_url($link);
 		$link = user_trailingslashit($link, 'page');
 	} else {
-		$link = home_url( '?page_id=' . $post->ID );
+		$link = home_url('?page_id='.$post->ID);
 	}
 
 	/**
@@ -373,7 +373,7 @@ 
 	 * @param string $link    The page's permalink.
 	 * @param int    $post_id The ID of the page.
 	 */
-	return apply_filters( '_get_page_link', $link, $post->ID );
+	return apply_filters('_get_page_link', $link, $post->ID);
 }
 
 /**
@@ -389,39 +389,39 @@ 
  * @param bool       $leavename Optional. Whether to keep the page name. Default false.
  * @return string The attachment permalink.
  */
-function get_attachment_link( $post = null, $leavename = false ) {
+function get_attachment_link($post = null, $leavename = false) {
 	global $wp_rewrite;
 
 	$link = false;
 
-	$post = get_post( $post );
-	$parent = ( $post->post_parent > 0 && $post->post_parent != $post->ID ) ? get_post( $post->post_parent ) : false;
-	if ( $parent && ! in_array( $parent->post_type, get_post_types() ) ) {
+	$post = get_post($post);
+	$parent = ($post->post_parent > 0 && $post->post_parent != $post->ID) ? get_post($post->post_parent) : false;
+	if ($parent && ! in_array($parent->post_type, get_post_types())) {
 		$parent = false;
 	}
 
-	if ( $wp_rewrite->using_permalinks() && $parent ) {
-		if ( 'page' == $parent->post_type )
-			$parentlink = _get_page_link( $post->post_parent ); // Ignores page_on_front
+	if ($wp_rewrite->using_permalinks() && $parent) {
+		if ('page' == $parent->post_type)
+			$parentlink = _get_page_link($post->post_parent); // Ignores page_on_front
 		else
-			$parentlink = get_permalink( $post->post_parent );
+			$parentlink = get_permalink($post->post_parent);
 
-		if ( is_numeric($post->post_name) || false !== strpos(get_option('permalink_structure'), '%category%') )
-			$name = 'attachment/' . $post->post_name; // <permalink>/<int>/ is paged so we use the explicit attachment marker
+		if (is_numeric($post->post_name) || false !== strpos(get_option('permalink_structure'), '%category%'))
+			$name = 'attachment/'.$post->post_name; // <permalink>/<int>/ is paged so we use the explicit attachment marker
 		else
 			$name = $post->post_name;
 
-		if ( strpos($parentlink, '?') === false )
-			$link = user_trailingslashit( trailingslashit($parentlink) . '%postname%' );
+		if (strpos($parentlink, '?') === false)
+			$link = user_trailingslashit(trailingslashit($parentlink).'%postname%');
 
-		if ( ! $leavename )
-			$link = str_replace( '%postname%', $name, $link );
-	} elseif ( $wp_rewrite->using_permalinks() && ! $leavename ) {
-		$link = home_url( user_trailingslashit( $post->post_name ) );
+		if ( ! $leavename)
+			$link = str_replace('%postname%', $name, $link);
+	} elseif ($wp_rewrite->using_permalinks() && ! $leavename) {
+		$link = home_url(user_trailingslashit($post->post_name));
 	}
 
-	if ( ! $link )
-		$link = home_url( '/?attachment_id=' . $post->ID );
+	if ( ! $link)
+		$link = home_url('/?attachment_id='.$post->ID);
 
 	/**
 	 * Filters the permalink for an attachment.
@@ -431,7 +431,7 @@ 
 	 * @param string $link    The attachment's permalink.
 	 * @param int    $post_id Attachment ID.
 	 */
-	return apply_filters( 'attachment_link', $link, $post->ID );
+	return apply_filters('attachment_link', $link, $post->ID);
 }
 
 /**
@@ -444,16 +444,16 @@ 
  * @param int|bool $year False for current year or year for permalink.
  * @return string The permalink for the specified year archive.
  */
-function get_year_link( $year ) {
+function get_year_link($year) {
 	global $wp_rewrite;
-	if ( !$year )
+	if ( ! $year)
 		$year = gmdate('Y', current_time('timestamp'));
 	$yearlink = $wp_rewrite->get_year_permastruct();
-	if ( !empty($yearlink) ) {
+	if ( ! empty($yearlink)) {
 		$yearlink = str_replace('%year%', $year, $yearlink);
-		$yearlink = home_url( user_trailingslashit( $yearlink, 'year' ) );
+		$yearlink = home_url(user_trailingslashit($yearlink, 'year'));
 	} else {
-		$yearlink = home_url( '?m=' . $year );
+		$yearlink = home_url('?m='.$year);
 	}
 
 	/**
@@ -464,7 +464,7 @@ 
 	 * @param string $yearlink Permalink for the year archive.
 	 * @param int    $year     Year for the archive.
 	 */
-	return apply_filters( 'year_link', $yearlink, $year );
+	return apply_filters('year_link', $yearlink, $year);
 }
 
 /**
@@ -480,17 +480,17 @@ 
  */
 function get_month_link($year, $month) {
 	global $wp_rewrite;
-	if ( !$year )
+	if ( ! $year)
 		$year = gmdate('Y', current_time('timestamp'));
-	if ( !$month )
+	if ( ! $month)
 		$month = gmdate('m', current_time('timestamp'));
 	$monthlink = $wp_rewrite->get_month_permastruct();
-	if ( !empty($monthlink) ) {
+	if ( ! empty($monthlink)) {
 		$monthlink = str_replace('%year%', $year, $monthlink);
 		$monthlink = str_replace('%monthnum%', zeroise(intval($month), 2), $monthlink);
-		$monthlink = home_url( user_trailingslashit( $monthlink, 'month' ) );
+		$monthlink = home_url(user_trailingslashit($monthlink, 'month'));
 	} else {
-		$monthlink = home_url( '?m=' . $year . zeroise( $month, 2 ) );
+		$monthlink = home_url('?m='.$year.zeroise($month, 2));
 	}
 
 	/**
@@ -502,7 +502,7 @@ 
 	 * @param int    $year      Year for the archive.
 	 * @param int    $month     The month for the archive.
 	 */
-	return apply_filters( 'month_link', $monthlink, $year, $month );
+	return apply_filters('month_link', $monthlink, $year, $month);
 }
 
 /**
@@ -519,21 +519,21 @@ 
  */
 function get_day_link($year, $month, $day) {
 	global $wp_rewrite;
-	if ( !$year )
+	if ( ! $year)
 		$year = gmdate('Y', current_time('timestamp'));
-	if ( !$month )
+	if ( ! $month)
 		$month = gmdate('m', current_time('timestamp'));
-	if ( !$day )
+	if ( ! $day)
 		$day = gmdate('j', current_time('timestamp'));
 
 	$daylink = $wp_rewrite->get_day_permastruct();
-	if ( !empty($daylink) ) {
+	if ( ! empty($daylink)) {
 		$daylink = str_replace('%year%', $year, $daylink);
 		$daylink = str_replace('%monthnum%', zeroise(intval($month), 2), $daylink);
 		$daylink = str_replace('%day%', zeroise(intval($day), 2), $daylink);
-		$daylink = home_url( user_trailingslashit( $daylink, 'day' ) );
+		$daylink = home_url(user_trailingslashit($daylink, 'day'));
 	} else {
-		$daylink = home_url( '?m=' . $year . zeroise( $month, 2 ) . zeroise( $day, 2 ) );
+		$daylink = home_url('?m='.$year.zeroise($month, 2).zeroise($day, 2));
 	}
 
 	/**
@@ -546,7 +546,7 @@ 
 	 * @param int    $month   Month for the archive.
 	 * @param int    $day     The day for the archive.
 	 */
-	return apply_filters( 'day_link', $daylink, $year, $month, $day );
+	return apply_filters('day_link', $daylink, $year, $month, $day);
 }
 
 /**
@@ -557,8 +557,8 @@ 
  * @param string $anchor The link's anchor text.
  * @param string $feed   Optional. Feed type. Default empty.
  */
-function the_feed_link( $anchor, $feed = '' ) {
-	$link = '<a href="' . esc_url( get_feed_link( $feed ) ) . '">' . $anchor . '</a>';
+function the_feed_link($anchor, $feed = '') {
+	$link = '<a href="'.esc_url(get_feed_link($feed)).'">'.$anchor.'</a>';
 
 	/**
 	 * Filters the feed link anchor tag.
@@ -569,7 +569,7 @@ 
 	 * @param string $feed The feed type, or an empty string for the
 	 *                     default feed type.
 	 */
-	echo apply_filters( 'the_feed_link', $link, $feed );
+	echo apply_filters('the_feed_link', $link, $feed);
 }
 
 /**
@@ -582,27 +582,27 @@ 
  * @param string $feed Optional. Feed type. Default empty.
  * @return string The feed permalink.
  */
-function get_feed_link( $feed = '' ) {
+function get_feed_link($feed = '') {
 	global $wp_rewrite;
 
 	$permalink = $wp_rewrite->get_feed_permastruct();
-	if ( '' != $permalink ) {
-		if ( false !== strpos($feed, 'comments_') ) {
+	if ('' != $permalink) {
+		if (false !== strpos($feed, 'comments_')) {
 			$feed = str_replace('comments_', '', $feed);
 			$permalink = $wp_rewrite->get_comment_feed_permastruct();
 		}
 
-		if ( get_default_feed() == $feed )
+		if (get_default_feed() == $feed)
 			$feed = '';
 
 		$permalink = str_replace('%feed%', $feed, $permalink);
 		$permalink = preg_replace('#/+#', '/', "/$permalink");
-		$output =  home_url( user_trailingslashit($permalink, 'feed') );
+		$output = home_url(user_trailingslashit($permalink, 'feed'));
 	} else {
-		if ( empty($feed) )
+		if (empty($feed))
 			$feed = get_default_feed();
 
-		if ( false !== strpos($feed, 'comments_') )
+		if (false !== strpos($feed, 'comments_'))
 			$feed = str_replace('comments_', 'comments-', $feed);
 
 		$output = home_url("?feed={$feed}");
@@ -616,7 +616,7 @@ 
 	 * @param string $output The feed permalink.
 	 * @param string $feed   Feed type.
 	 */
-	return apply_filters( 'feed_link', $output, $feed );
+	return apply_filters('feed_link', $output, $feed);
 }
 
 /**
@@ -628,43 +628,43 @@ 
  * @param string $feed    Optional. Feed type. Default empty.
  * @return string The permalink for the comments feed for the given post.
  */
-function get_post_comments_feed_link( $post_id = 0, $feed = '' ) {
-	$post_id = absint( $post_id );
+function get_post_comments_feed_link($post_id = 0, $feed = '') {
+	$post_id = absint($post_id);
 
-	if ( ! $post_id )
+	if ( ! $post_id)
 		$post_id = get_the_ID();
 
-	if ( empty( $feed ) )
+	if (empty($feed))
 		$feed = get_default_feed();
 
-	$post = get_post( $post_id );
+	$post = get_post($post_id);
 	$unattached = 'attachment' === $post->post_type && 0 === (int) $post->post_parent;
 
-	if ( '' != get_option('permalink_structure') ) {
-		if ( 'page' == get_option('show_on_front') && $post_id == get_option('page_on_front') )
-			$url = _get_page_link( $post_id );
+	if ('' != get_option('permalink_structure')) {
+		if ('page' == get_option('show_on_front') && $post_id == get_option('page_on_front'))
+			$url = _get_page_link($post_id);
 		else
 			$url = get_permalink($post_id);
 
-		if ( $unattached ) {
-			$url =  home_url( '/feed/' );
-			if ( $feed !== get_default_feed() ) {
+		if ($unattached) {
+			$url = home_url('/feed/');
+			if ($feed !== get_default_feed()) {
 				$url .= "$feed/";
 			}
-			$url = add_query_arg( 'attachment_id', $post_id, $url );
+			$url = add_query_arg('attachment_id', $post_id, $url);
 		} else {
-			$url = trailingslashit($url) . 'feed';
-			if ( $feed != get_default_feed() )
+			$url = trailingslashit($url).'feed';
+			if ($feed != get_default_feed())
 				$url .= "/$feed";
 			$url = user_trailingslashit($url, 'single_feed');
 		}
 	} else {
-		if ( $unattached ) {
-			$url = add_query_arg( array( 'feed' => $feed, 'attachment_id' => $post_id ), home_url( '/' ) );
-		} elseif ( 'page' == $post->post_type ) {
-			$url = add_query_arg( array( 'feed' => $feed, 'page_id' => $post_id ), home_url( '/' ) );
+		if ($unattached) {
+			$url = add_query_arg(array('feed' => $feed, 'attachment_id' => $post_id), home_url('/'));
+		} elseif ('page' == $post->post_type) {
+			$url = add_query_arg(array('feed' => $feed, 'page_id' => $post_id), home_url('/'));
 		} else {
-			$url = add_query_arg( array( 'feed' => $feed, 'p' => $post_id ), home_url( '/' ) );
+			$url = add_query_arg(array('feed' => $feed, 'p' => $post_id), home_url('/'));
 		}
 	}
 
@@ -675,7 +675,7 @@ 
 	 *
 	 * @param string $url Post comments feed permalink.
 	 */
-	return apply_filters( 'post_comments_feed_link', $url );
+	return apply_filters('post_comments_feed_link', $url);
 }
 
 /**
@@ -691,13 +691,13 @@ 
  * @param int    $post_id   Optional. Post ID. Default is the ID of the global `$post`.
  * @param string $feed      Optional. Feed format. Default empty.
  */
-function post_comments_feed_link( $link_text = '', $post_id = '', $feed = '' ) {
-	$url = get_post_comments_feed_link( $post_id, $feed );
-	if ( empty( $link_text ) ) {
+function post_comments_feed_link($link_text = '', $post_id = '', $feed = '') {
+	$url = get_post_comments_feed_link($post_id, $feed);
+	if (empty($link_text)) {
 		$link_text = __('Comments Feed');
 	}
 
-	$link = '<a href="' . esc_url( $url ) . '">' . $link_text . '</a>';
+	$link = '<a href="'.esc_url($url).'">'.$link_text.'</a>';
 	/**
 	 * Filters the post comment feed link anchor tag.
 	 *
@@ -707,7 +707,7 @@ 
 	 * @param int    $post_id Post ID.
 	 * @param string $feed    The feed type, or an empty string for the default feed type.
 	 */
-	echo apply_filters( 'post_comments_feed_link_html', $link, $post_id, $feed );
+	echo apply_filters('post_comments_feed_link_html', $link, $post_id, $feed);
 }
 
 /**
@@ -722,23 +722,23 @@ 
  * @param string $feed      Optional. Feed type. Default empty.
  * @return string Link to the feed for the author specified by $author_id.
  */
-function get_author_feed_link( $author_id, $feed = '' ) {
+function get_author_feed_link($author_id, $feed = '') {
 	$author_id = (int) $author_id;
 	$permalink_structure = get_option('permalink_structure');
 
-	if ( empty($feed) )
+	if (empty($feed))
 		$feed = get_default_feed();
 
-	if ( '' == $permalink_structure ) {
-		$link = home_url("?feed=$feed&amp;author=" . $author_id);
+	if ('' == $permalink_structure) {
+		$link = home_url("?feed=$feed&amp;author=".$author_id);
 	} else {
 		$link = get_author_posts_url($author_id);
-		if ( $feed == get_default_feed() )
+		if ($feed == get_default_feed())
 			$feed_link = 'feed';
 		else
 			$feed_link = "feed/$feed";
 
-		$link = trailingslashit($link) . user_trailingslashit($feed_link, 'feed');
+		$link = trailingslashit($link).user_trailingslashit($feed_link, 'feed');
 	}
 
 	/**
@@ -749,7 +749,7 @@ 
 	 * @param string $link The author feed link.
 	 * @param string $feed Feed type.
 	 */
-	$link = apply_filters( 'author_feed_link', $link, $feed );
+	$link = apply_filters('author_feed_link', $link, $feed);
 
 	return $link;
 }
@@ -766,8 +766,8 @@ 
  * @param string $feed   Optional. Feed type. Default empty.
  * @return string Link to the feed for the category specified by $cat_id.
  */
-function get_category_feed_link( $cat_id, $feed = '' ) {
-	return get_term_feed_link( $cat_id, 'category', $feed );
+function get_category_feed_link($cat_id, $feed = '') {
+	return get_term_feed_link($cat_id, 'category', $feed);
 }
 
 /**
@@ -783,40 +783,40 @@ 
  * @param string $feed     Optional. Feed type. Default empty.
  * @return string|false Link to the feed for the term specified by $term_id and $taxonomy.
  */
-function get_term_feed_link( $term_id, $taxonomy = 'category', $feed = '' ) {
-	$term_id = ( int ) $term_id;
+function get_term_feed_link($term_id, $taxonomy = 'category', $feed = '') {
+	$term_id = (int) $term_id;
 
-	$term = get_term( $term_id, $taxonomy  );
+	$term = get_term($term_id, $taxonomy);
 
-	if ( empty( $term ) || is_wp_error( $term ) )
+	if (empty($term) || is_wp_error($term))
 		return false;
 
-	if ( empty( $feed ) )
+	if (empty($feed))
 		$feed = get_default_feed();
 
-	$permalink_structure = get_option( 'permalink_structure' );
+	$permalink_structure = get_option('permalink_structure');
 
-	if ( '' == $permalink_structure ) {
-		if ( 'category' == $taxonomy ) {
+	if ('' == $permalink_structure) {
+		if ('category' == $taxonomy) {
 			$link = home_url("?feed=$feed&amp;cat=$term_id");
 		}
-		elseif ( 'post_tag' == $taxonomy ) {
+		elseif ('post_tag' == $taxonomy) {
 			$link = home_url("?feed=$feed&amp;tag=$term->slug");
 		} else {
-			$t = get_taxonomy( $taxonomy );
+			$t = get_taxonomy($taxonomy);
 			$link = home_url("?feed=$feed&amp;$t->query_var=$term->slug");
 		}
 	} else {
-		$link = get_term_link( $term_id, $term->taxonomy );
-		if ( $feed == get_default_feed() )
+		$link = get_term_link($term_id, $term->taxonomy);
+		if ($feed == get_default_feed())
 			$feed_link = 'feed';
 		else
 			$feed_link = "feed/$feed";
 
-		$link = trailingslashit( $link ) . user_trailingslashit( $feed_link, 'feed' );
+		$link = trailingslashit($link).user_trailingslashit($feed_link, 'feed');
 	}
 
-	if ( 'category' == $taxonomy ) {
+	if ('category' == $taxonomy) {
 		/**
 		 * Filters the category feed link.
 		 *
@@ -825,8 +825,8 @@ 
 		 * @param string $link The category feed link.
 		 * @param string $feed Feed type.
 		 */
-		$link = apply_filters( 'category_feed_link', $link, $feed );
-	} elseif ( 'post_tag' == $taxonomy ) {
+		$link = apply_filters('category_feed_link', $link, $feed);
+	} elseif ('post_tag' == $taxonomy) {
 		/**
 		 * Filters the post tag feed link.
 		 *
@@ -835,7 +835,7 @@ 
 		 * @param string $link The tag feed link.
 		 * @param string $feed Feed type.
 		 */
-		$link = apply_filters( 'tag_feed_link', $link, $feed );
+		$link = apply_filters('tag_feed_link', $link, $feed);
 	} else {
 		/**
 		 * Filters the feed link for a taxonomy other than 'category' or 'post_tag'.
@@ -846,7 +846,7 @@ 
 		 * @param string $feed Feed type.
 		 * @param string $feed The taxonomy name.
 		 */
-		$link = apply_filters( 'taxonomy_feed_link', $link, $feed, $taxonomy );
+		$link = apply_filters('taxonomy_feed_link', $link, $feed, $taxonomy);
 	}
 
 	return $link;
@@ -861,8 +861,8 @@ 
  * @param string $feed   Optional. Feed type. Default empty.
  * @return string The feed permalink for the given tag.
  */
-function get_tag_feed_link( $tag_id, $feed = '' ) {
-	return get_term_feed_link( $tag_id, 'post_tag', $feed );
+function get_tag_feed_link($tag_id, $feed = '') {
+	return get_term_feed_link($tag_id, 'post_tag', $feed);
 }
 
 /**
@@ -874,7 +874,7 @@ 
  * @param string $taxonomy Optional. Taxonomy slug. Default 'post_tag'.
  * @return string The edit tag link URL for the given tag.
  */
-function get_edit_tag_link( $tag_id, $taxonomy = 'post_tag' ) {
+function get_edit_tag_link($tag_id, $taxonomy = 'post_tag') {
 	/**
 	 * Filters the edit link for a tag (or term in another taxonomy).
 	 *
@@ -882,7 +882,7 @@ 
 	 *
 	 * @param string $link The term edit link.
 	 */
-	return apply_filters( 'get_edit_tag_link', get_edit_term_link( $tag_id, $taxonomy ) );
+	return apply_filters('get_edit_tag_link', get_edit_term_link($tag_id, $taxonomy));
 }
 
 /**
@@ -896,8 +896,8 @@ 
  * @param WP_Term $tag    Optional. Term object. If null, the queried object will be inspected.
  *                        Default null.
  */
-function edit_tag_link( $link = '', $before = '', $after = '', $tag = null ) {
-	$link = edit_term_link( $link, '', '', $tag, false );
+function edit_tag_link($link = '', $before = '', $after = '', $tag = null) {
+	$link = edit_term_link($link, '', '', $tag, false);
 
 	/**
 	 * Filters the anchor tag for the edit link for a tag (or term in another taxonomy).
@@ -906,7 +906,7 @@ 
 	 *
 	 * @param string $link The anchor tag for the edit link.
 	 */
-	echo $before . apply_filters( 'edit_tag_link', $link ) . $after;
+	echo $before.apply_filters('edit_tag_link', $link).$after;
 }
 
 /**
@@ -923,14 +923,14 @@ 
  *                            with the taxonomy.
  * @return string|null The edit term link URL for the given term, or null on failure.
  */
-function get_edit_term_link( $term_id, $taxonomy = '', $object_type = '' ) {
-	$term = get_term( $term_id, $taxonomy );
-	if ( ! $term || is_wp_error( $term ) ) {
+function get_edit_term_link($term_id, $taxonomy = '', $object_type = '') {
+	$term = get_term($term_id, $taxonomy);
+	if ( ! $term || is_wp_error($term)) {
 		return;
 	}
 
-	$tax = get_taxonomy( $term->taxonomy );
-	if ( ! $tax || ! current_user_can( $tax->cap->edit_terms ) ) {
+	$tax = get_taxonomy($term->taxonomy);
+	if ( ! $tax || ! current_user_can($tax->cap->edit_terms)) {
 		return;
 	}
 
@@ -939,14 +939,14 @@ 
 		'tag_ID'   => $term->term_id,
 	);
 
-	if ( $object_type ) {
+	if ($object_type) {
 		$args['post_type'] = $object_type;
-	} elseif ( ! empty( $tax->object_type ) ) {
-		$args['post_type'] = reset( $tax->object_type );
+	} elseif ( ! empty($tax->object_type)) {
+		$args['post_type'] = reset($tax->object_type);
 	}
 
-	if ( $tax->show_ui ) {
-		$location = add_query_arg( $args, admin_url( 'term.php' ) );
+	if ($tax->show_ui) {
+		$location = add_query_arg($args, admin_url('term.php'));
 	} else {
 		$location = '';
 	}
@@ -961,7 +961,7 @@ 
 	 * @param string $taxonomy    Taxonomy name.
 	 * @param string $object_type The object type (eg. the post type).
 	 */
-	return apply_filters( 'get_edit_term_link', $location, $term_id, $taxonomy, $object_type );
+	return apply_filters('get_edit_term_link', $location, $term_id, $taxonomy, $object_type);
 }
 
 /**
@@ -976,21 +976,21 @@ 
  * @param bool   $echo   Optional. Whether or not to echo the return. Default true.
  * @return string|void HTML content.
  */
-function edit_term_link( $link = '', $before = '', $after = '', $term = null, $echo = true ) {
-	if ( is_null( $term ) )
+function edit_term_link($link = '', $before = '', $after = '', $term = null, $echo = true) {
+	if (is_null($term))
 		$term = get_queried_object();
 
-	if ( ! $term )
+	if ( ! $term)
 		return;
 
-	$tax = get_taxonomy( $term->taxonomy );
-	if ( ! current_user_can( $tax->cap->edit_terms ) )
+	$tax = get_taxonomy($term->taxonomy);
+	if ( ! current_user_can($tax->cap->edit_terms))
 		return;
 
-	if ( empty( $link ) )
+	if (empty($link))
 		$link = __('Edit This');
 
-	$link = '<a href="' . get_edit_term_link( $term->term_id, $term->taxonomy ) . '">' . $link . '</a>';
+	$link = '<a href="'.get_edit_term_link($term->term_id, $term->taxonomy).'">'.$link.'</a>';
 
 	/**
 	 * Filters the anchor tag for the edit link of a term.
@@ -1000,9 +1000,9 @@ 
 	 * @param string $link    The anchor tag for the edit link.
 	 * @param int    $term_id Term ID.
 	 */
-	$link = $before . apply_filters( 'edit_term_link', $link, $term->term_id ) . $after;
+	$link = $before.apply_filters('edit_term_link', $link, $term->term_id).$after;
 
-	if ( $echo )
+	if ($echo)
 		echo $link;
 	else
 		return $link;
@@ -1018,23 +1018,23 @@ 
  * @param string $query Optional. The query string to use. If empty the current query is used. Default empty.
  * @return string The search permalink.
  */
-function get_search_link( $query = '' ) {
+function get_search_link($query = '') {
 	global $wp_rewrite;
 
-	if ( empty($query) )
-		$search = get_search_query( false );
+	if (empty($query))
+		$search = get_search_query(false);
 	else
 		$search = stripslashes($query);
 
 	$permastruct = $wp_rewrite->get_search_permastruct();
 
-	if ( empty( $permastruct ) ) {
-		$link = home_url('?s=' . urlencode($search) );
+	if (empty($permastruct)) {
+		$link = home_url('?s='.urlencode($search));
 	} else {
 		$search = urlencode($search);
 		$search = str_replace('%2F', '/', $search); // %2F(/) is not valid within a URL, send it un-encoded.
-		$link = str_replace( '%search%', $search, $permastruct );
-		$link = home_url( user_trailingslashit( $link, 'search' ) );
+		$link = str_replace('%search%', $search, $permastruct);
+		$link = home_url(user_trailingslashit($link, 'search'));
 	}
 
 	/**
@@ -1045,7 +1045,7 @@ 
 	 * @param string $link   Search permalink.
 	 * @param string $search The URL-encoded search term.
 	 */
-	return apply_filters( 'search_link', $link, $search );
+	return apply_filters('search_link', $link, $search);
 }
 
 /**
@@ -1063,12 +1063,12 @@ 
 	global $wp_rewrite;
 	$link = get_search_link($search_query);
 
-	if ( empty($feed) )
+	if (empty($feed))
 		$feed = get_default_feed();
 
 	$permastruct = $wp_rewrite->get_search_permastruct();
 
-	if ( empty($permastruct) ) {
+	if (empty($permastruct)) {
 		$link = add_query_arg('feed', $feed, $link);
 	} else {
 		$link = trailingslashit($link);
@@ -1084,7 +1084,7 @@ 
 	 * @param string $feed Feed type.
 	 * @param string $type The search type. One of 'posts' or 'comments'.
 	 */
-	return apply_filters( 'search_feed_link', $link, $feed, 'posts' );
+	return apply_filters('search_feed_link', $link, $feed, 'posts');
 }
 
 /**
@@ -1101,20 +1101,20 @@ 
 function get_search_comments_feed_link($search_query = '', $feed = '') {
 	global $wp_rewrite;
 
-	if ( empty($feed) )
+	if (empty($feed))
 		$feed = get_default_feed();
 
 	$link = get_search_feed_link($search_query, $feed);
 
 	$permastruct = $wp_rewrite->get_search_permastruct();
 
-	if ( empty($permastruct) )
-		$link = add_query_arg('feed', 'comments-' . $feed, $link);
+	if (empty($permastruct))
+		$link = add_query_arg('feed', 'comments-'.$feed, $link);
 	else
 		$link = add_query_arg('withcomments', 1, $link);
 
 	/** This filter is documented in wp-includes/link-template.php */
-	return apply_filters( 'search_feed_link', $link, $feed, 'comments' );
+	return apply_filters('search_feed_link', $link, $feed, 'comments');
 }
 
 /**
@@ -1128,36 +1128,36 @@ 
  * @param string $post_type Post type.
  * @return string|false The post type archive permalink.
  */
-function get_post_type_archive_link( $post_type ) {
+function get_post_type_archive_link($post_type) {
 	global $wp_rewrite;
-	if ( ! $post_type_obj = get_post_type_object( $post_type ) )
+	if ( ! $post_type_obj = get_post_type_object($post_type))
 		return false;
 
-	if ( 'post' === $post_type ) {
-		$show_on_front = get_option( 'show_on_front' );
-		$page_for_posts  = get_option( 'page_for_posts' );
+	if ('post' === $post_type) {
+		$show_on_front = get_option('show_on_front');
+		$page_for_posts = get_option('page_for_posts');
 
-		if ( 'page' == $show_on_front && $page_for_posts ) {
-			$link = get_permalink( $page_for_posts );
+		if ('page' == $show_on_front && $page_for_posts) {
+			$link = get_permalink($page_for_posts);
 		} else {
 			$link = get_home_url();
 		}
 		/** This filter is documented in wp-includes/link-template.php */
-		return apply_filters( 'post_type_archive_link', $link, $post_type );
+		return apply_filters('post_type_archive_link', $link, $post_type);
 	}
 
-	if ( ! $post_type_obj->has_archive )
+	if ( ! $post_type_obj->has_archive)
 		return false;
 
-	if ( get_option( 'permalink_structure' ) && is_array( $post_type_obj->rewrite ) ) {
-		$struct = ( true === $post_type_obj->has_archive ) ? $post_type_obj->rewrite['slug'] : $post_type_obj->has_archive;
-		if ( $post_type_obj->rewrite['with_front'] )
-			$struct = $wp_rewrite->front . $struct;
+	if (get_option('permalink_structure') && is_array($post_type_obj->rewrite)) {
+		$struct = (true === $post_type_obj->has_archive) ? $post_type_obj->rewrite['slug'] : $post_type_obj->has_archive;
+		if ($post_type_obj->rewrite['with_front'])
+			$struct = $wp_rewrite->front.$struct;
 		else
-			$struct = $wp_rewrite->root . $struct;
-		$link = home_url( user_trailingslashit( $struct, 'post_type_archive' ) );
+			$struct = $wp_rewrite->root.$struct;
+		$link = home_url(user_trailingslashit($struct, 'post_type_archive'));
 	} else {
-		$link = home_url( '?post_type=' . $post_type );
+		$link = home_url('?post_type='.$post_type);
 	}
 
 	/**
@@ -1168,7 +1168,7 @@ 
 	 * @param string $link      The post type archive permalink.
 	 * @param string $post_type Post type name.
 	 */
-	return apply_filters( 'post_type_archive_link', $link, $post_type );
+	return apply_filters('post_type_archive_link', $link, $post_type);
 }
 
 /**
@@ -1180,22 +1180,22 @@ 
  * @param string $feed      Optional. Feed type. Default empty.
  * @return string|false The post type feed permalink.
  */
-function get_post_type_archive_feed_link( $post_type, $feed = '' ) {
+function get_post_type_archive_feed_link($post_type, $feed = '') {
 	$default_feed = get_default_feed();
-	if ( empty( $feed ) )
+	if (empty($feed))
 		$feed = $default_feed;
 
-	if ( ! $link = get_post_type_archive_link( $post_type ) )
+	if ( ! $link = get_post_type_archive_link($post_type))
 		return false;
 
-	$post_type_obj = get_post_type_object( $post_type );
-	if ( get_option( 'permalink_structure' ) && is_array( $post_type_obj->rewrite ) && $post_type_obj->rewrite['feeds'] ) {
-		$link = trailingslashit( $link );
+	$post_type_obj = get_post_type_object($post_type);
+	if (get_option('permalink_structure') && is_array($post_type_obj->rewrite) && $post_type_obj->rewrite['feeds']) {
+		$link = trailingslashit($link);
 		$link .= 'feed/';
-		if ( $feed != $default_feed )
+		if ($feed != $default_feed)
 			$link .= "$feed/";
 	} else {
-		$link = add_query_arg( 'feed', $feed, $link );
+		$link = add_query_arg('feed', $feed, $link);
 	}
 
 	/**
@@ -1206,7 +1206,7 @@ 
 	 * @param string $link The post type archive feed link.
 	 * @param string $feed Feed type.
 	 */
-	return apply_filters( 'post_type_archive_feed_link', $link, $feed );
+	return apply_filters('post_type_archive_feed_link', $link, $feed);
 }
 
 /**
@@ -1223,20 +1223,20 @@ 
  *                                  post permalink. Default empty.
  * @return string|null URL used for the post preview, or null if the post does not exist.
  */
-function get_preview_post_link( $post = null, $query_args = array(), $preview_link = '' ) {
-	$post = get_post( $post );
-	if ( ! $post ) {
+function get_preview_post_link($post = null, $query_args = array(), $preview_link = '') {
+	$post = get_post($post);
+	if ( ! $post) {
 		return;
 	}
 
-	$post_type_object = get_post_type_object( $post->post_type );
-	if ( is_post_type_viewable( $post_type_object ) ) {
-		if ( ! $preview_link ) {
-			$preview_link = set_url_scheme( get_permalink( $post ) );
+	$post_type_object = get_post_type_object($post->post_type);
+	if (is_post_type_viewable($post_type_object)) {
+		if ( ! $preview_link) {
+			$preview_link = set_url_scheme(get_permalink($post));
 		}
 
 		$query_args['preview'] = 'true';
-		$preview_link = add_query_arg( $query_args, $preview_link );
+		$preview_link = add_query_arg($query_args, $preview_link);
 	}
 
 	/**
@@ -1248,7 +1248,7 @@ 
 	 * @param string  $preview_link URL used for the post preview.
 	 * @param WP_Post $post         Post object.
 	 */
-	return apply_filters( 'preview_post_link', $preview_link, $post );
+	return apply_filters('preview_post_link', $preview_link, $post);
 }
 
 /**
@@ -1264,26 +1264,26 @@ 
  * @return string|null The edit post link for the given post. null if the post type is invalid or does
  *                     not allow an editing UI.
  */
-function get_edit_post_link( $id = 0, $context = 'display' ) {
-	if ( ! $post = get_post( $id ) )
+function get_edit_post_link($id = 0, $context = 'display') {
+	if ( ! $post = get_post($id))
 		return;
 
-	if ( 'revision' === $post->post_type )
+	if ('revision' === $post->post_type)
 		$action = '';
-	elseif ( 'display' == $context )
+	elseif ('display' == $context)
 		$action = '&amp;action=edit';
 	else
 		$action = '&action=edit';
 
-	$post_type_object = get_post_type_object( $post->post_type );
-	if ( !$post_type_object )
+	$post_type_object = get_post_type_object($post->post_type);
+	if ( ! $post_type_object)
 		return;
 
-	if ( !current_user_can( 'edit_post', $post->ID ) )
+	if ( ! current_user_can('edit_post', $post->ID))
 		return;
 
-	if ( $post_type_object->_edit_link ) {
-		$link = admin_url( sprintf( $post_type_object->_edit_link . $action, $post->ID ) );
+	if ($post_type_object->_edit_link) {
+		$link = admin_url(sprintf($post_type_object->_edit_link.$action, $post->ID));
 	} else {
 		$link = '';
 	}
@@ -1298,7 +1298,7 @@ 
 	 * @param string $context The link context. If set to 'display' then ampersands
 	 *                        are encoded.
 	 */
-	return apply_filters( 'get_edit_post_link', $link, $post->ID, $context );
+	return apply_filters('get_edit_post_link', $link, $post->ID, $context);
 }
 
 /**
@@ -1313,20 +1313,20 @@ 
  * @param int    $id     Optional. Post ID. Default is the ID of the global `$post`.
  * @param string $class  Optional. Add custom class to link. Default 'post-edit-link'.
  */
-function edit_post_link( $text = null, $before = '', $after = '', $id = 0, $class = 'post-edit-link' ) {
-	if ( ! $post = get_post( $id ) ) {
+function edit_post_link($text = null, $before = '', $after = '', $id = 0, $class = 'post-edit-link') {
+	if ( ! $post = get_post($id)) {
 		return;
 	}
 
-	if ( ! $url = get_edit_post_link( $post->ID ) ) {
+	if ( ! $url = get_edit_post_link($post->ID)) {
 		return;
 	}
 
-	if ( null === $text ) {
-		$text = __( 'Edit This' );
+	if (null === $text) {
+		$text = __('Edit This');
 	}
 
-	$link = '<a class="' . esc_attr( $class ) . '" href="' . esc_url( $url ) . '">' . $text . '</a>';
+	$link = '<a class="'.esc_attr($class).'" href="'.esc_url($url).'">'.$text.'</a>';
 
 	/**
 	 * Filters the post edit link anchor tag.
@@ -1337,7 +1337,7 @@ 
 	 * @param int    $post_id Post ID.
 	 * @param string $text    Anchor text.
 	 */
-	echo $before . apply_filters( 'edit_post_link', $link, $post->ID, $text ) . $after;
+	echo $before.apply_filters('edit_post_link', $link, $post->ID, $text).$after;
 }
 
 /**
@@ -1352,23 +1352,23 @@ 
  * @param bool   $force_delete Optional. Whether to bypass trash and force deletion. Default false.
  * @return string|void The delete post link URL for the given post.
  */
-function get_delete_post_link( $id = 0, $deprecated = '', $force_delete = false ) {
-	if ( ! empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '3.0.0' );
+function get_delete_post_link($id = 0, $deprecated = '', $force_delete = false) {
+	if ( ! empty($deprecated))
+		_deprecated_argument(__FUNCTION__, '3.0.0');
 
-	if ( !$post = get_post( $id ) )
+	if ( ! $post = get_post($id))
 		return;
 
-	$post_type_object = get_post_type_object( $post->post_type );
-	if ( !$post_type_object )
+	$post_type_object = get_post_type_object($post->post_type);
+	if ( ! $post_type_object)
 		return;
 
-	if ( !current_user_can( 'delete_post', $post->ID ) )
+	if ( ! current_user_can('delete_post', $post->ID))
 		return;
 
-	$action = ( $force_delete || !EMPTY_TRASH_DAYS ) ? 'delete' : 'trash';
+	$action = ($force_delete || ! EMPTY_TRASH_DAYS) ? 'delete' : 'trash';
 
-	$delete_link = add_query_arg( 'action', $action, admin_url( sprintf( $post_type_object->_edit_link, $post->ID ) ) );
+	$delete_link = add_query_arg('action', $action, admin_url(sprintf($post_type_object->_edit_link, $post->ID)));
 
 	/**
 	 * Filters the post delete link.
@@ -1379,7 +1379,7 @@ 
 	 * @param int    $post_id      Post ID.
 	 * @param bool   $force_delete Whether to bypass the trash and force deletion. Default false.
 	 */
-	return apply_filters( 'get_delete_post_link', wp_nonce_url( $delete_link, "$action-post_{$post->ID}" ), $post->ID, $force_delete );
+	return apply_filters('get_delete_post_link', wp_nonce_url($delete_link, "$action-post_{$post->ID}"), $post->ID, $force_delete);
 }
 
 /**
@@ -1390,13 +1390,13 @@ 
  * @param int|WP_Comment $comment_id Optional. Comment ID or WP_Comment object.
  * @return string|void The edit comment link URL for the given comment.
  */
-function get_edit_comment_link( $comment_id = 0 ) {
-	$comment = get_comment( $comment_id );
+function get_edit_comment_link($comment_id = 0) {
+	$comment = get_comment($comment_id);
 
-	if ( !current_user_can( 'edit_comment', $comment->comment_ID ) )
+	if ( ! current_user_can('edit_comment', $comment->comment_ID))
 		return;
 
-	$location = admin_url('comment.php?action=editcomment&amp;c=') . $comment->comment_ID;
+	$location = admin_url('comment.php?action=editcomment&amp;c=').$comment->comment_ID;
 
 	/**
 	 * Filters the comment edit link.
@@ -1405,7 +1405,7 @@ 
 	 *
 	 * @param string $location The edit link.
 	 */
-	return apply_filters( 'get_edit_comment_link', $location );
+	return apply_filters('get_edit_comment_link', $location);
 }
 
 /**
@@ -1417,18 +1417,18 @@ 
  * @param string $before Optional. Display before edit link. Default empty.
  * @param string $after  Optional. Display after edit link. Default empty.
  */
-function edit_comment_link( $text = null, $before = '', $after = '' ) {
+function edit_comment_link($text = null, $before = '', $after = '') {
 	$comment = get_comment();
 
-	if ( ! current_user_can( 'edit_comment', $comment->comment_ID ) ) {
+	if ( ! current_user_can('edit_comment', $comment->comment_ID)) {
 		return;
 	}
 
-	if ( null === $text ) {
-		$text = __( 'Edit This' );
+	if (null === $text) {
+		$text = __('Edit This');
 	}
 
-	$link = '<a class="comment-edit-link" href="' . esc_url( get_edit_comment_link( $comment ) ) . '">' . $text . '</a>';
+	$link = '<a class="comment-edit-link" href="'.esc_url(get_edit_comment_link($comment)).'">'.$text.'</a>';
 
 	/**
 	 * Filters the comment edit link anchor tag.
@@ -1439,7 +1439,7 @@ 
 	 * @param int    $comment_id Comment ID.
 	 * @param string $text       Anchor text.
 	 */
-	echo $before . apply_filters( 'edit_comment_link', $link, $comment->comment_ID, $text ) . $after;
+	echo $before.apply_filters('edit_comment_link', $link, $comment->comment_ID, $text).$after;
 }
 
 /**
@@ -1450,13 +1450,13 @@ 
  * @param int|stdClass $link Optional. Bookmark ID. Default is the id of the current bookmark.
  * @return string|void The edit bookmark link URL.
  */
-function get_edit_bookmark_link( $link = 0 ) {
-	$link = get_bookmark( $link );
+function get_edit_bookmark_link($link = 0) {
+	$link = get_bookmark($link);
 
-	if ( !current_user_can('manage_links') )
+	if ( ! current_user_can('manage_links'))
 		return;
 
-	$location = admin_url('link.php?action=edit&amp;link_id=') . $link->link_id;
+	$location = admin_url('link.php?action=edit&amp;link_id=').$link->link_id;
 
 	/**
 	 * Filters the bookmark edit link.
@@ -1466,7 +1466,7 @@ 
 	 * @param string $location The edit link.
 	 * @param int    $link_id  Bookmark ID.
 	 */
-	return apply_filters( 'get_edit_bookmark_link', $location, $link->link_id );
+	return apply_filters('get_edit_bookmark_link', $location, $link->link_id);
 }
 
 /**
@@ -1479,16 +1479,16 @@ 
  * @param string $after    Optional. Display after edit link. Default empty.
  * @param int    $bookmark Optional. Bookmark ID. Default is the current bookmark.
  */
-function edit_bookmark_link( $link = '', $before = '', $after = '', $bookmark = null ) {
+function edit_bookmark_link($link = '', $before = '', $after = '', $bookmark = null) {
 	$bookmark = get_bookmark($bookmark);
 
-	if ( !current_user_can('manage_links') )
+	if ( ! current_user_can('manage_links'))
 		return;
 
-	if ( empty($link) )
+	if (empty($link))
 		$link = __('Edit This');
 
-	$link = '<a href="' . esc_url( get_edit_bookmark_link( $bookmark ) ) . '">' . $link . '</a>';
+	$link = '<a href="'.esc_url(get_edit_bookmark_link($bookmark)).'">'.$link.'</a>';
 
 	/**
 	 * Filters the bookmark edit link anchor tag.
@@ -1498,7 +1498,7 @@ 
 	 * @param string $link    Anchor tag for the edit link.
 	 * @param int    $link_id Bookmark ID.
 	 */
-	echo $before . apply_filters( 'edit_bookmark_link', $link, $bookmark->link_id ) . $after;
+	echo $before.apply_filters('edit_bookmark_link', $link, $bookmark->link_id).$after;
 }
 
 /**
@@ -1509,22 +1509,22 @@ 
  * @param int $user_id Optional. User ID. Defaults to the current user.
  * @return string URL to edit user page or empty string.
  */
-function get_edit_user_link( $user_id = null ) {
-	if ( ! $user_id )
+function get_edit_user_link($user_id = null) {
+	if ( ! $user_id)
 		$user_id = get_current_user_id();
 
-	if ( empty( $user_id ) || ! current_user_can( 'edit_user', $user_id ) )
+	if (empty($user_id) || ! current_user_can('edit_user', $user_id))
 		return '';
 
-	$user = get_userdata( $user_id );
+	$user = get_userdata($user_id);
 
-	if ( ! $user )
+	if ( ! $user)
 		return '';
 
-	if ( get_current_user_id() == $user->ID )
-		$link = get_edit_profile_url( $user->ID );
+	if (get_current_user_id() == $user->ID)
+		$link = get_edit_profile_url($user->ID);
 	else
-		$link = add_query_arg( 'user_id', $user->ID, self_admin_url( 'user-edit.php' ) );
+		$link = add_query_arg('user_id', $user->ID, self_admin_url('user-edit.php'));
 
 	/**
 	 * Filters the user edit link.
@@ -1534,7 +1534,7 @@ 
 	 * @param string $link    The edit link.
 	 * @param int    $user_id User ID.
 	 */
-	return apply_filters( 'get_edit_user_link', $link, $user->ID );
+	return apply_filters('get_edit_user_link', $link, $user->ID);
 }
 
 // Navigation links
@@ -1550,8 +1550,8 @@ 
  * @return null|string|WP_Post Post object if successful. Null if global $post is not set. Empty string if no
  *                             corresponding post exists.
  */
-function get_previous_post( $in_same_term = false, $excluded_terms = '', $taxonomy = 'category' ) {
-	return get_adjacent_post( $in_same_term, $excluded_terms, true, $taxonomy );
+function get_previous_post($in_same_term = false, $excluded_terms = '', $taxonomy = 'category') {
+	return get_adjacent_post($in_same_term, $excluded_terms, true, $taxonomy);
 }
 
 /**
@@ -1565,8 +1565,8 @@ 
  * @return null|string|WP_Post Post object if successful. Null if global $post is not set. Empty string if no
  *                             corresponding post exists.
  */
-function get_next_post( $in_same_term = false, $excluded_terms = '', $taxonomy = 'category' ) {
-	return get_adjacent_post( $in_same_term, $excluded_terms, false, $taxonomy );
+function get_next_post($in_same_term = false, $excluded_terms = '', $taxonomy = 'category') {
+	return get_adjacent_post($in_same_term, $excluded_terms, false, $taxonomy);
 }
 
 /**
@@ -1585,10 +1585,10 @@ 
  * @return null|string|WP_Post Post object if successful. Null if global $post is not set. Empty string if no
  *                             corresponding post exists.
  */
-function get_adjacent_post( $in_same_term = false, $excluded_terms = '', $previous = true, $taxonomy = 'category' ) {
+function get_adjacent_post($in_same_term = false, $excluded_terms = '', $previous = true, $taxonomy = 'category') {
 	global $wpdb;
 
-	if ( ( ! $post = get_post() ) || ! taxonomy_exists( $taxonomy ) )
+	if (( ! $post = get_post()) || ! taxonomy_exists($taxonomy))
 		return null;
 
 	$current_post_date = $post->post_date;
@@ -1597,35 +1597,35 @@ 
 	$where = '';
 	$adjacent = $previous ? 'previous' : 'next';
 
-	if ( $in_same_term || ! empty( $excluded_terms ) ) {
-		if ( ! empty( $excluded_terms ) && ! is_array( $excluded_terms ) ) {
+	if ($in_same_term || ! empty($excluded_terms)) {
+		if ( ! empty($excluded_terms) && ! is_array($excluded_terms)) {
 			// back-compat, $excluded_terms used to be $excluded_terms with IDs separated by " and "
-			if ( false !== strpos( $excluded_terms, ' and ' ) ) {
-				_deprecated_argument( __FUNCTION__, '3.3.0', sprintf( __( 'Use commas instead of %s to separate excluded terms.' ), "'and'" ) );
-				$excluded_terms = explode( ' and ', $excluded_terms );
+			if (false !== strpos($excluded_terms, ' and ')) {
+				_deprecated_argument(__FUNCTION__, '3.3.0', sprintf(__('Use commas instead of %s to separate excluded terms.'), "'and'"));
+				$excluded_terms = explode(' and ', $excluded_terms);
 			} else {
-				$excluded_terms = explode( ',', $excluded_terms );
+				$excluded_terms = explode(',', $excluded_terms);
 			}
 
-			$excluded_terms = array_map( 'intval', $excluded_terms );
+			$excluded_terms = array_map('intval', $excluded_terms);
 		}
 
-		if ( $in_same_term ) {
+		if ($in_same_term) {
 			$join .= " INNER JOIN $wpdb->term_relationships AS tr ON p.ID = tr.object_id INNER JOIN $wpdb->term_taxonomy tt ON tr.term_taxonomy_id = tt.term_taxonomy_id";
-			$where .= $wpdb->prepare( "AND tt.taxonomy = %s", $taxonomy );
+			$where .= $wpdb->prepare("AND tt.taxonomy = %s", $taxonomy);
 
-			if ( ! is_object_in_taxonomy( $post->post_type, $taxonomy ) )
+			if ( ! is_object_in_taxonomy($post->post_type, $taxonomy))
 				return '';
-			$term_array = wp_get_object_terms( $post->ID, $taxonomy, array( 'fields' => 'ids' ) );
+			$term_array = wp_get_object_terms($post->ID, $taxonomy, array('fields' => 'ids'));
 
 			// Remove any exclusions from the term array to include.
-			$term_array = array_diff( $term_array, (array) $excluded_terms );
-			$term_array = array_map( 'intval', $term_array );
+			$term_array = array_diff($term_array, (array) $excluded_terms);
+			$term_array = array_map('intval', $term_array);
 
-			if ( ! $term_array || is_wp_error( $term_array ) )
+			if ( ! $term_array || is_wp_error($term_array))
 				return '';
 
-			$where .= " AND tt.term_id IN (" . implode( ',', $term_array ) . ")";
+			$where .= " AND tt.term_id IN (".implode(',', $term_array).")";
 		}
 
 		/**
@@ -1638,21 +1638,21 @@ 
 		 *
 		 * @param string $excluded_terms Array of excluded term IDs.
 		 */
-		$excluded_terms = apply_filters( "get_{$adjacent}_post_excluded_terms", $excluded_terms );
+		$excluded_terms = apply_filters("get_{$adjacent}_post_excluded_terms", $excluded_terms);
 
-		if ( ! empty( $excluded_terms ) ) {
-			$where .= " AND p.ID NOT IN ( SELECT tr.object_id FROM $wpdb->term_relationships tr LEFT JOIN $wpdb->term_taxonomy tt ON (tr.term_taxonomy_id = tt.term_taxonomy_id) WHERE tt.term_id IN (" . implode( ',', array_map( 'intval', $excluded_terms ) ) . ') )';
+		if ( ! empty($excluded_terms)) {
+			$where .= " AND p.ID NOT IN ( SELECT tr.object_id FROM $wpdb->term_relationships tr LEFT JOIN $wpdb->term_taxonomy tt ON (tr.term_taxonomy_id = tt.term_taxonomy_id) WHERE tt.term_id IN (".implode(',', array_map('intval', $excluded_terms)).') )';
 		}
 	}
 
 	// 'post_status' clause depends on the current user.
-	if ( is_user_logged_in() ) {
+	if (is_user_logged_in()) {
 		$user_id = get_current_user_id();
 
-		$post_type_object = get_post_type_object( $post->post_type );
-		if ( empty( $post_type_object ) ) {
+		$post_type_object = get_post_type_object($post->post_type);
+		if (empty($post_type_object)) {
 			$post_type_cap    = $post->post_type;
-			$read_private_cap = 'read_private_' . $post_type_cap . 's';
+			$read_private_cap = 'read_private_'.$post_type_cap.'s';
 		} else {
 			$read_private_cap = $post_type_object->cap->read_private_posts;
 		}
@@ -1661,13 +1661,13 @@ 
 		 * Results should include private posts belonging to the current user, or private posts where the
 		 * current user has the 'read_private_posts' cap.
 		 */
-		$private_states = get_post_stati( array( 'private' => true ) );
+		$private_states = get_post_stati(array('private' => true));
 		$where .= " AND ( p.post_status = 'publish'";
-		foreach ( (array) $private_states as $state ) {
-			if ( current_user_can( $read_private_cap ) ) {
-				$where .= $wpdb->prepare( " OR p.post_status = %s", $state );
+		foreach ((array) $private_states as $state) {
+			if (current_user_can($read_private_cap)) {
+				$where .= $wpdb->prepare(" OR p.post_status = %s", $state);
 			} else {
-				$where .= $wpdb->prepare( " OR (p.post_author = %d AND p.post_status = %s)", $user_id, $state );
+				$where .= $wpdb->prepare(" OR (p.post_author = %d AND p.post_status = %s)", $user_id, $state);
 			}
 		}
 		$where .= " )";
@@ -1693,7 +1693,7 @@ 
 	 * @param string  $taxonomy       Taxonomy. Used to identify the term used when `$in_same_term` is true.
 	 * @param WP_Post $post           WP_Post object.
 	 */
-	$join = apply_filters( "get_{$adjacent}_post_join", $join, $in_same_term, $excluded_terms, $taxonomy, $post );
+	$join = apply_filters("get_{$adjacent}_post_join", $join, $in_same_term, $excluded_terms, $taxonomy, $post);
 
 	/**
 	 * Filters the WHERE clause in the SQL for an adjacent post query.
@@ -1710,7 +1710,7 @@ 
 	 * @param string $taxonomy       Taxonomy. Used to identify the term used when `$in_same_term` is true.
 	 * @param WP_Post $post           WP_Post object.
 	 */
-	$where = apply_filters( "get_{$adjacent}_post_where", $wpdb->prepare( "WHERE p.post_date $op %s AND p.post_type = %s $where", $current_post_date, $post->post_type ), $in_same_term, $excluded_terms, $taxonomy, $post );
+	$where = apply_filters("get_{$adjacent}_post_where", $wpdb->prepare("WHERE p.post_date $op %s AND p.post_type = %s $where", $current_post_date, $post->post_type), $in_same_term, $excluded_terms, $taxonomy, $post);
 
 	/**
 	 * Filters the ORDER BY clause in the SQL for an adjacent post query.
@@ -1724,25 +1724,25 @@ 
 	 * @param string $order_by The `ORDER BY` clause in the SQL.
 	 * @param WP_Post $post    WP_Post object.
 	 */
-	$sort  = apply_filters( "get_{$adjacent}_post_sort", "ORDER BY p.post_date $order LIMIT 1", $post );
+	$sort  = apply_filters("get_{$adjacent}_post_sort", "ORDER BY p.post_date $order LIMIT 1", $post);
 
 	$query = "SELECT p.ID FROM $wpdb->posts AS p $join $where $sort";
-	$query_key = 'adjacent_post_' . md5( $query );
-	$result = wp_cache_get( $query_key, 'counts' );
-	if ( false !== $result ) {
-		if ( $result )
-			$result = get_post( $result );
+	$query_key = 'adjacent_post_'.md5($query);
+	$result = wp_cache_get($query_key, 'counts');
+	if (false !== $result) {
+		if ($result)
+			$result = get_post($result);
 		return $result;
 	}
 
-	$result = $wpdb->get_var( $query );
-	if ( null === $result )
+	$result = $wpdb->get_var($query);
+	if (null === $result)
 		$result = '';
 
-	wp_cache_set( $query_key, $result, 'counts' );
+	wp_cache_set($query_key, $result, 'counts');
 
-	if ( $result )
-		$result = get_post( $result );
+	if ($result)
+		$result = get_post($result);
 
 	return $result;
 }
@@ -1761,28 +1761,28 @@ 
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
  * @return string|void The adjacent post relational link URL.
  */
-function get_adjacent_post_rel_link( $title = '%title', $in_same_term = false, $excluded_terms = '', $previous = true, $taxonomy = 'category' ) {
-	if ( $previous && is_attachment() && $post = get_post() )
-		$post = get_post( $post->post_parent );
+function get_adjacent_post_rel_link($title = '%title', $in_same_term = false, $excluded_terms = '', $previous = true, $taxonomy = 'category') {
+	if ($previous && is_attachment() && $post = get_post())
+		$post = get_post($post->post_parent);
 	else
-		$post = get_adjacent_post( $in_same_term, $excluded_terms, $previous, $taxonomy );
+		$post = get_adjacent_post($in_same_term, $excluded_terms, $previous, $taxonomy);
 
-	if ( empty( $post ) )
+	if (empty($post))
 		return;
 
-	$post_title = the_title_attribute( array( 'echo' => false, 'post' => $post ) );
+	$post_title = the_title_attribute(array('echo' => false, 'post' => $post));
 
-	if ( empty( $post_title ) )
-		$post_title = $previous ? __( 'Previous Post' ) : __( 'Next Post' );
+	if (empty($post_title))
+		$post_title = $previous ? __('Previous Post') : __('Next Post');
 
-	$date = mysql2date( get_option( 'date_format' ), $post->post_date );
+	$date = mysql2date(get_option('date_format'), $post->post_date);
 
-	$title = str_replace( '%title', $post_title, $title );
-	$title = str_replace( '%date', $date, $title );
+	$title = str_replace('%title', $post_title, $title);
+	$title = str_replace('%date', $date, $title);
 
 	$link = $previous ? "<link rel='prev' title='" : "<link rel='next' title='";
-	$link .= esc_attr( $title );
-	$link .= "' href='" . get_permalink( $post ) . "' />\n";
+	$link .= esc_attr($title);
+	$link .= "' href='".get_permalink($post)."' />\n";
 
 	$adjacent = $previous ? 'previous' : 'next';
 
@@ -1796,7 +1796,7 @@ 
 	 *
 	 * @param string $link The relational link.
 	 */
-	return apply_filters( "{$adjacent}_post_rel_link", $link );
+	return apply_filters("{$adjacent}_post_rel_link", $link);
 }
 
 /**
@@ -1809,9 +1809,9 @@ 
  * @param array|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs. Default empty.
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
  */
-function adjacent_posts_rel_link( $title = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category' ) {
-	echo get_adjacent_post_rel_link( $title, $in_same_term, $excluded_terms, true, $taxonomy );
-	echo get_adjacent_post_rel_link( $title, $in_same_term, $excluded_terms, false, $taxonomy );
+function adjacent_posts_rel_link($title = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category') {
+	echo get_adjacent_post_rel_link($title, $in_same_term, $excluded_terms, true, $taxonomy);
+	echo get_adjacent_post_rel_link($title, $in_same_term, $excluded_terms, false, $taxonomy);
 }
 
 /**
@@ -1825,7 +1825,7 @@ 
  * @see adjacent_posts_rel_link()
  */
 function adjacent_posts_rel_link_wp_head() {
-	if ( ! is_single() || is_attachment() ) {
+	if ( ! is_single() || is_attachment()) {
 		return;
 	}
 	adjacent_posts_rel_link();
@@ -1843,8 +1843,8 @@ 
  * @param array|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs. Default empty.
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
  */
-function next_post_rel_link( $title = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category' ) {
-	echo get_adjacent_post_rel_link( $title, $in_same_term, $excluded_terms, false, $taxonomy );
+function next_post_rel_link($title = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category') {
+	echo get_adjacent_post_rel_link($title, $in_same_term, $excluded_terms, false, $taxonomy);
 }
 
 /**
@@ -1859,8 +1859,8 @@ 
  * @param array|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs. Default true.
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
  */
-function prev_post_rel_link( $title = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category' ) {
-	echo get_adjacent_post_rel_link( $title, $in_same_term, $excluded_terms, true, $taxonomy );
+function prev_post_rel_link($title = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category') {
+	echo get_adjacent_post_rel_link($title, $in_same_term, $excluded_terms, true, $taxonomy);
 }
 
 /**
@@ -1879,9 +1879,9 @@ 
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
  * @return null|array Array containing the boundary post object if successful, null otherwise.
  */
-function get_boundary_post( $in_same_term = false, $excluded_terms = '', $start = true, $taxonomy = 'category' ) {
+function get_boundary_post($in_same_term = false, $excluded_terms = '', $start = true, $taxonomy = 'category') {
 	$post = get_post();
-	if ( ! $post || ! is_single() || is_attachment() || ! taxonomy_exists( $taxonomy ) )
+	if ( ! $post || ! is_single() || is_attachment() || ! taxonomy_exists($taxonomy))
 		return null;
 
 	$query_args = array(
@@ -1893,34 +1893,34 @@ 
 
 	$term_array = array();
 
-	if ( ! is_array( $excluded_terms ) ) {
-		if ( ! empty( $excluded_terms ) )
-			$excluded_terms = explode( ',', $excluded_terms );
+	if ( ! is_array($excluded_terms)) {
+		if ( ! empty($excluded_terms))
+			$excluded_terms = explode(',', $excluded_terms);
 		else
 			$excluded_terms = array();
 	}
 
-	if ( $in_same_term || ! empty( $excluded_terms ) ) {
-		if ( $in_same_term )
-			$term_array = wp_get_object_terms( $post->ID, $taxonomy, array( 'fields' => 'ids' ) );
+	if ($in_same_term || ! empty($excluded_terms)) {
+		if ($in_same_term)
+			$term_array = wp_get_object_terms($post->ID, $taxonomy, array('fields' => 'ids'));
 
-		if ( ! empty( $excluded_terms ) ) {
-			$excluded_terms = array_map( 'intval', $excluded_terms );
-			$excluded_terms = array_diff( $excluded_terms, $term_array );
+		if ( ! empty($excluded_terms)) {
+			$excluded_terms = array_map('intval', $excluded_terms);
+			$excluded_terms = array_diff($excluded_terms, $term_array);
 
 			$inverse_terms = array();
-			foreach ( $excluded_terms as $excluded_term )
+			foreach ($excluded_terms as $excluded_term)
 				$inverse_terms[] = $excluded_term * -1;
 			$excluded_terms = $inverse_terms;
 		}
 
-		$query_args[ 'tax_query' ] = array( array(
+		$query_args['tax_query'] = array(array(
 			'taxonomy' => $taxonomy,
-			'terms' => array_merge( $term_array, $excluded_terms )
-		) );
+			'terms' => array_merge($term_array, $excluded_terms)
+		));
 	}
 
-	return get_posts( $query_args );
+	return get_posts($query_args);
 }
 
 /**
@@ -1935,8 +1935,8 @@ 
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
  * @return string The link URL of the previous post in relation to the current post.
  */
-function get_previous_post_link( $format = '&laquo; %link', $link = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category' ) {
-	return get_adjacent_post_link( $format, $link, $in_same_term, $excluded_terms, true, $taxonomy );
+function get_previous_post_link($format = '&laquo; %link', $link = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category') {
+	return get_adjacent_post_link($format, $link, $in_same_term, $excluded_terms, true, $taxonomy);
 }
 
 /**
@@ -1952,8 +1952,8 @@ 
  * @param array|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs. Default empty.
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
  */
-function previous_post_link( $format = '&laquo; %link', $link = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category' ) {
-	echo get_previous_post_link( $format, $link, $in_same_term, $excluded_terms, $taxonomy );
+function previous_post_link($format = '&laquo; %link', $link = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category') {
+	echo get_previous_post_link($format, $link, $in_same_term, $excluded_terms, $taxonomy);
 }
 
 /**
@@ -1968,8 +1968,8 @@ 
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
  * @return string The link URL of the next post in relation to the current post.
  */
-function get_next_post_link( $format = '%link &raquo;', $link = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category' ) {
-	return get_adjacent_post_link( $format, $link, $in_same_term, $excluded_terms, false, $taxonomy );
+function get_next_post_link($format = '%link &raquo;', $link = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category') {
+	return get_adjacent_post_link($format, $link, $in_same_term, $excluded_terms, false, $taxonomy);
 }
 
 /**
@@ -1984,8 +1984,8 @@ 
  * @param array|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs. Default empty.
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
  */
-function next_post_link( $format = '%link &raquo;', $link = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category' ) {
-	 echo get_next_post_link( $format, $link, $in_same_term, $excluded_terms, $taxonomy );
+function next_post_link($format = '%link &raquo;', $link = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category') {
+	 echo get_next_post_link($format, $link, $in_same_term, $excluded_terms, $taxonomy);
 }
 
 /**
@@ -2003,32 +2003,32 @@ 
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
  * @return string The link URL of the previous or next post in relation to the current post.
  */
-function get_adjacent_post_link( $format, $link, $in_same_term = false, $excluded_terms = '', $previous = true, $taxonomy = 'category' ) {
-	if ( $previous && is_attachment() )
-		$post = get_post( get_post()->post_parent );
+function get_adjacent_post_link($format, $link, $in_same_term = false, $excluded_terms = '', $previous = true, $taxonomy = 'category') {
+	if ($previous && is_attachment())
+		$post = get_post(get_post()->post_parent);
 	else
-		$post = get_adjacent_post( $in_same_term, $excluded_terms, $previous, $taxonomy );
+		$post = get_adjacent_post($in_same_term, $excluded_terms, $previous, $taxonomy);
 
-	if ( ! $post ) {
+	if ( ! $post) {
 		$output = '';
 	} else {
 		$title = $post->post_title;
 
-		if ( empty( $post->post_title ) )
-			$title = $previous ? __( 'Previous Post' ) : __( 'Next Post' );
+		if (empty($post->post_title))
+			$title = $previous ? __('Previous Post') : __('Next Post');
 
 		/** This filter is documented in wp-includes/post-template.php */
-		$title = apply_filters( 'the_title', $title, $post->ID );
+		$title = apply_filters('the_title', $title, $post->ID);
 
-		$date = mysql2date( get_option( 'date_format' ), $post->post_date );
+		$date = mysql2date(get_option('date_format'), $post->post_date);
 		$rel = $previous ? 'prev' : 'next';
 
-		$string = '<a href="' . get_permalink( $post ) . '" rel="'.$rel.'">';
-		$inlink = str_replace( '%title', $title, $link );
-		$inlink = str_replace( '%date', $date, $inlink );
-		$inlink = $string . $inlink . '</a>';
+		$string = '<a href="'.get_permalink($post).'" rel="'.$rel.'">';
+		$inlink = str_replace('%title', $title, $link);
+		$inlink = str_replace('%date', $date, $inlink);
+		$inlink = $string.$inlink.'</a>';
 
-		$output = str_replace( '%link', $inlink, $format );
+		$output = str_replace('%link', $inlink, $format);
 	}
 
 	$adjacent = $previous ? 'previous' : 'next';
@@ -2048,7 +2048,7 @@ 
 	 * @param WP_Post $post     The adjacent post.
 	 * @param string  $adjacent Whether the post is previous or next.
 	 */
-	return apply_filters( "{$adjacent}_post_link", $output, $format, $link, $post, $adjacent );
+	return apply_filters("{$adjacent}_post_link", $output, $format, $link, $post, $adjacent);
 }
 
 /**
@@ -2065,8 +2065,8 @@ 
  * @param bool         $previous       Optional. Whether to display link to previous or next post. Default true.
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
  */
-function adjacent_post_link( $format, $link, $in_same_term = false, $excluded_terms = '', $previous = true, $taxonomy = 'category' ) {
-	echo get_adjacent_post_link( $format, $link, $in_same_term, $excluded_terms, $previous, $taxonomy );
+function adjacent_post_link($format, $link, $in_same_term = false, $excluded_terms = '', $previous = true, $taxonomy = 'category') {
+	echo get_adjacent_post_link($format, $link, $in_same_term, $excluded_terms, $previous, $taxonomy);
 }
 
 /**
@@ -2081,53 +2081,53 @@ 
  * 	                    Otherwise, prepares the URL with esc_url_raw().
  * @return string The link URL for the given page number.
  */
-function get_pagenum_link($pagenum = 1, $escape = true ) {
+function get_pagenum_link($pagenum = 1, $escape = true) {
 	global $wp_rewrite;
 
 	$pagenum = (int) $pagenum;
 
-	$request = remove_query_arg( 'paged' );
+	$request = remove_query_arg('paged');
 
 	$home_root = parse_url(home_url());
-	$home_root = ( isset($home_root['path']) ) ? $home_root['path'] : '';
-	$home_root = preg_quote( $home_root, '|' );
+	$home_root = (isset($home_root['path'])) ? $home_root['path'] : '';
+	$home_root = preg_quote($home_root, '|');
 
-	$request = preg_replace('|^'. $home_root . '|i', '', $request);
+	$request = preg_replace('|^'.$home_root.'|i', '', $request);
 	$request = preg_replace('|^/+|', '', $request);
 
-	if ( !$wp_rewrite->using_permalinks() || is_admin() ) {
-		$base = trailingslashit( get_bloginfo( 'url' ) );
+	if ( ! $wp_rewrite->using_permalinks() || is_admin()) {
+		$base = trailingslashit(get_bloginfo('url'));
 
-		if ( $pagenum > 1 ) {
-			$result = add_query_arg( 'paged', $pagenum, $base . $request );
+		if ($pagenum > 1) {
+			$result = add_query_arg('paged', $pagenum, $base.$request);
 		} else {
-			$result = $base . $request;
+			$result = $base.$request;
 		}
 	} else {
 		$qs_regex = '|\?.*?$|';
-		preg_match( $qs_regex, $request, $qs_match );
+		preg_match($qs_regex, $request, $qs_match);
 
-		if ( !empty( $qs_match[0] ) ) {
+		if ( ! empty($qs_match[0])) {
 			$query_string = $qs_match[0];
-			$request = preg_replace( $qs_regex, '', $request );
+			$request = preg_replace($qs_regex, '', $request);
 		} else {
 			$query_string = '';
 		}
 
-		$request = preg_replace( "|$wp_rewrite->pagination_base/\d+/?$|", '', $request);
-		$request = preg_replace( '|^' . preg_quote( $wp_rewrite->index, '|' ) . '|i', '', $request);
+		$request = preg_replace("|$wp_rewrite->pagination_base/\d+/?$|", '', $request);
+		$request = preg_replace('|^'.preg_quote($wp_rewrite->index, '|').'|i', '', $request);
 		$request = ltrim($request, '/');
 
-		$base = trailingslashit( get_bloginfo( 'url' ) );
+		$base = trailingslashit(get_bloginfo('url'));
 
-		if ( $wp_rewrite->using_index_permalinks() && ( $pagenum > 1 || '' != $request ) )
-			$base .= $wp_rewrite->index . '/';
+		if ($wp_rewrite->using_index_permalinks() && ($pagenum > 1 || '' != $request))
+			$base .= $wp_rewrite->index.'/';
 
-		if ( $pagenum > 1 ) {
-			$request = ( ( !empty( $request ) ) ? trailingslashit( $request ) : $request ) . user_trailingslashit( $wp_rewrite->pagination_base . "/" . $pagenum, 'paged' );
+		if ($pagenum > 1) {
+			$request = (( ! empty($request)) ? trailingslashit($request) : $request).user_trailingslashit($wp_rewrite->pagination_base."/".$pagenum, 'paged');
 		}
 
-		$result = $base . $request . $query_string;
+		$result = $base.$request.$query_string;
 	}
 
 	/**
@@ -2137,12 +2137,12 @@ 
 	 *
 	 * @param string $result The page number link.
 	 */
-	$result = apply_filters( 'get_pagenum_link', $result );
+	$result = apply_filters('get_pagenum_link', $result);
 
-	if ( $escape )
-		return esc_url( $result );
+	if ($escape)
+		return esc_url($result);
 	else
-		return esc_url_raw( $result );
+		return esc_url_raw($result);
 }
 
 /**
@@ -2160,11 +2160,11 @@ 
 function get_next_posts_page_link($max_page = 0) {
 	global $paged;
 
-	if ( !is_single() ) {
-		if ( !$paged )
+	if ( ! is_single()) {
+		if ( ! $paged)
 			$paged = 1;
 		$nextpage = intval($paged) + 1;
-		if ( !$max_page || $max_page >= $nextpage )
+		if ( ! $max_page || $max_page >= $nextpage)
 			return get_pagenum_link($nextpage);
 	}
 }
@@ -2178,10 +2178,10 @@ 
  * @param bool  $echo     Optional. Whether to echo the link. Default true.
  * @return string|void The link URL for next posts page if `$echo = false`.
  */
-function next_posts( $max_page = 0, $echo = true ) {
-	$output = esc_url( get_next_posts_page_link( $max_page ) );
+function next_posts($max_page = 0, $echo = true) {
+	$output = esc_url(get_next_posts_page_link($max_page));
 
-	if ( $echo )
+	if ($echo)
 		echo $output;
 	else
 		return $output;
@@ -2199,21 +2199,21 @@ 
  * @param int    $max_page Optional. Max pages. Default 0.
  * @return string|void HTML-formatted next posts page link.
  */
-function get_next_posts_link( $label = null, $max_page = 0 ) {
+function get_next_posts_link($label = null, $max_page = 0) {
 	global $paged, $wp_query;
 
-	if ( !$max_page )
+	if ( ! $max_page)
 		$max_page = $wp_query->max_num_pages;
 
-	if ( !$paged )
+	if ( ! $paged)
 		$paged = 1;
 
 	$nextpage = intval($paged) + 1;
 
-	if ( null === $label )
-		$label = __( 'Next Page &raquo;' );
+	if (null === $label)
+		$label = __('Next Page &raquo;');
 
-	if ( !is_single() && ( $nextpage <= $max_page ) ) {
+	if ( ! is_single() && ($nextpage <= $max_page)) {
 		/**
 		 * Filters the anchor tag attributes for the next posts page link.
 		 *
@@ -2221,9 +2221,9 @@ 
 		 *
 		 * @param string $attributes Attributes for the anchor tag.
 		 */
-		$attr = apply_filters( 'next_posts_link_attributes', '' );
+		$attr = apply_filters('next_posts_link_attributes', '');
 
-		return '<a href="' . next_posts( $max_page, false ) . "\" $attr>" . preg_replace('/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $label) . '</a>';
+		return '<a href="'.next_posts($max_page, false)."\" $attr>".preg_replace('/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $label).'</a>';
 	}
 }
 
@@ -2235,8 +2235,8 @@ 
  * @param string $label    Content for link text.
  * @param int    $max_page Optional. Max pages. Default 0.
  */
-function next_posts_link( $label = null, $max_page = 0 ) {
-	echo get_next_posts_link( $label, $max_page );
+function next_posts_link($label = null, $max_page = 0) {
+	echo get_next_posts_link($label, $max_page);
 }
 
 /**
@@ -2255,9 +2255,9 @@ 
 function get_previous_posts_page_link() {
 	global $paged;
 
-	if ( !is_single() ) {
+	if ( ! is_single()) {
 		$nextpage = intval($paged) - 1;
-		if ( $nextpage < 1 )
+		if ($nextpage < 1)
 			$nextpage = 1;
 		return get_pagenum_link($nextpage);
 	}
@@ -2271,10 +2271,10 @@ 
  * @param bool $echo Optional. Whether to echo the link. Default true.
  * @return string|void The previous posts page link if `$echo = false`.
  */
-function previous_posts( $echo = true ) {
-	$output = esc_url( get_previous_posts_page_link() );
+function previous_posts($echo = true) {
+	$output = esc_url(get_previous_posts_page_link());
 
-	if ( $echo )
+	if ($echo)
 		echo $output;
 	else
 		return $output;
@@ -2290,13 +2290,13 @@ 
  * @param string $label Optional. Previous page link text.
  * @return string|void HTML-formatted previous page link.
  */
-function get_previous_posts_link( $label = null ) {
+function get_previous_posts_link($label = null) {
 	global $paged;
 
-	if ( null === $label )
-		$label = __( '&laquo; Previous Page' );
+	if (null === $label)
+		$label = __('&laquo; Previous Page');
 
-	if ( !is_single() && $paged > 1 ) {
+	if ( ! is_single() && $paged > 1) {
 		/**
 		 * Filters the anchor tag attributes for the previous posts page link.
 		 *
@@ -2304,8 +2304,8 @@ 
 		 *
 		 * @param string $attributes Attributes for the anchor tag.
 		 */
-		$attr = apply_filters( 'previous_posts_link_attributes', '' );
-		return '<a href="' . previous_posts( false ) . "\" $attr>". preg_replace( '/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $label ) .'</a>';
+		$attr = apply_filters('previous_posts_link_attributes', '');
+		return '<a href="'.previous_posts(false)."\" $attr>".preg_replace('/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $label).'</a>';
 	}
 }
 
@@ -2316,8 +2316,8 @@ 
  *
  * @param string $label Optional. Previous page link text.
  */
-function previous_posts_link( $label = null ) {
-	echo get_previous_posts_link( $label );
+function previous_posts_link($label = null) {
+	echo get_previous_posts_link($label);
 }
 
 /**
@@ -2338,18 +2338,18 @@ 
  * }
  * @return string The posts link navigation.
  */
-function get_posts_nav_link( $args = array() ) {
+function get_posts_nav_link($args = array()) {
 	global $wp_query;
 
 	$return = '';
 
-	if ( !is_singular() ) {
+	if ( ! is_singular()) {
 		$defaults = array(
 			'sep' => ' &#8212; ',
 			'prelabel' => __('&laquo; Previous Page'),
 			'nxtlabel' => __('Next Page &raquo;'),
 		);
-		$args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args($args, $defaults);
 
 		$max_num_pages = $wp_query->max_num_pages;
 		$paged = get_query_var('paged');
@@ -2359,7 +2359,7 @@ 
 			$args['sep'] = '';
 		}
 
-		if ( $max_num_pages > 1 ) {
+		if ($max_num_pages > 1) {
 			$return = get_previous_posts_link($args['prelabel']);
 			$return .= preg_replace('/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $args['sep']);
 			$return .= get_next_posts_link($args['nxtlabel']);
@@ -2378,8 +2378,8 @@ 
  * @param string $prelabel Optional. Label for previous pages. Default empty.
  * @param string $nxtlabel Optional Label for next pages. Default empty.
  */
-function posts_nav_link( $sep = '', $prelabel = '', $nxtlabel = '' ) {
-	$args = array_filter( compact('sep', 'prelabel', 'nxtlabel') );
+function posts_nav_link($sep = '', $prelabel = '', $nxtlabel = '') {
+	$args = array_filter(compact('sep', 'prelabel', 'nxtlabel'));
 	echo get_posts_nav_link($args);
 }
 
@@ -2401,15 +2401,15 @@ 
  * }
  * @return string Markup for post links.
  */
-function get_the_post_navigation( $args = array() ) {
-	$args = wp_parse_args( $args, array(
+function get_the_post_navigation($args = array()) {
+	$args = wp_parse_args($args, array(
 		'prev_text'          => '%title',
 		'next_text'          => '%title',
 		'in_same_term'       => false,
 		'excluded_terms'     => '',
 		'taxonomy'           => 'category',
-		'screen_reader_text' => __( 'Post navigation' ),
-	) );
+		'screen_reader_text' => __('Post navigation'),
+	));
 
 	$navigation = '';
 
@@ -2430,8 +2430,8 @@ 
 	);
 
 	// Only add markup if there's somewhere to navigate to.
-	if ( $previous || $next ) {
-		$navigation = _navigation_markup( $previous . $next, 'post-navigation', $args['screen_reader_text'] );
+	if ($previous || $next) {
+		$navigation = _navigation_markup($previous.$next, 'post-navigation', $args['screen_reader_text']);
 	}
 
 	return $navigation;
@@ -2445,8 +2445,8 @@ 
  * @param array $args Optional. See get_the_post_navigation() for available arguments.
  *                    Default empty array.
  */
-function the_post_navigation( $args = array() ) {
-	echo get_the_post_navigation( $args );
+function the_post_navigation($args = array()) {
+	echo get_the_post_navigation($args);
 }
 
 /**
@@ -2468,29 +2468,29 @@ 
  * }
  * @return string Markup for posts links.
  */
-function get_the_posts_navigation( $args = array() ) {
+function get_the_posts_navigation($args = array()) {
 	$navigation = '';
 
 	// Don't print empty markup if there's only one page.
-	if ( $GLOBALS['wp_query']->max_num_pages > 1 ) {
-		$args = wp_parse_args( $args, array(
-			'prev_text'          => __( 'Older posts' ),
-			'next_text'          => __( 'Newer posts' ),
-			'screen_reader_text' => __( 'Posts navigation' ),
-		) );
-
-		$next_link = get_previous_posts_link( $args['next_text'] );
-		$prev_link = get_next_posts_link( $args['prev_text'] );
-
-		if ( $prev_link ) {
-			$navigation .= '<div class="nav-previous">' . $prev_link . '</div>';
+	if ($GLOBALS['wp_query']->max_num_pages > 1) {
+		$args = wp_parse_args($args, array(
+			'prev_text'          => __('Older posts'),
+			'next_text'          => __('Newer posts'),
+			'screen_reader_text' => __('Posts navigation'),
+		));
+
+		$next_link = get_previous_posts_link($args['next_text']);
+		$prev_link = get_next_posts_link($args['prev_text']);
+
+		if ($prev_link) {
+			$navigation .= '<div class="nav-previous">'.$prev_link.'</div>';
 		}
 
-		if ( $next_link ) {
-			$navigation .= '<div class="nav-next">' . $next_link . '</div>';
+		if ($next_link) {
+			$navigation .= '<div class="nav-next">'.$next_link.'</div>';
 		}
 
-		$navigation = _navigation_markup( $navigation, 'posts-navigation', $args['screen_reader_text'] );
+		$navigation = _navigation_markup($navigation, 'posts-navigation', $args['screen_reader_text']);
 	}
 
 	return $navigation;
@@ -2504,8 +2504,8 @@ 
  * @param array $args Optional. See get_the_posts_navigation() for available arguments.
  *                    Default empty array.
  */
-function the_posts_navigation( $args = array() ) {
-	echo get_the_posts_navigation( $args );
+function the_posts_navigation($args = array()) {
+	echo get_the_posts_navigation($args);
 }
 
 /**
@@ -2521,28 +2521,28 @@ 
  * }
  * @return string Markup for pagination links.
  */
-function get_the_posts_pagination( $args = array() ) {
+function get_the_posts_pagination($args = array()) {
 	$navigation = '';
 
 	// Don't print empty markup if there's only one page.
-	if ( $GLOBALS['wp_query']->max_num_pages > 1 ) {
-		$args = wp_parse_args( $args, array(
+	if ($GLOBALS['wp_query']->max_num_pages > 1) {
+		$args = wp_parse_args($args, array(
 			'mid_size'           => 1,
-			'prev_text'          => _x( 'Previous', 'previous post' ),
-			'next_text'          => _x( 'Next', 'next post' ),
-			'screen_reader_text' => __( 'Posts navigation' ),
-		) );
+			'prev_text'          => _x('Previous', 'previous post'),
+			'next_text'          => _x('Next', 'next post'),
+			'screen_reader_text' => __('Posts navigation'),
+		));
 
 		// Make sure we get a string back. Plain is the next best thing.
-		if ( isset( $args['type'] ) && 'array' == $args['type'] ) {
+		if (isset($args['type']) && 'array' == $args['type']) {
 			$args['type'] = 'plain';
 		}
 
 		// Set up paginated links.
-		$links = paginate_links( $args );
+		$links = paginate_links($args);
 
-		if ( $links ) {
-			$navigation = _navigation_markup( $links, 'pagination', $args['screen_reader_text'] );
+		if ($links) {
+			$navigation = _navigation_markup($links, 'pagination', $args['screen_reader_text']);
 		}
 	}
 
@@ -2557,8 +2557,8 @@ 
  * @param array $args Optional. See get_the_posts_pagination() for available arguments.
  *                    Default empty array.
  */
-function the_posts_pagination( $args = array() ) {
-	echo get_the_posts_pagination( $args );
+function the_posts_pagination($args = array()) {
+	echo get_the_posts_pagination($args);
 }
 
 /**
@@ -2572,9 +2572,9 @@ 
  * @param string $screen_reader_text Optional. Screen reader text for nav element. Default: 'Posts navigation'.
  * @return string Navigation template tag.
  */
-function _navigation_markup( $links, $class = 'posts-navigation', $screen_reader_text = '' ) {
-	if ( empty( $screen_reader_text ) ) {
-		$screen_reader_text = __( 'Posts navigation' );
+function _navigation_markup($links, $class = 'posts-navigation', $screen_reader_text = '') {
+	if (empty($screen_reader_text)) {
+		$screen_reader_text = __('Posts navigation');
 	}
 
 	$template = '
@@ -2601,9 +2601,9 @@ 
 	 * @param string $class    The class passed by the calling function.
 	 * @return string Navigation template.
 	 */
-	$template = apply_filters( 'navigation_markup_template', $template, $class );
+	$template = apply_filters('navigation_markup_template', $template, $class);
 
-	return sprintf( $template, sanitize_html_class( $class ), esc_html( $screen_reader_text ), $links );
+	return sprintf($template, sanitize_html_class($class), esc_html($screen_reader_text), $links);
 }
 
 /**
@@ -2617,25 +2617,25 @@ 
  * @param int $max_page Optional. The maximum number of comment pages. Default 0.
  * @return string The comments page number link URL.
  */
-function get_comments_pagenum_link( $pagenum = 1, $max_page = 0 ) {
+function get_comments_pagenum_link($pagenum = 1, $max_page = 0) {
 	global $wp_rewrite;
 
 	$pagenum = (int) $pagenum;
 
 	$result = get_permalink();
 
-	if ( 'newest' == get_option('default_comments_page') ) {
-		if ( $pagenum != $max_page ) {
-			if ( $wp_rewrite->using_permalinks() )
-				$result = user_trailingslashit( trailingslashit($result) . $wp_rewrite->comments_pagination_base . '-' . $pagenum, 'commentpaged');
+	if ('newest' == get_option('default_comments_page')) {
+		if ($pagenum != $max_page) {
+			if ($wp_rewrite->using_permalinks())
+				$result = user_trailingslashit(trailingslashit($result).$wp_rewrite->comments_pagination_base.'-'.$pagenum, 'commentpaged');
 			else
-				$result = add_query_arg( 'cpage', $pagenum, $result );
+				$result = add_query_arg('cpage', $pagenum, $result);
 		}
-	} elseif ( $pagenum > 1 ) {
-		if ( $wp_rewrite->using_permalinks() )
-			$result = user_trailingslashit( trailingslashit($result) . $wp_rewrite->comments_pagination_base . '-' . $pagenum, 'commentpaged');
+	} elseif ($pagenum > 1) {
+		if ($wp_rewrite->using_permalinks())
+			$result = user_trailingslashit(trailingslashit($result).$wp_rewrite->comments_pagination_base.'-'.$pagenum, 'commentpaged');
 		else
-			$result = add_query_arg( 'cpage', $pagenum, $result );
+			$result = add_query_arg('cpage', $pagenum, $result);
 	}
 
 	$result .= '#comments';
@@ -2647,7 +2647,7 @@ 
 	 *
 	 * @param string $result The comments page number link.
 	 */
-	return apply_filters( 'get_comments_pagenum_link', $result );
+	return apply_filters('get_comments_pagenum_link', $result);
 }
 
 /**
@@ -2661,30 +2661,30 @@ 
  * @param int    $max_page Optional. Max page. Default 0.
  * @return string|void HTML-formatted link for the next page of comments.
  */
-function get_next_comments_link( $label = '', $max_page = 0 ) {
+function get_next_comments_link($label = '', $max_page = 0) {
 	global $wp_query;
 
-	if ( ! is_singular() )
+	if ( ! is_singular())
 		return;
 
 	$page = get_query_var('cpage');
 
-	if ( ! $page ) {
+	if ( ! $page) {
 		$page = 1;
 	}
 
 	$nextpage = intval($page) + 1;
 
-	if ( empty($max_page) )
+	if (empty($max_page))
 		$max_page = $wp_query->max_num_comment_pages;
 
-	if ( empty($max_page) )
+	if (empty($max_page))
 		$max_page = get_comment_pages_count();
 
-	if ( $nextpage > $max_page )
+	if ($nextpage > $max_page)
 		return;
 
-	if ( empty($label) )
+	if (empty($label))
 		$label = __('Newer Comments &raquo;');
 
 	/**
@@ -2694,7 +2694,7 @@ 
 	 *
 	 * @param string $attributes Attributes for the anchor tag.
 	 */
-	return '<a href="' . esc_url( get_comments_pagenum_link( $nextpage, $max_page ) ) . '" ' . apply_filters( 'next_comments_link_attributes', '' ) . '>'. preg_replace('/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $label) .'</a>';
+	return '<a href="'.esc_url(get_comments_pagenum_link($nextpage, $max_page)).'" '.apply_filters('next_comments_link_attributes', '').'>'.preg_replace('/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $label).'</a>';
 }
 
 /**
@@ -2705,8 +2705,8 @@ 
  * @param string $label    Optional. Label for link text. Default empty.
  * @param int    $max_page Optional. Max page. Default 0.
  */
-function next_comments_link( $label = '', $max_page = 0 ) {
-	echo get_next_comments_link( $label, $max_page );
+function next_comments_link($label = '', $max_page = 0) {
+	echo get_next_comments_link($label, $max_page);
 }
 
 /**
@@ -2717,18 +2717,18 @@ 
  * @param string $label Optional. Label for comments link text. Default empty.
  * @return string|void HTML-formatted link for the previous page of comments.
  */
-function get_previous_comments_link( $label = '' ) {
-	if ( ! is_singular() )
+function get_previous_comments_link($label = '') {
+	if ( ! is_singular())
 		return;
 
 	$page = get_query_var('cpage');
 
-	if ( intval($page) <= 1 )
+	if (intval($page) <= 1)
 		return;
 
 	$prevpage = intval($page) - 1;
 
-	if ( empty($label) )
+	if (empty($label))
 		$label = __('&laquo; Older Comments');
 
 	/**
@@ -2738,7 +2738,7 @@ 
 	 *
 	 * @param string $attributes Attributes for the anchor tag.
 	 */
-	return '<a href="' . esc_url( get_comments_pagenum_link( $prevpage ) ) . '" ' . apply_filters( 'previous_comments_link_attributes', '' ) . '>' . preg_replace('/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $label) .'</a>';
+	return '<a href="'.esc_url(get_comments_pagenum_link($prevpage)).'" '.apply_filters('previous_comments_link_attributes', '').'>'.preg_replace('/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $label).'</a>';
 }
 
 /**
@@ -2748,8 +2748,8 @@ 
  *
  * @param string $label Optional. Label for comments link text. Default empty.
  */
-function previous_comments_link( $label = '' ) {
-	echo get_previous_comments_link( $label );
+function previous_comments_link($label = '') {
+	echo get_previous_comments_link($label);
 }
 
 /**
@@ -2763,31 +2763,31 @@ 
  * @param string|array $args Optional args. See paginate_links(). Default empty array.
  * @return string|void Markup for pagination links.
  */
-function paginate_comments_links( $args = array() ) {
+function paginate_comments_links($args = array()) {
 	global $wp_rewrite;
 
-	if ( ! is_singular() )
+	if ( ! is_singular())
 		return;
 
 	$page = get_query_var('cpage');
-	if ( !$page )
+	if ( ! $page)
 		$page = 1;
 	$max_page = get_comment_pages_count();
 	$defaults = array(
-		'base' => add_query_arg( 'cpage', '%#%' ),
+		'base' => add_query_arg('cpage', '%#%'),
 		'format' => '',
 		'total' => $max_page,
 		'current' => $page,
 		'echo' => true,
 		'add_fragment' => '#comments'
 	);
-	if ( $wp_rewrite->using_permalinks() )
-		$defaults['base'] = user_trailingslashit(trailingslashit(get_permalink()) . $wp_rewrite->comments_pagination_base . '-%#%', 'commentpaged');
+	if ($wp_rewrite->using_permalinks())
+		$defaults['base'] = user_trailingslashit(trailingslashit(get_permalink()).$wp_rewrite->comments_pagination_base.'-%#%', 'commentpaged');
 
-	$args = wp_parse_args( $args, $defaults );
-	$page_links = paginate_links( $args );
+	$args = wp_parse_args($args, $defaults);
+	$page_links = paginate_links($args);
 
-	if ( $args['echo'] )
+	if ($args['echo'])
 		echo $page_links;
 	else
 		return $page_links;
@@ -2809,29 +2809,29 @@ 
  * }
  * @return string Markup for comments links.
  */
-function get_the_comments_navigation( $args = array() ) {
+function get_the_comments_navigation($args = array()) {
 	$navigation = '';
 
 	// Are there comments to navigate through?
-	if ( get_comment_pages_count() > 1 ) {
-		$args = wp_parse_args( $args, array(
-			'prev_text'          => __( 'Older comments' ),
-			'next_text'          => __( 'Newer comments' ),
-			'screen_reader_text' => __( 'Comments navigation' ),
-		) );
-
-		$prev_link = get_previous_comments_link( $args['prev_text'] );
-		$next_link = get_next_comments_link( $args['next_text'] );
-
-		if ( $prev_link ) {
-			$navigation .= '<div class="nav-previous">' . $prev_link . '</div>';
+	if (get_comment_pages_count() > 1) {
+		$args = wp_parse_args($args, array(
+			'prev_text'          => __('Older comments'),
+			'next_text'          => __('Newer comments'),
+			'screen_reader_text' => __('Comments navigation'),
+		));
+
+		$prev_link = get_previous_comments_link($args['prev_text']);
+		$next_link = get_next_comments_link($args['next_text']);
+
+		if ($prev_link) {
+			$navigation .= '<div class="nav-previous">'.$prev_link.'</div>';
 		}
 
-		if ( $next_link ) {
-			$navigation .= '<div class="nav-next">' . $next_link . '</div>';
+		if ($next_link) {
+			$navigation .= '<div class="nav-next">'.$next_link.'</div>';
 		}
 
-		$navigation = _navigation_markup( $navigation, 'comment-navigation', $args['screen_reader_text'] );
+		$navigation = _navigation_markup($navigation, 'comment-navigation', $args['screen_reader_text']);
 	}
 
 	return $navigation;
@@ -2844,8 +2844,8 @@ 
  *
  * @param array $args See get_the_comments_navigation() for available arguments. Default empty array.
  */
-function the_comments_navigation( $args = array() ) {
-	echo get_the_comments_navigation( $args );
+function the_comments_navigation($args = array()) {
+	echo get_the_comments_navigation($args);
 }
 
 /**
@@ -2862,20 +2862,20 @@ 
  * }
  * @return string Markup for pagination links.
  */
-function get_the_comments_pagination( $args = array() ) {
+function get_the_comments_pagination($args = array()) {
 	$navigation = '';
-	$args       = wp_parse_args( $args, array(
-		'screen_reader_text' => __( 'Comments navigation' ),
-	) );
+	$args       = wp_parse_args($args, array(
+		'screen_reader_text' => __('Comments navigation'),
+	));
 	$args['echo'] = false;
 
 	// Make sure we get plain links, so we get a string we can work with.
 	$args['type'] = 'plain';
 
-	$links = paginate_comments_links( $args );
+	$links = paginate_comments_links($args);
 
-	if ( $links ) {
-		$navigation = _navigation_markup( $links, 'comments-pagination', $args['screen_reader_text'] );
+	if ($links) {
+		$navigation = _navigation_markup($links, 'comments-pagination', $args['screen_reader_text']);
 	}
 
 	return $navigation;
@@ -2888,8 +2888,8 @@ 
  *
  * @param array $args See get_the_comments_pagination() for available arguments. Default empty array.
  */
-function the_comments_pagination( $args = array() ) {
-	echo get_the_comments_pagination( $args );
+function the_comments_pagination($args = array()) {
+	echo get_the_comments_pagination($args);
 }
 
 /**
@@ -2909,11 +2909,11 @@ 
 function get_shortcut_link() {
 	global $is_IE, $wp_version;
 
-	include_once( ABSPATH . 'wp-admin/includes/class-wp-press-this.php' );
+	include_once(ABSPATH.'wp-admin/includes/class-wp-press-this.php');
 	$bookmarklet_version = $GLOBALS['wp_press_this']->version;
 	$link = '';
 
-	if ( $is_IE ) {
+	if ($is_IE) {
 		/*
 		 * Return the old/shorter bookmarklet code for MSIE 8 and lower,
 		 * since they only support a max length of ~2000 characters for
@@ -2923,27 +2923,27 @@ 
 		 */
 		$ua = $_SERVER['HTTP_USER_AGENT'];
 
-		if ( ! empty( $ua ) && preg_match( '/\bMSIE (\d)/', $ua, $matches ) && (int) $matches[1] <= 8 ) {
-			$url = wp_json_encode( admin_url( 'press-this.php' ) );
+		if ( ! empty($ua) && preg_match('/\bMSIE (\d)/', $ua, $matches) && (int) $matches[1] <= 8) {
+			$url = wp_json_encode(admin_url('press-this.php'));
 
-			$link = 'javascript:var d=document,w=window,e=w.getSelection,k=d.getSelection,x=d.selection,' .
-				's=(e?e():(k)?k():(x?x.createRange().text:0)),f=' . $url . ',l=d.location,e=encodeURIComponent,' .
-				'u=f+"?u="+e(l.href)+"&t="+e(d.title)+"&s="+e(s)+"&v=' . $bookmarklet_version . '";' .
-				'a=function(){if(!w.open(u,"t","toolbar=0,resizable=1,scrollbars=1,status=1,width=600,height=700"))l.href=u;};' .
+			$link = 'javascript:var d=document,w=window,e=w.getSelection,k=d.getSelection,x=d.selection,'.
+				's=(e?e():(k)?k():(x?x.createRange().text:0)),f='.$url.',l=d.location,e=encodeURIComponent,'.
+				'u=f+"?u="+e(l.href)+"&t="+e(d.title)+"&s="+e(s)+"&v='.$bookmarklet_version.'";'.
+				'a=function(){if(!w.open(u,"t","toolbar=0,resizable=1,scrollbars=1,status=1,width=600,height=700"))l.href=u;};'.
 				'if(/Firefox/.test(navigator.userAgent))setTimeout(a,0);else a();void(0)';
 		}
 	}
 
-	if ( empty( $link ) ) {
-		$src = @file_get_contents( ABSPATH . 'wp-admin/js/bookmarklet.min.js' );
+	if (empty($link)) {
+		$src = @file_get_contents(ABSPATH.'wp-admin/js/bookmarklet.min.js');
 
-		if ( $src ) {
-			$url = wp_json_encode( admin_url( 'press-this.php' ) . '?v=' . $bookmarklet_version );
-			$link = 'javascript:' . str_replace( 'window.pt_url', $url, $src );
+		if ($src) {
+			$url = wp_json_encode(admin_url('press-this.php').'?v='.$bookmarklet_version);
+			$link = 'javascript:'.str_replace('window.pt_url', $url, $src);
 		}
 	}
 
-	$link = str_replace( array( "\r", "\n", "\t" ),  '', $link );
+	$link = str_replace(array("\r", "\n", "\t"), '', $link);
 
 	/**
 	 * Filters the Press This bookmarklet link.
@@ -2952,7 +2952,7 @@ 
 	 *
 	 * @param string $link The Press This bookmarklet link.
 	 */
-	return apply_filters( 'shortcut_link', $link );
+	return apply_filters('shortcut_link', $link);
 }
 
 /**
@@ -2969,8 +2969,8 @@ 
  *                             'http', 'https', 'relative', 'rest', or null. Default null.
  * @return string Home URL link with optional path appended.
  */
-function home_url( $path = '', $scheme = null ) {
-	return get_home_url( null, $path, $scheme );
+function home_url($path = '', $scheme = null) {
+	return get_home_url(null, $path, $scheme);
 }
 
 /**
@@ -2990,30 +2990,30 @@ 
  *                              'http', 'https', 'relative', 'rest', or null. Default null.
  * @return string Home URL link with optional path appended.
  */
-function get_home_url( $blog_id = null, $path = '', $scheme = null ) {
+function get_home_url($blog_id = null, $path = '', $scheme = null) {
 	global $pagenow;
 
 	$orig_scheme = $scheme;
 
-	if ( empty( $blog_id ) || !is_multisite() ) {
-		$url = get_option( 'home' );
+	if (empty($blog_id) || ! is_multisite()) {
+		$url = get_option('home');
 	} else {
-		switch_to_blog( $blog_id );
-		$url = get_option( 'home' );
+		switch_to_blog($blog_id);
+		$url = get_option('home');
 		restore_current_blog();
 	}
 
-	if ( ! in_array( $scheme, array( 'http', 'https', 'relative' ) ) ) {
-		if ( is_ssl() && ! is_admin() && 'wp-login.php' !== $pagenow )
+	if ( ! in_array($scheme, array('http', 'https', 'relative'))) {
+		if (is_ssl() && ! is_admin() && 'wp-login.php' !== $pagenow)
 			$scheme = 'https';
 		else
-			$scheme = parse_url( $url, PHP_URL_SCHEME );
+			$scheme = parse_url($url, PHP_URL_SCHEME);
 	}
 
-	$url = set_url_scheme( $url, $scheme );
+	$url = set_url_scheme($url, $scheme);
 
-	if ( $path && is_string( $path ) )
-		$url .= '/' . ltrim( $path, '/' );
+	if ($path && is_string($path))
+		$url .= '/'.ltrim($path, '/');
 
 	/**
 	 * Filters the home URL.
@@ -3026,7 +3026,7 @@ 
 	 *                                 'relative', 'rest', or null.
 	 * @param int|null    $blog_id     Site ID, or null for the current site.
 	 */
-	return apply_filters( 'home_url', $url, $path, $orig_scheme, $blog_id );
+	return apply_filters('home_url', $url, $path, $orig_scheme, $blog_id);
 }
 
 /**
@@ -3043,8 +3043,8 @@ 
  * @param string $scheme Optional. Scheme to give the site URL context. See set_url_scheme().
  * @return string Site URL link with optional path appended.
  */
-function site_url( $path = '', $scheme = null ) {
-	return get_site_url( null, $path, $scheme );
+function site_url($path = '', $scheme = null) {
+	return get_site_url(null, $path, $scheme);
 }
 
 /**
@@ -3064,19 +3064,19 @@ 
  *                        'relative'. Default null.
  * @return string Site URL link with optional path appended.
  */
-function get_site_url( $blog_id = null, $path = '', $scheme = null ) {
-	if ( empty( $blog_id ) || !is_multisite() ) {
-		$url = get_option( 'siteurl' );
+function get_site_url($blog_id = null, $path = '', $scheme = null) {
+	if (empty($blog_id) || ! is_multisite()) {
+		$url = get_option('siteurl');
 	} else {
-		switch_to_blog( $blog_id );
-		$url = get_option( 'siteurl' );
+		switch_to_blog($blog_id);
+		$url = get_option('siteurl');
 		restore_current_blog();
 	}
 
-	$url = set_url_scheme( $url, $scheme );
+	$url = set_url_scheme($url, $scheme);
 
-	if ( $path && is_string( $path ) )
-		$url .= '/' . ltrim( $path, '/' );
+	if ($path && is_string($path))
+		$url .= '/'.ltrim($path, '/');
 
 	/**
 	 * Filters the site URL.
@@ -3089,7 +3089,7 @@ 
 	 *                             'login_post', 'admin', 'relative' or null.
 	 * @param int|null    $blog_id Site ID, or null for the current site.
 	 */
-	return apply_filters( 'site_url', $url, $path, $scheme, $blog_id );
+	return apply_filters('site_url', $url, $path, $scheme, $blog_id);
 }
 
 /**
@@ -3102,8 +3102,8 @@ 
  *                       'http' or 'https' can be passed to force those schemes.
  * @return string Admin URL link with optional path appended.
  */
-function admin_url( $path = '', $scheme = 'admin' ) {
-	return get_admin_url( null, $path, $scheme );
+function admin_url($path = '', $scheme = 'admin') {
+	return get_admin_url(null, $path, $scheme);
 }
 
 /**
@@ -3118,11 +3118,11 @@ 
  *                        force_ssl_admin() and is_ssl().
  * @return string Admin URL link with optional path appended.
  */
-function get_admin_url( $blog_id = null, $path = '', $scheme = 'admin' ) {
+function get_admin_url($blog_id = null, $path = '', $scheme = 'admin') {
 	$url = get_site_url($blog_id, 'wp-admin/', $scheme);
 
-	if ( $path && is_string( $path ) )
-		$url .= ltrim( $path, '/' );
+	if ($path && is_string($path))
+		$url .= ltrim($path, '/');
 
 	/**
 	 * Filters the admin area URL.
@@ -3133,7 +3133,7 @@ 
 	 * @param string   $path    Path relative to the admin area URL. Blank string if no path is specified.
 	 * @param int|null $blog_id Site ID, or null for the current site.
 	 */
-	return apply_filters( 'admin_url', $url, $path, $blog_id );
+	return apply_filters('admin_url', $url, $path, $blog_id);
 }
 
 /**
@@ -3146,10 +3146,10 @@ 
  *                       'http', 'https', or 'relative'. Default null.
  * @return string Includes URL link with optional path appended.
  */
-function includes_url( $path = '', $scheme = null ) {
-	$url = site_url( '/' . WPINC . '/', $scheme );
+function includes_url($path = '', $scheme = null) {
+	$url = site_url('/'.WPINC.'/', $scheme);
 
-	if ( $path && is_string( $path ) )
+	if ($path && is_string($path))
 		$url .= ltrim($path, '/');
 
 	/**
@@ -3161,7 +3161,7 @@ 
 	 * @param string $path Path relative to the URL to the wp-includes directory. Blank string
 	 *                     if no path is specified.
 	 */
-	return apply_filters( 'includes_url', $url, $path );
+	return apply_filters('includes_url', $url, $path);
 }
 
 /**
@@ -3172,11 +3172,11 @@ 
  * @param string $path Optional. Path relative to the content URL. Default empty.
  * @return string Content URL link with optional path appended.
  */
-function content_url( $path = '' ) {
-	$url = set_url_scheme( WP_CONTENT_URL );
+function content_url($path = '') {
+	$url = set_url_scheme(WP_CONTENT_URL);
 
-	if ( $path && is_string( $path ) )
-		$url .= '/' . ltrim($path, '/');
+	if ($path && is_string($path))
+		$url .= '/'.ltrim($path, '/');
 
 	/**
 	 * Filters the URL to the content directory.
@@ -3187,7 +3187,7 @@ 
 	 * @param string $path Path relative to the URL to the content directory. Blank string
 	 *                     if no path is specified.
 	 */
-	return apply_filters( 'content_url', $url, $path);
+	return apply_filters('content_url', $url, $path);
 }
 
 /**
@@ -3204,28 +3204,28 @@ 
  *                        Typically this is done by passing `__FILE__` as the argument.
  * @return string Plugins URL link with optional paths appended.
  */
-function plugins_url( $path = '', $plugin = '' ) {
+function plugins_url($path = '', $plugin = '') {
 
-	$path = wp_normalize_path( $path );
-	$plugin = wp_normalize_path( $plugin );
-	$mu_plugin_dir = wp_normalize_path( WPMU_PLUGIN_DIR );
+	$path = wp_normalize_path($path);
+	$plugin = wp_normalize_path($plugin);
+	$mu_plugin_dir = wp_normalize_path(WPMU_PLUGIN_DIR);
 
-	if ( !empty($plugin) && 0 === strpos($plugin, $mu_plugin_dir) )
+	if ( ! empty($plugin) && 0 === strpos($plugin, $mu_plugin_dir))
 		$url = WPMU_PLUGIN_URL;
 	else
 		$url = WP_PLUGIN_URL;
 
 
-	$url = set_url_scheme( $url );
+	$url = set_url_scheme($url);
 
-	if ( !empty($plugin) && is_string($plugin) ) {
+	if ( ! empty($plugin) && is_string($plugin)) {
 		$folder = dirname(plugin_basename($plugin));
-		if ( '.' != $folder )
-			$url .= '/' . ltrim($folder, '/');
+		if ('.' != $folder)
+			$url .= '/'.ltrim($folder, '/');
 	}
 
-	if ( $path && is_string( $path ) )
-		$url .= '/' . ltrim($path, '/');
+	if ($path && is_string($path))
+		$url .= '/'.ltrim($path, '/');
 
 	/**
 	 * Filters the URL to the plugins directory.
@@ -3238,7 +3238,7 @@ 
 	 * @param string $plugin The plugin file path to be relative to. Blank string if no plugin
 	 *                       is specified.
 	 */
-	return apply_filters( 'plugins_url', $url, $path, $plugin );
+	return apply_filters('plugins_url', $url, $path, $plugin);
 }
 
 /**
@@ -3257,19 +3257,19 @@ 
  *                       'http', 'https', or 'relative'. Default null.
  * @return string Site URL link with optional path appended.
  */
-function network_site_url( $path = '', $scheme = null ) {
-	if ( ! is_multisite() )
+function network_site_url($path = '', $scheme = null) {
+	if ( ! is_multisite())
 		return site_url($path, $scheme);
 
 	$current_site = get_current_site();
 
-	if ( 'relative' == $scheme )
+	if ('relative' == $scheme)
 		$url = $current_site->path;
 	else
-		$url = set_url_scheme( 'http://' . $current_site->domain . $current_site->path, $scheme );
+		$url = set_url_scheme('http://'.$current_site->domain.$current_site->path, $scheme);
 
-	if ( $path && is_string( $path ) )
-		$url .= ltrim( $path, '/' );
+	if ($path && is_string($path))
+		$url .= ltrim($path, '/');
 
 	/**
 	 * Filters the network site URL.
@@ -3282,7 +3282,7 @@ 
 	 * @param string|null $scheme Scheme to give the URL context. Accepts 'http', 'https',
 	 *                            'relative' or null.
 	 */
-	return apply_filters( 'network_site_url', $url, $path, $scheme );
+	return apply_filters('network_site_url', $url, $path, $scheme);
 }
 
 /**
@@ -3299,23 +3299,23 @@ 
  *                        'http', 'https', or 'relative'. Default null.
  * @return string Home URL link with optional path appended.
  */
-function network_home_url( $path = '', $scheme = null ) {
-	if ( ! is_multisite() )
+function network_home_url($path = '', $scheme = null) {
+	if ( ! is_multisite())
 		return home_url($path, $scheme);
 
 	$current_site = get_current_site();
 	$orig_scheme = $scheme;
 
-	if ( ! in_array( $scheme, array( 'http', 'https', 'relative' ) ) )
+	if ( ! in_array($scheme, array('http', 'https', 'relative')))
 		$scheme = is_ssl() && ! is_admin() ? 'https' : 'http';
 
-	if ( 'relative' == $scheme )
+	if ('relative' == $scheme)
 		$url = $current_site->path;
 	else
-		$url = set_url_scheme( 'http://' . $current_site->domain . $current_site->path, $scheme );
+		$url = set_url_scheme('http://'.$current_site->domain.$current_site->path, $scheme);
 
-	if ( $path && is_string( $path ) )
-		$url .= ltrim( $path, '/' );
+	if ($path && is_string($path))
+		$url .= ltrim($path, '/');
 
 	/**
 	 * Filters the network home URL.
@@ -3328,7 +3328,7 @@ 
 	 * @param string|null $orig_scheme Scheme to give the URL context. Accepts 'http', 'https',
 	 *                                 'relative' or null.
 	 */
-	return apply_filters( 'network_home_url', $url, $path, $orig_scheme);
+	return apply_filters('network_home_url', $url, $path, $orig_scheme);
 }
 
 /**
@@ -3341,13 +3341,13 @@ 
  *                       and is_ssl(). 'http' or 'https' can be passed to force those schemes.
  * @return string Admin URL link with optional path appended.
  */
-function network_admin_url( $path = '', $scheme = 'admin' ) {
-	if ( ! is_multisite() )
-		return admin_url( $path, $scheme );
+function network_admin_url($path = '', $scheme = 'admin') {
+	if ( ! is_multisite())
+		return admin_url($path, $scheme);
 
 	$url = network_site_url('wp-admin/network/', $scheme);
 
-	if ( $path && is_string( $path ) )
+	if ($path && is_string($path))
 		$url .= ltrim($path, '/');
 
 	/**
@@ -3359,7 +3359,7 @@ 
 	 * @param string $path Path relative to the network admin URL. Blank string if
 	 *                     no path is specified.
 	 */
-	return apply_filters( 'network_admin_url', $url, $path );
+	return apply_filters('network_admin_url', $url, $path);
 }
 
 /**
@@ -3372,10 +3372,10 @@ 
  *                       and is_ssl(). 'http' or 'https' can be passed to force those schemes.
  * @return string Admin URL link with optional path appended.
  */
-function user_admin_url( $path = '', $scheme = 'admin' ) {
+function user_admin_url($path = '', $scheme = 'admin') {
 	$url = network_site_url('wp-admin/user/', $scheme);
 
-	if ( $path && is_string( $path ) )
+	if ($path && is_string($path))
 		$url .= ltrim($path, '/');
 
 	/**
@@ -3387,7 +3387,7 @@ 
 	 * @param string $path Path relative to the URL. Blank string if
 	 *                     no path is specified.
 	 */
-	return apply_filters( 'user_admin_url', $url, $path );
+	return apply_filters('user_admin_url', $url, $path);
 }
 
 /**
@@ -3400,10 +3400,10 @@ 
  *                       and is_ssl(). 'http' or 'https' can be passed to force those schemes.
  * @return string Admin URL link with optional path appended.
  */
-function self_admin_url( $path = '', $scheme = 'admin' ) {
-	if ( is_network_admin() )
+function self_admin_url($path = '', $scheme = 'admin') {
+	if (is_network_admin())
 		return network_admin_url($path, $scheme);
-	elseif ( is_user_admin() )
+	elseif (is_user_admin())
 		return user_admin_url($path, $scheme);
 	else
 		return admin_url($path, $scheme);
@@ -3420,27 +3420,27 @@ 
  *                            'login_post', 'admin', 'relative', 'rest', 'rpc', or null. Default null.
  * @return string $url URL with chosen scheme.
  */
-function set_url_scheme( $url, $scheme = null ) {
+function set_url_scheme($url, $scheme = null) {
 	$orig_scheme = $scheme;
 
-	if ( ! $scheme ) {
+	if ( ! $scheme) {
 		$scheme = is_ssl() ? 'https' : 'http';
-	} elseif ( $scheme === 'admin' || $scheme === 'login' || $scheme === 'login_post' || $scheme === 'rpc' ) {
+	} elseif ($scheme === 'admin' || $scheme === 'login' || $scheme === 'login_post' || $scheme === 'rpc') {
 		$scheme = is_ssl() || force_ssl_admin() ? 'https' : 'http';
-	} elseif ( $scheme !== 'http' && $scheme !== 'https' && $scheme !== 'relative' ) {
+	} elseif ($scheme !== 'http' && $scheme !== 'https' && $scheme !== 'relative') {
 		$scheme = is_ssl() ? 'https' : 'http';
 	}
 
-	$url = trim( $url );
-	if ( substr( $url, 0, 2 ) === '//' )
-		$url = 'http:' . $url;
+	$url = trim($url);
+	if (substr($url, 0, 2) === '//')
+		$url = 'http:'.$url;
 
-	if ( 'relative' == $scheme ) {
-		$url = ltrim( preg_replace( '#^\w+://[^/]*#', '', $url ) );
-		if ( $url !== '' && $url[0] === '/' )
-			$url = '/' . ltrim($url , "/ \t\n\r\0\x0B" );
+	if ('relative' == $scheme) {
+		$url = ltrim(preg_replace('#^\w+://[^/]*#', '', $url));
+		if ($url !== '' && $url[0] === '/')
+			$url = '/'.ltrim($url, "/ \t\n\r\0\x0B");
 	} else {
-		$url = preg_replace( '#^\w+://#', $scheme . '://', $url );
+		$url = preg_replace('#^\w+://#', $scheme.'://', $url);
 	}
 
 	/**
@@ -3453,7 +3453,7 @@ 
 	 * @param string|null $orig_scheme Scheme requested for the URL. One of 'http', 'https', 'login',
 	 *                                 'login_post', 'admin', 'relative', 'rest', 'rpc', or null.
 	 */
-	return apply_filters( 'set_url_scheme', $url, $scheme, $orig_scheme );
+	return apply_filters('set_url_scheme', $url, $scheme, $orig_scheme);
 }
 
 /**
@@ -3472,24 +3472,24 @@ 
  *                        and is_ssl(). 'http' or 'https' can be passed to force those schemes.
  * @return string Dashboard URL link with optional path appended.
  */
-function get_dashboard_url( $user_id = 0, $path = '', $scheme = 'admin' ) {
+function get_dashboard_url($user_id = 0, $path = '', $scheme = 'admin') {
 	$user_id = $user_id ? (int) $user_id : get_current_user_id();
 
-	$blogs = get_blogs_of_user( $user_id );
-	if ( ! is_super_admin() && empty($blogs) ) {
-		$url = user_admin_url( $path, $scheme );
-	} elseif ( ! is_multisite() ) {
-		$url = admin_url( $path, $scheme );
+	$blogs = get_blogs_of_user($user_id);
+	if ( ! is_super_admin() && empty($blogs)) {
+		$url = user_admin_url($path, $scheme);
+	} elseif ( ! is_multisite()) {
+		$url = admin_url($path, $scheme);
 	} else {
 		$current_blog = get_current_blog_id();
-		if ( $current_blog  && ( is_super_admin( $user_id ) || in_array( $current_blog, array_keys( $blogs ) ) ) ) {
-			$url = admin_url( $path, $scheme );
+		if ($current_blog && (is_super_admin($user_id) || in_array($current_blog, array_keys($blogs)))) {
+			$url = admin_url($path, $scheme);
 		} else {
-			$active = get_active_blog_for_user( $user_id );
-			if ( $active )
-				$url = get_admin_url( $active->blog_id, $path, $scheme );
+			$active = get_active_blog_for_user($user_id);
+			if ($active)
+				$url = get_admin_url($active->blog_id, $path, $scheme);
 			else
-				$url = user_admin_url( $path, $scheme );
+				$url = user_admin_url($path, $scheme);
 		}
 	}
 
@@ -3504,7 +3504,7 @@ 
 	 * @param string $scheme  Scheme to give the URL context. Accepts 'http', 'https', 'login',
 	 *                        'login_post', 'admin', 'relative' or null.
 	 */
-	return apply_filters( 'user_dashboard_url', $url, $user_id, $path, $scheme);
+	return apply_filters('user_dashboard_url', $url, $user_id, $path, $scheme);
 }
 
 /**
@@ -3517,15 +3517,15 @@ 
  *                        and is_ssl(). 'http' or 'https' can be passed to force those schemes.
  * @return string Dashboard URL link with optional path appended.
  */
-function get_edit_profile_url( $user_id = 0, $scheme = 'admin' ) {
+function get_edit_profile_url($user_id = 0, $scheme = 'admin') {
 	$user_id = $user_id ? (int) $user_id : get_current_user_id();
 
-	if ( is_user_admin() )
-		$url = user_admin_url( 'profile.php', $scheme );
-	elseif ( is_network_admin() )
-		$url = network_admin_url( 'profile.php', $scheme );
+	if (is_user_admin())
+		$url = user_admin_url('profile.php', $scheme);
+	elseif (is_network_admin())
+		$url = network_admin_url('profile.php', $scheme);
 	else
-		$url = get_dashboard_url( $user_id, 'profile.php', $scheme );
+		$url = get_dashboard_url($user_id, 'profile.php', $scheme);
 
 	/**
 	 * Filters the URL for a user's profile editor.
@@ -3537,7 +3537,7 @@ 
 	 * @param string $scheme  Scheme to give the URL context. Accepts 'http', 'https', 'login',
 	 *                        'login_post', 'admin', 'relative' or null.
 	 */
-	return apply_filters( 'edit_profile_url', $url, $user_id, $scheme);
+	return apply_filters('edit_profile_url', $url, $user_id, $scheme);
 }
 
 /**
@@ -3552,33 +3552,33 @@ 
  * @return string|false The canonical URL, or false if the post does not exist or has not
  *                      been published yet.
  */
-function wp_get_canonical_url( $post = null ) {
-	$post = get_post( $post );
+function wp_get_canonical_url($post = null) {
+	$post = get_post($post);
 
-	if ( ! $post ) {
+	if ( ! $post) {
 		return false;
 	}
 
-	if ( 'publish' !== $post->post_status ) {
+	if ('publish' !== $post->post_status) {
 		return false;
 	}
 
-	$canonical_url = get_permalink( $post );
+	$canonical_url = get_permalink($post);
 
 	// If a canonical is being generated for the current page, make sure it has pagination if needed.
-	if ( $post->ID === get_queried_object_id() ) {
-		$page = get_query_var( 'page', 0 );
-		if ( $page >= 2 ) {
-			if ( '' == get_option( 'permalink_structure' ) ) {
-				$canonical_url = add_query_arg( 'page', $page, $canonical_url );
+	if ($post->ID === get_queried_object_id()) {
+		$page = get_query_var('page', 0);
+		if ($page >= 2) {
+			if ('' == get_option('permalink_structure')) {
+				$canonical_url = add_query_arg('page', $page, $canonical_url);
 			} else {
-				$canonical_url = trailingslashit( $canonical_url ) . user_trailingslashit( $page, 'single_paged' );
+				$canonical_url = trailingslashit($canonical_url).user_trailingslashit($page, 'single_paged');
 			}
 		}
 
-		$cpage = get_query_var( 'cpage', 0 );
-		if ( $cpage ) {
-			$canonical_url = get_comments_pagenum_link( $cpage );
+		$cpage = get_query_var('cpage', 0);
+		if ($cpage) {
+			$canonical_url = get_comments_pagenum_link($cpage);
 		}
 	}
 
@@ -3590,7 +3590,7 @@ 
 	 * @param string  $string The post's canonical URL.
 	 * @param WP_Post $post   Post object.
 	 */
-	return apply_filters( 'get_canonical_url', $canonical_url, $post );
+	return apply_filters('get_canonical_url', $canonical_url, $post);
 }
 
 /**
@@ -3600,20 +3600,20 @@ 
  * @since 4.6.0 Adjusted to use wp_get_canonical_url().
  */
 function rel_canonical() {
-	if ( ! is_singular() ) {
+	if ( ! is_singular()) {
 		return;
 	}
 
 	$id = get_queried_object_id();
 
-	if ( 0 === $id ) {
+	if (0 === $id) {
 		return;
 	}
 
-	$url = wp_get_canonical_url( $id );
+	$url = wp_get_canonical_url($id);
 
-	if ( ! empty( $url ) ) {
-		echo '<link rel="canonical" href="' . esc_url( $url ) . '" />' . "\n";
+	if ( ! empty($url)) {
+		echo '<link rel="canonical" href="'.esc_url($url).'" />'."\n";
 	}
 }
 
@@ -3637,7 +3637,7 @@ 
  * @return string A shortlink or an empty string if no shortlink exists for the requested resource or if shortlinks
  *                are not enabled.
  */
-function wp_get_shortlink( $id = 0, $context = 'post', $allow_slugs = true ) {
+function wp_get_shortlink($id = 0, $context = 'post', $allow_slugs = true) {
 	/**
 	 * Filters whether to preempt generating a shortlink for the given post.
 	 *
@@ -3651,32 +3651,32 @@ 
 	 * @param string      $context     The context for the link. One of 'post' or 'query',
 	 * @param bool        $allow_slugs Whether to allow post slugs in the shortlink.
 	 */
-	$shortlink = apply_filters( 'pre_get_shortlink', false, $id, $context, $allow_slugs );
+	$shortlink = apply_filters('pre_get_shortlink', false, $id, $context, $allow_slugs);
 
-	if ( false !== $shortlink ) {
+	if (false !== $shortlink) {
 		return $shortlink;
 	}
 
 	$post_id = 0;
-	if ( 'query' == $context && is_singular() ) {
+	if ('query' == $context && is_singular()) {
 		$post_id = get_queried_object_id();
-		$post = get_post( $post_id );
-	} elseif ( 'post' == $context ) {
-		$post = get_post( $id );
-		if ( ! empty( $post->ID ) )
+		$post = get_post($post_id);
+	} elseif ('post' == $context) {
+		$post = get_post($id);
+		if ( ! empty($post->ID))
 			$post_id = $post->ID;
 	}
 
 	$shortlink = '';
 
 	// Return p= link for all public post types.
-	if ( ! empty( $post_id ) ) {
-		$post_type = get_post_type_object( $post->post_type );
+	if ( ! empty($post_id)) {
+		$post_type = get_post_type_object($post->post_type);
 
-		if ( 'page' === $post->post_type && $post->ID == get_option( 'page_on_front' ) && 'page' == get_option( 'show_on_front' ) ) {
-			$shortlink = home_url( '/' );
-		} elseif ( $post_type->public ) {
-			$shortlink = home_url( '?p=' . $post_id );
+		if ('page' === $post->post_type && $post->ID == get_option('page_on_front') && 'page' == get_option('show_on_front')) {
+			$shortlink = home_url('/');
+		} elseif ($post_type->public) {
+			$shortlink = home_url('?p='.$post_id);
 		}
 	}
 
@@ -3690,7 +3690,7 @@ 
 	 * @param string $context     The context for the link. One of 'post' or 'query',
 	 * @param bool   $allow_slugs Whether to allow post slugs in the shortlink. Not used by default.
 	 */
-	return apply_filters( 'get_shortlink', $shortlink, $id, $context, $allow_slugs );
+	return apply_filters('get_shortlink', $shortlink, $id, $context, $allow_slugs);
 }
 
 /**
@@ -3701,12 +3701,12 @@ 
  * @since 3.0.0
  */
 function wp_shortlink_wp_head() {
-	$shortlink = wp_get_shortlink( 0, 'query' );
+	$shortlink = wp_get_shortlink(0, 'query');
 
-	if ( empty( $shortlink ) )
+	if (empty($shortlink))
 		return;
 
-	echo "<link rel='shortlink' href='" . esc_url( $shortlink ) . "' />\n";
+	echo "<link rel='shortlink' href='".esc_url($shortlink)."' />\n";
 }
 
 /**
@@ -3717,15 +3717,15 @@ 
  * @since 3.0.0
  */
 function wp_shortlink_header() {
-	if ( headers_sent() )
+	if (headers_sent())
 		return;
 
 	$shortlink = wp_get_shortlink(0, 'query');
 
-	if ( empty($shortlink) )
+	if (empty($shortlink))
 		return;
 
-	header('Link: <' . $shortlink . '>; rel=shortlink', false);
+	header('Link: <'.$shortlink.'>; rel=shortlink', false);
 }
 
 /**
@@ -3742,19 +3742,19 @@ 
  * @param string $before Optional HTML to display before the link. Default empty.
  * @param string $after  Optional HTML to display after the link. Default empty.
  */
-function the_shortlink( $text = '', $title = '', $before = '', $after = '' ) {
+function the_shortlink($text = '', $title = '', $before = '', $after = '') {
 	$post = get_post();
 
-	if ( empty( $text ) )
+	if (empty($text))
 		$text = __('This is the short link.');
 
-	if ( empty( $title ) )
-		$title = the_title_attribute( array( 'echo' => false ) );
+	if (empty($title))
+		$title = the_title_attribute(array('echo' => false));
 
-	$shortlink = wp_get_shortlink( $post->ID );
+	$shortlink = wp_get_shortlink($post->ID);
 
-	if ( !empty( $shortlink ) ) {
-		$link = '<a rel="shortlink" href="' . esc_url( $shortlink ) . '" title="' . $title . '">' . $text . '</a>';
+	if ( ! empty($shortlink)) {
+		$link = '<a rel="shortlink" href="'.esc_url($shortlink).'" title="'.$title.'">'.$text.'</a>';
 
 		/**
 		 * Filters the short link anchor tag for a post.
@@ -3766,7 +3766,7 @@ 
 		 * @param string $text      Shortlink's text.
 		 * @param string $title     Shortlink's title attribute.
 		 */
-		$link = apply_filters( 'the_shortlink', $link, $shortlink, $text, $title );
+		$link = apply_filters('the_shortlink', $link, $shortlink, $text, $title);
 		echo $before, $link, $after;
 	}
 }
@@ -3799,8 +3799,8 @@ 
  * }
  * @return false|string The URL of the avatar we found, or false if we couldn't find an avatar.
  */
-function get_avatar_url( $id_or_email, $args = null ) {
-	$args = get_avatar_data( $id_or_email, $args );
+function get_avatar_url($id_or_email, $args = null) {
+	$args = get_avatar_data($id_or_email, $args);
 	return $args['url'];
 }
 
@@ -3840,51 +3840,51 @@ 
  *     @type string $url          The URL of the avatar we found.
  * }
  */
-function get_avatar_data( $id_or_email, $args = null ) {
-	$args = wp_parse_args( $args, array(
+function get_avatar_data($id_or_email, $args = null) {
+	$args = wp_parse_args($args, array(
 		'size'           => 96,
 		'height'         => null,
 		'width'          => null,
-		'default'        => get_option( 'avatar_default', 'mystery' ),
+		'default'        => get_option('avatar_default', 'mystery'),
 		'force_default'  => false,
-		'rating'         => get_option( 'avatar_rating' ),
+		'rating'         => get_option('avatar_rating'),
 		'scheme'         => null,
 		'processed_args' => null, // if used, should be a reference
 		'extra_attr'     => '',
-	) );
+	));
 
-	if ( is_numeric( $args['size'] ) ) {
-		$args['size'] = absint( $args['size'] );
-		if ( ! $args['size'] ) {
+	if (is_numeric($args['size'])) {
+		$args['size'] = absint($args['size']);
+		if ( ! $args['size']) {
 			$args['size'] = 96;
 		}
 	} else {
 		$args['size'] = 96;
 	}
 
-	if ( is_numeric( $args['height'] ) ) {
-		$args['height'] = absint( $args['height'] );
-		if ( ! $args['height'] ) {
+	if (is_numeric($args['height'])) {
+		$args['height'] = absint($args['height']);
+		if ( ! $args['height']) {
 			$args['height'] = $args['size'];
 		}
 	} else {
 		$args['height'] = $args['size'];
 	}
 
-	if ( is_numeric( $args['width'] ) ) {
-		$args['width'] = absint( $args['width'] );
-		if ( ! $args['width'] ) {
+	if (is_numeric($args['width'])) {
+		$args['width'] = absint($args['width']);
+		if ( ! $args['width']) {
 			$args['width'] = $args['size'];
 		}
 	} else {
 		$args['width'] = $args['size'];
 	}
 
-	if ( empty( $args['default'] ) ) {
-		$args['default'] = get_option( 'avatar_default', 'mystery' );
+	if (empty($args['default'])) {
+		$args['default'] = get_option('avatar_default', 'mystery');
 	}
 
-	switch ( $args['default'] ) {
+	switch ($args['default']) {
 		case 'mm' :
 		case 'mystery' :
 		case 'mysteryman' :
@@ -3897,7 +3897,7 @@ 
 
 	$args['force_default'] = (bool) $args['force_default'];
 
-	$args['rating'] = strtolower( $args['rating'] );
+	$args['rating'] = strtolower($args['rating']);
 
 	$args['found_avatar'] = false;
 
@@ -3914,38 +3914,38 @@ 
 	 * @param mixed  $id_or_email The Gravatar to retrieve. Accepts a user_id, gravatar md5 hash,
 	 *                            user email, WP_User object, WP_Post object, or WP_Comment object.
 	 */
-	$args = apply_filters( 'pre_get_avatar_data', $args, $id_or_email );
+	$args = apply_filters('pre_get_avatar_data', $args, $id_or_email);
 
-	if ( isset( $args['url'] ) && ! is_null( $args['url'] ) ) {
+	if (isset($args['url']) && ! is_null($args['url'])) {
 		/** This filter is documented in wp-includes/link-template.php */
-		return apply_filters( 'get_avatar_data', $args, $id_or_email );
+		return apply_filters('get_avatar_data', $args, $id_or_email);
 	}
 
 	$email_hash = '';
 	$user = $email = false;
 
-	if ( is_object( $id_or_email ) && isset( $id_or_email->comment_ID ) ) {
-		$id_or_email = get_comment( $id_or_email );
+	if (is_object($id_or_email) && isset($id_or_email->comment_ID)) {
+		$id_or_email = get_comment($id_or_email);
 	}
 
 	// Process the user identifier.
-	if ( is_numeric( $id_or_email ) ) {
-		$user = get_user_by( 'id', absint( $id_or_email ) );
-	} elseif ( is_string( $id_or_email ) ) {
-		if ( strpos( $id_or_email, '@md5.gravatar.com' ) ) {
+	if (is_numeric($id_or_email)) {
+		$user = get_user_by('id', absint($id_or_email));
+	} elseif (is_string($id_or_email)) {
+		if (strpos($id_or_email, '@md5.gravatar.com')) {
 			// md5 hash
-			list( $email_hash ) = explode( '@', $id_or_email );
+			list($email_hash) = explode('@', $id_or_email);
 		} else {
 			// email address
 			$email = $id_or_email;
 		}
-	} elseif ( $id_or_email instanceof WP_User ) {
+	} elseif ($id_or_email instanceof WP_User) {
 		// User Object
 		$user = $id_or_email;
-	} elseif ( $id_or_email instanceof WP_Post ) {
+	} elseif ($id_or_email instanceof WP_Post) {
 		// Post Object
-		$user = get_user_by( 'id', (int) $id_or_email->post_author );
-	} elseif ( $id_or_email instanceof WP_Comment ) {
+		$user = get_user_by('id', (int) $id_or_email->post_author);
+	} elseif ($id_or_email instanceof WP_Comment) {
 		/**
 		 * Filters the list of allowed comment types for retrieving avatars.
 		 *
@@ -3953,36 +3953,36 @@ 
 		 *
 		 * @param array $types An array of content types. Default only contains 'comment'.
 		 */
-		$allowed_comment_types = apply_filters( 'get_avatar_comment_types', array( 'comment' ) );
-		if ( ! empty( $id_or_email->comment_type ) && ! in_array( $id_or_email->comment_type, (array) $allowed_comment_types ) ) {
+		$allowed_comment_types = apply_filters('get_avatar_comment_types', array('comment'));
+		if ( ! empty($id_or_email->comment_type) && ! in_array($id_or_email->comment_type, (array) $allowed_comment_types)) {
 			$args['url'] = false;
 			/** This filter is documented in wp-includes/link-template.php */
-			return apply_filters( 'get_avatar_data', $args, $id_or_email );
+			return apply_filters('get_avatar_data', $args, $id_or_email);
 		}
 
-		if ( ! empty( $id_or_email->user_id ) ) {
-			$user = get_user_by( 'id', (int) $id_or_email->user_id );
+		if ( ! empty($id_or_email->user_id)) {
+			$user = get_user_by('id', (int) $id_or_email->user_id);
 		}
-		if ( ( ! $user || is_wp_error( $user ) ) && ! empty( $id_or_email->comment_author_email ) ) {
+		if (( ! $user || is_wp_error($user)) && ! empty($id_or_email->comment_author_email)) {
 			$email = $id_or_email->comment_author_email;
 		}
 	}
 
-	if ( ! $email_hash ) {
-		if ( $user ) {
+	if ( ! $email_hash) {
+		if ($user) {
 			$email = $user->user_email;
 		}
 
-		if ( $email ) {
-			$email_hash = md5( strtolower( trim( $email ) ) );
+		if ($email) {
+			$email_hash = md5(strtolower(trim($email)));
 		}
 	}
 
-	if ( $email_hash ) {
+	if ($email_hash) {
 		$args['found_avatar'] = true;
-		$gravatar_server = hexdec( $email_hash[0] ) % 3;
+		$gravatar_server = hexdec($email_hash[0]) % 3;
 	} else {
-		$gravatar_server = rand( 0, 2 );
+		$gravatar_server = rand(0, 2);
 	}
 
 	$url_args = array(
@@ -3992,15 +3992,15 @@ 
 		'r' => $args['rating'],
 	);
 
-	if ( is_ssl() ) {
-		$url = 'https://secure.gravatar.com/avatar/' . $email_hash;
+	if (is_ssl()) {
+		$url = 'https://secure.gravatar.com/avatar/'.$email_hash;
 	} else {
-		$url = sprintf( 'http://%d.gravatar.com/avatar/%s', $gravatar_server, $email_hash );
+		$url = sprintf('http://%d.gravatar.com/avatar/%s', $gravatar_server, $email_hash);
 	}
 
 	$url = add_query_arg(
-		rawurlencode_deep( array_filter( $url_args ) ),
-		set_url_scheme( $url, $args['scheme'] )
+		rawurlencode_deep(array_filter($url_args)),
+		set_url_scheme($url, $args['scheme'])
 	);
 
 	/**
@@ -4013,7 +4013,7 @@ 
 	 *                            user email, WP_User object, WP_Post object, or WP_Comment object.
 	 * @param array  $args        Arguments passed to get_avatar_data(), after processing.
 	 */
-	$args['url'] = apply_filters( 'get_avatar_url', $url, $id_or_email, $args );
+	$args['url'] = apply_filters('get_avatar_url', $url, $id_or_email, $args);
 
 	/**
 	 * Filters the avatar data.
@@ -4024,5 +4024,5 @@ 
 	 * @param mixed  $id_or_email The Gravatar to retrieve. Accepts a user_id, gravatar md5 hash,
 	 *                            user email, WP_User object, WP_Post object, or WP_Comment object.
 	 */
-	return apply_filters( 'get_avatar_data', $args, $id_or_email );
+	return apply_filters('get_avatar_data', $args, $id_or_email);
 }

Braces +474 added lines, -340 removed lines

@@ -46,10 +46,11 @@ 
  */
 function user_trailingslashit($string, $type_of_url = '') {
 	global $wp_rewrite;
-	if ( $wp_rewrite->use_trailing_slashes )
-		$string = trailingslashit($string);
-	else
-		$string = untrailingslashit($string);
+	if ( $wp_rewrite->use_trailing_slashes ) {
+			$string = trailingslashit($string);
+	} else {
+			$string = untrailingslashit($string);
+	}
 
 	/**
 	 * Filters the trailing-slashed string, depending on whether the site is set to use trailing slashes.
@@ -137,15 +138,17 @@ 
 		$sample = false;
 	}
 
-	if ( empty($post->ID) )
-		return false;
+	if ( empty($post->ID) ) {
+			return false;
+	}
 
-	if ( $post->post_type == 'page' )
-		return get_page_link($post, $leavename, $sample);
-	elseif ( $post->post_type == 'attachment' )
-		return get_attachment_link( $post, $leavename );
-	elseif ( in_array($post->post_type, get_post_types( array('_builtin' => false) ) ) )
-		return get_post_permalink($post, $leavename, $sample);
+	if ( $post->post_type == 'page' ) {
+			return get_page_link($post, $leavename, $sample);
+	} elseif ( $post->post_type == 'attachment' ) {
+			return get_attachment_link( $post, $leavename );
+	} elseif ( in_array($post->post_type, get_post_types( array('_builtin' => false) ) ) ) {
+			return get_post_permalink($post, $leavename, $sample);
+	}
 
 	$permalink = get_option('permalink_structure');
 
@@ -184,8 +187,9 @@ 
 
 				$category_object = get_term( $category_object, 'category' );
 				$category = $category_object->slug;
-				if ( $parent = $category_object->parent )
-					$category = get_category_parents($parent, false, '/', true) . $category;
+				if ( $parent = $category_object->parent ) {
+									$category = get_category_parents($parent, false, '/', true) . $category;
+				}
 			}
 			// show default category in permalinks, without
 			// having to assign it explicitly
@@ -255,8 +259,9 @@ 
 
 	$post = get_post($id);
 
-	if ( is_wp_error( $post ) )
-		return $post;
+	if ( is_wp_error( $post ) ) {
+			return $post;
+	}
 
 	$post_link = $wp_rewrite->get_extra_permastruct($post->post_type);
 
@@ -276,10 +281,11 @@ 
 		}
 		$post_link = home_url( user_trailingslashit($post_link) );
 	} else {
-		if ( $post_type->query_var && ( isset($post->post_status) && !$draft_or_pending ) )
-			$post_link = add_query_arg($post_type->query_var, $slug, '');
-		else
-			$post_link = add_query_arg(array('post_type' => $post->post_type, 'p' => $post->ID), '');
+		if ( $post_type->query_var && ( isset($post->post_status) && !$draft_or_pending ) ) {
+					$post_link = add_query_arg($post_type->query_var, $slug, '');
+		} else {
+					$post_link = add_query_arg(array('post_type' => $post->post_type, 'p' => $post->ID), '');
+		}
 		$post_link = home_url($post_link);
 	}
 
@@ -312,10 +318,11 @@ 
 function get_page_link( $post = false, $leavename = false, $sample = false ) {
 	$post = get_post( $post );
 
-	if ( 'page' == get_option( 'show_on_front' ) && $post->ID == get_option( 'page_on_front' ) )
-		$link = home_url('/');
-	else
-		$link = _get_page_link( $post, $leavename, $sample );
+	if ( 'page' == get_option( 'show_on_front' ) && $post->ID == get_option( 'page_on_front' ) ) {
+			$link = home_url('/');
+	} else {
+			$link = _get_page_link( $post, $leavename, $sample );
+	}
 
 	/**
 	 * Filters the permalink for a page.
@@ -401,27 +408,36 @@ 
 	}
 
 	if ( $wp_rewrite->using_permalinks() && $parent ) {
-		if ( 'page' == $parent->post_type )
-			$parentlink = _get_page_link( $post->post_parent ); // Ignores page_on_front
-		else
-			$parentlink = get_permalink( $post->post_parent );
+		if ( 'page' == $parent->post_type ) {
+					$parentlink = _get_page_link( $post->post_parent );
+		}
+		// Ignores page_on_front
+		else {
+					$parentlink = get_permalink( $post->post_parent );
+		}
 
-		if ( is_numeric($post->post_name) || false !== strpos(get_option('permalink_structure'), '%category%') )
-			$name = 'attachment/' . $post->post_name; // <permalink>/<int>/ is paged so we use the explicit attachment marker
-		else
-			$name = $post->post_name;
+		if ( is_numeric($post->post_name) || false !== strpos(get_option('permalink_structure'), '%category%') ) {
+					$name = 'attachment/' . $post->post_name;
+		}
+		// <permalink>/<int>/ is paged so we use the explicit attachment marker
+		else {
+					$name = $post->post_name;
+		}
 
-		if ( strpos($parentlink, '?') === false )
-			$link = user_trailingslashit( trailingslashit($parentlink) . '%postname%' );
+		if ( strpos($parentlink, '?') === false ) {
+					$link = user_trailingslashit( trailingslashit($parentlink) . '%postname%' );
+		}
 
-		if ( ! $leavename )
-			$link = str_replace( '%postname%', $name, $link );
+		if ( ! $leavename ) {
+					$link = str_replace( '%postname%', $name, $link );
+		}
 	} elseif ( $wp_rewrite->using_permalinks() && ! $leavename ) {
 		$link = home_url( user_trailingslashit( $post->post_name ) );
 	}
 
-	if ( ! $link )
-		$link = home_url( '/?attachment_id=' . $post->ID );
+	if ( ! $link ) {
+			$link = home_url( '/?attachment_id=' . $post->ID );
+	}
 
 	/**
 	 * Filters the permalink for an attachment.
@@ -446,8 +462,9 @@ 
  */
 function get_year_link( $year ) {
 	global $wp_rewrite;
-	if ( !$year )
-		$year = gmdate('Y', current_time('timestamp'));
+	if ( !$year ) {
+			$year = gmdate('Y', current_time('timestamp'));
+	}
 	$yearlink = $wp_rewrite->get_year_permastruct();
 	if ( !empty($yearlink) ) {
 		$yearlink = str_replace('%year%', $year, $yearlink);
@@ -480,10 +497,12 @@ 
  */
 function get_month_link($year, $month) {
 	global $wp_rewrite;
-	if ( !$year )
-		$year = gmdate('Y', current_time('timestamp'));
-	if ( !$month )
-		$month = gmdate('m', current_time('timestamp'));
+	if ( !$year ) {
+			$year = gmdate('Y', current_time('timestamp'));
+	}
+	if ( !$month ) {
+			$month = gmdate('m', current_time('timestamp'));
+	}
 	$monthlink = $wp_rewrite->get_month_permastruct();
 	if ( !empty($monthlink) ) {
 		$monthlink = str_replace('%year%', $year, $monthlink);
@@ -519,12 +538,15 @@ 
  */
 function get_day_link($year, $month, $day) {
 	global $wp_rewrite;
-	if ( !$year )
-		$year = gmdate('Y', current_time('timestamp'));
-	if ( !$month )
-		$month = gmdate('m', current_time('timestamp'));
-	if ( !$day )
-		$day = gmdate('j', current_time('timestamp'));
+	if ( !$year ) {
+			$year = gmdate('Y', current_time('timestamp'));
+	}
+	if ( !$month ) {
+			$month = gmdate('m', current_time('timestamp'));
+	}
+	if ( !$day ) {
+			$day = gmdate('j', current_time('timestamp'));
+	}
 
 	$daylink = $wp_rewrite->get_day_permastruct();
 	if ( !empty($daylink) ) {
@@ -592,18 +614,21 @@ 
 			$permalink = $wp_rewrite->get_comment_feed_permastruct();
 		}
 
-		if ( get_default_feed() == $feed )
-			$feed = '';
+		if ( get_default_feed() == $feed ) {
+					$feed = '';
+		}
 
 		$permalink = str_replace('%feed%', $feed, $permalink);
 		$permalink = preg_replace('#/+#', '/', "/$permalink");
 		$output =  home_url( user_trailingslashit($permalink, 'feed') );
 	} else {
-		if ( empty($feed) )
-			$feed = get_default_feed();
+		if ( empty($feed) ) {
+					$feed = get_default_feed();
+		}
 
-		if ( false !== strpos($feed, 'comments_') )
-			$feed = str_replace('comments_', 'comments-', $feed);
+		if ( false !== strpos($feed, 'comments_') ) {
+					$feed = str_replace('comments_', 'comments-', $feed);
+		}
 
 		$output = home_url("?feed={$feed}");
 	}
@@ -631,20 +656,23 @@ 
 function get_post_comments_feed_link( $post_id = 0, $feed = '' ) {
 	$post_id = absint( $post_id );
 
-	if ( ! $post_id )
-		$post_id = get_the_ID();
+	if ( ! $post_id ) {
+			$post_id = get_the_ID();
+	}
 
-	if ( empty( $feed ) )
-		$feed = get_default_feed();
+	if ( empty( $feed ) ) {
+			$feed = get_default_feed();
+	}
 
 	$post = get_post( $post_id );
 	$unattached = 'attachment' === $post->post_type && 0 === (int) $post->post_parent;
 
 	if ( '' != get_option('permalink_structure') ) {
-		if ( 'page' == get_option('show_on_front') && $post_id == get_option('page_on_front') )
-			$url = _get_page_link( $post_id );
-		else
-			$url = get_permalink($post_id);
+		if ( 'page' == get_option('show_on_front') && $post_id == get_option('page_on_front') ) {
+					$url = _get_page_link( $post_id );
+		} else {
+					$url = get_permalink($post_id);
+		}
 
 		if ( $unattached ) {
 			$url =  home_url( '/feed/' );
@@ -654,8 +682,9 @@ 
 			$url = add_query_arg( 'attachment_id', $post_id, $url );
 		} else {
 			$url = trailingslashit($url) . 'feed';
-			if ( $feed != get_default_feed() )
-				$url .= "/$feed";
+			if ( $feed != get_default_feed() ) {
+							$url .= "/$feed";
+			}
 			$url = user_trailingslashit($url, 'single_feed');
 		}
 	} else {
@@ -726,17 +755,19 @@ 
 	$author_id = (int) $author_id;
 	$permalink_structure = get_option('permalink_structure');
 
-	if ( empty($feed) )
-		$feed = get_default_feed();
+	if ( empty($feed) ) {
+			$feed = get_default_feed();
+	}
 
 	if ( '' == $permalink_structure ) {
 		$link = home_url("?feed=$feed&amp;author=" . $author_id);
 	} else {
 		$link = get_author_posts_url($author_id);
-		if ( $feed == get_default_feed() )
-			$feed_link = 'feed';
-		else
-			$feed_link = "feed/$feed";
+		if ( $feed == get_default_feed() ) {
+					$feed_link = 'feed';
+		} else {
+					$feed_link = "feed/$feed";
+		}
 
 		$link = trailingslashit($link) . user_trailingslashit($feed_link, 'feed');
 	}
@@ -788,19 +819,20 @@ 
 
 	$term = get_term( $term_id, $taxonomy  );
 
-	if ( empty( $term ) || is_wp_error( $term ) )
-		return false;
+	if ( empty( $term ) || is_wp_error( $term ) ) {
+			return false;
+	}
 
-	if ( empty( $feed ) )
-		$feed = get_default_feed();
+	if ( empty( $feed ) ) {
+			$feed = get_default_feed();
+	}
 
 	$permalink_structure = get_option( 'permalink_structure' );
 
 	if ( '' == $permalink_structure ) {
 		if ( 'category' == $taxonomy ) {
 			$link = home_url("?feed=$feed&amp;cat=$term_id");
-		}
-		elseif ( 'post_tag' == $taxonomy ) {
+		} elseif ( 'post_tag' == $taxonomy ) {
 			$link = home_url("?feed=$feed&amp;tag=$term->slug");
 		} else {
 			$t = get_taxonomy( $taxonomy );
@@ -808,10 +840,11 @@ 
 		}
 	} else {
 		$link = get_term_link( $term_id, $term->taxonomy );
-		if ( $feed == get_default_feed() )
-			$feed_link = 'feed';
-		else
-			$feed_link = "feed/$feed";
+		if ( $feed == get_default_feed() ) {
+					$feed_link = 'feed';
+		} else {
+					$feed_link = "feed/$feed";
+		}
 
 		$link = trailingslashit( $link ) . user_trailingslashit( $feed_link, 'feed' );
 	}
@@ -977,18 +1010,22 @@ 
  * @return string|void HTML content.
  */
 function edit_term_link( $link = '', $before = '', $after = '', $term = null, $echo = true ) {
-	if ( is_null( $term ) )
-		$term = get_queried_object();
+	if ( is_null( $term ) ) {
+			$term = get_queried_object();
+	}
 
-	if ( ! $term )
-		return;
+	if ( ! $term ) {
+			return;
+	}
 
 	$tax = get_taxonomy( $term->taxonomy );
-	if ( ! current_user_can( $tax->cap->edit_terms ) )
-		return;
+	if ( ! current_user_can( $tax->cap->edit_terms ) ) {
+			return;
+	}
 
-	if ( empty( $link ) )
-		$link = __('Edit This');
+	if ( empty( $link ) ) {
+			$link = __('Edit This');
+	}
 
 	$link = '<a href="' . get_edit_term_link( $term->term_id, $term->taxonomy ) . '">' . $link . '</a>';
 
@@ -1002,11 +1039,12 @@ 
 	 */
 	$link = $before . apply_filters( 'edit_term_link', $link, $term->term_id ) . $after;
 
-	if ( $echo )
-		echo $link;
-	else
-		return $link;
-}
+	if ( $echo ) {
+			echo $link;
+	} else {
+			return $link;
+	}
+	}
 
 /**
  * Retrieves the permalink for a search.
@@ -1021,10 +1059,11 @@ 
 function get_search_link( $query = '' ) {
 	global $wp_rewrite;
 
-	if ( empty($query) )
-		$search = get_search_query( false );
-	else
-		$search = stripslashes($query);
+	if ( empty($query) ) {
+			$search = get_search_query( false );
+	} else {
+			$search = stripslashes($query);
+	}
 
 	$permastruct = $wp_rewrite->get_search_permastruct();
 
@@ -1063,8 +1102,9 @@ 
 	global $wp_rewrite;
 	$link = get_search_link($search_query);
 
-	if ( empty($feed) )
-		$feed = get_default_feed();
+	if ( empty($feed) ) {
+			$feed = get_default_feed();
+	}
 
 	$permastruct = $wp_rewrite->get_search_permastruct();
 
@@ -1101,17 +1141,19 @@ 
 function get_search_comments_feed_link($search_query = '', $feed = '') {
 	global $wp_rewrite;
 
-	if ( empty($feed) )
-		$feed = get_default_feed();
+	if ( empty($feed) ) {
+			$feed = get_default_feed();
+	}
 
 	$link = get_search_feed_link($search_query, $feed);
 
 	$permastruct = $wp_rewrite->get_search_permastruct();
 
-	if ( empty($permastruct) )
-		$link = add_query_arg('feed', 'comments-' . $feed, $link);
-	else
-		$link = add_query_arg('withcomments', 1, $link);
+	if ( empty($permastruct) ) {
+			$link = add_query_arg('feed', 'comments-' . $feed, $link);
+	} else {
+			$link = add_query_arg('withcomments', 1, $link);
+	}
 
 	/** This filter is documented in wp-includes/link-template.php */
 	return apply_filters( 'search_feed_link', $link, $feed, 'comments' );
@@ -1130,8 +1172,9 @@ 
  */
 function get_post_type_archive_link( $post_type ) {
 	global $wp_rewrite;
-	if ( ! $post_type_obj = get_post_type_object( $post_type ) )
-		return false;
+	if ( ! $post_type_obj = get_post_type_object( $post_type ) ) {
+			return false;
+	}
 
 	if ( 'post' === $post_type ) {
 		$show_on_front = get_option( 'show_on_front' );
@@ -1146,15 +1189,17 @@ 
 		return apply_filters( 'post_type_archive_link', $link, $post_type );
 	}
 
-	if ( ! $post_type_obj->has_archive )
-		return false;
+	if ( ! $post_type_obj->has_archive ) {
+			return false;
+	}
 
 	if ( get_option( 'permalink_structure' ) && is_array( $post_type_obj->rewrite ) ) {
 		$struct = ( true === $post_type_obj->has_archive ) ? $post_type_obj->rewrite['slug'] : $post_type_obj->has_archive;
-		if ( $post_type_obj->rewrite['with_front'] )
-			$struct = $wp_rewrite->front . $struct;
-		else
-			$struct = $wp_rewrite->root . $struct;
+		if ( $post_type_obj->rewrite['with_front'] ) {
+					$struct = $wp_rewrite->front . $struct;
+		} else {
+					$struct = $wp_rewrite->root . $struct;
+		}
 		$link = home_url( user_trailingslashit( $struct, 'post_type_archive' ) );
 	} else {
 		$link = home_url( '?post_type=' . $post_type );
@@ -1182,18 +1227,21 @@ 
  */
 function get_post_type_archive_feed_link( $post_type, $feed = '' ) {
 	$default_feed = get_default_feed();
-	if ( empty( $feed ) )
-		$feed = $default_feed;
+	if ( empty( $feed ) ) {
+			$feed = $default_feed;
+	}
 
-	if ( ! $link = get_post_type_archive_link( $post_type ) )
-		return false;
+	if ( ! $link = get_post_type_archive_link( $post_type ) ) {
+			return false;
+	}
 
 	$post_type_obj = get_post_type_object( $post_type );
 	if ( get_option( 'permalink_structure' ) && is_array( $post_type_obj->rewrite ) && $post_type_obj->rewrite['feeds'] ) {
 		$link = trailingslashit( $link );
 		$link .= 'feed/';
-		if ( $feed != $default_feed )
-			$link .= "$feed/";
+		if ( $feed != $default_feed ) {
+					$link .= "$feed/";
+		}
 	} else {
 		$link = add_query_arg( 'feed', $feed, $link );
 	}
@@ -1265,22 +1313,26 @@ 
  *                     not allow an editing UI.
  */
 function get_edit_post_link( $id = 0, $context = 'display' ) {
-	if ( ! $post = get_post( $id ) )
-		return;
+	if ( ! $post = get_post( $id ) ) {
+			return;
+	}
 
-	if ( 'revision' === $post->post_type )
-		$action = '';
-	elseif ( 'display' == $context )
-		$action = '&amp;action=edit';
-	else
-		$action = '&action=edit';
+	if ( 'revision' === $post->post_type ) {
+			$action = '';
+	} elseif ( 'display' == $context ) {
+			$action = '&amp;action=edit';
+	} else {
+			$action = '&action=edit';
+	}
 
 	$post_type_object = get_post_type_object( $post->post_type );
-	if ( !$post_type_object )
-		return;
+	if ( !$post_type_object ) {
+			return;
+	}
 
-	if ( !current_user_can( 'edit_post', $post->ID ) )
-		return;
+	if ( !current_user_can( 'edit_post', $post->ID ) ) {
+			return;
+	}
 
 	if ( $post_type_object->_edit_link ) {
 		$link = admin_url( sprintf( $post_type_object->_edit_link . $action, $post->ID ) );
@@ -1353,18 +1405,22 @@ 
  * @return string|void The delete post link URL for the given post.
  */
 function get_delete_post_link( $id = 0, $deprecated = '', $force_delete = false ) {
-	if ( ! empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '3.0.0' );
+	if ( ! empty( $deprecated ) ) {
+			_deprecated_argument( __FUNCTION__, '3.0.0' );
+	}
 
-	if ( !$post = get_post( $id ) )
-		return;
+	if ( !$post = get_post( $id ) ) {
+			return;
+	}
 
 	$post_type_object = get_post_type_object( $post->post_type );
-	if ( !$post_type_object )
-		return;
+	if ( !$post_type_object ) {
+			return;
+	}
 
-	if ( !current_user_can( 'delete_post', $post->ID ) )
-		return;
+	if ( !current_user_can( 'delete_post', $post->ID ) ) {
+			return;
+	}
 
 	$action = ( $force_delete || !EMPTY_TRASH_DAYS ) ? 'delete' : 'trash';
 
@@ -1393,8 +1449,9 @@ 
 function get_edit_comment_link( $comment_id = 0 ) {
 	$comment = get_comment( $comment_id );
 
-	if ( !current_user_can( 'edit_comment', $comment->comment_ID ) )
-		return;
+	if ( !current_user_can( 'edit_comment', $comment->comment_ID ) ) {
+			return;
+	}
 
 	$location = admin_url('comment.php?action=editcomment&amp;c=') . $comment->comment_ID;
 
@@ -1453,8 +1510,9 @@ 
 function get_edit_bookmark_link( $link = 0 ) {
 	$link = get_bookmark( $link );
 
-	if ( !current_user_can('manage_links') )
-		return;
+	if ( !current_user_can('manage_links') ) {
+			return;
+	}
 
 	$location = admin_url('link.php?action=edit&amp;link_id=') . $link->link_id;
 
@@ -1482,11 +1540,13 @@ 
 function edit_bookmark_link( $link = '', $before = '', $after = '', $bookmark = null ) {
 	$bookmark = get_bookmark($bookmark);
 
-	if ( !current_user_can('manage_links') )
-		return;
+	if ( !current_user_can('manage_links') ) {
+			return;
+	}
 
-	if ( empty($link) )
-		$link = __('Edit This');
+	if ( empty($link) ) {
+			$link = __('Edit This');
+	}
 
 	$link = '<a href="' . esc_url( get_edit_bookmark_link( $bookmark ) ) . '">' . $link . '</a>';
 
@@ -1510,21 +1570,25 @@ 
  * @return string URL to edit user page or empty string.
  */
 function get_edit_user_link( $user_id = null ) {
-	if ( ! $user_id )
-		$user_id = get_current_user_id();
+	if ( ! $user_id ) {
+			$user_id = get_current_user_id();
+	}
 
-	if ( empty( $user_id ) || ! current_user_can( 'edit_user', $user_id ) )
-		return '';
+	if ( empty( $user_id ) || ! current_user_can( 'edit_user', $user_id ) ) {
+			return '';
+	}
 
 	$user = get_userdata( $user_id );
 
-	if ( ! $user )
-		return '';
+	if ( ! $user ) {
+			return '';
+	}
 
-	if ( get_current_user_id() == $user->ID )
-		$link = get_edit_profile_url( $user->ID );
-	else
-		$link = add_query_arg( 'user_id', $user->ID, self_admin_url( 'user-edit.php' ) );
+	if ( get_current_user_id() == $user->ID ) {
+			$link = get_edit_profile_url( $user->ID );
+	} else {
+			$link = add_query_arg( 'user_id', $user->ID, self_admin_url( 'user-edit.php' ) );
+	}
 
 	/**
 	 * Filters the user edit link.
@@ -1588,8 +1652,9 @@ 
 function get_adjacent_post( $in_same_term = false, $excluded_terms = '', $previous = true, $taxonomy = 'category' ) {
 	global $wpdb;
 
-	if ( ( ! $post = get_post() ) || ! taxonomy_exists( $taxonomy ) )
-		return null;
+	if ( ( ! $post = get_post() ) || ! taxonomy_exists( $taxonomy ) ) {
+			return null;
+	}
 
 	$current_post_date = $post->post_date;
 
@@ -1614,16 +1679,18 @@ 
 			$join .= " INNER JOIN $wpdb->term_relationships AS tr ON p.ID = tr.object_id INNER JOIN $wpdb->term_taxonomy tt ON tr.term_taxonomy_id = tt.term_taxonomy_id";
 			$where .= $wpdb->prepare( "AND tt.taxonomy = %s", $taxonomy );
 
-			if ( ! is_object_in_taxonomy( $post->post_type, $taxonomy ) )
-				return '';
+			if ( ! is_object_in_taxonomy( $post->post_type, $taxonomy ) ) {
+							return '';
+			}
 			$term_array = wp_get_object_terms( $post->ID, $taxonomy, array( 'fields' => 'ids' ) );
 
 			// Remove any exclusions from the term array to include.
 			$term_array = array_diff( $term_array, (array) $excluded_terms );
 			$term_array = array_map( 'intval', $term_array );
 
-			if ( ! $term_array || is_wp_error( $term_array ) )
-				return '';
+			if ( ! $term_array || is_wp_error( $term_array ) ) {
+							return '';
+			}
 
 			$where .= " AND tt.term_id IN (" . implode( ',', $term_array ) . ")";
 		}
@@ -1730,19 +1797,22 @@ 
 	$query_key = 'adjacent_post_' . md5( $query );
 	$result = wp_cache_get( $query_key, 'counts' );
 	if ( false !== $result ) {
-		if ( $result )
-			$result = get_post( $result );
+		if ( $result ) {
+					$result = get_post( $result );
+		}
 		return $result;
 	}
 
 	$result = $wpdb->get_var( $query );
-	if ( null === $result )
-		$result = '';
+	if ( null === $result ) {
+			$result = '';
+	}
 
 	wp_cache_set( $query_key, $result, 'counts' );
 
-	if ( $result )
-		$result = get_post( $result );
+	if ( $result ) {
+			$result = get_post( $result );
+	}
 
 	return $result;
 }
@@ -1762,18 +1832,21 @@ 
  * @return string|void The adjacent post relational link URL.
  */
 function get_adjacent_post_rel_link( $title = '%title', $in_same_term = false, $excluded_terms = '', $previous = true, $taxonomy = 'category' ) {
-	if ( $previous && is_attachment() && $post = get_post() )
-		$post = get_post( $post->post_parent );
-	else
-		$post = get_adjacent_post( $in_same_term, $excluded_terms, $previous, $taxonomy );
+	if ( $previous && is_attachment() && $post = get_post() ) {
+			$post = get_post( $post->post_parent );
+	} else {
+			$post = get_adjacent_post( $in_same_term, $excluded_terms, $previous, $taxonomy );
+	}
 
-	if ( empty( $post ) )
-		return;
+	if ( empty( $post ) ) {
+			return;
+	}
 
 	$post_title = the_title_attribute( array( 'echo' => false, 'post' => $post ) );
 
-	if ( empty( $post_title ) )
-		$post_title = $previous ? __( 'Previous Post' ) : __( 'Next Post' );
+	if ( empty( $post_title ) ) {
+			$post_title = $previous ? __( 'Previous Post' ) : __( 'Next Post' );
+	}
 
 	$date = mysql2date( get_option( 'date_format' ), $post->post_date );
 
@@ -1881,8 +1954,9 @@ 
  */
 function get_boundary_post( $in_same_term = false, $excluded_terms = '', $start = true, $taxonomy = 'category' ) {
 	$post = get_post();
-	if ( ! $post || ! is_single() || is_attachment() || ! taxonomy_exists( $taxonomy ) )
-		return null;
+	if ( ! $post || ! is_single() || is_attachment() || ! taxonomy_exists( $taxonomy ) ) {
+			return null;
+	}
 
 	$query_args = array(
 		'posts_per_page' => 1,
@@ -1894,23 +1968,26 @@ 
 	$term_array = array();
 
 	if ( ! is_array( $excluded_terms ) ) {
-		if ( ! empty( $excluded_terms ) )
-			$excluded_terms = explode( ',', $excluded_terms );
-		else
-			$excluded_terms = array();
+		if ( ! empty( $excluded_terms ) ) {
+					$excluded_terms = explode( ',', $excluded_terms );
+		} else {
+					$excluded_terms = array();
+		}
 	}
 
 	if ( $in_same_term || ! empty( $excluded_terms ) ) {
-		if ( $in_same_term )
-			$term_array = wp_get_object_terms( $post->ID, $taxonomy, array( 'fields' => 'ids' ) );
+		if ( $in_same_term ) {
+					$term_array = wp_get_object_terms( $post->ID, $taxonomy, array( 'fields' => 'ids' ) );
+		}
 
 		if ( ! empty( $excluded_terms ) ) {
 			$excluded_terms = array_map( 'intval', $excluded_terms );
 			$excluded_terms = array_diff( $excluded_terms, $term_array );
 
 			$inverse_terms = array();
-			foreach ( $excluded_terms as $excluded_term )
-				$inverse_terms[] = $excluded_term * -1;
+			foreach ( $excluded_terms as $excluded_term ) {
+							$inverse_terms[] = $excluded_term * -1;
+			}
 			$excluded_terms = $inverse_terms;
 		}
 
@@ -2004,18 +2081,20 @@ 
  * @return string The link URL of the previous or next post in relation to the current post.
  */
 function get_adjacent_post_link( $format, $link, $in_same_term = false, $excluded_terms = '', $previous = true, $taxonomy = 'category' ) {
-	if ( $previous && is_attachment() )
-		$post = get_post( get_post()->post_parent );
-	else
-		$post = get_adjacent_post( $in_same_term, $excluded_terms, $previous, $taxonomy );
+	if ( $previous && is_attachment() ) {
+			$post = get_post( get_post()->post_parent );
+	} else {
+			$post = get_adjacent_post( $in_same_term, $excluded_terms, $previous, $taxonomy );
+	}
 
 	if ( ! $post ) {
 		$output = '';
 	} else {
 		$title = $post->post_title;
 
-		if ( empty( $post->post_title ) )
-			$title = $previous ? __( 'Previous Post' ) : __( 'Next Post' );
+		if ( empty( $post->post_title ) ) {
+					$title = $previous ? __( 'Previous Post' ) : __( 'Next Post' );
+		}
 
 		/** This filter is documented in wp-includes/post-template.php */
 		$title = apply_filters( 'the_title', $title, $post->ID );
@@ -2120,8 +2199,9 @@ 
 
 		$base = trailingslashit( get_bloginfo( 'url' ) );
 
-		if ( $wp_rewrite->using_index_permalinks() && ( $pagenum > 1 || '' != $request ) )
-			$base .= $wp_rewrite->index . '/';
+		if ( $wp_rewrite->using_index_permalinks() && ( $pagenum > 1 || '' != $request ) ) {
+					$base .= $wp_rewrite->index . '/';
+		}
 
 		if ( $pagenum > 1 ) {
 			$request = ( ( !empty( $request ) ) ? trailingslashit( $request ) : $request ) . user_trailingslashit( $wp_rewrite->pagination_base . "/" . $pagenum, 'paged' );
@@ -2139,11 +2219,12 @@ 
 	 */
 	$result = apply_filters( 'get_pagenum_link', $result );
 
-	if ( $escape )
-		return esc_url( $result );
-	else
-		return esc_url_raw( $result );
-}
+	if ( $escape ) {
+			return esc_url( $result );
+	} else {
+			return esc_url_raw( $result );
+	}
+	}
 
 /**
  * Retrieves the next posts page link.
@@ -2161,11 +2242,13 @@ 
 	global $paged;
 
 	if ( !is_single() ) {
-		if ( !$paged )
-			$paged = 1;
+		if ( !$paged ) {
+					$paged = 1;
+		}
 		$nextpage = intval($paged) + 1;
-		if ( !$max_page || $max_page >= $nextpage )
-			return get_pagenum_link($nextpage);
+		if ( !$max_page || $max_page >= $nextpage ) {
+					return get_pagenum_link($nextpage);
+		}
 	}
 }
 
@@ -2181,11 +2264,12 @@ 
 function next_posts( $max_page = 0, $echo = true ) {
 	$output = esc_url( get_next_posts_page_link( $max_page ) );
 
-	if ( $echo )
-		echo $output;
-	else
-		return $output;
-}
+	if ( $echo ) {
+			echo $output;
+	} else {
+			return $output;
+	}
+	}
 
 /**
  * Retrieves the next posts page link.
@@ -2202,16 +2286,19 @@ 
 function get_next_posts_link( $label = null, $max_page = 0 ) {
 	global $paged, $wp_query;
 
-	if ( !$max_page )
-		$max_page = $wp_query->max_num_pages;
+	if ( !$max_page ) {
+			$max_page = $wp_query->max_num_pages;
+	}
 
-	if ( !$paged )
-		$paged = 1;
+	if ( !$paged ) {
+			$paged = 1;
+	}
 
 	$nextpage = intval($paged) + 1;
 
-	if ( null === $label )
-		$label = __( 'Next Page &raquo;' );
+	if ( null === $label ) {
+			$label = __( 'Next Page &raquo;' );
+	}
 
 	if ( !is_single() && ( $nextpage <= $max_page ) ) {
 		/**
@@ -2257,8 +2344,9 @@ 
 
 	if ( !is_single() ) {
 		$nextpage = intval($paged) - 1;
-		if ( $nextpage < 1 )
-			$nextpage = 1;
+		if ( $nextpage < 1 ) {
+					$nextpage = 1;
+		}
 		return get_pagenum_link($nextpage);
 	}
 }
@@ -2274,11 +2362,12 @@ 
 function previous_posts( $echo = true ) {
 	$output = esc_url( get_previous_posts_page_link() );
 
-	if ( $echo )
-		echo $output;
-	else
-		return $output;
-}
+	if ( $echo ) {
+			echo $output;
+	} else {
+			return $output;
+	}
+	}
 
 /**
  * Retrieves the previous posts page link.
@@ -2293,8 +2382,9 @@ 
 function get_previous_posts_link( $label = null ) {
 	global $paged;
 
-	if ( null === $label )
-		$label = __( '&laquo; Previous Page' );
+	if ( null === $label ) {
+			$label = __( '&laquo; Previous Page' );
+	}
 
 	if ( !is_single() && $paged > 1 ) {
 		/**
@@ -2626,16 +2716,18 @@ 
 
 	if ( 'newest' == get_option('default_comments_page') ) {
 		if ( $pagenum != $max_page ) {
-			if ( $wp_rewrite->using_permalinks() )
-				$result = user_trailingslashit( trailingslashit($result) . $wp_rewrite->comments_pagination_base . '-' . $pagenum, 'commentpaged');
-			else
-				$result = add_query_arg( 'cpage', $pagenum, $result );
+			if ( $wp_rewrite->using_permalinks() ) {
+							$result = user_trailingslashit( trailingslashit($result) . $wp_rewrite->comments_pagination_base . '-' . $pagenum, 'commentpaged');
+			} else {
+							$result = add_query_arg( 'cpage', $pagenum, $result );
+			}
 		}
 	} elseif ( $pagenum > 1 ) {
-		if ( $wp_rewrite->using_permalinks() )
-			$result = user_trailingslashit( trailingslashit($result) . $wp_rewrite->comments_pagination_base . '-' . $pagenum, 'commentpaged');
-		else
-			$result = add_query_arg( 'cpage', $pagenum, $result );
+		if ( $wp_rewrite->using_permalinks() ) {
+					$result = user_trailingslashit( trailingslashit($result) . $wp_rewrite->comments_pagination_base . '-' . $pagenum, 'commentpaged');
+		} else {
+					$result = add_query_arg( 'cpage', $pagenum, $result );
+		}
 	}
 
 	$result .= '#comments';
@@ -2664,8 +2756,9 @@ 
 function get_next_comments_link( $label = '', $max_page = 0 ) {
 	global $wp_query;
 
-	if ( ! is_singular() )
-		return;
+	if ( ! is_singular() ) {
+			return;
+	}
 
 	$page = get_query_var('cpage');
 
@@ -2675,17 +2768,21 @@ 
 
 	$nextpage = intval($page) + 1;
 
-	if ( empty($max_page) )
-		$max_page = $wp_query->max_num_comment_pages;
+	if ( empty($max_page) ) {
+			$max_page = $wp_query->max_num_comment_pages;
+	}
 
-	if ( empty($max_page) )
-		$max_page = get_comment_pages_count();
+	if ( empty($max_page) ) {
+			$max_page = get_comment_pages_count();
+	}
 
-	if ( $nextpage > $max_page )
-		return;
+	if ( $nextpage > $max_page ) {
+			return;
+	}
 
-	if ( empty($label) )
-		$label = __('Newer Comments &raquo;');
+	if ( empty($label) ) {
+			$label = __('Newer Comments &raquo;');
+	}
 
 	/**
 	 * Filters the anchor tag attributes for the next comments page link.
@@ -2718,18 +2815,21 @@ 
  * @return string|void HTML-formatted link for the previous page of comments.
  */
 function get_previous_comments_link( $label = '' ) {
-	if ( ! is_singular() )
-		return;
+	if ( ! is_singular() ) {
+			return;
+	}
 
 	$page = get_query_var('cpage');
 
-	if ( intval($page) <= 1 )
-		return;
+	if ( intval($page) <= 1 ) {
+			return;
+	}
 
 	$prevpage = intval($page) - 1;
 
-	if ( empty($label) )
-		$label = __('&laquo; Older Comments');
+	if ( empty($label) ) {
+			$label = __('&laquo; Older Comments');
+	}
 
 	/**
 	 * Filters the anchor tag attributes for the previous comments page link.
@@ -2766,12 +2866,14 @@ 
 function paginate_comments_links( $args = array() ) {
 	global $wp_rewrite;
 
-	if ( ! is_singular() )
-		return;
+	if ( ! is_singular() ) {
+			return;
+	}
 
 	$page = get_query_var('cpage');
-	if ( !$page )
-		$page = 1;
+	if ( !$page ) {
+			$page = 1;
+	}
 	$max_page = get_comment_pages_count();
 	$defaults = array(
 		'base' => add_query_arg( 'cpage', '%#%' ),
@@ -2781,17 +2883,19 @@ 
 		'echo' => true,
 		'add_fragment' => '#comments'
 	);
-	if ( $wp_rewrite->using_permalinks() )
-		$defaults['base'] = user_trailingslashit(trailingslashit(get_permalink()) . $wp_rewrite->comments_pagination_base . '-%#%', 'commentpaged');
+	if ( $wp_rewrite->using_permalinks() ) {
+			$defaults['base'] = user_trailingslashit(trailingslashit(get_permalink()) . $wp_rewrite->comments_pagination_base . '-%#%', 'commentpaged');
+	}
 
 	$args = wp_parse_args( $args, $defaults );
 	$page_links = paginate_links( $args );
 
-	if ( $args['echo'] )
-		echo $page_links;
-	else
-		return $page_links;
-}
+	if ( $args['echo'] ) {
+			echo $page_links;
+	} else {
+			return $page_links;
+	}
+	}
 
 /**
  * Retrieves navigation to next/previous set of comments, when applicable.
@@ -3004,16 +3108,18 @@ 
 	}
 
 	if ( ! in_array( $scheme, array( 'http', 'https', 'relative' ) ) ) {
-		if ( is_ssl() && ! is_admin() && 'wp-login.php' !== $pagenow )
-			$scheme = 'https';
-		else
-			$scheme = parse_url( $url, PHP_URL_SCHEME );
+		if ( is_ssl() && ! is_admin() && 'wp-login.php' !== $pagenow ) {
+					$scheme = 'https';
+		} else {
+					$scheme = parse_url( $url, PHP_URL_SCHEME );
+		}
 	}
 
 	$url = set_url_scheme( $url, $scheme );
 
-	if ( $path && is_string( $path ) )
-		$url .= '/' . ltrim( $path, '/' );
+	if ( $path && is_string( $path ) ) {
+			$url .= '/' . ltrim( $path, '/' );
+	}
 
 	/**
 	 * Filters the home URL.
@@ -3075,8 +3181,9 @@ 
 
 	$url = set_url_scheme( $url, $scheme );
 
-	if ( $path && is_string( $path ) )
-		$url .= '/' . ltrim( $path, '/' );
+	if ( $path && is_string( $path ) ) {
+			$url .= '/' . ltrim( $path, '/' );
+	}
 
 	/**
 	 * Filters the site URL.
@@ -3121,8 +3228,9 @@ 
 function get_admin_url( $blog_id = null, $path = '', $scheme = 'admin' ) {
 	$url = get_site_url($blog_id, 'wp-admin/', $scheme);
 
-	if ( $path && is_string( $path ) )
-		$url .= ltrim( $path, '/' );
+	if ( $path && is_string( $path ) ) {
+			$url .= ltrim( $path, '/' );
+	}
 
 	/**
 	 * Filters the admin area URL.
@@ -3149,8 +3257,9 @@ 
 function includes_url( $path = '', $scheme = null ) {
 	$url = site_url( '/' . WPINC . '/', $scheme );
 
-	if ( $path && is_string( $path ) )
-		$url .= ltrim($path, '/');
+	if ( $path && is_string( $path ) ) {
+			$url .= ltrim($path, '/');
+	}
 
 	/**
 	 * Filters the URL to the includes directory.
@@ -3175,8 +3284,9 @@ 
 function content_url( $path = '' ) {
 	$url = set_url_scheme( WP_CONTENT_URL );
 
-	if ( $path && is_string( $path ) )
-		$url .= '/' . ltrim($path, '/');
+	if ( $path && is_string( $path ) ) {
+			$url .= '/' . ltrim($path, '/');
+	}
 
 	/**
 	 * Filters the URL to the content directory.
@@ -3210,22 +3320,25 @@ 
 	$plugin = wp_normalize_path( $plugin );
 	$mu_plugin_dir = wp_normalize_path( WPMU_PLUGIN_DIR );
 
-	if ( !empty($plugin) && 0 === strpos($plugin, $mu_plugin_dir) )
-		$url = WPMU_PLUGIN_URL;
-	else
-		$url = WP_PLUGIN_URL;
+	if ( !empty($plugin) && 0 === strpos($plugin, $mu_plugin_dir) ) {
+			$url = WPMU_PLUGIN_URL;
+	} else {
+			$url = WP_PLUGIN_URL;
+	}
 
 
 	$url = set_url_scheme( $url );
 
 	if ( !empty($plugin) && is_string($plugin) ) {
 		$folder = dirname(plugin_basename($plugin));
-		if ( '.' != $folder )
-			$url .= '/' . ltrim($folder, '/');
+		if ( '.' != $folder ) {
+					$url .= '/' . ltrim($folder, '/');
+		}
 	}
 
-	if ( $path && is_string( $path ) )
-		$url .= '/' . ltrim($path, '/');
+	if ( $path && is_string( $path ) ) {
+			$url .= '/' . ltrim($path, '/');
+	}
 
 	/**
 	 * Filters the URL to the plugins directory.
@@ -3258,18 +3371,21 @@ 
  * @return string Site URL link with optional path appended.
  */
 function network_site_url( $path = '', $scheme = null ) {
-	if ( ! is_multisite() )
-		return site_url($path, $scheme);
+	if ( ! is_multisite() ) {
+			return site_url($path, $scheme);
+	}
 
 	$current_site = get_current_site();
 
-	if ( 'relative' == $scheme )
-		$url = $current_site->path;
-	else
-		$url = set_url_scheme( 'http://' . $current_site->domain . $current_site->path, $scheme );
+	if ( 'relative' == $scheme ) {
+			$url = $current_site->path;
+	} else {
+			$url = set_url_scheme( 'http://' . $current_site->domain . $current_site->path, $scheme );
+	}
 
-	if ( $path && is_string( $path ) )
-		$url .= ltrim( $path, '/' );
+	if ( $path && is_string( $path ) ) {
+			$url .= ltrim( $path, '/' );
+	}
 
 	/**
 	 * Filters the network site URL.
@@ -3300,22 +3416,26 @@ 
  * @return string Home URL link with optional path appended.
  */
 function network_home_url( $path = '', $scheme = null ) {
-	if ( ! is_multisite() )
-		return home_url($path, $scheme);
+	if ( ! is_multisite() ) {
+			return home_url($path, $scheme);
+	}
 
 	$current_site = get_current_site();
 	$orig_scheme = $scheme;
 
-	if ( ! in_array( $scheme, array( 'http', 'https', 'relative' ) ) )
-		$scheme = is_ssl() && ! is_admin() ? 'https' : 'http';
+	if ( ! in_array( $scheme, array( 'http', 'https', 'relative' ) ) ) {
+			$scheme = is_ssl() && ! is_admin() ? 'https' : 'http';
+	}
 
-	if ( 'relative' == $scheme )
-		$url = $current_site->path;
-	else
-		$url = set_url_scheme( 'http://' . $current_site->domain . $current_site->path, $scheme );
+	if ( 'relative' == $scheme ) {
+			$url = $current_site->path;
+	} else {
+			$url = set_url_scheme( 'http://' . $current_site->domain . $current_site->path, $scheme );
+	}
 
-	if ( $path && is_string( $path ) )
-		$url .= ltrim( $path, '/' );
+	if ( $path && is_string( $path ) ) {
+			$url .= ltrim( $path, '/' );
+	}
 
 	/**
 	 * Filters the network home URL.
@@ -3342,13 +3462,15 @@ 
  * @return string Admin URL link with optional path appended.
  */
 function network_admin_url( $path = '', $scheme = 'admin' ) {
-	if ( ! is_multisite() )
-		return admin_url( $path, $scheme );
+	if ( ! is_multisite() ) {
+			return admin_url( $path, $scheme );
+	}
 
 	$url = network_site_url('wp-admin/network/', $scheme);
 
-	if ( $path && is_string( $path ) )
-		$url .= ltrim($path, '/');
+	if ( $path && is_string( $path ) ) {
+			$url .= ltrim($path, '/');
+	}
 
 	/**
 	 * Filters the network admin URL.
@@ -3375,8 +3497,9 @@ 
 function user_admin_url( $path = '', $scheme = 'admin' ) {
 	$url = network_site_url('wp-admin/user/', $scheme);
 
-	if ( $path && is_string( $path ) )
-		$url .= ltrim($path, '/');
+	if ( $path && is_string( $path ) ) {
+			$url .= ltrim($path, '/');
+	}
 
 	/**
 	 * Filters the user admin URL for the current user.
@@ -3401,13 +3524,14 @@ 
  * @return string Admin URL link with optional path appended.
  */
 function self_admin_url( $path = '', $scheme = 'admin' ) {
-	if ( is_network_admin() )
-		return network_admin_url($path, $scheme);
-	elseif ( is_user_admin() )
-		return user_admin_url($path, $scheme);
-	else
-		return admin_url($path, $scheme);
-}
+	if ( is_network_admin() ) {
+			return network_admin_url($path, $scheme);
+	} elseif ( is_user_admin() ) {
+			return user_admin_url($path, $scheme);
+	} else {
+			return admin_url($path, $scheme);
+	}
+	}
 
 /**
  * Sets the scheme for a URL.
@@ -3432,13 +3556,15 @@ 
 	}
 
 	$url = trim( $url );
-	if ( substr( $url, 0, 2 ) === '//' )
-		$url = 'http:' . $url;
+	if ( substr( $url, 0, 2 ) === '//' ) {
+			$url = 'http:' . $url;
+	}
 
 	if ( 'relative' == $scheme ) {
 		$url = ltrim( preg_replace( '#^\w+://[^/]*#', '', $url ) );
-		if ( $url !== '' && $url[0] === '/' )
-			$url = '/' . ltrim($url , "/ \t\n\r\0\x0B" );
+		if ( $url !== '' && $url[0] === '/' ) {
+					$url = '/' . ltrim($url , "/ \t\n\r\0\x0B" );
+		}
 	} else {
 		$url = preg_replace( '#^\w+://#', $scheme . '://', $url );
 	}
@@ -3486,10 +3612,11 @@ 
 			$url = admin_url( $path, $scheme );
 		} else {
 			$active = get_active_blog_for_user( $user_id );
-			if ( $active )
-				$url = get_admin_url( $active->blog_id, $path, $scheme );
-			else
-				$url = user_admin_url( $path, $scheme );
+			if ( $active ) {
+							$url = get_admin_url( $active->blog_id, $path, $scheme );
+			} else {
+							$url = user_admin_url( $path, $scheme );
+			}
 		}
 	}
 
@@ -3520,12 +3647,13 @@ 
 function get_edit_profile_url( $user_id = 0, $scheme = 'admin' ) {
 	$user_id = $user_id ? (int) $user_id : get_current_user_id();
 
-	if ( is_user_admin() )
-		$url = user_admin_url( 'profile.php', $scheme );
-	elseif ( is_network_admin() )
-		$url = network_admin_url( 'profile.php', $scheme );
-	else
-		$url = get_dashboard_url( $user_id, 'profile.php', $scheme );
+	if ( is_user_admin() ) {
+			$url = user_admin_url( 'profile.php', $scheme );
+	} elseif ( is_network_admin() ) {
+			$url = network_admin_url( 'profile.php', $scheme );
+	} else {
+			$url = get_dashboard_url( $user_id, 'profile.php', $scheme );
+	}
 
 	/**
 	 * Filters the URL for a user's profile editor.
@@ -3663,8 +3791,9 @@ 
 		$post = get_post( $post_id );
 	} elseif ( 'post' == $context ) {
 		$post = get_post( $id );
-		if ( ! empty( $post->ID ) )
-			$post_id = $post->ID;
+		if ( ! empty( $post->ID ) ) {
+					$post_id = $post->ID;
+		}
 	}
 
 	$shortlink = '';
@@ -3703,8 +3832,9 @@ 
 function wp_shortlink_wp_head() {
 	$shortlink = wp_get_shortlink( 0, 'query' );
 
-	if ( empty( $shortlink ) )
-		return;
+	if ( empty( $shortlink ) ) {
+			return;
+	}
 
 	echo "<link rel='shortlink' href='" . esc_url( $shortlink ) . "' />\n";
 }
@@ -3717,13 +3847,15 @@ 
  * @since 3.0.0
  */
 function wp_shortlink_header() {
-	if ( headers_sent() )
-		return;
+	if ( headers_sent() ) {
+			return;
+	}
 
 	$shortlink = wp_get_shortlink(0, 'query');
 
-	if ( empty($shortlink) )
-		return;
+	if ( empty($shortlink) ) {
+			return;
+	}
 
 	header('Link: <' . $shortlink . '>; rel=shortlink', false);
 }
@@ -3745,11 +3877,13 @@ 
 function the_shortlink( $text = '', $title = '', $before = '', $after = '' ) {
 	$post = get_post();
 
-	if ( empty( $text ) )
-		$text = __('This is the short link.');
+	if ( empty( $text ) ) {
+			$text = __('This is the short link.');
+	}
 
-	if ( empty( $title ) )
-		$title = the_title_attribute( array( 'echo' => false ) );
+	if ( empty( $title ) ) {
+			$title = the_title_attribute( array( 'echo' => false ) );
+	}
 
 	$shortlink = wp_get_shortlink( $post->ID );