ntwb / wordpress

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

Doc Comments +1 added lines, -1 removed lines

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

Spacing +46 added lines, -46 removed lines

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

Braces +47 added lines, -32 removed lines

@@ -221,8 +221,9 @@ 
 		if ( ! $_post ) {
 			$_post = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->posts WHERE ID = %d LIMIT 1", $post_id ) );
 
-			if ( ! $_post )
-				return false;
+			if ( ! $_post ) {
+							return false;
+			}
 
 			$_post = sanitize_post( $_post, 'raw' );
 			wp_cache_add( $_post->ID, $_post, 'posts' );
@@ -239,8 +240,9 @@ 
 	 * @param WP_Post|object $post Post object.
 	 */
 	public function __construct( $post ) {
-		foreach ( get_object_vars( $post ) as $key => $value )
-			$this->$key = $value;
+		foreach ( get_object_vars( $post ) as $key => $value ) {
+					$this->$key = $value;
+		}
 	}
 
 	/**
@@ -250,17 +252,21 @@ 
 	 * @return bool
 	 */
 	public function __isset( $key ) {
-		if ( 'ancestors' == $key )
-			return true;
+		if ( 'ancestors' == $key ) {
+					return true;
+		}
 
-		if ( 'page_template' == $key )
-			return true;
+		if ( 'page_template' == $key ) {
+					return true;
+		}
 
-		if ( 'post_category' == $key )
-		   return true;
+		if ( 'post_category' == $key ) {
+				   return true;
+		}
 
-		if ( 'tags_input' == $key )
-		   return true;
+		if ( 'tags_input' == $key ) {
+				   return true;
+		}
 
 		return metadata_exists( 'post', $this->ID, $key );
 	}
@@ -277,33 +283,39 @@ 
 		}
 
 		if ( 'post_category' == $key ) {
-			if ( is_object_in_taxonomy( $this->post_type, 'category' ) )
-				$terms = get_the_terms( $this, 'category' );
+			if ( is_object_in_taxonomy( $this->post_type, 'category' ) ) {
+							$terms = get_the_terms( $this, 'category' );
+			}
 
-			if ( empty( $terms ) )
-				return array();
+			if ( empty( $terms ) ) {
+							return array();
+			}
 
 			return wp_list_pluck( $terms, 'term_id' );
 		}
 
 		if ( 'tags_input' == $key ) {
-			if ( is_object_in_taxonomy( $this->post_type, 'post_tag' ) )
-				$terms = get_the_terms( $this, 'post_tag' );
+			if ( is_object_in_taxonomy( $this->post_type, 'post_tag' ) ) {
+							$terms = get_the_terms( $this, 'post_tag' );
+			}
 
-			if ( empty( $terms ) )
-				return array();
+			if ( empty( $terms ) ) {
+							return array();
+			}
 
 			return wp_list_pluck( $terms, 'name' );
 		}
 
 		// Rest of the values need filtering.
-		if ( 'ancestors' == $key )
-			$value = get_post_ancestors( $this );
-		else
-			$value = get_post_meta( $this->ID, $key, true );
+		if ( 'ancestors' == $key ) {
+					$value = get_post_ancestors( $this );
+		} else {
+					$value = get_post_meta( $this->ID, $key, true );
+		}
 
-		if ( $this->filter )
-			$value = sanitize_post_field( $key, $value, $this->ID, $this->filter );
+		if ( $this->filter ) {
+					$value = sanitize_post_field( $key, $value, $this->ID, $this->filter );
+		}
 
 		return $value;
 	}
@@ -315,11 +327,13 @@ 
 	 * @return self|array|bool|object|WP_Post
 	 */
 	public function filter( $filter ) {
-		if ( $this->filter == $filter )
-			return $this;
+		if ( $this->filter == $filter ) {
+					return $this;
+		}
 
-		if ( $filter == 'raw' )
-			return self::get_instance( $this->ID );
+		if ( $filter == 'raw' ) {
+					return self::get_instance( $this->ID );
+		}
 
 		return sanitize_post( $this, $filter );
 	}
@@ -333,8 +347,9 @@ 
 		$post = get_object_vars( $this );
 
 		foreach ( array( 'ancestors', 'page_template', 'post_category', 'tags_input' ) as $key ) {
-			if ( $this->__isset( $key ) )
-				$post[ $key ] = $this->__get( $key );
+			if ( $this->__isset( $key ) ) {
+							$post[ $key ] = $this->__get( $key );
+			}
 		}
 
 		return $post;

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

Doc Comments +1 added lines, -1 removed lines

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

Braces +42 added lines, -32 removed lines

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

Spacing +191 added lines, -191 removed lines

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

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

Doc Comments +1 added lines, -6 removed lines

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

Braces +55 added lines, -38 removed lines

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

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/customize/class-wp-customize-selective-refresh.php

Doc Comments +2 added lines, -2 removed lines

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

Spacing +69 added lines, -69 removed lines

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

src/wp-includes/general-template.php

Doc Comments +3 added lines, -3 removed lines

@@ -1847,7 +1847,7 @@ 
  * @since 1.5.0
  *
  * @param int $num Number of day.
- * @return int Days since the start of the week.
+ * @return double Days since the start of the week.
  */
 function calendar_week_mod($num) {
 	$base = 7;
@@ -3029,7 +3029,7 @@ 
  *     @type string $before_page_number A string to appear before the page number. Default empty.
  *     @type string $after_page_number  A string to append after the page number. Default empty.
  * }
- * @return array|string|void String of page links or array of page links.
+ * @return string String of page links or array of page links.
  */
 function paginate_links( $args = '' ) {
 	global $wp_query, $wp_rewrite;
@@ -3190,7 +3190,7 @@ 
  * @param string $key    The unique key for this theme.
  * @param string $name   The name of the theme.
  * @param string $url    The URL of the CSS file containing the color scheme.
- * @param array  $colors Optional. An array of CSS color definition strings which are used
+ * @param string[]  $colors Optional. An array of CSS color definition strings which are used
  *                       to give the user a feel for the theme.
  * @param array  $icons {
  *     Optional. CSS color definitions used to color any SVG icons.

Indentation +1 added lines, -1 removed lines

@@ -2908,7 +2908,7 @@
 
 			foreach ( $atts as $attr => $value ) {
 				if ( ! is_scalar( $value ) ||
-				     ( ! in_array( $attr, array( 'as', 'crossorigin', 'href', 'pr', 'rel', 'type' ), true ) && ! is_numeric( $attr ))
+					 ( ! in_array( $attr, array( 'as', 'crossorigin', 'href', 'pr', 'rel', 'type' ), true ) && ! is_numeric( $attr ))
 				) {
 					continue;
 				}

Spacing +776 added lines, -776 removed lines

@@ -19,7 +19,7 @@ 
  *
  * @param string $name The name of the specialised header.
  */
-function get_header( $name = null ) {
+function get_header($name = null) {
 	/**
 	 * Fires before the header template file is loaded.
 	 *
@@ -32,17 +32,17 @@ 
 	 *
 	 * @param string|null $name Name of the specific header file to use. null for the default header.
 	 */
-	do_action( 'get_header', $name );
+	do_action('get_header', $name);
 
 	$templates = array();
 	$name = (string) $name;
-	if ( '' !== $name ) {
+	if ('' !== $name) {
 		$templates[] = "header-{$name}.php";
 	}
 
 	$templates[] = 'header.php';
 
-	locate_template( $templates, true );
+	locate_template($templates, true);
 }
 
 /**
@@ -58,7 +58,7 @@ 
  *
  * @param string $name The name of the specialised footer.
  */
-function get_footer( $name = null ) {
+function get_footer($name = null) {
 	/**
 	 * Fires before the footer template file is loaded.
 	 *
@@ -71,17 +71,17 @@ 
 	 *
 	 * @param string|null $name Name of the specific footer file to use. null for the default footer.
 	 */
-	do_action( 'get_footer', $name );
+	do_action('get_footer', $name);
 
 	$templates = array();
 	$name = (string) $name;
-	if ( '' !== $name ) {
+	if ('' !== $name) {
 		$templates[] = "footer-{$name}.php";
 	}
 
-	$templates[]    = 'footer.php';
+	$templates[] = 'footer.php';
 
-	locate_template( $templates, true );
+	locate_template($templates, true);
 }
 
 /**
@@ -97,7 +97,7 @@ 
  *
  * @param string $name The name of the specialised sidebar.
  */
-function get_sidebar( $name = null ) {
+function get_sidebar($name = null) {
 	/**
 	 * Fires before the sidebar template file is loaded.
 	 *
@@ -110,16 +110,16 @@ 
 	 *
 	 * @param string|null $name Name of the specific sidebar file to use. null for the default sidebar.
 	 */
-	do_action( 'get_sidebar', $name );
+	do_action('get_sidebar', $name);
 
 	$templates = array();
 	$name = (string) $name;
-	if ( '' !== $name )
+	if ('' !== $name)
 		$templates[] = "sidebar-{$name}.php";
 
 	$templates[] = 'sidebar.php';
 
-	locate_template( $templates, true );
+	locate_template($templates, true);
 }
 
 /**
@@ -143,7 +143,7 @@ 
  * @param string $slug The slug name for the generic template.
  * @param string $name The name of the specialised template.
  */
-function get_template_part( $slug, $name = null ) {
+function get_template_part($slug, $name = null) {
 	/**
 	 * Fires before the specified template part file is loaded.
 	 *
@@ -155,11 +155,11 @@ 
 	 * @param string      $slug The slug name for the generic template.
 	 * @param string|null $name The name of the specialized template.
 	 */
-	do_action( "get_template_part_{$slug}", $slug, $name );
+	do_action("get_template_part_{$slug}", $slug, $name);
 
 	$templates = array();
 	$name = (string) $name;
-	if ( '' !== $name )
+	if ('' !== $name)
 		$templates[] = "{$slug}-{$name}.php";
 
 	$templates[] = "{$slug}.php";
@@ -189,7 +189,7 @@ 
  * @param bool $echo Default to echo and not return the form.
  * @return string|void String when $echo is false.
  */
-function get_search_form( $echo = true ) {
+function get_search_form($echo = true) {
 	/**
 	 * Fires before the search form is retrieved, at the start of get_search_form().
 	 *
@@ -198,9 +198,9 @@ 
 	 *
 	 * @link https://core.trac.wordpress.org/ticket/19321
 	 */
-	do_action( 'pre_get_search_form' );
+	do_action('pre_get_search_form');
 
-	$format = current_theme_supports( 'html5', 'search-form' ) ? 'html5' : 'xhtml';
+	$format = current_theme_supports('html5', 'search-form') ? 'html5' : 'xhtml';
 
 	/**
 	 * Filters the HTML format of the search form.
@@ -210,28 +210,28 @@ 
 	 * @param string $format The type of markup to use in the search form.
 	 *                       Accepts 'html5', 'xhtml'.
 	 */
-	$format = apply_filters( 'search_form_format', $format );
+	$format = apply_filters('search_form_format', $format);
 
-	$search_form_template = locate_template( 'searchform.php' );
-	if ( '' != $search_form_template ) {
+	$search_form_template = locate_template('searchform.php');
+	if ('' != $search_form_template) {
 		ob_start();
-		require( $search_form_template );
+		require($search_form_template);
 		$form = ob_get_clean();
 	} else {
-		if ( 'html5' == $format ) {
-			$form = '<form role="search" method="get" class="search-form" action="' . esc_url( home_url( '/' ) ) . '">
+		if ('html5' == $format) {
+			$form = '<form role="search" method="get" class="search-form" action="'.esc_url(home_url('/')).'">
 				<label>
-					<span class="screen-reader-text">' . _x( 'Search for:', 'label' ) . '</span>
-					<input type="search" class="search-field" placeholder="' . esc_attr_x( 'Search &hellip;', 'placeholder' ) . '" value="' . get_search_query() . '" name="s" />
+					<span class="screen-reader-text">' . _x('Search for:', 'label').'</span>
+					<input type="search" class="search-field" placeholder="' . esc_attr_x('Search &hellip;', 'placeholder').'" value="'.get_search_query().'" name="s" />
 				</label>
-				<input type="submit" class="search-submit" value="'. esc_attr_x( 'Search', 'submit button' ) .'" />
+				<input type="submit" class="search-submit" value="'. esc_attr_x('Search', 'submit button').'" />
 			</form>';
 		} else {
-			$form = '<form role="search" method="get" id="searchform" class="searchform" action="' . esc_url( home_url( '/' ) ) . '">
+			$form = '<form role="search" method="get" id="searchform" class="searchform" action="'.esc_url(home_url('/')).'">
 				<div>
-					<label class="screen-reader-text" for="s">' . _x( 'Search for:', 'label' ) . '</label>
-					<input type="text" value="' . get_search_query() . '" name="s" id="s" />
-					<input type="submit" id="searchsubmit" value="'. esc_attr_x( 'Search', 'submit button' ) .'" />
+					<label class="screen-reader-text" for="s">' . _x('Search for:', 'label').'</label>
+					<input type="text" value="' . get_search_query().'" name="s" id="s" />
+					<input type="submit" id="searchsubmit" value="'. esc_attr_x('Search', 'submit button').'" />
 				</div>
 			</form>';
 		}
@@ -244,12 +244,12 @@ 
 	 *
 	 * @param string $form The search form HTML output.
 	 */
-	$result = apply_filters( 'get_search_form', $form );
+	$result = apply_filters('get_search_form', $form);
 
-	if ( null === $result )
+	if (null === $result)
 		$result = $form;
 
-	if ( $echo )
+	if ($echo)
 		echo $result;
 	else
 		return $result;
@@ -268,12 +268,12 @@ 
  * @return string|void String when retrieving.
  */
 function wp_loginout($redirect = '', $echo = true) {
-	if ( ! is_user_logged_in() )
-		$link = '<a href="' . esc_url( wp_login_url($redirect) ) . '">' . __('Log in') . '</a>';
+	if ( ! is_user_logged_in())
+		$link = '<a href="'.esc_url(wp_login_url($redirect)).'">'.__('Log in').'</a>';
 	else
-		$link = '<a href="' . esc_url( wp_logout_url($redirect) ) . '">' . __('Log out') . '</a>';
+		$link = '<a href="'.esc_url(wp_logout_url($redirect)).'">'.__('Log out').'</a>';
 
-	if ( $echo ) {
+	if ($echo) {
 		/**
 		 * Filters the HTML output for the Log In/Log Out link.
 		 *
@@ -281,10 +281,10 @@ 
 		 *
 		 * @param string $link The HTML link content.
 		 */
-		echo apply_filters( 'loginout', $link );
+		echo apply_filters('loginout', $link);
 	} else {
 		/** This filter is documented in wp-includes/general-template.php */
-		return apply_filters( 'loginout', $link );
+		return apply_filters('loginout', $link);
 	}
 }
 
@@ -299,13 +299,13 @@ 
  * @return string The logout URL. Note: HTML-encoded via esc_html() in wp_nonce_url().
  */
 function wp_logout_url($redirect = '') {
-	$args = array( 'action' => 'logout' );
-	if ( !empty($redirect) ) {
-		$args['redirect_to'] = urlencode( $redirect );
+	$args = array('action' => 'logout');
+	if ( ! empty($redirect)) {
+		$args['redirect_to'] = urlencode($redirect);
 	}
 
 	$logout_url = add_query_arg($args, site_url('wp-login.php', 'login'));
-	$logout_url = wp_nonce_url( $logout_url, 'log-out' );
+	$logout_url = wp_nonce_url($logout_url, 'log-out');
 
 	/**
 	 * Filters the logout URL.
@@ -315,7 +315,7 @@ 
 	 * @param string $logout_url The HTML-encoded logout URL.
 	 * @param string $redirect   Path to redirect to on logout.
 	 */
-	return apply_filters( 'logout_url', $logout_url, $redirect );
+	return apply_filters('logout_url', $logout_url, $redirect);
 }
 
 /**
@@ -331,10 +331,10 @@ 
 function wp_login_url($redirect = '', $force_reauth = false) {
 	$login_url = site_url('wp-login.php', 'login');
 
-	if ( !empty($redirect) )
+	if ( ! empty($redirect))
 		$login_url = add_query_arg('redirect_to', urlencode($redirect), $login_url);
 
-	if ( $force_reauth )
+	if ($force_reauth)
 		$login_url = add_query_arg('reauth', '1', $login_url);
 
 	/**
@@ -347,7 +347,7 @@ 
 	 * @param string $redirect     The path to redirect to on login, if supplied.
 	 * @param bool   $force_reauth Whether to force reauthorization, even if a cookie is present.
 	 */
-	return apply_filters( 'login_url', $login_url, $redirect, $force_reauth );
+	return apply_filters('login_url', $login_url, $redirect, $force_reauth);
 }
 
 /**
@@ -365,7 +365,7 @@ 
 	 *
 	 * @param string $register The user registration URL.
 	 */
-	return apply_filters( 'register_url', site_url( 'wp-login.php?action=register', 'login' ) );
+	return apply_filters('register_url', site_url('wp-login.php?action=register', 'login'));
 }
 
 /**
@@ -399,16 +399,16 @@ 
  * }
  * @return string|void String when retrieving.
  */
-function wp_login_form( $args = array() ) {
+function wp_login_form($args = array()) {
 	$defaults = array(
 		'echo' => true,
 		// Default 'redirect' value takes the user back to the request URI.
-		'redirect' => ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'],
+		'redirect' => (is_ssl() ? 'https://' : 'http://').$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'],
 		'form_id' => 'loginform',
-		'label_username' => __( 'Username or Email Address' ),
-		'label_password' => __( 'Password' ),
-		'label_remember' => __( 'Remember Me' ),
-		'label_log_in' => __( 'Log In' ),
+		'label_username' => __('Username or Email Address'),
+		'label_password' => __('Password'),
+		'label_remember' => __('Remember Me'),
+		'label_log_in' => __('Log In'),
 		'id_username' => 'user_login',
 		'id_password' => 'user_pass',
 		'id_remember' => 'rememberme',
@@ -428,7 +428,7 @@ 
 	 *
 	 * @param array $defaults An array of default login form arguments.
 	 */
-	$args = wp_parse_args( $args, apply_filters( 'login_form_defaults', $defaults ) );
+	$args = wp_parse_args($args, apply_filters('login_form_defaults', $defaults));
 
 	/**
 	 * Filters content to display at the top of the login form.
@@ -440,7 +440,7 @@ 
 	 * @param string $content Content to display. Default empty.
 	 * @param array  $args    Array of login form arguments.
 	 */
-	$login_form_top = apply_filters( 'login_form_top', '', $args );
+	$login_form_top = apply_filters('login_form_top', '', $args);
 
 	/**
 	 * Filters content to display in the middle of the login form.
@@ -453,7 +453,7 @@ 
 	 * @param string $content Content to display. Default empty.
 	 * @param array  $args    Array of login form arguments.
 	 */
-	$login_form_middle = apply_filters( 'login_form_middle', '', $args );
+	$login_form_middle = apply_filters('login_form_middle', '', $args);
 
 	/**
 	 * Filters content to display at the bottom of the login form.
@@ -465,29 +465,29 @@ 
 	 * @param string $content Content to display. Default empty.
 	 * @param array  $args    Array of login form arguments.
 	 */
-	$login_form_bottom = apply_filters( 'login_form_bottom', '', $args );
+	$login_form_bottom = apply_filters('login_form_bottom', '', $args);
 
 	$form = '
-		<form name="' . $args['form_id'] . '" id="' . $args['form_id'] . '" action="' . esc_url( site_url( 'wp-login.php', 'login_post' ) ) . '" method="post">
-			' . $login_form_top . '
+		<form name="' . $args['form_id'].'" id="'.$args['form_id'].'" action="'.esc_url(site_url('wp-login.php', 'login_post')).'" method="post">
+			' . $login_form_top.'
 			<p class="login-username">
-				<label for="' . esc_attr( $args['id_username'] ) . '">' . esc_html( $args['label_username'] ) . '</label>
-				<input type="text" name="log" id="' . esc_attr( $args['id_username'] ) . '" class="input" value="' . esc_attr( $args['value_username'] ) . '" size="20" />
+				<label for="' . esc_attr($args['id_username']).'">'.esc_html($args['label_username']).'</label>
+				<input type="text" name="log" id="' . esc_attr($args['id_username']).'" class="input" value="'.esc_attr($args['value_username']).'" size="20" />
 			</p>
 			<p class="login-password">
-				<label for="' . esc_attr( $args['id_password'] ) . '">' . esc_html( $args['label_password'] ) . '</label>
-				<input type="password" name="pwd" id="' . esc_attr( $args['id_password'] ) . '" class="input" value="" size="20" />
+				<label for="' . esc_attr($args['id_password']).'">'.esc_html($args['label_password']).'</label>
+				<input type="password" name="pwd" id="' . esc_attr($args['id_password']).'" class="input" value="" size="20" />
 			</p>
-			' . $login_form_middle . '
-			' . ( $args['remember'] ? '<p class="login-remember"><label><input name="rememberme" type="checkbox" id="' . esc_attr( $args['id_remember'] ) . '" value="forever"' . ( $args['value_remember'] ? ' checked="checked"' : '' ) . ' /> ' . esc_html( $args['label_remember'] ) . '</label></p>' : '' ) . '
+			' . $login_form_middle.'
+			' . ($args['remember'] ? '<p class="login-remember"><label><input name="rememberme" type="checkbox" id="'.esc_attr($args['id_remember']).'" value="forever"'.($args['value_remember'] ? ' checked="checked"' : '').' /> '.esc_html($args['label_remember']).'</label></p>' : '').'
 			<p class="login-submit">
-				<input type="submit" name="wp-submit" id="' . esc_attr( $args['id_submit'] ) . '" class="button button-primary" value="' . esc_attr( $args['label_log_in'] ) . '" />
-				<input type="hidden" name="redirect_to" value="' . esc_url( $args['redirect'] ) . '" />
+				<input type="submit" name="wp-submit" id="' . esc_attr($args['id_submit']).'" class="button button-primary" value="'.esc_attr($args['label_log_in']).'" />
+				<input type="hidden" name="redirect_to" value="' . esc_url($args['redirect']).'" />
 			</p>
-			' . $login_form_bottom . '
+			' . $login_form_bottom.'
 		</form>';
 
-	if ( $args['echo'] )
+	if ($args['echo'])
 		echo $form;
 	else
 		return $form;
@@ -501,13 +501,13 @@ 
  * @param string $redirect Path to redirect to on login.
  * @return string Lost password URL.
  */
-function wp_lostpassword_url( $redirect = '' ) {
-	$args = array( 'action' => 'lostpassword' );
-	if ( !empty($redirect) ) {
+function wp_lostpassword_url($redirect = '') {
+	$args = array('action' => 'lostpassword');
+	if ( ! empty($redirect)) {
 		$args['redirect_to'] = $redirect;
 	}
 
-	$lostpassword_url = add_query_arg( $args, network_site_url('wp-login.php', 'login') );
+	$lostpassword_url = add_query_arg($args, network_site_url('wp-login.php', 'login'));
 
 	/**
 	 * Filters the Lost Password URL.
@@ -517,7 +517,7 @@ 
 	 * @param string $lostpassword_url The lost password page URL.
 	 * @param string $redirect         The path to redirect to on login.
 	 */
-	return apply_filters( 'lostpassword_url', $lostpassword_url, $redirect );
+	return apply_filters('lostpassword_url', $lostpassword_url, $redirect);
 }
 
 /**
@@ -533,14 +533,14 @@ 
  * @param bool   $echo   Default to echo and not return the link.
  * @return string|void String when retrieving.
  */
-function wp_register( $before = '<li>', $after = '</li>', $echo = true ) {
-	if ( ! is_user_logged_in() ) {
-		if ( get_option('users_can_register') )
-			$link = $before . '<a href="' . esc_url( wp_registration_url() ) . '">' . __('Register') . '</a>' . $after;
+function wp_register($before = '<li>', $after = '</li>', $echo = true) {
+	if ( ! is_user_logged_in()) {
+		if (get_option('users_can_register'))
+			$link = $before.'<a href="'.esc_url(wp_registration_url()).'">'.__('Register').'</a>'.$after;
 		else
 			$link = '';
-	} elseif ( current_user_can( 'read' ) ) {
-		$link = $before . '<a href="' . admin_url() . '">' . __('Site Admin') . '</a>' . $after;
+	} elseif (current_user_can('read')) {
+		$link = $before.'<a href="'.admin_url().'">'.__('Site Admin').'</a>'.$after;
 	} else {
 		$link = '';
 	}
@@ -555,9 +555,9 @@ 
 	 *
 	 * @param string $link The HTML code for the link to the Registration or Admin page.
 	 */
-	$link = apply_filters( 'register', $link );
+	$link = apply_filters('register', $link);
 
-	if ( $echo ) {
+	if ($echo) {
 		echo $link;
 	} else {
 		return $link;
@@ -580,7 +580,7 @@ 
 	 *
 	 * @since 1.5.0
 	 */
-	do_action( 'wp_meta' );
+	do_action('wp_meta');
 }
 
 /**
@@ -592,8 +592,8 @@ 
  *
  * @param string $show Optional. Site information to display. Default empty.
  */
-function bloginfo( $show = '' ) {
-	echo get_bloginfo( $show, 'display' );
+function bloginfo($show = '') {
+	echo get_bloginfo($show, 'display');
 }
 
 /**
@@ -643,17 +643,17 @@ 
  * @param string $filter Optional. How to filter what is retrieved. Default 'raw'.
  * @return string Mostly string values, might be empty.
  */
-function get_bloginfo( $show = '', $filter = 'raw' ) {
-	switch( $show ) {
+function get_bloginfo($show = '', $filter = 'raw') {
+	switch ($show) {
 		case 'home' : // DEPRECATED
 		case 'siteurl' : // DEPRECATED
-			_deprecated_argument( __FUNCTION__, '2.2.0', sprintf(
+			_deprecated_argument(__FUNCTION__, '2.2.0', sprintf(
 				/* translators: 1: 'siteurl'/'home' argument, 2: bloginfo() function name, 3: 'url' argument */
-				__( 'The %1$s option is deprecated for the family of %2$s functions. Use the %3$s option instead.' ),
-				'<code>' . $show . '</code>',
+				__('The %1$s option is deprecated for the family of %2$s functions. Use the %3$s option instead.'),
+				'<code>'.$show.'</code>',
 				'<code>bloginfo()</code>',
 				'<code>url</code>'
-			) );
+			));
 		case 'url' :
 			$output = home_url();
 			break;
@@ -682,7 +682,7 @@ 
 			$output = get_feed_link('comments_rss2');
 			break;
 		case 'pingback_url':
-			$output = site_url( 'xmlrpc.php' );
+			$output = site_url('xmlrpc.php');
 			break;
 		case 'stylesheet_url':
 			$output = get_stylesheet_uri();
@@ -713,21 +713,21 @@ 
 			 * see https://www.w3.org/International/articles/language-tags/ for reference.
 			 * Do not translate into your own language.
 			 */
-			$output = __( 'html_lang_attribute' );
-			if ( 'html_lang_attribute' === $output || preg_match( '/[^a-zA-Z0-9-]/', $output ) ) {
+			$output = __('html_lang_attribute');
+			if ('html_lang_attribute' === $output || preg_match('/[^a-zA-Z0-9-]/', $output)) {
 				$output = get_locale();
-				$output = str_replace( '_', '-', $output );
+				$output = str_replace('_', '-', $output);
 			}
 			break;
 		case 'text_direction':
-			_deprecated_argument( __FUNCTION__, '2.2.0', sprintf(
+			_deprecated_argument(__FUNCTION__, '2.2.0', sprintf(
 				/* translators: 1: 'text_direction' argument, 2: bloginfo() function name, 3: is_rtl() function name */
-				__( 'The %1$s option is deprecated for the family of %2$s functions. Use the %3$s function instead.' ),
-				'<code>' . $show . '</code>',
+				__('The %1$s option is deprecated for the family of %2$s functions. Use the %3$s function instead.'),
+				'<code>'.$show.'</code>',
 				'<code>bloginfo()</code>',
 				'<code>is_rtl()</code>'
-			) );
-			if ( function_exists( 'is_rtl' ) ) {
+			));
+			if (function_exists('is_rtl')) {
 				$output = is_rtl() ? 'rtl' : 'ltr';
 			} else {
 				$output = 'ltr';
@@ -745,8 +745,8 @@ 
 		strpos($show, 'home') === false)
 		$url = false;
 
-	if ( 'display' == $filter ) {
-		if ( $url ) {
+	if ('display' == $filter) {
+		if ($url) {
 			/**
 			 * Filters the URL returned by get_bloginfo().
 			 *
@@ -755,7 +755,7 @@ 
 			 * @param mixed $output The URL returned by bloginfo().
 			 * @param mixed $show   Type of information requested.
 			 */
-			$output = apply_filters( 'bloginfo_url', $output, $show );
+			$output = apply_filters('bloginfo_url', $output, $show);
 		} else {
 			/**
 			 * Filters the site information returned by get_bloginfo().
@@ -765,7 +765,7 @@ 
 			 * @param mixed $output The requested non-URL site information.
 			 * @param mixed $show   Type of information requested.
 			 */
-			$output = apply_filters( 'bloginfo', $output, $show );
+			$output = apply_filters('bloginfo', $output, $show);
 		}
 	}
 
@@ -782,26 +782,26 @@ 
  * @param int    $blog_id Optional. ID of the blog to get the site icon for. Default current blog.
  * @return string Site Icon URL.
  */
-function get_site_icon_url( $size = 512, $url = '', $blog_id = 0 ) {
+function get_site_icon_url($size = 512, $url = '', $blog_id = 0) {
 	$switched_blog = false;
 
-	if ( is_multisite() && ! empty( $blog_id ) && (int) $blog_id !== get_current_blog_id() ) {
-		switch_to_blog( $blog_id );
+	if (is_multisite() && ! empty($blog_id) && (int) $blog_id !== get_current_blog_id()) {
+		switch_to_blog($blog_id);
 		$switched_blog = true;
 	}
 
-	$site_icon_id = get_option( 'site_icon' );
+	$site_icon_id = get_option('site_icon');
 
-	if ( $site_icon_id ) {
-		if ( $size >= 512 ) {
+	if ($site_icon_id) {
+		if ($size >= 512) {
 			$size_data = 'full';
 		} else {
-			$size_data = array( $size, $size );
+			$size_data = array($size, $size);
 		}
-		$url = wp_get_attachment_image_url( $site_icon_id, $size_data );
+		$url = wp_get_attachment_image_url($site_icon_id, $size_data);
 	}
 
-	if ( $switched_blog ) {
+	if ($switched_blog) {
 		restore_current_blog();
 	}
 
@@ -814,7 +814,7 @@ 
 	 * @param int    $size    Size of the site icon.
 	 * @param int    $blog_id ID of the blog to get the site icon for.
 	 */
-	return apply_filters( 'get_site_icon_url', $url, $size, $blog_id );
+	return apply_filters('get_site_icon_url', $url, $size, $blog_id);
 }
 
 /**
@@ -826,8 +826,8 @@ 
  * @param string $url     Optional. Fallback url if no site icon is found. Default empty.
  * @param int    $blog_id Optional. ID of the blog to get the site icon for. Default current blog.
  */
-function site_icon_url( $size = 512, $url = '', $blog_id = 0 ) {
-	echo esc_url( get_site_icon_url( $size, $url, $blog_id ) );
+function site_icon_url($size = 512, $url = '', $blog_id = 0) {
+	echo esc_url(get_site_icon_url($size, $url, $blog_id));
 }
 
 /**
@@ -838,8 +838,8 @@ 
  * @param int $blog_id Optional. ID of the blog in question. Default current blog.
  * @return bool Whether the site has a site icon or not.
  */
-function has_site_icon( $blog_id = 0 ) {
-	return (bool) get_site_icon_url( 512, '', $blog_id );
+function has_site_icon($blog_id = 0) {
+	return (bool) get_site_icon_url(512, '', $blog_id);
 }
 
 /**
@@ -850,17 +850,17 @@ 
  * @param int $blog_id Optional. ID of the blog in question. Default is the ID of the current blog.
  * @return bool Whether the site has a custom logo or not.
  */
-function has_custom_logo( $blog_id = 0 ) {
+function has_custom_logo($blog_id = 0) {
 	$switched_blog = false;
 
-	if ( is_multisite() && ! empty( $blog_id ) && (int) $blog_id !== get_current_blog_id() ) {
-		switch_to_blog( $blog_id );
+	if (is_multisite() && ! empty($blog_id) && (int) $blog_id !== get_current_blog_id()) {
+		switch_to_blog($blog_id);
 		$switched_blog = true;
 	}
 
-	$custom_logo_id = get_theme_mod( 'custom_logo' );
+	$custom_logo_id = get_theme_mod('custom_logo');
 
-	if ( $switched_blog ) {
+	if ($switched_blog) {
 		restore_current_blog();
 	}
 
@@ -875,36 +875,36 @@ 
  * @param int $blog_id Optional. ID of the blog in question. Default is the ID of the current blog.
  * @return string Custom logo markup.
  */
-function get_custom_logo( $blog_id = 0 ) {
+function get_custom_logo($blog_id = 0) {
 	$html = '';
 	$switched_blog = false;
 
-	if ( is_multisite() && ! empty( $blog_id ) && (int) $blog_id !== get_current_blog_id() ) {
-		switch_to_blog( $blog_id );
+	if (is_multisite() && ! empty($blog_id) && (int) $blog_id !== get_current_blog_id()) {
+		switch_to_blog($blog_id);
 		$switched_blog = true;
 	}
 
-	$custom_logo_id = get_theme_mod( 'custom_logo' );
+	$custom_logo_id = get_theme_mod('custom_logo');
 
 	// We have a logo. Logo is go.
-	if ( $custom_logo_id ) {
-		$html = sprintf( '<a href="%1$s" class="custom-logo-link" rel="home" itemprop="url">%2$s</a>',
-			esc_url( home_url( '/' ) ),
-			wp_get_attachment_image( $custom_logo_id, 'full', false, array(
+	if ($custom_logo_id) {
+		$html = sprintf('<a href="%1$s" class="custom-logo-link" rel="home" itemprop="url">%2$s</a>',
+			esc_url(home_url('/')),
+			wp_get_attachment_image($custom_logo_id, 'full', false, array(
 				'class'    => 'custom-logo',
 				'itemprop' => 'logo',
-			) )
+			))
 		);
 	}
 
 	// If no logo is set but we're in the Customizer, leave a placeholder (needed for the live preview).
-	elseif ( is_customize_preview() ) {
-		$html = sprintf( '<a href="%1$s" class="custom-logo-link" style="display:none;"><img class="custom-logo"/></a>',
-			esc_url( home_url( '/' ) )
+	elseif (is_customize_preview()) {
+		$html = sprintf('<a href="%1$s" class="custom-logo-link" style="display:none;"><img class="custom-logo"/></a>',
+			esc_url(home_url('/'))
 		);
 	}
 
-	if ( $switched_blog ) {
+	if ($switched_blog) {
 		restore_current_blog();
 	}
 
@@ -917,7 +917,7 @@ 
 	 * @param string $html    Custom logo HTML output.
 	 * @param int    $blog_id ID of the blog to get the custom logo for.
 	 */
-	return apply_filters( 'get_custom_logo', $html, $blog_id );
+	return apply_filters('get_custom_logo', $html, $blog_id);
 }
 
 /**
@@ -927,8 +927,8 @@ 
  *
  * @param int $blog_id Optional. ID of the blog in question. Default is the ID of the current blog.
  */
-function the_custom_logo( $blog_id = 0 ) {
-	echo get_custom_logo( $blog_id );
+function the_custom_logo($blog_id = 0) {
+	echo get_custom_logo($blog_id);
 }
 
 /**
@@ -953,8 +953,8 @@ 
 	 *
 	 * @param string $title The document title. Default empty string.
 	 */
-	$title = apply_filters( 'pre_get_document_title', '' );
-	if ( ! empty( $title ) ) {
+	$title = apply_filters('pre_get_document_title', '');
+	if ( ! empty($title)) {
 		return $title;
 	}
 
@@ -965,62 +965,62 @@ 
 	);
 
 	// If it's a 404 page, use a "Page not found" title.
-	if ( is_404() ) {
-		$title['title'] = __( 'Page not found' );
+	if (is_404()) {
+		$title['title'] = __('Page not found');
 
 	// If it's a search, use a dynamic search results title.
-	} elseif ( is_search() ) {
+	} elseif (is_search()) {
 		/* translators: %s: search phrase */
-		$title['title'] = sprintf( __( 'Search Results for &#8220;%s&#8221;' ), get_search_query() );
+		$title['title'] = sprintf(__('Search Results for &#8220;%s&#8221;'), get_search_query());
 
 	// If on the front page, use the site title.
-	} elseif ( is_front_page() ) {
-		$title['title'] = get_bloginfo( 'name', 'display' );
+	} elseif (is_front_page()) {
+		$title['title'] = get_bloginfo('name', 'display');
 
 	// If on a post type archive, use the post type archive title.
-	} elseif ( is_post_type_archive() ) {
-		$title['title'] = post_type_archive_title( '', false );
+	} elseif (is_post_type_archive()) {
+		$title['title'] = post_type_archive_title('', false);
 
 	// If on a taxonomy archive, use the term title.
-	} elseif ( is_tax() ) {
-		$title['title'] = single_term_title( '', false );
+	} elseif (is_tax()) {
+		$title['title'] = single_term_title('', false);
 
 	/*
 	 * If we're on the blog page that is not the homepage or
 	 * a single post of any post type, use the post title.
 	 */
-	} elseif ( is_home() || is_singular() ) {
-		$title['title'] = single_post_title( '', false );
+	} elseif (is_home() || is_singular()) {
+		$title['title'] = single_post_title('', false);
 
 	// If on a category or tag archive, use the term title.
-	} elseif ( is_category() || is_tag() ) {
-		$title['title'] = single_term_title( '', false );
+	} elseif (is_category() || is_tag()) {
+		$title['title'] = single_term_title('', false);
 
 	// If on an author archive, use the author's display name.
-	} elseif ( is_author() && $author = get_queried_object() ) {
+	} elseif (is_author() && $author = get_queried_object()) {
 		$title['title'] = $author->display_name;
 
 	// If it's a date archive, use the date as the title.
-	} elseif ( is_year() ) {
-		$title['title'] = get_the_date( _x( 'Y', 'yearly archives date format' ) );
+	} elseif (is_year()) {
+		$title['title'] = get_the_date(_x('Y', 'yearly archives date format'));
 
-	} elseif ( is_month() ) {
-		$title['title'] = get_the_date( _x( 'F Y', 'monthly archives date format' ) );
+	} elseif (is_month()) {
+		$title['title'] = get_the_date(_x('F Y', 'monthly archives date format'));
 
-	} elseif ( is_day() ) {
+	} elseif (is_day()) {
 		$title['title'] = get_the_date();
 	}
 
 	// Add a page number if necessary.
-	if ( ( $paged >= 2 || $page >= 2 ) && ! is_404() ) {
-		$title['page'] = sprintf( __( 'Page %s' ), max( $paged, $page ) );
+	if (($paged >= 2 || $page >= 2) && ! is_404()) {
+		$title['page'] = sprintf(__('Page %s'), max($paged, $page));
 	}
 
 	// Append the description or site title to give context.
-	if ( is_front_page() ) {
-		$title['tagline'] = get_bloginfo( 'description', 'display' );
+	if (is_front_page()) {
+		$title['tagline'] = get_bloginfo('description', 'display');
 	} else {
-		$title['site'] = get_bloginfo( 'name', 'display' );
+		$title['site'] = get_bloginfo('name', 'display');
 	}
 
 	/**
@@ -1030,7 +1030,7 @@ 
 	 *
 	 * @param string $sep Document title separator. Default '-'.
 	 */
-	$sep = apply_filters( 'document_title_separator', '-' );
+	$sep = apply_filters('document_title_separator', '-');
 
 	/**
 	 * Filters the parts of the document title.
@@ -1046,13 +1046,13 @@ 
 	 *     @type string $site    Optional. Site title when not on home page.
 	 * }
 	 */
-	$title = apply_filters( 'document_title_parts', $title );
+	$title = apply_filters('document_title_parts', $title);
 
-	$title = implode( " $sep ", array_filter( $title ) );
-	$title = wptexturize( $title );
-	$title = convert_chars( $title );
-	$title = esc_html( $title );
-	$title = capital_P_dangit( $title );
+	$title = implode(" $sep ", array_filter($title));
+	$title = wptexturize($title);
+	$title = convert_chars($title);
+	$title = esc_html($title);
+	$title = capital_P_dangit($title);
 
 	return $title;
 }
@@ -1066,11 +1066,11 @@ 
  * @access private
  */
 function _wp_render_title_tag() {
-	if ( ! current_theme_supports( 'title-tag' ) ) {
+	if ( ! current_theme_supports('title-tag')) {
 		return;
 	}
 
-	echo '<title>' . wp_get_document_title() . '</title>' . "\n";
+	echo '<title>'.wp_get_document_title().'</title>'."\n";
 }
 
 /**
@@ -1098,94 +1098,94 @@ 
  * @param string $seplocation Optional. Direction to display title, 'right'.
  * @return string|null String on retrieve, null when displaying.
  */
-function wp_title( $sep = '&raquo;', $display = true, $seplocation = '' ) {
+function wp_title($sep = '&raquo;', $display = true, $seplocation = '') {
 	global $wp_locale;
 
-	$m        = get_query_var( 'm' );
-	$year     = get_query_var( 'year' );
-	$monthnum = get_query_var( 'monthnum' );
-	$day      = get_query_var( 'day' );
-	$search   = get_query_var( 's' );
+	$m        = get_query_var('m');
+	$year     = get_query_var('year');
+	$monthnum = get_query_var('monthnum');
+	$day      = get_query_var('day');
+	$search   = get_query_var('s');
 	$title    = '';
 
 	$t_sep = '%WP_TITLE_SEP%'; // Temporary separator, for accurate flipping, if necessary
 
 	// If there is a post
-	if ( is_single() || ( is_home() && ! is_front_page() ) || ( is_page() && ! is_front_page() ) ) {
-		$title = single_post_title( '', false );
+	if (is_single() || (is_home() && ! is_front_page()) || (is_page() && ! is_front_page())) {
+		$title = single_post_title('', false);
 	}
 
 	// If there's a post type archive
-	if ( is_post_type_archive() ) {
-		$post_type = get_query_var( 'post_type' );
-		if ( is_array( $post_type ) ) {
-			$post_type = reset( $post_type );
+	if (is_post_type_archive()) {
+		$post_type = get_query_var('post_type');
+		if (is_array($post_type)) {
+			$post_type = reset($post_type);
 		}
-		$post_type_object = get_post_type_object( $post_type );
-		if ( ! $post_type_object->has_archive ) {
-			$title = post_type_archive_title( '', false );
+		$post_type_object = get_post_type_object($post_type);
+		if ( ! $post_type_object->has_archive) {
+			$title = post_type_archive_title('', false);
 		}
 	}
 
 	// If there's a category or tag
-	if ( is_category() || is_tag() ) {
-		$title = single_term_title( '', false );
+	if (is_category() || is_tag()) {
+		$title = single_term_title('', false);
 	}
 
 	// If there's a taxonomy
-	if ( is_tax() ) {
+	if (is_tax()) {
 		$term = get_queried_object();
-		if ( $term ) {
-			$tax   = get_taxonomy( $term->taxonomy );
-			$title = single_term_title( $tax->labels->name . $t_sep, false );
+		if ($term) {
+			$tax   = get_taxonomy($term->taxonomy);
+			$title = single_term_title($tax->labels->name.$t_sep, false);
 		}
 	}
 
 	// If there's an author
-	if ( is_author() && ! is_post_type_archive() ) {
+	if (is_author() && ! is_post_type_archive()) {
 		$author = get_queried_object();
-		if ( $author ) {
+		if ($author) {
 			$title = $author->display_name;
 		}
 	}
 
 	// Post type archives with has_archive should override terms.
-	if ( is_post_type_archive() && $post_type_object->has_archive ) {
-		$title = post_type_archive_title( '', false );
+	if (is_post_type_archive() && $post_type_object->has_archive) {
+		$title = post_type_archive_title('', false);
 	}
 
 	// If there's a month
-	if ( is_archive() && ! empty( $m ) ) {
-		$my_year  = substr( $m, 0, 4 );
-		$my_month = $wp_locale->get_month( substr( $m, 4, 2 ) );
-		$my_day   = intval( substr( $m, 6, 2 ) );
-		$title    = $my_year . ( $my_month ? $t_sep . $my_month : '' ) . ( $my_day ? $t_sep . $my_day : '' );
+	if (is_archive() && ! empty($m)) {
+		$my_year  = substr($m, 0, 4);
+		$my_month = $wp_locale->get_month(substr($m, 4, 2));
+		$my_day   = intval(substr($m, 6, 2));
+		$title    = $my_year.($my_month ? $t_sep.$my_month : '').($my_day ? $t_sep.$my_day : '');
 	}
 
 	// If there's a year
-	if ( is_archive() && ! empty( $year ) ) {
+	if (is_archive() && ! empty($year)) {
 		$title = $year;
-		if ( ! empty( $monthnum ) ) {
-			$title .= $t_sep . $wp_locale->get_month( $monthnum );
+		if ( ! empty($monthnum)) {
+			$title .= $t_sep.$wp_locale->get_month($monthnum);
 		}
-		if ( ! empty( $day ) ) {
-			$title .= $t_sep . zeroise( $day, 2 );
+		if ( ! empty($day)) {
+			$title .= $t_sep.zeroise($day, 2);
 		}
 	}
 
 	// If it's a search
-	if ( is_search() ) {
+	if (is_search()) {
 		/* translators: 1: separator, 2: search phrase */
-		$title = sprintf( __( 'Search Results %1$s %2$s' ), $t_sep, strip_tags( $search ) );
+		$title = sprintf(__('Search Results %1$s %2$s'), $t_sep, strip_tags($search));
 	}
 
 	// If it's a 404 page
-	if ( is_404() ) {
-		$title = __( 'Page not found' );
+	if (is_404()) {
+		$title = __('Page not found');
 	}
 
 	$prefix = '';
-	if ( ! empty( $title ) ) {
+	if ( ! empty($title)) {
 		$prefix = " $sep ";
 	}
 
@@ -1196,14 +1196,14 @@ 
 	 *
 	 * @param array $title_array Parts of the page title.
 	 */
-	$title_array = apply_filters( 'wp_title_parts', explode( $t_sep, $title ) );
+	$title_array = apply_filters('wp_title_parts', explode($t_sep, $title));
 
 	// Determines position of the separator and direction of the breadcrumb
-	if ( 'right' == $seplocation ) { // sep on right, so reverse the order
-		$title_array = array_reverse( $title_array );
-		$title       = implode( " $sep ", $title_array ) . $prefix;
+	if ('right' == $seplocation) { // sep on right, so reverse the order
+		$title_array = array_reverse($title_array);
+		$title       = implode(" $sep ", $title_array).$prefix;
 	} else {
-		$title = $prefix . implode( " $sep ", $title_array );
+		$title = $prefix.implode(" $sep ", $title_array);
 	}
 
 	/**
@@ -1215,10 +1215,10 @@ 
 	 * @param string $sep Title separator.
 	 * @param string $seplocation Location of the separator (left or right).
 	 */
-	$title = apply_filters( 'wp_title', $title, $sep, $seplocation );
+	$title = apply_filters('wp_title', $title, $sep, $seplocation);
 
 	// Send it out
-	if ( $display ) {
+	if ($display) {
 		echo $title;
 	} else {
 		return $title;
@@ -1241,10 +1241,10 @@ 
  * @param bool   $display Optional, default is true. Whether to display or retrieve title.
  * @return string|void Title when retrieving.
  */
-function single_post_title( $prefix = '', $display = true ) {
+function single_post_title($prefix = '', $display = true) {
 	$_post = get_queried_object();
 
-	if ( !isset($_post->post_title) )
+	if ( ! isset($_post->post_title))
 		return;
 
 	/**
@@ -1255,11 +1255,11 @@ 
 	 * @param string $_post_title The single post page title.
 	 * @param object $_post       The current queried object as returned by get_queried_object().
 	 */
-	$title = apply_filters( 'single_post_title', $_post->post_title, $_post );
-	if ( $display )
-		echo $prefix . $title;
+	$title = apply_filters('single_post_title', $_post->post_title, $_post);
+	if ($display)
+		echo $prefix.$title;
 	else
-		return $prefix . $title;
+		return $prefix.$title;
 }
 
 /**
@@ -1274,15 +1274,15 @@ 
  * @param bool   $display Optional, default is true. Whether to display or retrieve title.
  * @return string|void Title when retrieving, null when displaying or failure.
  */
-function post_type_archive_title( $prefix = '', $display = true ) {
-	if ( ! is_post_type_archive() )
+function post_type_archive_title($prefix = '', $display = true) {
+	if ( ! is_post_type_archive())
 		return;
 
-	$post_type = get_query_var( 'post_type' );
-	if ( is_array( $post_type ) )
-		$post_type = reset( $post_type );
+	$post_type = get_query_var('post_type');
+	if (is_array($post_type))
+		$post_type = reset($post_type);
 
-	$post_type_obj = get_post_type_object( $post_type );
+	$post_type_obj = get_post_type_object($post_type);
 
 	/**
 	 * Filters the post type archive title.
@@ -1292,12 +1292,12 @@ 
 	 * @param string $post_type_name Post type 'name' label.
 	 * @param string $post_type      Post type.
 	 */
-	$title = apply_filters( 'post_type_archive_title', $post_type_obj->labels->name, $post_type );
+	$title = apply_filters('post_type_archive_title', $post_type_obj->labels->name, $post_type);
 
-	if ( $display )
-		echo $prefix . $title;
+	if ($display)
+		echo $prefix.$title;
 	else
-		return $prefix . $title;
+		return $prefix.$title;
 }
 
 /**
@@ -1313,8 +1313,8 @@ 
  * @param bool   $display Optional, default is true. Whether to display or retrieve title.
  * @return string|void Title when retrieving.
  */
-function single_cat_title( $prefix = '', $display = true ) {
-	return single_term_title( $prefix, $display );
+function single_cat_title($prefix = '', $display = true) {
+	return single_term_title($prefix, $display);
 }
 
 /**
@@ -1330,8 +1330,8 @@ 
  * @param bool   $display Optional, default is true. Whether to display or retrieve title.
  * @return string|void Title when retrieving.
  */
-function single_tag_title( $prefix = '', $display = true ) {
-	return single_term_title( $prefix, $display );
+function single_tag_title($prefix = '', $display = true) {
+	return single_term_title($prefix, $display);
 }
 
 /**
@@ -1347,13 +1347,13 @@ 
  * @param bool   $display Optional, default is true. Whether to display or retrieve title.
  * @return string|void Title when retrieving.
  */
-function single_term_title( $prefix = '', $display = true ) {
+function single_term_title($prefix = '', $display = true) {
 	$term = get_queried_object();
 
-	if ( !$term )
+	if ( ! $term)
 		return;
 
-	if ( is_category() ) {
+	if (is_category()) {
 		/**
 		 * Filters the category archive page title.
 		 *
@@ -1361,8 +1361,8 @@ 
 		 *
 		 * @param string $term_name Category name for archive being displayed.
 		 */
-		$term_name = apply_filters( 'single_cat_title', $term->name );
-	} elseif ( is_tag() ) {
+		$term_name = apply_filters('single_cat_title', $term->name);
+	} elseif (is_tag()) {
 		/**
 		 * Filters the tag archive page title.
 		 *
@@ -1370,8 +1370,8 @@ 
 		 *
 		 * @param string $term_name Tag name for archive being displayed.
 		 */
-		$term_name = apply_filters( 'single_tag_title', $term->name );
-	} elseif ( is_tax() ) {
+		$term_name = apply_filters('single_tag_title', $term->name);
+	} elseif (is_tax()) {
 		/**
 		 * Filters the custom taxonomy archive page title.
 		 *
@@ -1379,18 +1379,18 @@ 
 		 *
 		 * @param string $term_name Term name for archive being displayed.
 		 */
-		$term_name = apply_filters( 'single_term_title', $term->name );
+		$term_name = apply_filters('single_term_title', $term->name);
 	} else {
 		return;
 	}
 
-	if ( empty( $term_name ) )
+	if (empty($term_name))
 		return;
 
-	if ( $display )
-		echo $prefix . $term_name;
+	if ($display)
+		echo $prefix.$term_name;
 	else
-		return $prefix . $term_name;
+		return $prefix.$term_name;
 }
 
 /**
@@ -1409,27 +1409,27 @@ 
  * @param bool   $display Optional, default is true. Whether to display or retrieve title.
  * @return string|void Title when retrieving.
  */
-function single_month_title($prefix = '', $display = true ) {
+function single_month_title($prefix = '', $display = true) {
 	global $wp_locale;
 
 	$m = get_query_var('m');
 	$year = get_query_var('year');
 	$monthnum = get_query_var('monthnum');
 
-	if ( !empty($monthnum) && !empty($year) ) {
+	if ( ! empty($monthnum) && ! empty($year)) {
 		$my_year = $year;
 		$my_month = $wp_locale->get_month($monthnum);
-	} elseif ( !empty($m) ) {
+	} elseif ( ! empty($m)) {
 		$my_year = substr($m, 0, 4);
 		$my_month = $wp_locale->get_month(substr($m, 4, 2));
 	}
 
-	if ( empty($my_month) )
+	if (empty($my_month))
 		return false;
 
-	$result = $prefix . $my_month . $prefix . $my_year;
+	$result = $prefix.$my_month.$prefix.$my_year;
 
-	if ( !$display )
+	if ( ! $display)
 		return $result;
 	echo $result;
 }
@@ -1444,11 +1444,11 @@ 
  * @param string $before Optional. Content to prepend to the title. Default empty.
  * @param string $after  Optional. Content to append to the title. Default empty.
  */
-function the_archive_title( $before = '', $after = '' ) {
+function the_archive_title($before = '', $after = '') {
 	$title = get_the_archive_title();
 
-	if ( ! empty( $title ) ) {
-		echo $before . $title . $after;
+	if ( ! empty($title)) {
+		echo $before.$title.$after;
 	}
 }
 
@@ -1460,53 +1460,53 @@ 
  * @return string Archive title.
  */
 function get_the_archive_title() {
-	if ( is_category() ) {
+	if (is_category()) {
 		/* translators: Category archive title. 1: Category name */
-		$title = sprintf( __( 'Category: %s' ), single_cat_title( '', false ) );
-	} elseif ( is_tag() ) {
+		$title = sprintf(__('Category: %s'), single_cat_title('', false));
+	} elseif (is_tag()) {
 		/* translators: Tag archive title. 1: Tag name */
-		$title = sprintf( __( 'Tag: %s' ), single_tag_title( '', false ) );
-	} elseif ( is_author() ) {
+		$title = sprintf(__('Tag: %s'), single_tag_title('', false));
+	} elseif (is_author()) {
 		/* translators: Author archive title. 1: Author name */
-		$title = sprintf( __( 'Author: %s' ), '<span class="vcard">' . get_the_author() . '</span>' );
-	} elseif ( is_year() ) {
+		$title = sprintf(__('Author: %s'), '<span class="vcard">'.get_the_author().'</span>');
+	} elseif (is_year()) {
 		/* translators: Yearly archive title. 1: Year */
-		$title = sprintf( __( 'Year: %s' ), get_the_date( _x( 'Y', 'yearly archives date format' ) ) );
-	} elseif ( is_month() ) {
+		$title = sprintf(__('Year: %s'), get_the_date(_x('Y', 'yearly archives date format')));
+	} elseif (is_month()) {
 		/* translators: Monthly archive title. 1: Month name and year */
-		$title = sprintf( __( 'Month: %s' ), get_the_date( _x( 'F Y', 'monthly archives date format' ) ) );
-	} elseif ( is_day() ) {
+		$title = sprintf(__('Month: %s'), get_the_date(_x('F Y', 'monthly archives date format')));
+	} elseif (is_day()) {
 		/* translators: Daily archive title. 1: Date */
-		$title = sprintf( __( 'Day: %s' ), get_the_date( _x( 'F j, Y', 'daily archives date format' ) ) );
-	} elseif ( is_tax( 'post_format' ) ) {
-		if ( is_tax( 'post_format', 'post-format-aside' ) ) {
-			$title = _x( 'Asides', 'post format archive title' );
-		} elseif ( is_tax( 'post_format', 'post-format-gallery' ) ) {
-			$title = _x( 'Galleries', 'post format archive title' );
-		} elseif ( is_tax( 'post_format', 'post-format-image' ) ) {
-			$title = _x( 'Images', 'post format archive title' );
-		} elseif ( is_tax( 'post_format', 'post-format-video' ) ) {
-			$title = _x( 'Videos', 'post format archive title' );
-		} elseif ( is_tax( 'post_format', 'post-format-quote' ) ) {
-			$title = _x( 'Quotes', 'post format archive title' );
-		} elseif ( is_tax( 'post_format', 'post-format-link' ) ) {
-			$title = _x( 'Links', 'post format archive title' );
-		} elseif ( is_tax( 'post_format', 'post-format-status' ) ) {
-			$title = _x( 'Statuses', 'post format archive title' );
-		} elseif ( is_tax( 'post_format', 'post-format-audio' ) ) {
-			$title = _x( 'Audio', 'post format archive title' );
-		} elseif ( is_tax( 'post_format', 'post-format-chat' ) ) {
-			$title = _x( 'Chats', 'post format archive title' );
+		$title = sprintf(__('Day: %s'), get_the_date(_x('F j, Y', 'daily archives date format')));
+	} elseif (is_tax('post_format')) {
+		if (is_tax('post_format', 'post-format-aside')) {
+			$title = _x('Asides', 'post format archive title');
+		} elseif (is_tax('post_format', 'post-format-gallery')) {
+			$title = _x('Galleries', 'post format archive title');
+		} elseif (is_tax('post_format', 'post-format-image')) {
+			$title = _x('Images', 'post format archive title');
+		} elseif (is_tax('post_format', 'post-format-video')) {
+			$title = _x('Videos', 'post format archive title');
+		} elseif (is_tax('post_format', 'post-format-quote')) {
+			$title = _x('Quotes', 'post format archive title');
+		} elseif (is_tax('post_format', 'post-format-link')) {
+			$title = _x('Links', 'post format archive title');
+		} elseif (is_tax('post_format', 'post-format-status')) {
+			$title = _x('Statuses', 'post format archive title');
+		} elseif (is_tax('post_format', 'post-format-audio')) {
+			$title = _x('Audio', 'post format archive title');
+		} elseif (is_tax('post_format', 'post-format-chat')) {
+			$title = _x('Chats', 'post format archive title');
 		}
-	} elseif ( is_post_type_archive() ) {
+	} elseif (is_post_type_archive()) {
 		/* translators: Post type archive title. 1: Post type name */
-		$title = sprintf( __( 'Archives: %s' ), post_type_archive_title( '', false ) );
-	} elseif ( is_tax() ) {
-		$tax = get_taxonomy( get_queried_object()->taxonomy );
+		$title = sprintf(__('Archives: %s'), post_type_archive_title('', false));
+	} elseif (is_tax()) {
+		$tax = get_taxonomy(get_queried_object()->taxonomy);
 		/* translators: Taxonomy term archive title. 1: Taxonomy singular name, 2: Current taxonomy term */
-		$title = sprintf( __( '%1$s: %2$s' ), $tax->labels->singular_name, single_term_title( '', false ) );
+		$title = sprintf(__('%1$s: %2$s'), $tax->labels->singular_name, single_term_title('', false));
 	} else {
-		$title = __( 'Archives' );
+		$title = __('Archives');
 	}
 
 	/**
@@ -1516,7 +1516,7 @@ 
 	 *
 	 * @param string $title Archive title to be displayed.
 	 */
-	return apply_filters( 'get_the_archive_title', $title );
+	return apply_filters('get_the_archive_title', $title);
 }
 
 /**
@@ -1529,10 +1529,10 @@ 
  * @param string $before Optional. Content to prepend to the description. Default empty.
  * @param string $after  Optional. Content to append to the description. Default empty.
  */
-function the_archive_description( $before = '', $after = '' ) {
+function the_archive_description($before = '', $after = '') {
 	$description = get_the_archive_description();
-	if ( $description ) {
-		echo $before . $description . $after;
+	if ($description) {
+		echo $before.$description.$after;
 	}
 }
 
@@ -1547,8 +1547,8 @@ 
  * @return string Archive description.
  */
 function get_the_archive_description() {
-	if ( is_author() ) {
-		$description = get_the_author_meta( 'description' );
+	if (is_author()) {
+		$description = get_the_author_meta('description');
 	} else {
 		$description = term_description();
 	}
@@ -1560,7 +1560,7 @@ 
 	 *
 	 * @param string $description Archive description to be displayed.
 	 */
-	return apply_filters( 'get_the_archive_description', $description );
+	return apply_filters('get_the_archive_description', $description);
 }
 
 /**
@@ -1601,7 +1601,7 @@ 
 	$url = esc_url($url);
 
 	if ('link' == $format)
-		$link_html = "\t<link rel='archives' title='" . esc_attr( $text ) . "' href='$url' />\n";
+		$link_html = "\t<link rel='archives' title='".esc_attr($text)."' href='$url' />\n";
 	elseif ('option' == $format)
 		$link_html = "\t<option value='$url'>$before $text $after</option>\n";
 	elseif ('html' == $format)
@@ -1622,7 +1622,7 @@ 
 	 * @param string $before    Content to prepend to the description.
 	 * @param string $after     Content to append to the description.
 	 */
-	return apply_filters( 'get_archives_link', $link_html, $url, $text, $format, $before, $after );
+	return apply_filters('get_archives_link', $link_html, $url, $text, $format, $before, $after);
 }
 
 /**
@@ -1660,7 +1660,7 @@ 
  * }
  * @return string|void String when retrieving.
  */
-function wp_get_archives( $args = '' ) {
+function wp_get_archives($args = '') {
 	global $wpdb, $wp_locale;
 
 	$defaults = array(
@@ -1671,32 +1671,32 @@ 
 		'post_type' => 'post'
 	);
 
-	$r = wp_parse_args( $args, $defaults );
+	$r = wp_parse_args($args, $defaults);
 
-	$post_type_object = get_post_type_object( $r['post_type'] );
-	if ( ! is_post_type_viewable( $post_type_object ) ) {
+	$post_type_object = get_post_type_object($r['post_type']);
+	if ( ! is_post_type_viewable($post_type_object)) {
 		return;
 	}
 	$r['post_type'] = $post_type_object->name;
 
-	if ( '' == $r['type'] ) {
+	if ('' == $r['type']) {
 		$r['type'] = 'monthly';
 	}
 
-	if ( ! empty( $r['limit'] ) ) {
-		$r['limit'] = absint( $r['limit'] );
-		$r['limit'] = ' LIMIT ' . $r['limit'];
+	if ( ! empty($r['limit'])) {
+		$r['limit'] = absint($r['limit']);
+		$r['limit'] = ' LIMIT '.$r['limit'];
 	}
 
-	$order = strtoupper( $r['order'] );
-	if ( $order !== 'ASC' ) {
+	$order = strtoupper($r['order']);
+	if ($order !== 'ASC') {
 		$order = 'DESC';
 	}
 
 	// this is what will separate dates on weekly archive links
 	$archive_week_separator = '&#8211;';
 
-	$sql_where = $wpdb->prepare( "WHERE post_type = %s AND post_status = 'publish'", $r['post_type'] );
+	$sql_where = $wpdb->prepare("WHERE post_type = %s AND post_status = 'publish'", $r['post_type']);
 
 	/**
 	 * Filters the SQL WHERE clause for retrieving archives.
@@ -1706,7 +1706,7 @@ 
 	 * @param string $sql_where Portion of SQL query containing the WHERE clause.
 	 * @param array  $r         An array of default arguments.
 	 */
-	$where = apply_filters( 'getarchives_where', $sql_where, $r );
+	$where = apply_filters('getarchives_where', $sql_where, $r);
 
 	/**
 	 * Filters the SQL JOIN clause for retrieving archives.
@@ -1716,138 +1716,138 @@ 
 	 * @param string $sql_join Portion of SQL query containing JOIN clause.
 	 * @param array  $r        An array of default arguments.
 	 */
-	$join = apply_filters( 'getarchives_join', '', $r );
+	$join = apply_filters('getarchives_join', '', $r);
 
 	$output = '';
 
-	$last_changed = wp_cache_get_last_changed( 'posts' );
+	$last_changed = wp_cache_get_last_changed('posts');
 
 	$limit = $r['limit'];
 
-	if ( 'monthly' == $r['type'] ) {
+	if ('monthly' == $r['type']) {
 		$query = "SELECT YEAR(post_date) AS `year`, MONTH(post_date) AS `month`, count(ID) as posts FROM $wpdb->posts $join $where GROUP BY YEAR(post_date), MONTH(post_date) ORDER BY post_date $order $limit";
-		$key = md5( $query );
+		$key = md5($query);
 		$key = "wp_get_archives:$key:$last_changed";
-		if ( ! $results = wp_cache_get( $key, 'posts' ) ) {
-			$results = $wpdb->get_results( $query );
-			wp_cache_set( $key, $results, 'posts' );
+		if ( ! $results = wp_cache_get($key, 'posts')) {
+			$results = $wpdb->get_results($query);
+			wp_cache_set($key, $results, 'posts');
 		}
-		if ( $results ) {
+		if ($results) {
 			$after = $r['after'];
-			foreach ( (array) $results as $result ) {
-				$url = get_month_link( $result->year, $result->month );
-				if ( 'post' !== $r['post_type'] ) {
-					$url = add_query_arg( 'post_type', $r['post_type'], $url );
+			foreach ((array) $results as $result) {
+				$url = get_month_link($result->year, $result->month);
+				if ('post' !== $r['post_type']) {
+					$url = add_query_arg('post_type', $r['post_type'], $url);
 				}
 				/* translators: 1: month name, 2: 4-digit year */
-				$text = sprintf( __( '%1$s %2$d' ), $wp_locale->get_month( $result->month ), $result->year );
-				if ( $r['show_post_count'] ) {
-					$r['after'] = '&nbsp;(' . $result->posts . ')' . $after;
+				$text = sprintf(__('%1$s %2$d'), $wp_locale->get_month($result->month), $result->year);
+				if ($r['show_post_count']) {
+					$r['after'] = '&nbsp;('.$result->posts.')'.$after;
 				}
-				$output .= get_archives_link( $url, $text, $r['format'], $r['before'], $r['after'] );
+				$output .= get_archives_link($url, $text, $r['format'], $r['before'], $r['after']);
 			}
 		}
-	} elseif ( 'yearly' == $r['type'] ) {
+	} elseif ('yearly' == $r['type']) {
 		$query = "SELECT YEAR(post_date) AS `year`, count(ID) as posts FROM $wpdb->posts $join $where GROUP BY YEAR(post_date) ORDER BY post_date $order $limit";
-		$key = md5( $query );
+		$key = md5($query);
 		$key = "wp_get_archives:$key:$last_changed";
-		if ( ! $results = wp_cache_get( $key, 'posts' ) ) {
-			$results = $wpdb->get_results( $query );
-			wp_cache_set( $key, $results, 'posts' );
+		if ( ! $results = wp_cache_get($key, 'posts')) {
+			$results = $wpdb->get_results($query);
+			wp_cache_set($key, $results, 'posts');
 		}
-		if ( $results ) {
+		if ($results) {
 			$after = $r['after'];
-			foreach ( (array) $results as $result) {
-				$url = get_year_link( $result->year );
-				if ( 'post' !== $r['post_type'] ) {
-					$url = add_query_arg( 'post_type', $r['post_type'], $url );
+			foreach ((array) $results as $result) {
+				$url = get_year_link($result->year);
+				if ('post' !== $r['post_type']) {
+					$url = add_query_arg('post_type', $r['post_type'], $url);
 				}
-				$text = sprintf( '%d', $result->year );
-				if ( $r['show_post_count'] ) {
-					$r['after'] = '&nbsp;(' . $result->posts . ')' . $after;
+				$text = sprintf('%d', $result->year);
+				if ($r['show_post_count']) {
+					$r['after'] = '&nbsp;('.$result->posts.')'.$after;
 				}
-				$output .= get_archives_link( $url, $text, $r['format'], $r['before'], $r['after'] );
+				$output .= get_archives_link($url, $text, $r['format'], $r['before'], $r['after']);
 			}
 		}
-	} elseif ( 'daily' == $r['type'] ) {
+	} elseif ('daily' == $r['type']) {
 		$query = "SELECT YEAR(post_date) AS `year`, MONTH(post_date) AS `month`, DAYOFMONTH(post_date) AS `dayofmonth`, count(ID) as posts FROM $wpdb->posts $join $where GROUP BY YEAR(post_date), MONTH(post_date), DAYOFMONTH(post_date) ORDER BY post_date $order $limit";
-		$key = md5( $query );
+		$key = md5($query);
 		$key = "wp_get_archives:$key:$last_changed";
-		if ( ! $results = wp_cache_get( $key, 'posts' ) ) {
-			$results = $wpdb->get_results( $query );
-			wp_cache_set( $key, $results, 'posts' );
+		if ( ! $results = wp_cache_get($key, 'posts')) {
+			$results = $wpdb->get_results($query);
+			wp_cache_set($key, $results, 'posts');
 		}
-		if ( $results ) {
+		if ($results) {
 			$after = $r['after'];
-			foreach ( (array) $results as $result ) {
-				$url  = get_day_link( $result->year, $result->month, $result->dayofmonth );
-				if ( 'post' !== $r['post_type'] ) {
-					$url = add_query_arg( 'post_type', $r['post_type'], $url );
+			foreach ((array) $results as $result) {
+				$url  = get_day_link($result->year, $result->month, $result->dayofmonth);
+				if ('post' !== $r['post_type']) {
+					$url = add_query_arg('post_type', $r['post_type'], $url);
 				}
-				$date = sprintf( '%1$d-%2$02d-%3$02d 00:00:00', $result->year, $result->month, $result->dayofmonth );
-				$text = mysql2date( get_option( 'date_format' ), $date );
-				if ( $r['show_post_count'] ) {
-					$r['after'] = '&nbsp;(' . $result->posts . ')' . $after;
+				$date = sprintf('%1$d-%2$02d-%3$02d 00:00:00', $result->year, $result->month, $result->dayofmonth);
+				$text = mysql2date(get_option('date_format'), $date);
+				if ($r['show_post_count']) {
+					$r['after'] = '&nbsp;('.$result->posts.')'.$after;
 				}
-				$output .= get_archives_link( $url, $text, $r['format'], $r['before'], $r['after'] );
+				$output .= get_archives_link($url, $text, $r['format'], $r['before'], $r['after']);
 			}
 		}
-	} elseif ( 'weekly' == $r['type'] ) {
-		$week = _wp_mysql_week( '`post_date`' );
+	} elseif ('weekly' == $r['type']) {
+		$week = _wp_mysql_week('`post_date`');
 		$query = "SELECT DISTINCT $week AS `week`, YEAR( `post_date` ) AS `yr`, DATE_FORMAT( `post_date`, '%Y-%m-%d' ) AS `yyyymmdd`, count( `ID` ) AS `posts` FROM `$wpdb->posts` $join $where GROUP BY $week, YEAR( `post_date` ) ORDER BY `post_date` $order $limit";
-		$key = md5( $query );
+		$key = md5($query);
 		$key = "wp_get_archives:$key:$last_changed";
-		if ( ! $results = wp_cache_get( $key, 'posts' ) ) {
-			$results = $wpdb->get_results( $query );
-			wp_cache_set( $key, $results, 'posts' );
+		if ( ! $results = wp_cache_get($key, 'posts')) {
+			$results = $wpdb->get_results($query);
+			wp_cache_set($key, $results, 'posts');
 		}
 		$arc_w_last = '';
-		if ( $results ) {
+		if ($results) {
 			$after = $r['after'];
-			foreach ( (array) $results as $result ) {
-				if ( $result->week != $arc_w_last ) {
+			foreach ((array) $results as $result) {
+				if ($result->week != $arc_w_last) {
 					$arc_year       = $result->yr;
 					$arc_w_last     = $result->week;
-					$arc_week       = get_weekstartend( $result->yyyymmdd, get_option( 'start_of_week' ) );
-					$arc_week_start = date_i18n( get_option( 'date_format' ), $arc_week['start'] );
-					$arc_week_end   = date_i18n( get_option( 'date_format' ), $arc_week['end'] );
-					$url            = add_query_arg( array( 'm' => $arc_year, 'w' => $result->week, ), home_url( '/' ) );
-					if ( 'post' !== $r['post_type'] ) {
-						$url = add_query_arg( 'post_type', $r['post_type'], $url );
+					$arc_week       = get_weekstartend($result->yyyymmdd, get_option('start_of_week'));
+					$arc_week_start = date_i18n(get_option('date_format'), $arc_week['start']);
+					$arc_week_end   = date_i18n(get_option('date_format'), $arc_week['end']);
+					$url            = add_query_arg(array('m' => $arc_year, 'w' => $result->week,), home_url('/'));
+					if ('post' !== $r['post_type']) {
+						$url = add_query_arg('post_type', $r['post_type'], $url);
 					}
-					$text           = $arc_week_start . $archive_week_separator . $arc_week_end;
-					if ( $r['show_post_count'] ) {
-						$r['after'] = '&nbsp;(' . $result->posts . ')' . $after;
+					$text = $arc_week_start.$archive_week_separator.$arc_week_end;
+					if ($r['show_post_count']) {
+						$r['after'] = '&nbsp;('.$result->posts.')'.$after;
 					}
-					$output .= get_archives_link( $url, $text, $r['format'], $r['before'], $r['after'] );
+					$output .= get_archives_link($url, $text, $r['format'], $r['before'], $r['after']);
 				}
 			}
 		}
-	} elseif ( ( 'postbypost' == $r['type'] ) || ('alpha' == $r['type'] ) ) {
-		$orderby = ( 'alpha' == $r['type'] ) ? 'post_title ASC ' : 'post_date DESC, ID DESC ';
+	} elseif (('postbypost' == $r['type']) || ('alpha' == $r['type'])) {
+		$orderby = ('alpha' == $r['type']) ? 'post_title ASC ' : 'post_date DESC, ID DESC ';
 		$query = "SELECT * FROM $wpdb->posts $join $where ORDER BY $orderby $limit";
-		$key = md5( $query );
+		$key = md5($query);
 		$key = "wp_get_archives:$key:$last_changed";
-		if ( ! $results = wp_cache_get( $key, 'posts' ) ) {
-			$results = $wpdb->get_results( $query );
-			wp_cache_set( $key, $results, 'posts' );
+		if ( ! $results = wp_cache_get($key, 'posts')) {
+			$results = $wpdb->get_results($query);
+			wp_cache_set($key, $results, 'posts');
 		}
-		if ( $results ) {
-			foreach ( (array) $results as $result ) {
-				if ( $result->post_date != '0000-00-00 00:00:00' ) {
-					$url = get_permalink( $result );
-					if ( $result->post_title ) {
+		if ($results) {
+			foreach ((array) $results as $result) {
+				if ($result->post_date != '0000-00-00 00:00:00') {
+					$url = get_permalink($result);
+					if ($result->post_title) {
 						/** This filter is documented in wp-includes/post-template.php */
-						$text = strip_tags( apply_filters( 'the_title', $result->post_title, $result->ID ) );
+						$text = strip_tags(apply_filters('the_title', $result->post_title, $result->ID));
 					} else {
 						$text = $result->ID;
 					}
-					$output .= get_archives_link( $url, $text, $r['format'], $r['before'], $r['after'] );
+					$output .= get_archives_link($url, $text, $r['format'], $r['before'], $r['after']);
 				}
 			}
 		}
 	}
-	if ( $r['echo'] ) {
+	if ($r['echo']) {
 		echo $output;
 	} else {
 		return $output;
@@ -1864,7 +1864,7 @@ 
  */
 function calendar_week_mod($num) {
 	$base = 7;
-	return ($num - $base*floor($num/$base));
+	return ($num - $base * floor($num / $base));
 }
 
 /**
@@ -1886,17 +1886,17 @@ 
  * @param bool $echo    Optional, default is true. Set to false for return.
  * @return string|void String when retrieving.
  */
-function get_calendar( $initial = true, $echo = true ) {
+function get_calendar($initial = true, $echo = true) {
 	global $wpdb, $m, $monthnum, $year, $wp_locale, $posts;
 
-	$key = md5( $m . $monthnum . $year );
-	$cache = wp_cache_get( 'get_calendar', 'calendar' );
+	$key = md5($m.$monthnum.$year);
+	$cache = wp_cache_get('get_calendar', 'calendar');
 
-	if ( $cache && is_array( $cache ) && isset( $cache[ $key ] ) ) {
+	if ($cache && is_array($cache) && isset($cache[$key])) {
 		/** This filter is documented in wp-includes/general-template.php */
-		$output = apply_filters( 'get_calendar', $cache[ $key ] );
+		$output = apply_filters('get_calendar', $cache[$key]);
 
-		if ( $echo ) {
+		if ($echo) {
 			echo $output;
 			return;
 		}
@@ -1904,51 +1904,51 @@ 
 		return $output;
 	}
 
-	if ( ! is_array( $cache ) ) {
+	if ( ! is_array($cache)) {
 		$cache = array();
 	}
 
 	// Quick check. If we have no posts at all, abort!
-	if ( ! $posts ) {
+	if ( ! $posts) {
 		$gotsome = $wpdb->get_var("SELECT 1 as test FROM $wpdb->posts WHERE post_type = 'post' AND post_status = 'publish' LIMIT 1");
-		if ( ! $gotsome ) {
-			$cache[ $key ] = '';
-			wp_cache_set( 'get_calendar', $cache, 'calendar' );
+		if ( ! $gotsome) {
+			$cache[$key] = '';
+			wp_cache_set('get_calendar', $cache, 'calendar');
 			return;
 		}
 	}
 
-	if ( isset( $_GET['w'] ) ) {
+	if (isset($_GET['w'])) {
 		$w = (int) $_GET['w'];
 	}
 	// week_begins = 0 stands for Sunday
-	$week_begins = (int) get_option( 'start_of_week' );
-	$ts = current_time( 'timestamp' );
+	$week_begins = (int) get_option('start_of_week');
+	$ts = current_time('timestamp');
 
 	// Let's figure out when we are
-	if ( ! empty( $monthnum ) && ! empty( $year ) ) {
-		$thismonth = zeroise( intval( $monthnum ), 2 );
+	if ( ! empty($monthnum) && ! empty($year)) {
+		$thismonth = zeroise(intval($monthnum), 2);
 		$thisyear = (int) $year;
-	} elseif ( ! empty( $w ) ) {
+	} elseif ( ! empty($w)) {
 		// We need to get the month from MySQL
-		$thisyear = (int) substr( $m, 0, 4 );
+		$thisyear = (int) substr($m, 0, 4);
 		//it seems MySQL's weeks disagree with PHP's
-		$d = ( ( $w - 1 ) * 7 ) + 6;
+		$d = (($w - 1) * 7) + 6;
 		$thismonth = $wpdb->get_var("SELECT DATE_FORMAT((DATE_ADD('{$thisyear}0101', INTERVAL $d DAY) ), '%m')");
-	} elseif ( ! empty( $m ) ) {
-		$thisyear = (int) substr( $m, 0, 4 );
-		if ( strlen( $m ) < 6 ) {
+	} elseif ( ! empty($m)) {
+		$thisyear = (int) substr($m, 0, 4);
+		if (strlen($m) < 6) {
 			$thismonth = '01';
 		} else {
-			$thismonth = zeroise( (int) substr( $m, 4, 2 ), 2 );
+			$thismonth = zeroise((int) substr($m, 4, 2), 2);
 		}
 	} else {
-		$thisyear = gmdate( 'Y', $ts );
-		$thismonth = gmdate( 'm', $ts );
+		$thisyear = gmdate('Y', $ts);
+		$thismonth = gmdate('m', $ts);
 	}
 
-	$unixmonth = mktime( 0, 0 , 0, $thismonth, 1, $thisyear );
-	$last_day = date( 't', $unixmonth );
+	$unixmonth = mktime(0, 0, 0, $thismonth, 1, $thisyear);
+	$last_day = date('t', $unixmonth);
 
 	// Get the next and previous month and year with at least one post
 	$previous = $wpdb->get_row("SELECT MONTH(post_date) AS month, YEAR(post_date) AS year
@@ -1969,21 +1969,21 @@ 
 	$calendar_output = '<table id="wp-calendar">
 	<caption>' . sprintf(
 		$calendar_caption,
-		$wp_locale->get_month( $thismonth ),
-		date( 'Y', $unixmonth )
-	) . '</caption>
+		$wp_locale->get_month($thismonth),
+		date('Y', $unixmonth)
+	).'</caption>
 	<thead>
 	<tr>';
 
 	$myweek = array();
 
-	for ( $wdcount = 0; $wdcount <= 6; $wdcount++ ) {
-		$myweek[] = $wp_locale->get_weekday( ( $wdcount + $week_begins ) % 7 );
+	for ($wdcount = 0; $wdcount <= 6; $wdcount++) {
+		$myweek[] = $wp_locale->get_weekday(($wdcount + $week_begins) % 7);
 	}
 
-	foreach ( $myweek as $wd ) {
-		$day_name = $initial ? $wp_locale->get_weekday_initial( $wd ) : $wp_locale->get_weekday_abbrev( $wd );
-		$wd = esc_attr( $wd );
+	foreach ($myweek as $wd) {
+		$day_name = $initial ? $wp_locale->get_weekday_initial($wd) : $wp_locale->get_weekday_abbrev($wd);
+		$wd = esc_attr($wd);
 		$calendar_output .= "\n\t\t<th scope=\"col\" title=\"$wd\">$day_name</th>";
 	}
 
@@ -1994,9 +1994,9 @@ 
 	<tfoot>
 	<tr>';
 
-	if ( $previous ) {
-		$calendar_output .= "\n\t\t".'<td colspan="3" id="prev"><a href="' . get_month_link( $previous->year, $previous->month ) . '">&laquo; ' .
-			$wp_locale->get_month_abbrev( $wp_locale->get_month( $previous->month ) ) .
+	if ($previous) {
+		$calendar_output .= "\n\t\t".'<td colspan="3" id="prev"><a href="'.get_month_link($previous->year, $previous->month).'">&laquo; '.
+			$wp_locale->get_month_abbrev($wp_locale->get_month($previous->month)).
 		'</a></td>';
 	} else {
 		$calendar_output .= "\n\t\t".'<td colspan="3" id="prev" class="pad">&nbsp;</td>';
@@ -2004,9 +2004,9 @@ 
 
 	$calendar_output .= "\n\t\t".'<td class="pad">&nbsp;</td>';
 
-	if ( $next ) {
-		$calendar_output .= "\n\t\t".'<td colspan="3" id="next"><a href="' . get_month_link( $next->year, $next->month ) . '">' .
-			$wp_locale->get_month_abbrev( $wp_locale->get_month( $next->month ) ) .
+	if ($next) {
+		$calendar_output .= "\n\t\t".'<td colspan="3" id="next"><a href="'.get_month_link($next->year, $next->month).'">'.
+			$wp_locale->get_month_abbrev($wp_locale->get_month($next->month)).
 		' &raquo;</a></td>';
 	} else {
 		$calendar_output .= "\n\t\t".'<td colspan="3" id="next" class="pad">&nbsp;</td>';
@@ -2026,44 +2026,44 @@ 
 		FROM $wpdb->posts WHERE post_date >= '{$thisyear}-{$thismonth}-01 00:00:00'
 		AND post_type = 'post' AND post_status = 'publish'
 		AND post_date <= '{$thisyear}-{$thismonth}-{$last_day} 23:59:59'", ARRAY_N);
-	if ( $dayswithposts ) {
-		foreach ( (array) $dayswithposts as $daywith ) {
+	if ($dayswithposts) {
+		foreach ((array) $dayswithposts as $daywith) {
 			$daywithpost[] = $daywith[0];
 		}
 	}
 
 	// See how much we should pad in the beginning
-	$pad = calendar_week_mod( date( 'w', $unixmonth ) - $week_begins );
-	if ( 0 != $pad ) {
-		$calendar_output .= "\n\t\t".'<td colspan="'. esc_attr( $pad ) .'" class="pad">&nbsp;</td>';
+	$pad = calendar_week_mod(date('w', $unixmonth) - $week_begins);
+	if (0 != $pad) {
+		$calendar_output .= "\n\t\t".'<td colspan="'.esc_attr($pad).'" class="pad">&nbsp;</td>';
 	}
 
 	$newrow = false;
-	$daysinmonth = (int) date( 't', $unixmonth );
+	$daysinmonth = (int) date('t', $unixmonth);
 
-	for ( $day = 1; $day <= $daysinmonth; ++$day ) {
-		if ( isset($newrow) && $newrow ) {
+	for ($day = 1; $day <= $daysinmonth; ++$day) {
+		if (isset($newrow) && $newrow) {
 			$calendar_output .= "\n\t</tr>\n\t<tr>\n\t\t";
 		}
 		$newrow = false;
 
-		if ( $day == gmdate( 'j', $ts ) &&
-			$thismonth == gmdate( 'm', $ts ) &&
-			$thisyear == gmdate( 'Y', $ts ) ) {
+		if ($day == gmdate('j', $ts) &&
+			$thismonth == gmdate('m', $ts) &&
+			$thisyear == gmdate('Y', $ts)) {
 			$calendar_output .= '<td id="today">';
 		} else {
 			$calendar_output .= '<td>';
 		}
 
-		if ( in_array( $day, $daywithpost ) ) {
+		if (in_array($day, $daywithpost)) {
 			// any posts today?
-			$date_format = date( _x( 'F j, Y', 'daily archives date format' ), strtotime( "{$thisyear}-{$thismonth}-{$day}" ) );
+			$date_format = date(_x('F j, Y', 'daily archives date format'), strtotime("{$thisyear}-{$thismonth}-{$day}"));
 			/* translators: Post calendar label. 1: Date */
-			$label = sprintf( __( 'Posts published on %s' ), $date_format );
+			$label = sprintf(__('Posts published on %s'), $date_format);
 			$calendar_output .= sprintf(
 				'<a href="%s" aria-label="%s">%s</a>',
-				get_day_link( $thisyear, $thismonth, $day ),
-				esc_attr( $label ),
+				get_day_link($thisyear, $thismonth, $day),
+				esc_attr($label),
 				$day
 			);
 		} else {
@@ -2071,21 +2071,21 @@ 
 		}
 		$calendar_output .= '</td>';
 
-		if ( 6 == calendar_week_mod( date( 'w', mktime(0, 0 , 0, $thismonth, $day, $thisyear ) ) - $week_begins ) ) {
+		if (6 == calendar_week_mod(date('w', mktime(0, 0, 0, $thismonth, $day, $thisyear)) - $week_begins)) {
 			$newrow = true;
 		}
 	}
 
-	$pad = 7 - calendar_week_mod( date( 'w', mktime( 0, 0 , 0, $thismonth, $day, $thisyear ) ) - $week_begins );
-	if ( $pad != 0 && $pad != 7 ) {
-		$calendar_output .= "\n\t\t".'<td class="pad" colspan="'. esc_attr( $pad ) .'">&nbsp;</td>';
+	$pad = 7 - calendar_week_mod(date('w', mktime(0, 0, 0, $thismonth, $day, $thisyear)) - $week_begins);
+	if ($pad != 0 && $pad != 7) {
+		$calendar_output .= "\n\t\t".'<td class="pad" colspan="'.esc_attr($pad).'">&nbsp;</td>';
 	}
 	$calendar_output .= "\n\t</tr>\n\t</tbody>\n\t</table>";
 
-	$cache[ $key ] = $calendar_output;
-	wp_cache_set( 'get_calendar', $cache, 'calendar' );
+	$cache[$key] = $calendar_output;
+	wp_cache_set('get_calendar', $cache, 'calendar');
 
-	if ( $echo ) {
+	if ($echo) {
 		/**
 		 * Filters the HTML calendar output.
 		 *
@@ -2093,11 +2093,11 @@ 
 		 *
 		 * @param string $calendar_output HTML output of the calendar.
 		 */
-		echo apply_filters( 'get_calendar', $calendar_output );
+		echo apply_filters('get_calendar', $calendar_output);
 		return;
 	}
 	/** This filter is documented in wp-includes/general-template.php */
-	return apply_filters( 'get_calendar', $calendar_output );
+	return apply_filters('get_calendar', $calendar_output);
 }
 
 /**
@@ -2107,7 +2107,7 @@ 
  * @since 2.1.0
  */
 function delete_get_calendar_cache() {
-	wp_cache_delete( 'get_calendar', 'calendar' );
+	wp_cache_delete('get_calendar', 'calendar');
 }
 
 /**
@@ -2125,16 +2125,16 @@ 
 function allowed_tags() {
 	global $allowedtags;
 	$allowed = '';
-	foreach ( (array) $allowedtags as $tag => $attributes ) {
+	foreach ((array) $allowedtags as $tag => $attributes) {
 		$allowed .= '<'.$tag;
-		if ( 0 < count($attributes) ) {
-			foreach ( $attributes as $attribute => $limits ) {
+		if (0 < count($attributes)) {
+			foreach ($attributes as $attribute => $limits) {
 				$allowed .= ' '.$attribute.'=""';
 			}
 		}
 		$allowed .= '> ';
 	}
-	return htmlentities( $allowed );
+	return htmlentities($allowed);
 }
 
 /***** Date/Time tags *****/
@@ -2145,7 +2145,7 @@ 
  * @since 1.0.0
  */
 function the_date_xml() {
-	echo mysql2date( 'Y-m-d', get_post()->post_date, false );
+	echo mysql2date('Y-m-d', get_post()->post_date, false);
 }
 
 /**
@@ -2171,11 +2171,11 @@ 
  * @param bool   $echo   Optional, default is display. Whether to echo the date or return it.
  * @return string|void String if retrieving.
  */
-function the_date( $d = '', $before = '', $after = '', $echo = true ) {
+function the_date($d = '', $before = '', $after = '', $echo = true) {
 	global $currentday, $previousday;
 
-	if ( is_new_day() ) {
-		$the_date = $before . get_the_date( $d ) . $after;
+	if (is_new_day()) {
+		$the_date = $before.get_the_date($d).$after;
 		$previousday = $currentday;
 
 		/**
@@ -2189,9 +2189,9 @@ 
 		 * @param string $before   HTML output before the date.
 		 * @param string $after    HTML output after the date.
 		 */
-		$the_date = apply_filters( 'the_date', $the_date, $d, $before, $after );
+		$the_date = apply_filters('the_date', $the_date, $d, $before, $after);
 
-		if ( $echo )
+		if ($echo)
 			echo $the_date;
 		else
 			return $the_date;
@@ -2210,17 +2210,17 @@ 
  * @param  int|WP_Post $post Optional. Post ID or WP_Post object. Default current post.
  * @return false|string Date the current post was written. False on failure.
  */
-function get_the_date( $d = '', $post = null ) {
-	$post = get_post( $post );
+function get_the_date($d = '', $post = null) {
+	$post = get_post($post);
 
-	if ( ! $post ) {
+	if ( ! $post) {
 		return false;
 	}
 
-	if ( '' == $d ) {
-		$the_date = mysql2date( get_option( 'date_format' ), $post->post_date );
+	if ('' == $d) {
+		$the_date = mysql2date(get_option('date_format'), $post->post_date);
 	} else {
-		$the_date = mysql2date( $d, $post->post_date );
+		$the_date = mysql2date($d, $post->post_date);
 	}
 
 	/**
@@ -2233,7 +2233,7 @@ 
 	 *                              if not specified.
 	 * @param int|WP_Post $post     The post object or ID.
 	 */
-	return apply_filters( 'get_the_date', $the_date, $d, $post );
+	return apply_filters('get_the_date', $the_date, $d, $post);
 }
 
 /**
@@ -2247,8 +2247,8 @@ 
  * @param bool   $echo   Optional, default is display. Whether to echo the date or return it.
  * @return string|void String if retrieving.
  */
-function the_modified_date( $d = '', $before = '', $after = '', $echo = true ) {
-	$the_modified_date = $before . get_the_modified_date($d) . $after;
+function the_modified_date($d = '', $before = '', $after = '', $echo = true) {
+	$the_modified_date = $before.get_the_modified_date($d).$after;
 
 	/**
 	 * Filters the date a post was last modified for display.
@@ -2261,9 +2261,9 @@ 
 	 * @param string $before            HTML output before the date.
 	 * @param string $after             HTML output after the date.
 	 */
-	$the_modified_date = apply_filters( 'the_modified_date', $the_modified_date, $d, $before, $after );
+	$the_modified_date = apply_filters('the_modified_date', $the_modified_date, $d, $before, $after);
 
-	if ( $echo )
+	if ($echo)
 		echo $the_modified_date;
 	else
 		return $the_modified_date;
@@ -2280,16 +2280,16 @@ 
  * @param int|WP_Post $post Optional. Post ID or WP_Post object. Default current post.
  * @return false|string Date the current post was modified. False on failure.
  */
-function get_the_modified_date( $d = '', $post = null ) {
-	$post = get_post( $post );
+function get_the_modified_date($d = '', $post = null) {
+	$post = get_post($post);
 
-	if ( ! $post ) {
+	if ( ! $post) {
 		// For backward compatibility, failures go through the filter below.
 		$the_time = false;
-	} elseif ( empty( $d ) ) {
-		$the_time = get_post_modified_time( get_option( 'date_format' ), false, $post, true );
+	} elseif (empty($d)) {
+		$the_time = get_post_modified_time(get_option('date_format'), false, $post, true);
 	} else {
-		$the_time = get_post_modified_time( $d, false, $post, true );
+		$the_time = get_post_modified_time($d, false, $post, true);
 	}
 
 	/**
@@ -2303,7 +2303,7 @@ 
 	 *                          'date_format' option.
 	 * @param WP_Post $post     WP_Post object.
 	 */
-	return apply_filters( 'get_the_modified_date', $the_time, $d, $post );
+	return apply_filters('get_the_modified_date', $the_time, $d, $post);
 }
 
 /**
@@ -2313,7 +2313,7 @@ 
  *
  * @param string $d Either 'G', 'U', or php date format.
  */
-function the_time( $d = '' ) {
+function the_time($d = '') {
 	/**
 	 * Filters the time a post was written for display.
 	 *
@@ -2323,7 +2323,7 @@ 
 	 * @param string $d            The time format. Accepts 'G', 'U',
 	 *                             or php date format.
 	 */
-	echo apply_filters( 'the_time', get_the_time( $d ), $d );
+	echo apply_filters('the_time', get_the_time($d), $d);
 }
 
 /**
@@ -2337,14 +2337,14 @@ 
  * @param int|WP_Post $post WP_Post object or ID. Default is global $post object.
  * @return string|int|false Formatted date string or Unix timestamp if `$id` is 'U' or 'G'. False on failure.
  */
-function get_the_time( $d = '', $post = null ) {
+function get_the_time($d = '', $post = null) {
 	$post = get_post($post);
 
-	if ( ! $post ) {
+	if ( ! $post) {
 		return false;
 	}
 
-	if ( '' == $d )
+	if ('' == $d)
 		$the_time = get_post_time(get_option('time_format'), false, $post, true);
 	else
 		$the_time = get_post_time($d, false, $post, true);
@@ -2360,7 +2360,7 @@ 
 	 *                              in 'time_format' option. Default empty.
 	 * @param int|WP_Post $post     WP_Post object or ID.
 	 */
-	return apply_filters( 'get_the_time', $the_time, $d, $post );
+	return apply_filters('get_the_time', $the_time, $d, $post);
 }
 
 /**
@@ -2375,14 +2375,14 @@ 
  * @param bool        $translate Whether to translate the time string. Default false.
  * @return string|int|false Formatted date string or Unix timestamp if `$id` is 'U' or 'G'. False on failure.
  */
-function get_post_time( $d = 'U', $gmt = false, $post = null, $translate = false ) {
+function get_post_time($d = 'U', $gmt = false, $post = null, $translate = false) {
 	$post = get_post($post);
 
-	if ( ! $post ) {
+	if ( ! $post) {
 		return false;
 	}
 
-	if ( $gmt )
+	if ($gmt)
 		$time = $post->post_date_gmt;
 	else
 		$time = $post->post_date;
@@ -2399,7 +2399,7 @@ 
 	 *                     Accepts 'G', 'U', or php date format. Default 'U'.
 	 * @param bool   $gmt  Whether to retrieve the GMT time. Default false.
 	 */
-	return apply_filters( 'get_post_time', $time, $d, $gmt );
+	return apply_filters('get_post_time', $time, $d, $gmt);
 }
 
 /**
@@ -2420,7 +2420,7 @@ 
 	 *                                      or php date format. Defaults to value
 	 *                                      specified in 'time_format' option.
 	 */
-	echo apply_filters( 'the_modified_time', get_the_modified_time($d), $d );
+	echo apply_filters('the_modified_time', get_the_modified_time($d), $d);
 }
 
 /**
@@ -2435,16 +2435,16 @@ 
  * @param int|WP_Post $post  Optional. Post ID or WP_Post object. Default current post.
  * @return false|string Formatted date string or Unix timestamp. False on failure.
  */
-function get_the_modified_time( $d = '', $post = null ) {
-	$post = get_post( $post );
+function get_the_modified_time($d = '', $post = null) {
+	$post = get_post($post);
 
-	if ( ! $post ) {
+	if ( ! $post) {
 		// For backward compatibility, failures go through the filter below.
 		$the_time = false;
-	} elseif ( empty( $d ) ) {
-		$the_time = get_post_modified_time( get_option( 'time_format' ), false, $post, true );
+	} elseif (empty($d)) {
+		$the_time = get_post_modified_time(get_option('time_format'), false, $post, true);
 	} else {
-		$the_time = get_post_modified_time( $d, false, $post, true );
+		$the_time = get_post_modified_time($d, false, $post, true);
 	}
 
 	/**
@@ -2459,7 +2459,7 @@ 
 	 *                         to value specified in 'time_format' option.
 	 * @param WP_Post $post    WP_Post object.
 	 */
-	return apply_filters( 'get_the_modified_time', $the_time, $d, $post );
+	return apply_filters('get_the_modified_time', $the_time, $d, $post);
 }
 
 /**
@@ -2474,14 +2474,14 @@ 
  * @param bool        $translate Whether to translate the time string. Default false.
  * @return string|int|false Formatted date string or Unix timestamp if `$id` is 'U' or 'G'. False on failure.
  */
-function get_post_modified_time( $d = 'U', $gmt = false, $post = null, $translate = false ) {
+function get_post_modified_time($d = 'U', $gmt = false, $post = null, $translate = false) {
 	$post = get_post($post);
 
-	if ( ! $post ) {
+	if ( ! $post) {
 		return false;
 	}
 
-	if ( $gmt )
+	if ($gmt)
 		$time = $post->post_modified_gmt;
 	else
 		$time = $post->post_modified;
@@ -2496,7 +2496,7 @@ 
 	 * @param string $d    The date format. Accepts 'G', 'U', or php date format. Default 'U'.
 	 * @param bool   $gmt  Whether to return the GMT time. Default false.
 	 */
-	return apply_filters( 'get_post_modified_time', $time, $d, $gmt );
+	return apply_filters('get_post_modified_time', $time, $d, $gmt);
 }
 
 /**
@@ -2508,7 +2508,7 @@ 
  */
 function the_weekday() {
 	global $wp_locale;
-	$the_weekday = $wp_locale->get_weekday( mysql2date( 'w', get_post()->post_date, false ) );
+	$the_weekday = $wp_locale->get_weekday(mysql2date('w', get_post()->post_date, false));
 
 	/**
 	 * Filters the weekday on which the post was written, for display.
@@ -2517,7 +2517,7 @@ 
 	 *
 	 * @param string $the_weekday
 	 */
-	echo apply_filters( 'the_weekday', $the_weekday );
+	echo apply_filters('the_weekday', $the_weekday);
 }
 
 /**
@@ -2535,12 +2535,12 @@ 
  * @param string $before Optional Output before the date.
  * @param string $after Optional Output after the date.
  */
-function the_weekday_date($before='',$after='') {
+function the_weekday_date($before = '', $after = '') {
 	global $wp_locale, $currentday, $previousweekday;
 	$the_weekday_date = '';
-	if ( $currentday != $previousweekday ) {
+	if ($currentday != $previousweekday) {
 		$the_weekday_date .= $before;
-		$the_weekday_date .= $wp_locale->get_weekday( mysql2date( 'w', get_post()->post_date, false ) );
+		$the_weekday_date .= $wp_locale->get_weekday(mysql2date('w', get_post()->post_date, false));
 		$the_weekday_date .= $after;
 		$previousweekday = $currentday;
 	}
@@ -2554,7 +2554,7 @@ 
 	 * @param string $before           The HTML to output before the date.
 	 * @param string $after            The HTML to output after the date.
 	 */
-	$the_weekday_date = apply_filters( 'the_weekday_date', $the_weekday_date, $before, $after );
+	$the_weekday_date = apply_filters('the_weekday_date', $the_weekday_date, $before, $after);
 	echo $the_weekday_date;
 }
 
@@ -2571,7 +2571,7 @@ 
 	 *
 	 * @since 1.5.0
 	 */
-	do_action( 'wp_head' );
+	do_action('wp_head');
 }
 
 /**
@@ -2587,7 +2587,7 @@ 
 	 *
 	 * @since 1.5.1
 	 */
-	do_action( 'wp_footer' );
+	do_action('wp_footer');
 }
 
 /**
@@ -2597,8 +2597,8 @@ 
  *
  * @param array $args Optional arguments.
  */
-function feed_links( $args = array() ) {
-	if ( !current_theme_supports('automatic-feed-links') )
+function feed_links($args = array()) {
+	if ( ! current_theme_supports('automatic-feed-links'))
 		return;
 
 	$defaults = array(
@@ -2610,7 +2610,7 @@ 
 		'comstitle'	=> __('%1$s %2$s Comments Feed'),
 	);
 
-	$args = wp_parse_args( $args, $defaults );
+	$args = wp_parse_args($args, $defaults);
 
 	/**
 	 * Filters whether to display the posts feed link.
@@ -2619,8 +2619,8 @@ 
 	 *
 	 * @param bool $show Whether to display the posts feed link. Default true.
 	 */
-	if ( apply_filters( 'feed_links_show_posts_feed', true ) ) {
-		echo '<link rel="alternate" type="' . feed_content_type() . '" title="' . esc_attr( sprintf( $args['feedtitle'], get_bloginfo( 'name' ), $args['separator'] ) ) . '" href="' . esc_url( get_feed_link() ) . "\" />\n";
+	if (apply_filters('feed_links_show_posts_feed', true)) {
+		echo '<link rel="alternate" type="'.feed_content_type().'" title="'.esc_attr(sprintf($args['feedtitle'], get_bloginfo('name'), $args['separator'])).'" href="'.esc_url(get_feed_link())."\" />\n";
 	}
 
 	/**
@@ -2630,8 +2630,8 @@ 
 	 *
 	 * @param bool $show Whether to display the comments feed link. Default true.
 	 */
-	if ( apply_filters( 'feed_links_show_comments_feed', true ) ) {
-		echo '<link rel="alternate" type="' . feed_content_type() . '" title="' . esc_attr( sprintf( $args['comstitle'], get_bloginfo( 'name' ), $args['separator'] ) ) . '" href="' . esc_url( get_feed_link( 'comments_' . get_default_feed() ) ) . "\" />\n";
+	if (apply_filters('feed_links_show_comments_feed', true)) {
+		echo '<link rel="alternate" type="'.feed_content_type().'" title="'.esc_attr(sprintf($args['comstitle'], get_bloginfo('name'), $args['separator'])).'" href="'.esc_url(get_feed_link('comments_'.get_default_feed()))."\" />\n";
 	}
 }
 
@@ -2642,7 +2642,7 @@ 
  *
  * @param array $args Optional arguments.
  */
-function feed_links_extra( $args = array() ) {
+function feed_links_extra($args = array()) {
 	$defaults = array(
 		/* translators: Separator between blog name and feed type in feed links */
 		'separator'   => _x('&raquo;', 'feed link'),
@@ -2662,60 +2662,60 @@ 
 		'posttypetitle' => __('%1$s %2$s %3$s Feed'),
 	);
 
-	$args = wp_parse_args( $args, $defaults );
+	$args = wp_parse_args($args, $defaults);
 
-	if ( is_singular() ) {
+	if (is_singular()) {
 		$id = 0;
-		$post = get_post( $id );
+		$post = get_post($id);
 
-		if ( comments_open() || pings_open() || $post->comment_count > 0 ) {
-			$title = sprintf( $args['singletitle'], get_bloginfo('name'), $args['separator'], the_title_attribute( array( 'echo' => false ) ) );
-			$href = get_post_comments_feed_link( $post->ID );
+		if (comments_open() || pings_open() || $post->comment_count > 0) {
+			$title = sprintf($args['singletitle'], get_bloginfo('name'), $args['separator'], the_title_attribute(array('echo' => false)));
+			$href = get_post_comments_feed_link($post->ID);
 		}
-	} elseif ( is_post_type_archive() ) {
-		$post_type = get_query_var( 'post_type' );
-		if ( is_array( $post_type ) )
-			$post_type = reset( $post_type );
-
-		$post_type_obj = get_post_type_object( $post_type );
-		$title = sprintf( $args['posttypetitle'], get_bloginfo( 'name' ), $args['separator'], $post_type_obj->labels->name );
-		$href = get_post_type_archive_feed_link( $post_type_obj->name );
-	} elseif ( is_category() ) {
+	} elseif (is_post_type_archive()) {
+		$post_type = get_query_var('post_type');
+		if (is_array($post_type))
+			$post_type = reset($post_type);
+
+		$post_type_obj = get_post_type_object($post_type);
+		$title = sprintf($args['posttypetitle'], get_bloginfo('name'), $args['separator'], $post_type_obj->labels->name);
+		$href = get_post_type_archive_feed_link($post_type_obj->name);
+	} elseif (is_category()) {
 		$term = get_queried_object();
 
-		if ( $term ) {
-			$title = sprintf( $args['cattitle'], get_bloginfo('name'), $args['separator'], $term->name );
-			$href = get_category_feed_link( $term->term_id );
+		if ($term) {
+			$title = sprintf($args['cattitle'], get_bloginfo('name'), $args['separator'], $term->name);
+			$href = get_category_feed_link($term->term_id);
 		}
-	} elseif ( is_tag() ) {
+	} elseif (is_tag()) {
 		$term = get_queried_object();
 
-		if ( $term ) {
-			$title = sprintf( $args['tagtitle'], get_bloginfo('name'), $args['separator'], $term->name );
-			$href = get_tag_feed_link( $term->term_id );
+		if ($term) {
+			$title = sprintf($args['tagtitle'], get_bloginfo('name'), $args['separator'], $term->name);
+			$href = get_tag_feed_link($term->term_id);
 		}
-	} elseif ( is_tax() ) {
+	} elseif (is_tax()) {
  		$term = get_queried_object();
- 		$tax = get_taxonomy( $term->taxonomy );
- 		$title = sprintf( $args['taxtitle'], get_bloginfo('name'), $args['separator'], $term->name, $tax->labels->singular_name );
- 		$href = get_term_feed_link( $term->term_id, $term->taxonomy );
-	} elseif ( is_author() ) {
-		$author_id = intval( get_query_var('author') );
-
-		$title = sprintf( $args['authortitle'], get_bloginfo('name'), $args['separator'], get_the_author_meta( 'display_name', $author_id ) );
-		$href = get_author_feed_link( $author_id );
-	} elseif ( is_search() ) {
-		$title = sprintf( $args['searchtitle'], get_bloginfo('name'), $args['separator'], get_search_query( false ) );
+ 		$tax = get_taxonomy($term->taxonomy);
+ 		$title = sprintf($args['taxtitle'], get_bloginfo('name'), $args['separator'], $term->name, $tax->labels->singular_name);
+ 		$href = get_term_feed_link($term->term_id, $term->taxonomy);
+	} elseif (is_author()) {
+		$author_id = intval(get_query_var('author'));
+
+		$title = sprintf($args['authortitle'], get_bloginfo('name'), $args['separator'], get_the_author_meta('display_name', $author_id));
+		$href = get_author_feed_link($author_id);
+	} elseif (is_search()) {
+		$title = sprintf($args['searchtitle'], get_bloginfo('name'), $args['separator'], get_search_query(false));
 		$href = get_search_feed_link();
-	} elseif ( is_post_type_archive() ) {
-		$title = sprintf( $args['posttypetitle'], get_bloginfo('name'), $args['separator'], post_type_archive_title( '', false ) );
+	} elseif (is_post_type_archive()) {
+		$title = sprintf($args['posttypetitle'], get_bloginfo('name'), $args['separator'], post_type_archive_title('', false));
 		$post_type_obj = get_queried_object();
-		if ( $post_type_obj )
-			$href = get_post_type_archive_feed_link( $post_type_obj->name );
+		if ($post_type_obj)
+			$href = get_post_type_archive_feed_link($post_type_obj->name);
 	}
 
-	if ( isset($title) && isset($href) )
-		echo '<link rel="alternate" type="' . feed_content_type() . '" title="' . esc_attr( $title ) . '" href="' . esc_url( $href ) . '" />' . "\n";
+	if (isset($title) && isset($href))
+		echo '<link rel="alternate" type="'.feed_content_type().'" title="'.esc_attr($title).'" href="'.esc_url($href).'" />'."\n";
 }
 
 /**
@@ -2725,7 +2725,7 @@ 
  * @since 2.0.0
  */
 function rsd_link() {
-	echo '<link rel="EditURI" type="application/rsd+xml" title="RSD" href="' . esc_url( site_url( 'xmlrpc.php?rsd', 'rpc' ) ) . '" />' . "\n";
+	echo '<link rel="EditURI" type="application/rsd+xml" title="RSD" href="'.esc_url(site_url('xmlrpc.php?rsd', 'rpc')).'" />'."\n";
 }
 
 /**
@@ -2736,7 +2736,7 @@ 
  */
 function wlwmanifest_link() {
 	echo '<link rel="wlwmanifest" type="application/wlwmanifest+xml" href="',
-		includes_url( 'wlwmanifest.xml' ), '" /> ', "\n";
+		includes_url('wlwmanifest.xml'), '" /> ', "\n";
 }
 
 /**
@@ -2756,7 +2756,7 @@ 
  */
 function noindex() {
 	// If the blog is not public, tell robots to go away.
-	if ( '0' == get_option('blog_public') )
+	if ('0' == get_option('blog_public'))
 		wp_no_robots();
 }
 
@@ -2780,29 +2780,29 @@ 
  * @link https://www.whatwg.org/specs/web-apps/current-work/multipage/links.html#rel-icon HTML5 specification link icon.
  */
 function wp_site_icon() {
-	if ( ! has_site_icon() && ! is_customize_preview() ) {
+	if ( ! has_site_icon() && ! is_customize_preview()) {
 		return;
 	}
 
 	$meta_tags = array();
-	$icon_32 = get_site_icon_url( 32 );
-	if ( empty( $icon_32 ) && is_customize_preview() ) {
+	$icon_32 = get_site_icon_url(32);
+	if (empty($icon_32) && is_customize_preview()) {
 		$icon_32 = '/favicon.ico'; // Serve default favicon URL in customizer so element can be updated for preview.
 	}
-	if ( $icon_32 ) {
-		$meta_tags[] = sprintf( '<link rel="icon" href="%s" sizes="32x32" />', esc_url( $icon_32 ) );
+	if ($icon_32) {
+		$meta_tags[] = sprintf('<link rel="icon" href="%s" sizes="32x32" />', esc_url($icon_32));
 	}
-	$icon_192 = get_site_icon_url( 192 );
-	if ( $icon_192 ) {
-		$meta_tags[] = sprintf( '<link rel="icon" href="%s" sizes="192x192" />', esc_url( $icon_192 ) );
+	$icon_192 = get_site_icon_url(192);
+	if ($icon_192) {
+		$meta_tags[] = sprintf('<link rel="icon" href="%s" sizes="192x192" />', esc_url($icon_192));
 	}
-	$icon_180 = get_site_icon_url( 180 );
-	if ( $icon_180 ) {
-		$meta_tags[] = sprintf( '<link rel="apple-touch-icon-precomposed" href="%s" />', esc_url( $icon_180 ) );
+	$icon_180 = get_site_icon_url(180);
+	if ($icon_180) {
+		$meta_tags[] = sprintf('<link rel="apple-touch-icon-precomposed" href="%s" />', esc_url($icon_180));
 	}
-	$icon_270 = get_site_icon_url( 270 );
-	if ( $icon_270 ) {
-		$meta_tags[] = sprintf( '<meta name="msapplication-TileImage" content="%s" />', esc_url( $icon_270 ) );
+	$icon_270 = get_site_icon_url(270);
+	if ($icon_270) {
+		$meta_tags[] = sprintf('<meta name="msapplication-TileImage" content="%s" />', esc_url($icon_270));
 	}
 
 	/**
@@ -2812,10 +2812,10 @@ 
 	 *
 	 * @param array $meta_tags Site Icon meta elements.
 	 */
-	$meta_tags = apply_filters( 'site_icon_meta_tags', $meta_tags );
-	$meta_tags = array_filter( $meta_tags );
+	$meta_tags = apply_filters('site_icon_meta_tags', $meta_tags);
+	$meta_tags = array_filter($meta_tags);
 
-	foreach ( $meta_tags as $meta_tag ) {
+	foreach ($meta_tags as $meta_tag) {
 		echo "$meta_tag\n";
 	}
 }
@@ -2845,9 +2845,9 @@ 
 	 * The path is removed in the foreach loop below.
 	 */
 	/** This filter is documented in wp-includes/formatting.php */
-	$hints['dns-prefetch'][] = apply_filters( 'emoji_svg_url', 'https://s.w.org/images/core/emoji/2.2.1/svg/' );
+	$hints['dns-prefetch'][] = apply_filters('emoji_svg_url', 'https://s.w.org/images/core/emoji/2.2.1/svg/');
 
-	foreach ( $hints as $relation_type => $urls ) {
+	foreach ($hints as $relation_type => $urls) {
 		$unique_urls = array();
 
 		/**
@@ -2858,13 +2858,13 @@ 
 		 * @param array  $urls          URLs to print for resource hints.
 		 * @param string $relation_type The relation type the URLs are printed for, e.g. 'preconnect' or 'prerender'.
 		 */
-		$urls = apply_filters( 'wp_resource_hints', $urls, $relation_type );
+		$urls = apply_filters('wp_resource_hints', $urls, $relation_type);
 
-		foreach ( $urls as $key => $url ) {
+		foreach ($urls as $key => $url) {
 			$atts = array();
 
-			if ( is_array( $url ) ) {
-				if ( isset( $url['href'] ) ) {
+			if (is_array($url)) {
+				if (isset($url['href'])) {
 					$atts = $url;
 					$url  = $url['href'];
 				} else {
@@ -2872,57 +2872,57 @@ 
 				}
 			}
 
-			$url = esc_url( $url, array( 'http', 'https' ) );
+			$url = esc_url($url, array('http', 'https'));
 
-			if ( ! $url ) {
+			if ( ! $url) {
 				continue;
 			}
 
-			if ( isset( $unique_urls[ $url ] ) ) {
+			if (isset($unique_urls[$url])) {
 				continue;
 			}
 
-			if ( in_array( $relation_type, array( 'preconnect', 'dns-prefetch' ) ) ) {
-				$parsed = wp_parse_url( $url );
+			if (in_array($relation_type, array('preconnect', 'dns-prefetch'))) {
+				$parsed = wp_parse_url($url);
 
-				if ( empty( $parsed['host'] ) ) {
+				if (empty($parsed['host'])) {
 					continue;
 				}
 
-				if ( 'preconnect' === $relation_type && ! empty( $parsed['scheme'] ) ) {
-					$url = $parsed['scheme'] . '://' . $parsed['host'];
+				if ('preconnect' === $relation_type && ! empty($parsed['scheme'])) {
+					$url = $parsed['scheme'].'://'.$parsed['host'];
 				} else {
 					// Use protocol-relative URLs for dns-prefetch or if scheme is missing.
-					$url = '//' . $parsed['host'];
+					$url = '//'.$parsed['host'];
 				}
 			}
 
 			$atts['rel'] = $relation_type;
 			$atts['href'] = $url;
 
-			$unique_urls[ $url ] = $atts;
+			$unique_urls[$url] = $atts;
 		}
 
-		foreach ( $unique_urls as $atts ) {
+		foreach ($unique_urls as $atts) {
 			$html = '';
 
-			foreach ( $atts as $attr => $value ) {
-				if ( ! is_scalar( $value ) ||
-				     ( ! in_array( $attr, array( 'as', 'crossorigin', 'href', 'pr', 'rel', 'type' ), true ) && ! is_numeric( $attr ))
+			foreach ($atts as $attr => $value) {
+				if ( ! is_scalar($value) ||
+				     ( ! in_array($attr, array('as', 'crossorigin', 'href', 'pr', 'rel', 'type'), true) && ! is_numeric($attr))
 				) {
 					continue;
 				}
 
-				$value = ( 'href' === $attr ) ? esc_url( $value ) : esc_attr( $value );
+				$value = ('href' === $attr) ? esc_url($value) : esc_attr($value);
 
-				if ( ! is_string( $attr ) ) {
+				if ( ! is_string($attr)) {
 					$html .= " $value";
 				} else {
 					$html .= " $attr='$value'";
 				}
 			}
 
-			$html = trim( $html );
+			$html = trim($html);
 
 			echo "<link $html />\n";
 		}
@@ -2941,18 +2941,18 @@ 
 
 	$unique_hosts = array();
 
-	foreach ( array( $wp_scripts, $wp_styles ) as $dependencies ) {
-		if ( $dependencies instanceof WP_Dependencies && ! empty( $dependencies->queue ) ) {
-			foreach ( $dependencies->queue as $handle ) {
-				if ( ! isset( $dependencies->registered[ $handle ] ) ) {
+	foreach (array($wp_scripts, $wp_styles) as $dependencies) {
+		if ($dependencies instanceof WP_Dependencies && ! empty($dependencies->queue)) {
+			foreach ($dependencies->queue as $handle) {
+				if ( ! isset($dependencies->registered[$handle])) {
 					continue;
 				}
 
 				/* @var _WP_Dependency $dependency */
-				$dependency = $dependencies->registered[ $handle ];
-				$parsed     = wp_parse_url( $dependency->src );
+				$dependency = $dependencies->registered[$handle];
+				$parsed     = wp_parse_url($dependency->src);
 
-				if ( ! empty( $parsed['host'] ) && ! in_array( $parsed['host'], $unique_hosts ) && $parsed['host'] !== $_SERVER['SERVER_NAME'] ) {
+				if ( ! empty($parsed['host']) && ! in_array($parsed['host'], $unique_hosts) && $parsed['host'] !== $_SERVER['SERVER_NAME']) {
 					$unique_hosts[] = $parsed['host'];
 				}
 			}
@@ -2982,13 +2982,13 @@ 
 function user_can_richedit() {
 	global $wp_rich_edit, $is_gecko, $is_opera, $is_safari, $is_chrome, $is_IE, $is_edge;
 
-	if ( !isset($wp_rich_edit) ) {
+	if ( ! isset($wp_rich_edit)) {
 		$wp_rich_edit = false;
 
-		if ( get_user_option( 'rich_editing' ) == 'true' || ! is_user_logged_in() ) { // default to 'true' for logged out users
-			if ( $is_safari ) {
-				$wp_rich_edit = ! wp_is_mobile() || ( preg_match( '!AppleWebKit/(\d+)!', $_SERVER['HTTP_USER_AGENT'], $match ) && intval( $match[1] ) >= 534 );
-			} elseif ( $is_gecko || $is_chrome || $is_IE || $is_edge || ( $is_opera && !wp_is_mobile() ) ) {
+		if (get_user_option('rich_editing') == 'true' || ! is_user_logged_in()) { // default to 'true' for logged out users
+			if ($is_safari) {
+				$wp_rich_edit = ! wp_is_mobile() || (preg_match('!AppleWebKit/(\d+)!', $_SERVER['HTTP_USER_AGENT'], $match) && intval($match[1]) >= 534);
+			} elseif ($is_gecko || $is_chrome || $is_IE || $is_edge || ($is_opera && ! wp_is_mobile())) {
 				$wp_rich_edit = true;
 			}
 		}
@@ -3001,7 +3001,7 @@ 
 	 *
 	 * @param bool $wp_rich_edit Whether the user can access the visual editor.
 	 */
-	return apply_filters( 'user_can_richedit', $wp_rich_edit );
+	return apply_filters('user_can_richedit', $wp_rich_edit);
 }
 
 /**
@@ -3016,9 +3016,9 @@ 
  */
 function wp_default_editor() {
 	$r = user_can_richedit() ? 'tinymce' : 'html'; // defaults
-	if ( wp_get_current_user() ) { // look for cookie
+	if (wp_get_current_user()) { // look for cookie
 		$ed = get_user_setting('editor', 'tinymce');
-		$r = ( in_array($ed, array('tinymce', 'html', 'test') ) ) ? $ed : $r;
+		$r = (in_array($ed, array('tinymce', 'html', 'test'))) ? $ed : $r;
 	}
 
 	/**
@@ -3028,7 +3028,7 @@ 
 	 *
 	 * @param string $r Which editor should be displayed by default. Either 'tinymce', 'html', or 'test'.
 	 */
-	return apply_filters( 'wp_default_editor', $r );
+	return apply_filters('wp_default_editor', $r);
 }
 
 /**
@@ -3050,9 +3050,9 @@ 
  * @param string $editor_id HTML ID attribute value for the textarea and TinyMCE. Can only be /[a-z]+/.
  * @param array  $settings  See _WP_Editors::editor().
  */
-function wp_editor( $content, $editor_id, $settings = array() ) {
-	if ( ! class_exists( '_WP_Editors', false ) )
-		require( ABSPATH . WPINC . '/class-wp-editor.php' );
+function wp_editor($content, $editor_id, $settings = array()) {
+	if ( ! class_exists('_WP_Editors', false))
+		require(ABSPATH.WPINC.'/class-wp-editor.php');
 	_WP_Editors::editor($content, $editor_id, $settings);
 }
 
@@ -3068,7 +3068,7 @@ 
  * 	                    Only use when you are later escaping it. Do not use unescaped.
  * @return string
  */
-function get_search_query( $escaped = true ) {
+function get_search_query($escaped = true) {
 	/**
 	 * Filters the contents of the search query variable.
 	 *
@@ -3076,10 +3076,10 @@ 
 	 *
 	 * @param mixed $search Contents of the search query variable.
 	 */
-	$query = apply_filters( 'get_search_query', get_query_var( 's' ) );
+	$query = apply_filters('get_search_query', get_query_var('s'));
 
-	if ( $escaped )
-		$query = esc_attr( $query );
+	if ($escaped)
+		$query = esc_attr($query);
 	return $query;
 }
 
@@ -3099,7 +3099,7 @@ 
 	 *
 	 * @param mixed $search Contents of the search query variable.
 	 */
-	echo esc_attr( apply_filters( 'the_search_query', get_search_query( false ) ) );
+	echo esc_attr(apply_filters('the_search_query', get_search_query(false)));
 }
 
 /**
@@ -3112,17 +3112,17 @@ 
  *
  * @param string $doctype Optional. The type of html document. Accepts 'xhtml' or 'html'. Default 'html'.
  */
-function get_language_attributes( $doctype = 'html' ) {
+function get_language_attributes($doctype = 'html') {
 	$attributes = array();
 
-	if ( function_exists( 'is_rtl' ) && is_rtl() )
+	if (function_exists('is_rtl') && is_rtl())
 		$attributes[] = 'dir="rtl"';
 
-	if ( $lang = get_bloginfo('language') ) {
-		if ( get_option('html_type') == 'text/html' || $doctype == 'html' )
+	if ($lang = get_bloginfo('language')) {
+		if (get_option('html_type') == 'text/html' || $doctype == 'html')
 			$attributes[] = "lang=\"$lang\"";
 
-		if ( get_option('html_type') != 'text/html' || $doctype == 'xhtml' )
+		if (get_option('html_type') != 'text/html' || $doctype == 'xhtml')
 			$attributes[] = "xml:lang=\"$lang\"";
 	}
 
@@ -3137,7 +3137,7 @@ 
 	 * @param string $output A space-separated list of language attributes.
 	 * @param string $doctype The type of html document (xhtml|html).
 	 */
-	return apply_filters( 'language_attributes', $output, $doctype );
+	return apply_filters('language_attributes', $output, $doctype);
 }
 
 /**
@@ -3151,8 +3151,8 @@ 
  *
  * @param string $doctype Optional. The type of html document. Accepts 'xhtml' or 'html'. Default 'html'.
  */
-function language_attributes( $doctype = 'html' ) {
-	echo get_language_attributes( $doctype );
+function language_attributes($doctype = 'html') {
+	echo get_language_attributes($doctype);
 }
 
 /**
@@ -3230,23 +3230,23 @@ 
  * }
  * @return array|string|void String of page links or array of page links.
  */
-function paginate_links( $args = '' ) {
+function paginate_links($args = '') {
 	global $wp_query, $wp_rewrite;
 
 	// Setting up default values based on the current URL.
-	$pagenum_link = html_entity_decode( get_pagenum_link() );
-	$url_parts    = explode( '?', $pagenum_link );
+	$pagenum_link = html_entity_decode(get_pagenum_link());
+	$url_parts    = explode('?', $pagenum_link);
 
 	// Get max pages and current page out of the current query, if available.
-	$total   = isset( $wp_query->max_num_pages ) ? $wp_query->max_num_pages : 1;
-	$current = get_query_var( 'paged' ) ? intval( get_query_var( 'paged' ) ) : 1;
+	$total   = isset($wp_query->max_num_pages) ? $wp_query->max_num_pages : 1;
+	$current = get_query_var('paged') ? intval(get_query_var('paged')) : 1;
 
 	// Append the format placeholder to the base URL.
-	$pagenum_link = trailingslashit( $url_parts[0] ) . '%_%';
+	$pagenum_link = trailingslashit($url_parts[0]).'%_%';
 
 	// URL base depends on permalink settings.
-	$format  = $wp_rewrite->using_index_permalinks() && ! strpos( $pagenum_link, 'index.php' ) ? 'index.php/' : '';
-	$format .= $wp_rewrite->using_permalinks() ? user_trailingslashit( $wp_rewrite->pagination_base . '/%#%', 'paged' ) : '?paged=%#%';
+	$format  = $wp_rewrite->using_index_permalinks() && ! strpos($pagenum_link, 'index.php') ? 'index.php/' : '';
+	$format .= $wp_rewrite->using_permalinks() ? user_trailingslashit($wp_rewrite->pagination_base.'/%#%', 'paged') : '?paged=%#%';
 
 	$defaults = array(
 		'base' => $pagenum_link, // http://example.com/all_posts.php%_% : %_% is replaced by format (below)
@@ -3266,42 +3266,42 @@ 
 		'after_page_number' => ''
 	);
 
-	$args = wp_parse_args( $args, $defaults );
+	$args = wp_parse_args($args, $defaults);
 
-	if ( ! is_array( $args['add_args'] ) ) {
+	if ( ! is_array($args['add_args'])) {
 		$args['add_args'] = array();
 	}
 
 	// Merge additional query vars found in the original URL into 'add_args' array.
-	if ( isset( $url_parts[1] ) ) {
+	if (isset($url_parts[1])) {
 		// Find the format argument.
-		$format = explode( '?', str_replace( '%_%', $args['format'], $args['base'] ) );
-		$format_query = isset( $format[1] ) ? $format[1] : '';
-		wp_parse_str( $format_query, $format_args );
+		$format = explode('?', str_replace('%_%', $args['format'], $args['base']));
+		$format_query = isset($format[1]) ? $format[1] : '';
+		wp_parse_str($format_query, $format_args);
 
 		// Find the query args of the requested URL.
-		wp_parse_str( $url_parts[1], $url_query_args );
+		wp_parse_str($url_parts[1], $url_query_args);
 
 		// Remove the format argument from the array of query arguments, to avoid overwriting custom format.
-		foreach ( $format_args as $format_arg => $format_arg_value ) {
-			unset( $url_query_args[ $format_arg ] );
+		foreach ($format_args as $format_arg => $format_arg_value) {
+			unset($url_query_args[$format_arg]);
 		}
 
-		$args['add_args'] = array_merge( $args['add_args'], urlencode_deep( $url_query_args ) );
+		$args['add_args'] = array_merge($args['add_args'], urlencode_deep($url_query_args));
 	}
 
 	// Who knows what else people pass in $args
 	$total = (int) $args['total'];
-	if ( $total < 2 ) {
+	if ($total < 2) {
 		return;
 	}
 	$current  = (int) $args['current'];
 	$end_size = (int) $args['end_size']; // Out of bounds?  Make it the default.
-	if ( $end_size < 1 ) {
+	if ($end_size < 1) {
 		$end_size = 1;
 	}
 	$mid_size = (int) $args['mid_size'];
-	if ( $mid_size < 0 ) {
+	if ($mid_size < 0) {
 		$mid_size = 2;
 	}
 	$add_args = $args['add_args'];
@@ -3309,11 +3309,11 @@ 
 	$page_links = array();
 	$dots = false;
 
-	if ( $args['prev_next'] && $current && 1 < $current ) :
-		$link = str_replace( '%_%', 2 == $current ? '' : $args['format'], $args['base'] );
-		$link = str_replace( '%#%', $current - 1, $link );
-		if ( $add_args )
-			$link = add_query_arg( $add_args, $link );
+	if ($args['prev_next'] && $current && 1 < $current) :
+		$link = str_replace('%_%', 2 == $current ? '' : $args['format'], $args['base']);
+		$link = str_replace('%#%', $current - 1, $link);
+		if ($add_args)
+			$link = add_query_arg($add_args, $link);
 		$link .= $args['add_fragment'];
 
 		/**
@@ -3323,40 +3323,40 @@ 
 		 *
 		 * @param string $link The paginated link URL.
 		 */
-		$page_links[] = '<a class="prev page-numbers" href="' . esc_url( apply_filters( 'paginate_links', $link ) ) . '">' . $args['prev_text'] . '</a>';
+		$page_links[] = '<a class="prev page-numbers" href="'.esc_url(apply_filters('paginate_links', $link)).'">'.$args['prev_text'].'</a>';
 	endif;
-	for ( $n = 1; $n <= $total; $n++ ) :
-		if ( $n == $current ) :
-			$page_links[] = "<span class='page-numbers current'>" . $args['before_page_number'] . number_format_i18n( $n ) . $args['after_page_number'] . "</span>";
+	for ($n = 1; $n <= $total; $n++) :
+		if ($n == $current) :
+			$page_links[] = "<span class='page-numbers current'>".$args['before_page_number'].number_format_i18n($n).$args['after_page_number']."</span>";
 			$dots = true;
 		else :
-			if ( $args['show_all'] || ( $n <= $end_size || ( $current && $n >= $current - $mid_size && $n <= $current + $mid_size ) || $n > $total - $end_size ) ) :
-				$link = str_replace( '%_%', 1 == $n ? '' : $args['format'], $args['base'] );
-				$link = str_replace( '%#%', $n, $link );
-				if ( $add_args )
-					$link = add_query_arg( $add_args, $link );
+			if ($args['show_all'] || ($n <= $end_size || ($current && $n >= $current - $mid_size && $n <= $current + $mid_size) || $n > $total - $end_size)) :
+				$link = str_replace('%_%', 1 == $n ? '' : $args['format'], $args['base']);
+				$link = str_replace('%#%', $n, $link);
+				if ($add_args)
+					$link = add_query_arg($add_args, $link);
 				$link .= $args['add_fragment'];
 
 				/** This filter is documented in wp-includes/general-template.php */
-				$page_links[] = "<a class='page-numbers' href='" . esc_url( apply_filters( 'paginate_links', $link ) ) . "'>" . $args['before_page_number'] . number_format_i18n( $n ) . $args['after_page_number'] . "</a>";
+				$page_links[] = "<a class='page-numbers' href='".esc_url(apply_filters('paginate_links', $link))."'>".$args['before_page_number'].number_format_i18n($n).$args['after_page_number']."</a>";
 				$dots = true;
-			elseif ( $dots && ! $args['show_all'] ) :
-				$page_links[] = '<span class="page-numbers dots">' . __( '&hellip;' ) . '</span>';
+			elseif ($dots && ! $args['show_all']) :
+				$page_links[] = '<span class="page-numbers dots">'.__('&hellip;').'</span>';
 				$dots = false;
 			endif;
 		endif;
 	endfor;
-	if ( $args['prev_next'] && $current && $current < $total ) :
-		$link = str_replace( '%_%', $args['format'], $args['base'] );
-		$link = str_replace( '%#%', $current + 1, $link );
-		if ( $add_args )
-			$link = add_query_arg( $add_args, $link );
+	if ($args['prev_next'] && $current && $current < $total) :
+		$link = str_replace('%_%', $args['format'], $args['base']);
+		$link = str_replace('%#%', $current + 1, $link);
+		if ($add_args)
+			$link = add_query_arg($add_args, $link);
 		$link .= $args['add_fragment'];
 
 		/** This filter is documented in wp-includes/general-template.php */
-		$page_links[] = '<a class="next page-numbers" href="' . esc_url( apply_filters( 'paginate_links', $link ) ) . '">' . $args['next_text'] . '</a>';
+		$page_links[] = '<a class="next page-numbers" href="'.esc_url(apply_filters('paginate_links', $link)).'">'.$args['next_text'].'</a>';
 	endif;
-	switch ( $args['type'] ) {
+	switch ($args['type']) {
 		case 'array' :
 			return $page_links;
 
@@ -3399,10 +3399,10 @@ 
  *     @type string $current SVG icon color of current admin menu link.
  * }
  */
-function wp_admin_css_color( $key, $name, $url, $colors = array(), $icons = array() ) {
+function wp_admin_css_color($key, $name, $url, $colors = array(), $icons = array()) {
 	global $_wp_admin_css_colors;
 
-	if ( !isset($_wp_admin_css_colors) )
+	if ( ! isset($_wp_admin_css_colors))
 		$_wp_admin_css_colors = array();
 
 	$_wp_admin_css_colors[$key] = (object) array(
@@ -3422,57 +3422,57 @@ 
 	$suffix = is_rtl() ? '-rtl' : '';
 	$suffix .= SCRIPT_DEBUG ? '' : '.min';
 
-	wp_admin_css_color( 'fresh', _x( 'Default', 'admin color scheme' ),
+	wp_admin_css_color('fresh', _x('Default', 'admin color scheme'),
 		false,
-		array( '#222', '#333', '#0073aa', '#00a0d2' ),
-		array( 'base' => '#82878c', 'focus' => '#00a0d2', 'current' => '#fff' )
+		array('#222', '#333', '#0073aa', '#00a0d2'),
+		array('base' => '#82878c', 'focus' => '#00a0d2', 'current' => '#fff')
 	);
 
 	// Other color schemes are not available when running out of src
-	if ( false !== strpos( get_bloginfo( 'version' ), '-src' ) ) {
+	if (false !== strpos(get_bloginfo('version'), '-src')) {
 		return;
 	}
 
-	wp_admin_css_color( 'light', _x( 'Light', 'admin color scheme' ),
-		admin_url( "css/colors/light/colors$suffix.css" ),
-		array( '#e5e5e5', '#999', '#d64e07', '#04a4cc' ),
-		array( 'base' => '#999', 'focus' => '#ccc', 'current' => '#ccc' )
+	wp_admin_css_color('light', _x('Light', 'admin color scheme'),
+		admin_url("css/colors/light/colors$suffix.css"),
+		array('#e5e5e5', '#999', '#d64e07', '#04a4cc'),
+		array('base' => '#999', 'focus' => '#ccc', 'current' => '#ccc')
 	);
 
-	wp_admin_css_color( 'blue', _x( 'Blue', 'admin color scheme' ),
-		admin_url( "css/colors/blue/colors$suffix.css" ),
-		array( '#096484', '#4796b3', '#52accc', '#74B6CE' ),
-		array( 'base' => '#e5f8ff', 'focus' => '#fff', 'current' => '#fff' )
+	wp_admin_css_color('blue', _x('Blue', 'admin color scheme'),
+		admin_url("css/colors/blue/colors$suffix.css"),
+		array('#096484', '#4796b3', '#52accc', '#74B6CE'),
+		array('base' => '#e5f8ff', 'focus' => '#fff', 'current' => '#fff')
 	);
 
-	wp_admin_css_color( 'midnight', _x( 'Midnight', 'admin color scheme' ),
-		admin_url( "css/colors/midnight/colors$suffix.css" ),
-		array( '#25282b', '#363b3f', '#69a8bb', '#e14d43' ),
-		array( 'base' => '#f1f2f3', 'focus' => '#fff', 'current' => '#fff' )
+	wp_admin_css_color('midnight', _x('Midnight', 'admin color scheme'),
+		admin_url("css/colors/midnight/colors$suffix.css"),
+		array('#25282b', '#363b3f', '#69a8bb', '#e14d43'),
+		array('base' => '#f1f2f3', 'focus' => '#fff', 'current' => '#fff')
 	);
 
-	wp_admin_css_color( 'sunrise', _x( 'Sunrise', 'admin color scheme' ),
-		admin_url( "css/colors/sunrise/colors$suffix.css" ),
-		array( '#b43c38', '#cf4944', '#dd823b', '#ccaf0b' ),
-		array( 'base' => '#f3f1f1', 'focus' => '#fff', 'current' => '#fff' )
+	wp_admin_css_color('sunrise', _x('Sunrise', 'admin color scheme'),
+		admin_url("css/colors/sunrise/colors$suffix.css"),
+		array('#b43c38', '#cf4944', '#dd823b', '#ccaf0b'),
+		array('base' => '#f3f1f1', 'focus' => '#fff', 'current' => '#fff')
 	);
 
-	wp_admin_css_color( 'ectoplasm', _x( 'Ectoplasm', 'admin color scheme' ),
-		admin_url( "css/colors/ectoplasm/colors$suffix.css" ),
-		array( '#413256', '#523f6d', '#a3b745', '#d46f15' ),
-		array( 'base' => '#ece6f6', 'focus' => '#fff', 'current' => '#fff' )
+	wp_admin_css_color('ectoplasm', _x('Ectoplasm', 'admin color scheme'),
+		admin_url("css/colors/ectoplasm/colors$suffix.css"),
+		array('#413256', '#523f6d', '#a3b745', '#d46f15'),
+		array('base' => '#ece6f6', 'focus' => '#fff', 'current' => '#fff')
 	);
 
-	wp_admin_css_color( 'ocean', _x( 'Ocean', 'admin color scheme' ),
-		admin_url( "css/colors/ocean/colors$suffix.css" ),
-		array( '#627c83', '#738e96', '#9ebaa0', '#aa9d88' ),
-		array( 'base' => '#f2fcff', 'focus' => '#fff', 'current' => '#fff' )
+	wp_admin_css_color('ocean', _x('Ocean', 'admin color scheme'),
+		admin_url("css/colors/ocean/colors$suffix.css"),
+		array('#627c83', '#738e96', '#9ebaa0', '#aa9d88'),
+		array('base' => '#f2fcff', 'focus' => '#fff', 'current' => '#fff')
 	);
 
-	wp_admin_css_color( 'coffee', _x( 'Coffee', 'admin color scheme' ),
-		admin_url( "css/colors/coffee/colors$suffix.css" ),
-		array( '#46403c', '#59524c', '#c7a589', '#9ea476' ),
-		array( 'base' => '#f3f2f1', 'focus' => '#fff', 'current' => '#fff' )
+	wp_admin_css_color('coffee', _x('Coffee', 'admin color scheme'),
+		admin_url("css/colors/coffee/colors$suffix.css"),
+		array('#46403c', '#59524c', '#c7a589', '#9ea476'),
+		array('base' => '#f3f2f1', 'focus' => '#fff', 'current' => '#fff')
 	);
 
 }
@@ -3487,13 +3487,13 @@ 
  * @param string $file file relative to wp-admin/ without its ".css" extension.
  * @return string
  */
-function wp_admin_css_uri( $file = 'wp-admin' ) {
-	if ( defined('WP_INSTALLING') ) {
+function wp_admin_css_uri($file = 'wp-admin') {
+	if (defined('WP_INSTALLING')) {
 		$_file = "./$file.css";
 	} else {
 		$_file = admin_url("$file.css");
 	}
-	$_file = add_query_arg( 'version', get_bloginfo( 'version' ),  $_file );
+	$_file = add_query_arg('version', get_bloginfo('version'), $_file);
 
 	/**
 	 * Filters the URI of a WordPress admin CSS file.
@@ -3503,7 +3503,7 @@ 
 	 * @param string $_file Relative path to the file with query arguments attached.
 	 * @param string $file  Relative path to the file, minus its ".css" extension.
 	 */
-	return apply_filters( 'wp_admin_css_uri', $_file, $file );
+	return apply_filters('wp_admin_css_uri', $_file, $file);
 }
 
 /**
@@ -3526,15 +3526,15 @@ 
  * 	                         to wp-admin/. Defaults to 'wp-admin'.
  * @param bool   $force_echo Optional. Force the stylesheet link to be printed rather than enqueued.
  */
-function wp_admin_css( $file = 'wp-admin', $force_echo = false ) {
+function wp_admin_css($file = 'wp-admin', $force_echo = false) {
 	// For backward compatibility
-	$handle = 0 === strpos( $file, 'css/' ) ? substr( $file, 4 ) : $file;
+	$handle = 0 === strpos($file, 'css/') ? substr($file, 4) : $file;
 
-	if ( wp_styles()->query( $handle ) ) {
-		if ( $force_echo || did_action( 'wp_print_styles' ) ) // we already printed the style queue. Print this one immediately
-			wp_print_styles( $handle );
+	if (wp_styles()->query($handle)) {
+		if ($force_echo || did_action('wp_print_styles')) // we already printed the style queue. Print this one immediately
+			wp_print_styles($handle);
 		else // Add to style queue
-			wp_enqueue_style( $handle );
+			wp_enqueue_style($handle);
 		return;
 	}
 
@@ -3549,11 +3549,11 @@ 
 	 * @param string $file            Style handle name or filename (without ".css" extension)
 	 *                                relative to wp-admin/. Defaults to 'wp-admin'.
 	 */
-	echo apply_filters( 'wp_admin_css', "<link rel='stylesheet' href='" . esc_url( wp_admin_css_uri( $file ) ) . "' type='text/css' />\n", $file );
+	echo apply_filters('wp_admin_css', "<link rel='stylesheet' href='".esc_url(wp_admin_css_uri($file))."' type='text/css' />\n", $file);
 
-	if ( function_exists( 'is_rtl' ) && is_rtl() ) {
+	if (function_exists('is_rtl') && is_rtl()) {
 		/** This filter is documented in wp-includes/general-template.php */
-		echo apply_filters( 'wp_admin_css', "<link rel='stylesheet' href='" . esc_url( wp_admin_css_uri( "$file-rtl" ) ) . "' type='text/css' />\n", "$file-rtl" );
+		echo apply_filters('wp_admin_css', "<link rel='stylesheet' href='".esc_url(wp_admin_css_uri("$file-rtl"))."' type='text/css' />\n", "$file-rtl");
 	}
 }
 
@@ -3567,11 +3567,11 @@ 
  * @since 2.5.0
  */
 function add_thickbox() {
-	wp_enqueue_script( 'thickbox' );
-	wp_enqueue_style( 'thickbox' );
+	wp_enqueue_script('thickbox');
+	wp_enqueue_style('thickbox');
 
-	if ( is_network_admin() )
-		add_action( 'admin_head', '_thickbox_path_admin_subfolder' );
+	if (is_network_admin())
+		add_action('admin_head', '_thickbox_path_admin_subfolder');
 }
 
 /**
@@ -3589,7 +3589,7 @@ 
 	 *
 	 * @param string $generator_type The XHTML generator.
 	 */
-	the_generator( apply_filters( 'wp_generator_type', 'xhtml' ) );
+	the_generator(apply_filters('wp_generator_type', 'xhtml'));
 }
 
 /**
@@ -3602,7 +3602,7 @@ 
  *
  * @param string $type The type of generator to output - (html|xhtml|atom|rss2|rdf|comment|export).
  */
-function the_generator( $type ) {
+function the_generator($type) {
 	/**
 	 * Filters the output of the XHTML generator tag for display.
 	 *
@@ -3612,7 +3612,7 @@ 
 	 * @param string $type           The type of generator to output. Accepts 'html',
 	 *                               'xhtml', 'atom', 'rss2', 'rdf', 'comment', 'export'.
 	 */
-	echo apply_filters( 'the_generator', get_the_generator($type), $type ) . "\n";
+	echo apply_filters('the_generator', get_the_generator($type), $type)."\n";
 }
 
 /**
@@ -3627,14 +3627,14 @@ 
  * @param string $type The type of generator to return - (html|xhtml|atom|rss2|rdf|comment|export).
  * @return string|void The HTML content for the generator.
  */
-function get_the_generator( $type = '' ) {
-	if ( empty( $type ) ) {
+function get_the_generator($type = '') {
+	if (empty($type)) {
 
 		$current_filter = current_filter();
-		if ( empty( $current_filter ) )
+		if (empty($current_filter))
 			return;
 
-		switch ( $current_filter ) {
+		switch ($current_filter) {
 			case 'rss2_head' :
 			case 'commentsrss2_head' :
 				$type = 'rss2';
@@ -3654,27 +3654,27 @@ 
 		}
 	}
 
-	switch ( $type ) {
+	switch ($type) {
 		case 'html':
-			$gen = '<meta name="generator" content="WordPress ' . get_bloginfo( 'version' ) . '">';
+			$gen = '<meta name="generator" content="WordPress '.get_bloginfo('version').'">';
 			break;
 		case 'xhtml':
-			$gen = '<meta name="generator" content="WordPress ' . get_bloginfo( 'version' ) . '" />';
+			$gen = '<meta name="generator" content="WordPress '.get_bloginfo('version').'" />';
 			break;
 		case 'atom':
-			$gen = '<generator uri="https://wordpress.org/" version="' . get_bloginfo_rss( 'version' ) . '">WordPress</generator>';
+			$gen = '<generator uri="https://wordpress.org/" version="'.get_bloginfo_rss('version').'">WordPress</generator>';
 			break;
 		case 'rss2':
-			$gen = '<generator>https://wordpress.org/?v=' . get_bloginfo_rss( 'version' ) . '</generator>';
+			$gen = '<generator>https://wordpress.org/?v='.get_bloginfo_rss('version').'</generator>';
 			break;
 		case 'rdf':
-			$gen = '<admin:generatorAgent rdf:resource="https://wordpress.org/?v=' . get_bloginfo_rss( 'version' ) . '" />';
+			$gen = '<admin:generatorAgent rdf:resource="https://wordpress.org/?v='.get_bloginfo_rss('version').'" />';
 			break;
 		case 'comment':
-			$gen = '<!-- generator="WordPress/' . get_bloginfo( 'version' ) . '" -->';
+			$gen = '<!-- generator="WordPress/'.get_bloginfo('version').'" -->';
 			break;
 		case 'export':
-			$gen = '<!-- generator="WordPress/' . get_bloginfo_rss('version') . '" created="'. date('Y-m-d H:i') . '" -->';
+			$gen = '<!-- generator="WordPress/'.get_bloginfo_rss('version').'" created="'.date('Y-m-d H:i').'" -->';
 			break;
 	}
 
@@ -3689,7 +3689,7 @@ 
 	 * @param string $type The type of generator. Accepts 'html', 'xhtml', 'atom',
 	 *                     'rss2', 'rdf', 'comment', 'export'.
 	 */
-	return apply_filters( "get_the_generator_{$type}", $gen, $type );
+	return apply_filters("get_the_generator_{$type}", $gen, $type);
 }
 
 /**
@@ -3704,8 +3704,8 @@ 
  * @param bool  $echo    Whether to echo or just return the string
  * @return string html attribute or empty string
  */
-function checked( $checked, $current = true, $echo = true ) {
-	return __checked_selected_helper( $checked, $current, $echo, 'checked' );
+function checked($checked, $current = true, $echo = true) {
+	return __checked_selected_helper($checked, $current, $echo, 'checked');
 }
 
 /**
@@ -3720,8 +3720,8 @@ 
  * @param bool  $echo     Whether to echo or just return the string
  * @return string html attribute or empty string
  */
-function selected( $selected, $current = true, $echo = true ) {
-	return __checked_selected_helper( $selected, $current, $echo, 'selected' );
+function selected($selected, $current = true, $echo = true) {
+	return __checked_selected_helper($selected, $current, $echo, 'selected');
 }
 
 /**
@@ -3736,8 +3736,8 @@ 
  * @param bool  $echo     Whether to echo or just return the string
  * @return string html attribute or empty string
  */
-function disabled( $disabled, $current = true, $echo = true ) {
-	return __checked_selected_helper( $disabled, $current, $echo, 'disabled' );
+function disabled($disabled, $current = true, $echo = true) {
+	return __checked_selected_helper($disabled, $current, $echo, 'disabled');
 }
 
 /**
@@ -3754,13 +3754,13 @@ 
  * @param string $type    The type of checked|selected|disabled we are doing
  * @return string html attribute or empty string
  */
-function __checked_selected_helper( $helper, $current, $echo, $type ) {
-	if ( (string) $helper === (string) $current )
+function __checked_selected_helper($helper, $current, $echo, $type) {
+	if ((string) $helper === (string) $current)
 		$result = " $type='$type'";
 	else
 		$result = '';
 
-	if ( $echo )
+	if ($echo)
 		echo $result;
 
 	return $result;
@@ -3776,12 +3776,12 @@ 
  * @param array $settings
  * @return array $settings
  */
-function wp_heartbeat_settings( $settings ) {
-	if ( ! is_admin() )
-		$settings['ajaxurl'] = admin_url( 'admin-ajax.php', 'relative' );
+function wp_heartbeat_settings($settings) {
+	if ( ! is_admin())
+		$settings['ajaxurl'] = admin_url('admin-ajax.php', 'relative');
 
-	if ( is_user_logged_in() )
-		$settings['nonce'] = wp_create_nonce( 'heartbeat-nonce' );
+	if (is_user_logged_in())
+		$settings['nonce'] = wp_create_nonce('heartbeat-nonce');
 
 	return $settings;
 }

Braces +189 added lines, -135 removed lines

@@ -114,8 +114,9 @@ 
 
 	$templates = array();
 	$name = (string) $name;
-	if ( '' !== $name )
-		$templates[] = "sidebar-{$name}.php";
+	if ( '' !== $name ) {
+			$templates[] = "sidebar-{$name}.php";
+	}
 
 	$templates[] = 'sidebar.php';
 
@@ -159,8 +160,9 @@ 
 
 	$templates = array();
 	$name = (string) $name;
-	if ( '' !== $name )
-		$templates[] = "{$slug}-{$name}.php";
+	if ( '' !== $name ) {
+			$templates[] = "{$slug}-{$name}.php";
+	}
 
 	$templates[] = "{$slug}.php";
 
@@ -246,14 +248,16 @@ 
 	 */
 	$result = apply_filters( 'get_search_form', $form );
 
-	if ( null === $result )
-		$result = $form;
+	if ( null === $result ) {
+			$result = $form;
+	}
 
-	if ( $echo )
-		echo $result;
-	else
-		return $result;
-}
+	if ( $echo ) {
+			echo $result;
+	} else {
+			return $result;
+	}
+	}
 
 /**
  * Display the Log In/Out link.
@@ -268,10 +272,11 @@ 
  * @return string|void String when retrieving.
  */
 function wp_loginout($redirect = '', $echo = true) {
-	if ( ! is_user_logged_in() )
-		$link = '<a href="' . esc_url( wp_login_url($redirect) ) . '">' . __('Log in') . '</a>';
-	else
-		$link = '<a href="' . esc_url( wp_logout_url($redirect) ) . '">' . __('Log out') . '</a>';
+	if ( ! is_user_logged_in() ) {
+			$link = '<a href="' . esc_url( wp_login_url($redirect) ) . '">' . __('Log in') . '</a>';
+	} else {
+			$link = '<a href="' . esc_url( wp_logout_url($redirect) ) . '">' . __('Log out') . '</a>';
+	}
 
 	if ( $echo ) {
 		/**
@@ -331,11 +336,13 @@ 
 function wp_login_url($redirect = '', $force_reauth = false) {
 	$login_url = site_url('wp-login.php', 'login');
 
-	if ( !empty($redirect) )
-		$login_url = add_query_arg('redirect_to', urlencode($redirect), $login_url);
+	if ( !empty($redirect) ) {
+			$login_url = add_query_arg('redirect_to', urlencode($redirect), $login_url);
+	}
 
-	if ( $force_reauth )
-		$login_url = add_query_arg('reauth', '1', $login_url);
+	if ( $force_reauth ) {
+			$login_url = add_query_arg('reauth', '1', $login_url);
+	}
 
 	/**
 	 * Filters the login URL.
@@ -487,11 +494,12 @@ 
 			' . $login_form_bottom . '
 		</form>';
 
-	if ( $args['echo'] )
-		echo $form;
-	else
-		return $form;
-}
+	if ( $args['echo'] ) {
+			echo $form;
+	} else {
+			return $form;
+	}
+	}
 
 /**
  * Returns the URL that allows the user to retrieve the lost password
@@ -535,10 +543,11 @@ 
  */
 function wp_register( $before = '<li>', $after = '</li>', $echo = true ) {
 	if ( ! is_user_logged_in() ) {
-		if ( get_option('users_can_register') )
-			$link = $before . '<a href="' . esc_url( wp_registration_url() ) . '">' . __('Register') . '</a>' . $after;
-		else
-			$link = '';
+		if ( get_option('users_can_register') ) {
+					$link = $before . '<a href="' . esc_url( wp_registration_url() ) . '">' . __('Register') . '</a>' . $after;
+		} else {
+					$link = '';
+		}
 	} elseif ( current_user_can( 'read' ) ) {
 		$link = $before . '<a href="' . admin_url() . '">' . __('Site Admin') . '</a>' . $after;
 	} else {
@@ -699,7 +708,9 @@ 
 			break;
 		case 'charset':
 			$output = get_option('blog_charset');
-			if ('' == $output) $output = 'UTF-8';
+			if ('' == $output) {
+				$output = 'UTF-8';
+			}
 			break;
 		case 'html_type' :
 			$output = get_option('html_type');
@@ -742,8 +753,9 @@ 
 	$url = true;
 	if (strpos($show, 'url') === false &&
 		strpos($show, 'directory') === false &&
-		strpos($show, 'home') === false)
-		$url = false;
+		strpos($show, 'home') === false) {
+			$url = false;
+	}
 
 	if ( 'display' == $filter ) {
 		if ( $url ) {
@@ -1244,8 +1256,9 @@ 
 function single_post_title( $prefix = '', $display = true ) {
 	$_post = get_queried_object();
 
-	if ( !isset($_post->post_title) )
-		return;
+	if ( !isset($_post->post_title) ) {
+			return;
+	}
 
 	/**
 	 * Filters the page title for a single post.
@@ -1256,11 +1269,12 @@ 
 	 * @param object $_post       The current queried object as returned by get_queried_object().
 	 */
 	$title = apply_filters( 'single_post_title', $_post->post_title, $_post );
-	if ( $display )
-		echo $prefix . $title;
-	else
-		return $prefix . $title;
-}
+	if ( $display ) {
+			echo $prefix . $title;
+	} else {
+			return $prefix . $title;
+	}
+	}
 
 /**
  * Display or retrieve title for a post type archive.
@@ -1275,12 +1289,14 @@ 
  * @return string|void Title when retrieving, null when displaying or failure.
  */
 function post_type_archive_title( $prefix = '', $display = true ) {
-	if ( ! is_post_type_archive() )
-		return;
+	if ( ! is_post_type_archive() ) {
+			return;
+	}
 
 	$post_type = get_query_var( 'post_type' );
-	if ( is_array( $post_type ) )
-		$post_type = reset( $post_type );
+	if ( is_array( $post_type ) ) {
+			$post_type = reset( $post_type );
+	}
 
 	$post_type_obj = get_post_type_object( $post_type );
 
@@ -1294,11 +1310,12 @@ 
 	 */
 	$title = apply_filters( 'post_type_archive_title', $post_type_obj->labels->name, $post_type );
 
-	if ( $display )
-		echo $prefix . $title;
-	else
-		return $prefix . $title;
-}
+	if ( $display ) {
+			echo $prefix . $title;
+	} else {
+			return $prefix . $title;
+	}
+	}
 
 /**
  * Display or retrieve page title for category archive.
@@ -1350,8 +1367,9 @@ 
 function single_term_title( $prefix = '', $display = true ) {
 	$term = get_queried_object();
 
-	if ( !$term )
-		return;
+	if ( !$term ) {
+			return;
+	}
 
 	if ( is_category() ) {
 		/**
@@ -1384,14 +1402,16 @@ 
 		return;
 	}
 
-	if ( empty( $term_name ) )
-		return;
+	if ( empty( $term_name ) ) {
+			return;
+	}
 
-	if ( $display )
-		echo $prefix . $term_name;
-	else
-		return $prefix . $term_name;
-}
+	if ( $display ) {
+			echo $prefix . $term_name;
+	} else {
+			return $prefix . $term_name;
+	}
+	}
 
 /**
  * Display or retrieve page title for post archive based on date.
@@ -1424,13 +1444,15 @@ 
 		$my_month = $wp_locale->get_month(substr($m, 4, 2));
 	}
 
-	if ( empty($my_month) )
-		return false;
+	if ( empty($my_month) ) {
+			return false;
+	}
 
 	$result = $prefix . $my_month . $prefix . $my_year;
 
-	if ( !$display )
-		return $result;
+	if ( !$display ) {
+			return $result;
+	}
 	echo $result;
 }
 
@@ -1600,14 +1622,16 @@ 
 	$text = wptexturize($text);
 	$url = esc_url($url);
 
-	if ('link' == $format)
-		$link_html = "\t<link rel='archives' title='" . esc_attr( $text ) . "' href='$url' />\n";
-	elseif ('option' == $format)
-		$link_html = "\t<option value='$url'>$before $text $after</option>\n";
-	elseif ('html' == $format)
-		$link_html = "\t<li>$before<a href='$url'>$text</a>$after</li>\n";
-	else // custom
+	if ('link' == $format) {
+			$link_html = "\t<link rel='archives' title='" . esc_attr( $text ) . "' href='$url' />\n";
+	} elseif ('option' == $format) {
+			$link_html = "\t<option value='$url'>$before $text $after</option>\n";
+	} elseif ('html' == $format) {
+			$link_html = "\t<li>$before<a href='$url'>$text</a>$after</li>\n";
+	} else {
+		// custom
 		$link_html = "\t$before<a href='$url'>$text</a>$after\n";
+	}
 
 	/**
 	 * Filters the archive link content.
@@ -2191,10 +2215,11 @@ 
 		 */
 		$the_date = apply_filters( 'the_date', $the_date, $d, $before, $after );
 
-		if ( $echo )
-			echo $the_date;
-		else
-			return $the_date;
+		if ( $echo ) {
+					echo $the_date;
+		} else {
+					return $the_date;
+		}
 	}
 }
 
@@ -2263,10 +2288,11 @@ 
 	 */
 	$the_modified_date = apply_filters( 'the_modified_date', $the_modified_date, $d, $before, $after );
 
-	if ( $echo )
-		echo $the_modified_date;
-	else
-		return $the_modified_date;
+	if ( $echo ) {
+			echo $the_modified_date;
+	} else {
+			return $the_modified_date;
+	}
 
 }
 
@@ -2344,10 +2370,11 @@ 
 		return false;
 	}
 
-	if ( '' == $d )
-		$the_time = get_post_time(get_option('time_format'), false, $post, true);
-	else
-		$the_time = get_post_time($d, false, $post, true);
+	if ( '' == $d ) {
+			$the_time = get_post_time(get_option('time_format'), false, $post, true);
+	} else {
+			$the_time = get_post_time($d, false, $post, true);
+	}
 
 	/**
 	 * Filters the time a post was written.
@@ -2382,10 +2409,11 @@ 
 		return false;
 	}
 
-	if ( $gmt )
-		$time = $post->post_date_gmt;
-	else
-		$time = $post->post_date;
+	if ( $gmt ) {
+			$time = $post->post_date_gmt;
+	} else {
+			$time = $post->post_date;
+	}
 
 	$time = mysql2date($d, $time, $translate);
 
@@ -2481,10 +2509,11 @@ 
 		return false;
 	}
 
-	if ( $gmt )
-		$time = $post->post_modified_gmt;
-	else
-		$time = $post->post_modified;
+	if ( $gmt ) {
+			$time = $post->post_modified_gmt;
+	} else {
+			$time = $post->post_modified;
+	}
 	$time = mysql2date($d, $time, $translate);
 
 	/**
@@ -2598,8 +2627,9 @@ 
  * @param array $args Optional arguments.
  */
 function feed_links( $args = array() ) {
-	if ( !current_theme_supports('automatic-feed-links') )
-		return;
+	if ( !current_theme_supports('automatic-feed-links') ) {
+			return;
+	}
 
 	$defaults = array(
 		/* translators: Separator between blog name and feed type in feed links */
@@ -2674,8 +2704,9 @@ 
 		}
 	} elseif ( is_post_type_archive() ) {
 		$post_type = get_query_var( 'post_type' );
-		if ( is_array( $post_type ) )
-			$post_type = reset( $post_type );
+		if ( is_array( $post_type ) ) {
+					$post_type = reset( $post_type );
+		}
 
 		$post_type_obj = get_post_type_object( $post_type );
 		$title = sprintf( $args['posttypetitle'], get_bloginfo( 'name' ), $args['separator'], $post_type_obj->labels->name );
@@ -2710,13 +2741,15 @@ 
 	} elseif ( is_post_type_archive() ) {
 		$title = sprintf( $args['posttypetitle'], get_bloginfo('name'), $args['separator'], post_type_archive_title( '', false ) );
 		$post_type_obj = get_queried_object();
-		if ( $post_type_obj )
-			$href = get_post_type_archive_feed_link( $post_type_obj->name );
+		if ( $post_type_obj ) {
+					$href = get_post_type_archive_feed_link( $post_type_obj->name );
+		}
 	}
 
-	if ( isset($title) && isset($href) )
-		echo '<link rel="alternate" type="' . feed_content_type() . '" title="' . esc_attr( $title ) . '" href="' . esc_url( $href ) . '" />' . "\n";
-}
+	if ( isset($title) && isset($href) ) {
+			echo '<link rel="alternate" type="' . feed_content_type() . '" title="' . esc_attr( $title ) . '" href="' . esc_url( $href ) . '" />' . "\n";
+	}
+	}
 
 /**
  * Display the link to the Really Simple Discovery service endpoint.
@@ -2756,9 +2789,10 @@ 
  */
 function noindex() {
 	// If the blog is not public, tell robots to go away.
-	if ( '0' == get_option('blog_public') )
-		wp_no_robots();
-}
+	if ( '0' == get_option('blog_public') ) {
+			wp_no_robots();
+	}
+	}
 
 /**
  * Display a noindex meta tag.
@@ -3051,8 +3085,9 @@ 
  * @param array  $settings  See _WP_Editors::editor().
  */
 function wp_editor( $content, $editor_id, $settings = array() ) {
-	if ( ! class_exists( '_WP_Editors', false ) )
-		require( ABSPATH . WPINC . '/class-wp-editor.php' );
+	if ( ! class_exists( '_WP_Editors', false ) ) {
+			require( ABSPATH . WPINC . '/class-wp-editor.php' );
+	}
 	_WP_Editors::editor($content, $editor_id, $settings);
 }
 
@@ -3078,8 +3113,9 @@ 
 	 */
 	$query = apply_filters( 'get_search_query', get_query_var( 's' ) );
 
-	if ( $escaped )
-		$query = esc_attr( $query );
+	if ( $escaped ) {
+			$query = esc_attr( $query );
+	}
 	return $query;
 }
 
@@ -3115,15 +3151,18 @@ 
 function get_language_attributes( $doctype = 'html' ) {
 	$attributes = array();
 
-	if ( function_exists( 'is_rtl' ) && is_rtl() )
-		$attributes[] = 'dir="rtl"';
+	if ( function_exists( 'is_rtl' ) && is_rtl() ) {
+			$attributes[] = 'dir="rtl"';
+	}
 
 	if ( $lang = get_bloginfo('language') ) {
-		if ( get_option('html_type') == 'text/html' || $doctype == 'html' )
-			$attributes[] = "lang=\"$lang\"";
+		if ( get_option('html_type') == 'text/html' || $doctype == 'html' ) {
+					$attributes[] = "lang=\"$lang\"";
+		}
 
-		if ( get_option('html_type') != 'text/html' || $doctype == 'xhtml' )
-			$attributes[] = "xml:lang=\"$lang\"";
+		if ( get_option('html_type') != 'text/html' || $doctype == 'xhtml' ) {
+					$attributes[] = "xml:lang=\"$lang\"";
+		}
 	}
 
 	$output = implode(' ', $attributes);
@@ -3312,8 +3351,9 @@ 
 	if ( $args['prev_next'] && $current && 1 < $current ) :
 		$link = str_replace( '%_%', 2 == $current ? '' : $args['format'], $args['base'] );
 		$link = str_replace( '%#%', $current - 1, $link );
-		if ( $add_args )
-			$link = add_query_arg( $add_args, $link );
+		if ( $add_args ) {
+					$link = add_query_arg( $add_args, $link );
+		}
 		$link .= $args['add_fragment'];
 
 		/**
@@ -3329,12 +3369,15 @@ 
 		if ( $n == $current ) :
 			$page_links[] = "<span class='page-numbers current'>" . $args['before_page_number'] . number_format_i18n( $n ) . $args['after_page_number'] . "</span>";
 			$dots = true;
-		else :
+		else {
+			:
 			if ( $args['show_all'] || ( $n <= $end_size || ( $current && $n >= $current - $mid_size && $n <= $current + $mid_size ) || $n > $total - $end_size ) ) :
 				$link = str_replace( '%_%', 1 == $n ? '' : $args['format'], $args['base'] );
+		}
 				$link = str_replace( '%#%', $n, $link );
-				if ( $add_args )
-					$link = add_query_arg( $add_args, $link );
+				if ( $add_args ) {
+									$link = add_query_arg( $add_args, $link );
+				}
 				$link .= $args['add_fragment'];
 
 				/** This filter is documented in wp-includes/general-template.php */
@@ -3349,8 +3392,9 @@ 
 	if ( $args['prev_next'] && $current && $current < $total ) :
 		$link = str_replace( '%_%', $args['format'], $args['base'] );
 		$link = str_replace( '%#%', $current + 1, $link );
-		if ( $add_args )
-			$link = add_query_arg( $add_args, $link );
+		if ( $add_args ) {
+					$link = add_query_arg( $add_args, $link );
+		}
 		$link .= $args['add_fragment'];
 
 		/** This filter is documented in wp-includes/general-template.php */
@@ -3402,8 +3446,9 @@ 
 function wp_admin_css_color( $key, $name, $url, $colors = array(), $icons = array() ) {
 	global $_wp_admin_css_colors;
 
-	if ( !isset($_wp_admin_css_colors) )
-		$_wp_admin_css_colors = array();
+	if ( !isset($_wp_admin_css_colors) ) {
+			$_wp_admin_css_colors = array();
+	}
 
 	$_wp_admin_css_colors[$key] = (object) array(
 		'name' => $name,
@@ -3531,10 +3576,13 @@ 
 	$handle = 0 === strpos( $file, 'css/' ) ? substr( $file, 4 ) : $file;
 
 	if ( wp_styles()->query( $handle ) ) {
-		if ( $force_echo || did_action( 'wp_print_styles' ) ) // we already printed the style queue. Print this one immediately
+		if ( $force_echo || did_action( 'wp_print_styles' ) ) {
+			// we already printed the style queue. Print this one immediately
 			wp_print_styles( $handle );
-		else // Add to style queue
+		} else {
+			// Add to style queue
 			wp_enqueue_style( $handle );
+		}
 		return;
 	}
 
@@ -3570,9 +3618,10 @@ 
 	wp_enqueue_script( 'thickbox' );
 	wp_enqueue_style( 'thickbox' );
 
-	if ( is_network_admin() )
-		add_action( 'admin_head', '_thickbox_path_admin_subfolder' );
-}
+	if ( is_network_admin() ) {
+			add_action( 'admin_head', '_thickbox_path_admin_subfolder' );
+	}
+	}
 
 /**
  * Displays the XHTML generator that is generated on the wp_head hook.
@@ -3631,8 +3680,9 @@ 
 	if ( empty( $type ) ) {
 
 		$current_filter = current_filter();
-		if ( empty( $current_filter ) )
-			return;
+		if ( empty( $current_filter ) ) {
+					return;
+		}
 
 		switch ( $current_filter ) {
 			case 'rss2_head' :
@@ -3755,13 +3805,15 @@ 
  * @return string html attribute or empty string
  */
 function __checked_selected_helper( $helper, $current, $echo, $type ) {
-	if ( (string) $helper === (string) $current )
-		$result = " $type='$type'";
-	else
-		$result = '';
+	if ( (string) $helper === (string) $current ) {
+			$result = " $type='$type'";
+	} else {
+			$result = '';
+	}
 
-	if ( $echo )
-		echo $result;
+	if ( $echo ) {
+			echo $result;
+	}
 
 	return $result;
 }
@@ -3777,11 +3829,13 @@ 
  * @return array $settings
  */
 function wp_heartbeat_settings( $settings ) {
-	if ( ! is_admin() )
-		$settings['ajaxurl'] = admin_url( 'admin-ajax.php', 'relative' );
+	if ( ! is_admin() ) {
+			$settings['ajaxurl'] = admin_url( 'admin-ajax.php', 'relative' );
+	}
 
-	if ( is_user_logged_in() )
-		$settings['nonce'] = wp_create_nonce( 'heartbeat-nonce' );
+	if ( is_user_logged_in() ) {
+			$settings['nonce'] = wp_create_nonce( 'heartbeat-nonce' );
+	}
 
 	return $settings;
 }

src/wp-includes/media.php

Doc Comments +8 added lines, -8 removed lines

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

Spacing +907 added lines, -907 removed lines

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

Braces +108 added lines, -80 removed lines

@@ -59,14 +59,14 @@ 
 
 	$_wp_additional_image_sizes = wp_get_additional_image_sizes();
 
-	if ( ! $context )
-		$context = is_admin() ? 'edit' : 'display';
+	if ( ! $context ) {
+			$context = is_admin() ? 'edit' : 'display';
+	}
 
 	if ( is_array($size) ) {
 		$max_width = $size[0];
 		$max_height = $size[1];
-	}
-	elseif ( $size == 'thumb' || $size == 'thumbnail' ) {
+	} elseif ( $size == 'thumb' || $size == 'thumbnail' ) {
 		$max_width = intval(get_option('thumbnail_size_w'));
 		$max_height = intval(get_option('thumbnail_size_h'));
 		// last chance thumbnail size defaults
@@ -74,21 +74,18 @@ 
 			$max_width = 128;
 			$max_height = 96;
 		}
-	}
-	elseif ( $size == 'medium' ) {
+	} elseif ( $size == 'medium' ) {
 		$max_width = intval(get_option('medium_size_w'));
 		$max_height = intval(get_option('medium_size_h'));
 
-	}
-	elseif ( $size == 'medium_large' ) {
+	} elseif ( $size == 'medium_large' ) {
 		$max_width = intval( get_option( 'medium_large_size_w' ) );
 		$max_height = intval( get_option( 'medium_large_size_h' ) );
 
 		if ( intval( $content_width ) > 0 ) {
 			$max_width = min( intval( $content_width ), $max_width );
 		}
-	}
-	elseif ( $size == 'large' ) {
+	} elseif ( $size == 'large' ) {
 		/*
 		 * We're inserting a large size image into the editor. If it's a really
 		 * big image we'll scale it down to fit reasonably within the editor
@@ -150,10 +147,12 @@ 
  */
 function image_hwstring( $width, $height ) {
 	$out = '';
-	if ($width)
-		$out .= 'width="'.intval($width).'" ';
-	if ($height)
-		$out .= 'height="'.intval($height).'" ';
+	if ($width) {
+			$out .= 'width="'.intval($width).'" ';
+	}
+	if ($height) {
+			$out .= 'height="'.intval($height).'" ';
+	}
 	return $out;
 }
 
@@ -227,8 +226,7 @@ 
 		$width = $intermediate['width'];
 		$height = $intermediate['height'];
 		$is_intermediate = true;
-	}
-	elseif ( $size == 'thumbnail' ) {
+	} elseif ( $size == 'thumbnail' ) {
 		// fall back to the old thumbnail
 		if ( ($thumb_file = wp_get_attachment_thumb_file($id)) && $info = getimagesize($thumb_file) ) {
 			$img_url = str_replace($img_url_basename, wp_basename($thumb_file), $img_url);
@@ -412,8 +410,9 @@ 
  * @return array First item is the width, the second item is the height.
  */
 function wp_constrain_dimensions( $current_width, $current_height, $max_width = 0, $max_height = 0 ) {
-	if ( !$max_width && !$max_height )
-		return array( $current_width, $current_height );
+	if ( !$max_width && !$max_height ) {
+			return array( $current_width, $current_height );
+	}
 
 	$width_ratio = $height_ratio = 1.0;
 	$did_width = $did_height = false;
@@ -498,11 +497,13 @@ 
  */
 function image_resize_dimensions( $orig_w, $orig_h, $dest_w, $dest_h, $crop = false ) {
 
-	if ($orig_w <= 0 || $orig_h <= 0)
-		return false;
+	if ($orig_w <= 0 || $orig_h <= 0) {
+			return false;
+	}
 	// at least one of dest_w or dest_h must be specific
-	if ($dest_w <= 0 && $dest_h <= 0)
-		return false;
+	if ($dest_w <= 0 && $dest_h <= 0) {
+			return false;
+	}
 
 	/**
 	 * Filters whether to preempt calculating the image resize dimensions.
@@ -521,8 +522,9 @@ 
 	 *                           An array can specify positioning of the crop area. Default false.
 	 */
 	$output = apply_filters( 'image_resize_dimensions', null, $orig_w, $orig_h, $dest_w, $dest_h, $crop );
-	if ( null !== $output )
-		return $output;
+	if ( null !== $output ) {
+			return $output;
+	}
 
 	if ( $crop ) {
 		// crop the largest possible portion of the original image that we can size to $dest_w x $dest_h
@@ -606,8 +608,9 @@ 
 	if ( $width || $height ) {
 		$editor = wp_get_image_editor( $file );
 
-		if ( is_wp_error( $editor ) || is_wp_error( $editor->resize( $width, $height, $crop ) ) )
-			return false;
+		if ( is_wp_error( $editor ) || is_wp_error( $editor->resize( $width, $height, $crop ) ) ) {
+					return false;
+		}
 
 		$resized_file = $editor->save();
 
@@ -1537,8 +1540,9 @@ 
 	 * @param string $content The image element, possibly wrapped in a hyperlink.
 	 */
 	$output = apply_filters( 'img_caption_shortcode', '', $attr, $content );
-	if ( $output != '' )
-		return $output;
+	if ( $output != '' ) {
+			return $output;
+	}
 
 	$atts = shortcode_atts( array(
 		'id'	  => '',
@@ -1549,11 +1553,13 @@ 
 	), $attr, 'caption' );
 
 	$atts['width'] = (int) $atts['width'];
-	if ( $atts['width'] < 1 || empty( $atts['caption'] ) )
-		return $content;
+	if ( $atts['width'] < 1 || empty( $atts['caption'] ) ) {
+			return $content;
+	}
 
-	if ( ! empty( $atts['id'] ) )
-		$atts['id'] = 'id="' . esc_attr( sanitize_html_class( $atts['id'] ) ) . '" ';
+	if ( ! empty( $atts['id'] ) ) {
+			$atts['id'] = 'id="' . esc_attr( sanitize_html_class( $atts['id'] ) ) . '" ';
+	}
 
 	$class = trim( 'wp-caption ' . $atts['align'] . ' ' . $atts['class'] );
 
@@ -2738,22 +2744,25 @@ 
 	} elseif ( is_array( $attachment ) ) {
 		$attachment = (object) $attachment;
 	}
-	if ( ! is_object($attachment) )
-		return array();
+	if ( ! is_object($attachment) ) {
+			return array();
+	}
 
 	$file = get_attached_file( $attachment->ID );
 	$filename = basename( $file );
 
 	$objects = array('attachment');
 
-	if ( false !== strpos($filename, '.') )
-		$objects[] = 'attachment:' . substr($filename, strrpos($filename, '.') + 1);
+	if ( false !== strpos($filename, '.') ) {
+			$objects[] = 'attachment:' . substr($filename, strrpos($filename, '.') + 1);
+	}
 	if ( !empty($attachment->post_mime_type) ) {
 		$objects[] = 'attachment:' . $attachment->post_mime_type;
-		if ( false !== strpos($attachment->post_mime_type, '/') )
-			foreach ( explode('/', $attachment->post_mime_type) as $token )
+		if ( false !== strpos($attachment->post_mime_type, '/') ) {
+					foreach ( explode('/', $attachment->post_mime_type) as $token )
 				if ( !empty($token) )
 					$objects[] = "attachment:$token";
+		}
 	}
 
 	$taxonomies = array();
@@ -2788,10 +2797,11 @@ 
 	foreach ( get_taxonomies( array(), 'objects' ) as $taxonomy ) {
 		foreach ( $taxonomy->object_type as $object_type ) {
 			if ( 'attachment' == $object_type || 0 === strpos( $object_type, 'attachment:' ) ) {
-				if ( 'names' == $output )
-					$taxonomies[] = $taxonomy->name;
-				else
-					$taxonomies[ $taxonomy->name ] = $taxonomy;
+				if ( 'names' == $output ) {
+									$taxonomies[] = $taxonomy->name;
+				} else {
+									$taxonomies[ $taxonomy->name ] = $taxonomy;
+				}
 				break;
 			}
 		}
@@ -2884,8 +2894,9 @@ 
 
 		// If $file_info['type'] is false, then we let the editor attempt to
 		// figure out the file type, rather than forcing a failure based on extension.
-		if ( isset( $file_info ) && $file_info['type'] )
-			$args['mime_type'] = $file_info['type'];
+		if ( isset( $file_info ) && $file_info['type'] ) {
+					$args['mime_type'] = $file_info['type'];
+		}
 	}
 
 	$implementation = _wp_image_editor_choose( $args );
@@ -2894,8 +2905,9 @@ 
 		$editor = new $implementation( $path );
 		$loaded = $editor->load();
 
-		if ( is_wp_error( $loaded ) )
-			return $loaded;
+		if ( is_wp_error( $loaded ) ) {
+					return $loaded;
+		}
 
 		return $editor;
 	}
@@ -2941,8 +2953,9 @@ 
 	$implementations = apply_filters( 'wp_image_editors', array( 'WP_Image_Editor_Imagick', 'WP_Image_Editor_GD' ) );
 
 	foreach ( $implementations as $implementation ) {
-		if ( ! call_user_func( array( $implementation, 'test' ), $args ) )
-			continue;
+		if ( ! call_user_func( array( $implementation, 'test' ), $args ) ) {
+					continue;
+		}
 
 		if ( isset( $args['mime_type'] ) &&
 			! call_user_func(
@@ -2971,8 +2984,9 @@ 
 	$wp_scripts = wp_scripts();
 
 	$data = $wp_scripts->get_data( 'wp-plupload', 'data' );
-	if ( $data && false !== strpos( $data, '_wpPluploadSettings' ) )
-		return;
+	if ( $data && false !== strpos( $data, '_wpPluploadSettings' ) ) {
+			return;
+	}
 
 	$max_upload_size = wp_max_upload_size();
 	$allowed_extensions = array_keys( get_allowed_mime_types() );
@@ -3036,8 +3050,9 @@ 
 
 	$script = 'var _wpPluploadSettings = ' . wp_json_encode( $settings ) . ';';
 
-	if ( $data )
-		$script = "$data\n$script";
+	if ( $data ) {
+			$script = "$data\n$script";
+	}
 
 	$wp_scripts->add_data( 'wp-plupload', 'data', $script );
 }
@@ -3052,17 +3067,20 @@ 
  * @return array|void Array of attachment details.
  */
 function wp_prepare_attachment_for_js( $attachment ) {
-	if ( ! $attachment = get_post( $attachment ) )
-		return;
+	if ( ! $attachment = get_post( $attachment ) ) {
+			return;
+	}
 
-	if ( 'attachment' != $attachment->post_type )
-		return;
+	if ( 'attachment' != $attachment->post_type ) {
+			return;
+	}
 
 	$meta = wp_get_attachment_metadata( $attachment->ID );
-	if ( false !== strpos( $attachment->post_mime_type, '/' ) )
-		list( $type, $subtype ) = explode( '/', $attachment->post_mime_type );
-	else
-		list( $type, $subtype ) = array( $attachment->post_mime_type, '' );
+	if ( false !== strpos( $attachment->post_mime_type, '/' ) ) {
+			list( $type, $subtype ) = explode( '/', $attachment->post_mime_type );
+	} else {
+			list( $type, $subtype ) = array( $attachment->post_mime_type, '' );
+	}
 
 	$attachment_url = wp_get_attachment_url( $attachment->ID );
 	$base_url = str_replace( wp_basename( $attachment_url ), '', $attachment_url );
@@ -3139,8 +3157,9 @@ 
 		$response['editLink'] = get_edit_post_link( $attachment->ID, 'raw' );
 	}
 
-	if ( current_user_can( 'delete_post', $attachment->ID ) )
-		$response['nonces']['delete'] = wp_create_nonce( 'delete-post_' . $attachment->ID );
+	if ( current_user_can( 'delete_post', $attachment->ID ) ) {
+			$response['nonces']['delete'] = wp_create_nonce( 'delete-post_' . $attachment->ID );
+	}
 
 	if ( $meta && ( 'image' === $type || ! empty( $meta['sizes'] ) ) ) {
 		$sizes = array();
@@ -3212,15 +3231,18 @@ 
 	}
 
 	if ( $meta && 'video' === $type ) {
-		if ( isset( $meta['width'] ) )
-			$response['width'] = (int) $meta['width'];
-		if ( isset( $meta['height'] ) )
-			$response['height'] = (int) $meta['height'];
+		if ( isset( $meta['width'] ) ) {
+					$response['width'] = (int) $meta['width'];
+		}
+		if ( isset( $meta['height'] ) ) {
+					$response['height'] = (int) $meta['height'];
+		}
 	}
 
 	if ( $meta && ( 'audio' === $type || 'video' === $type ) ) {
-		if ( isset( $meta['length_formatted'] ) )
-			$response['fileLength'] = $meta['length_formatted'];
+		if ( isset( $meta['length_formatted'] ) ) {
+					$response['fileLength'] = $meta['length_formatted'];
+		}
 
 		$response['meta'] = array();
 		foreach ( wp_get_attachment_id3_keys( $attachment, 'js' ) as $key => $label ) {
@@ -3246,8 +3268,9 @@ 
 		}
 	}
 
-	if ( function_exists('get_compat_media_markup') )
-		$response['compat'] = get_compat_media_markup( $attachment->ID, array( 'in_modal' => true ) );
+	if ( function_exists('get_compat_media_markup') ) {
+			$response['compat'] = get_compat_media_markup( $attachment->ID, array( 'in_modal' => true ) );
+	}
 
 	/**
 	 * Filters the attachment data prepared for JavaScript.
@@ -3279,8 +3302,9 @@ 
  */
 function wp_enqueue_media( $args = array() ) {
 	// Enqueue me just once per page, please.
-	if ( did_action( 'wp_enqueue_media' ) )
-		return;
+	if ( did_action( 'wp_enqueue_media' ) ) {
+			return;
+	}
 
 	global $content_width, $wpdb, $wp_locale;
 
@@ -3580,8 +3604,9 @@ 
  * @return array Found attachments.
  */
 function get_attached_media( $type, $post = 0 ) {
-	if ( ! $post = get_post( $post ) )
-		return array();
+	if ( ! $post = get_post( $post ) ) {
+			return array();
+	}
 
 	$args = array(
 		'post_parent' => $post->ID,
@@ -3669,11 +3694,13 @@ 
  *               from the expanded shortcode.
  */
 function get_post_galleries( $post, $html = true ) {
-	if ( ! $post = get_post( $post ) )
-		return array();
+	if ( ! $post = get_post( $post ) ) {
+			return array();
+	}
 
-	if ( ! has_shortcode( $post->post_content, 'gallery' ) )
-		return array();
+	if ( ! has_shortcode( $post->post_content, 'gallery' ) ) {
+			return array();
+	}
 
 	$galleries = array();
 	if ( preg_match_all( '/' . get_shortcode_regex() . '/s', $post->post_content, $matches, PREG_SET_ORDER ) ) {
@@ -3687,8 +3714,9 @@ 
 				} else {
 					preg_match_all( '#src=([\'"])(.+?)\1#is', $gallery, $src, PREG_SET_ORDER );
 					if ( ! empty( $src ) ) {
-						foreach ( $src as $s )
-							$srcs[] = $s[2];
+						foreach ( $src as $s ) {
+													$srcs[] = $s[2];
+						}
 					}
 
 					$data = shortcode_parse_atts( $shortcode[3] );

src/wp-includes/pluggable.php

Doc Comments +7 added lines, -7 removed lines

@@ -742,7 +742,7 @@ 
  *
  * @param string $cookie
  * @param string $scheme Optional. The cookie scheme to use: auth, secure_auth, or logged_in
- * @return array|false Authentication cookie components
+ * @return string Authentication cookie components
  */
 function wp_parse_auth_cookie($cookie = '', $scheme = '') {
 	if ( empty($cookie) ) {
@@ -1041,7 +1041,7 @@ 
  *
  * @since 1.2.0
  *
- * @param int|string $action    Action nonce.
+ * @param integer $action    Action nonce.
  * @param string     $query_arg Optional. Key to check for nonce in `$_REQUEST` (since 2.5).
  *                              Default '_wpnonce'.
  * @return false|int False if the nonce is invalid, 1 if the nonce is valid and generated between
@@ -1081,7 +1081,7 @@ 
  *
  * @since 2.0.3
  *
- * @param int|string   $action    Action nonce.
+ * @param integer   $action    Action nonce.
  * @param false|string $query_arg Optional. Key to check for the nonce in `$_REQUEST` (since 2.5). If false,
  *                                `$_REQUEST` values will be evaluated for '_ajax_nonce', and '_wpnonce'
  *                                (in that order). Default false.
@@ -1531,7 +1531,7 @@ 
  * should be notified, overriding the site setting.
  *
  * @param int $comment_id Comment ID.
- * @return true Always returns true.
+ * @return boolean Always returns true.
  */
 function wp_notify_moderator($comment_id) {
 	global $wpdb;
@@ -1782,8 +1782,8 @@ 
  * @since 2.0.3
  *
  * @param string     $nonce  Nonce that was used in the form to verify
- * @param string|int $action Should give context to what is taking place and be the same when nonce was created.
- * @return false|int False if the nonce is invalid, 1 if the nonce is valid and generated between
+ * @param integer $action Should give context to what is taking place and be the same when nonce was created.
+ * @return string False if the nonce is invalid, 1 if the nonce is valid and generated between
  *                   0-12 hours ago, 2 if the nonce is valid and generated between 12-24 hours ago.
  */
 function wp_verify_nonce( $nonce, $action = -1 ) {
@@ -1846,7 +1846,7 @@ 
  * @since 2.0.3
  * @since 4.0.0 Session tokens were integrated with nonce creation
  *
- * @param string|int $action Scalar value to add context to the nonce.
+ * @param integer $action Scalar value to add context to the nonce.
  * @return string The token.
  */
 function wp_create_nonce($action = -1) {

Indentation +1 added lines, -1 removed lines

@@ -764,7 +764,7 @@
 					$cookie_name = AUTH_COOKIE;
 					$scheme = 'auth';
 				}
-	    }
+		}
 
 		if ( empty($_COOKIE[$cookie_name]) )
 			return false;

Spacing +528 added lines, -528 removed lines

@@ -6,7 +6,7 @@ 
  * @package WordPress
  */
 
-if ( !function_exists('wp_set_current_user') ) :
+if ( ! function_exists('wp_set_current_user')) :
 /**
  * Changes the current user by ID or name.
  *
@@ -27,30 +27,30 @@ 
 	global $current_user;
 
 	// If `$id` matches the user who's already current, there's nothing to do.
-	if ( isset( $current_user )
-		&& ( $current_user instanceof WP_User )
-		&& ( $id == $current_user->ID )
-		&& ( null !== $id )
+	if (isset($current_user)
+		&& ($current_user instanceof WP_User)
+		&& ($id == $current_user->ID)
+		&& (null !== $id)
 	) {
 		return $current_user;
 	}
 
-	$current_user = new WP_User( $id, $name );
+	$current_user = new WP_User($id, $name);
 
-	setup_userdata( $current_user->ID );
+	setup_userdata($current_user->ID);
 
 	/**
 	 * Fires after the current user is set.
 	 *
 	 * @since 2.0.1
 	 */
-	do_action( 'set_current_user' );
+	do_action('set_current_user');
 
 	return $current_user;
 }
 endif;
 
-if ( !function_exists('wp_get_current_user') ) :
+if ( ! function_exists('wp_get_current_user')) :
 /**
  * Retrieve the current user object.
  *
@@ -70,7 +70,7 @@ 
 }
 endif;
 
-if ( !function_exists('get_userdata') ) :
+if ( ! function_exists('get_userdata')) :
 /**
  * Retrieve user info by user ID.
  *
@@ -79,12 +79,12 @@ 
  * @param int $user_id User ID
  * @return WP_User|false WP_User object on success, false on failure.
  */
-function get_userdata( $user_id ) {
-	return get_user_by( 'id', $user_id );
+function get_userdata($user_id) {
+	return get_user_by('id', $user_id);
 }
 endif;
 
-if ( !function_exists('get_user_by') ) :
+if ( ! function_exists('get_user_by')) :
 /**
  * Retrieve user info by a given field
  *
@@ -95,20 +95,20 @@ 
  * @param int|string $value A value for $field. A user ID, slug, email address, or login name.
  * @return WP_User|false WP_User object on success, false on failure.
  */
-function get_user_by( $field, $value ) {
-	$userdata = WP_User::get_data_by( $field, $value );
+function get_user_by($field, $value) {
+	$userdata = WP_User::get_data_by($field, $value);
 
-	if ( !$userdata )
+	if ( ! $userdata)
 		return false;
 
 	$user = new WP_User;
-	$user->init( $userdata );
+	$user->init($userdata);
 
 	return $user;
 }
 endif;
 
-if ( !function_exists('cache_users') ) :
+if ( ! function_exists('cache_users')) :
 /**
  * Retrieve info for user lists to prevent multiple queries by get_userdata()
  *
@@ -118,28 +118,28 @@ 
  *
  * @param array $user_ids User ID numbers list
  */
-function cache_users( $user_ids ) {
+function cache_users($user_ids) {
 	global $wpdb;
 
-	$clean = _get_non_cached_ids( $user_ids, 'users' );
+	$clean = _get_non_cached_ids($user_ids, 'users');
 
-	if ( empty( $clean ) )
+	if (empty($clean))
 		return;
 
-	$list = implode( ',', $clean );
+	$list = implode(',', $clean);
 
-	$users = $wpdb->get_results( "SELECT * FROM $wpdb->users WHERE ID IN ($list)" );
+	$users = $wpdb->get_results("SELECT * FROM $wpdb->users WHERE ID IN ($list)");
 
 	$ids = array();
-	foreach ( $users as $user ) {
-		update_user_caches( $user );
+	foreach ($users as $user) {
+		update_user_caches($user);
 		$ids[] = $user->ID;
 	}
-	update_meta_cache( 'user', $ids );
+	update_meta_cache('user', $ids);
 }
 endif;
 
-if ( !function_exists( 'wp_mail' ) ) :
+if ( ! function_exists('wp_mail')) :
 /**
  * Send mail, similar to PHP's mail
  *
@@ -170,7 +170,7 @@ 
  * @param string|array $attachments Optional. Files to attach.
  * @return bool Whether the email contents were sent successfully.
  */
-function wp_mail( $to, $subject, $message, $headers = '', $attachments = array() ) {
+function wp_mail($to, $subject, $message, $headers = '', $attachments = array()) {
 	// Compact the input, apply the filters, and extract them back out
 
 	/**
@@ -181,126 +181,126 @@ 
 	 * @param array $args A compacted array of wp_mail() arguments, including the "to" email,
 	 *                    subject, message, headers, and attachments values.
 	 */
-	$atts = apply_filters( 'wp_mail', compact( 'to', 'subject', 'message', 'headers', 'attachments' ) );
+	$atts = apply_filters('wp_mail', compact('to', 'subject', 'message', 'headers', 'attachments'));
 
-	if ( isset( $atts['to'] ) ) {
+	if (isset($atts['to'])) {
 		$to = $atts['to'];
 	}
 
-	if ( !is_array( $to ) ) {
-		$to = explode( ',', $to );
+	if ( ! is_array($to)) {
+		$to = explode(',', $to);
 	}
 
-	if ( isset( $atts['subject'] ) ) {
+	if (isset($atts['subject'])) {
 		$subject = $atts['subject'];
 	}
 
-	if ( isset( $atts['message'] ) ) {
+	if (isset($atts['message'])) {
 		$message = $atts['message'];
 	}
 
-	if ( isset( $atts['headers'] ) ) {
+	if (isset($atts['headers'])) {
 		$headers = $atts['headers'];
 	}
 
-	if ( isset( $atts['attachments'] ) ) {
+	if (isset($atts['attachments'])) {
 		$attachments = $atts['attachments'];
 	}
 
-	if ( ! is_array( $attachments ) ) {
-		$attachments = explode( "\n", str_replace( "\r\n", "\n", $attachments ) );
+	if ( ! is_array($attachments)) {
+		$attachments = explode("\n", str_replace("\r\n", "\n", $attachments));
 	}
 	global $phpmailer;
 
 	// (Re)create it, if it's gone missing
-	if ( ! ( $phpmailer instanceof PHPMailer ) ) {
-		require_once ABSPATH . WPINC . '/class-phpmailer.php';
-		require_once ABSPATH . WPINC . '/class-smtp.php';
-		$phpmailer = new PHPMailer( true );
+	if ( ! ($phpmailer instanceof PHPMailer)) {
+		require_once ABSPATH.WPINC.'/class-phpmailer.php';
+		require_once ABSPATH.WPINC.'/class-smtp.php';
+		$phpmailer = new PHPMailer(true);
 	}
 
 	// Headers
 	$cc = $bcc = $reply_to = array();
 
-	if ( empty( $headers ) ) {
+	if (empty($headers)) {
 		$headers = array();
 	} else {
-		if ( !is_array( $headers ) ) {
+		if ( ! is_array($headers)) {
 			// Explode the headers out, so this function can take both
 			// string headers and an array of headers.
-			$tempheaders = explode( "\n", str_replace( "\r\n", "\n", $headers ) );
+			$tempheaders = explode("\n", str_replace("\r\n", "\n", $headers));
 		} else {
 			$tempheaders = $headers;
 		}
 		$headers = array();
 
 		// If it's actually got contents
-		if ( !empty( $tempheaders ) ) {
+		if ( ! empty($tempheaders)) {
 			// Iterate through the raw headers
-			foreach ( (array) $tempheaders as $header ) {
-				if ( strpos($header, ':') === false ) {
-					if ( false !== stripos( $header, 'boundary=' ) ) {
-						$parts = preg_split('/boundary=/i', trim( $header ) );
-						$boundary = trim( str_replace( array( "'", '"' ), '', $parts[1] ) );
+			foreach ((array) $tempheaders as $header) {
+				if (strpos($header, ':') === false) {
+					if (false !== stripos($header, 'boundary=')) {
+						$parts = preg_split('/boundary=/i', trim($header));
+						$boundary = trim(str_replace(array("'", '"'), '', $parts[1]));
 					}
 					continue;
 				}
 				// Explode them out
-				list( $name, $content ) = explode( ':', trim( $header ), 2 );
+				list($name, $content) = explode(':', trim($header), 2);
 
 				// Cleanup crew
-				$name    = trim( $name    );
-				$content = trim( $content );
+				$name    = trim($name);
+				$content = trim($content);
 
-				switch ( strtolower( $name ) ) {
+				switch (strtolower($name)) {
 					// Mainly for legacy -- process a From: header if it's there
 					case 'from':
-						$bracket_pos = strpos( $content, '<' );
-						if ( $bracket_pos !== false ) {
+						$bracket_pos = strpos($content, '<');
+						if ($bracket_pos !== false) {
 							// Text before the bracketed email is the "From" name.
-							if ( $bracket_pos > 0 ) {
-								$from_name = substr( $content, 0, $bracket_pos - 1 );
-								$from_name = str_replace( '"', '', $from_name );
-								$from_name = trim( $from_name );
+							if ($bracket_pos > 0) {
+								$from_name = substr($content, 0, $bracket_pos - 1);
+								$from_name = str_replace('"', '', $from_name);
+								$from_name = trim($from_name);
 							}
 
-							$from_email = substr( $content, $bracket_pos + 1 );
-							$from_email = str_replace( '>', '', $from_email );
-							$from_email = trim( $from_email );
+							$from_email = substr($content, $bracket_pos + 1);
+							$from_email = str_replace('>', '', $from_email);
+							$from_email = trim($from_email);
 
 						// Avoid setting an empty $from_email.
-						} elseif ( '' !== trim( $content ) ) {
-							$from_email = trim( $content );
+						} elseif ('' !== trim($content)) {
+							$from_email = trim($content);
 						}
 						break;
 					case 'content-type':
-						if ( strpos( $content, ';' ) !== false ) {
-							list( $type, $charset_content ) = explode( ';', $content );
-							$content_type = trim( $type );
-							if ( false !== stripos( $charset_content, 'charset=' ) ) {
-								$charset = trim( str_replace( array( 'charset=', '"' ), '', $charset_content ) );
-							} elseif ( false !== stripos( $charset_content, 'boundary=' ) ) {
-								$boundary = trim( str_replace( array( 'BOUNDARY=', 'boundary=', '"' ), '', $charset_content ) );
+						if (strpos($content, ';') !== false) {
+							list($type, $charset_content) = explode(';', $content);
+							$content_type = trim($type);
+							if (false !== stripos($charset_content, 'charset=')) {
+								$charset = trim(str_replace(array('charset=', '"'), '', $charset_content));
+							} elseif (false !== stripos($charset_content, 'boundary=')) {
+								$boundary = trim(str_replace(array('BOUNDARY=', 'boundary=', '"'), '', $charset_content));
 								$charset = '';
 							}
 
 						// Avoid setting an empty $content_type.
-						} elseif ( '' !== trim( $content ) ) {
-							$content_type = trim( $content );
+						} elseif ('' !== trim($content)) {
+							$content_type = trim($content);
 						}
 						break;
 					case 'cc':
-						$cc = array_merge( (array) $cc, explode( ',', $content ) );
+						$cc = array_merge((array) $cc, explode(',', $content));
 						break;
 					case 'bcc':
-						$bcc = array_merge( (array) $bcc, explode( ',', $content ) );
+						$bcc = array_merge((array) $bcc, explode(',', $content));
 						break;
 					case 'reply-to':
-						$reply_to = array_merge( (array) $reply_to, explode( ',', $content ) );
+						$reply_to = array_merge((array) $reply_to, explode(',', $content));
 						break;
 					default:
 						// Add it to our grand headers array
-						$headers[trim( $name )] = trim( $content );
+						$headers[trim($name)] = trim($content);
 						break;
 				}
 			}
@@ -315,7 +315,7 @@ 
 
 	// From email and name
 	// If we don't have a name from the input headers
-	if ( !isset( $from_name ) )
+	if ( ! isset($from_name))
 		$from_name = 'WordPress';
 
 	/* If we don't have an email from the input headers default to wordpress@$sitename
@@ -325,14 +325,14 @@ 
 	 * https://core.trac.wordpress.org/ticket/5007.
 	 */
 
-	if ( !isset( $from_email ) ) {
+	if ( ! isset($from_email)) {
 		// Get the site domain and get rid of www.
-		$sitename = strtolower( $_SERVER['SERVER_NAME'] );
-		if ( substr( $sitename, 0, 4 ) == 'www.' ) {
-			$sitename = substr( $sitename, 4 );
+		$sitename = strtolower($_SERVER['SERVER_NAME']);
+		if (substr($sitename, 0, 4) == 'www.') {
+			$sitename = substr($sitename, 4);
 		}
 
-		$from_email = 'wordpress@' . $sitename;
+		$from_email = 'wordpress@'.$sitename;
 	}
 
 	/**
@@ -342,7 +342,7 @@ 
 	 *
 	 * @param string $from_email Email address to send from.
 	 */
-	$from_email = apply_filters( 'wp_mail_from', $from_email );
+	$from_email = apply_filters('wp_mail_from', $from_email);
 
 	/**
 	 * Filters the name to associate with the "from" email address.
@@ -351,16 +351,16 @@ 
 	 *
 	 * @param string $from_name Name associated with the "from" email address.
 	 */
-	$from_name = apply_filters( 'wp_mail_from_name', $from_name );
+	$from_name = apply_filters('wp_mail_from_name', $from_name);
 
 	try {
-		$phpmailer->setFrom( $from_email, $from_name, false );
-	} catch ( phpmailerException $e ) {
-		$mail_error_data = compact( 'to', 'subject', 'message', 'headers', 'attachments' );
+		$phpmailer->setFrom($from_email, $from_name, false);
+	} catch (phpmailerException $e) {
+		$mail_error_data = compact('to', 'subject', 'message', 'headers', 'attachments');
 		$mail_error_data['phpmailer_exception_code'] = $e->getCode();
 
 		/** This filter is documented in wp-includes/pluggable.php */
-		do_action( 'wp_mail_failed', new WP_Error( 'wp_mail_failed', $e->getMessage(), $mail_error_data ) );
+		do_action('wp_mail_failed', new WP_Error('wp_mail_failed', $e->getMessage(), $mail_error_data));
 
 		return false;
 	}
@@ -370,40 +370,40 @@ 
 	$phpmailer->Body    = $message;
 
 	// Set destination addresses, using appropriate methods for handling addresses
-	$address_headers = compact( 'to', 'cc', 'bcc', 'reply_to' );
+	$address_headers = compact('to', 'cc', 'bcc', 'reply_to');
 
-	foreach ( $address_headers as $address_header => $addresses ) {
-		if ( empty( $addresses ) ) {
+	foreach ($address_headers as $address_header => $addresses) {
+		if (empty($addresses)) {
 			continue;
 		}
 
-		foreach ( (array) $addresses as $address ) {
+		foreach ((array) $addresses as $address) {
 			try {
 				// Break $recipient into name and address parts if in the format "Foo <bar@baz.com>"
 				$recipient_name = '';
 
-				if ( preg_match( '/(.*)<(.+)>/', $address, $matches ) ) {
-					if ( count( $matches ) == 3 ) {
+				if (preg_match('/(.*)<(.+)>/', $address, $matches)) {
+					if (count($matches) == 3) {
 						$recipient_name = $matches[1];
 						$address        = $matches[2];
 					}
 				}
 
-				switch ( $address_header ) {
+				switch ($address_header) {
 					case 'to':
-						$phpmailer->addAddress( $address, $recipient_name );
+						$phpmailer->addAddress($address, $recipient_name);
 						break;
 					case 'cc':
-						$phpmailer->addCc( $address, $recipient_name );
+						$phpmailer->addCc($address, $recipient_name);
 						break;
 					case 'bcc':
-						$phpmailer->addBcc( $address, $recipient_name );
+						$phpmailer->addBcc($address, $recipient_name);
 						break;
 					case 'reply_to':
-						$phpmailer->addReplyTo( $address, $recipient_name );
+						$phpmailer->addReplyTo($address, $recipient_name);
 						break;
 				}
-			} catch ( phpmailerException $e ) {
+			} catch (phpmailerException $e) {
 				continue;
 			}
 		}
@@ -414,7 +414,7 @@ 
 
 	// Set Content-Type and charset
 	// If we don't have a content-type from the input headers
-	if ( !isset( $content_type ) )
+	if ( ! isset($content_type))
 		$content_type = 'text/plain';
 
 	/**
@@ -424,17 +424,17 @@ 
 	 *
 	 * @param string $content_type Default wp_mail() content type.
 	 */
-	$content_type = apply_filters( 'wp_mail_content_type', $content_type );
+	$content_type = apply_filters('wp_mail_content_type', $content_type);
 
 	$phpmailer->ContentType = $content_type;
 
 	// Set whether it's plaintext, depending on $content_type
-	if ( 'text/html' == $content_type )
-		$phpmailer->IsHTML( true );
+	if ('text/html' == $content_type)
+		$phpmailer->IsHTML(true);
 
 	// If we don't have a charset from the input headers
-	if ( !isset( $charset ) )
-		$charset = get_bloginfo( 'charset' );
+	if ( ! isset($charset))
+		$charset = get_bloginfo('charset');
 
 	// Set the content-type and charset
 
@@ -445,23 +445,23 @@ 
 	 *
 	 * @param string $charset Default email charset.
 	 */
-	$phpmailer->CharSet = apply_filters( 'wp_mail_charset', $charset );
+	$phpmailer->CharSet = apply_filters('wp_mail_charset', $charset);
 
 	// Set custom headers
-	if ( !empty( $headers ) ) {
-		foreach ( (array) $headers as $name => $content ) {
-			$phpmailer->AddCustomHeader( sprintf( '%1$s: %2$s', $name, $content ) );
+	if ( ! empty($headers)) {
+		foreach ((array) $headers as $name => $content) {
+			$phpmailer->AddCustomHeader(sprintf('%1$s: %2$s', $name, $content));
 		}
 
-		if ( false !== stripos( $content_type, 'multipart' ) && ! empty($boundary) )
-			$phpmailer->AddCustomHeader( sprintf( "Content-Type: %s;\n\t boundary=\"%s\"", $content_type, $boundary ) );
+		if (false !== stripos($content_type, 'multipart') && ! empty($boundary))
+			$phpmailer->AddCustomHeader(sprintf("Content-Type: %s;\n\t boundary=\"%s\"", $content_type, $boundary));
 	}
 
-	if ( !empty( $attachments ) ) {
-		foreach ( $attachments as $attachment ) {
+	if ( ! empty($attachments)) {
+		foreach ($attachments as $attachment) {
 			try {
 				$phpmailer->AddAttachment($attachment);
-			} catch ( phpmailerException $e ) {
+			} catch (phpmailerException $e) {
 				continue;
 			}
 		}
@@ -474,14 +474,14 @@ 
 	 *
 	 * @param PHPMailer &$phpmailer The PHPMailer instance, passed by reference.
 	 */
-	do_action_ref_array( 'phpmailer_init', array( &$phpmailer ) );
+	do_action_ref_array('phpmailer_init', array(&$phpmailer));
 
 	// Send!
 	try {
 		return $phpmailer->send();
-	} catch ( phpmailerException $e ) {
+	} catch (phpmailerException $e) {
 
-		$mail_error_data = compact( 'to', 'subject', 'message', 'headers', 'attachments' );
+		$mail_error_data = compact('to', 'subject', 'message', 'headers', 'attachments');
 		$mail_error_data['phpmailer_exception_code'] = $e->getCode();
 
 		/**
@@ -492,14 +492,14 @@ 
 		 * @param WP_Error $error A WP_Error object with the phpmailerException message, and an array
 		 *                        containing the mail recipient, subject, message, headers, and attachments.
 		 */
-		do_action( 'wp_mail_failed', new WP_Error( 'wp_mail_failed', $e->getMessage(), $mail_error_data ) );
+		do_action('wp_mail_failed', new WP_Error('wp_mail_failed', $e->getMessage(), $mail_error_data));
 
 		return false;
 	}
 }
 endif;
 
-if ( !function_exists('wp_authenticate') ) :
+if ( ! function_exists('wp_authenticate')) :
 /**
  * Authenticate a user, confirming the login credentials are valid.
  *
@@ -529,17 +529,17 @@ 
 	 * @param string                $username Username or email address.
 	 * @param string                $password User password
 	 */
-	$user = apply_filters( 'authenticate', null, $username, $password );
+	$user = apply_filters('authenticate', null, $username, $password);
 
-	if ( $user == null ) {
+	if ($user == null) {
 		// TODO what should the error message be? (Or would these even happen?)
 		// Only needed if all authentication handlers fail to return anything.
-		$user = new WP_Error( 'authentication_failed', __( '<strong>ERROR</strong>: Invalid username, email address or incorrect password.' ) );
+		$user = new WP_Error('authentication_failed', __('<strong>ERROR</strong>: Invalid username, email address or incorrect password.'));
 	}
 
 	$ignore_codes = array('empty_username', 'empty_password');
 
-	if (is_wp_error($user) && !in_array($user->get_error_code(), $ignore_codes) ) {
+	if (is_wp_error($user) && ! in_array($user->get_error_code(), $ignore_codes)) {
 		/**
 		 * Fires after a user login has failed.
 		 *
@@ -548,14 +548,14 @@ 
 		 *
 		 * @param string $username Username or email address.
 		 */
-		do_action( 'wp_login_failed', $username );
+		do_action('wp_login_failed', $username);
 	}
 
 	return $user;
 }
 endif;
 
-if ( !function_exists('wp_logout') ) :
+if ( ! function_exists('wp_logout')) :
 /**
  * Log the current user out.
  *
@@ -570,11 +570,11 @@ 
 	 *
 	 * @since 1.5.0
 	 */
-	do_action( 'wp_logout' );
+	do_action('wp_logout');
 }
 endif;
 
-if ( !function_exists('wp_validate_auth_cookie') ) :
+if ( ! function_exists('wp_validate_auth_cookie')) :
 /**
  * Validates authentication cookie.
  *
@@ -593,7 +593,7 @@ 
  * @return false|int False if invalid cookie, User ID if valid.
  */
 function wp_validate_auth_cookie($cookie = '', $scheme = '') {
-	if ( ! $cookie_elements = wp_parse_auth_cookie($cookie, $scheme) ) {
+	if ( ! $cookie_elements = wp_parse_auth_cookie($cookie, $scheme)) {
 		/**
 		 * Fires if an authentication cookie is malformed.
 		 *
@@ -603,7 +603,7 @@ 
 		 * @param string $scheme Authentication scheme. Values include 'auth', 'secure_auth',
 		 *                       or 'logged_in'.
 		 */
-		do_action( 'auth_cookie_malformed', $cookie, $scheme );
+		do_action('auth_cookie_malformed', $cookie, $scheme);
 		return false;
 	}
 
@@ -614,12 +614,12 @@ 
 	$expired = $expiration = $cookie_elements['expiration'];
 
 	// Allow a grace period for POST and Ajax requests
-	if ( wp_doing_ajax() || 'POST' == $_SERVER['REQUEST_METHOD'] ) {
+	if (wp_doing_ajax() || 'POST' == $_SERVER['REQUEST_METHOD']) {
 		$expired += HOUR_IN_SECONDS;
 	}
 
 	// Quick check to see if an honest cookie has expired
-	if ( $expired < time() ) {
+	if ($expired < time()) {
 		/**
 		 * Fires once an authentication cookie has expired.
 		 *
@@ -627,12 +627,12 @@ 
 		 *
 		 * @param array $cookie_elements An array of data for the authentication cookie.
 		 */
-		do_action( 'auth_cookie_expired', $cookie_elements );
+		do_action('auth_cookie_expired', $cookie_elements);
 		return false;
 	}
 
 	$user = get_user_by('login', $username);
-	if ( ! $user ) {
+	if ( ! $user) {
 		/**
 		 * Fires if a bad username is entered in the user authentication process.
 		 *
@@ -640,19 +640,19 @@ 
 		 *
 		 * @param array $cookie_elements An array of data for the authentication cookie.
 		 */
-		do_action( 'auth_cookie_bad_username', $cookie_elements );
+		do_action('auth_cookie_bad_username', $cookie_elements);
 		return false;
 	}
 
 	$pass_frag = substr($user->user_pass, 8, 4);
 
-	$key = wp_hash( $username . '|' . $pass_frag . '|' . $expiration . '|' . $token, $scheme );
+	$key = wp_hash($username.'|'.$pass_frag.'|'.$expiration.'|'.$token, $scheme);
 
 	// If ext/hash is not present, compat.php's hash_hmac() does not support sha256.
-	$algo = function_exists( 'hash' ) ? 'sha256' : 'sha1';
-	$hash = hash_hmac( $algo, $username . '|' . $expiration . '|' . $token, $key );
+	$algo = function_exists('hash') ? 'sha256' : 'sha1';
+	$hash = hash_hmac($algo, $username.'|'.$expiration.'|'.$token, $key);
 
-	if ( ! hash_equals( $hash, $hmac ) ) {
+	if ( ! hash_equals($hash, $hmac)) {
 		/**
 		 * Fires if a bad authentication cookie hash is encountered.
 		 *
@@ -660,18 +660,18 @@ 
 		 *
 		 * @param array $cookie_elements An array of data for the authentication cookie.
 		 */
-		do_action( 'auth_cookie_bad_hash', $cookie_elements );
+		do_action('auth_cookie_bad_hash', $cookie_elements);
 		return false;
 	}
 
-	$manager = WP_Session_Tokens::get_instance( $user->ID );
-	if ( ! $manager->verify( $token ) ) {
-		do_action( 'auth_cookie_bad_session_token', $cookie_elements );
+	$manager = WP_Session_Tokens::get_instance($user->ID);
+	if ( ! $manager->verify($token)) {
+		do_action('auth_cookie_bad_session_token', $cookie_elements);
 		return false;
 	}
 
 	// Ajax/POST grace period set above
-	if ( $expiration < time() ) {
+	if ($expiration < time()) {
 		$GLOBALS['login_grace_period'] = 1;
 	}
 
@@ -683,13 +683,13 @@ 
 	 * @param array   $cookie_elements An array of data for the authentication cookie.
 	 * @param WP_User $user            User object.
 	 */
-	do_action( 'auth_cookie_valid', $cookie_elements, $user );
+	do_action('auth_cookie_valid', $cookie_elements, $user);
 
 	return $user->ID;
 }
 endif;
 
-if ( !function_exists('wp_generate_auth_cookie') ) :
+if ( ! function_exists('wp_generate_auth_cookie')) :
 /**
  * Generate authentication cookie contents.
  *
@@ -701,26 +701,26 @@ 
  * @param string $token      User's session token to use for this cookie
  * @return string Authentication cookie contents. Empty string if user does not exist.
  */
-function wp_generate_auth_cookie( $user_id, $expiration, $scheme = 'auth', $token = '' ) {
+function wp_generate_auth_cookie($user_id, $expiration, $scheme = 'auth', $token = '') {
 	$user = get_userdata($user_id);
-	if ( ! $user ) {
+	if ( ! $user) {
 		return '';
 	}
 
-	if ( ! $token ) {
-		$manager = WP_Session_Tokens::get_instance( $user_id );
-		$token = $manager->create( $expiration );
+	if ( ! $token) {
+		$manager = WP_Session_Tokens::get_instance($user_id);
+		$token = $manager->create($expiration);
 	}
 
 	$pass_frag = substr($user->user_pass, 8, 4);
 
-	$key = wp_hash( $user->user_login . '|' . $pass_frag . '|' . $expiration . '|' . $token, $scheme );
+	$key = wp_hash($user->user_login.'|'.$pass_frag.'|'.$expiration.'|'.$token, $scheme);
 
 	// If ext/hash is not present, compat.php's hash_hmac() does not support sha256.
-	$algo = function_exists( 'hash' ) ? 'sha256' : 'sha1';
-	$hash = hash_hmac( $algo, $user->user_login . '|' . $expiration . '|' . $token, $key );
+	$algo = function_exists('hash') ? 'sha256' : 'sha1';
+	$hash = hash_hmac($algo, $user->user_login.'|'.$expiration.'|'.$token, $key);
 
-	$cookie = $user->user_login . '|' . $expiration . '|' . $token . '|' . $hash;
+	$cookie = $user->user_login.'|'.$expiration.'|'.$token.'|'.$hash;
 
 	/**
 	 * Filters the authentication cookie.
@@ -733,11 +733,11 @@ 
 	 * @param string $scheme     Cookie scheme used. Accepts 'auth', 'secure_auth', or 'logged_in'.
 	 * @param string $token      User's session token used.
 	 */
-	return apply_filters( 'auth_cookie', $cookie, $user_id, $expiration, $scheme, $token );
+	return apply_filters('auth_cookie', $cookie, $user_id, $expiration, $scheme, $token);
 }
 endif;
 
-if ( !function_exists('wp_parse_auth_cookie') ) :
+if ( ! function_exists('wp_parse_auth_cookie')) :
 /**
  * Parse a cookie into its components
  *
@@ -748,8 +748,8 @@ 
  * @return array|false Authentication cookie components
  */
 function wp_parse_auth_cookie($cookie = '', $scheme = '') {
-	if ( empty($cookie) ) {
-		switch ($scheme){
+	if (empty($cookie)) {
+		switch ($scheme) {
 			case 'auth':
 				$cookie_name = AUTH_COOKIE;
 				break;
@@ -760,7 +760,7 @@ 
 				$cookie_name = LOGGED_IN_COOKIE;
 				break;
 			default:
-				if ( is_ssl() ) {
+				if (is_ssl()) {
 					$cookie_name = SECURE_AUTH_COOKIE;
 					$scheme = 'secure_auth';
 				} else {
@@ -769,23 +769,23 @@ 
 				}
 	    }
 
-		if ( empty($_COOKIE[$cookie_name]) )
+		if (empty($_COOKIE[$cookie_name]))
 			return false;
 		$cookie = $_COOKIE[$cookie_name];
 	}
 
 	$cookie_elements = explode('|', $cookie);
-	if ( count( $cookie_elements ) !== 4 ) {
+	if (count($cookie_elements) !== 4) {
 		return false;
 	}
 
-	list( $username, $expiration, $token, $hmac ) = $cookie_elements;
+	list($username, $expiration, $token, $hmac) = $cookie_elements;
 
-	return compact( 'username', 'expiration', 'token', 'hmac', 'scheme' );
+	return compact('username', 'expiration', 'token', 'hmac', 'scheme');
 }
 endif;
 
-if ( !function_exists('wp_set_auth_cookie') ) :
+if ( ! function_exists('wp_set_auth_cookie')) :
 /**
  * Log in a user by setting authentication cookies.
  *
@@ -802,8 +802,8 @@ 
  *                         Default is_ssl().
  * @param string $token    Optional. User's session token to use for this cookie.
  */
-function wp_set_auth_cookie( $user_id, $remember = false, $secure = '', $token = '' ) {
-	if ( $remember ) {
+function wp_set_auth_cookie($user_id, $remember = false, $secure = '', $token = '') {
+	if ($remember) {
 		/**
 		 * Filters the duration of the authentication cookie expiration period.
 		 *
@@ -813,25 +813,25 @@ 
 		 * @param int  $user_id  User ID.
 		 * @param bool $remember Whether to remember the user login. Default false.
 		 */
-		$expiration = time() + apply_filters( 'auth_cookie_expiration', 14 * DAY_IN_SECONDS, $user_id, $remember );
+		$expiration = time() + apply_filters('auth_cookie_expiration', 14 * DAY_IN_SECONDS, $user_id, $remember);
 
 		/*
 		 * Ensure the browser will continue to send the cookie after the expiration time is reached.
 		 * Needed for the login grace period in wp_validate_auth_cookie().
 		 */
-		$expire = $expiration + ( 12 * HOUR_IN_SECONDS );
+		$expire = $expiration + (12 * HOUR_IN_SECONDS);
 	} else {
 		/** This filter is documented in wp-includes/pluggable.php */
-		$expiration = time() + apply_filters( 'auth_cookie_expiration', 2 * DAY_IN_SECONDS, $user_id, $remember );
+		$expiration = time() + apply_filters('auth_cookie_expiration', 2 * DAY_IN_SECONDS, $user_id, $remember);
 		$expire = 0;
 	}
 
-	if ( '' === $secure ) {
+	if ('' === $secure) {
 		$secure = is_ssl();
 	}
 
 	// Front-end cookie is secure when the auth cookie is secure and the site's home URL is forced HTTPS.
-	$secure_logged_in_cookie = $secure && 'https' === parse_url( get_option( 'home' ), PHP_URL_SCHEME );
+	$secure_logged_in_cookie = $secure && 'https' === parse_url(get_option('home'), PHP_URL_SCHEME);
 
 	/**
 	 * Filters whether the connection is secure.
@@ -841,7 +841,7 @@ 
 	 * @param bool $secure  Whether the connection is secure.
 	 * @param int  $user_id User ID.
 	 */
-	$secure = apply_filters( 'secure_auth_cookie', $secure, $user_id );
+	$secure = apply_filters('secure_auth_cookie', $secure, $user_id);
 
 	/**
 	 * Filters whether to use a secure cookie when logged-in.
@@ -852,9 +852,9 @@ 
 	 * @param int  $user_id                 User ID.
 	 * @param bool $secure                  Whether the connection is secure.
 	 */
-	$secure_logged_in_cookie = apply_filters( 'secure_logged_in_cookie', $secure_logged_in_cookie, $user_id, $secure );
+	$secure_logged_in_cookie = apply_filters('secure_logged_in_cookie', $secure_logged_in_cookie, $user_id, $secure);
 
-	if ( $secure ) {
+	if ($secure) {
 		$auth_cookie_name = SECURE_AUTH_COOKIE;
 		$scheme = 'secure_auth';
 	} else {
@@ -862,13 +862,13 @@ 
 		$scheme = 'auth';
 	}
 
-	if ( '' === $token ) {
-		$manager = WP_Session_Tokens::get_instance( $user_id );
-		$token   = $manager->create( $expiration );
+	if ('' === $token) {
+		$manager = WP_Session_Tokens::get_instance($user_id);
+		$token   = $manager->create($expiration);
 	}
 
-	$auth_cookie = wp_generate_auth_cookie( $user_id, $expiration, $scheme, $token );
-	$logged_in_cookie = wp_generate_auth_cookie( $user_id, $expiration, 'logged_in', $token );
+	$auth_cookie = wp_generate_auth_cookie($user_id, $expiration, $scheme, $token);
+	$logged_in_cookie = wp_generate_auth_cookie($user_id, $expiration, 'logged_in', $token);
 
 	/**
 	 * Fires immediately before the authentication cookie is set.
@@ -883,7 +883,7 @@ 
 	 * @param int    $user_id     User ID.
 	 * @param string $scheme      Authentication scheme. Values include 'auth', 'secure_auth', or 'logged_in'.
 	 */
-	do_action( 'set_auth_cookie', $auth_cookie, $expire, $expiration, $user_id, $scheme );
+	do_action('set_auth_cookie', $auth_cookie, $expire, $expiration, $user_id, $scheme);
 
 	/**
 	 * Fires immediately before the logged-in authentication cookie is set.
@@ -898,17 +898,17 @@ 
 	 * @param int    $user_id          User ID.
 	 * @param string $scheme           Authentication scheme. Default 'logged_in'.
 	 */
-	do_action( 'set_logged_in_cookie', $logged_in_cookie, $expire, $expiration, $user_id, 'logged_in' );
+	do_action('set_logged_in_cookie', $logged_in_cookie, $expire, $expiration, $user_id, 'logged_in');
 
 	setcookie($auth_cookie_name, $auth_cookie, $expire, PLUGINS_COOKIE_PATH, COOKIE_DOMAIN, $secure, true);
 	setcookie($auth_cookie_name, $auth_cookie, $expire, ADMIN_COOKIE_PATH, COOKIE_DOMAIN, $secure, true);
 	setcookie(LOGGED_IN_COOKIE, $logged_in_cookie, $expire, COOKIEPATH, COOKIE_DOMAIN, $secure_logged_in_cookie, true);
-	if ( COOKIEPATH != SITECOOKIEPATH )
+	if (COOKIEPATH != SITECOOKIEPATH)
 		setcookie(LOGGED_IN_COOKIE, $logged_in_cookie, $expire, SITECOOKIEPATH, COOKIE_DOMAIN, $secure_logged_in_cookie, true);
 }
 endif;
 
-if ( !function_exists('wp_clear_auth_cookie') ) :
+if ( ! function_exists('wp_clear_auth_cookie')) :
 /**
  * Removes all of the cookies associated with authentication.
  *
@@ -920,30 +920,30 @@ 
 	 *
 	 * @since 2.7.0
 	 */
-	do_action( 'clear_auth_cookie' );
+	do_action('clear_auth_cookie');
 
-	setcookie( AUTH_COOKIE,        ' ', time() - YEAR_IN_SECONDS, ADMIN_COOKIE_PATH,   COOKIE_DOMAIN );
-	setcookie( SECURE_AUTH_COOKIE, ' ', time() - YEAR_IN_SECONDS, ADMIN_COOKIE_PATH,   COOKIE_DOMAIN );
-	setcookie( AUTH_COOKIE,        ' ', time() - YEAR_IN_SECONDS, PLUGINS_COOKIE_PATH, COOKIE_DOMAIN );
-	setcookie( SECURE_AUTH_COOKIE, ' ', time() - YEAR_IN_SECONDS, PLUGINS_COOKIE_PATH, COOKIE_DOMAIN );
-	setcookie( LOGGED_IN_COOKIE,   ' ', time() - YEAR_IN_SECONDS, COOKIEPATH,          COOKIE_DOMAIN );
-	setcookie( LOGGED_IN_COOKIE,   ' ', time() - YEAR_IN_SECONDS, SITECOOKIEPATH,      COOKIE_DOMAIN );
+	setcookie(AUTH_COOKIE, ' ', time() - YEAR_IN_SECONDS, ADMIN_COOKIE_PATH, COOKIE_DOMAIN);
+	setcookie(SECURE_AUTH_COOKIE, ' ', time() - YEAR_IN_SECONDS, ADMIN_COOKIE_PATH, COOKIE_DOMAIN);
+	setcookie(AUTH_COOKIE, ' ', time() - YEAR_IN_SECONDS, PLUGINS_COOKIE_PATH, COOKIE_DOMAIN);
+	setcookie(SECURE_AUTH_COOKIE, ' ', time() - YEAR_IN_SECONDS, PLUGINS_COOKIE_PATH, COOKIE_DOMAIN);
+	setcookie(LOGGED_IN_COOKIE, ' ', time() - YEAR_IN_SECONDS, COOKIEPATH, COOKIE_DOMAIN);
+	setcookie(LOGGED_IN_COOKIE, ' ', time() - YEAR_IN_SECONDS, SITECOOKIEPATH, COOKIE_DOMAIN);
 
 	// Old cookies
-	setcookie( AUTH_COOKIE,        ' ', time() - YEAR_IN_SECONDS, COOKIEPATH,     COOKIE_DOMAIN );
-	setcookie( AUTH_COOKIE,        ' ', time() - YEAR_IN_SECONDS, SITECOOKIEPATH, COOKIE_DOMAIN );
-	setcookie( SECURE_AUTH_COOKIE, ' ', time() - YEAR_IN_SECONDS, COOKIEPATH,     COOKIE_DOMAIN );
-	setcookie( SECURE_AUTH_COOKIE, ' ', time() - YEAR_IN_SECONDS, SITECOOKIEPATH, COOKIE_DOMAIN );
+	setcookie(AUTH_COOKIE, ' ', time() - YEAR_IN_SECONDS, COOKIEPATH, COOKIE_DOMAIN);
+	setcookie(AUTH_COOKIE, ' ', time() - YEAR_IN_SECONDS, SITECOOKIEPATH, COOKIE_DOMAIN);
+	setcookie(SECURE_AUTH_COOKIE, ' ', time() - YEAR_IN_SECONDS, COOKIEPATH, COOKIE_DOMAIN);
+	setcookie(SECURE_AUTH_COOKIE, ' ', time() - YEAR_IN_SECONDS, SITECOOKIEPATH, COOKIE_DOMAIN);
 
 	// Even older cookies
-	setcookie( USER_COOKIE, ' ', time() - YEAR_IN_SECONDS, COOKIEPATH,     COOKIE_DOMAIN );
-	setcookie( PASS_COOKIE, ' ', time() - YEAR_IN_SECONDS, COOKIEPATH,     COOKIE_DOMAIN );
-	setcookie( USER_COOKIE, ' ', time() - YEAR_IN_SECONDS, SITECOOKIEPATH, COOKIE_DOMAIN );
-	setcookie( PASS_COOKIE, ' ', time() - YEAR_IN_SECONDS, SITECOOKIEPATH, COOKIE_DOMAIN );
+	setcookie(USER_COOKIE, ' ', time() - YEAR_IN_SECONDS, COOKIEPATH, COOKIE_DOMAIN);
+	setcookie(PASS_COOKIE, ' ', time() - YEAR_IN_SECONDS, COOKIEPATH, COOKIE_DOMAIN);
+	setcookie(USER_COOKIE, ' ', time() - YEAR_IN_SECONDS, SITECOOKIEPATH, COOKIE_DOMAIN);
+	setcookie(PASS_COOKIE, ' ', time() - YEAR_IN_SECONDS, SITECOOKIEPATH, COOKIE_DOMAIN);
 }
 endif;
 
-if ( !function_exists('is_user_logged_in') ) :
+if ( ! function_exists('is_user_logged_in')) :
 /**
  * Checks if the current visitor is a logged in user.
  *
@@ -958,7 +958,7 @@ 
 }
 endif;
 
-if ( !function_exists('auth_redirect') ) :
+if ( ! function_exists('auth_redirect')) :
 /**
  * Checks if a user is logged in, if not it redirects them to the login page.
  *
@@ -967,7 +967,7 @@ 
 function auth_redirect() {
 	// Checks if a user is logged in, if not redirects them to the login page
 
-	$secure = ( is_ssl() || force_ssl_admin() );
+	$secure = (is_ssl() || force_ssl_admin());
 
 	/**
 	 * Filters whether to use a secure authentication redirect.
@@ -976,15 +976,15 @@ 
 	 *
 	 * @param bool $secure Whether to use a secure authentication redirect. Default false.
 	 */
-	$secure = apply_filters( 'secure_auth_redirect', $secure );
+	$secure = apply_filters('secure_auth_redirect', $secure);
 
 	// If https is required and request is http, redirect
-	if ( $secure && !is_ssl() && false !== strpos($_SERVER['REQUEST_URI'], 'wp-admin') ) {
-		if ( 0 === strpos( $_SERVER['REQUEST_URI'], 'http' ) ) {
-			wp_redirect( set_url_scheme( $_SERVER['REQUEST_URI'], 'https' ) );
+	if ($secure && ! is_ssl() && false !== strpos($_SERVER['REQUEST_URI'], 'wp-admin')) {
+		if (0 === strpos($_SERVER['REQUEST_URI'], 'http')) {
+			wp_redirect(set_url_scheme($_SERVER['REQUEST_URI'], 'https'));
 			exit();
 		} else {
-			wp_redirect( 'https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
+			wp_redirect('https://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']);
 			exit();
 		}
 	}
@@ -996,9 +996,9 @@ 
 	 *
 	 * @param string $scheme Authentication redirect scheme. Default empty.
 	 */
-	$scheme = apply_filters( 'auth_redirect_scheme', '' );
+	$scheme = apply_filters('auth_redirect_scheme', '');
 
-	if ( $user_id = wp_validate_auth_cookie( '',  $scheme) ) {
+	if ($user_id = wp_validate_auth_cookie('', $scheme)) {
 		/**
 		 * Fires before the authentication redirect.
 		 *
@@ -1006,26 +1006,26 @@ 
 		 *
 		 * @param int $user_id User ID.
 		 */
-		do_action( 'auth_redirect', $user_id );
+		do_action('auth_redirect', $user_id);
 
 		// If the user wants ssl but the session is not ssl, redirect.
-		if ( !$secure && get_user_option('use_ssl', $user_id) && false !== strpos($_SERVER['REQUEST_URI'], 'wp-admin') ) {
-			if ( 0 === strpos( $_SERVER['REQUEST_URI'], 'http' ) ) {
-				wp_redirect( set_url_scheme( $_SERVER['REQUEST_URI'], 'https' ) );
+		if ( ! $secure && get_user_option('use_ssl', $user_id) && false !== strpos($_SERVER['REQUEST_URI'], 'wp-admin')) {
+			if (0 === strpos($_SERVER['REQUEST_URI'], 'http')) {
+				wp_redirect(set_url_scheme($_SERVER['REQUEST_URI'], 'https'));
 				exit();
 			} else {
-				wp_redirect( 'https://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
+				wp_redirect('https://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']);
 				exit();
 			}
 		}
 
-		return;  // The cookie is good so we're done
+		return; // The cookie is good so we're done
 	}
 
 	// The cookie is no good so force login
 	nocache_headers();
 
-	$redirect = ( strpos( $_SERVER['REQUEST_URI'], '/options.php' ) && wp_get_referer() ) ? wp_get_referer() : set_url_scheme( 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'] );
+	$redirect = (strpos($_SERVER['REQUEST_URI'], '/options.php') && wp_get_referer()) ? wp_get_referer() : set_url_scheme('http://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']);
 
 	$login_url = wp_login_url($redirect, true);
 
@@ -1034,7 +1034,7 @@ 
 }
 endif;
 
-if ( !function_exists('check_admin_referer') ) :
+if ( ! function_exists('check_admin_referer')) :
 /**
  * Makes sure that a user was referred from another admin page.
  *
@@ -1048,9 +1048,9 @@ 
  * @return false|int False if the nonce is invalid, 1 if the nonce is valid and generated between
  *                   0-12 hours ago, 2 if the nonce is valid and generated between 12-24 hours ago.
  */
-function check_admin_referer( $action = -1, $query_arg = '_wpnonce' ) {
+function check_admin_referer($action = -1, $query_arg = '_wpnonce') {
 	if ( -1 == $action )
-		_doing_it_wrong( __FUNCTION__, __( 'You should specify a nonce action to be verified by using the first parameter.' ), '3.2.0' );
+		_doing_it_wrong(__FUNCTION__, __('You should specify a nonce action to be verified by using the first parameter.'), '3.2.0');
 
 	$adminurl = strtolower(admin_url());
 	$referer = strtolower(wp_get_referer());
@@ -1065,10 +1065,10 @@ 
 	 * @param false|int $result False if the nonce is invalid, 1 if the nonce is valid and generated between
 	 *                          0-12 hours ago, 2 if the nonce is valid and generated between 12-24 hours ago.
 	 */
-	do_action( 'check_admin_referer', $action, $result );
+	do_action('check_admin_referer', $action, $result);
 
-	if ( ! $result && ! ( -1 == $action && strpos( $referer, $adminurl ) === 0 ) ) {
-		wp_nonce_ays( $action );
+	if ( ! $result && ! ( -1 == $action && strpos($referer, $adminurl) === 0 )) {
+		wp_nonce_ays($action);
 		die();
 	}
 
@@ -1076,7 +1076,7 @@ 
 }
 endif;
 
-if ( !function_exists('check_ajax_referer') ) :
+if ( ! function_exists('check_ajax_referer')) :
 /**
  * Verifies the Ajax request to prevent processing requests external of the blog.
  *
@@ -1091,21 +1091,21 @@ 
  * @return false|int False if the nonce is invalid, 1 if the nonce is valid and generated between
  *                   0-12 hours ago, 2 if the nonce is valid and generated between 12-24 hours ago.
  */
-function check_ajax_referer( $action = -1, $query_arg = false, $die = true ) {
+function check_ajax_referer($action = -1, $query_arg = false, $die = true) {
 	if ( -1 == $action ) {
-		_doing_it_wrong( __FUNCTION__, __( 'You should specify a nonce action to be verified by using the first parameter.' ), '4.7' );
+		_doing_it_wrong(__FUNCTION__, __('You should specify a nonce action to be verified by using the first parameter.'), '4.7');
 	}
 
 	$nonce = '';
 
-	if ( $query_arg && isset( $_REQUEST[ $query_arg ] ) )
-		$nonce = $_REQUEST[ $query_arg ];
-	elseif ( isset( $_REQUEST['_ajax_nonce'] ) )
+	if ($query_arg && isset($_REQUEST[$query_arg]))
+		$nonce = $_REQUEST[$query_arg];
+	elseif (isset($_REQUEST['_ajax_nonce']))
 		$nonce = $_REQUEST['_ajax_nonce'];
-	elseif ( isset( $_REQUEST['_wpnonce'] ) )
+	elseif (isset($_REQUEST['_wpnonce']))
 		$nonce = $_REQUEST['_wpnonce'];
 
-	$result = wp_verify_nonce( $nonce, $action );
+	$result = wp_verify_nonce($nonce, $action);
 
 	/**
 	 * Fires once the Ajax request has been validated or not.
@@ -1116,13 +1116,13 @@ 
 	 * @param false|int $result False if the nonce is invalid, 1 if the nonce is valid and generated between
 	 *                          0-12 hours ago, 2 if the nonce is valid and generated between 12-24 hours ago.
 	 */
-	do_action( 'check_ajax_referer', $action, $result );
+	do_action('check_ajax_referer', $action, $result);
 
-	if ( $die && false === $result ) {
-		if ( wp_doing_ajax() ) {
+	if ($die && false === $result) {
+		if (wp_doing_ajax()) {
 			wp_die( -1, 403 );
 		} else {
-			die( '-1' );
+			die('-1');
 		}
 	}
 
@@ -1130,7 +1130,7 @@ 
 }
 endif;
 
-if ( !function_exists('wp_redirect') ) :
+if ( ! function_exists('wp_redirect')) :
 /**
  * Redirects to another page.
  *
@@ -1166,7 +1166,7 @@ 
 	 * @param string $location The path to redirect to.
 	 * @param int    $status   Status code to use.
 	 */
-	$location = apply_filters( 'wp_redirect', $location, $status );
+	$location = apply_filters('wp_redirect', $location, $status);
 
 	/**
 	 * Filters the redirect status code.
@@ -1176,14 +1176,14 @@ 
 	 * @param int    $status   Status code to use.
 	 * @param string $location The path to redirect to.
 	 */
-	$status = apply_filters( 'wp_redirect_status', $status, $location );
+	$status = apply_filters('wp_redirect_status', $status, $location);
 
-	if ( ! $location )
+	if ( ! $location)
 		return false;
 
 	$location = wp_sanitize_redirect($location);
 
-	if ( !$is_IIS && PHP_SAPI != 'cgi-fcgi' )
+	if ( ! $is_IIS && PHP_SAPI != 'cgi-fcgi')
 		status_header($status); // This causes problems on IIS and some FastCGI setups
 
 	header("Location: $location", true, $status);
@@ -1192,7 +1192,7 @@ 
 }
 endif;
 
-if ( !function_exists('wp_sanitize_redirect') ) :
+if ( ! function_exists('wp_sanitize_redirect')) :
 /**
  * Sanitizes a URL for use in a redirect.
  *
@@ -1214,13 +1214,13 @@ 
 			|   \xF4[\x80-\x8F][\x80-\xBF]{2}
 		){1,40}                              # ...one or more times
 		)/x';
-	$location = preg_replace_callback( $regex, '_wp_sanitize_utf8_in_redirect', $location );
+	$location = preg_replace_callback($regex, '_wp_sanitize_utf8_in_redirect', $location);
 	$location = preg_replace('|[^a-z0-9-~+_.?#=&;,/:%!*\[\]()@]|i', '', $location);
 	$location = wp_kses_no_null($location);
 
 	// remove %0d and %0a from location
 	$strip = array('%0d', '%0a', '%0D', '%0A');
-	return _deep_replace( $strip, $location );
+	return _deep_replace($strip, $location);
 }
 
 /**
@@ -1235,12 +1235,12 @@ 
  * @param array $matches RegEx matches against the redirect location.
  * @return string URL-encoded version of the first RegEx match.
  */
-function _wp_sanitize_utf8_in_redirect( $matches ) {
-	return urlencode( $matches[0] );
+function _wp_sanitize_utf8_in_redirect($matches) {
+	return urlencode($matches[0]);
 }
 endif;
 
-if ( !function_exists('wp_safe_redirect') ) :
+if ( ! function_exists('wp_safe_redirect')) :
 /**
  * Performs a safe (local) redirect, using wp_redirect().
  *
@@ -1270,13 +1270,13 @@ 
 	 * @param string $fallback_url The fallback URL to use by default.
 	 * @param int    $status       The redirect status.
 	 */
-	$location = wp_validate_redirect( $location, apply_filters( 'wp_safe_redirect_fallback', admin_url(), $status ) );
+	$location = wp_validate_redirect($location, apply_filters('wp_safe_redirect_fallback', admin_url(), $status));
 
 	wp_redirect($location, $status);
 }
 endif;
 
-if ( !function_exists('wp_validate_redirect') ) :
+if ( ! function_exists('wp_validate_redirect')) :
 /**
  * Validates a URL for use in a redirect.
  *
@@ -1293,33 +1293,33 @@ 
  * @return string redirect-sanitized URL
  **/
 function wp_validate_redirect($location, $default = '') {
-	$location = trim( $location );
+	$location = trim($location);
 	// browsers will assume 'http' is your protocol, and will obey a redirect to a URL starting with '//'
-	if ( substr($location, 0, 2) == '//' )
-		$location = 'http:' . $location;
+	if (substr($location, 0, 2) == '//')
+		$location = 'http:'.$location;
 
 	// In php 5 parse_url may fail if the URL query part contains http://, bug #38143
-	$test = ( $cut = strpos($location, '?') ) ? substr( $location, 0, $cut ) : $location;
+	$test = ($cut = strpos($location, '?')) ? substr($location, 0, $cut) : $location;
 
 	// @-operator is used to prevent possible warnings in PHP < 5.3.3.
 	$lp = @parse_url($test);
 
 	// Give up if malformed URL
-	if ( false === $lp )
+	if (false === $lp)
 		return $default;
 
 	// Allow only http and https schemes. No data:, etc.
-	if ( isset($lp['scheme']) && !('http' == $lp['scheme'] || 'https' == $lp['scheme']) )
+	if (isset($lp['scheme']) && ! ('http' == $lp['scheme'] || 'https' == $lp['scheme']))
 		return $default;
 
 	// Reject if certain components are set but host is not. This catches urls like https:host.com for which parse_url does not set the host field.
-	if ( ! isset( $lp['host'] ) && ( isset( $lp['scheme'] ) || isset( $lp['user'] ) || isset( $lp['pass'] ) || isset( $lp['port'] ) ) ) {
+	if ( ! isset($lp['host']) && (isset($lp['scheme']) || isset($lp['user']) || isset($lp['pass']) || isset($lp['port']))) {
 		return $default;
 	}
 
 	// Reject malformed components parse_url() can return on odd inputs.
-	foreach ( array( 'user', 'pass', 'host' ) as $component ) {
-		if ( isset( $lp[ $component ] ) && strpbrk( $lp[ $component ], ':/?#@' ) ) {
+	foreach (array('user', 'pass', 'host') as $component) {
+		if (isset($lp[$component]) && strpbrk($lp[$component], ':/?#@')) {
 			return $default;
 		}
 	}
@@ -1334,16 +1334,16 @@ 
 	 * @param array       $hosts An array of allowed hosts.
 	 * @param bool|string $host  The parsed host; empty if not isset.
 	 */
-	$allowed_hosts = (array) apply_filters( 'allowed_redirect_hosts', array($wpp['host']), isset($lp['host']) ? $lp['host'] : '' );
+	$allowed_hosts = (array) apply_filters('allowed_redirect_hosts', array($wpp['host']), isset($lp['host']) ? $lp['host'] : '');
 
-	if ( isset($lp['host']) && ( !in_array($lp['host'], $allowed_hosts) && $lp['host'] != strtolower($wpp['host'])) )
+	if (isset($lp['host']) && ( ! in_array($lp['host'], $allowed_hosts) && $lp['host'] != strtolower($wpp['host'])))
 		$location = $default;
 
 	return $location;
 }
 endif;
 
-if ( ! function_exists('wp_notify_postauthor') ) :
+if ( ! function_exists('wp_notify_postauthor')) :
 /**
  * Notify an author (and/or others) of a comment/trackback/pingback on a post.
  *
@@ -1353,21 +1353,21 @@ 
  * @param string          $deprecated Not used
  * @return bool True on completion. False if no email addresses were specified.
  */
-function wp_notify_postauthor( $comment_id, $deprecated = null ) {
-	if ( null !== $deprecated ) {
-		_deprecated_argument( __FUNCTION__, '3.8.0' );
+function wp_notify_postauthor($comment_id, $deprecated = null) {
+	if (null !== $deprecated) {
+		_deprecated_argument(__FUNCTION__, '3.8.0');
 	}
 
-	$comment = get_comment( $comment_id );
-	if ( empty( $comment ) || empty( $comment->comment_post_ID ) )
+	$comment = get_comment($comment_id);
+	if (empty($comment) || empty($comment->comment_post_ID))
 		return false;
 
-	$post    = get_post( $comment->comment_post_ID );
-	$author  = get_userdata( $post->post_author );
+	$post    = get_post($comment->comment_post_ID);
+	$author  = get_userdata($post->post_author);
 
 	// Who to notify? By default, just the post author, but others can be added.
 	$emails = array();
-	if ( $author ) {
+	if ($author) {
 		$emails[] = $author->user_email;
 	}
 
@@ -1382,16 +1382,16 @@ 
 	 * @param array $emails     An array of email addresses to receive a comment notification.
 	 * @param int   $comment_id The comment ID.
 	 */
-	$emails = apply_filters( 'comment_notification_recipients', $emails, $comment->comment_ID );
-	$emails = array_filter( $emails );
+	$emails = apply_filters('comment_notification_recipients', $emails, $comment->comment_ID);
+	$emails = array_filter($emails);
 
 	// If there are no addresses to send the comment to, bail.
-	if ( ! count( $emails ) ) {
+	if ( ! count($emails)) {
 		return false;
 	}
 
 	// Facilitate unsetting below without knowing the keys.
-	$emails = array_flip( $emails );
+	$emails = array_flip($emails);
 
 	/**
 	 * Filters whether to notify comment authors of their comments on their own posts.
@@ -1405,103 +1405,103 @@ 
 	 *                         Default false.
 	 * @param int  $comment_id The comment ID.
 	 */
-	$notify_author = apply_filters( 'comment_notification_notify_author', false, $comment->comment_ID );
+	$notify_author = apply_filters('comment_notification_notify_author', false, $comment->comment_ID);
 
 	// The comment was left by the author
-	if ( $author && ! $notify_author && $comment->user_id == $post->post_author ) {
-		unset( $emails[ $author->user_email ] );
+	if ($author && ! $notify_author && $comment->user_id == $post->post_author) {
+		unset($emails[$author->user_email]);
 	}
 
 	// The author moderated a comment on their own post
-	if ( $author && ! $notify_author && $post->post_author == get_current_user_id() ) {
-		unset( $emails[ $author->user_email ] );
+	if ($author && ! $notify_author && $post->post_author == get_current_user_id()) {
+		unset($emails[$author->user_email]);
 	}
 
 	// The post author is no longer a member of the blog
-	if ( $author && ! $notify_author && ! user_can( $post->post_author, 'read_post', $post->ID ) ) {
-		unset( $emails[ $author->user_email ] );
+	if ($author && ! $notify_author && ! user_can($post->post_author, 'read_post', $post->ID)) {
+		unset($emails[$author->user_email]);
 	}
 
 	// If there's no email to send the comment to, bail, otherwise flip array back around for use below
-	if ( ! count( $emails ) ) {
+	if ( ! count($emails)) {
 		return false;
 	} else {
-		$emails = array_flip( $emails );
+		$emails = array_flip($emails);
 	}
 
-	$switched_locale = switch_to_locale( get_locale() );
+	$switched_locale = switch_to_locale(get_locale());
 
 	$comment_author_domain = @gethostbyaddr($comment->comment_author_IP);
 
 	// The blogname option is escaped with esc_html on the way into the database in sanitize_option
 	// we want to reverse this for the plain text arena of emails.
 	$blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
-	$comment_content = wp_specialchars_decode( $comment->comment_content );
+	$comment_content = wp_specialchars_decode($comment->comment_content);
 
-	switch ( $comment->comment_type ) {
+	switch ($comment->comment_type) {
 		case 'trackback':
 			/* translators: 1: Post title */
-			$notify_message  = sprintf( __( 'New trackback on your post "%s"' ), $post->post_title ) . "\r\n";
+			$notify_message  = sprintf(__('New trackback on your post "%s"'), $post->post_title)."\r\n";
 			/* translators: 1: Trackback/pingback website name, 2: website IP, 3: website hostname */
-			$notify_message .= sprintf( __('Website: %1$s (IP: %2$s, %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
-			$notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
-			$notify_message .= sprintf( __( 'Comment: %s' ), "\r\n" . $comment_content ) . "\r\n\r\n";
-			$notify_message .= __( 'You can see all trackbacks on this post here:' ) . "\r\n";
+			$notify_message .= sprintf(__('Website: %1$s (IP: %2$s, %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain)."\r\n";
+			$notify_message .= sprintf(__('URL: %s'), $comment->comment_author_url)."\r\n";
+			$notify_message .= sprintf(__('Comment: %s'), "\r\n".$comment_content)."\r\n\r\n";
+			$notify_message .= __('You can see all trackbacks on this post here:')."\r\n";
 			/* translators: 1: blog name, 2: post title */
-			$subject = sprintf( __('[%1$s] Trackback: "%2$s"'), $blogname, $post->post_title );
+			$subject = sprintf(__('[%1$s] Trackback: "%2$s"'), $blogname, $post->post_title);
 			break;
 		case 'pingback':
 			/* translators: 1: Post title */
-			$notify_message  = sprintf( __( 'New pingback on your post "%s"' ), $post->post_title ) . "\r\n";
+			$notify_message  = sprintf(__('New pingback on your post "%s"'), $post->post_title)."\r\n";
 			/* translators: 1: Trackback/pingback website name, 2: website IP, 3: website hostname */
-			$notify_message .= sprintf( __('Website: %1$s (IP: %2$s, %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
-			$notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
-			$notify_message .= sprintf( __( 'Comment: %s' ), "\r\n" . $comment_content ) . "\r\n\r\n";
-			$notify_message .= __( 'You can see all pingbacks on this post here:' ) . "\r\n";
+			$notify_message .= sprintf(__('Website: %1$s (IP: %2$s, %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain)."\r\n";
+			$notify_message .= sprintf(__('URL: %s'), $comment->comment_author_url)."\r\n";
+			$notify_message .= sprintf(__('Comment: %s'), "\r\n".$comment_content)."\r\n\r\n";
+			$notify_message .= __('You can see all pingbacks on this post here:')."\r\n";
 			/* translators: 1: blog name, 2: post title */
-			$subject = sprintf( __('[%1$s] Pingback: "%2$s"'), $blogname, $post->post_title );
+			$subject = sprintf(__('[%1$s] Pingback: "%2$s"'), $blogname, $post->post_title);
 			break;
 		default: // Comments
-			$notify_message  = sprintf( __( 'New comment on your post "%s"' ), $post->post_title ) . "\r\n";
+			$notify_message  = sprintf(__('New comment on your post "%s"'), $post->post_title)."\r\n";
 			/* translators: 1: comment author, 2: author IP, 3: author domain */
-			$notify_message .= sprintf( __( 'Author: %1$s (IP: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
-			$notify_message .= sprintf( __( 'Email: %s' ), $comment->comment_author_email ) . "\r\n";
-			$notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
-			$notify_message .= sprintf( __('Comment: %s' ), "\r\n" . $comment_content ) . "\r\n\r\n";
-			$notify_message .= __( 'You can see all comments on this post here:' ) . "\r\n";
+			$notify_message .= sprintf(__('Author: %1$s (IP: %2$s, %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain)."\r\n";
+			$notify_message .= sprintf(__('Email: %s'), $comment->comment_author_email)."\r\n";
+			$notify_message .= sprintf(__('URL: %s'), $comment->comment_author_url)."\r\n";
+			$notify_message .= sprintf(__('Comment: %s'), "\r\n".$comment_content)."\r\n\r\n";
+			$notify_message .= __('You can see all comments on this post here:')."\r\n";
 			/* translators: 1: blog name, 2: post title */
-			$subject = sprintf( __('[%1$s] Comment: "%2$s"'), $blogname, $post->post_title );
+			$subject = sprintf(__('[%1$s] Comment: "%2$s"'), $blogname, $post->post_title);
 			break;
 	}
-	$notify_message .= get_permalink($comment->comment_post_ID) . "#comments\r\n\r\n";
-	$notify_message .= sprintf( __('Permalink: %s'), get_comment_link( $comment ) ) . "\r\n";
+	$notify_message .= get_permalink($comment->comment_post_ID)."#comments\r\n\r\n";
+	$notify_message .= sprintf(__('Permalink: %s'), get_comment_link($comment))."\r\n";
 
-	if ( user_can( $post->post_author, 'edit_comment', $comment->comment_ID ) ) {
-		if ( EMPTY_TRASH_DAYS ) {
-			$notify_message .= sprintf( __( 'Trash it: %s' ), admin_url( "comment.php?action=trash&c={$comment->comment_ID}#wpbody-content" ) ) . "\r\n";
+	if (user_can($post->post_author, 'edit_comment', $comment->comment_ID)) {
+		if (EMPTY_TRASH_DAYS) {
+			$notify_message .= sprintf(__('Trash it: %s'), admin_url("comment.php?action=trash&c={$comment->comment_ID}#wpbody-content"))."\r\n";
 		} else {
-			$notify_message .= sprintf( __( 'Delete it: %s' ), admin_url( "comment.php?action=delete&c={$comment->comment_ID}#wpbody-content" ) ) . "\r\n";
+			$notify_message .= sprintf(__('Delete it: %s'), admin_url("comment.php?action=delete&c={$comment->comment_ID}#wpbody-content"))."\r\n";
 		}
-		$notify_message .= sprintf( __( 'Spam it: %s' ), admin_url( "comment.php?action=spam&c={$comment->comment_ID}#wpbody-content" ) ) . "\r\n";
+		$notify_message .= sprintf(__('Spam it: %s'), admin_url("comment.php?action=spam&c={$comment->comment_ID}#wpbody-content"))."\r\n";
 	}
 
-	$wp_email = 'wordpress@' . preg_replace('#^www\.#', '', strtolower($_SERVER['SERVER_NAME']));
+	$wp_email = 'wordpress@'.preg_replace('#^www\.#', '', strtolower($_SERVER['SERVER_NAME']));
 
-	if ( '' == $comment->comment_author ) {
+	if ('' == $comment->comment_author) {
 		$from = "From: \"$blogname\" <$wp_email>";
-		if ( '' != $comment->comment_author_email )
+		if ('' != $comment->comment_author_email)
 			$reply_to = "Reply-To: $comment->comment_author_email";
 	} else {
 		$from = "From: \"$comment->comment_author\" <$wp_email>";
-		if ( '' != $comment->comment_author_email )
+		if ('' != $comment->comment_author_email)
 			$reply_to = "Reply-To: \"$comment->comment_author_email\" <$comment->comment_author_email>";
 	}
 
 	$message_headers = "$from\n"
-		. "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
+		. "Content-Type: text/plain; charset=\"".get_option('blog_charset')."\"\n";
 
-	if ( isset($reply_to) )
-		$message_headers .= $reply_to . "\n";
+	if (isset($reply_to))
+		$message_headers .= $reply_to."\n";
 
 	/**
 	 * Filters the comment notification email text.
@@ -1511,7 +1511,7 @@ 
 	 * @param string $notify_message The comment notification email text.
 	 * @param int    $comment_id     Comment ID.
 	 */
-	$notify_message = apply_filters( 'comment_notification_text', $notify_message, $comment->comment_ID );
+	$notify_message = apply_filters('comment_notification_text', $notify_message, $comment->comment_ID);
 
 	/**
 	 * Filters the comment notification email subject.
@@ -1521,7 +1521,7 @@ 
 	 * @param string $subject    The comment notification email subject.
 	 * @param int    $comment_id Comment ID.
 	 */
-	$subject = apply_filters( 'comment_notification_subject', $subject, $comment->comment_ID );
+	$subject = apply_filters('comment_notification_subject', $subject, $comment->comment_ID);
 
 	/**
 	 * Filters the comment notification email headers.
@@ -1531,13 +1531,13 @@ 
 	 * @param string $message_headers Headers for the comment notification email.
 	 * @param int    $comment_id      Comment ID.
 	 */
-	$message_headers = apply_filters( 'comment_notification_headers', $message_headers, $comment->comment_ID );
+	$message_headers = apply_filters('comment_notification_headers', $message_headers, $comment->comment_ID);
 
-	foreach ( $emails as $email ) {
-		@wp_mail( $email, wp_specialchars_decode( $subject ), $notify_message, $message_headers );
+	foreach ($emails as $email) {
+		@wp_mail($email, wp_specialchars_decode($subject), $notify_message, $message_headers);
 	}
 
-	if ( $switched_locale ) {
+	if ($switched_locale) {
 		restore_previous_locale();
 	}
 
@@ -1545,7 +1545,7 @@ 
 }
 endif;
 
-if ( !function_exists('wp_notify_moderator') ) :
+if ( ! function_exists('wp_notify_moderator')) :
 /**
  * Notifies the moderator of the site about a new comment that is awaiting approval.
  *
@@ -1562,7 +1562,7 @@ 
 function wp_notify_moderator($comment_id) {
 	global $wpdb;
 
-	$maybe_notify = get_option( 'moderation_notify' );
+	$maybe_notify = get_option('moderation_notify');
 
 	/**
 	 * Filters whether to send the site moderator email notifications, overriding the site setting.
@@ -1572,23 +1572,23 @@ 
 	 * @param bool $maybe_notify Whether to notify blog moderator.
 	 * @param int  $comment_ID   The id of the comment for the notification.
 	 */
-	$maybe_notify = apply_filters( 'notify_moderator', $maybe_notify, $comment_id );
+	$maybe_notify = apply_filters('notify_moderator', $maybe_notify, $comment_id);
 
-	if ( ! $maybe_notify ) {
+	if ( ! $maybe_notify) {
 		return true;
 	}
 
 	$comment = get_comment($comment_id);
 	$post = get_post($comment->comment_post_ID);
-	$user = get_userdata( $post->post_author );
+	$user = get_userdata($post->post_author);
 	// Send to the administration and to the post author if the author can modify the comment.
-	$emails = array( get_option( 'admin_email' ) );
-	if ( $user && user_can( $user->ID, 'edit_comment', $comment_id ) && ! empty( $user->user_email ) ) {
-		if ( 0 !== strcasecmp( $user->user_email, get_option( 'admin_email' ) ) )
+	$emails = array(get_option('admin_email'));
+	if ($user && user_can($user->ID, 'edit_comment', $comment_id) && ! empty($user->user_email)) {
+		if (0 !== strcasecmp($user->user_email, get_option('admin_email')))
 			$emails[] = $user->user_email;
 	}
 
-	$switched_locale = switch_to_locale( get_locale() );
+	$switched_locale = switch_to_locale(get_locale());
 
 	$comment_author_domain = @gethostbyaddr($comment->comment_author_IP);
 	$comments_waiting = $wpdb->get_var("SELECT count(comment_ID) FROM $wpdb->comments WHERE comment_approved = '0'");
@@ -1596,65 +1596,65 @@ 
 	// The blogname option is escaped with esc_html on the way into the database in sanitize_option
 	// we want to reverse this for the plain text arena of emails.
 	$blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
-	$comment_content = wp_specialchars_decode( $comment->comment_content );
+	$comment_content = wp_specialchars_decode($comment->comment_content);
 
-	switch ( $comment->comment_type ) {
+	switch ($comment->comment_type) {
 		case 'trackback':
 			/* translators: 1: Post title */
-			$notify_message  = sprintf( __('A new trackback on the post "%s" is waiting for your approval'), $post->post_title ) . "\r\n";
-			$notify_message .= get_permalink($comment->comment_post_ID) . "\r\n\r\n";
+			$notify_message  = sprintf(__('A new trackback on the post "%s" is waiting for your approval'), $post->post_title)."\r\n";
+			$notify_message .= get_permalink($comment->comment_post_ID)."\r\n\r\n";
 			/* translators: 1: Trackback/pingback website name, 2: website IP, 3: website hostname */
-			$notify_message .= sprintf( __( 'Website: %1$s (IP: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
+			$notify_message .= sprintf(__('Website: %1$s (IP: %2$s, %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain)."\r\n";
 			/* translators: 1: Trackback/pingback/comment author URL */
-			$notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
-			$notify_message .= __('Trackback excerpt: ') . "\r\n" . $comment_content . "\r\n\r\n";
+			$notify_message .= sprintf(__('URL: %s'), $comment->comment_author_url)."\r\n";
+			$notify_message .= __('Trackback excerpt: ')."\r\n".$comment_content."\r\n\r\n";
 			break;
 		case 'pingback':
 			/* translators: 1: Post title */
-			$notify_message  = sprintf( __('A new pingback on the post "%s" is waiting for your approval'), $post->post_title ) . "\r\n";
-			$notify_message .= get_permalink($comment->comment_post_ID) . "\r\n\r\n";
+			$notify_message  = sprintf(__('A new pingback on the post "%s" is waiting for your approval'), $post->post_title)."\r\n";
+			$notify_message .= get_permalink($comment->comment_post_ID)."\r\n\r\n";
 			/* translators: 1: Trackback/pingback website name, 2: website IP, 3: website hostname */
-			$notify_message .= sprintf( __( 'Website: %1$s (IP: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
+			$notify_message .= sprintf(__('Website: %1$s (IP: %2$s, %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain)."\r\n";
 			/* translators: 1: Trackback/pingback/comment author URL */
-			$notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
-			$notify_message .= __('Pingback excerpt: ') . "\r\n" . $comment_content . "\r\n\r\n";
+			$notify_message .= sprintf(__('URL: %s'), $comment->comment_author_url)."\r\n";
+			$notify_message .= __('Pingback excerpt: ')."\r\n".$comment_content."\r\n\r\n";
 			break;
 		default: // Comments
 			/* translators: 1: Post title */
-			$notify_message  = sprintf( __('A new comment on the post "%s" is waiting for your approval'), $post->post_title ) . "\r\n";
-			$notify_message .= get_permalink($comment->comment_post_ID) . "\r\n\r\n";
+			$notify_message  = sprintf(__('A new comment on the post "%s" is waiting for your approval'), $post->post_title)."\r\n";
+			$notify_message .= get_permalink($comment->comment_post_ID)."\r\n\r\n";
 			/* translators: 1: Comment author name, 2: comment author's IP, 3: comment author IP's hostname */
-			$notify_message .= sprintf( __( 'Author: %1$s (IP: %2$s, %3$s)' ), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain ) . "\r\n";
+			$notify_message .= sprintf(__('Author: %1$s (IP: %2$s, %3$s)'), $comment->comment_author, $comment->comment_author_IP, $comment_author_domain)."\r\n";
 			/* translators: 1: Comment author URL */
-			$notify_message .= sprintf( __( 'Email: %s' ), $comment->comment_author_email ) . "\r\n";
+			$notify_message .= sprintf(__('Email: %s'), $comment->comment_author_email)."\r\n";
 			/* translators: 1: Trackback/pingback/comment author URL */
-			$notify_message .= sprintf( __( 'URL: %s' ), $comment->comment_author_url ) . "\r\n";
+			$notify_message .= sprintf(__('URL: %s'), $comment->comment_author_url)."\r\n";
 			/* translators: 1: Comment text */
-			$notify_message .= sprintf( __( 'Comment: %s' ), "\r\n" . $comment_content ) . "\r\n\r\n";
+			$notify_message .= sprintf(__('Comment: %s'), "\r\n".$comment_content)."\r\n\r\n";
 			break;
 	}
 
 	/* translators: Comment moderation. 1: Comment action URL */
-	$notify_message .= sprintf( __( 'Approve it: %s' ), admin_url( "comment.php?action=approve&c={$comment_id}#wpbody-content" ) ) . "\r\n";
+	$notify_message .= sprintf(__('Approve it: %s'), admin_url("comment.php?action=approve&c={$comment_id}#wpbody-content"))."\r\n";
 
-	if ( EMPTY_TRASH_DAYS ) {
+	if (EMPTY_TRASH_DAYS) {
 		/* translators: Comment moderation. 1: Comment action URL */
-		$notify_message .= sprintf( __( 'Trash it: %s' ), admin_url( "comment.php?action=trash&c={$comment_id}#wpbody-content" ) ) . "\r\n";
+		$notify_message .= sprintf(__('Trash it: %s'), admin_url("comment.php?action=trash&c={$comment_id}#wpbody-content"))."\r\n";
 	} else {
 		/* translators: Comment moderation. 1: Comment action URL */
-		$notify_message .= sprintf( __( 'Delete it: %s' ), admin_url( "comment.php?action=delete&c={$comment_id}#wpbody-content" ) ) . "\r\n";
+		$notify_message .= sprintf(__('Delete it: %s'), admin_url("comment.php?action=delete&c={$comment_id}#wpbody-content"))."\r\n";
 	}
 
 	/* translators: Comment moderation. 1: Comment action URL */
-	$notify_message .= sprintf( __( 'Spam it: %s' ), admin_url( "comment.php?action=spam&c={$comment_id}#wpbody-content" ) ) . "\r\n";
+	$notify_message .= sprintf(__('Spam it: %s'), admin_url("comment.php?action=spam&c={$comment_id}#wpbody-content"))."\r\n";
 
 	/* translators: Comment moderation. 1: Number of comments awaiting approval */
-	$notify_message .= sprintf( _n('Currently %s comment is waiting for approval. Please visit the moderation panel:',
- 		'Currently %s comments are waiting for approval. Please visit the moderation panel:', $comments_waiting), number_format_i18n($comments_waiting) ) . "\r\n";
-	$notify_message .= admin_url( "edit-comments.php?comment_status=moderated#wpbody-content" ) . "\r\n";
+	$notify_message .= sprintf(_n('Currently %s comment is waiting for approval. Please visit the moderation panel:',
+ 		'Currently %s comments are waiting for approval. Please visit the moderation panel:', $comments_waiting), number_format_i18n($comments_waiting))."\r\n";
+	$notify_message .= admin_url("edit-comments.php?comment_status=moderated#wpbody-content")."\r\n";
 
 	/* translators: Comment moderation notification email subject. 1: Site name, 2: Post title */
-	$subject = sprintf( __('[%1$s] Please moderate: "%2$s"'), $blogname, $post->post_title );
+	$subject = sprintf(__('[%1$s] Please moderate: "%2$s"'), $blogname, $post->post_title);
 	$message_headers = '';
 
 	/**
@@ -1665,7 +1665,7 @@ 
 	 * @param array $emails     List of email addresses to notify for comment moderation.
 	 * @param int   $comment_id Comment ID.
 	 */
-	$emails = apply_filters( 'comment_moderation_recipients', $emails, $comment_id );
+	$emails = apply_filters('comment_moderation_recipients', $emails, $comment_id);
 
 	/**
 	 * Filters the comment moderation email text.
@@ -1675,7 +1675,7 @@ 
 	 * @param string $notify_message Text of the comment moderation email.
 	 * @param int    $comment_id     Comment ID.
 	 */
-	$notify_message = apply_filters( 'comment_moderation_text', $notify_message, $comment_id );
+	$notify_message = apply_filters('comment_moderation_text', $notify_message, $comment_id);
 
 	/**
 	 * Filters the comment moderation email subject.
@@ -1685,7 +1685,7 @@ 
 	 * @param string $subject    Subject of the comment moderation email.
 	 * @param int    $comment_id Comment ID.
 	 */
-	$subject = apply_filters( 'comment_moderation_subject', $subject, $comment_id );
+	$subject = apply_filters('comment_moderation_subject', $subject, $comment_id);
 
 	/**
 	 * Filters the comment moderation email headers.
@@ -1695,13 +1695,13 @@ 
 	 * @param string $message_headers Headers for the comment moderation email.
 	 * @param int    $comment_id      Comment ID.
 	 */
-	$message_headers = apply_filters( 'comment_moderation_headers', $message_headers, $comment_id );
+	$message_headers = apply_filters('comment_moderation_headers', $message_headers, $comment_id);
 
-	foreach ( $emails as $email ) {
-		@wp_mail( $email, wp_specialchars_decode( $subject ), $notify_message, $message_headers );
+	foreach ($emails as $email) {
+		@wp_mail($email, wp_specialchars_decode($subject), $notify_message, $message_headers);
 	}
 
-	if ( $switched_locale ) {
+	if ($switched_locale) {
 		restore_previous_locale();
 	}
 
@@ -1709,7 +1709,7 @@ 
 }
 endif;
 
-if ( !function_exists('wp_password_change_notification') ) :
+if ( ! function_exists('wp_password_change_notification')) :
 /**
  * Notify the blog admin of a user changing password, normally via email.
  *
@@ -1717,22 +1717,22 @@ 
  *
  * @param WP_User $user User object.
  */
-function wp_password_change_notification( $user ) {
+function wp_password_change_notification($user) {
 	// send a copy of password change notification to the admin
 	// but check to see if it's the admin whose password we're changing, and skip this
-	if ( 0 !== strcasecmp( $user->user_email, get_option( 'admin_email' ) ) ) {
+	if (0 !== strcasecmp($user->user_email, get_option('admin_email'))) {
 		/* translators: %s: user name */
-		$message = sprintf( __( 'Password changed for user: %s' ), $user->user_login ) . "\r\n";
+		$message = sprintf(__('Password changed for user: %s'), $user->user_login)."\r\n";
 		// The blogname option is escaped with esc_html on the way into the database in sanitize_option
 		// we want to reverse this for the plain text arena of emails.
 		$blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
 		/* translators: %s: site title */
-		wp_mail( get_option( 'admin_email' ), sprintf( __( '[%s] Password Changed' ), $blogname ), $message );
+		wp_mail(get_option('admin_email'), sprintf(__('[%s] Password Changed'), $blogname), $message);
 	}
 }
 endif;
 
-if ( !function_exists('wp_new_user_notification') ) :
+if ( ! function_exists('wp_new_user_notification')) :
 /**
  * Email login credentials to a newly-registered user.
  *
@@ -1751,66 +1751,66 @@ 
  * @param string $notify     Optional. Type of notification that should happen. Accepts 'admin' or an empty
  *                           string (admin only), 'user', or 'both' (admin and user). Default empty.
  */
-function wp_new_user_notification( $user_id, $deprecated = null, $notify = '' ) {
-	if ( $deprecated !== null ) {
-		_deprecated_argument( __FUNCTION__, '4.3.1' );
+function wp_new_user_notification($user_id, $deprecated = null, $notify = '') {
+	if ($deprecated !== null) {
+		_deprecated_argument(__FUNCTION__, '4.3.1');
 	}
 
 	global $wpdb, $wp_hasher;
-	$user = get_userdata( $user_id );
+	$user = get_userdata($user_id);
 
 	// The blogname option is escaped with esc_html on the way into the database in sanitize_option
 	// we want to reverse this for the plain text arena of emails.
 	$blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
 
-	if ( 'user' !== $notify ) {
-		$switched_locale = switch_to_locale( get_locale() );
-		$message  = sprintf( __( 'New user registration on your site %s:' ), $blogname ) . "\r\n\r\n";
-		$message .= sprintf( __( 'Username: %s' ), $user->user_login ) . "\r\n\r\n";
-		$message .= sprintf( __( 'Email: %s' ), $user->user_email ) . "\r\n";
+	if ('user' !== $notify) {
+		$switched_locale = switch_to_locale(get_locale());
+		$message  = sprintf(__('New user registration on your site %s:'), $blogname)."\r\n\r\n";
+		$message .= sprintf(__('Username: %s'), $user->user_login)."\r\n\r\n";
+		$message .= sprintf(__('Email: %s'), $user->user_email)."\r\n";
 
-		@wp_mail( get_option( 'admin_email' ), sprintf( __( '[%s] New User Registration' ), $blogname ), $message );
+		@wp_mail(get_option('admin_email'), sprintf(__('[%s] New User Registration'), $blogname), $message);
 
-		if ( $switched_locale ) {
+		if ($switched_locale) {
 			restore_previous_locale();
 		}
 	}
 
 	// `$deprecated was pre-4.3 `$plaintext_pass`. An empty `$plaintext_pass` didn't sent a user notification.
-	if ( 'admin' === $notify || ( empty( $deprecated ) && empty( $notify ) ) ) {
+	if ('admin' === $notify || (empty($deprecated) && empty($notify))) {
 		return;
 	}
 
 	// Generate something random for a password reset key.
-	$key = wp_generate_password( 20, false );
+	$key = wp_generate_password(20, false);
 
 	/** This action is documented in wp-login.php */
-	do_action( 'retrieve_password_key', $user->user_login, $key );
+	do_action('retrieve_password_key', $user->user_login, $key);
 
 	// Now insert the key, hashed, into the DB.
-	if ( empty( $wp_hasher ) ) {
-		$wp_hasher = new PasswordHash( 8, true );
+	if (empty($wp_hasher)) {
+		$wp_hasher = new PasswordHash(8, true);
 	}
-	$hashed = time() . ':' . $wp_hasher->HashPassword( $key );
-	$wpdb->update( $wpdb->users, array( 'user_activation_key' => $hashed ), array( 'user_login' => $user->user_login ) );
+	$hashed = time().':'.$wp_hasher->HashPassword($key);
+	$wpdb->update($wpdb->users, array('user_activation_key' => $hashed), array('user_login' => $user->user_login));
 
-	$switched_locale = switch_to_locale( get_user_locale( $user ) );
+	$switched_locale = switch_to_locale(get_user_locale($user));
 
-	$message = sprintf(__('Username: %s'), $user->user_login) . "\r\n\r\n";
-	$message .= __('To set your password, visit the following address:') . "\r\n\r\n";
-	$message .= '<' . network_site_url("wp-login.php?action=rp&key=$key&login=" . rawurlencode($user->user_login), 'login') . ">\r\n\r\n";
+	$message = sprintf(__('Username: %s'), $user->user_login)."\r\n\r\n";
+	$message .= __('To set your password, visit the following address:')."\r\n\r\n";
+	$message .= '<'.network_site_url("wp-login.php?action=rp&key=$key&login=".rawurlencode($user->user_login), 'login').">\r\n\r\n";
 
-	$message .= wp_login_url() . "\r\n";
+	$message .= wp_login_url()."\r\n";
 
 	wp_mail($user->user_email, sprintf(__('[%s] Your username and password info'), $blogname), $message);
 
-	if ( $switched_locale ) {
+	if ($switched_locale) {
 		restore_previous_locale();
 	}
 }
 endif;
 
-if ( !function_exists('wp_nonce_tick') ) :
+if ( ! function_exists('wp_nonce_tick')) :
 /**
  * Get the time-dependent variable for nonce creation.
  *
@@ -1829,13 +1829,13 @@ 
 	 *
 	 * @param int $lifespan Lifespan of nonces in seconds. Default 86,400 seconds, or one day.
 	 */
-	$nonce_life = apply_filters( 'nonce_life', DAY_IN_SECONDS );
+	$nonce_life = apply_filters('nonce_life', DAY_IN_SECONDS);
 
-	return ceil(time() / ( $nonce_life / 2 ));
+	return ceil(time() / ($nonce_life / 2));
 }
 endif;
 
-if ( !function_exists('wp_verify_nonce') ) :
+if ( ! function_exists('wp_verify_nonce')) :
 /**
  * Verify that correct nonce was used with time limit.
  *
@@ -1849,11 +1849,11 @@ 
  * @return false|int False if the nonce is invalid, 1 if the nonce is valid and generated between
  *                   0-12 hours ago, 2 if the nonce is valid and generated between 12-24 hours ago.
  */
-function wp_verify_nonce( $nonce, $action = -1 ) {
+function wp_verify_nonce($nonce, $action = -1) {
 	$nonce = (string) $nonce;
 	$user = wp_get_current_user();
 	$uid = (int) $user->ID;
-	if ( ! $uid ) {
+	if ( ! $uid) {
 		/**
 		 * Filters whether the user who generated the nonce is logged out.
 		 *
@@ -1862,10 +1862,10 @@ 
 		 * @param int    $uid    ID of the nonce-owning user.
 		 * @param string $action The nonce action.
 		 */
-		$uid = apply_filters( 'nonce_user_logged_out', $uid, $action );
+		$uid = apply_filters('nonce_user_logged_out', $uid, $action);
 	}
 
-	if ( empty( $nonce ) ) {
+	if (empty($nonce)) {
 		return false;
 	}
 
@@ -1873,14 +1873,14 @@ 
 	$i = wp_nonce_tick();
 
 	// Nonce generated 0-12 hours ago
-	$expected = substr( wp_hash( $i . '|' . $action . '|' . $uid . '|' . $token, 'nonce'), -12, 10 );
-	if ( hash_equals( $expected, $nonce ) ) {
+	$expected = substr(wp_hash($i.'|'.$action.'|'.$uid.'|'.$token, 'nonce'), -12, 10);
+	if (hash_equals($expected, $nonce)) {
 		return 1;
 	}
 
 	// Nonce generated 12-24 hours ago
-	$expected = substr( wp_hash( ( $i - 1 ) . '|' . $action . '|' . $uid . '|' . $token, 'nonce' ), -12, 10 );
-	if ( hash_equals( $expected, $nonce ) ) {
+	$expected = substr(wp_hash(($i - 1).'|'.$action.'|'.$uid.'|'.$token, 'nonce'), -12, 10);
+	if (hash_equals($expected, $nonce)) {
 		return 2;
 	}
 
@@ -1894,14 +1894,14 @@ 
 	 * @param WP_User    $user   The current user object.
 	 * @param string     $token  The user's session token.
 	 */
-	do_action( 'wp_verify_nonce_failed', $nonce, $action, $user, $token );
+	do_action('wp_verify_nonce_failed', $nonce, $action, $user, $token);
 
 	// Invalid nonce
 	return false;
 }
 endif;
 
-if ( !function_exists('wp_create_nonce') ) :
+if ( ! function_exists('wp_create_nonce')) :
 /**
  * Creates a cryptographic token tied to a specific action, user, user session,
  * and window of time.
@@ -1915,19 +1915,19 @@ 
 function wp_create_nonce($action = -1) {
 	$user = wp_get_current_user();
 	$uid = (int) $user->ID;
-	if ( ! $uid ) {
+	if ( ! $uid) {
 		/** This filter is documented in wp-includes/pluggable.php */
-		$uid = apply_filters( 'nonce_user_logged_out', $uid, $action );
+		$uid = apply_filters('nonce_user_logged_out', $uid, $action);
 	}
 
 	$token = wp_get_session_token();
 	$i = wp_nonce_tick();
 
-	return substr( wp_hash( $i . '|' . $action . '|' . $uid . '|' . $token, 'nonce' ), -12, 10 );
+	return substr(wp_hash($i.'|'.$action.'|'.$uid.'|'.$token, 'nonce'), -12, 10);
 }
 endif;
 
-if ( !function_exists('wp_salt') ) :
+if ( ! function_exists('wp_salt')) :
 /**
  * Get salt to add to hashes.
  *
@@ -1963,9 +1963,9 @@ 
  * @param string $scheme Authentication scheme (auth, secure_auth, logged_in, nonce)
  * @return string Salt value
  */
-function wp_salt( $scheme = 'auth' ) {
+function wp_salt($scheme = 'auth') {
 	static $cached_salts = array();
-	if ( isset( $cached_salts[ $scheme ] ) ) {
+	if (isset($cached_salts[$scheme])) {
 		/**
 		 * Filters the WordPress salt.
 		 *
@@ -1975,19 +1975,19 @@ 
 		 * @param string $scheme      Authentication scheme. Values include 'auth',
 		 *                            'secure_auth', 'logged_in', and 'nonce'.
 		 */
-		return apply_filters( 'salt', $cached_salts[ $scheme ], $scheme );
+		return apply_filters('salt', $cached_salts[$scheme], $scheme);
 	}
 
 	static $duplicated_keys;
-	if ( null === $duplicated_keys ) {
-		$duplicated_keys = array( 'put your unique phrase here' => true );
-		foreach ( array( 'AUTH', 'SECURE_AUTH', 'LOGGED_IN', 'NONCE', 'SECRET' ) as $first ) {
-			foreach ( array( 'KEY', 'SALT' ) as $second ) {
-				if ( ! defined( "{$first}_{$second}" ) ) {
+	if (null === $duplicated_keys) {
+		$duplicated_keys = array('put your unique phrase here' => true);
+		foreach (array('AUTH', 'SECURE_AUTH', 'LOGGED_IN', 'NONCE', 'SECRET') as $first) {
+			foreach (array('KEY', 'SALT') as $second) {
+				if ( ! defined("{$first}_{$second}")) {
 					continue;
 				}
-				$value = constant( "{$first}_{$second}" );
-				$duplicated_keys[ $value ] = isset( $duplicated_keys[ $value ] );
+				$value = constant("{$first}_{$second}");
+				$duplicated_keys[$value] = isset($duplicated_keys[$value]);
 			}
 		}
 	}
@@ -1996,45 +1996,45 @@ 
 		'key' => '',
 		'salt' => ''
 	);
-	if ( defined( 'SECRET_KEY' ) && SECRET_KEY && empty( $duplicated_keys[ SECRET_KEY ] ) ) {
+	if (defined('SECRET_KEY') && SECRET_KEY && empty($duplicated_keys[SECRET_KEY])) {
 		$values['key'] = SECRET_KEY;
 	}
-	if ( 'auth' == $scheme && defined( 'SECRET_SALT' ) && SECRET_SALT && empty( $duplicated_keys[ SECRET_SALT ] ) ) {
+	if ('auth' == $scheme && defined('SECRET_SALT') && SECRET_SALT && empty($duplicated_keys[SECRET_SALT])) {
 		$values['salt'] = SECRET_SALT;
 	}
 
-	if ( in_array( $scheme, array( 'auth', 'secure_auth', 'logged_in', 'nonce' ) ) ) {
-		foreach ( array( 'key', 'salt' ) as $type ) {
-			$const = strtoupper( "{$scheme}_{$type}" );
-			if ( defined( $const ) && constant( $const ) && empty( $duplicated_keys[ constant( $const ) ] ) ) {
-				$values[ $type ] = constant( $const );
-			} elseif ( ! $values[ $type ] ) {
-				$values[ $type ] = get_site_option( "{$scheme}_{$type}" );
-				if ( ! $values[ $type ] ) {
-					$values[ $type ] = wp_generate_password( 64, true, true );
-					update_site_option( "{$scheme}_{$type}", $values[ $type ] );
+	if (in_array($scheme, array('auth', 'secure_auth', 'logged_in', 'nonce'))) {
+		foreach (array('key', 'salt') as $type) {
+			$const = strtoupper("{$scheme}_{$type}");
+			if (defined($const) && constant($const) && empty($duplicated_keys[constant($const)])) {
+				$values[$type] = constant($const);
+			} elseif ( ! $values[$type]) {
+				$values[$type] = get_site_option("{$scheme}_{$type}");
+				if ( ! $values[$type]) {
+					$values[$type] = wp_generate_password(64, true, true);
+					update_site_option("{$scheme}_{$type}", $values[$type]);
 				}
 			}
 		}
 	} else {
-		if ( ! $values['key'] ) {
-			$values['key'] = get_site_option( 'secret_key' );
-			if ( ! $values['key'] ) {
-				$values['key'] = wp_generate_password( 64, true, true );
-				update_site_option( 'secret_key', $values['key'] );
+		if ( ! $values['key']) {
+			$values['key'] = get_site_option('secret_key');
+			if ( ! $values['key']) {
+				$values['key'] = wp_generate_password(64, true, true);
+				update_site_option('secret_key', $values['key']);
 			}
 		}
-		$values['salt'] = hash_hmac( 'md5', $scheme, $values['key'] );
+		$values['salt'] = hash_hmac('md5', $scheme, $values['key']);
 	}
 
-	$cached_salts[ $scheme ] = $values['key'] . $values['salt'];
+	$cached_salts[$scheme] = $values['key'].$values['salt'];
 
 	/** This filter is documented in wp-includes/pluggable.php */
-	return apply_filters( 'salt', $cached_salts[ $scheme ], $scheme );
+	return apply_filters('salt', $cached_salts[$scheme], $scheme);
 }
 endif;
 
-if ( !function_exists('wp_hash') ) :
+if ( ! function_exists('wp_hash')) :
 /**
  * Get hash of given string.
  *
@@ -2051,7 +2051,7 @@ 
 }
 endif;
 
-if ( !function_exists('wp_hash_password') ) :
+if ( ! function_exists('wp_hash_password')) :
 /**
  * Create a hash (encrypt) of a plain text password.
  *
@@ -2068,16 +2068,16 @@ 
 function wp_hash_password($password) {
 	global $wp_hasher;
 
-	if ( empty($wp_hasher) ) {
+	if (empty($wp_hasher)) {
 		// By default, use the portable hash from phpass
 		$wp_hasher = new PasswordHash(8, true);
 	}
 
-	return $wp_hasher->HashPassword( trim( $password ) );
+	return $wp_hasher->HashPassword(trim($password));
 }
 endif;
 
-if ( !function_exists('wp_check_password') ) :
+if ( ! function_exists('wp_check_password')) :
 /**
  * Checks the plaintext password against the encrypted Password.
  *
@@ -2104,9 +2104,9 @@ 
 	global $wp_hasher;
 
 	// If the hash is still md5...
-	if ( strlen($hash) <= 32 ) {
-		$check = hash_equals( $hash, md5( $password ) );
-		if ( $check && $user_id ) {
+	if (strlen($hash) <= 32) {
+		$check = hash_equals($hash, md5($password));
+		if ($check && $user_id) {
 			// Rehash using new hash.
 			wp_set_password($password, $user_id);
 			$hash = wp_hash_password($password);
@@ -2122,12 +2122,12 @@ 
 		 * @param string     $hash     The hashed password.
 		 * @param string|int $user_id  User ID. Can be empty.
 		 */
-		return apply_filters( 'check_password', $check, $password, $hash, $user_id );
+		return apply_filters('check_password', $check, $password, $hash, $user_id);
 	}
 
 	// If the stored hash is longer than an MD5, presume the
 	// new style phpass portable hash.
-	if ( empty($wp_hasher) ) {
+	if (empty($wp_hasher)) {
 		// By default, use the portable hash from phpass
 		$wp_hasher = new PasswordHash(8, true);
 	}
@@ -2135,11 +2135,11 @@ 
 	$check = $wp_hasher->CheckPassword($password, $hash);
 
 	/** This filter is documented in wp-includes/pluggable.php */
-	return apply_filters( 'check_password', $check, $password, $hash, $user_id );
+	return apply_filters('check_password', $check, $password, $hash, $user_id);
 }
 endif;
 
-if ( !function_exists('wp_generate_password') ) :
+if ( ! function_exists('wp_generate_password')) :
 /**
  * Generates a random password drawn from the defined set of characters.
  *
@@ -2152,15 +2152,15 @@ 
  *                                  Used when generating secret keys and salts. Default false.
  * @return string The random password.
  */
-function wp_generate_password( $length = 12, $special_chars = true, $extra_special_chars = false ) {
+function wp_generate_password($length = 12, $special_chars = true, $extra_special_chars = false) {
 	$chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
-	if ( $special_chars )
+	if ($special_chars)
 		$chars .= '!@#$%^&*()';
-	if ( $extra_special_chars )
+	if ($extra_special_chars)
 		$chars .= '-_ []{}<>~`+=,.;:/?|';
 
 	$password = '';
-	for ( $i = 0; $i < $length; $i++ ) {
+	for ($i = 0; $i < $length; $i++) {
 		$password .= substr($chars, wp_rand(0, strlen($chars) - 1), 1);
 	}
 
@@ -2171,11 +2171,11 @@ 
 	 *
 	 * @param string $password The generated password.
 	 */
-	return apply_filters( 'random_password', $password );
+	return apply_filters('random_password', $password);
 }
 endif;
 
-if ( !function_exists('wp_rand') ) :
+if ( ! function_exists('wp_rand')) :
 /**
  * Generates a random number
  *
@@ -2190,7 +2190,7 @@ 
  * @param int $max Upper limit for the generated number
  * @return int A random number between min and max
  */
-function wp_rand( $min = 0, $max = 0 ) {
+function wp_rand($min = 0, $max = 0) {
 	global $rnd_value;
 
 	// Some misconfigured 32bit environments (Entropy PHP, for example) truncate integers larger than PHP_INT_MAX to PHP_INT_MAX rather than overflowing them to floats.
@@ -2202,38 +2202,38 @@ 
 
 	// Use PHP's CSPRNG, or a compatible method
 	static $use_random_int_functionality = true;
-	if ( $use_random_int_functionality ) {
+	if ($use_random_int_functionality) {
 		try {
-			$_max = ( 0 != $max ) ? $max : $max_random_number;
+			$_max = (0 != $max) ? $max : $max_random_number;
 			// wp_rand() can accept arguments in either order, PHP cannot.
-			$_max = max( $min, $_max );
-			$_min = min( $min, $_max );
-			$val = random_int( $_min, $_max );
-			if ( false !== $val ) {
-				return absint( $val );
+			$_max = max($min, $_max);
+			$_min = min($min, $_max);
+			$val = random_int($_min, $_max);
+			if (false !== $val) {
+				return absint($val);
 			} else {
 				$use_random_int_functionality = false;
 			}
-		} catch ( Error $e ) {
+		} catch (Error $e) {
 			$use_random_int_functionality = false;
-		} catch ( Exception $e ) {
+		} catch (Exception $e) {
 			$use_random_int_functionality = false;
 		}
 	}
 
 	// Reset $rnd_value after 14 uses
 	// 32(md5) + 40(sha1) + 40(sha1) / 8 = 14 random numbers from $rnd_value
-	if ( strlen($rnd_value) < 8 ) {
-		if ( defined( 'WP_SETUP_CONFIG' ) )
+	if (strlen($rnd_value) < 8) {
+		if (defined('WP_SETUP_CONFIG'))
 			static $seed = '';
 		else
 			$seed = get_transient('random_seed');
-		$rnd_value = md5( uniqid(microtime() . mt_rand(), true ) . $seed );
+		$rnd_value = md5(uniqid(microtime().mt_rand(), true).$seed);
 		$rnd_value .= sha1($rnd_value);
-		$rnd_value .= sha1($rnd_value . $seed);
-		$seed = md5($seed . $rnd_value);
-		if ( ! defined( 'WP_SETUP_CONFIG' ) && ! defined( 'WP_INSTALLING' ) ) {
-			set_transient( 'random_seed', $seed );
+		$rnd_value .= sha1($rnd_value.$seed);
+		$seed = md5($seed.$rnd_value);
+		if ( ! defined('WP_SETUP_CONFIG') && ! defined('WP_INSTALLING')) {
+			set_transient('random_seed', $seed);
 		}
 	}
 
@@ -2246,14 +2246,14 @@ 
 	$value = abs(hexdec($value));
 
 	// Reduce the value to be within the min - max range
-	if ( $max != 0 )
-		$value = $min + ( $max - $min + 1 ) * $value / ( $max_random_number + 1 );
+	if ($max != 0)
+		$value = $min + ($max - $min + 1) * $value / ($max_random_number + 1);
 
 	return abs(intval($value));
 }
 endif;
 
-if ( !function_exists('wp_set_password') ) :
+if ( ! function_exists('wp_set_password')) :
 /**
  * Updates the user's password with a new encrypted one.
  *
@@ -2271,17 +2271,17 @@ 
  * @param string $password The plaintext new user password
  * @param int    $user_id  User ID
  */
-function wp_set_password( $password, $user_id ) {
+function wp_set_password($password, $user_id) {
 	global $wpdb;
 
-	$hash = wp_hash_password( $password );
-	$wpdb->update($wpdb->users, array('user_pass' => $hash, 'user_activation_key' => ''), array('ID' => $user_id) );
+	$hash = wp_hash_password($password);
+	$wpdb->update($wpdb->users, array('user_pass' => $hash, 'user_activation_key' => ''), array('ID' => $user_id));
 
 	wp_cache_delete($user_id, 'users');
 }
 endif;
 
-if ( !function_exists( 'get_avatar' ) ) :
+if ( ! function_exists('get_avatar')) :
 /**
  * Retrieve the avatar `<img>` tag for a user, email address, MD5 hash, comment, or post.
  *
@@ -2316,15 +2316,15 @@ 
  * }
  * @return false|string `<img>` tag for the user's avatar. False on failure.
  */
-function get_avatar( $id_or_email, $size = 96, $default = '', $alt = '', $args = null ) {
+function get_avatar($id_or_email, $size = 96, $default = '', $alt = '', $args = null) {
 	$defaults = array(
 		// get_avatar_data() args.
 		'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,
 		'alt'           => '',
 		'class'         => null,
@@ -2332,7 +2332,7 @@ 
 		'extra_attr'    => '',
 	);
 
-	if ( empty( $args ) ) {
+	if (empty($args)) {
 		$args = array();
 	}
 
@@ -2340,17 +2340,17 @@ 
 	$args['default'] = $default;
 	$args['alt']     = $alt;
 
-	$args = wp_parse_args( $args, $defaults );
+	$args = wp_parse_args($args, $defaults);
 
-	if ( empty( $args['height'] ) ) {
+	if (empty($args['height'])) {
 		$args['height'] = $args['size'];
 	}
-	if ( empty( $args['width'] ) ) {
+	if (empty($args['width'])) {
 		$args['width'] = $args['size'];
 	}
 
-	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);
 	}
 
 	/**
@@ -2366,36 +2366,36 @@ 
 	 *                            user email, WP_User object, WP_Post object, or WP_Comment object.
 	 * @param array  $args        Arguments passed to get_avatar_url(), after processing.
 	 */
-	$avatar = apply_filters( 'pre_get_avatar', null, $id_or_email, $args );
+	$avatar = apply_filters('pre_get_avatar', null, $id_or_email, $args);
 
-	if ( ! is_null( $avatar ) ) {
+	if ( ! is_null($avatar)) {
 		/** This filter is documented in wp-includes/pluggable.php */
-		return apply_filters( 'get_avatar', $avatar, $id_or_email, $args['size'], $args['default'], $args['alt'], $args );
+		return apply_filters('get_avatar', $avatar, $id_or_email, $args['size'], $args['default'], $args['alt'], $args);
 	}
 
-	if ( ! $args['force_display'] && ! get_option( 'show_avatars' ) ) {
+	if ( ! $args['force_display'] && ! get_option('show_avatars')) {
 		return false;
 	}
 
-	$url2x = get_avatar_url( $id_or_email, array_merge( $args, array( 'size' => $args['size'] * 2 ) ) );
+	$url2x = get_avatar_url($id_or_email, array_merge($args, array('size' => $args['size'] * 2)));
 
-	$args = get_avatar_data( $id_or_email, $args );
+	$args = get_avatar_data($id_or_email, $args);
 
 	$url = $args['url'];
 
-	if ( ! $url || is_wp_error( $url ) ) {
+	if ( ! $url || is_wp_error($url)) {
 		return false;
 	}
 
-	$class = array( 'avatar', 'avatar-' . (int) $args['size'], 'photo' );
+	$class = array('avatar', 'avatar-'.(int) $args['size'], 'photo');
 
-	if ( ! $args['found_avatar'] || $args['force_default'] ) {
+	if ( ! $args['found_avatar'] || $args['force_default']) {
 		$class[] = 'avatar-default';
 	}
 
-	if ( $args['class'] ) {
-		if ( is_array( $args['class'] ) ) {
-			$class = array_merge( $class, $args['class'] );
+	if ($args['class']) {
+		if (is_array($args['class'])) {
+			$class = array_merge($class, $args['class']);
 		} else {
 			$class[] = $args['class'];
 		}
@@ -2403,10 +2403,10 @@ 
 
 	$avatar = sprintf(
 		"<img alt='%s' src='%s' srcset='%s' class='%s' height='%d' width='%d' %s/>",
-		esc_attr( $args['alt'] ),
-		esc_url( $url ),
-		esc_attr( "$url2x 2x" ),
-		esc_attr( join( ' ', $class ) ),
+		esc_attr($args['alt']),
+		esc_url($url),
+		esc_attr("$url2x 2x"),
+		esc_attr(join(' ', $class)),
 		(int) $args['height'],
 		(int) $args['width'],
 		$args['extra_attr']
@@ -2428,11 +2428,11 @@ 
 	 * @param string $alt         Alternative text to use in the avatar image tag. Default empty.
 	 * @param array  $args        Arguments passed to get_avatar_data(), after processing.
 	 */
-	return apply_filters( 'get_avatar', $avatar, $id_or_email, $args['size'], $args['default'], $args['alt'], $args );
+	return apply_filters('get_avatar', $avatar, $id_or_email, $args['size'], $args['default'], $args['alt'], $args);
 }
 endif;
 
-if ( !function_exists( 'wp_text_diff' ) ) :
+if ( ! function_exists('wp_text_diff')) :
 /**
  * Displays a human readable HTML representation of the difference between two strings.
  *
@@ -2460,12 +2460,12 @@ 
  * @param string|array $args         Optional. Change 'title', 'title_left', and 'title_right' defaults.
  * @return string Empty string if strings are equivalent or HTML with differences.
  */
-function wp_text_diff( $left_string, $right_string, $args = null ) {
-	$defaults = array( 'title' => '', 'title_left' => '', 'title_right' => '' );
-	$args = wp_parse_args( $args, $defaults );
+function wp_text_diff($left_string, $right_string, $args = null) {
+	$defaults = array('title' => '', 'title_left' => '', 'title_right' => '');
+	$args = wp_parse_args($args, $defaults);
 
-	if ( ! class_exists( 'WP_Text_Diff_Renderer_Table', false ) )
-		require( ABSPATH . WPINC . '/wp-diff.php' );
+	if ( ! class_exists('WP_Text_Diff_Renderer_Table', false))
+		require(ABSPATH.WPINC.'/wp-diff.php');
 
 	$left_string  = normalize_whitespace($left_string);
 	$right_string = normalize_whitespace($right_string);
@@ -2473,31 +2473,31 @@ 
 	$left_lines  = explode("\n", $left_string);
 	$right_lines = explode("\n", $right_string);
 	$text_diff = new Text_Diff($left_lines, $right_lines);
-	$renderer  = new WP_Text_Diff_Renderer_Table( $args );
+	$renderer  = new WP_Text_Diff_Renderer_Table($args);
 	$diff = $renderer->render($text_diff);
 
-	if ( !$diff )
+	if ( ! $diff)
 		return '';
 
-	$r  = "<table class='diff'>\n";
+	$r = "<table class='diff'>\n";
 
-	if ( ! empty( $args[ 'show_split_view' ] ) ) {
+	if ( ! empty($args['show_split_view'])) {
 		$r .= "<col class='content diffsplit left' /><col class='content diffsplit middle' /><col class='content diffsplit right' />";
 	} else {
 		$r .= "<col class='content' />";
 	}
 
-	if ( $args['title'] || $args['title_left'] || $args['title_right'] )
+	if ($args['title'] || $args['title_left'] || $args['title_right'])
 		$r .= "<thead>";
-	if ( $args['title'] )
+	if ($args['title'])
 		$r .= "<tr class='diff-title'><th colspan='4'>$args[title]</th></tr>\n";
-	if ( $args['title_left'] || $args['title_right'] ) {
+	if ($args['title_left'] || $args['title_right']) {
 		$r .= "<tr class='diff-sub-title'>\n";
 		$r .= "\t<td></td><th>$args[title_left]</th>\n";
 		$r .= "\t<td></td><th>$args[title_right]</th>\n";
 		$r .= "</tr>\n";
 	}
-	if ( $args['title'] || $args['title_left'] || $args['title_right'] )
+	if ($args['title'] || $args['title_left'] || $args['title_right'])
 		$r .= "</thead>\n";
 
 	$r .= "<tbody>\n$diff\n</tbody>\n";

Braces +101 added lines, -69 removed lines

@@ -98,8 +98,9 @@ 
 function get_user_by( $field, $value ) {
 	$userdata = WP_User::get_data_by( $field, $value );
 
-	if ( !$userdata )
-		return false;
+	if ( !$userdata ) {
+			return false;
+	}
 
 	$user = new WP_User;
 	$user->init( $userdata );
@@ -123,8 +124,9 @@ 
 
 	$clean = _get_non_cached_ids( $user_ids, 'users' );
 
-	if ( empty( $clean ) )
-		return;
+	if ( empty( $clean ) ) {
+			return;
+	}
 
 	$list = implode( ',', $clean );
 
@@ -315,8 +317,9 @@ 
 
 	// From email and name
 	// If we don't have a name from the input headers
-	if ( !isset( $from_name ) )
-		$from_name = 'WordPress';
+	if ( !isset( $from_name ) ) {
+			$from_name = 'WordPress';
+	}
 
 	/* If we don't have an email from the input headers default to wordpress@$sitename
 	 * Some hosts will block outgoing mail from this address if it doesn't exist but
@@ -414,8 +417,9 @@ 
 
 	// Set Content-Type and charset
 	// If we don't have a content-type from the input headers
-	if ( !isset( $content_type ) )
-		$content_type = 'text/plain';
+	if ( !isset( $content_type ) ) {
+			$content_type = 'text/plain';
+	}
 
 	/**
 	 * Filters the wp_mail() content type.
@@ -429,12 +433,14 @@ 
 	$phpmailer->ContentType = $content_type;
 
 	// Set whether it's plaintext, depending on $content_type
-	if ( 'text/html' == $content_type )
-		$phpmailer->IsHTML( true );
+	if ( 'text/html' == $content_type ) {
+			$phpmailer->IsHTML( true );
+	}
 
 	// If we don't have a charset from the input headers
-	if ( !isset( $charset ) )
-		$charset = get_bloginfo( 'charset' );
+	if ( !isset( $charset ) ) {
+			$charset = get_bloginfo( 'charset' );
+	}
 
 	// Set the content-type and charset
 
@@ -453,8 +459,9 @@ 
 			$phpmailer->AddCustomHeader( sprintf( '%1$s: %2$s', $name, $content ) );
 		}
 
-		if ( false !== stripos( $content_type, 'multipart' ) && ! empty($boundary) )
-			$phpmailer->AddCustomHeader( sprintf( "Content-Type: %s;\n\t boundary=\"%s\"", $content_type, $boundary ) );
+		if ( false !== stripos( $content_type, 'multipart' ) && ! empty($boundary) ) {
+					$phpmailer->AddCustomHeader( sprintf( "Content-Type: %s;\n\t boundary=\"%s\"", $content_type, $boundary ) );
+		}
 	}
 
 	if ( !empty( $attachments ) ) {
@@ -769,8 +776,9 @@ 
 				}
 	    }
 
-		if ( empty($_COOKIE[$cookie_name]) )
-			return false;
+		if ( empty($_COOKIE[$cookie_name]) ) {
+					return false;
+		}
 		$cookie = $_COOKIE[$cookie_name];
 	}
 
@@ -903,9 +911,10 @@ 
 	setcookie($auth_cookie_name, $auth_cookie, $expire, PLUGINS_COOKIE_PATH, COOKIE_DOMAIN, $secure, true);
 	setcookie($auth_cookie_name, $auth_cookie, $expire, ADMIN_COOKIE_PATH, COOKIE_DOMAIN, $secure, true);
 	setcookie(LOGGED_IN_COOKIE, $logged_in_cookie, $expire, COOKIEPATH, COOKIE_DOMAIN, $secure_logged_in_cookie, true);
-	if ( COOKIEPATH != SITECOOKIEPATH )
-		setcookie(LOGGED_IN_COOKIE, $logged_in_cookie, $expire, SITECOOKIEPATH, COOKIE_DOMAIN, $secure_logged_in_cookie, true);
-}
+	if ( COOKIEPATH != SITECOOKIEPATH ) {
+			setcookie(LOGGED_IN_COOKIE, $logged_in_cookie, $expire, SITECOOKIEPATH, COOKIE_DOMAIN, $secure_logged_in_cookie, true);
+	}
+	}
 endif;
 
 if ( !function_exists('wp_clear_auth_cookie') ) :
@@ -1049,8 +1058,9 @@ 
  *                   0-12 hours ago, 2 if the nonce is valid and generated between 12-24 hours ago.
  */
 function check_admin_referer( $action = -1, $query_arg = '_wpnonce' ) {
-	if ( -1 == $action )
-		_doing_it_wrong( __FUNCTION__, __( 'You should specify a nonce action to be verified by using the first parameter.' ), '3.2.0' );
+	if ( -1 == $action ) {
+			_doing_it_wrong( __FUNCTION__, __( 'You should specify a nonce action to be verified by using the first parameter.' ), '3.2.0' );
+	}
 
 	$adminurl = strtolower(admin_url());
 	$referer = strtolower(wp_get_referer());
@@ -1098,12 +1108,13 @@ 
 
 	$nonce = '';
 
-	if ( $query_arg && isset( $_REQUEST[ $query_arg ] ) )
-		$nonce = $_REQUEST[ $query_arg ];
-	elseif ( isset( $_REQUEST['_ajax_nonce'] ) )
-		$nonce = $_REQUEST['_ajax_nonce'];
-	elseif ( isset( $_REQUEST['_wpnonce'] ) )
-		$nonce = $_REQUEST['_wpnonce'];
+	if ( $query_arg && isset( $_REQUEST[ $query_arg ] ) ) {
+			$nonce = $_REQUEST[ $query_arg ];
+	} elseif ( isset( $_REQUEST['_ajax_nonce'] ) ) {
+			$nonce = $_REQUEST['_ajax_nonce'];
+	} elseif ( isset( $_REQUEST['_wpnonce'] ) ) {
+			$nonce = $_REQUEST['_wpnonce'];
+	}
 
 	$result = wp_verify_nonce( $nonce, $action );
 
@@ -1178,13 +1189,16 @@ 
 	 */
 	$status = apply_filters( 'wp_redirect_status', $status, $location );
 
-	if ( ! $location )
-		return false;
+	if ( ! $location ) {
+			return false;
+	}
 
 	$location = wp_sanitize_redirect($location);
 
-	if ( !$is_IIS && PHP_SAPI != 'cgi-fcgi' )
-		status_header($status); // This causes problems on IIS and some FastCGI setups
+	if ( !$is_IIS && PHP_SAPI != 'cgi-fcgi' ) {
+			status_header($status);
+	}
+	// This causes problems on IIS and some FastCGI setups
 
 	header("Location: $location", true, $status);
 
@@ -1295,8 +1309,9 @@ 
 function wp_validate_redirect($location, $default = '') {
 	$location = trim( $location );
 	// browsers will assume 'http' is your protocol, and will obey a redirect to a URL starting with '//'
-	if ( substr($location, 0, 2) == '//' )
-		$location = 'http:' . $location;
+	if ( substr($location, 0, 2) == '//' ) {
+			$location = 'http:' . $location;
+	}
 
 	// In php 5 parse_url may fail if the URL query part contains http://, bug #38143
 	$test = ( $cut = strpos($location, '?') ) ? substr( $location, 0, $cut ) : $location;
@@ -1305,12 +1320,14 @@ 
 	$lp = @parse_url($test);
 
 	// Give up if malformed URL
-	if ( false === $lp )
-		return $default;
+	if ( false === $lp ) {
+			return $default;
+	}
 
 	// Allow only http and https schemes. No data:, etc.
-	if ( isset($lp['scheme']) && !('http' == $lp['scheme'] || 'https' == $lp['scheme']) )
-		return $default;
+	if ( isset($lp['scheme']) && !('http' == $lp['scheme'] || 'https' == $lp['scheme']) ) {
+			return $default;
+	}
 
 	// Reject if certain components are set but host is not. This catches urls like https:host.com for which parse_url does not set the host field.
 	if ( ! isset( $lp['host'] ) && ( isset( $lp['scheme'] ) || isset( $lp['user'] ) || isset( $lp['pass'] ) || isset( $lp['port'] ) ) ) {
@@ -1336,8 +1353,9 @@ 
 	 */
 	$allowed_hosts = (array) apply_filters( 'allowed_redirect_hosts', array($wpp['host']), isset($lp['host']) ? $lp['host'] : '' );
 
-	if ( isset($lp['host']) && ( !in_array($lp['host'], $allowed_hosts) && $lp['host'] != strtolower($wpp['host'])) )
-		$location = $default;
+	if ( isset($lp['host']) && ( !in_array($lp['host'], $allowed_hosts) && $lp['host'] != strtolower($wpp['host'])) ) {
+			$location = $default;
+	}
 
 	return $location;
 }
@@ -1359,8 +1377,9 @@ 
 	}
 
 	$comment = get_comment( $comment_id );
-	if ( empty( $comment ) || empty( $comment->comment_post_ID ) )
-		return false;
+	if ( empty( $comment ) || empty( $comment->comment_post_ID ) ) {
+			return false;
+	}
 
 	$post    = get_post( $comment->comment_post_ID );
 	$author  = get_userdata( $post->post_author );
@@ -1489,19 +1508,22 @@ 
 
 	if ( '' == $comment->comment_author ) {
 		$from = "From: \"$blogname\" <$wp_email>";
-		if ( '' != $comment->comment_author_email )
-			$reply_to = "Reply-To: $comment->comment_author_email";
+		if ( '' != $comment->comment_author_email ) {
+					$reply_to = "Reply-To: $comment->comment_author_email";
+		}
 	} else {
 		$from = "From: \"$comment->comment_author\" <$wp_email>";
-		if ( '' != $comment->comment_author_email )
-			$reply_to = "Reply-To: \"$comment->comment_author_email\" <$comment->comment_author_email>";
+		if ( '' != $comment->comment_author_email ) {
+					$reply_to = "Reply-To: \"$comment->comment_author_email\" <$comment->comment_author_email>";
+		}
 	}
 
 	$message_headers = "$from\n"
 		. "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
 
-	if ( isset($reply_to) )
-		$message_headers .= $reply_to . "\n";
+	if ( isset($reply_to) ) {
+			$message_headers .= $reply_to . "\n";
+	}
 
 	/**
 	 * Filters the comment notification email text.
@@ -1584,8 +1606,9 @@ 
 	// Send to the administration and to the post author if the author can modify the comment.
 	$emails = array( get_option( 'admin_email' ) );
 	if ( $user && user_can( $user->ID, 'edit_comment', $comment_id ) && ! empty( $user->user_email ) ) {
-		if ( 0 !== strcasecmp( $user->user_email, get_option( 'admin_email' ) ) )
-			$emails[] = $user->user_email;
+		if ( 0 !== strcasecmp( $user->user_email, get_option( 'admin_email' ) ) ) {
+					$emails[] = $user->user_email;
+		}
 	}
 
 	$switched_locale = switch_to_locale( get_locale() );
@@ -2154,10 +2177,12 @@ 
  */
 function wp_generate_password( $length = 12, $special_chars = true, $extra_special_chars = false ) {
 	$chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
-	if ( $special_chars )
-		$chars .= '!@#$%^&*()';
-	if ( $extra_special_chars )
-		$chars .= '-_ []{}<>~`+=,.;:/?|';
+	if ( $special_chars ) {
+			$chars .= '!@#$%^&*()';
+	}
+	if ( $extra_special_chars ) {
+			$chars .= '-_ []{}<>~`+=,.;:/?|';
+	}
 
 	$password = '';
 	for ( $i = 0; $i < $length; $i++ ) {
@@ -2224,10 +2249,11 @@ 
 	// Reset $rnd_value after 14 uses
 	// 32(md5) + 40(sha1) + 40(sha1) / 8 = 14 random numbers from $rnd_value
 	if ( strlen($rnd_value) < 8 ) {
-		if ( defined( 'WP_SETUP_CONFIG' ) )
-			static $seed = '';
-		else
-			$seed = get_transient('random_seed');
+		if ( defined( 'WP_SETUP_CONFIG' ) ) {
+					static $seed = '';
+		} else {
+					$seed = get_transient('random_seed');
+		}
 		$rnd_value = md5( uniqid(microtime() . mt_rand(), true ) . $seed );
 		$rnd_value .= sha1($rnd_value);
 		$rnd_value .= sha1($rnd_value . $seed);
@@ -2246,8 +2272,9 @@ 
 	$value = abs(hexdec($value));
 
 	// Reduce the value to be within the min - max range
-	if ( $max != 0 )
-		$value = $min + ( $max - $min + 1 ) * $value / ( $max_random_number + 1 );
+	if ( $max != 0 ) {
+			$value = $min + ( $max - $min + 1 ) * $value / ( $max_random_number + 1 );
+	}
 
 	return abs(intval($value));
 }
@@ -2464,8 +2491,9 @@ 
 	$defaults = array( 'title' => '', 'title_left' => '', 'title_right' => '' );
 	$args = wp_parse_args( $args, $defaults );
 
-	if ( ! class_exists( 'WP_Text_Diff_Renderer_Table', false ) )
-		require( ABSPATH . WPINC . '/wp-diff.php' );
+	if ( ! class_exists( 'WP_Text_Diff_Renderer_Table', false ) ) {
+			require( ABSPATH . WPINC . '/wp-diff.php' );
+	}
 
 	$left_string  = normalize_whitespace($left_string);
 	$right_string = normalize_whitespace($right_string);
@@ -2476,8 +2504,9 @@ 
 	$renderer  = new WP_Text_Diff_Renderer_Table( $args );
 	$diff = $renderer->render($text_diff);
 
-	if ( !$diff )
-		return '';
+	if ( !$diff ) {
+			return '';
+	}
 
 	$r  = "<table class='diff'>\n";
 
@@ -2487,18 +2516,21 @@ 
 		$r .= "<col class='content' />";
 	}
 
-	if ( $args['title'] || $args['title_left'] || $args['title_right'] )
-		$r .= "<thead>";
-	if ( $args['title'] )
-		$r .= "<tr class='diff-title'><th colspan='4'>$args[title]</th></tr>\n";
+	if ( $args['title'] || $args['title_left'] || $args['title_right'] ) {
+			$r .= "<thead>";
+	}
+	if ( $args['title'] ) {
+			$r .= "<tr class='diff-title'><th colspan='4'>$args[title]</th></tr>\n";
+	}
 	if ( $args['title_left'] || $args['title_right'] ) {
 		$r .= "<tr class='diff-sub-title'>\n";
 		$r .= "\t<td></td><th>$args[title_left]</th>\n";
 		$r .= "\t<td></td><th>$args[title_right]</th>\n";
 		$r .= "</tr>\n";
 	}
-	if ( $args['title'] || $args['title_left'] || $args['title_right'] )
-		$r .= "</thead>\n";
+	if ( $args['title'] || $args['title_left'] || $args['title_right'] ) {
+			$r .= "</thead>\n";
+	}
 
 	$r .= "<tbody>\n$diff\n</tbody>\n";
 	$r .= "</table>";

src/wp-includes/plugin.php

Doc Comments +4 added lines, -7 removed lines

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

Spacing +108 added lines, -108 removed lines

@@ -22,21 +22,21 @@ 
  */
 
 // Initialize the filter globals.
-require( dirname( __FILE__ ) . '/class-wp-hook.php' );
+require(dirname(__FILE__).'/class-wp-hook.php');
 
 /** @var WP_Hook[] $wp_filter */
 global $wp_filter, $wp_actions, $wp_current_filter;
 
-if ( $wp_filter ) {
-	$wp_filter = WP_Hook::build_preinitialized_hooks( $wp_filter );
+if ($wp_filter) {
+	$wp_filter = WP_Hook::build_preinitialized_hooks($wp_filter);
 } else {
 	$wp_filter = array();
 }
 
-if ( ! isset( $wp_actions ) )
+if ( ! isset($wp_actions))
 	$wp_actions = array();
 
-if ( ! isset( $wp_current_filter ) )
+if ( ! isset($wp_current_filter))
 	$wp_current_filter = array();
 
 /**
@@ -103,12 +103,12 @@ 
  * @param int      $accepted_args   Optional. The number of arguments the function accepts. Default 1.
  * @return true
  */
-function add_filter( $tag, $function_to_add, $priority = 10, $accepted_args = 1 ) {
+function add_filter($tag, $function_to_add, $priority = 10, $accepted_args = 1) {
 	global $wp_filter;
-	if ( ! isset( $wp_filter[ $tag ] ) ) {
-		$wp_filter[ $tag ] = new WP_Hook();
+	if ( ! isset($wp_filter[$tag])) {
+		$wp_filter[$tag] = new WP_Hook();
 	}
-	$wp_filter[ $tag ]->add_filter( $tag, $function_to_add, $priority, $accepted_args );
+	$wp_filter[$tag]->add_filter($tag, $function_to_add, $priority, $accepted_args);
 	return true;
 }
 
@@ -131,11 +131,11 @@ 
 function has_filter($tag, $function_to_check = false) {
 	global $wp_filter;
 
-	if ( ! isset( $wp_filter[ $tag ] ) ) {
+	if ( ! isset($wp_filter[$tag])) {
 		return false;
 	}
 
-	return $wp_filter[ $tag ]->has_filter( $tag, $function_to_check );
+	return $wp_filter[$tag]->has_filter($tag, $function_to_check);
 }
 
 /**
@@ -173,36 +173,36 @@ 
  * @param mixed  $var,... Additional variables passed to the functions hooked to `$tag`.
  * @return mixed The filtered value after all hooked functions are applied to it.
  */
-function apply_filters( $tag, $value ) {
+function apply_filters($tag, $value) {
 	global $wp_filter, $wp_current_filter;
 
 	$args = array();
 
 	// Do 'all' actions first.
-	if ( isset($wp_filter['all']) ) {
+	if (isset($wp_filter['all'])) {
 		$wp_current_filter[] = $tag;
 		$args = func_get_args();
 		_wp_call_all_hook($args);
 	}
 
-	if ( !isset($wp_filter[$tag]) ) {
-		if ( isset($wp_filter['all']) )
+	if ( ! isset($wp_filter[$tag])) {
+		if (isset($wp_filter['all']))
 			array_pop($wp_current_filter);
 		return $value;
 	}
 
-	if ( !isset($wp_filter['all']) )
+	if ( ! isset($wp_filter['all']))
 		$wp_current_filter[] = $tag;
 
-	if ( empty($args) )
+	if (empty($args))
 		$args = func_get_args();
 
 	// don't pass the tag name to WP_Hook
-	array_shift( $args );
+	array_shift($args);
 
-	$filtered = $wp_filter[ $tag ]->apply_filters( $value, $args );
+	$filtered = $wp_filter[$tag]->apply_filters($value, $args);
 
-	array_pop( $wp_current_filter );
+	array_pop($wp_current_filter);
 
 	return $filtered;
 }
@@ -226,24 +226,24 @@ 
 	global $wp_filter, $wp_current_filter;
 
 	// Do 'all' actions first
-	if ( isset($wp_filter['all']) ) {
+	if (isset($wp_filter['all'])) {
 		$wp_current_filter[] = $tag;
 		$all_args = func_get_args();
 		_wp_call_all_hook($all_args);
 	}
 
-	if ( !isset($wp_filter[$tag]) ) {
-		if ( isset($wp_filter['all']) )
+	if ( ! isset($wp_filter[$tag])) {
+		if (isset($wp_filter['all']))
 			array_pop($wp_current_filter);
 		return $args[0];
 	}
 
-	if ( !isset($wp_filter['all']) )
+	if ( ! isset($wp_filter['all']))
 		$wp_current_filter[] = $tag;
 
-	$filtered = $wp_filter[ $tag ]->apply_filters( $args[0], $args );
+	$filtered = $wp_filter[$tag]->apply_filters($args[0], $args);
 
-	array_pop( $wp_current_filter );
+	array_pop($wp_current_filter);
 
 	return $filtered;
 }
@@ -268,14 +268,14 @@ 
  * @param int      $priority           Optional. The priority of the function. Default 10.
  * @return bool    Whether the function existed before it was removed.
  */
-function remove_filter( $tag, $function_to_remove, $priority = 10 ) {
+function remove_filter($tag, $function_to_remove, $priority = 10) {
 	global $wp_filter;
 
 	$r = false;
-	if ( isset( $wp_filter[ $tag ] ) ) {
-		$r = $wp_filter[ $tag ]->remove_filter( $tag, $function_to_remove, $priority );
-		if ( ! $wp_filter[ $tag ]->callbacks ) {
-			unset( $wp_filter[ $tag ] );
+	if (isset($wp_filter[$tag])) {
+		$r = $wp_filter[$tag]->remove_filter($tag, $function_to_remove, $priority);
+		if ( ! $wp_filter[$tag]->callbacks) {
+			unset($wp_filter[$tag]);
 		}
 	}
 
@@ -293,13 +293,13 @@ 
  * @param int|bool $priority Optional. The priority number to remove. Default false.
  * @return true True when finished.
  */
-function remove_all_filters( $tag, $priority = false ) {
+function remove_all_filters($tag, $priority = false) {
 	global $wp_filter;
 
-	if ( isset( $wp_filter[ $tag ]) ) {
-		$wp_filter[ $tag ]->remove_all_filters( $priority );
-		if ( ! $wp_filter[ $tag ]->has_filters() ) {
-			unset( $wp_filter[ $tag ] );
+	if (isset($wp_filter[$tag])) {
+		$wp_filter[$tag]->remove_all_filters($priority);
+		if ( ! $wp_filter[$tag]->has_filters()) {
+			unset($wp_filter[$tag]);
 		}
 	}
 
@@ -317,7 +317,7 @@ 
  */
 function current_filter() {
 	global $wp_current_filter;
-	return end( $wp_current_filter );
+	return end($wp_current_filter);
 }
 
 /**
@@ -352,14 +352,14 @@ 
  *                            checks if any filter is currently being run.
  * @return bool Whether the filter is currently in the stack.
  */
-function doing_filter( $filter = null ) {
+function doing_filter($filter = null) {
 	global $wp_current_filter;
 
-	if ( null === $filter ) {
-		return ! empty( $wp_current_filter );
+	if (null === $filter) {
+		return ! empty($wp_current_filter);
 	}
 
-	return in_array( $filter, $wp_current_filter );
+	return in_array($filter, $wp_current_filter);
 }
 
 /**
@@ -371,8 +371,8 @@ 
  *                            if any action is currently being run.
  * @return bool Whether the action is currently in the stack.
  */
-function doing_action( $action = null ) {
-	return doing_filter( $action );
+function doing_action($action = null) {
+	return doing_filter($action);
 }
 
 /**
@@ -421,36 +421,36 @@ 
 function do_action($tag, $arg = '') {
 	global $wp_filter, $wp_actions, $wp_current_filter;
 
-	if ( ! isset($wp_actions[$tag]) )
+	if ( ! isset($wp_actions[$tag]))
 		$wp_actions[$tag] = 1;
 	else
 		++$wp_actions[$tag];
 
 	// Do 'all' actions first
-	if ( isset($wp_filter['all']) ) {
+	if (isset($wp_filter['all'])) {
 		$wp_current_filter[] = $tag;
 		$all_args = func_get_args();
 		_wp_call_all_hook($all_args);
 	}
 
-	if ( !isset($wp_filter[$tag]) ) {
-		if ( isset($wp_filter['all']) )
+	if ( ! isset($wp_filter[$tag])) {
+		if (isset($wp_filter['all']))
 			array_pop($wp_current_filter);
 		return;
 	}
 
-	if ( !isset($wp_filter['all']) )
+	if ( ! isset($wp_filter['all']))
 		$wp_current_filter[] = $tag;
 
 	$args = array();
-	if ( is_array($arg) && 1 == count($arg) && isset($arg[0]) && is_object($arg[0]) ) // array(&$this)
-		$args[] =& $arg[0];
+	if (is_array($arg) && 1 == count($arg) && isset($arg[0]) && is_object($arg[0])) // array(&$this)
+		$args[] = & $arg[0];
 	else
 		$args[] = $arg;
-	for ( $a = 2, $num = func_num_args(); $a < $num; $a++ )
+	for ($a = 2, $num = func_num_args(); $a < $num; $a++)
 		$args[] = func_get_arg($a);
 
-	$wp_filter[ $tag ]->do_action( $args );
+	$wp_filter[$tag]->do_action($args);
 
 	array_pop($wp_current_filter);
 }
@@ -468,7 +468,7 @@ 
 function did_action($tag) {
 	global $wp_actions;
 
-	if ( ! isset( $wp_actions[ $tag ] ) )
+	if ( ! isset($wp_actions[$tag]))
 		return 0;
 
 	return $wp_actions[$tag];
@@ -491,28 +491,28 @@ 
 function do_action_ref_array($tag, $args) {
 	global $wp_filter, $wp_actions, $wp_current_filter;
 
-	if ( ! isset($wp_actions[$tag]) )
+	if ( ! isset($wp_actions[$tag]))
 		$wp_actions[$tag] = 1;
 	else
 		++$wp_actions[$tag];
 
 	// Do 'all' actions first
-	if ( isset($wp_filter['all']) ) {
+	if (isset($wp_filter['all'])) {
 		$wp_current_filter[] = $tag;
 		$all_args = func_get_args();
 		_wp_call_all_hook($all_args);
 	}
 
-	if ( !isset($wp_filter[$tag]) ) {
-		if ( isset($wp_filter['all']) )
+	if ( ! isset($wp_filter[$tag])) {
+		if (isset($wp_filter['all']))
 			array_pop($wp_current_filter);
 		return;
 	}
 
-	if ( !isset($wp_filter['all']) )
+	if ( ! isset($wp_filter['all']))
 		$wp_current_filter[] = $tag;
 
-	$wp_filter[ $tag ]->do_action( $args );
+	$wp_filter[$tag]->do_action($args);
 
 	array_pop($wp_current_filter);
 }
@@ -551,8 +551,8 @@ 
  * @param int      $priority           Optional. The priority of the function. Default 10.
  * @return bool Whether the function is removed.
  */
-function remove_action( $tag, $function_to_remove, $priority = 10 ) {
-	return remove_filter( $tag, $function_to_remove, $priority );
+function remove_action($tag, $function_to_remove, $priority = 10) {
+	return remove_filter($tag, $function_to_remove, $priority);
 }
 
 /**
@@ -585,14 +585,14 @@ 
  * @param string $replacement Optional. The hook that should have been used. Default false.
  * @param string $message     Optional. A message regarding the change. Default null.
  */
-function apply_filters_deprecated( $tag, $args, $version, $replacement = false, $message = null ) {
-	if ( ! has_filter( $tag ) ) {
+function apply_filters_deprecated($tag, $args, $version, $replacement = false, $message = null) {
+	if ( ! has_filter($tag)) {
 		return $args[0];
 	}
 
-	_deprecated_hook( $tag, $version, $replacement, $message );
+	_deprecated_hook($tag, $version, $replacement, $message);
 
-	return apply_filters_ref_array( $tag, $args );
+	return apply_filters_ref_array($tag, $args);
 }
 
 /**
@@ -612,14 +612,14 @@ 
  * @param string $replacement Optional. The hook that should have been used.
  * @param string $message     Optional. A message regarding the change.
  */
-function do_action_deprecated( $tag, $args, $version, $replacement = false, $message = null ) {
-	if ( ! has_action( $tag ) ) {
+function do_action_deprecated($tag, $args, $version, $replacement = false, $message = null) {
+	if ( ! has_action($tag)) {
 		return;
 	}
 
-	_deprecated_hook( $tag, $version, $replacement, $message );
+	_deprecated_hook($tag, $version, $replacement, $message);
 
-	do_action_ref_array( $tag, $args );
+	do_action_ref_array($tag, $args);
 }
 
 //
@@ -638,23 +638,23 @@ 
  * @param string $file The filename of plugin.
  * @return string The name of a plugin.
  */
-function plugin_basename( $file ) {
+function plugin_basename($file) {
 	global $wp_plugin_paths;
 
 	// $wp_plugin_paths contains normalized paths.
-	$file = wp_normalize_path( $file );
+	$file = wp_normalize_path($file);
 
-	arsort( $wp_plugin_paths );
-	foreach ( $wp_plugin_paths as $dir => $realdir ) {
-		if ( strpos( $file, $realdir ) === 0 ) {
-			$file = $dir . substr( $file, strlen( $realdir ) );
+	arsort($wp_plugin_paths);
+	foreach ($wp_plugin_paths as $dir => $realdir) {
+		if (strpos($file, $realdir) === 0) {
+			$file = $dir.substr($file, strlen($realdir));
 		}
 	}
 
-	$plugin_dir = wp_normalize_path( WP_PLUGIN_DIR );
-	$mu_plugin_dir = wp_normalize_path( WPMU_PLUGIN_DIR );
+	$plugin_dir = wp_normalize_path(WP_PLUGIN_DIR);
+	$mu_plugin_dir = wp_normalize_path(WPMU_PLUGIN_DIR);
 
-	$file = preg_replace('#^' . preg_quote($plugin_dir, '#') . '/|^' . preg_quote($mu_plugin_dir, '#') . '/#','',$file); // get relative path from plugins dir
+	$file = preg_replace('#^'.preg_quote($plugin_dir, '#').'/|^'.preg_quote($mu_plugin_dir, '#').'/#', '', $file); // get relative path from plugins dir
 	$file = trim($file, '/');
 	return $file;
 }
@@ -676,25 +676,25 @@ 
  * @param string $file Known path to the file.
  * @return bool Whether the path was able to be registered.
  */
-function wp_register_plugin_realpath( $file ) {
+function wp_register_plugin_realpath($file) {
 	global $wp_plugin_paths;
 
 	// Normalize, but store as static to avoid recalculation of a constant value
 	static $wp_plugin_path = null, $wpmu_plugin_path = null;
-	if ( ! isset( $wp_plugin_path ) ) {
-		$wp_plugin_path   = wp_normalize_path( WP_PLUGIN_DIR   );
-		$wpmu_plugin_path = wp_normalize_path( WPMU_PLUGIN_DIR );
+	if ( ! isset($wp_plugin_path)) {
+		$wp_plugin_path   = wp_normalize_path(WP_PLUGIN_DIR);
+		$wpmu_plugin_path = wp_normalize_path(WPMU_PLUGIN_DIR);
 	}
 
-	$plugin_path = wp_normalize_path( dirname( $file ) );
-	$plugin_realpath = wp_normalize_path( dirname( realpath( $file ) ) );
+	$plugin_path = wp_normalize_path(dirname($file));
+	$plugin_realpath = wp_normalize_path(dirname(realpath($file)));
 
-	if ( $plugin_path === $wp_plugin_path || $plugin_path === $wpmu_plugin_path ) {
+	if ($plugin_path === $wp_plugin_path || $plugin_path === $wpmu_plugin_path) {
 		return false;
 	}
 
-	if ( $plugin_path !== $plugin_realpath ) {
-		$wp_plugin_paths[ $plugin_path ] = $plugin_realpath;
+	if ($plugin_path !== $plugin_realpath) {
+		$wp_plugin_paths[$plugin_path] = $plugin_realpath;
 	}
 
 	return true;
@@ -708,8 +708,8 @@ 
  * @param string $file The filename of the plugin (__FILE__).
  * @return string the filesystem path of the directory that contains the plugin.
  */
-function plugin_dir_path( $file ) {
-	return trailingslashit( dirname( $file ) );
+function plugin_dir_path($file) {
+	return trailingslashit(dirname($file));
 }
 
 /**
@@ -720,8 +720,8 @@ 
  * @param string $file The filename of the plugin (__FILE__).
  * @return string the URL path of the directory that contains the plugin.
  */
-function plugin_dir_url( $file ) {
-	return trailingslashit( plugins_url( '', $file ) );
+function plugin_dir_url($file) {
+	return trailingslashit(plugins_url('', $file));
 }
 
 /**
@@ -744,7 +744,7 @@ 
  */
 function register_activation_hook($file, $function) {
 	$file = plugin_basename($file);
-	add_action('activate_' . $file, $function);
+	add_action('activate_'.$file, $function);
 }
 
 /**
@@ -767,7 +767,7 @@ 
  */
 function register_deactivation_hook($file, $function) {
 	$file = plugin_basename($file);
-	add_action('deactivate_' . $file, $function);
+	add_action('deactivate_'.$file, $function);
 }
 
 /**
@@ -796,9 +796,9 @@ 
  * @param callable $callback The callback to run when the hook is called. Must be
  *                           a static method or function.
  */
-function register_uninstall_hook( $file, $callback ) {
-	if ( is_array( $callback ) && is_object( $callback[0] ) ) {
-		_doing_it_wrong( __FUNCTION__, __( 'Only a static class method or function can be used in an uninstall hook.' ), '3.1.0' );
+function register_uninstall_hook($file, $callback) {
+	if (is_array($callback) && is_object($callback[0])) {
+		_doing_it_wrong(__FUNCTION__, __('Only a static class method or function can be used in an uninstall hook.'), '3.1.0');
 		return;
 	}
 
@@ -834,7 +834,7 @@ 
 function _wp_call_all_hook($args) {
 	global $wp_filter;
 
-	$wp_filter['all']->do_all_hook( $args );
+	$wp_filter['all']->do_all_hook($args);
 }
 
 /**
@@ -875,26 +875,26 @@ 
 	global $wp_filter;
 	static $filter_id_count = 0;
 
-	if ( is_string($function) )
+	if (is_string($function))
 		return $function;
 
-	if ( is_object($function) ) {
+	if (is_object($function)) {
 		// Closures are currently implemented as objects
-		$function = array( $function, '' );
+		$function = array($function, '');
 	} else {
 		$function = (array) $function;
 	}
 
-	if (is_object($function[0]) ) {
+	if (is_object($function[0])) {
 		// Object Class Calling
-		if ( function_exists('spl_object_hash') ) {
-			return spl_object_hash($function[0]) . $function[1];
+		if (function_exists('spl_object_hash')) {
+			return spl_object_hash($function[0]).$function[1];
 		} else {
 			$obj_idx = get_class($function[0]).$function[1];
-			if ( !isset($function[0]->wp_filter_id) ) {
-				if ( false === $priority )
+			if ( ! isset($function[0]->wp_filter_id)) {
+				if (false === $priority)
 					return false;
-				$obj_idx .= isset($wp_filter[$tag][$priority]) ? count((array)$wp_filter[$tag][$priority]) : $filter_id_count;
+				$obj_idx .= isset($wp_filter[$tag][$priority]) ? count((array) $wp_filter[$tag][$priority]) : $filter_id_count;
 				$function[0]->wp_filter_id = $filter_id_count;
 				++$filter_id_count;
 			} else {
@@ -903,8 +903,8 @@ 
 
 			return $obj_idx;
 		}
-	} elseif ( is_string( $function[0] ) ) {
+	} elseif (is_string($function[0])) {
 		// Static Calling
-		return $function[0] . '::' . $function[1];
+		return $function[0].'::'.$function[1];
 	}
 }

Braces +58 added lines, -39 removed lines

@@ -33,11 +33,13 @@ 
 	$wp_filter = array();
 }
 
-if ( ! isset( $wp_actions ) )
+if ( ! isset( $wp_actions ) ) {
 	$wp_actions = array();
+}
 
-if ( ! isset( $wp_current_filter ) )
+if ( ! isset( $wp_current_filter ) ) {
 	$wp_current_filter = array();
+}
 
 /**
  * Hook a function or method to a specific filter action.
@@ -186,16 +188,19 @@ 
 	}
 
 	if ( !isset($wp_filter[$tag]) ) {
-		if ( isset($wp_filter['all']) )
-			array_pop($wp_current_filter);
+		if ( isset($wp_filter['all']) ) {
+					array_pop($wp_current_filter);
+		}
 		return $value;
 	}
 
-	if ( !isset($wp_filter['all']) )
-		$wp_current_filter[] = $tag;
+	if ( !isset($wp_filter['all']) ) {
+			$wp_current_filter[] = $tag;
+	}
 
-	if ( empty($args) )
-		$args = func_get_args();
+	if ( empty($args) ) {
+			$args = func_get_args();
+	}
 
 	// don't pass the tag name to WP_Hook
 	array_shift( $args );
@@ -233,13 +238,15 @@ 
 	}
 
 	if ( !isset($wp_filter[$tag]) ) {
-		if ( isset($wp_filter['all']) )
-			array_pop($wp_current_filter);
+		if ( isset($wp_filter['all']) ) {
+					array_pop($wp_current_filter);
+		}
 		return $args[0];
 	}
 
-	if ( !isset($wp_filter['all']) )
-		$wp_current_filter[] = $tag;
+	if ( !isset($wp_filter['all']) ) {
+			$wp_current_filter[] = $tag;
+	}
 
 	$filtered = $wp_filter[ $tag ]->apply_filters( $args[0], $args );
 
@@ -421,10 +428,11 @@ 
 function do_action($tag, $arg = '') {
 	global $wp_filter, $wp_actions, $wp_current_filter;
 
-	if ( ! isset($wp_actions[$tag]) )
-		$wp_actions[$tag] = 1;
-	else
-		++$wp_actions[$tag];
+	if ( ! isset($wp_actions[$tag]) ) {
+			$wp_actions[$tag] = 1;
+	} else {
+			++$wp_actions[$tag];
+	}
 
 	// Do 'all' actions first
 	if ( isset($wp_filter['all']) ) {
@@ -434,21 +442,26 @@ 
 	}
 
 	if ( !isset($wp_filter[$tag]) ) {
-		if ( isset($wp_filter['all']) )
-			array_pop($wp_current_filter);
+		if ( isset($wp_filter['all']) ) {
+					array_pop($wp_current_filter);
+		}
 		return;
 	}
 
-	if ( !isset($wp_filter['all']) )
-		$wp_current_filter[] = $tag;
+	if ( !isset($wp_filter['all']) ) {
+			$wp_current_filter[] = $tag;
+	}
 
 	$args = array();
-	if ( is_array($arg) && 1 == count($arg) && isset($arg[0]) && is_object($arg[0]) ) // array(&$this)
+	if ( is_array($arg) && 1 == count($arg) && isset($arg[0]) && is_object($arg[0]) ) {
+		// array(&$this)
 		$args[] =& $arg[0];
-	else
-		$args[] = $arg;
-	for ( $a = 2, $num = func_num_args(); $a < $num; $a++ )
-		$args[] = func_get_arg($a);
+	} else {
+			$args[] = $arg;
+	}
+	for ( $a = 2, $num = func_num_args(); $a < $num; $a++ ) {
+			$args[] = func_get_arg($a);
+	}
 
 	$wp_filter[ $tag ]->do_action( $args );
 
@@ -468,8 +481,9 @@ 
 function did_action($tag) {
 	global $wp_actions;
 
-	if ( ! isset( $wp_actions[ $tag ] ) )
-		return 0;
+	if ( ! isset( $wp_actions[ $tag ] ) ) {
+			return 0;
+	}
 
 	return $wp_actions[$tag];
 }
@@ -491,10 +505,11 @@ 
 function do_action_ref_array($tag, $args) {
 	global $wp_filter, $wp_actions, $wp_current_filter;
 
-	if ( ! isset($wp_actions[$tag]) )
-		$wp_actions[$tag] = 1;
-	else
-		++$wp_actions[$tag];
+	if ( ! isset($wp_actions[$tag]) ) {
+			$wp_actions[$tag] = 1;
+	} else {
+			++$wp_actions[$tag];
+	}
 
 	// Do 'all' actions first
 	if ( isset($wp_filter['all']) ) {
@@ -504,13 +519,15 @@ 
 	}
 
 	if ( !isset($wp_filter[$tag]) ) {
-		if ( isset($wp_filter['all']) )
-			array_pop($wp_current_filter);
+		if ( isset($wp_filter['all']) ) {
+					array_pop($wp_current_filter);
+		}
 		return;
 	}
 
-	if ( !isset($wp_filter['all']) )
-		$wp_current_filter[] = $tag;
+	if ( !isset($wp_filter['all']) ) {
+			$wp_current_filter[] = $tag;
+	}
 
 	$wp_filter[ $tag ]->do_action( $args );
 
@@ -875,8 +892,9 @@ 
 	global $wp_filter;
 	static $filter_id_count = 0;
 
-	if ( is_string($function) )
-		return $function;
+	if ( is_string($function) ) {
+			return $function;
+	}
 
 	if ( is_object($function) ) {
 		// Closures are currently implemented as objects
@@ -892,8 +910,9 @@ 
 		} else {
 			$obj_idx = get_class($function[0]).$function[1];
 			if ( !isset($function[0]->wp_filter_id) ) {
-				if ( false === $priority )
-					return false;
+				if ( false === $priority ) {
+									return false;
+				}
 				$obj_idx .= isset($wp_filter[$tag][$priority]) ? count((array)$wp_filter[$tag][$priority]) : $filter_id_count;
 				$function[0]->wp_filter_id = $filter_id_count;
 				++$filter_id_count;

src/wp-includes/pomo/po.php

Doc Comments +7 added lines, -2 removed lines

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

Spacing +56 added lines, -56 removed lines

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

Braces +56 added lines, -26 removed lines

@@ -34,10 +34,11 @@ 
 			$header_string.= "$header: $value\n";
 		}
 		$poified = PO::poify($header_string);
-		if ($this->comments_before_headers)
-			$before_headers = $this->prepend_each_line(rtrim($this->comments_before_headers)."\n", '# ');
-		else
-			$before_headers = '';
+		if ($this->comments_before_headers) {
+					$before_headers = $this->prepend_each_line(rtrim($this->comments_before_headers)."\n", '# ');
+		} else {
+					$before_headers = '';
+		}
 		return rtrim("{$before_headers}msgid \"\"\nmsgstr $poified");
 	}
 
@@ -76,10 +77,14 @@ 
 	 */
 	function export_to_file($filename, $include_headers = true) {
 		$fh = fopen($filename, 'w');
-		if (false === $fh) return false;
+		if (false === $fh) {
+			return false;
+		}
 		$export = $this->export($include_headers);
 		$res = fwrite($fh, $export);
-		if (false === $res) return false;
+		if (false === $res) {
+			return false;
+		}
 		return fclose($fh);
 	}
 
@@ -141,10 +146,11 @@ 
 			$chars = $chars[0];
 			foreach($chars as $char) {
 				if (!$previous_is_backslash) {
-					if ('\\' == $char)
-						$previous_is_backslash = true;
-					else
-						$unpoified .= $char;
+					if ('\\' == $char) {
+											$previous_is_backslash = true;
+					} else {
+											$unpoified .= $char;
+					}
 				} else {
 					$previous_is_backslash = false;
 					$unpoified .= isset($escapes[$char])? $escapes[$char] : $char;
@@ -206,13 +212,25 @@ 
 	 * 	false if the entry is empty
 	 */
 	public static function export_entry(&$entry) {
-		if ( null === $entry->singular || '' === $entry->singular ) return false;
+		if ( null === $entry->singular || '' === $entry->singular ) {
+			return false;
+		}
 		$po = array();
-		if (!empty($entry->translator_comments)) $po[] = PO::comment_block($entry->translator_comments);
-		if (!empty($entry->extracted_comments)) $po[] = PO::comment_block($entry->extracted_comments, '.');
-		if (!empty($entry->references)) $po[] = PO::comment_block(implode(' ', $entry->references), ':');
-		if (!empty($entry->flags)) $po[] = PO::comment_block(implode(", ", $entry->flags), ',');
-		if ($entry->context) $po[] = 'msgctxt '.PO::poify($entry->context);
+		if (!empty($entry->translator_comments)) {
+			$po[] = PO::comment_block($entry->translator_comments);
+		}
+		if (!empty($entry->extracted_comments)) {
+			$po[] = PO::comment_block($entry->extracted_comments, '.');
+		}
+		if (!empty($entry->references)) {
+			$po[] = PO::comment_block(implode(' ', $entry->references), ':');
+		}
+		if (!empty($entry->flags)) {
+			$po[] = PO::comment_block(implode(", ", $entry->flags), ',');
+		}
+		if ($entry->context) {
+			$po[] = 'msgctxt '.PO::poify($entry->context);
+		}
 		$po[] = 'msgid '.PO::poify($entry->singular);
 		if (!$entry->is_plural) {
 			$translation = empty($entry->translations)? '' : $entry->translations[0];
@@ -264,11 +282,15 @@ 
 	 */
 	function import_from_file($filename) {
 		$f = fopen($filename, 'r');
-		if (!$f) return false;
+		if (!$f) {
+			return false;
+		}
 		$lineno = 0;
 		while (true) {
 			$res = $this->read_entry($f, $lineno);
-			if (!$res) break;
+			if (!$res) {
+				break;
+			}
 			if ($res['entry']->singular == '') {
 				$this->set_headers($this->make_headers($res['entry']->translations[0]));
 			} else {
@@ -310,17 +332,21 @@ 
 			$line = PO::read_line($f);
 			if (!$line)  {
 				if (feof($f)) {
-					if (self::is_final($context))
-						break;
-					elseif (!$context) // we haven't read a line and eof came
+					if (self::is_final($context)) {
+											break;
+					} elseif (!$context) {
+						// we haven't read a line and eof came
 						return null;
-					else
-						return false;
+					} else {
+											return false;
+					}
 				} else {
 					return false;
 				}
 			}
-			if ($line == "\n") continue;
+			if ($line == "\n") {
+				continue;
+			}
 			$line = trim($line);
 			if (preg_match('/^#/', $line, $m)) {
 				// the comment is the start of a new entry
@@ -461,8 +487,12 @@ 
 	 * @return sring
 	 */
 	public static function trim_quotes($s) {
-		if ( substr($s, 0, 1) == '"') $s = substr($s, 1);
-		if ( substr($s, -1, 1) == '"') $s = substr($s, 0, -1);
+		if ( substr($s, 0, 1) == '"') {
+			$s = substr($s, 1);
+		}
+		if ( substr($s, -1, 1) == '"') {
+			$s = substr($s, 0, -1);
+		}
 		return $s;
 	}
 }