ntwb / wordpress

src/wp-includes/formatting.php

Doc Comments +4 added lines, -5 removed lines

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

Indentation +14 added lines, -14 removed lines

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

Spacing +956 added lines, -957 removed lines

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

Braces +222 added lines, -139 removed lines

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

src/wp-includes/functions.php

Doc Comments +7 added lines, -10 removed lines

@@ -55,7 +55,7 @@ 
  *
  * @param string   $type Type of time to retrieve. Accepts 'mysql', 'timestamp', or PHP date
  *                       format string (e.g. 'Y-m-d').
- * @param int|bool $gmt  Optional. Whether to use GMT timezone. Default false.
+ * @param integer $gmt  Optional. Whether to use GMT timezone. Default false.
  * @return int|string Integer if $type is 'timestamp', string otherwise.
  */
 function current_time( $type, $gmt = 0 ) {
@@ -427,7 +427,7 @@ 
  * @since 2.0.5
  *
  * @param string|array|object $data Data that might be serialized.
- * @return mixed A scalar data
+ * @return string A scalar data
  */
 function maybe_serialize( $data ) {
 	if ( is_array( $data ) || is_object( $data ) )
@@ -762,9 +762,6 @@ 
  *
  * @since 1.5.0
  *
- * @param string|array $key   Either a query variable key, or an associative array of query variables.
- * @param string       $value Optional. Either a query variable value, or a URL to act upon.
- * @param string       $url   Optional. A URL to act upon.
  * @return string New URL query string (unescaped).
  */
 function add_query_arg() {
@@ -1419,7 +1416,7 @@ 
  * @since 2.0.4
  *
  * @param string     $actionurl URL to add nonce action.
- * @param int|string $action    Optional. Nonce action name. Default -1.
+ * @param integer $action    Optional. Nonce action name. Default -1.
  * @param string     $name      Optional. Nonce name. Default '_wpnonce'.
  * @return string Escaped URL with nonce action added.
  */
@@ -1448,7 +1445,7 @@ 
  *
  * @since 2.0.4
  *
- * @param int|string $action  Optional. Action name. Default -1.
+ * @param integer $action  Optional. Action name. Default -1.
  * @param string     $name    Optional. Nonce name. Default '_wpnonce'.
  * @param bool       $referer Optional. Whether to set the referer field for validation. Default true.
  * @param bool       $echo    Optional. Whether to display or return hidden form field. Default true.
@@ -1540,7 +1537,7 @@ 
  *
  * @since 4.5.0
  *
- * @return string|false Referer URL on success, false on failure.
+ * @return string Referer URL on success, false on failure.
  */
 function wp_get_raw_referer() {
 	if ( ! empty( $_REQUEST['_wp_http_referer'] ) ) {
@@ -4616,7 +4613,7 @@ 
  *
  * @see __return_false()
  *
- * @return true True.
+ * @return boolean True.
  */
 function __return_true() {
 	return true;
@@ -4738,7 +4735,7 @@ 
  * @param int      $start         The ID to start the loop check at.
  * @param int      $start_parent  The parent_ID of $start to use instead of calling $callback( $start ).
  *                                Use null to always use $callback
- * @param array    $callback_args Optional. Additional arguments to send to $callback.
+ * @param string[]    $callback_args Optional. Additional arguments to send to $callback.
  * @return array IDs of all members of loop.
  */
 function wp_find_hierarchy_loop( $callback, $start, $start_parent, $callback_args = array() ) {

Indentation +66 added lines, -66 removed lines

@@ -1,9 +1,9 @@ 
 <?php
 /**
- * Main WordPress API
- *
- * @package WordPress
- */
+	 * Main WordPress API
+	 *
+	 * @package WordPress
+	 */
 
 require( ABSPATH . WPINC . '/option.php' );
 
@@ -2452,14 +2452,14 @@ 
 	) );
 }
 /**
- * Retrieve list of allowed mime types and file extensions.
- *
- * @since 2.8.6
- *
- * @param int|WP_User $user Optional. User to check. Defaults to current user.
- * @return array Array of mime types keyed by the file extension regex corresponding
- *               to those types.
- */
+	 * Retrieve list of allowed mime types and file extensions.
+	 *
+	 * @since 2.8.6
+	 *
+	 * @param int|WP_User $user Optional. User to check. Defaults to current user.
+	 * @return array Array of mime types keyed by the file extension regex corresponding
+	 *               to those types.
+	 */
 function get_allowed_mime_types( $user = null ) {
 	$t = wp_get_mime_types();
 
@@ -3208,7 +3208,7 @@ 
 		  ':arrow:' => "\xe2\x9e\xa1",
 		  ':shock:' => "\xf0\x9f\x98\xaf",
 		  ':smile:' => "\xf0\x9f\x99\x82",
-		    ':???:' => "\xf0\x9f\x98\x95",
+			':???:' => "\xf0\x9f\x98\x95",
 		   ':cool:' => "\xf0\x9f\x98\x8e",
 		   ':evil:' => "\xf0\x9f\x91\xbf",
 		   ':grin:' => "\xf0\x9f\x98\x80",
@@ -3217,36 +3217,36 @@ 
 		   ':razz:' => "\xf0\x9f\x98\x9b",
 		   ':roll:' => 'rolleyes.png',
 		   ':wink:' => "\xf0\x9f\x98\x89",
-		    ':cry:' => "\xf0\x9f\x98\xa5",
-		    ':eek:' => "\xf0\x9f\x98\xae",
-		    ':lol:' => "\xf0\x9f\x98\x86",
-		    ':mad:' => "\xf0\x9f\x98\xa1",
-		    ':sad:' => "\xf0\x9f\x99\x81",
-		      '8-)' => "\xf0\x9f\x98\x8e",
-		      '8-O' => "\xf0\x9f\x98\xaf",
-		      ':-(' => "\xf0\x9f\x99\x81",
-		      ':-)' => "\xf0\x9f\x99\x82",
-		      ':-?' => "\xf0\x9f\x98\x95",
-		      ':-D' => "\xf0\x9f\x98\x80",
-		      ':-P' => "\xf0\x9f\x98\x9b",
-		      ':-o' => "\xf0\x9f\x98\xae",
-		      ':-x' => "\xf0\x9f\x98\xa1",
-		      ':-|' => "\xf0\x9f\x98\x90",
-		      ';-)' => "\xf0\x9f\x98\x89",
+			':cry:' => "\xf0\x9f\x98\xa5",
+			':eek:' => "\xf0\x9f\x98\xae",
+			':lol:' => "\xf0\x9f\x98\x86",
+			':mad:' => "\xf0\x9f\x98\xa1",
+			':sad:' => "\xf0\x9f\x99\x81",
+			  '8-)' => "\xf0\x9f\x98\x8e",
+			  '8-O' => "\xf0\x9f\x98\xaf",
+			  ':-(' => "\xf0\x9f\x99\x81",
+			  ':-)' => "\xf0\x9f\x99\x82",
+			  ':-?' => "\xf0\x9f\x98\x95",
+			  ':-D' => "\xf0\x9f\x98\x80",
+			  ':-P' => "\xf0\x9f\x98\x9b",
+			  ':-o' => "\xf0\x9f\x98\xae",
+			  ':-x' => "\xf0\x9f\x98\xa1",
+			  ':-|' => "\xf0\x9f\x98\x90",
+			  ';-)' => "\xf0\x9f\x98\x89",
 		// This one transformation breaks regular text with frequency.
 		//     '8)' => "\xf0\x9f\x98\x8e",
-		       '8O' => "\xf0\x9f\x98\xaf",
-		       ':(' => "\xf0\x9f\x99\x81",
-		       ':)' => "\xf0\x9f\x99\x82",
-		       ':?' => "\xf0\x9f\x98\x95",
-		       ':D' => "\xf0\x9f\x98\x80",
-		       ':P' => "\xf0\x9f\x98\x9b",
-		       ':o' => "\xf0\x9f\x98\xae",
-		       ':x' => "\xf0\x9f\x98\xa1",
-		       ':|' => "\xf0\x9f\x98\x90",
-		       ';)' => "\xf0\x9f\x98\x89",
-		      ':!:' => "\xe2\x9d\x97",
-		      ':?:' => "\xe2\x9d\x93",
+			   '8O' => "\xf0\x9f\x98\xaf",
+			   ':(' => "\xf0\x9f\x99\x81",
+			   ':)' => "\xf0\x9f\x99\x82",
+			   ':?' => "\xf0\x9f\x98\x95",
+			   ':D' => "\xf0\x9f\x98\x80",
+			   ':P' => "\xf0\x9f\x98\x9b",
+			   ':o' => "\xf0\x9f\x98\xae",
+			   ':x' => "\xf0\x9f\x98\xa1",
+			   ':|' => "\xf0\x9f\x98\x90",
+			   ';)' => "\xf0\x9f\x98\x89",
+			  ':!:' => "\xe2\x9d\x97",
+			  ':?:' => "\xe2\x9d\x93",
 		);
 	}
 
@@ -3795,31 +3795,31 @@ 
 	}
 }
 /**
- * Mark a function argument as deprecated and inform when it has been used.
- *
- * This function is to be used whenever a deprecated function argument is used.
- * Before this function is called, the argument must be checked for whether it was
- * used by comparing it to its default value or evaluating whether it is empty.
- * For example:
- *
- *     if ( ! empty( $deprecated ) ) {
- *         _deprecated_argument( __FUNCTION__, '3.0' );
- *     }
- *
- *
- * There is a hook deprecated_argument_run that will be called that can be used
- * to get the backtrace up to what file and function used the deprecated
- * argument.
- *
- * The current behavior is to trigger a user error if WP_DEBUG is true.
- *
- * @since 3.0.0
- * @access private
- *
- * @param string $function The function that was called.
- * @param string $version  The version of WordPress that deprecated the argument used.
- * @param string $message  Optional. A message regarding the change. Default null.
- */
+	 * Mark a function argument as deprecated and inform when it has been used.
+	 *
+	 * This function is to be used whenever a deprecated function argument is used.
+	 * Before this function is called, the argument must be checked for whether it was
+	 * used by comparing it to its default value or evaluating whether it is empty.
+	 * For example:
+	 *
+	 *     if ( ! empty( $deprecated ) ) {
+	 *         _deprecated_argument( __FUNCTION__, '3.0' );
+	 *     }
+	 *
+	 *
+	 * There is a hook deprecated_argument_run that will be called that can be used
+	 * to get the backtrace up to what file and function used the deprecated
+	 * argument.
+	 *
+	 * The current behavior is to trigger a user error if WP_DEBUG is true.
+	 *
+	 * @since 3.0.0
+	 * @access private
+	 *
+	 * @param string $function The function that was called.
+	 * @param string $version  The version of WordPress that deprecated the argument used.
+	 * @param string $message  Optional. A message regarding the change. Default null.
+	 */
 function _deprecated_argument( $function, $version, $message = null ) {
 
 	/**

Spacing +1005 added lines, -1005 removed lines

@@ -5,7 +5,7 @@ 
  * @package WordPress
  */
 
-require( ABSPATH . WPINC . '/option.php' );
+require(ABSPATH.WPINC.'/option.php');
 
 /**
  * Convert given date string into a different format.
@@ -23,22 +23,22 @@ 
  * @param bool   $translate Whether the return date should be translated. Default true.
  * @return string|int|bool Formatted date string or Unix timestamp. False if $date is empty.
  */
-function mysql2date( $format, $date, $translate = true ) {
-	if ( empty( $date ) )
+function mysql2date($format, $date, $translate = true) {
+	if (empty($date))
 		return false;
 
-	if ( 'G' == $format )
-		return strtotime( $date . ' +0000' );
+	if ('G' == $format)
+		return strtotime($date.' +0000');
 
-	$i = strtotime( $date );
+	$i = strtotime($date);
 
-	if ( 'U' == $format )
+	if ('U' == $format)
 		return $i;
 
-	if ( $translate )
-		return date_i18n( $format, $i );
+	if ($translate)
+		return date_i18n($format, $i);
 	else
-		return date( $format, $i );
+		return date($format, $i);
 }
 
 /**
@@ -58,14 +58,14 @@ 
  * @param int|bool $gmt  Optional. Whether to use GMT timezone. Default false.
  * @return int|string Integer if $type is 'timestamp', string otherwise.
  */
-function current_time( $type, $gmt = 0 ) {
-	switch ( $type ) {
+function current_time($type, $gmt = 0) {
+	switch ($type) {
 		case 'mysql':
-			return ( $gmt ) ? gmdate( 'Y-m-d H:i:s' ) : gmdate( 'Y-m-d H:i:s', ( time() + ( get_option( 'gmt_offset' ) * HOUR_IN_SECONDS ) ) );
+			return ($gmt) ? gmdate('Y-m-d H:i:s') : gmdate('Y-m-d H:i:s', (time() + (get_option('gmt_offset') * HOUR_IN_SECONDS)));
 		case 'timestamp':
-			return ( $gmt ) ? time() : time() + ( get_option( 'gmt_offset' ) * HOUR_IN_SECONDS );
+			return ($gmt) ? time() : time() + (get_option('gmt_offset') * HOUR_IN_SECONDS);
 		default:
-			return ( $gmt ) ? date( $type ) : date( $type, time() + ( get_option( 'gmt_offset' ) * HOUR_IN_SECONDS ) );
+			return ($gmt) ? date($type) : date($type, time() + (get_option('gmt_offset') * HOUR_IN_SECONDS));
 	}
 }
 
@@ -86,13 +86,13 @@ 
  *
  * @return string The date, translated if locale specifies it.
  */
-function date_i18n( $dateformatstring, $unixtimestamp = false, $gmt = false ) {
+function date_i18n($dateformatstring, $unixtimestamp = false, $gmt = false) {
 	global $wp_locale;
 	$i = $unixtimestamp;
 
-	if ( false === $i ) {
-		if ( ! $gmt )
-			$i = current_time( 'timestamp' );
+	if (false === $i) {
+		if ( ! $gmt)
+			$i = current_time('timestamp');
 		else
 			$i = time();
 		// we should not let date() interfere with our
@@ -106,43 +106,43 @@ 
 	 */
 	$req_format = $dateformatstring;
 
-	$datefunc = $gmt? 'gmdate' : 'date';
+	$datefunc = $gmt ? 'gmdate' : 'date';
 
-	if ( ( !empty( $wp_locale->month ) ) && ( !empty( $wp_locale->weekday ) ) ) {
-		$datemonth = $wp_locale->get_month( $datefunc( 'm', $i ) );
-		$datemonth_abbrev = $wp_locale->get_month_abbrev( $datemonth );
-		$dateweekday = $wp_locale->get_weekday( $datefunc( 'w', $i ) );
-		$dateweekday_abbrev = $wp_locale->get_weekday_abbrev( $dateweekday );
-		$datemeridiem = $wp_locale->get_meridiem( $datefunc( 'a', $i ) );
-		$datemeridiem_capital = $wp_locale->get_meridiem( $datefunc( 'A', $i ) );
+	if (( ! empty($wp_locale->month)) && ( ! empty($wp_locale->weekday))) {
+		$datemonth = $wp_locale->get_month($datefunc('m', $i));
+		$datemonth_abbrev = $wp_locale->get_month_abbrev($datemonth);
+		$dateweekday = $wp_locale->get_weekday($datefunc('w', $i));
+		$dateweekday_abbrev = $wp_locale->get_weekday_abbrev($dateweekday);
+		$datemeridiem = $wp_locale->get_meridiem($datefunc('a', $i));
+		$datemeridiem_capital = $wp_locale->get_meridiem($datefunc('A', $i));
 		$dateformatstring = ' '.$dateformatstring;
-		$dateformatstring = preg_replace( "/([^\\\])D/", "\\1" . backslashit( $dateweekday_abbrev ), $dateformatstring );
-		$dateformatstring = preg_replace( "/([^\\\])F/", "\\1" . backslashit( $datemonth ), $dateformatstring );
-		$dateformatstring = preg_replace( "/([^\\\])l/", "\\1" . backslashit( $dateweekday ), $dateformatstring );
-		$dateformatstring = preg_replace( "/([^\\\])M/", "\\1" . backslashit( $datemonth_abbrev ), $dateformatstring );
-		$dateformatstring = preg_replace( "/([^\\\])a/", "\\1" . backslashit( $datemeridiem ), $dateformatstring );
-		$dateformatstring = preg_replace( "/([^\\\])A/", "\\1" . backslashit( $datemeridiem_capital ), $dateformatstring );
-
-		$dateformatstring = substr( $dateformatstring, 1, strlen( $dateformatstring ) -1 );
-	}
-	$timezone_formats = array( 'P', 'I', 'O', 'T', 'Z', 'e' );
-	$timezone_formats_re = implode( '|', $timezone_formats );
-	if ( preg_match( "/$timezone_formats_re/", $dateformatstring ) ) {
-		$timezone_string = get_option( 'timezone_string' );
-		if ( $timezone_string ) {
-			$timezone_object = timezone_open( $timezone_string );
-			$date_object = date_create( null, $timezone_object );
-			foreach ( $timezone_formats as $timezone_format ) {
-				if ( false !== strpos( $dateformatstring, $timezone_format ) ) {
-					$formatted = date_format( $date_object, $timezone_format );
+		$dateformatstring = preg_replace("/([^\\\])D/", "\\1".backslashit($dateweekday_abbrev), $dateformatstring);
+		$dateformatstring = preg_replace("/([^\\\])F/", "\\1".backslashit($datemonth), $dateformatstring);
+		$dateformatstring = preg_replace("/([^\\\])l/", "\\1".backslashit($dateweekday), $dateformatstring);
+		$dateformatstring = preg_replace("/([^\\\])M/", "\\1".backslashit($datemonth_abbrev), $dateformatstring);
+		$dateformatstring = preg_replace("/([^\\\])a/", "\\1".backslashit($datemeridiem), $dateformatstring);
+		$dateformatstring = preg_replace("/([^\\\])A/", "\\1".backslashit($datemeridiem_capital), $dateformatstring);
+
+		$dateformatstring = substr($dateformatstring, 1, strlen($dateformatstring) - 1);
+	}
+	$timezone_formats = array('P', 'I', 'O', 'T', 'Z', 'e');
+	$timezone_formats_re = implode('|', $timezone_formats);
+	if (preg_match("/$timezone_formats_re/", $dateformatstring)) {
+		$timezone_string = get_option('timezone_string');
+		if ($timezone_string) {
+			$timezone_object = timezone_open($timezone_string);
+			$date_object = date_create(null, $timezone_object);
+			foreach ($timezone_formats as $timezone_format) {
+				if (false !== strpos($dateformatstring, $timezone_format)) {
+					$formatted = date_format($date_object, $timezone_format);
 					$dateformatstring = ' '.$dateformatstring;
-					$dateformatstring = preg_replace( "/([^\\\])$timezone_format/", "\\1" . backslashit( $formatted ), $dateformatstring );
-					$dateformatstring = substr( $dateformatstring, 1, strlen( $dateformatstring ) -1 );
+					$dateformatstring = preg_replace("/([^\\\])$timezone_format/", "\\1".backslashit($formatted), $dateformatstring);
+					$dateformatstring = substr($dateformatstring, 1, strlen($dateformatstring) - 1);
 				}
 			}
 		}
 	}
-	$j = @$datefunc( $dateformatstring, $i );
+	$j = @$datefunc($dateformatstring, $i);
 
 	/**
 	 * Filter the date formatted based on the locale.
@@ -154,7 +154,7 @@ 
 	 * @param int    $i          Unix timestamp.
 	 * @param bool   $gmt        Whether to convert to GMT for time. Default false.
 	 */
-	$j = apply_filters( 'date_i18n', $j, $req_format, $i, $gmt );
+	$j = apply_filters('date_i18n', $j, $req_format, $i, $gmt);
 	return $j;
 }
 
@@ -169,36 +169,36 @@ 
  * @param string $date Formatted date string.
  * @return string The date, declined if locale specifies it.
  */
-function wp_maybe_decline_date( $date ) {
+function wp_maybe_decline_date($date) {
 	global $wp_locale;
 
 	// i18n functions are not available in SHORTINIT mode
-	if ( ! function_exists( '_x' ) ) {
+	if ( ! function_exists('_x')) {
 		return $date;
 	}
 
 	/* translators: If months in your language require a genitive case,
 	 * translate this to 'on'. Do not translate into your own language.
 	 */
-	if ( 'on' === _x( 'off', 'decline months names: on or off' ) ) {
+	if ('on' === _x('off', 'decline months names: on or off')) {
 		// Match a format like 'j F Y' or 'j. F'
-		if ( @preg_match( '#^\d{1,2}\.? \w+#u', $date ) ) {
+		if (@preg_match('#^\d{1,2}\.? \w+#u', $date)) {
 			$months = $wp_locale->month;
 
-			foreach ( $months as $key => $month ) {
-				$months[ $key ] = '#' . $month . '#';
+			foreach ($months as $key => $month) {
+				$months[$key] = '#'.$month.'#';
 			}
 
-			$date = preg_replace( $months, $wp_locale->month_genitive, $date );
+			$date = preg_replace($months, $wp_locale->month_genitive, $date);
 		}
 	}
 
 	// Used for locale-specific rules
 	$locale = get_locale();
 
-	if ( 'ca' === $locale ) {
+	if ('ca' === $locale) {
 		// " de abril| de agost| de octubre..." -> " d'abril| d'agost| d'octubre..."
-		$date = preg_replace( '# de ([ao])#i', " d'\\1", $date );
+		$date = preg_replace('# de ([ao])#i', " d'\\1", $date);
 	}
 
 	return $date;
@@ -215,13 +215,13 @@ 
  * @param int   $decimals Optional. Precision of the number of decimal places. Default 0.
  * @return string Converted number in string format.
  */
-function number_format_i18n( $number, $decimals = 0 ) {
+function number_format_i18n($number, $decimals = 0) {
 	global $wp_locale;
 
-	if ( isset( $wp_locale ) ) {
-		$formatted = number_format( $number, absint( $decimals ), $wp_locale->number_format['decimal_point'], $wp_locale->number_format['thousands_sep'] );
+	if (isset($wp_locale)) {
+		$formatted = number_format($number, absint($decimals), $wp_locale->number_format['decimal_point'], $wp_locale->number_format['thousands_sep']);
 	} else {
-		$formatted = number_format( $number, absint( $decimals ) );
+		$formatted = number_format($number, absint($decimals));
 	}
 
 	/**
@@ -231,7 +231,7 @@ 
 	 *
 	 * @param string $formatted Converted number in string format.
 	 */
-	return apply_filters( 'number_format_i18n', $formatted );
+	return apply_filters('number_format_i18n', $formatted);
 }
 
 /**
@@ -254,7 +254,7 @@ 
  * @param int        $decimals Optional. Precision of number of decimal places. Default 0.
  * @return string|false False on failure. Number string on success.
  */
-function size_format( $bytes, $decimals = 0 ) {
+function size_format($bytes, $decimals = 0) {
 	$quant = array(
 		'TB' => TB_IN_BYTES,
 		'GB' => GB_IN_BYTES,
@@ -263,9 +263,9 @@ 
 		'B'  => 1,
 	);
 
-	foreach ( $quant as $unit => $mag ) {
-		if ( doubleval( $bytes ) >= $mag ) {
-			return number_format_i18n( $bytes / $mag, $decimals ) . ' ' . $unit;
+	foreach ($quant as $unit => $mag) {
+		if (doubleval($bytes) >= $mag) {
+			return number_format_i18n($bytes / $mag, $decimals).' '.$unit;
 		}
 	}
 
@@ -281,34 +281,34 @@ 
  * @param int|string $start_of_week Optional. Start of the week as an integer. Default empty string.
  * @return array Keys are 'start' and 'end'.
  */
-function get_weekstartend( $mysqlstring, $start_of_week = '' ) {
+function get_weekstartend($mysqlstring, $start_of_week = '') {
 	// MySQL string year.
-	$my = substr( $mysqlstring, 0, 4 );
+	$my = substr($mysqlstring, 0, 4);
 
 	// MySQL string month.
-	$mm = substr( $mysqlstring, 8, 2 );
+	$mm = substr($mysqlstring, 8, 2);
 
 	// MySQL string day.
-	$md = substr( $mysqlstring, 5, 2 );
+	$md = substr($mysqlstring, 5, 2);
 
 	// The timestamp for MySQL string day.
-	$day = mktime( 0, 0, 0, $md, $mm, $my );
+	$day = mktime(0, 0, 0, $md, $mm, $my);
 
 	// The day of the week from the timestamp.
-	$weekday = date( 'w', $day );
+	$weekday = date('w', $day);
 
-	if ( !is_numeric($start_of_week) )
-		$start_of_week = get_option( 'start_of_week' );
+	if ( ! is_numeric($start_of_week))
+		$start_of_week = get_option('start_of_week');
 
-	if ( $weekday < $start_of_week )
+	if ($weekday < $start_of_week)
 		$weekday += 7;
 
 	// The most recent week start day on or before $day.
-	$start = $day - DAY_IN_SECONDS * ( $weekday - $start_of_week );
+	$start = $day - DAY_IN_SECONDS * ($weekday - $start_of_week);
 
 	// $start + 1 week - 1 second.
 	$end = $start + WEEK_IN_SECONDS - 1;
-	return compact( 'start', 'end' );
+	return compact('start', 'end');
 }
 
 /**
@@ -319,9 +319,9 @@ 
  * @param string $original Maybe unserialized original, if is needed.
  * @return mixed Unserialized data can be any type.
  */
-function maybe_unserialize( $original ) {
-	if ( is_serialized( $original ) ) // don't attempt to unserialize data that wasn't serialized going in
-		return @unserialize( $original );
+function maybe_unserialize($original) {
+	if (is_serialized($original)) // don't attempt to unserialize data that wasn't serialized going in
+		return @unserialize($original);
 	return $original;
 }
 
@@ -337,57 +337,57 @@ 
  * @param bool   $strict Optional. Whether to be strict about the end of the string. Default true.
  * @return bool False if not serialized and true if it was.
  */
-function is_serialized( $data, $strict = true ) {
+function is_serialized($data, $strict = true) {
 	// if it isn't a string, it isn't serialized.
-	if ( ! is_string( $data ) ) {
+	if ( ! is_string($data)) {
 		return false;
 	}
-	$data = trim( $data );
- 	if ( 'N;' == $data ) {
+	$data = trim($data);
+ 	if ('N;' == $data) {
 		return true;
 	}
-	if ( strlen( $data ) < 4 ) {
+	if (strlen($data) < 4) {
 		return false;
 	}
-	if ( ':' !== $data[1] ) {
+	if (':' !== $data[1]) {
 		return false;
 	}
-	if ( $strict ) {
-		$lastc = substr( $data, -1 );
-		if ( ';' !== $lastc && '}' !== $lastc ) {
+	if ($strict) {
+		$lastc = substr($data, -1);
+		if (';' !== $lastc && '}' !== $lastc) {
 			return false;
 		}
 	} else {
-		$semicolon = strpos( $data, ';' );
-		$brace     = strpos( $data, '}' );
+		$semicolon = strpos($data, ';');
+		$brace     = strpos($data, '}');
 		// Either ; or } must exist.
-		if ( false === $semicolon && false === $brace )
+		if (false === $semicolon && false === $brace)
 			return false;
 		// But neither must be in the first X characters.
-		if ( false !== $semicolon && $semicolon < 3 )
+		if (false !== $semicolon && $semicolon < 3)
 			return false;
-		if ( false !== $brace && $brace < 4 )
+		if (false !== $brace && $brace < 4)
 			return false;
 	}
 	$token = $data[0];
-	switch ( $token ) {
+	switch ($token) {
 		case 's' :
-			if ( $strict ) {
-				if ( '"' !== substr( $data, -2, 1 ) ) {
+			if ($strict) {
+				if ('"' !== substr($data, -2, 1)) {
 					return false;
 				}
-			} elseif ( false === strpos( $data, '"' ) ) {
+			} elseif (false === strpos($data, '"')) {
 				return false;
 			}
 			// or else fall through
 		case 'a' :
 		case 'O' :
-			return (bool) preg_match( "/^{$token}:[0-9]+:/s", $data );
+			return (bool) preg_match("/^{$token}:[0-9]+:/s", $data);
 		case 'b' :
 		case 'i' :
 		case 'd' :
 			$end = $strict ? '$' : '';
-			return (bool) preg_match( "/^{$token}:[0-9.E-]+;$end/", $data );
+			return (bool) preg_match("/^{$token}:[0-9.E-]+;$end/", $data);
 	}
 	return false;
 }
@@ -400,21 +400,21 @@ 
  * @param string $data Serialized data.
  * @return bool False if not a serialized string, true if it is.
  */
-function is_serialized_string( $data ) {
+function is_serialized_string($data) {
 	// if it isn't a string, it isn't a serialized string.
-	if ( ! is_string( $data ) ) {
+	if ( ! is_string($data)) {
 		return false;
 	}
-	$data = trim( $data );
-	if ( strlen( $data ) < 4 ) {
+	$data = trim($data);
+	if (strlen($data) < 4) {
 		return false;
-	} elseif ( ':' !== $data[1] ) {
+	} elseif (':' !== $data[1]) {
 		return false;
-	} elseif ( ';' !== substr( $data, -1 ) ) {
+	} elseif (';' !== substr($data, -1)) {
 		return false;
-	} elseif ( $data[0] !== 's' ) {
+	} elseif ($data[0] !== 's') {
 		return false;
-	} elseif ( '"' !== substr( $data, -2, 1 ) ) {
+	} elseif ('"' !== substr($data, -2, 1)) {
 		return false;
 	} else {
 		return true;
@@ -429,15 +429,15 @@ 
  * @param string|array|object $data Data that might be serialized.
  * @return mixed A scalar data
  */
-function maybe_serialize( $data ) {
-	if ( is_array( $data ) || is_object( $data ) )
-		return serialize( $data );
+function maybe_serialize($data) {
+	if (is_array($data) || is_object($data))
+		return serialize($data);
 
 	// Double serialization is required for backward compatibility.
 	// See https://core.trac.wordpress.org/ticket/12930
 	// Also the world will end. See WP 3.6.1.
-	if ( is_serialized( $data, false ) )
-		return serialize( $data );
+	if (is_serialized($data, false))
+		return serialize($data);
 
 	return $data;
 }
@@ -455,9 +455,9 @@ 
  * @param string $content XMLRPC XML Request content
  * @return string Post title
  */
-function xmlrpc_getposttitle( $content ) {
+function xmlrpc_getposttitle($content) {
 	global $post_default_title;
-	if ( preg_match( '/<title>(.+?)<\/title>/is', $content, $matchtitle ) ) {
+	if (preg_match('/<title>(.+?)<\/title>/is', $content, $matchtitle)) {
 		$post_title = $matchtitle[1];
 	} else {
 		$post_title = $post_default_title;
@@ -479,11 +479,11 @@ 
  * @param string $content XMLRPC XML Request content
  * @return string|array List of categories or category name.
  */
-function xmlrpc_getpostcategory( $content ) {
+function xmlrpc_getpostcategory($content) {
 	global $post_default_category;
-	if ( preg_match( '/<category>(.+?)<\/category>/is', $content, $matchcat ) ) {
-		$post_category = trim( $matchcat[1], ',' );
-		$post_category = explode( ',', $post_category );
+	if (preg_match('/<category>(.+?)<\/category>/is', $content, $matchcat)) {
+		$post_category = trim($matchcat[1], ',');
+		$post_category = explode(',', $post_category);
 	} else {
 		$post_category = $post_default_category;
 	}
@@ -498,10 +498,10 @@ 
  * @param string $content XML-RPC XML Request content.
  * @return string XMLRPC XML Request content without title and category elements.
  */
-function xmlrpc_removepostdata( $content ) {
-	$content = preg_replace( '/<title>(.+?)<\/title>/si', '', $content );
-	$content = preg_replace( '/<category>(.+?)<\/category>/si', '', $content );
-	$content = trim( $content );
+function xmlrpc_removepostdata($content) {
+	$content = preg_replace('/<title>(.+?)<\/title>/si', '', $content);
+	$content = preg_replace('/<category>(.+?)<\/category>/si', '', $content);
+	$content = trim($content);
 	return $content;
 }
 
@@ -513,7 +513,7 @@ 
  * @param string $content Content to extract URLs from.
  * @return array URLs found in passed string.
  */
-function wp_extract_urls( $content ) {
+function wp_extract_urls($content) {
 	preg_match_all(
 		"#([\"']?)("
 			. "(?:([\w-]+:)?//?)"
@@ -531,9 +531,9 @@ 
 		$post_links
 	);
 
-	$post_links = array_unique( array_map( 'html_entity_decode', $post_links[2] ) );
+	$post_links = array_unique(array_map('html_entity_decode', $post_links[2]));
 
-	return array_values( $post_links );
+	return array_values($post_links);
 }
 
 /**
@@ -550,34 +550,34 @@ 
  * @param string $content Post Content.
  * @param int    $post_ID Post ID.
  */
-function do_enclose( $content, $post_ID ) {
+function do_enclose($content, $post_ID) {
 	global $wpdb;
 
 	//TODO: Tidy this ghetto code up and make the debug code optional
-	include_once( ABSPATH . WPINC . '/class-IXR.php' );
+	include_once(ABSPATH.WPINC.'/class-IXR.php');
 
 	$post_links = array();
 
-	$pung = get_enclosed( $post_ID );
+	$pung = get_enclosed($post_ID);
 
-	$post_links_temp = wp_extract_urls( $content );
+	$post_links_temp = wp_extract_urls($content);
 
-	foreach ( $pung as $link_test ) {
-		if ( ! in_array( $link_test, $post_links_temp ) ) { // link no longer in post
-			$mids = $wpdb->get_col( $wpdb->prepare("SELECT meta_id FROM $wpdb->postmeta WHERE post_id = %d AND meta_key = 'enclosure' AND meta_value LIKE %s", $post_ID, $wpdb->esc_like( $link_test ) . '%') );
-			foreach ( $mids as $mid )
-				delete_metadata_by_mid( 'post', $mid );
+	foreach ($pung as $link_test) {
+		if ( ! in_array($link_test, $post_links_temp)) { // link no longer in post
+			$mids = $wpdb->get_col($wpdb->prepare("SELECT meta_id FROM $wpdb->postmeta WHERE post_id = %d AND meta_key = 'enclosure' AND meta_value LIKE %s", $post_ID, $wpdb->esc_like($link_test).'%'));
+			foreach ($mids as $mid)
+				delete_metadata_by_mid('post', $mid);
 		}
 	}
 
-	foreach ( (array) $post_links_temp as $link_test ) {
-		if ( !in_array( $link_test, $pung ) ) { // If we haven't pung it already
-			$test = @parse_url( $link_test );
-			if ( false === $test )
+	foreach ((array) $post_links_temp as $link_test) {
+		if ( ! in_array($link_test, $pung)) { // If we haven't pung it already
+			$test = @parse_url($link_test);
+			if (false === $test)
 				continue;
-			if ( isset( $test['query'] ) )
+			if (isset($test['query']))
 				$post_links[] = $link_test;
-			elseif ( isset($test['path']) && ( $test['path'] != '/' ) &&  ($test['path'] != '' ) )
+			elseif (isset($test['path']) && ($test['path'] != '/') && ($test['path'] != ''))
 				$post_links[] = $link_test;
 		}
 	}
@@ -593,24 +593,24 @@ 
 	 * @param array $post_links An array of enclosure links.
 	 * @param int   $post_ID    Post ID.
 	 */
-	$post_links = apply_filters( 'enclosure_links', $post_links, $post_ID );
+	$post_links = apply_filters('enclosure_links', $post_links, $post_ID);
 
-	foreach ( (array) $post_links as $url ) {
-		if ( $url != '' && !$wpdb->get_var( $wpdb->prepare( "SELECT post_id FROM $wpdb->postmeta WHERE post_id = %d AND meta_key = 'enclosure' AND meta_value LIKE %s", $post_ID, $wpdb->esc_like( $url ) . '%' ) ) ) {
+	foreach ((array) $post_links as $url) {
+		if ($url != '' && ! $wpdb->get_var($wpdb->prepare("SELECT post_id FROM $wpdb->postmeta WHERE post_id = %d AND meta_key = 'enclosure' AND meta_value LIKE %s", $post_ID, $wpdb->esc_like($url).'%'))) {
 
-			if ( $headers = wp_get_http_headers( $url) ) {
-				$len = isset( $headers['content-length'] ) ? (int) $headers['content-length'] : 0;
-				$type = isset( $headers['content-type'] ) ? $headers['content-type'] : '';
-				$allowed_types = array( 'video', 'audio' );
+			if ($headers = wp_get_http_headers($url)) {
+				$len = isset($headers['content-length']) ? (int) $headers['content-length'] : 0;
+				$type = isset($headers['content-type']) ? $headers['content-type'] : '';
+				$allowed_types = array('video', 'audio');
 
 				// Check to see if we can figure out the mime type from
 				// the extension
-				$url_parts = @parse_url( $url );
-				if ( false !== $url_parts ) {
-					$extension = pathinfo( $url_parts['path'], PATHINFO_EXTENSION );
-					if ( !empty( $extension ) ) {
-						foreach ( wp_get_mime_types() as $exts => $mime ) {
-							if ( preg_match( '!^(' . $exts . ')$!i', $extension ) ) {
+				$url_parts = @parse_url($url);
+				if (false !== $url_parts) {
+					$extension = pathinfo($url_parts['path'], PATHINFO_EXTENSION);
+					if ( ! empty($extension)) {
+						foreach (wp_get_mime_types() as $exts => $mime) {
+							if (preg_match('!^('.$exts.')$!i', $extension)) {
 								$type = $mime;
 								break;
 							}
@@ -618,8 +618,8 @@ 
 					}
 				}
 
-				if ( in_array( substr( $type, 0, strpos( $type, "/" ) ), $allowed_types ) ) {
-					add_post_meta( $post_ID, 'enclosure', "$url\n$len\n$mime\n" );
+				if (in_array(substr($type, 0, strpos($type, "/")), $allowed_types)) {
+					add_post_meta($post_ID, 'enclosure', "$url\n$len\n$mime\n");
 				}
 			}
 		}
@@ -635,16 +635,16 @@ 
  * @param bool   $deprecated Not Used.
  * @return bool|string False on failure, headers on success.
  */
-function wp_get_http_headers( $url, $deprecated = false ) {
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '2.7' );
+function wp_get_http_headers($url, $deprecated = false) {
+	if ( ! empty($deprecated))
+		_deprecated_argument(__FUNCTION__, '2.7');
 
-	$response = wp_safe_remote_head( $url );
+	$response = wp_safe_remote_head($url);
 
-	if ( is_wp_error( $response ) )
+	if (is_wp_error($response))
 		return false;
 
-	return wp_remote_retrieve_headers( $response );
+	return wp_remote_retrieve_headers($response);
 }
 
 /**
@@ -660,7 +660,7 @@ 
  */
 function is_new_day() {
 	global $currentday, $previousday;
-	if ( $currentday != $previousday )
+	if ($currentday != $previousday)
 		return 1;
 	else
 		return 0;
@@ -681,8 +681,8 @@ 
  * @param array $data URL-encode key/value pairs.
  * @return string URL-encoded string.
  */
-function build_query( $data ) {
-	return _http_build_query( $data, null, '&', '', false );
+function build_query($data) {
+	return _http_build_query($data, null, '&', '', false);
 }
 
 /**
@@ -703,30 +703,30 @@ 
  *
  * @return string The query string.
  */
-function _http_build_query( $data, $prefix = null, $sep = null, $key = '', $urlencode = true ) {
+function _http_build_query($data, $prefix = null, $sep = null, $key = '', $urlencode = true) {
 	$ret = array();
 
-	foreach ( (array) $data as $k => $v ) {
-		if ( $urlencode)
+	foreach ((array) $data as $k => $v) {
+		if ($urlencode)
 			$k = urlencode($k);
-		if ( is_int($k) && $prefix != null )
+		if (is_int($k) && $prefix != null)
 			$k = $prefix.$k;
-		if ( !empty($key) )
-			$k = $key . '%5B' . $k . '%5D';
-		if ( $v === null )
+		if ( ! empty($key))
+			$k = $key.'%5B'.$k.'%5D';
+		if ($v === null)
 			continue;
-		elseif ( $v === false )
+		elseif ($v === false)
 			$v = '0';
 
-		if ( is_array($v) || is_object($v) )
-			array_push($ret,_http_build_query($v, '', $sep, $k, $urlencode));
-		elseif ( $urlencode )
+		if (is_array($v) || is_object($v))
+			array_push($ret, _http_build_query($v, '', $sep, $k, $urlencode));
+		elseif ($urlencode)
 			array_push($ret, $k.'='.urlencode($v));
 		else
 			array_push($ret, $k.'='.$v);
 	}
 
-	if ( null === $sep )
+	if (null === $sep)
 		$sep = ini_get('arg_separator.output');
 
 	return implode($sep, $ret);
@@ -769,64 +769,64 @@ 
  */
 function add_query_arg() {
 	$args = func_get_args();
-	if ( is_array( $args[0] ) ) {
-		if ( count( $args ) < 2 || false === $args[1] )
+	if (is_array($args[0])) {
+		if (count($args) < 2 || false === $args[1])
 			$uri = $_SERVER['REQUEST_URI'];
 		else
 			$uri = $args[1];
 	} else {
-		if ( count( $args ) < 3 || false === $args[2] )
+		if (count($args) < 3 || false === $args[2])
 			$uri = $_SERVER['REQUEST_URI'];
 		else
 			$uri = $args[2];
 	}
 
-	if ( $frag = strstr( $uri, '#' ) )
-		$uri = substr( $uri, 0, -strlen( $frag ) );
+	if ($frag = strstr($uri, '#'))
+		$uri = substr($uri, 0, -strlen($frag));
 	else
 		$frag = '';
 
-	if ( 0 === stripos( $uri, 'http://' ) ) {
+	if (0 === stripos($uri, 'http://')) {
 		$protocol = 'http://';
-		$uri = substr( $uri, 7 );
-	} elseif ( 0 === stripos( $uri, 'https://' ) ) {
+		$uri = substr($uri, 7);
+	} elseif (0 === stripos($uri, 'https://')) {
 		$protocol = 'https://';
-		$uri = substr( $uri, 8 );
+		$uri = substr($uri, 8);
 	} else {
 		$protocol = '';
 	}
 
-	if ( strpos( $uri, '?' ) !== false ) {
-		list( $base, $query ) = explode( '?', $uri, 2 );
+	if (strpos($uri, '?') !== false) {
+		list($base, $query) = explode('?', $uri, 2);
 		$base .= '?';
-	} elseif ( $protocol || strpos( $uri, '=' ) === false ) {
-		$base = $uri . '?';
+	} elseif ($protocol || strpos($uri, '=') === false) {
+		$base = $uri.'?';
 		$query = '';
 	} else {
 		$base = '';
 		$query = $uri;
 	}
 
-	wp_parse_str( $query, $qs );
-	$qs = urlencode_deep( $qs ); // this re-URL-encodes things that were already in the query string
-	if ( is_array( $args[0] ) ) {
-		foreach ( $args[0] as $k => $v ) {
-			$qs[ $k ] = $v;
+	wp_parse_str($query, $qs);
+	$qs = urlencode_deep($qs); // this re-URL-encodes things that were already in the query string
+	if (is_array($args[0])) {
+		foreach ($args[0] as $k => $v) {
+			$qs[$k] = $v;
 		}
 	} else {
-		$qs[ $args[0] ] = $args[1];
+		$qs[$args[0]] = $args[1];
 	}
 
-	foreach ( $qs as $k => $v ) {
-		if ( $v === false )
-			unset( $qs[$k] );
+	foreach ($qs as $k => $v) {
+		if ($v === false)
+			unset($qs[$k]);
 	}
 
-	$ret = build_query( $qs );
-	$ret = trim( $ret, '?' );
-	$ret = preg_replace( '#=(&|$)#', '$1', $ret );
-	$ret = $protocol . $base . $ret . $frag;
-	$ret = rtrim( $ret, '?' );
+	$ret = build_query($qs);
+	$ret = trim($ret, '?');
+	$ret = preg_replace('#=(&|$)#', '$1', $ret);
+	$ret = $protocol.$base.$ret.$frag;
+	$ret = rtrim($ret, '?');
 	return $ret;
 }
 
@@ -839,13 +839,13 @@ 
  * @param bool|string  $query Optional. When false uses the current URL. Default false.
  * @return string New URL query string.
  */
-function remove_query_arg( $key, $query = false ) {
-	if ( is_array( $key ) ) { // removing multiple keys
-		foreach ( $key as $k )
-			$query = add_query_arg( $k, false, $query );
+function remove_query_arg($key, $query = false) {
+	if (is_array($key)) { // removing multiple keys
+		foreach ($key as $k)
+			$query = add_query_arg($k, false, $query);
 		return $query;
 	}
-	return add_query_arg( $key, false, $query );
+	return add_query_arg($key, false, $query);
 }
 
 /**
@@ -887,7 +887,7 @@ 
 	 *
 	 * @param array $removable_query_args An array of query variables to remove from a URL.
 	 */
-	return apply_filters( 'removable_query_args', $removable_query_args );
+	return apply_filters('removable_query_args', $removable_query_args);
 }
 
 /**
@@ -898,12 +898,12 @@ 
  * @param array $array Array to walk while sanitizing contents.
  * @return array Sanitized $array.
  */
-function add_magic_quotes( $array ) {
-	foreach ( (array) $array as $k => $v ) {
-		if ( is_array( $v ) ) {
-			$array[$k] = add_magic_quotes( $v );
+function add_magic_quotes($array) {
+	foreach ((array) $array as $k => $v) {
+		if (is_array($v)) {
+			$array[$k] = add_magic_quotes($v);
 		} else {
-			$array[$k] = addslashes( $v );
+			$array[$k] = addslashes($v);
 		}
 	}
 	return $array;
@@ -919,21 +919,21 @@ 
  * @param string $uri URI/URL of web page to retrieve.
  * @return false|string HTTP content. False on failure.
  */
-function wp_remote_fopen( $uri ) {
-	$parsed_url = @parse_url( $uri );
+function wp_remote_fopen($uri) {
+	$parsed_url = @parse_url($uri);
 
-	if ( !$parsed_url || !is_array( $parsed_url ) )
+	if ( ! $parsed_url || ! is_array($parsed_url))
 		return false;
 
 	$options = array();
 	$options['timeout'] = 10;
 
-	$response = wp_safe_remote_get( $uri, $options );
+	$response = wp_safe_remote_get($uri, $options);
 
-	if ( is_wp_error( $response ) )
+	if (is_wp_error($response))
 		return false;
 
-	return wp_remote_retrieve_body( $response );
+	return wp_remote_retrieve_body($response);
 }
 
 /**
@@ -947,11 +947,11 @@ 
  *
  * @param string|array $query_vars Default WP_Query arguments.
  */
-function wp( $query_vars = '' ) {
+function wp($query_vars = '') {
 	global $wp, $wp_query, $wp_the_query;
-	$wp->main( $query_vars );
+	$wp->main($query_vars);
 
-	if ( !isset($wp_the_query) )
+	if ( ! isset($wp_the_query))
 		$wp_the_query = $wp_query;
 }
 
@@ -965,12 +965,12 @@ 
  * @param int $code HTTP status code.
  * @return string Empty string if not found, or description if found.
  */
-function get_status_header_desc( $code ) {
+function get_status_header_desc($code) {
 	global $wp_header_to_desc;
 
-	$code = absint( $code );
+	$code = absint($code);
 
-	if ( !isset( $wp_header_to_desc ) ) {
+	if ( ! isset($wp_header_to_desc)) {
 		$wp_header_to_desc = array(
 			100 => 'Continue',
 			101 => 'Switching Protocols',
@@ -1038,7 +1038,7 @@ 
 		);
 	}
 
-	if ( isset( $wp_header_to_desc[$code] ) )
+	if (isset($wp_header_to_desc[$code]))
 		return $wp_header_to_desc[$code];
 	else
 		return '';
@@ -1055,18 +1055,18 @@ 
  * @param int    $code        HTTP status code.
  * @param string $description Optional. A custom description for the HTTP status.
  */
-function status_header( $code, $description = '' ) {
-	if ( ! $description ) {
-		$description = get_status_header_desc( $code );
+function status_header($code, $description = '') {
+	if ( ! $description) {
+		$description = get_status_header_desc($code);
 	}
 
-	if ( empty( $description ) ) {
+	if (empty($description)) {
 		return;
 	}
 
 	$protocol = wp_get_server_protocol();
 	$status_header = "$protocol $code $description";
-	if ( function_exists( 'apply_filters' ) )
+	if (function_exists('apply_filters'))
 
 		/**
 		 * Filter an HTTP status header.
@@ -1078,9 +1078,9 @@ 
 		 * @param string $description   Description for the status code.
 		 * @param string $protocol      Server protocol.
 		 */
-		$status_header = apply_filters( 'status_header', $status_header, $code, $description, $protocol );
+		$status_header = apply_filters('status_header', $status_header, $code, $description, $protocol);
 
-	@header( $status_header, true, $code );
+	@header($status_header, true, $code);
 }
 
 /**
@@ -1100,7 +1100,7 @@ 
 		'Pragma' => 'no-cache',
 	);
 
-	if ( function_exists('apply_filters') ) {
+	if (function_exists('apply_filters')) {
 		/**
 		 * Filter the cache-controlling headers.
 		 *
@@ -1116,7 +1116,7 @@ 
 		 *     @type string $Pragma        Pragma header.
 		 * }
 		 */
-		$headers = (array) apply_filters( 'nocache_headers', $headers );
+		$headers = (array) apply_filters('nocache_headers', $headers);
 	}
 	$headers['Last-Modified'] = false;
 	return $headers;
@@ -1136,23 +1136,23 @@ 
 function nocache_headers() {
 	$headers = wp_get_nocache_headers();
 
-	unset( $headers['Last-Modified'] );
+	unset($headers['Last-Modified']);
 
 	// In PHP 5.3+, make sure we are not sending a Last-Modified header.
-	if ( function_exists( 'header_remove' ) ) {
-		@header_remove( 'Last-Modified' );
+	if (function_exists('header_remove')) {
+		@header_remove('Last-Modified');
 	} else {
 		// In PHP 5.2, send an empty Last-Modified header, but only as a
 		// last resort to override a header already sent. #WP23021
-		foreach ( headers_list() as $header ) {
-			if ( 0 === stripos( $header, 'Last-Modified' ) ) {
+		foreach (headers_list() as $header) {
+			if (0 === stripos($header, 'Last-Modified')) {
 				$headers['Last-Modified'] = '';
 				break;
 			}
 		}
 	}
 
-	foreach ( $headers as $name => $field_value )
+	foreach ($headers as $name => $field_value)
 		@header("{$name}: {$field_value}");
 }
 
@@ -1164,9 +1164,9 @@ 
 function cache_javascript_headers() {
 	$expiresOffset = 10 * DAY_IN_SECONDS;
 
-	header( "Content-Type: text/javascript; charset=" . get_bloginfo( 'charset' ) );
-	header( "Vary: Accept-Encoding" ); // Handle proxies
-	header( "Expires: " . gmdate( "D, d M Y H:i:s", time() + $expiresOffset ) . " GMT" );
+	header("Content-Type: text/javascript; charset=".get_bloginfo('charset'));
+	header("Vary: Accept-Encoding"); // Handle proxies
+	header("Expires: ".gmdate("D, d M Y H:i:s", time() + $expiresOffset)." GMT");
 }
 
 /**
@@ -1193,8 +1193,8 @@ 
  * @param string $yn Character string containing either 'y' (yes) or 'n' (no).
  * @return bool True if yes, false on anything else.
  */
-function bool_from_yn( $yn ) {
-	return ( strtolower( $yn ) == 'y' );
+function bool_from_yn($yn) {
+	return (strtolower($yn) == 'y');
 }
 
 /**
@@ -1212,16 +1212,16 @@ 
 function do_feed() {
 	global $wp_query;
 
-	$feed = get_query_var( 'feed' );
+	$feed = get_query_var('feed');
 
 	// Remove the pad, if present.
-	$feed = preg_replace( '/^_+/', '', $feed );
+	$feed = preg_replace('/^_+/', '', $feed);
 
-	if ( $feed == '' || $feed == 'feed' )
+	if ($feed == '' || $feed == 'feed')
 		$feed = get_default_feed();
 
-	if ( ! has_action( "do_feed_{$feed}" ) ) {
-		wp_die( __( 'ERROR: This is not a valid feed template.' ), '', array( 'response' => 404 ) );
+	if ( ! has_action("do_feed_{$feed}")) {
+		wp_die(__('ERROR: This is not a valid feed template.'), '', array('response' => 404));
 	}
 
 	/**
@@ -1236,7 +1236,7 @@ 
 	 * @param bool   $is_comment_feed Whether the feed is a comment feed.
 	 * @param string $feed            The feed name.
 	 */
-	do_action( "do_feed_{$feed}", $wp_query->is_comment_feed, $feed );
+	do_action("do_feed_{$feed}", $wp_query->is_comment_feed, $feed);
 }
 
 /**
@@ -1247,7 +1247,7 @@ 
  * @see load_template()
  */
 function do_feed_rdf() {
-	load_template( ABSPATH . WPINC . '/feed-rdf.php' );
+	load_template(ABSPATH.WPINC.'/feed-rdf.php');
 }
 
 /**
@@ -1258,7 +1258,7 @@ 
  * @see load_template()
  */
 function do_feed_rss() {
-	load_template( ABSPATH . WPINC . '/feed-rss.php' );
+	load_template(ABSPATH.WPINC.'/feed-rss.php');
 }
 
 /**
@@ -1270,11 +1270,11 @@ 
  *
  * @param bool $for_comments True for the comment feed, false for normal feed.
  */
-function do_feed_rss2( $for_comments ) {
-	if ( $for_comments )
-		load_template( ABSPATH . WPINC . '/feed-rss2-comments.php' );
+function do_feed_rss2($for_comments) {
+	if ($for_comments)
+		load_template(ABSPATH.WPINC.'/feed-rss2-comments.php');
 	else
-		load_template( ABSPATH . WPINC . '/feed-rss2.php' );
+		load_template(ABSPATH.WPINC.'/feed-rss2.php');
 }
 
 /**
@@ -1286,11 +1286,11 @@ 
  *
  * @param bool $for_comments True for the comment feed, false for normal feed.
  */
-function do_feed_atom( $for_comments ) {
+function do_feed_atom($for_comments) {
 	if ($for_comments)
-		load_template( ABSPATH . WPINC . '/feed-atom-comments.php');
+		load_template(ABSPATH.WPINC.'/feed-atom-comments.php');
 	else
-		load_template( ABSPATH . WPINC . '/feed-atom.php' );
+		load_template(ABSPATH.WPINC.'/feed-atom.php');
 }
 
 /**
@@ -1302,22 +1302,22 @@ 
  * @since 2.1.0
  */
 function do_robots() {
-	header( 'Content-Type: text/plain; charset=utf-8' );
+	header('Content-Type: text/plain; charset=utf-8');
 
 	/**
 	 * Fires when displaying the robots.txt file.
 	 *
 	 * @since 2.1.0
 	 */
-	do_action( 'do_robotstxt' );
+	do_action('do_robotstxt');
 
 	$output = "User-agent: *\n";
-	$public = get_option( 'blog_public' );
-	if ( '0' == $public ) {
+	$public = get_option('blog_public');
+	if ('0' == $public) {
 		$output .= "Disallow: /\n";
 	} else {
-		$site_url = parse_url( site_url() );
-		$path = ( !empty( $site_url['path'] ) ) ? $site_url['path'] : '';
+		$site_url = parse_url(site_url());
+		$path = ( ! empty($site_url['path'])) ? $site_url['path'] : '';
 		$output .= "Disallow: $path/wp-admin/\n";
 		$output .= "Allow: $path/wp-admin/admin-ajax.php\n";
 	}
@@ -1330,7 +1330,7 @@ 
 	 * @param string $output Robots.txt output.
 	 * @param bool   $public Whether the site is considered "public".
 	 */
-	echo apply_filters( 'robots_txt', $output, $public );
+	echo apply_filters('robots_txt', $output, $public);
 }
 
 /**
@@ -1355,28 +1355,28 @@ 
 	 * Check cache first. If options table goes away and we have true
 	 * cached, oh well.
 	 */
-	if ( wp_cache_get( 'is_blog_installed' ) )
+	if (wp_cache_get('is_blog_installed'))
 		return true;
 
 	$suppress = $wpdb->suppress_errors();
-	if ( ! wp_installing() ) {
+	if ( ! wp_installing()) {
 		$alloptions = wp_load_alloptions();
 	}
 	// If siteurl is not set to autoload, check it specifically
-	if ( !isset( $alloptions['siteurl'] ) )
-		$installed = $wpdb->get_var( "SELECT option_value FROM $wpdb->options WHERE option_name = 'siteurl'" );
+	if ( ! isset($alloptions['siteurl']))
+		$installed = $wpdb->get_var("SELECT option_value FROM $wpdb->options WHERE option_name = 'siteurl'");
 	else
 		$installed = $alloptions['siteurl'];
-	$wpdb->suppress_errors( $suppress );
+	$wpdb->suppress_errors($suppress);
 
-	$installed = !empty( $installed );
-	wp_cache_set( 'is_blog_installed', $installed );
+	$installed = ! empty($installed);
+	wp_cache_set('is_blog_installed', $installed);
 
-	if ( $installed )
+	if ($installed)
 		return true;
 
 	// If visiting repair.php, return true and let it take over.
-	if ( defined( 'WP_REPAIRING' ) )
+	if (defined('WP_REPAIRING'))
 		return true;
 
 	$suppress = $wpdb->suppress_errors();
@@ -1387,14 +1387,14 @@ 
 	 * options table could not be accessed.
 	 */
 	$wp_tables = $wpdb->tables();
-	foreach ( $wp_tables as $table ) {
+	foreach ($wp_tables as $table) {
 		// The existence of custom user tables shouldn't suggest an insane state or prevent a clean install.
-		if ( defined( 'CUSTOM_USER_TABLE' ) && CUSTOM_USER_TABLE == $table )
+		if (defined('CUSTOM_USER_TABLE') && CUSTOM_USER_TABLE == $table)
 			continue;
-		if ( defined( 'CUSTOM_USER_META_TABLE' ) && CUSTOM_USER_META_TABLE == $table )
+		if (defined('CUSTOM_USER_META_TABLE') && CUSTOM_USER_META_TABLE == $table)
 			continue;
 
-		if ( ! $wpdb->get_results( "DESCRIBE $table;" ) )
+		if ( ! $wpdb->get_results("DESCRIBE $table;"))
 			continue;
 
 		// One or more tables exist. We are insane.
@@ -1402,13 +1402,13 @@ 
 		wp_load_translations_early();
 
 		// Die with a DB error.
-		$wpdb->error = sprintf( __( 'One or more database tables are unavailable. The database may need to be <a href="%s">repaired</a>.' ), 'maint/repair.php?referrer=is_blog_installed' );
+		$wpdb->error = sprintf(__('One or more database tables are unavailable. The database may need to be <a href="%s">repaired</a>.'), 'maint/repair.php?referrer=is_blog_installed');
 		dead_db();
 	}
 
-	$wpdb->suppress_errors( $suppress );
+	$wpdb->suppress_errors($suppress);
 
-	wp_cache_set( 'is_blog_installed', false );
+	wp_cache_set('is_blog_installed', false);
 
 	return false;
 }
@@ -1423,9 +1423,9 @@ 
  * @param string     $name      Optional. Nonce name. Default '_wpnonce'.
  * @return string Escaped URL with nonce action added.
  */
-function wp_nonce_url( $actionurl, $action = -1, $name = '_wpnonce' ) {
-	$actionurl = str_replace( '&amp;', '&', $actionurl );
-	return esc_html( add_query_arg( $name, wp_create_nonce( $action ), $actionurl ) );
+function wp_nonce_url($actionurl, $action = -1, $name = '_wpnonce') {
+	$actionurl = str_replace('&amp;', '&', $actionurl);
+	return esc_html(add_query_arg($name, wp_create_nonce($action), $actionurl));
 }
 
 /**
@@ -1454,14 +1454,14 @@ 
  * @param bool       $echo    Optional. Whether to display or return hidden form field. Default true.
  * @return string Nonce field HTML markup.
  */
-function wp_nonce_field( $action = -1, $name = "_wpnonce", $referer = true , $echo = true ) {
-	$name = esc_attr( $name );
-	$nonce_field = '<input type="hidden" id="' . $name . '" name="' . $name . '" value="' . wp_create_nonce( $action ) . '" />';
+function wp_nonce_field($action = -1, $name = "_wpnonce", $referer = true, $echo = true) {
+	$name = esc_attr($name);
+	$nonce_field = '<input type="hidden" id="'.$name.'" name="'.$name.'" value="'.wp_create_nonce($action).'" />';
 
-	if ( $referer )
-		$nonce_field .= wp_referer_field( false );
+	if ($referer)
+		$nonce_field .= wp_referer_field(false);
 
-	if ( $echo )
+	if ($echo)
 		echo $nonce_field;
 
 	return $nonce_field;
@@ -1478,10 +1478,10 @@ 
  * @param bool $echo Optional. Whether to echo or return the referer field. Default true.
  * @return string Referer field HTML markup.
  */
-function wp_referer_field( $echo = true ) {
-	$referer_field = '<input type="hidden" name="_wp_http_referer" value="'. esc_attr( wp_unslash( $_SERVER['REQUEST_URI'] ) ) . '" />';
+function wp_referer_field($echo = true) {
+	$referer_field = '<input type="hidden" name="_wp_http_referer" value="'.esc_attr(wp_unslash($_SERVER['REQUEST_URI'])).'" />';
 
-	if ( $echo )
+	if ($echo)
 		echo $referer_field;
 	return $referer_field;
 }
@@ -1500,12 +1500,12 @@ 
  *                             Default 'current'.
  * @return string Original referer field.
  */
-function wp_original_referer_field( $echo = true, $jump_back_to = 'current' ) {
-	if ( ! $ref = wp_get_original_referer() ) {
-		$ref = 'previous' == $jump_back_to ? wp_get_referer() : wp_unslash( $_SERVER['REQUEST_URI'] );
+function wp_original_referer_field($echo = true, $jump_back_to = 'current') {
+	if ( ! $ref = wp_get_original_referer()) {
+		$ref = 'previous' == $jump_back_to ? wp_get_referer() : wp_unslash($_SERVER['REQUEST_URI']);
 	}
-	$orig_referer_field = '<input type="hidden" name="_wp_original_http_referer" value="' . esc_attr( $ref ) . '" />';
-	if ( $echo )
+	$orig_referer_field = '<input type="hidden" name="_wp_original_http_referer" value="'.esc_attr($ref).'" />';
+	if ($echo)
 		echo $orig_referer_field;
 	return $orig_referer_field;
 }
@@ -1520,14 +1520,14 @@ 
  * @return false|string False on failure. Referer URL on success.
  */
 function wp_get_referer() {
-	if ( ! function_exists( 'wp_validate_redirect' ) ) {
+	if ( ! function_exists('wp_validate_redirect')) {
 		return false;
 	}
 
 	$ref = wp_get_raw_referer();
 
-	if ( $ref && $ref !== wp_unslash( $_SERVER['REQUEST_URI'] ) && $ref !== home_url() . wp_unslash( $_SERVER['REQUEST_URI'] ) ) {
-		return wp_validate_redirect( $ref, false );
+	if ($ref && $ref !== wp_unslash($_SERVER['REQUEST_URI']) && $ref !== home_url().wp_unslash($_SERVER['REQUEST_URI'])) {
+		return wp_validate_redirect($ref, false);
 	}
 
 	return false;
@@ -1543,10 +1543,10 @@ 
  * @return string|false Referer URL on success, false on failure.
  */
 function wp_get_raw_referer() {
-	if ( ! empty( $_REQUEST['_wp_http_referer'] ) ) {
-		return wp_unslash( $_REQUEST['_wp_http_referer'] );
-	} else if ( ! empty( $_SERVER['HTTP_REFERER'] ) ) {
-		return wp_unslash( $_SERVER['HTTP_REFERER'] );
+	if ( ! empty($_REQUEST['_wp_http_referer'])) {
+		return wp_unslash($_REQUEST['_wp_http_referer']);
+	} else if ( ! empty($_SERVER['HTTP_REFERER'])) {
+		return wp_unslash($_SERVER['HTTP_REFERER']);
 	}
 
 	return false;
@@ -1560,8 +1560,8 @@ 
  * @return string|false False if no original referer or original referer if set.
  */
 function wp_get_original_referer() {
-	if ( ! empty( $_REQUEST['_wp_original_http_referer'] ) && function_exists( 'wp_validate_redirect' ) )
-		return wp_validate_redirect( wp_unslash( $_REQUEST['_wp_original_http_referer'] ), false );
+	if ( ! empty($_REQUEST['_wp_original_http_referer']) && function_exists('wp_validate_redirect'))
+		return wp_validate_redirect(wp_unslash($_REQUEST['_wp_original_http_referer']), false);
 	return false;
 }
 
@@ -1575,20 +1575,20 @@ 
  * @param string $target Full path to attempt to create.
  * @return bool Whether the path was created. True if path already exists.
  */
-function wp_mkdir_p( $target ) {
+function wp_mkdir_p($target) {
 	$wrapper = null;
 
 	// Strip the protocol.
-	if ( wp_is_stream( $target ) ) {
-		list( $wrapper, $target ) = explode( '://', $target, 2 );
+	if (wp_is_stream($target)) {
+		list($wrapper, $target) = explode('://', $target, 2);
 	}
 
 	// From php.net/mkdir user contributed notes.
-	$target = str_replace( '//', '/', $target );
+	$target = str_replace('//', '/', $target);
 
 	// Put the wrapper back on the target.
-	if ( $wrapper !== null ) {
-		$target = $wrapper . '://' . $target;
+	if ($wrapper !== null) {
+		$target = $wrapper.'://'.$target;
 	}
 
 	/*
@@ -1596,35 +1596,35 @@ 
 	 * Use rtrim() instead of untrailingslashit to avoid formatting.php dependency.
 	 */
 	$target = rtrim($target, '/');
-	if ( empty($target) )
+	if (empty($target))
 		$target = '/';
 
-	if ( file_exists( $target ) )
-		return @is_dir( $target );
+	if (file_exists($target))
+		return @is_dir($target);
 
 	// We need to find the permissions of the parent folder that exists and inherit that.
-	$target_parent = dirname( $target );
-	while ( '.' != $target_parent && ! is_dir( $target_parent ) ) {
-		$target_parent = dirname( $target_parent );
+	$target_parent = dirname($target);
+	while ('.' != $target_parent && ! is_dir($target_parent)) {
+		$target_parent = dirname($target_parent);
 	}
 
 	// Get the permission bits.
-	if ( $stat = @stat( $target_parent ) ) {
+	if ($stat = @stat($target_parent)) {
 		$dir_perms = $stat['mode'] & 0007777;
 	} else {
 		$dir_perms = 0777;
 	}
 
-	if ( @mkdir( $target, $dir_perms, true ) ) {
+	if (@mkdir($target, $dir_perms, true)) {
 
 		/*
 		 * If a umask is set that modifies $dir_perms, we'll have to re-set
 		 * the $dir_perms correctly with chmod()
 		 */
-		if ( $dir_perms != ( $dir_perms & ~umask() ) ) {
-			$folder_parts = explode( '/', substr( $target, strlen( $target_parent ) + 1 ) );
-			for ( $i = 1, $c = count( $folder_parts ); $i <= $c; $i++ ) {
-				@chmod( $target_parent . '/' . implode( '/', array_slice( $folder_parts, 0, $i ) ), $dir_perms );
+		if ($dir_perms != ($dir_perms & ~umask())) {
+			$folder_parts = explode('/', substr($target, strlen($target_parent) + 1));
+			for ($i = 1, $c = count($folder_parts); $i <= $c; $i++) {
+				@chmod($target_parent.'/'.implode('/', array_slice($folder_parts, 0, $i)), $dir_perms);
 			}
 		}
 
@@ -1644,23 +1644,23 @@ 
  * @param string $path File path.
  * @return bool True if path is absolute, false is not absolute.
  */
-function path_is_absolute( $path ) {
+function path_is_absolute($path) {
 	/*
 	 * This is definitive if true but fails if $path does not exist or contains
 	 * a symbolic link.
 	 */
-	if ( realpath($path) == $path )
+	if (realpath($path) == $path)
 		return true;
 
-	if ( strlen($path) == 0 || $path[0] == '.' )
+	if (strlen($path) == 0 || $path[0] == '.')
 		return false;
 
 	// Windows allows absolute paths like this.
-	if ( preg_match('#^[a-zA-Z]:\\\\#', $path) )
+	if (preg_match('#^[a-zA-Z]:\\\\#', $path))
 		return true;
 
 	// A path starting with / or \ is absolute; anything else is relative.
-	return ( $path[0] == '/' || $path[0] == '\\' );
+	return ($path[0] == '/' || $path[0] == '\\');
 }
 
 /**
@@ -1675,11 +1675,11 @@ 
  * @param string $path Path relative to $base.
  * @return string The path with the base or absolute path.
  */
-function path_join( $base, $path ) {
-	if ( path_is_absolute($path) )
+function path_join($base, $path) {
+	if (path_is_absolute($path))
 		return $path;
 
-	return rtrim($base, '/') . '/' . ltrim($path, '/');
+	return rtrim($base, '/').'/'.ltrim($path, '/');
 }
 
 /**
@@ -1697,11 +1697,11 @@ 
  * @param string $path Path to normalize.
  * @return string Normalized path.
  */
-function wp_normalize_path( $path ) {
-	$path = str_replace( '\\', '/', $path );
-	$path = preg_replace( '|(?<=.)/+|', '/', $path );
-	if ( ':' === substr( $path, 1, 1 ) ) {
-		$path = ucfirst( $path );
+function wp_normalize_path($path) {
+	$path = str_replace('\\', '/', $path);
+	$path = preg_replace('|(?<=.)/+|', '/', $path);
+	if (':' === substr($path, 1, 1)) {
+		$path = ucfirst($path);
 	}
 	return $path;
 }
@@ -1724,24 +1724,24 @@ 
  */
 function get_temp_dir() {
 	static $temp = '';
-	if ( defined('WP_TEMP_DIR') )
+	if (defined('WP_TEMP_DIR'))
 		return trailingslashit(WP_TEMP_DIR);
 
-	if ( $temp )
-		return trailingslashit( $temp );
+	if ($temp)
+		return trailingslashit($temp);
 
-	if ( function_exists('sys_get_temp_dir') ) {
+	if (function_exists('sys_get_temp_dir')) {
 		$temp = sys_get_temp_dir();
-		if ( @is_dir( $temp ) && wp_is_writable( $temp ) )
-			return trailingslashit( $temp );
+		if (@is_dir($temp) && wp_is_writable($temp))
+			return trailingslashit($temp);
 	}
 
 	$temp = ini_get('upload_tmp_dir');
-	if ( @is_dir( $temp ) && wp_is_writable( $temp ) )
-		return trailingslashit( $temp );
+	if (@is_dir($temp) && wp_is_writable($temp))
+		return trailingslashit($temp);
 
-	$temp = WP_CONTENT_DIR . '/';
-	if ( is_dir( $temp ) && wp_is_writable( $temp ) )
+	$temp = WP_CONTENT_DIR.'/';
+	if (is_dir($temp) && wp_is_writable($temp))
 		return $temp;
 
 	return '/tmp/';
@@ -1760,11 +1760,11 @@ 
  * @param string $path Path to check for write-ability.
  * @return bool Whether the path is writable.
  */
-function wp_is_writable( $path ) {
-	if ( 'WIN' === strtoupper( substr( PHP_OS, 0, 3 ) ) )
-		return win_is_writable( $path );
+function wp_is_writable($path) {
+	if ('WIN' === strtoupper(substr(PHP_OS, 0, 3)))
+		return win_is_writable($path);
 	else
-		return @is_writable( $path );
+		return @is_writable($path);
 }
 
 /**
@@ -1783,21 +1783,21 @@ 
  * @param string $path Windows path to check for write-ability.
  * @return bool Whether the path is writable.
  */
-function win_is_writable( $path ) {
+function win_is_writable($path) {
 
-	if ( $path[strlen( $path ) - 1] == '/' ) { // if it looks like a directory, check a random file within the directory
-		return win_is_writable( $path . uniqid( mt_rand() ) . '.tmp');
-	} elseif ( is_dir( $path ) ) { // If it's a directory (and not a file) check a random file within the directory
-		return win_is_writable( $path . '/' . uniqid( mt_rand() ) . '.tmp' );
+	if ($path[strlen($path) - 1] == '/') { // if it looks like a directory, check a random file within the directory
+		return win_is_writable($path.uniqid(mt_rand()).'.tmp');
+	} elseif (is_dir($path)) { // If it's a directory (and not a file) check a random file within the directory
+		return win_is_writable($path.'/'.uniqid(mt_rand()).'.tmp');
 	}
 	// check tmp file for read/write capabilities
-	$should_delete_tmp_file = !file_exists( $path );
-	$f = @fopen( $path, 'a' );
-	if ( $f === false )
+	$should_delete_tmp_file = ! file_exists($path);
+	$f = @fopen($path, 'a');
+	if ($f === false)
 		return false;
-	fclose( $f );
-	if ( $should_delete_tmp_file )
-		unlink( $path );
+	fclose($f);
+	if ($should_delete_tmp_file)
+		unlink($path);
 	return true;
 }
 
@@ -1815,7 +1815,7 @@ 
  * @return array See wp_upload_dir() for description.
  */
 function wp_get_upload_dir() {
-	return wp_upload_dir( null, false );
+	return wp_upload_dir(null, false);
 }
 
 /**
@@ -1853,13 +1853,13 @@ 
  * @param bool   $refresh_cache Optional. Whether to refresh the cache. Default false.
  * @return array See above for description.
  */
-function wp_upload_dir( $time = null, $create_dir = true, $refresh_cache = false ) {
+function wp_upload_dir($time = null, $create_dir = true, $refresh_cache = false) {
 	static $cache = array();
 
-	$key = sprintf( '%d-%s', get_current_blog_id(), (string) $time );
+	$key = sprintf('%d-%s', get_current_blog_id(), (string) $time);
 
-	if ( $refresh_cache || empty( $cache[ $key ] ) ) {
-		$cache[ $key ] = _wp_upload_dir( $time );
+	if ($refresh_cache || empty($cache[$key])) {
+		$cache[$key] = _wp_upload_dir($time);
 	}
 
 	/**
@@ -1870,28 +1870,28 @@ 
 	 * @param array $uploads Array of upload directory data with keys of 'path',
 	 *                       'url', 'subdir, 'basedir', and 'error'.
 	 */
-	$uploads = apply_filters( 'upload_dir', $cache[ $key ] );
+	$uploads = apply_filters('upload_dir', $cache[$key]);
 
-	if ( $create_dir ) {
+	if ($create_dir) {
 		$path = $uploads['path'];
-		$tested_paths = wp_cache_get( 'upload_dir_tested_paths' );
+		$tested_paths = wp_cache_get('upload_dir_tested_paths');
 
-		if ( ! is_array( $tested_paths ) ) {
+		if ( ! is_array($tested_paths)) {
 			$tested_paths = array();
 		}
 
-		if ( ! in_array( $path, $tested_paths, true ) ) {
-			if ( ! wp_mkdir_p( $path ) ) {
-				if ( 0 === strpos( $uploads['basedir'], ABSPATH ) ) {
-					$error_path = str_replace( ABSPATH, '', $uploads['basedir'] ) . $uploads['subdir'];
+		if ( ! in_array($path, $tested_paths, true)) {
+			if ( ! wp_mkdir_p($path)) {
+				if (0 === strpos($uploads['basedir'], ABSPATH)) {
+					$error_path = str_replace(ABSPATH, '', $uploads['basedir']).$uploads['subdir'];
 				} else {
-					$error_path = basename( $uploads['basedir'] ) . $uploads['subdir'];
+					$error_path = basename($uploads['basedir']).$uploads['subdir'];
 				}
 
-				$uploads['error'] = sprintf( __( 'Unable to create directory %s. Is its parent directory writable by the server?' ), esc_html( $error_path ) );
+				$uploads['error'] = sprintf(__('Unable to create directory %s. Is its parent directory writable by the server?'), esc_html($error_path));
 			} else {
 				$tested_paths[] = $path;
-				wp_cache_set( 'upload_dir_tested_paths', $tested_paths );
+				wp_cache_set('upload_dir_tested_paths', $tested_paths);
 			}
 		}
 	}
@@ -1907,39 +1907,39 @@ 
  * @param string $time Optional. Time formatted in 'yyyy/mm'. Default null.
  * @return array See wp_upload_dir()
  */
-function _wp_upload_dir( $time = null ) {
-	$siteurl = get_option( 'siteurl' );
-	$upload_path = trim( get_option( 'upload_path' ) );
+function _wp_upload_dir($time = null) {
+	$siteurl = get_option('siteurl');
+	$upload_path = trim(get_option('upload_path'));
 
-	if ( empty( $upload_path ) || 'wp-content/uploads' == $upload_path ) {
-		$dir = WP_CONTENT_DIR . '/uploads';
-	} elseif ( 0 !== strpos( $upload_path, ABSPATH ) ) {
+	if (empty($upload_path) || 'wp-content/uploads' == $upload_path) {
+		$dir = WP_CONTENT_DIR.'/uploads';
+	} elseif (0 !== strpos($upload_path, ABSPATH)) {
 		// $dir is absolute, $upload_path is (maybe) relative to ABSPATH
-		$dir = path_join( ABSPATH, $upload_path );
+		$dir = path_join(ABSPATH, $upload_path);
 	} else {
 		$dir = $upload_path;
 	}
 
-	if ( !$url = get_option( 'upload_url_path' ) ) {
-		if ( empty($upload_path) || ( 'wp-content/uploads' == $upload_path ) || ( $upload_path == $dir ) )
-			$url = WP_CONTENT_URL . '/uploads';
+	if ( ! $url = get_option('upload_url_path')) {
+		if (empty($upload_path) || ('wp-content/uploads' == $upload_path) || ($upload_path == $dir))
+			$url = WP_CONTENT_URL.'/uploads';
 		else
-			$url = trailingslashit( $siteurl ) . $upload_path;
+			$url = trailingslashit($siteurl).$upload_path;
 	}
 
 	/*
 	 * Honor the value of UPLOADS. This happens as long as ms-files rewriting is disabled.
 	 * We also sometimes obey UPLOADS when rewriting is enabled -- see the next block.
 	 */
-	if ( defined( 'UPLOADS' ) && ! ( is_multisite() && get_site_option( 'ms_files_rewriting' ) ) ) {
-		$dir = ABSPATH . UPLOADS;
-		$url = trailingslashit( $siteurl ) . UPLOADS;
+	if (defined('UPLOADS') && ! (is_multisite() && get_site_option('ms_files_rewriting'))) {
+		$dir = ABSPATH.UPLOADS;
+		$url = trailingslashit($siteurl).UPLOADS;
 	}
 
 	// If multisite (and if not the main site in a post-MU network)
-	if ( is_multisite() && ! ( is_main_network() && is_main_site() && defined( 'MULTISITE' ) ) ) {
+	if (is_multisite() && ! (is_main_network() && is_main_site() && defined('MULTISITE'))) {
 
-		if ( ! get_site_option( 'ms_files_rewriting' ) ) {
+		if ( ! get_site_option('ms_files_rewriting')) {
 			/*
 			 * If ms-files rewriting is disabled (networks created post-3.5), it is fairly
 			 * straightforward: Append sites/%d if we're not on the main site (for post-MU
@@ -1949,15 +1949,15 @@ 
 			 * had wp-content/uploads for the main site.)
 			 */
 
-			if ( defined( 'MULTISITE' ) )
-				$ms_dir = '/sites/' . get_current_blog_id();
+			if (defined('MULTISITE'))
+				$ms_dir = '/sites/'.get_current_blog_id();
 			else
-				$ms_dir = '/' . get_current_blog_id();
+				$ms_dir = '/'.get_current_blog_id();
 
 			$dir .= $ms_dir;
 			$url .= $ms_dir;
 
-		} elseif ( defined( 'UPLOADS' ) && ! ms_is_switched() ) {
+		} elseif (defined('UPLOADS') && ! ms_is_switched()) {
 			/*
 			 * Handle the old-form ms-files.php rewriting if the network still has that enabled.
 			 * When ms-files rewriting is enabled, then we only listen to UPLOADS when:
@@ -1972,11 +1972,11 @@ 
 			 * rewriting in multisite, the resulting URL is /files. (#WP22702 for background.)
 			 */
 
-			if ( defined( 'BLOGUPLOADDIR' ) )
-				$dir = untrailingslashit( BLOGUPLOADDIR );
+			if (defined('BLOGUPLOADDIR'))
+				$dir = untrailingslashit(BLOGUPLOADDIR);
 			else
-				$dir = ABSPATH . UPLOADS;
-			$url = trailingslashit( $siteurl ) . 'files';
+				$dir = ABSPATH.UPLOADS;
+			$url = trailingslashit($siteurl).'files';
 		}
 	}
 
@@ -1984,12 +1984,12 @@ 
 	$baseurl = $url;
 
 	$subdir = '';
-	if ( get_option( 'uploads_use_yearmonth_folders' ) ) {
+	if (get_option('uploads_use_yearmonth_folders')) {
 		// Generate the yearly and monthly dirs
-		if ( !$time )
-			$time = current_time( 'mysql' );
-		$y = substr( $time, 0, 4 );
-		$m = substr( $time, 5, 2 );
+		if ( ! $time)
+			$time = current_time('mysql');
+		$y = substr($time, 0, 4);
+		$m = substr($time, 5, 2);
 		$subdir = "/$y/$m";
 	}
 
@@ -2023,38 +2023,38 @@ 
  * @param callable $unique_filename_callback Callback. Default null.
  * @return string New filename, if given wasn't unique.
  */
-function wp_unique_filename( $dir, $filename, $unique_filename_callback = null ) {
+function wp_unique_filename($dir, $filename, $unique_filename_callback = null) {
 	// Sanitize the file name before we begin processing.
 	$filename = sanitize_file_name($filename);
 
 	// Separate the filename into a name and extension.
 	$info = pathinfo($filename);
-	$ext = !empty($info['extension']) ? '.' . $info['extension'] : '';
+	$ext = ! empty($info['extension']) ? '.'.$info['extension'] : '';
 	$name = basename($filename, $ext);
 
 	// Edge case: if file is named '.ext', treat as an empty name.
-	if ( $name === $ext )
+	if ($name === $ext)
 		$name = '';
 
 	/*
 	 * Increment the file number until we have a unique file to save in $dir.
 	 * Use callback if supplied.
 	 */
-	if ( $unique_filename_callback && is_callable( $unique_filename_callback ) ) {
-		$filename = call_user_func( $unique_filename_callback, $dir, $name, $ext );
+	if ($unique_filename_callback && is_callable($unique_filename_callback)) {
+		$filename = call_user_func($unique_filename_callback, $dir, $name, $ext);
 	} else {
 		$number = '';
 
 		// Change '.ext' to lower case.
-		if ( $ext && strtolower($ext) != $ext ) {
+		if ($ext && strtolower($ext) != $ext) {
 			$ext2 = strtolower($ext);
-			$filename2 = preg_replace( '|' . preg_quote($ext) . '$|', $ext2, $filename );
+			$filename2 = preg_replace('|'.preg_quote($ext).'$|', $ext2, $filename);
 
 			// Check for both lower and upper case extension or image sub-sizes may be overwritten.
-			while ( file_exists($dir . "/$filename") || file_exists($dir . "/$filename2") ) {
+			while (file_exists($dir."/$filename") || file_exists($dir."/$filename2")) {
 				$new_number = $number + 1;
-				$filename = str_replace( array( "-$number$ext", "$number$ext" ), "-$new_number$ext", $filename );
-				$filename2 = str_replace( array( "-$number$ext2", "$number$ext2" ), "-$new_number$ext2", $filename2 );
+				$filename = str_replace(array("-$number$ext", "$number$ext"), "-$new_number$ext", $filename);
+				$filename2 = str_replace(array("-$number$ext2", "$number$ext2"), "-$new_number$ext2", $filename2);
 				$number = $new_number;
 			}
 
@@ -2068,20 +2068,20 @@ 
 			 * @param string        $dir                      Directory path.
 			 * @param callable|null $unique_filename_callback Callback function that generates the unique file name.
 			 */
-			return apply_filters( 'wp_unique_filename', $filename2, $ext, $dir, $unique_filename_callback );
+			return apply_filters('wp_unique_filename', $filename2, $ext, $dir, $unique_filename_callback);
 		}
 
-		while ( file_exists( $dir . "/$filename" ) ) {
-			if ( '' == "$number$ext" ) {
-				$filename = "$filename-" . ++$number;
+		while (file_exists($dir."/$filename")) {
+			if ('' == "$number$ext") {
+				$filename = "$filename-".++$number;
 			} else {
-				$filename = str_replace( array( "-$number$ext", "$number$ext" ), "-" . ++$number . $ext, $filename );
+				$filename = str_replace(array("-$number$ext", "$number$ext"), "-".++$number.$ext, $filename);
 			}
 		}
 	}
 
 	/** This filter is documented in wp-includes/functions.php */
-	return apply_filters( 'wp_unique_filename', $filename, $ext, $dir, $unique_filename_callback );
+	return apply_filters('wp_unique_filename', $filename, $ext, $dir, $unique_filename_callback);
 }
 
 /**
@@ -2107,20 +2107,20 @@ 
  * @param string       $time       Optional. Time formatted in 'yyyy/mm'. Default null.
  * @return array
  */
-function wp_upload_bits( $name, $deprecated, $bits, $time = null ) {
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '2.0' );
+function wp_upload_bits($name, $deprecated, $bits, $time = null) {
+	if ( ! empty($deprecated))
+		_deprecated_argument(__FUNCTION__, '2.0');
 
-	if ( empty( $name ) )
-		return array( 'error' => __( 'Empty filename' ) );
+	if (empty($name))
+		return array('error' => __('Empty filename'));
 
-	$wp_filetype = wp_check_filetype( $name );
-	if ( ! $wp_filetype['ext'] && ! current_user_can( 'unfiltered_upload' ) )
-		return array( 'error' => __( 'Invalid file type' ) );
+	$wp_filetype = wp_check_filetype($name);
+	if ( ! $wp_filetype['ext'] && ! current_user_can('unfiltered_upload'))
+		return array('error' => __('Invalid file type'));
 
-	$upload = wp_upload_dir( $time );
+	$upload = wp_upload_dir($time);
 
-	if ( $upload['error'] !== false )
+	if ($upload['error'] !== false)
 		return $upload;
 
 	/**
@@ -2133,45 +2133,45 @@ 
 	 *
 	 * @param mixed $upload_bits_error An array of upload bits data, or a non-array error to return.
 	 */
-	$upload_bits_error = apply_filters( 'wp_upload_bits', array( 'name' => $name, 'bits' => $bits, 'time' => $time ) );
-	if ( !is_array( $upload_bits_error ) ) {
-		$upload[ 'error' ] = $upload_bits_error;
+	$upload_bits_error = apply_filters('wp_upload_bits', array('name' => $name, 'bits' => $bits, 'time' => $time));
+	if ( ! is_array($upload_bits_error)) {
+		$upload['error'] = $upload_bits_error;
 		return $upload;
 	}
 
-	$filename = wp_unique_filename( $upload['path'], $name );
+	$filename = wp_unique_filename($upload['path'], $name);
 
-	$new_file = $upload['path'] . "/$filename";
-	if ( ! wp_mkdir_p( dirname( $new_file ) ) ) {
-		if ( 0 === strpos( $upload['basedir'], ABSPATH ) )
-			$error_path = str_replace( ABSPATH, '', $upload['basedir'] ) . $upload['subdir'];
+	$new_file = $upload['path']."/$filename";
+	if ( ! wp_mkdir_p(dirname($new_file))) {
+		if (0 === strpos($upload['basedir'], ABSPATH))
+			$error_path = str_replace(ABSPATH, '', $upload['basedir']).$upload['subdir'];
 		else
-			$error_path = basename( $upload['basedir'] ) . $upload['subdir'];
+			$error_path = basename($upload['basedir']).$upload['subdir'];
 
-		$message = sprintf( __( 'Unable to create directory %s. Is its parent directory writable by the server?' ), $error_path );
-		return array( 'error' => $message );
+		$message = sprintf(__('Unable to create directory %s. Is its parent directory writable by the server?'), $error_path);
+		return array('error' => $message);
 	}
 
-	$ifp = @ fopen( $new_file, 'wb' );
-	if ( ! $ifp )
-		return array( 'error' => sprintf( __( 'Could not write file %s' ), $new_file ) );
+	$ifp = @ fopen($new_file, 'wb');
+	if ( ! $ifp)
+		return array('error' => sprintf(__('Could not write file %s'), $new_file));
 
-	@fwrite( $ifp, $bits );
-	fclose( $ifp );
+	@fwrite($ifp, $bits);
+	fclose($ifp);
 	clearstatcache();
 
 	// Set correct file permissions
-	$stat = @ stat( dirname( $new_file ) );
+	$stat = @ stat(dirname($new_file));
 	$perms = $stat['mode'] & 0007777;
 	$perms = $perms & 0000666;
-	@ chmod( $new_file, $perms );
+	@ chmod($new_file, $perms);
 	clearstatcache();
 
 	// Compute the URL
-	$url = $upload['url'] . "/$filename";
+	$url = $upload['url']."/$filename";
 
 	/** This filter is documented in wp-admin/includes/file.php */
-	return apply_filters( 'wp_handle_upload', array( 'file' => $new_file, 'url' => $url, 'type' => $wp_filetype['type'], 'error' => false ), 'sideload' );
+	return apply_filters('wp_handle_upload', array('file' => $new_file, 'url' => $url, 'type' => $wp_filetype['type'], 'error' => false), 'sideload');
 }
 
 /**
@@ -2182,8 +2182,8 @@ 
  * @param string $ext The extension to search.
  * @return string|void The file type, example: audio, video, document, spreadsheet, etc.
  */
-function wp_ext2type( $ext ) {
-	$ext = strtolower( $ext );
+function wp_ext2type($ext) {
+	$ext = strtolower($ext);
 
 	/**
 	 * Filter file type based on the extension name.
@@ -2195,20 +2195,20 @@ 
 	 * @param array $ext2type Multi-dimensional array with extensions for a default set
 	 *                        of file types.
 	 */
-	$ext2type = apply_filters( 'ext2type', array(
-		'image'       => array( 'jpg', 'jpeg', 'jpe',  'gif',  'png',  'bmp',   'tif',  'tiff', 'ico' ),
-		'audio'       => array( 'aac', 'ac3',  'aif',  'aiff', 'm3a',  'm4a',   'm4b',  'mka',  'mp1',  'mp2',  'mp3', 'ogg', 'oga', 'ram', 'wav', 'wma' ),
-		'video'       => array( '3g2',  '3gp', '3gpp', 'asf', 'avi',  'divx', 'dv',   'flv',  'm4v',   'mkv',  'mov',  'mp4',  'mpeg', 'mpg', 'mpv', 'ogm', 'ogv', 'qt',  'rm', 'vob', 'wmv' ),
-		'document'    => array( 'doc', 'docx', 'docm', 'dotm', 'odt',  'pages', 'pdf',  'xps',  'oxps', 'rtf',  'wp', 'wpd', 'psd', 'xcf' ),
-		'spreadsheet' => array( 'numbers',     'ods',  'xls',  'xlsx', 'xlsm',  'xlsb' ),
-		'interactive' => array( 'swf', 'key',  'ppt',  'pptx', 'pptm', 'pps',   'ppsx', 'ppsm', 'sldx', 'sldm', 'odp' ),
-		'text'        => array( 'asc', 'csv',  'tsv',  'txt' ),
-		'archive'     => array( 'bz2', 'cab',  'dmg',  'gz',   'rar',  'sea',   'sit',  'sqx',  'tar',  'tgz',  'zip', '7z' ),
-		'code'        => array( 'css', 'htm',  'html', 'php',  'js' ),
-	) );
-
-	foreach ( $ext2type as $type => $exts )
-		if ( in_array( $ext, $exts ) )
+	$ext2type = apply_filters('ext2type', array(
+		'image'       => array('jpg', 'jpeg', 'jpe', 'gif', 'png', 'bmp', 'tif', 'tiff', 'ico'),
+		'audio'       => array('aac', 'ac3', 'aif', 'aiff', 'm3a', 'm4a', 'm4b', 'mka', 'mp1', 'mp2', 'mp3', 'ogg', 'oga', 'ram', 'wav', 'wma'),
+		'video'       => array('3g2', '3gp', '3gpp', 'asf', 'avi', 'divx', 'dv', 'flv', 'm4v', 'mkv', 'mov', 'mp4', 'mpeg', 'mpg', 'mpv', 'ogm', 'ogv', 'qt', 'rm', 'vob', 'wmv'),
+		'document'    => array('doc', 'docx', 'docm', 'dotm', 'odt', 'pages', 'pdf', 'xps', 'oxps', 'rtf', 'wp', 'wpd', 'psd', 'xcf'),
+		'spreadsheet' => array('numbers', 'ods', 'xls', 'xlsx', 'xlsm', 'xlsb'),
+		'interactive' => array('swf', 'key', 'ppt', 'pptx', 'pptm', 'pps', 'ppsx', 'ppsm', 'sldx', 'sldm', 'odp'),
+		'text'        => array('asc', 'csv', 'tsv', 'txt'),
+		'archive'     => array('bz2', 'cab', 'dmg', 'gz', 'rar', 'sea', 'sit', 'sqx', 'tar', 'tgz', 'zip', '7z'),
+		'code'        => array('css', 'htm', 'html', 'php', 'js'),
+	));
+
+	foreach ($ext2type as $type => $exts)
+		if (in_array($ext, $exts))
 			return $type;
 }
 
@@ -2223,22 +2223,22 @@ 
  * @param array  $mimes    Optional. Key is the file extension with value as the mime type.
  * @return array Values with extension first and mime type.
  */
-function wp_check_filetype( $filename, $mimes = null ) {
-	if ( empty($mimes) )
+function wp_check_filetype($filename, $mimes = null) {
+	if (empty($mimes))
 		$mimes = get_allowed_mime_types();
 	$type = false;
 	$ext = false;
 
-	foreach ( $mimes as $ext_preg => $mime_match ) {
-		$ext_preg = '!\.(' . $ext_preg . ')$!i';
-		if ( preg_match( $ext_preg, $filename, $ext_matches ) ) {
+	foreach ($mimes as $ext_preg => $mime_match) {
+		$ext_preg = '!\.('.$ext_preg.')$!i';
+		if (preg_match($ext_preg, $filename, $ext_matches)) {
 			$type = $mime_match;
 			$ext = $ext_matches[1];
 			break;
 		}
 	}
 
-	return compact( 'ext', 'type' );
+	return compact('ext', 'type');
 }
 
 /**
@@ -2260,27 +2260,27 @@ 
  * @return array Values for the extension, MIME, and either a corrected filename or false
  *               if original $filename is valid.
  */
-function wp_check_filetype_and_ext( $file, $filename, $mimes = null ) {
+function wp_check_filetype_and_ext($file, $filename, $mimes = null) {
 	$proper_filename = false;
 
 	// Do basic extension validation and MIME mapping
-	$wp_filetype = wp_check_filetype( $filename, $mimes );
+	$wp_filetype = wp_check_filetype($filename, $mimes);
 	$ext = $wp_filetype['ext'];
 	$type = $wp_filetype['type'];
 
 	// We can't do any further validation without a file to work with
-	if ( ! file_exists( $file ) ) {
-		return compact( 'ext', 'type', 'proper_filename' );
+	if ( ! file_exists($file)) {
+		return compact('ext', 'type', 'proper_filename');
 	}
 
 	// We're able to validate images using GD
-	if ( $type && 0 === strpos( $type, 'image/' ) && function_exists('getimagesize') ) {
+	if ($type && 0 === strpos($type, 'image/') && function_exists('getimagesize')) {
 
 		// Attempt to figure out what type of image it actually is
-		$imgstats = @getimagesize( $file );
+		$imgstats = @getimagesize($file);
 
 		// If getimagesize() knows what kind of image it really is and if the real MIME doesn't match the claimed MIME
-		if ( !empty($imgstats['mime']) && $imgstats['mime'] != $type ) {
+		if ( ! empty($imgstats['mime']) && $imgstats['mime'] != $type) {
 			/**
 			 * Filter the list mapping image mime types to their respective extensions.
 			 *
@@ -2288,26 +2288,26 @@ 
 			 *
 			 * @param  array $mime_to_ext Array of image mime types and their matching extensions.
 			 */
-			$mime_to_ext = apply_filters( 'getimagesize_mimes_to_exts', array(
+			$mime_to_ext = apply_filters('getimagesize_mimes_to_exts', array(
 				'image/jpeg' => 'jpg',
 				'image/png'  => 'png',
 				'image/gif'  => 'gif',
 				'image/bmp'  => 'bmp',
 				'image/tiff' => 'tif',
-			) );
+			));
 
 			// Replace whatever is after the last period in the filename with the correct extension
-			if ( ! empty( $mime_to_ext[ $imgstats['mime'] ] ) ) {
-				$filename_parts = explode( '.', $filename );
-				array_pop( $filename_parts );
-				$filename_parts[] = $mime_to_ext[ $imgstats['mime'] ];
-				$new_filename = implode( '.', $filename_parts );
+			if ( ! empty($mime_to_ext[$imgstats['mime']])) {
+				$filename_parts = explode('.', $filename);
+				array_pop($filename_parts);
+				$filename_parts[] = $mime_to_ext[$imgstats['mime']];
+				$new_filename = implode('.', $filename_parts);
 
-				if ( $new_filename != $filename ) {
+				if ($new_filename != $filename) {
 					$proper_filename = $new_filename; // Mark that it changed
 				}
 				// Redefine the extension / MIME
-				$wp_filetype = wp_check_filetype( $new_filename, $mimes );
+				$wp_filetype = wp_check_filetype($new_filename, $mimes);
 				$ext = $wp_filetype['ext'];
 				$type = $wp_filetype['type'];
 			}
@@ -2326,7 +2326,7 @@ 
 	 *                                          $file being in a tmp directory).
 	 * @param array  $mimes                     Key is the file extension with value as the mime type.
 	 */
-	return apply_filters( 'wp_check_filetype_and_ext', compact( 'ext', 'type', 'proper_filename' ), $file, $filename, $mimes );
+	return apply_filters('wp_check_filetype_and_ext', compact('ext', 'type', 'proper_filename'), $file, $filename, $mimes);
 }
 
 /**
@@ -2349,7 +2349,7 @@ 
 	 * @param array $wp_get_mime_types Mime types keyed by the file extension regex
 	 *                                 corresponding to those types.
 	 */
-	return apply_filters( 'mime_types', array(
+	return apply_filters('mime_types', array(
 	// Image formats.
 	'jpg|jpeg|jpe' => 'image/jpeg',
 	'gif' => 'image/gif',
@@ -2449,7 +2449,7 @@ 
 	'key' => 'application/vnd.apple.keynote',
 	'numbers' => 'application/vnd.apple.numbers',
 	'pages' => 'application/vnd.apple.pages',
-	) );
+	));
 }
 /**
  * Retrieve list of allowed mime types and file extensions.
@@ -2460,15 +2460,15 @@ 
  * @return array Array of mime types keyed by the file extension regex corresponding
  *               to those types.
  */
-function get_allowed_mime_types( $user = null ) {
+function get_allowed_mime_types($user = null) {
 	$t = wp_get_mime_types();
 
-	unset( $t['swf'], $t['exe'] );
-	if ( function_exists( 'current_user_can' ) )
-		$unfiltered = $user ? user_can( $user, 'unfiltered_html' ) : current_user_can( 'unfiltered_html' );
+	unset($t['swf'], $t['exe']);
+	if (function_exists('current_user_can'))
+		$unfiltered = $user ? user_can($user, 'unfiltered_html') : current_user_can('unfiltered_html');
 
-	if ( empty( $unfiltered ) )
-		unset( $t['htm|html'] );
+	if (empty($unfiltered))
+		unset($t['htm|html']);
 
 	/**
 	 * Filter list of allowed mime types and file extensions.
@@ -2480,7 +2480,7 @@ 
 	 *                               removed depending on '$user' capabilities.
 	 * @param int|WP_User|null $user User ID, User object or null if not provided (indicates current user).
 	 */
-	return apply_filters( 'upload_mimes', $t, $user );
+	return apply_filters('upload_mimes', $t, $user);
 }
 
 /**
@@ -2493,18 +2493,18 @@ 
  *
  * @param string $action The nonce action.
  */
-function wp_nonce_ays( $action ) {
-	if ( 'log-out' == $action ) {
-		$html = sprintf( __( 'You are attempting to log out of %s' ), get_bloginfo( 'name' ) ) . '</p><p>';
-		$redirect_to = isset( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : '';
-		$html .= sprintf( __( "Do you really want to <a href='%s'>log out</a>?"), wp_logout_url( $redirect_to ) );
+function wp_nonce_ays($action) {
+	if ('log-out' == $action) {
+		$html = sprintf(__('You are attempting to log out of %s'), get_bloginfo('name')).'</p><p>';
+		$redirect_to = isset($_REQUEST['redirect_to']) ? $_REQUEST['redirect_to'] : '';
+		$html .= sprintf(__("Do you really want to <a href='%s'>log out</a>?"), wp_logout_url($redirect_to));
 	} else {
-		$html = __( 'Are you sure you want to do this?' );
-		if ( wp_get_referer() )
-			$html .= "</p><p><a href='" . esc_url( remove_query_arg( 'updated', wp_get_referer() ) ) . "'>" . __( 'Please try again.' ) . "</a>";
+		$html = __('Are you sure you want to do this?');
+		if (wp_get_referer())
+			$html .= "</p><p><a href='".esc_url(remove_query_arg('updated', wp_get_referer()))."'>".__('Please try again.')."</a>";
 	}
 
-	wp_die( $html, __( 'WordPress Failure Notice' ), 403 );
+	wp_die($html, __('WordPress Failure Notice'), 403);
 }
 
 /**
@@ -2540,16 +2540,16 @@ 
  *                                  Default is the value of {@see is_rtl()}.
  * }
  */
-function wp_die( $message = '', $title = '', $args = array() ) {
+function wp_die($message = '', $title = '', $args = array()) {
 
-	if ( is_int( $args ) ) {
-		$args = array( 'response' => $args );
-	} elseif ( is_int( $title ) ) {
-		$args  = array( 'response' => $title );
+	if (is_int($args)) {
+		$args = array('response' => $args);
+	} elseif (is_int($title)) {
+		$args  = array('response' => $title);
 		$title = '';
 	}
 
-	if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) {
+	if (defined('DOING_AJAX') && DOING_AJAX) {
 		/**
 		 * Filter callback for killing WordPress execution for AJAX requests.
 		 *
@@ -2557,8 +2557,8 @@ 
 		 *
 		 * @param callable $function Callback function name.
 		 */
-		$function = apply_filters( 'wp_die_ajax_handler', '_ajax_wp_die_handler' );
-	} elseif ( defined( 'XMLRPC_REQUEST' ) && XMLRPC_REQUEST ) {
+		$function = apply_filters('wp_die_ajax_handler', '_ajax_wp_die_handler');
+	} elseif (defined('XMLRPC_REQUEST') && XMLRPC_REQUEST) {
 		/**
 		 * Filter callback for killing WordPress execution for XML-RPC requests.
 		 *
@@ -2566,7 +2566,7 @@ 
 		 *
 		 * @param callable $function Callback function name.
 		 */
-		$function = apply_filters( 'wp_die_xmlrpc_handler', '_xmlrpc_wp_die_handler' );
+		$function = apply_filters('wp_die_xmlrpc_handler', '_xmlrpc_wp_die_handler');
 	} else {
 		/**
 		 * Filter callback for killing WordPress execution for all non-AJAX, non-XML-RPC requests.
@@ -2575,10 +2575,10 @@ 
 		 *
 		 * @param callable $function Callback function name.
 		 */
-		$function = apply_filters( 'wp_die_handler', '_default_wp_die_handler' );
+		$function = apply_filters('wp_die_handler', '_default_wp_die_handler');
 	}
 
-	call_user_func( $function, $message, $title, $args );
+	call_user_func($function, $message, $title, $args);
 }
 
 /**
@@ -2594,20 +2594,20 @@ 
  * @param string       $title   Optional. Error title. Default empty.
  * @param string|array $args    Optional. Arguments to control behavior. Default empty array.
  */
-function _default_wp_die_handler( $message, $title = '', $args = array() ) {
-	$defaults = array( 'response' => 500 );
+function _default_wp_die_handler($message, $title = '', $args = array()) {
+	$defaults = array('response' => 500);
 	$r = wp_parse_args($args, $defaults);
 
 	$have_gettext = function_exists('__');
 
-	if ( function_exists( 'is_wp_error' ) && is_wp_error( $message ) ) {
-		if ( empty( $title ) ) {
+	if (function_exists('is_wp_error') && is_wp_error($message)) {
+		if (empty($title)) {
 			$error_data = $message->get_error_data();
-			if ( is_array( $error_data ) && isset( $error_data['title'] ) )
+			if (is_array($error_data) && isset($error_data['title']))
 				$title = $error_data['title'];
 		}
 		$errors = $message->get_error_messages();
-		switch ( count( $errors ) ) {
+		switch (count($errors)) {
 		case 0 :
 			$message = '';
 			break;
@@ -2615,38 +2615,38 @@ 
 			$message = "<p>{$errors[0]}</p>";
 			break;
 		default :
-			$message = "<ul>\n\t\t<li>" . join( "</li>\n\t\t<li>", $errors ) . "</li>\n\t</ul>";
+			$message = "<ul>\n\t\t<li>".join("</li>\n\t\t<li>", $errors)."</li>\n\t</ul>";
 			break;
 		}
-	} elseif ( is_string( $message ) ) {
+	} elseif (is_string($message)) {
 		$message = "<p>$message</p>";
 	}
 
-	if ( isset( $r['back_link'] ) && $r['back_link'] ) {
-		$back_text = $have_gettext? __('&laquo; Back') : '&laquo; Back';
+	if (isset($r['back_link']) && $r['back_link']) {
+		$back_text = $have_gettext ? __('&laquo; Back') : '&laquo; Back';
 		$message .= "\n<p><a href='javascript:history.back()'>$back_text</a></p>";
 	}
 
-	if ( ! did_action( 'admin_head' ) ) :
-		if ( !headers_sent() ) {
-			status_header( $r['response'] );
+	if ( ! did_action('admin_head')) :
+		if ( ! headers_sent()) {
+			status_header($r['response']);
 			nocache_headers();
-			header( 'Content-Type: text/html; charset=utf-8' );
+			header('Content-Type: text/html; charset=utf-8');
 		}
 
-		if ( empty($title) )
+		if (empty($title))
 			$title = $have_gettext ? __('WordPress &rsaquo; Error') : 'WordPress &rsaquo; Error';
 
 		$text_direction = 'ltr';
-		if ( isset($r['text_direction']) && 'rtl' == $r['text_direction'] )
+		if (isset($r['text_direction']) && 'rtl' == $r['text_direction'])
 			$text_direction = 'rtl';
-		elseif ( function_exists( 'is_rtl' ) && is_rtl() )
+		elseif (function_exists('is_rtl') && is_rtl())
 			$text_direction = 'rtl';
 ?>
 <!DOCTYPE html>
 <!-- Ticket #11289, IE bug fix: always pad the error page with enough characters such that it is greater than 512 bytes, even after gzip compression abcdefghijklmnopqrstuvwxyz1234567890aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz11223344556677889900abacbcbdcdcededfefegfgfhghgihihjijikjkjlklkmlmlnmnmononpopoqpqprqrqsrsrtstsubcbcdcdedefefgfabcadefbghicjkldmnoepqrfstugvwxhyz1i234j567k890laabmbccnddeoeffpgghqhiirjjksklltmmnunoovppqwqrrxsstytuuzvvw0wxx1yyz2z113223434455666777889890091abc2def3ghi4jkl5mno6pqr7stu8vwx9yz11aab2bcc3dd4ee5ff6gg7hh8ii9j0jk1kl2lmm3nnoo4p5pq6qrr7ss8tt9uuvv0wwx1x2yyzz13aba4cbcb5dcdc6dedfef8egf9gfh0ghg1ihi2hji3jik4jkj5lkl6kml7mln8mnm9ono
 -->
-<html xmlns="http://www.w3.org/1999/xhtml" <?php if ( function_exists( 'language_attributes' ) && function_exists( 'is_rtl' ) ) language_attributes(); else echo "dir='$text_direction'"; ?>>
+<html xmlns="http://www.w3.org/1999/xhtml" <?php if (function_exists('language_attributes') && function_exists('is_rtl')) language_attributes(); else echo "dir='$text_direction'"; ?>>
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<meta name="viewport" content="width=device-width">
@@ -2762,7 +2762,7 @@ 
 		}
 
 		<?php
-		if ( 'rtl' == $text_direction ) {
+		if ('rtl' == $text_direction) {
 			echo 'body { font-family: Tahoma, Arial; }';
 		}
 		?>
@@ -2791,15 +2791,15 @@ 
  * @param string       $title   Optional. Error title. Default empty.
  * @param string|array $args    Optional. Arguments to control behavior. Default empty array.
  */
-function _xmlrpc_wp_die_handler( $message, $title = '', $args = array() ) {
+function _xmlrpc_wp_die_handler($message, $title = '', $args = array()) {
 	global $wp_xmlrpc_server;
-	$defaults = array( 'response' => 500 );
+	$defaults = array('response' => 500);
 
 	$r = wp_parse_args($args, $defaults);
 
-	if ( $wp_xmlrpc_server ) {
-		$error = new IXR_Error( $r['response'] , $message);
-		$wp_xmlrpc_server->output( $error->getXml() );
+	if ($wp_xmlrpc_server) {
+		$error = new IXR_Error($r['response'], $message);
+		$wp_xmlrpc_server->output($error->getXml());
 	}
 	die();
 }
@@ -2814,10 +2814,10 @@ 
  *
  * @param string $message Optional. Response to print. Default empty.
  */
-function _ajax_wp_die_handler( $message = '' ) {
-	if ( is_scalar( $message ) )
-		die( (string) $message );
-	die( '0' );
+function _ajax_wp_die_handler($message = '') {
+	if (is_scalar($message))
+		die((string) $message);
+	die('0');
 }
 
 /**
@@ -2830,9 +2830,9 @@ 
  *
  * @param string $message Optional. Response to print. Default empty.
  */
-function _scalar_wp_die_handler( $message = '' ) {
-	if ( is_scalar( $message ) )
-		die( (string) $message );
+function _scalar_wp_die_handler($message = '') {
+	if (is_scalar($message))
+		die((string) $message);
 	die();
 }
 
@@ -2847,39 +2847,39 @@ 
  *                       greater than 0. Default 512.
  * @return string|false The JSON encoded string, or false if it cannot be encoded.
  */
-function wp_json_encode( $data, $options = 0, $depth = 512 ) {
+function wp_json_encode($data, $options = 0, $depth = 512) {
 	/*
 	 * json_encode() has had extra params added over the years.
 	 * $options was added in 5.3, and $depth in 5.5.
 	 * We need to make sure we call it with the correct arguments.
 	 */
-	if ( version_compare( PHP_VERSION, '5.5', '>=' ) ) {
-		$args = array( $data, $options, $depth );
-	} elseif ( version_compare( PHP_VERSION, '5.3', '>=' ) ) {
-		$args = array( $data, $options );
+	if (version_compare(PHP_VERSION, '5.5', '>=')) {
+		$args = array($data, $options, $depth);
+	} elseif (version_compare(PHP_VERSION, '5.3', '>=')) {
+		$args = array($data, $options);
 	} else {
-		$args = array( $data );
+		$args = array($data);
 	}
 
 	// Prepare the data for JSON serialization.
-	$data = _wp_json_prepare_data( $data );
+	$data = _wp_json_prepare_data($data);
 
-	$json = @call_user_func_array( 'json_encode', $args );
+	$json = @call_user_func_array('json_encode', $args);
 
 	// If json_encode() was successful, no need to do more sanity checking.
 	// ... unless we're in an old version of PHP, and json_encode() returned
 	// a string containing 'null'. Then we need to do more sanity checking.
-	if ( false !== $json && ( version_compare( PHP_VERSION, '5.5', '>=' ) || false === strpos( $json, 'null' ) ) )  {
+	if (false !== $json && (version_compare(PHP_VERSION, '5.5', '>=') || false === strpos($json, 'null'))) {
 		return $json;
 	}
 
 	try {
-		$args[0] = _wp_json_sanity_check( $data, $depth );
-	} catch ( Exception $e ) {
+		$args[0] = _wp_json_sanity_check($data, $depth);
+	} catch (Exception $e) {
 		return false;
 	}
 
-	return call_user_func_array( 'json_encode', $args );
+	return call_user_func_array('json_encode', $args);
 }
 
 /**
@@ -2895,49 +2895,49 @@ 
  * @param int   $depth Maximum depth to walk through $data. Must be greater than 0.
  * @return mixed The sanitized data that shall be encoded to JSON.
  */
-function _wp_json_sanity_check( $data, $depth ) {
-	if ( $depth < 0 ) {
-		throw new Exception( 'Reached depth limit' );
+function _wp_json_sanity_check($data, $depth) {
+	if ($depth < 0) {
+		throw new Exception('Reached depth limit');
 	}
 
-	if ( is_array( $data ) ) {
+	if (is_array($data)) {
 		$output = array();
-		foreach ( $data as $id => $el ) {
+		foreach ($data as $id => $el) {
 			// Don't forget to sanitize the ID!
-			if ( is_string( $id ) ) {
-				$clean_id = _wp_json_convert_string( $id );
+			if (is_string($id)) {
+				$clean_id = _wp_json_convert_string($id);
 			} else {
 				$clean_id = $id;
 			}
 
 			// Check the element type, so that we're only recursing if we really have to.
-			if ( is_array( $el ) || is_object( $el ) ) {
-				$output[ $clean_id ] = _wp_json_sanity_check( $el, $depth - 1 );
-			} elseif ( is_string( $el ) ) {
-				$output[ $clean_id ] = _wp_json_convert_string( $el );
+			if (is_array($el) || is_object($el)) {
+				$output[$clean_id] = _wp_json_sanity_check($el, $depth - 1);
+			} elseif (is_string($el)) {
+				$output[$clean_id] = _wp_json_convert_string($el);
 			} else {
-				$output[ $clean_id ] = $el;
+				$output[$clean_id] = $el;
 			}
 		}
-	} elseif ( is_object( $data ) ) {
+	} elseif (is_object($data)) {
 		$output = new stdClass;
-		foreach ( $data as $id => $el ) {
-			if ( is_string( $id ) ) {
-				$clean_id = _wp_json_convert_string( $id );
+		foreach ($data as $id => $el) {
+			if (is_string($id)) {
+				$clean_id = _wp_json_convert_string($id);
 			} else {
 				$clean_id = $id;
 			}
 
-			if ( is_array( $el ) || is_object( $el ) ) {
-				$output->$clean_id = _wp_json_sanity_check( $el, $depth - 1 );
-			} elseif ( is_string( $el ) ) {
-				$output->$clean_id = _wp_json_convert_string( $el );
+			if (is_array($el) || is_object($el)) {
+				$output->$clean_id = _wp_json_sanity_check($el, $depth - 1);
+			} elseif (is_string($el)) {
+				$output->$clean_id = _wp_json_convert_string($el);
 			} else {
 				$output->$clean_id = $el;
 			}
 		}
-	} elseif ( is_string( $data ) ) {
-		return _wp_json_convert_string( $data );
+	} elseif (is_string($data)) {
+		return _wp_json_convert_string($data);
 	} else {
 		return $data;
 	}
@@ -2959,21 +2959,21 @@ 
  * @param string $string The string which is to be converted.
  * @return string The checked string.
  */
-function _wp_json_convert_string( $string ) {
+function _wp_json_convert_string($string) {
 	static $use_mb = null;
-	if ( is_null( $use_mb ) ) {
-		$use_mb = function_exists( 'mb_convert_encoding' );
+	if (is_null($use_mb)) {
+		$use_mb = function_exists('mb_convert_encoding');
 	}
 
-	if ( $use_mb ) {
-		$encoding = mb_detect_encoding( $string, mb_detect_order(), true );
-		if ( $encoding ) {
-			return mb_convert_encoding( $string, 'UTF-8', $encoding );
+	if ($use_mb) {
+		$encoding = mb_detect_encoding($string, mb_detect_order(), true);
+		if ($encoding) {
+			return mb_convert_encoding($string, 'UTF-8', $encoding);
 		} else {
-			return mb_convert_encoding( $string, 'UTF-8', 'UTF-8' );
+			return mb_convert_encoding($string, 'UTF-8', 'UTF-8');
 		}
 	} else {
-		return wp_check_invalid_utf8( $string, true );
+		return wp_check_invalid_utf8($string, true);
 	}
 }
 
@@ -2989,12 +2989,12 @@ 
  * @param mixed $data Native representation.
  * @return bool|int|float|null|string|array Data ready for `json_encode()`.
  */
-function _wp_json_prepare_data( $data ) {
-	if ( ! defined( 'WP_JSON_SERIALIZE_COMPATIBLE' ) || WP_JSON_SERIALIZE_COMPATIBLE === false ) {
+function _wp_json_prepare_data($data) {
+	if ( ! defined('WP_JSON_SERIALIZE_COMPATIBLE') || WP_JSON_SERIALIZE_COMPATIBLE === false) {
 		return $data;
 	}
 
-	switch ( gettype( $data ) ) {
+	switch (gettype($data)) {
 		case 'boolean':
 		case 'integer':
 		case 'double':
@@ -3005,22 +3005,22 @@ 
 
 		case 'array':
 			// Arrays must be mapped in case they also return objects.
-			return array_map( '_wp_json_prepare_data', $data );
+			return array_map('_wp_json_prepare_data', $data);
 
 		case 'object':
 			// If this is an incomplete object (__PHP_Incomplete_Class), bail.
-			if ( ! is_object( $data ) ) {
+			if ( ! is_object($data)) {
 				return null;
 			}
 
-			if ( $data instanceof JsonSerializable ) {
+			if ($data instanceof JsonSerializable) {
 				$data = $data->jsonSerialize();
 			} else {
-				$data = get_object_vars( $data );
+				$data = get_object_vars($data);
 			}
 
 			// Now, pass the array (or whatever was returned from jsonSerialize through).
-			return _wp_json_prepare_data( $data );
+			return _wp_json_prepare_data($data);
 
 		default:
 			return null;
@@ -3035,10 +3035,10 @@ 
  * @param mixed $response Variable (usually an array or object) to encode as JSON,
  *                        then print and die.
  */
-function wp_send_json( $response ) {
-	@header( 'Content-Type: application/json; charset=' . get_option( 'blog_charset' ) );
-	echo wp_json_encode( $response );
-	if ( defined( 'DOING_AJAX' ) && DOING_AJAX )
+function wp_send_json($response) {
+	@header('Content-Type: application/json; charset='.get_option('blog_charset'));
+	echo wp_json_encode($response);
+	if (defined('DOING_AJAX') && DOING_AJAX)
 		wp_die();
 	else
 		die;
@@ -3051,13 +3051,13 @@ 
  *
  * @param mixed $data Data to encode as JSON, then print and die.
  */
-function wp_send_json_success( $data = null ) {
-	$response = array( 'success' => true );
+function wp_send_json_success($data = null) {
+	$response = array('success' => true);
 
-	if ( isset( $data ) )
+	if (isset($data))
 		$response['data'] = $data;
 
-	wp_send_json( $response );
+	wp_send_json($response);
 }
 
 /**
@@ -3074,15 +3074,15 @@ 
  *
  * @param mixed $data Data to encode as JSON, then print and die.
  */
-function wp_send_json_error( $data = null ) {
-	$response = array( 'success' => false );
+function wp_send_json_error($data = null) {
+	$response = array('success' => false);
 
-	if ( isset( $data ) ) {
-		if ( is_wp_error( $data ) ) {
+	if (isset($data)) {
+		if (is_wp_error($data)) {
 			$result = array();
-			foreach ( $data->errors as $code => $messages ) {
-				foreach ( $messages as $message ) {
-					$result[] = array( 'code' => $code, 'message' => $message );
+			foreach ($data->errors as $code => $messages) {
+				foreach ($messages as $message) {
+					$result[] = array('code' => $code, 'message' => $message);
 				}
 			}
 
@@ -3092,7 +3092,7 @@ 
 		}
 	}
 
-	wp_send_json( $response );
+	wp_send_json($response);
 }
 
 /**
@@ -3110,9 +3110,9 @@ 
  * @param string $url URL for the home location.
  * @return string Homepage location.
  */
-function _config_wp_home( $url = '' ) {
-	if ( defined( 'WP_HOME' ) )
-		return untrailingslashit( WP_HOME );
+function _config_wp_home($url = '') {
+	if (defined('WP_HOME'))
+		return untrailingslashit(WP_HOME);
 	return $url;
 }
 
@@ -3131,9 +3131,9 @@ 
  * @param string $url URL to set the WordPress site location.
  * @return string The WordPress Site URL.
  */
-function _config_wp_siteurl( $url = '' ) {
-	if ( defined( 'WP_SITEURL' ) )
-		return untrailingslashit( WP_SITEURL );
+function _config_wp_siteurl($url = '') {
+	if (defined('WP_SITEURL'))
+		return untrailingslashit(WP_SITEURL);
 	return $url;
 }
 
@@ -3154,15 +3154,15 @@ 
  * @param array $input MCE settings array.
  * @return array Direction set for 'rtl', if needed by locale.
  */
-function _mce_set_direction( $input ) {
-	if ( is_rtl() ) {
+function _mce_set_direction($input) {
+	if (is_rtl()) {
 		$input['directionality'] = 'rtl';
 
-		if ( ! empty( $input['plugins'] ) && strpos( $input['plugins'], 'directionality' ) === false ) {
+		if ( ! empty($input['plugins']) && strpos($input['plugins'], 'directionality') === false) {
 			$input['plugins'] .= ',directionality';
 		}
 
-		if ( ! empty( $input['toolbar1'] ) && ! preg_match( '/\bltr\b/', $input['toolbar1'] ) ) {
+		if ( ! empty($input['toolbar1']) && ! preg_match('/\bltr\b/', $input['toolbar1'])) {
 			$input['toolbar1'] .= ',ltr';
 		}
 	}
@@ -3197,10 +3197,10 @@ 
 	global $wpsmiliestrans, $wp_smiliessearch;
 
 	// don't bother setting up smilies if they are disabled
-	if ( !get_option( 'use_smilies' ) )
+	if ( ! get_option('use_smilies'))
 		return;
 
-	if ( !isset( $wpsmiliestrans ) ) {
+	if ( ! isset($wpsmiliestrans)) {
 		$wpsmiliestrans = array(
 		':mrgreen:' => 'mrgreen.png',
 		':neutral:' => "\xf0\x9f\x98\x90",
@@ -3264,28 +3264,28 @@ 
 	$spaces = wp_spaces_regexp();
 
 	// Begin first "subpattern"
-	$wp_smiliessearch = '/(?<=' . $spaces . '|^)';
+	$wp_smiliessearch = '/(?<='.$spaces.'|^)';
 
 	$subchar = '';
-	foreach ( (array) $wpsmiliestrans as $smiley => $img ) {
+	foreach ((array) $wpsmiliestrans as $smiley => $img) {
 		$firstchar = substr($smiley, 0, 1);
 		$rest = substr($smiley, 1);
 
 		// new subpattern?
 		if ($firstchar != $subchar) {
 			if ($subchar != '') {
-				$wp_smiliessearch .= ')(?=' . $spaces . '|$)';  // End previous "subpattern"
-				$wp_smiliessearch .= '|(?<=' . $spaces . '|^)'; // Begin another "subpattern"
+				$wp_smiliessearch .= ')(?='.$spaces.'|$)'; // End previous "subpattern"
+				$wp_smiliessearch .= '|(?<='.$spaces.'|^)'; // Begin another "subpattern"
 			}
 			$subchar = $firstchar;
-			$wp_smiliessearch .= preg_quote($firstchar, '/') . '(?:';
+			$wp_smiliessearch .= preg_quote($firstchar, '/').'(?:';
 		} else {
 			$wp_smiliessearch .= '|';
 		}
 		$wp_smiliessearch .= preg_quote($rest, '/');
 	}
 
-	$wp_smiliessearch .= ')(?=' . $spaces . '|$)/m';
+	$wp_smiliessearch .= ')(?='.$spaces.'|$)/m';
 
 }
 
@@ -3301,16 +3301,16 @@ 
  * @param array        $defaults Optional. Array that serves as the defaults. Default empty.
  * @return array Merged user defined values with defaults.
  */
-function wp_parse_args( $args, $defaults = '' ) {
-	if ( is_object( $args ) )
-		$r = get_object_vars( $args );
-	elseif ( is_array( $args ) )
-		$r =& $args;
+function wp_parse_args($args, $defaults = '') {
+	if (is_object($args))
+		$r = get_object_vars($args);
+	elseif (is_array($args))
+		$r = & $args;
 	else
-		wp_parse_str( $args, $r );
+		wp_parse_str($args, $r);
 
-	if ( is_array( $defaults ) )
-		return array_merge( $defaults, $r );
+	if (is_array($defaults))
+		return array_merge($defaults, $r);
 	return $r;
 }
 
@@ -3322,8 +3322,8 @@ 
  * @param array|string $list List of ids.
  * @return array Sanitized array of IDs.
  */
-function wp_parse_id_list( $list ) {
-	if ( !is_array($list) )
+function wp_parse_id_list($list) {
+	if ( ! is_array($list))
 		$list = preg_split('/[\s,]+/', $list);
 
 	return array_unique(array_map('absint', $list));
@@ -3338,11 +3338,11 @@ 
  * @param array $keys  The list of keys.
  * @return array The array slice.
  */
-function wp_array_slice_assoc( $array, $keys ) {
+function wp_array_slice_assoc($array, $keys) {
 	$slice = array();
-	foreach ( $keys as $key )
-		if ( isset( $array[ $key ] ) )
-			$slice[ $key ] = $array[ $key ];
+	foreach ($keys as $key)
+		if (isset($array[$key]))
+			$slice[$key] = $array[$key];
 
 	return $slice;
 }
@@ -3355,14 +3355,14 @@ 
  * @param mixed $data Variable to check.
  * @return bool Whether the variable is a list.
  */
-function wp_is_numeric_array( $data ) {
-	if ( ! is_array( $data ) ) {
+function wp_is_numeric_array($data) {
+	if ( ! is_array($data)) {
 		return false;
 	}
 
-	$keys = array_keys( $data );
-	$string_keys = array_filter( $keys, 'is_string' );
-	return count( $string_keys ) === 0;
+	$keys = array_keys($data);
+	$string_keys = array_filter($keys, 'is_string');
+	return count($string_keys) === 0;
 }
 
 /**
@@ -3381,14 +3381,14 @@ 
  *                              Default false.
  * @return array A list of objects or object fields.
  */
-function wp_filter_object_list( $list, $args = array(), $operator = 'and', $field = false ) {
-	if ( ! is_array( $list ) )
+function wp_filter_object_list($list, $args = array(), $operator = 'and', $field = false) {
+	if ( ! is_array($list))
 		return array();
 
-	$list = wp_list_filter( $list, $args, $operator );
+	$list = wp_list_filter($list, $args, $operator);
 
-	if ( $field )
-		$list = wp_list_pluck( $list, $field );
+	if ($field)
+		$list = wp_list_pluck($list, $field);
 
 	return $list;
 }
@@ -3407,29 +3407,29 @@ 
  *                         match. Default 'AND'.
  * @return array Array of found values.
  */
-function wp_list_filter( $list, $args = array(), $operator = 'AND' ) {
-	if ( ! is_array( $list ) )
+function wp_list_filter($list, $args = array(), $operator = 'AND') {
+	if ( ! is_array($list))
 		return array();
 
-	if ( empty( $args ) )
+	if (empty($args))
 		return $list;
 
-	$operator = strtoupper( $operator );
-	$count = count( $args );
+	$operator = strtoupper($operator);
+	$count = count($args);
 	$filtered = array();
 
-	foreach ( $list as $key => $obj ) {
+	foreach ($list as $key => $obj) {
 		$to_match = (array) $obj;
 
 		$matched = 0;
-		foreach ( $args as $m_key => $m_value ) {
-			if ( array_key_exists( $m_key, $to_match ) && $m_value == $to_match[ $m_key ] )
+		foreach ($args as $m_key => $m_value) {
+			if (array_key_exists($m_key, $to_match) && $m_value == $to_match[$m_key])
 				$matched++;
 		}
 
-		if ( ( 'AND' == $operator && $matched == $count )
-		  || ( 'OR' == $operator && $matched > 0 )
-		  || ( 'NOT' == $operator && 0 == $matched ) ) {
+		if (('AND' == $operator && $matched == $count)
+		  || ('OR' == $operator && $matched > 0)
+		  || ('NOT' == $operator && 0 == $matched)) {
 			$filtered[$key] = $obj;
 		}
 	}
@@ -3454,17 +3454,17 @@ 
  *               corresponding to `$index_key`. If `$index_key` is null, array keys from the original
  *               `$list` will be preserved in the results.
  */
-function wp_list_pluck( $list, $field, $index_key = null ) {
-	if ( ! $index_key ) {
+function wp_list_pluck($list, $field, $index_key = null) {
+	if ( ! $index_key) {
 		/*
 		 * This is simple. Could at some point wrap array_column()
 		 * if we knew we had an array of arrays.
 		 */
-		foreach ( $list as $key => $value ) {
-			if ( is_object( $value ) ) {
-				$list[ $key ] = $value->$field;
+		foreach ($list as $key => $value) {
+			if (is_object($value)) {
+				$list[$key] = $value->$field;
 			} else {
-				$list[ $key ] = $value[ $field ];
+				$list[$key] = $value[$field];
 			}
 		}
 		return $list;
@@ -3475,18 +3475,18 @@ 
 	 * to the end of the stack. This is how array_column() behaves.
 	 */
 	$newlist = array();
-	foreach ( $list as $value ) {
-		if ( is_object( $value ) ) {
-			if ( isset( $value->$index_key ) ) {
-				$newlist[ $value->$index_key ] = $value->$field;
+	foreach ($list as $value) {
+		if (is_object($value)) {
+			if (isset($value->$index_key)) {
+				$newlist[$value->$index_key] = $value->$field;
 			} else {
 				$newlist[] = $value->$field;
 			}
 		} else {
-			if ( isset( $value[ $index_key ] ) ) {
-				$newlist[ $value[ $index_key ] ] = $value[ $field ];
+			if (isset($value[$index_key])) {
+				$newlist[$value[$index_key]] = $value[$field];
 			} else {
-				$newlist[] = $value[ $field ];
+				$newlist[] = $value[$field];
 			}
 		}
 	}
@@ -3514,13 +3514,13 @@ 
 	 * @param bool $wp_maybe_load_widgets Whether to load the Widgets library.
 	 *                                    Default true.
 	 */
-	if ( ! apply_filters( 'load_default_widgets', true ) ) {
+	if ( ! apply_filters('load_default_widgets', true)) {
 		return;
 	}
 
-	require_once( ABSPATH . WPINC . '/default-widgets.php' );
+	require_once(ABSPATH.WPINC.'/default-widgets.php');
 
-	add_action( '_admin_menu', 'wp_widgets_add_menu' );
+	add_action('_admin_menu', 'wp_widgets_add_menu');
 }
 
 /**
@@ -3533,11 +3533,11 @@ 
 function wp_widgets_add_menu() {
 	global $submenu;
 
-	if ( ! current_theme_supports( 'widgets' ) )
+	if ( ! current_theme_supports('widgets'))
 		return;
 
-	$submenu['themes.php'][7] = array( __( 'Widgets' ), 'edit_theme_options', 'widgets.php' );
-	ksort( $submenu['themes.php'], SORT_NUMERIC );
+	$submenu['themes.php'][7] = array(__('Widgets'), 'edit_theme_options', 'widgets.php');
+	ksort($submenu['themes.php'], SORT_NUMERIC);
 }
 
 /**
@@ -3549,7 +3549,7 @@ 
  */
 function wp_ob_end_flush_all() {
 	$levels = ob_get_level();
-	for ($i=0; $i<$levels; $i++)
+	for ($i = 0; $i < $levels; $i++)
 		ob_end_flush();
 }
 
@@ -3577,29 +3577,29 @@ 
 	wp_load_translations_early();
 
 	// Load custom DB error template, if present.
-	if ( file_exists( WP_CONTENT_DIR . '/db-error.php' ) ) {
-		require_once( WP_CONTENT_DIR . '/db-error.php' );
+	if (file_exists(WP_CONTENT_DIR.'/db-error.php')) {
+		require_once(WP_CONTENT_DIR.'/db-error.php');
 		die();
 	}
 
 	// If installing or in the admin, provide the verbose message.
-	if ( wp_installing() || defined( 'WP_ADMIN' ) )
+	if (wp_installing() || defined('WP_ADMIN'))
 		wp_die($wpdb->error);
 
 	// Otherwise, be terse.
-	status_header( 500 );
+	status_header(500);
 	nocache_headers();
-	header( 'Content-Type: text/html; charset=utf-8' );
+	header('Content-Type: text/html; charset=utf-8');
 ?>
 <!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"<?php if ( is_rtl() ) echo ' dir="rtl"'; ?>>
+<html xmlns="http://www.w3.org/1999/xhtml"<?php if (is_rtl()) echo ' dir="rtl"'; ?>>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<title><?php _e( 'Database Error' ); ?></title>
+	<title><?php _e('Database Error'); ?></title>
 
 </head>
 <body>
-	<h1><?php _e( 'Error establishing a database connection' ); ?></h1>
+	<h1><?php _e('Error establishing a database connection'); ?></h1>
 </body>
 </html>
 <?php
@@ -3614,8 +3614,8 @@ 
  * @param mixed $maybeint Data you wish to have converted to a non-negative integer.
  * @return int A non-negative integer.
  */
-function absint( $maybeint ) {
-	return abs( intval( $maybeint ) );
+function absint($maybeint) {
+	return abs(intval($maybeint));
 }
 
 /**
@@ -3636,7 +3636,7 @@ 
  * @param string $version     The version of WordPress that deprecated the function.
  * @param string $replacement Optional. The function that should have been called. Default null.
  */
-function _deprecated_function( $function, $version, $replacement = null ) {
+function _deprecated_function($function, $version, $replacement = null) {
 
 	/**
 	 * Fires when a deprecated function is called.
@@ -3647,7 +3647,7 @@ 
 	 * @param string $replacement The function that should have been called.
 	 * @param string $version     The version of WordPress that deprecated the function.
 	 */
-	do_action( 'deprecated_function_run', $function, $replacement, $version );
+	do_action('deprecated_function_run', $function, $replacement, $version);
 
 	/**
 	 * Filter whether to trigger an error for deprecated functions.
@@ -3656,17 +3656,17 @@ 
 	 *
 	 * @param bool $trigger Whether to trigger the error for deprecated functions. Default true.
 	 */
-	if ( WP_DEBUG && apply_filters( 'deprecated_function_trigger_error', true ) ) {
-		if ( function_exists( '__' ) ) {
-			if ( ! is_null( $replacement ) )
-				trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.'), $function, $version, $replacement ) );
+	if (WP_DEBUG && apply_filters('deprecated_function_trigger_error', true)) {
+		if (function_exists('__')) {
+			if ( ! is_null($replacement))
+				trigger_error(sprintf(__('%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.'), $function, $version, $replacement));
 			else
-				trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.'), $function, $version ) );
+				trigger_error(sprintf(__('%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.'), $function, $version));
 		} else {
-			if ( ! is_null( $replacement ) )
-				trigger_error( sprintf( '%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.', $function, $version, $replacement ) );
+			if ( ! is_null($replacement))
+				trigger_error(sprintf('%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.', $function, $version, $replacement));
 			else
-				trigger_error( sprintf( '%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.', $function, $version ) );
+				trigger_error(sprintf('%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.', $function, $version));
 		}
 	}
 }
@@ -3691,7 +3691,7 @@ 
  * @param string $parent_class Optional. The parent class calling the deprecated constructor.
  *                             Default empty string.
  */
-function _deprecated_constructor( $class, $version, $parent_class = '' ) {
+function _deprecated_constructor($class, $version, $parent_class = '') {
 
 	/**
 	 * Fires when a deprecated constructor is called.
@@ -3703,7 +3703,7 @@ 
 	 * @param string $version      The version of WordPress that deprecated the function.
 	 * @param string $parent_class The parent class calling the deprecated constructor.
 	 */
-	do_action( 'deprecated_constructor_run', $class, $version, $parent_class );
+	do_action('deprecated_constructor_run', $class, $version, $parent_class);
 
 	/**
 	 * Filter whether to trigger an error for deprecated functions.
@@ -3714,24 +3714,24 @@ 
 	 *
 	 * @param bool $trigger Whether to trigger the error for deprecated functions. Default true.
 	 */
-	if ( WP_DEBUG && apply_filters( 'deprecated_constructor_trigger_error', true ) ) {
-		if ( function_exists( '__' ) ) {
-			if ( ! empty( $parent_class ) ) {
+	if (WP_DEBUG && apply_filters('deprecated_constructor_trigger_error', true)) {
+		if (function_exists('__')) {
+			if ( ! empty($parent_class)) {
 				/* translators: 1: PHP class name, 2: PHP parent class name, 3: version number, 4: __construct() method */
-				trigger_error( sprintf( __( 'The called constructor method for %1$s in %2$s is <strong>deprecated</strong> since version %3$s! Use %4$s instead.' ),
-					$class, $parent_class, $version, '<pre>__construct()</pre>' ) );
+				trigger_error(sprintf(__('The called constructor method for %1$s in %2$s is <strong>deprecated</strong> since version %3$s! Use %4$s instead.'),
+					$class, $parent_class, $version, '<pre>__construct()</pre>'));
 			} else {
 				/* translators: 1: PHP class name, 2: version number, 3: __construct() method */
-				trigger_error( sprintf( __( 'The called constructor method for %1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.' ),
-					$class, $version, '<pre>__construct()</pre>' ) );
+				trigger_error(sprintf(__('The called constructor method for %1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.'),
+					$class, $version, '<pre>__construct()</pre>'));
 			}
 		} else {
-			if ( ! empty( $parent_class ) ) {
-				trigger_error( sprintf( 'The called constructor method for %1$s in %2$s is <strong>deprecated</strong> since version %3$s! Use %4$s instead.',
-					$class, $parent_class, $version, '<pre>__construct()</pre>' ) );
+			if ( ! empty($parent_class)) {
+				trigger_error(sprintf('The called constructor method for %1$s in %2$s is <strong>deprecated</strong> since version %3$s! Use %4$s instead.',
+					$class, $parent_class, $version, '<pre>__construct()</pre>'));
 			} else {
-				trigger_error( sprintf( 'The called constructor method for %1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.',
-					$class, $version, '<pre>__construct()</pre>' ) );
+				trigger_error(sprintf('The called constructor method for %1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.',
+					$class, $version, '<pre>__construct()</pre>'));
 			}
 		}
 	}
@@ -3758,7 +3758,7 @@ 
  *                            Default null.
  * @param string $message     Optional. A message regarding the change. Default empty.
  */
-function _deprecated_file( $file, $version, $replacement = null, $message = '' ) {
+function _deprecated_file($file, $version, $replacement = null, $message = '') {
 
 	/**
 	 * Fires when a deprecated file is called.
@@ -3770,7 +3770,7 @@ 
 	 * @param string $version     The version of WordPress that deprecated the file.
 	 * @param string $message     A message regarding the change.
 	 */
-	do_action( 'deprecated_file_included', $file, $replacement, $version, $message );
+	do_action('deprecated_file_included', $file, $replacement, $version, $message);
 
 	/**
 	 * Filter whether to trigger an error for deprecated files.
@@ -3779,18 +3779,18 @@ 
 	 *
 	 * @param bool $trigger Whether to trigger the error for deprecated files. Default true.
 	 */
-	if ( WP_DEBUG && apply_filters( 'deprecated_file_trigger_error', true ) ) {
-		$message = empty( $message ) ? '' : ' ' . $message;
-		if ( function_exists( '__' ) ) {
-			if ( ! is_null( $replacement ) )
-				trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.'), $file, $version, $replacement ) . $message );
+	if (WP_DEBUG && apply_filters('deprecated_file_trigger_error', true)) {
+		$message = empty($message) ? '' : ' '.$message;
+		if (function_exists('__')) {
+			if ( ! is_null($replacement))
+				trigger_error(sprintf(__('%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.'), $file, $version, $replacement).$message);
 			else
-				trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.'), $file, $version ) . $message );
+				trigger_error(sprintf(__('%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.'), $file, $version).$message);
 		} else {
-			if ( ! is_null( $replacement ) )
-				trigger_error( sprintf( '%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.', $file, $version, $replacement ) . $message );
+			if ( ! is_null($replacement))
+				trigger_error(sprintf('%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.', $file, $version, $replacement).$message);
 			else
-				trigger_error( sprintf( '%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.', $file, $version ) . $message );
+				trigger_error(sprintf('%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.', $file, $version).$message);
 		}
 	}
 }
@@ -3820,7 +3820,7 @@ 
  * @param string $version  The version of WordPress that deprecated the argument used.
  * @param string $message  Optional. A message regarding the change. Default null.
  */
-function _deprecated_argument( $function, $version, $message = null ) {
+function _deprecated_argument($function, $version, $message = null) {
 
 	/**
 	 * Fires when a deprecated argument is called.
@@ -3831,7 +3831,7 @@ 
 	 * @param string $message  A message regarding the change.
 	 * @param string $version  The version of WordPress that deprecated the argument used.
 	 */
-	do_action( 'deprecated_argument_run', $function, $message, $version );
+	do_action('deprecated_argument_run', $function, $message, $version);
 
 	/**
 	 * Filter whether to trigger an error for deprecated arguments.
@@ -3840,17 +3840,17 @@ 
 	 *
 	 * @param bool $trigger Whether to trigger the error for deprecated arguments. Default true.
 	 */
-	if ( WP_DEBUG && apply_filters( 'deprecated_argument_trigger_error', true ) ) {
-		if ( function_exists( '__' ) ) {
-			if ( ! is_null( $message ) )
-				trigger_error( sprintf( __('%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s! %3$s'), $function, $version, $message ) );
+	if (WP_DEBUG && apply_filters('deprecated_argument_trigger_error', true)) {
+		if (function_exists('__')) {
+			if ( ! is_null($message))
+				trigger_error(sprintf(__('%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s! %3$s'), $function, $version, $message));
 			else
-				trigger_error( sprintf( __('%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s with no alternative available.'), $function, $version ) );
+				trigger_error(sprintf(__('%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s with no alternative available.'), $function, $version));
 		} else {
-			if ( ! is_null( $message ) )
-				trigger_error( sprintf( '%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s! %3$s', $function, $version, $message ) );
+			if ( ! is_null($message))
+				trigger_error(sprintf('%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s! %3$s', $function, $version, $message));
 			else
-				trigger_error( sprintf( '%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s with no alternative available.', $function, $version ) );
+				trigger_error(sprintf('%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s with no alternative available.', $function, $version));
 		}
 	}
 }
@@ -3871,7 +3871,7 @@ 
  * @param string $message  A message explaining what has been done incorrectly.
  * @param string $version  The version of WordPress where the message was added.
  */
-function _doing_it_wrong( $function, $message, $version ) {
+function _doing_it_wrong($function, $message, $version) {
 
 	/**
 	 * Fires when the given function is being used incorrectly.
@@ -3882,7 +3882,7 @@ 
 	 * @param string $message  A message explaining what has been done incorrectly.
 	 * @param string $version  The version of WordPress where the message was added.
 	 */
-	do_action( 'doing_it_wrong_run', $function, $message, $version );
+	do_action('doing_it_wrong_run', $function, $message, $version);
 
 	/**
 	 * Filter whether to trigger an error for _doing_it_wrong() calls.
@@ -3891,20 +3891,20 @@ 
 	 *
 	 * @param bool $trigger Whether to trigger the error for _doing_it_wrong() calls. Default true.
 	 */
-	if ( WP_DEBUG && apply_filters( 'doing_it_wrong_trigger_error', true ) ) {
-		if ( function_exists( '__' ) ) {
-			$version = is_null( $version ) ? '' : sprintf( __( '(This message was added in version %s.)' ), $version );
+	if (WP_DEBUG && apply_filters('doing_it_wrong_trigger_error', true)) {
+		if (function_exists('__')) {
+			$version = is_null($version) ? '' : sprintf(__('(This message was added in version %s.)'), $version);
 			/* translators: %s: Codex URL */
-			$message .= ' ' . sprintf( __( 'Please see <a href="%s">Debugging in WordPress</a> for more information.' ),
-				__( 'https://codex.wordpress.org/Debugging_in_WordPress' )
+			$message .= ' '.sprintf(__('Please see <a href="%s">Debugging in WordPress</a> for more information.'),
+				__('https://codex.wordpress.org/Debugging_in_WordPress')
 			);
-			trigger_error( sprintf( __( '%1$s was called <strong>incorrectly</strong>. %2$s %3$s' ), $function, $message, $version ) );
+			trigger_error(sprintf(__('%1$s was called <strong>incorrectly</strong>. %2$s %3$s'), $function, $message, $version));
 		} else {
-			$version = is_null( $version ) ? '' : sprintf( '(This message was added in version %s.)', $version );
-			$message .= sprintf( ' Please see <a href="%s">Debugging in WordPress</a> for more information.',
+			$version = is_null($version) ? '' : sprintf('(This message was added in version %s.)', $version);
+			$message .= sprintf(' Please see <a href="%s">Debugging in WordPress</a> for more information.',
 				'https://codex.wordpress.org/Debugging_in_WordPress'
 			);
-			trigger_error( sprintf( '%1$s was called <strong>incorrectly</strong>. %2$s %3$s', $function, $message, $version ) );
+			trigger_error(sprintf('%1$s was called <strong>incorrectly</strong>. %2$s %3$s', $function, $message, $version));
 		}
 	}
 }
@@ -3917,9 +3917,9 @@ 
  * @return bool Whether the server is running lighttpd < 1.5.0.
  */
 function is_lighttpd_before_150() {
-	$server_parts = explode( '/', isset( $_SERVER['SERVER_SOFTWARE'] )? $_SERVER['SERVER_SOFTWARE'] : '' );
-	$server_parts[1] = isset( $server_parts[1] )? $server_parts[1] : '';
-	return  'lighttpd' == $server_parts[0] && -1 == version_compare( $server_parts[1], '1.5.0' );
+	$server_parts = explode('/', isset($_SERVER['SERVER_SOFTWARE']) ? $_SERVER['SERVER_SOFTWARE'] : '');
+	$server_parts[1] = isset($server_parts[1]) ? $server_parts[1] : '';
+	return  'lighttpd' == $server_parts[0] && -1 == version_compare($server_parts[1], '1.5.0');
 }
 
 /**
@@ -3936,18 +3936,18 @@ 
 function apache_mod_loaded($mod, $default = false) {
 	global $is_apache;
 
-	if ( !$is_apache )
+	if ( ! $is_apache)
 		return false;
 
-	if ( function_exists( 'apache_get_modules' ) ) {
+	if (function_exists('apache_get_modules')) {
 		$mods = apache_get_modules();
-		if ( in_array($mod, $mods) )
+		if (in_array($mod, $mods))
 			return true;
-	} elseif ( function_exists( 'phpinfo' ) && false === strpos( ini_get( 'disable_functions' ), 'phpinfo' ) ) {
+	} elseif (function_exists('phpinfo') && false === strpos(ini_get('disable_functions'), 'phpinfo')) {
 			ob_start();
 			phpinfo(8);
 			$phpinfo = ob_get_clean();
-			if ( false !== strpos($phpinfo, $mod) )
+			if (false !== strpos($phpinfo, $mod))
 				return true;
 	}
 	return $default;
@@ -3966,7 +3966,7 @@ 
 	global $is_iis7;
 
 	$supports_permalinks = false;
-	if ( $is_iis7 ) {
+	if ($is_iis7) {
 		/* First we check if the DOMDocument class exists. If it does not exist, then we cannot
 		 * easily update the xml configuration file, hence we just bail out and tell user that
 		 * pretty permalinks cannot be used.
@@ -3976,7 +3976,7 @@ 
 		 * Lastly we make sure that PHP is running via FastCGI. This is important because if it runs
 		 * via ISAPI then pretty permalinks will not work.
 		 */
-		$supports_permalinks = class_exists( 'DOMDocument', false ) && isset($_SERVER['IIS_UrlRewriteModule']) && ( PHP_SAPI == 'cgi-fcgi' );
+		$supports_permalinks = class_exists('DOMDocument', false) && isset($_SERVER['IIS_UrlRewriteModule']) && (PHP_SAPI == 'cgi-fcgi');
 	}
 
 	/**
@@ -3986,7 +3986,7 @@ 
 	 *
 	 * @param bool $supports_permalinks Whether IIS7 supports permalinks. Default false.
 	 */
-	return apply_filters( 'iis7_supports_permalinks', $supports_permalinks );
+	return apply_filters('iis7_supports_permalinks', $supports_permalinks);
 }
 
 /**
@@ -4003,17 +4003,17 @@ 
  * @param array  $allowed_files List of allowed files.
  * @return int 0 means nothing is wrong, greater than 0 means something was wrong.
  */
-function validate_file( $file, $allowed_files = '' ) {
-	if ( false !== strpos( $file, '..' ) )
+function validate_file($file, $allowed_files = '') {
+	if (false !== strpos($file, '..'))
 		return 1;
 
-	if ( false !== strpos( $file, './' ) )
+	if (false !== strpos($file, './'))
 		return 1;
 
-	if ( ! empty( $allowed_files ) && ! in_array( $file, $allowed_files ) )
+	if ( ! empty($allowed_files) && ! in_array($file, $allowed_files))
 		return 3;
 
-	if (':' == substr( $file, 1, 1 ) )
+	if (':' == substr($file, 1, 1))
 		return 2;
 
 	return 0;
@@ -4027,12 +4027,12 @@ 
  * @return bool True if SSL, false if not used.
  */
 function is_ssl() {
-	if ( isset($_SERVER['HTTPS']) ) {
-		if ( 'on' == strtolower($_SERVER['HTTPS']) )
+	if (isset($_SERVER['HTTPS'])) {
+		if ('on' == strtolower($_SERVER['HTTPS']))
 			return true;
-		if ( '1' == $_SERVER['HTTPS'] )
+		if ('1' == $_SERVER['HTTPS'])
 			return true;
-	} elseif ( isset($_SERVER['SERVER_PORT']) && ( '443' == $_SERVER['SERVER_PORT'] ) ) {
+	} elseif (isset($_SERVER['SERVER_PORT']) && ('443' == $_SERVER['SERVER_PORT'])) {
 		return true;
 	}
 	return false;
@@ -4048,10 +4048,10 @@ 
  * @param string|bool $force Optional. Whether to force SSL in admin screens. Default null.
  * @return bool True if forced, false if not forced.
  */
-function force_ssl_admin( $force = null ) {
+function force_ssl_admin($force = null) {
 	static $forced = false;
 
-	if ( !is_null( $force ) ) {
+	if ( ! is_null($force)) {
 		$old_forced = $forced;
 		$forced = $force;
 		return $old_forced;
@@ -4071,39 +4071,39 @@ 
  * @return string The guessed URL.
  */
 function wp_guess_url() {
-	if ( defined('WP_SITEURL') && '' != WP_SITEURL ) {
+	if (defined('WP_SITEURL') && '' != WP_SITEURL) {
 		$url = WP_SITEURL;
 	} else {
-		$abspath_fix = str_replace( '\\', '/', ABSPATH );
-		$script_filename_dir = dirname( $_SERVER['SCRIPT_FILENAME'] );
+		$abspath_fix = str_replace('\\', '/', ABSPATH);
+		$script_filename_dir = dirname($_SERVER['SCRIPT_FILENAME']);
 
 		// The request is for the admin
-		if ( strpos( $_SERVER['REQUEST_URI'], 'wp-admin' ) !== false || strpos( $_SERVER['REQUEST_URI'], 'wp-login.php' ) !== false ) {
-			$path = preg_replace( '#/(wp-admin/.*|wp-login.php)#i', '', $_SERVER['REQUEST_URI'] );
+		if (strpos($_SERVER['REQUEST_URI'], 'wp-admin') !== false || strpos($_SERVER['REQUEST_URI'], 'wp-login.php') !== false) {
+			$path = preg_replace('#/(wp-admin/.*|wp-login.php)#i', '', $_SERVER['REQUEST_URI']);
 
 		// The request is for a file in ABSPATH
-		} elseif ( $script_filename_dir . '/' == $abspath_fix ) {
+		} elseif ($script_filename_dir.'/' == $abspath_fix) {
 			// Strip off any file/query params in the path
-			$path = preg_replace( '#/[^/]*$#i', '', $_SERVER['PHP_SELF'] );
+			$path = preg_replace('#/[^/]*$#i', '', $_SERVER['PHP_SELF']);
 
 		} else {
-			if ( false !== strpos( $_SERVER['SCRIPT_FILENAME'], $abspath_fix ) ) {
+			if (false !== strpos($_SERVER['SCRIPT_FILENAME'], $abspath_fix)) {
 				// Request is hitting a file inside ABSPATH
-				$directory = str_replace( ABSPATH, '', $script_filename_dir );
+				$directory = str_replace(ABSPATH, '', $script_filename_dir);
 				// Strip off the sub directory, and any file/query params
-				$path = preg_replace( '#/' . preg_quote( $directory, '#' ) . '/[^/]*$#i', '' , $_SERVER['REQUEST_URI'] );
-			} elseif ( false !== strpos( $abspath_fix, $script_filename_dir ) ) {
+				$path = preg_replace('#/'.preg_quote($directory, '#').'/[^/]*$#i', '', $_SERVER['REQUEST_URI']);
+			} elseif (false !== strpos($abspath_fix, $script_filename_dir)) {
 				// Request is hitting a file above ABSPATH
-				$subdirectory = substr( $abspath_fix, strpos( $abspath_fix, $script_filename_dir ) + strlen( $script_filename_dir ) );
+				$subdirectory = substr($abspath_fix, strpos($abspath_fix, $script_filename_dir) + strlen($script_filename_dir));
 				// Strip off any file/query params from the path, appending the sub directory to the install
-				$path = preg_replace( '#/[^/]*$#i', '' , $_SERVER['REQUEST_URI'] ) . $subdirectory;
+				$path = preg_replace('#/[^/]*$#i', '', $_SERVER['REQUEST_URI']).$subdirectory;
 			} else {
 				$path = $_SERVER['REQUEST_URI'];
 			}
 		}
 
 		$schema = is_ssl() ? 'https://' : 'http://'; // set_url_scheme() is not defined yet
-		$url = $schema . $_SERVER['HTTP_HOST'] . $path;
+		$url = $schema.$_SERVER['HTTP_HOST'].$path;
 	}
 
 	return rtrim($url, '/');
@@ -4126,10 +4126,10 @@ 
  * @param bool $suspend Optional. Suspends additions if true, re-enables them if false.
  * @return bool The current suspend setting
  */
-function wp_suspend_cache_addition( $suspend = null ) {
+function wp_suspend_cache_addition($suspend = null) {
 	static $_suspend = false;
 
-	if ( is_bool( $suspend ) )
+	if (is_bool($suspend))
 		$_suspend = $suspend;
 
 	return $_suspend;
@@ -4149,7 +4149,7 @@ 
  * @param bool $suspend Optional. Whether to suspend or enable cache invalidation. Default true.
  * @return bool The current suspend setting.
  */
-function wp_suspend_cache_invalidation( $suspend = true ) {
+function wp_suspend_cache_invalidation($suspend = true) {
 	global $_wp_suspend_cache_invalidation;
 
 	$current_suspend = $_wp_suspend_cache_invalidation;
@@ -4169,14 +4169,14 @@ 
  * @return bool True if $site_id is the main site of the network, or if not
  *              running Multisite.
  */
-function is_main_site( $site_id = null ) {
+function is_main_site($site_id = null) {
 	// This is the current network's information; 'site' is old terminology.
 	global $current_site;
 
-	if ( ! is_multisite() )
+	if ( ! is_multisite())
 		return true;
 
-	if ( ! $site_id )
+	if ( ! $site_id)
 		$site_id = get_current_blog_id();
 
 	return (int) $site_id === (int) $current_site->blog_id;
@@ -4190,20 +4190,20 @@ 
  * @param int $network_id Optional. Network ID to test. Defaults to current network.
  * @return bool True if $network_id is the main network, or if not running Multisite.
  */
-function is_main_network( $network_id = null ) {
-	if ( ! is_multisite() ) {
+function is_main_network($network_id = null) {
+	if ( ! is_multisite()) {
 		return true;
 	}
 
 	$current_network_id = (int) get_current_site()->id;
 
-	if ( null === $network_id ) {
+	if (null === $network_id) {
 		$network_id = $current_network_id;
 	}
 
 	$network_id = (int) $network_id;
 
-	return ( $network_id === get_main_network_id() );
+	return ($network_id === get_main_network_id());
 }
 
 /**
@@ -4218,21 +4218,21 @@ 
 function get_main_network_id() {
 	global $wpdb;
 
-	if ( ! is_multisite() ) {
+	if ( ! is_multisite()) {
 		return 1;
 	}
 
-	if ( defined( 'PRIMARY_NETWORK_ID' ) ) {
+	if (defined('PRIMARY_NETWORK_ID')) {
 		$main_network_id = PRIMARY_NETWORK_ID;
-	} elseif ( 1 === (int) get_current_site()->id ) {
+	} elseif (1 === (int) get_current_site()->id) {
 		// If the current network has an ID of 1, assume it is the main network.
 		$main_network_id = 1;
 	} else {
-		$main_network_id = wp_cache_get( 'primary_network_id', 'site-options' );
+		$main_network_id = wp_cache_get('primary_network_id', 'site-options');
 
-		if ( false === $main_network_id ) {
-			$main_network_id = (int) $wpdb->get_var( "SELECT id FROM {$wpdb->site} ORDER BY id LIMIT 1" );
-			wp_cache_add( 'primary_network_id', $main_network_id, 'site-options' );
+		if (false === $main_network_id) {
+			$main_network_id = (int) $wpdb->get_var("SELECT id FROM {$wpdb->site} ORDER BY id LIMIT 1");
+			wp_cache_add('primary_network_id', $main_network_id, 'site-options');
 		}
 	}
 
@@ -4243,7 +4243,7 @@ 
 	 *
 	 * @param int $main_network_id The ID of the main network.
 	 */
-	return (int) apply_filters( 'get_main_network_id', $main_network_id );
+	return (int) apply_filters('get_main_network_id', $main_network_id);
 }
 
 /**
@@ -4256,11 +4256,11 @@ 
  * @return bool True if multisite and global terms enabled.
  */
 function global_terms_enabled() {
-	if ( ! is_multisite() )
+	if ( ! is_multisite())
 		return false;
 
 	static $global_terms = null;
-	if ( is_null( $global_terms ) ) {
+	if (is_null($global_terms)) {
 
 		/**
 		 * Filter whether global terms are enabled.
@@ -4272,11 +4272,11 @@ 
 		 *
 		 * @param null $enabled Whether global terms are enabled.
 		 */
-		$filter = apply_filters( 'global_terms_enabled', null );
-		if ( ! is_null( $filter ) )
+		$filter = apply_filters('global_terms_enabled', null);
+		if ( ! is_null($filter))
 			$global_terms = (bool) $filter;
 		else
-			$global_terms = (bool) get_site_option( 'global_terms_enabled', false );
+			$global_terms = (bool) get_site_option('global_terms_enabled', false);
 	}
 	return $global_terms;
 }
@@ -4291,16 +4291,16 @@ 
  * @return float|false Timezone GMT offset, false otherwise.
  */
 function wp_timezone_override_offset() {
-	if ( !$timezone_string = get_option( 'timezone_string' ) ) {
+	if ( ! $timezone_string = get_option('timezone_string')) {
 		return false;
 	}
 
-	$timezone_object = timezone_open( $timezone_string );
+	$timezone_object = timezone_open($timezone_string);
 	$datetime_object = date_create();
-	if ( false === $timezone_object || false === $datetime_object ) {
+	if (false === $timezone_object || false === $datetime_object) {
 		return false;
 	}
-	return round( timezone_offset_get( $timezone_object, $datetime_object ) / HOUR_IN_SECONDS, 2 );
+	return round(timezone_offset_get($timezone_object, $datetime_object) / HOUR_IN_SECONDS, 2);
 }
 
 /**
@@ -4313,41 +4313,41 @@ 
  * @param array $b
  * @return int
  */
-function _wp_timezone_choice_usort_callback( $a, $b ) {
+function _wp_timezone_choice_usort_callback($a, $b) {
 	// Don't use translated versions of Etc
-	if ( 'Etc' === $a['continent'] && 'Etc' === $b['continent'] ) {
+	if ('Etc' === $a['continent'] && 'Etc' === $b['continent']) {
 		// Make the order of these more like the old dropdown
-		if ( 'GMT+' === substr( $a['city'], 0, 4 ) && 'GMT+' === substr( $b['city'], 0, 4 ) ) {
-			return -1 * ( strnatcasecmp( $a['city'], $b['city'] ) );
+		if ('GMT+' === substr($a['city'], 0, 4) && 'GMT+' === substr($b['city'], 0, 4)) {
+			return -1 * (strnatcasecmp($a['city'], $b['city']));
 		}
-		if ( 'UTC' === $a['city'] ) {
-			if ( 'GMT+' === substr( $b['city'], 0, 4 ) ) {
+		if ('UTC' === $a['city']) {
+			if ('GMT+' === substr($b['city'], 0, 4)) {
 				return 1;
 			}
 			return -1;
 		}
-		if ( 'UTC' === $b['city'] ) {
-			if ( 'GMT+' === substr( $a['city'], 0, 4 ) ) {
+		if ('UTC' === $b['city']) {
+			if ('GMT+' === substr($a['city'], 0, 4)) {
 				return -1;
 			}
 			return 1;
 		}
-		return strnatcasecmp( $a['city'], $b['city'] );
+		return strnatcasecmp($a['city'], $b['city']);
 	}
-	if ( $a['t_continent'] == $b['t_continent'] ) {
-		if ( $a['t_city'] == $b['t_city'] ) {
-			return strnatcasecmp( $a['t_subcity'], $b['t_subcity'] );
+	if ($a['t_continent'] == $b['t_continent']) {
+		if ($a['t_city'] == $b['t_city']) {
+			return strnatcasecmp($a['t_subcity'], $b['t_subcity']);
 		}
-		return strnatcasecmp( $a['t_city'], $b['t_city'] );
+		return strnatcasecmp($a['t_city'], $b['t_city']);
 	} else {
 		// Force Etc to the bottom of the list
-		if ( 'Etc' === $a['continent'] ) {
+		if ('Etc' === $a['continent']) {
 			return 1;
 		}
-		if ( 'Etc' === $b['continent'] ) {
+		if ('Etc' === $b['continent']) {
 			return -1;
 		}
-		return strnatcasecmp( $a['t_continent'], $b['t_continent'] );
+		return strnatcasecmp($a['t_continent'], $b['t_continent']);
 	}
 }
 
@@ -4361,125 +4361,125 @@ 
  * @param string $selected_zone Selected timezone.
  * @return string
  */
-function wp_timezone_choice( $selected_zone ) {
+function wp_timezone_choice($selected_zone) {
 	static $mo_loaded = false;
 
-	$continents = array( 'Africa', 'America', 'Antarctica', 'Arctic', 'Asia', 'Atlantic', 'Australia', 'Europe', 'Indian', 'Pacific');
+	$continents = array('Africa', 'America', 'Antarctica', 'Arctic', 'Asia', 'Atlantic', 'Australia', 'Europe', 'Indian', 'Pacific');
 
 	// Load translations for continents and cities
-	if ( !$mo_loaded ) {
+	if ( ! $mo_loaded) {
 		$locale = get_locale();
-		$mofile = WP_LANG_DIR . '/continents-cities-' . $locale . '.mo';
-		load_textdomain( 'continents-cities', $mofile );
+		$mofile = WP_LANG_DIR.'/continents-cities-'.$locale.'.mo';
+		load_textdomain('continents-cities', $mofile);
 		$mo_loaded = true;
 	}
 
 	$zonen = array();
-	foreach ( timezone_identifiers_list() as $zone ) {
-		$zone = explode( '/', $zone );
-		if ( !in_array( $zone[0], $continents ) ) {
+	foreach (timezone_identifiers_list() as $zone) {
+		$zone = explode('/', $zone);
+		if ( ! in_array($zone[0], $continents)) {
 			continue;
 		}
 
 		// This determines what gets set and translated - we don't translate Etc/* strings here, they are done later
 		$exists = array(
-			0 => ( isset( $zone[0] ) && $zone[0] ),
-			1 => ( isset( $zone[1] ) && $zone[1] ),
-			2 => ( isset( $zone[2] ) && $zone[2] ),
+			0 => (isset($zone[0]) && $zone[0]),
+			1 => (isset($zone[1]) && $zone[1]),
+			2 => (isset($zone[2]) && $zone[2]),
 		);
-		$exists[3] = ( $exists[0] && 'Etc' !== $zone[0] );
-		$exists[4] = ( $exists[1] && $exists[3] );
-		$exists[5] = ( $exists[2] && $exists[3] );
+		$exists[3] = ($exists[0] && 'Etc' !== $zone[0]);
+		$exists[4] = ($exists[1] && $exists[3]);
+		$exists[5] = ($exists[2] && $exists[3]);
 
 		$zonen[] = array(
-			'continent'   => ( $exists[0] ? $zone[0] : '' ),
-			'city'        => ( $exists[1] ? $zone[1] : '' ),
-			'subcity'     => ( $exists[2] ? $zone[2] : '' ),
-			't_continent' => ( $exists[3] ? translate( str_replace( '_', ' ', $zone[0] ), 'continents-cities' ) : '' ),
-			't_city'      => ( $exists[4] ? translate( str_replace( '_', ' ', $zone[1] ), 'continents-cities' ) : '' ),
-			't_subcity'   => ( $exists[5] ? translate( str_replace( '_', ' ', $zone[2] ), 'continents-cities' ) : '' )
+			'continent'   => ($exists[0] ? $zone[0] : ''),
+			'city'        => ($exists[1] ? $zone[1] : ''),
+			'subcity'     => ($exists[2] ? $zone[2] : ''),
+			't_continent' => ($exists[3] ? translate(str_replace('_', ' ', $zone[0]), 'continents-cities') : ''),
+			't_city'      => ($exists[4] ? translate(str_replace('_', ' ', $zone[1]), 'continents-cities') : ''),
+			't_subcity'   => ($exists[5] ? translate(str_replace('_', ' ', $zone[2]), 'continents-cities') : '')
 		);
 	}
-	usort( $zonen, '_wp_timezone_choice_usort_callback' );
+	usort($zonen, '_wp_timezone_choice_usort_callback');
 
 	$structure = array();
 
-	if ( empty( $selected_zone ) ) {
-		$structure[] = '<option selected="selected" value="">' . __( 'Select a city' ) . '</option>';
+	if (empty($selected_zone)) {
+		$structure[] = '<option selected="selected" value="">'.__('Select a city').'</option>';
 	}
 
-	foreach ( $zonen as $key => $zone ) {
+	foreach ($zonen as $key => $zone) {
 		// Build value in an array to join later
-		$value = array( $zone['continent'] );
+		$value = array($zone['continent']);
 
-		if ( empty( $zone['city'] ) ) {
+		if (empty($zone['city'])) {
 			// It's at the continent level (generally won't happen)
 			$display = $zone['t_continent'];
 		} else {
 			// It's inside a continent group
 
 			// Continent optgroup
-			if ( !isset( $zonen[$key - 1] ) || $zonen[$key - 1]['continent'] !== $zone['continent'] ) {
+			if ( ! isset($zonen[$key - 1]) || $zonen[$key - 1]['continent'] !== $zone['continent']) {
 				$label = $zone['t_continent'];
-				$structure[] = '<optgroup label="'. esc_attr( $label ) .'">';
+				$structure[] = '<optgroup label="'.esc_attr($label).'">';
 			}
 
 			// Add the city to the value
 			$value[] = $zone['city'];
 
 			$display = $zone['t_city'];
-			if ( !empty( $zone['subcity'] ) ) {
+			if ( ! empty($zone['subcity'])) {
 				// Add the subcity to the value
 				$value[] = $zone['subcity'];
-				$display .= ' - ' . $zone['t_subcity'];
+				$display .= ' - '.$zone['t_subcity'];
 			}
 		}
 
 		// Build the value
-		$value = join( '/', $value );
+		$value = join('/', $value);
 		$selected = '';
-		if ( $value === $selected_zone ) {
+		if ($value === $selected_zone) {
 			$selected = 'selected="selected" ';
 		}
-		$structure[] = '<option ' . $selected . 'value="' . esc_attr( $value ) . '">' . esc_html( $display ) . "</option>";
+		$structure[] = '<option '.$selected.'value="'.esc_attr($value).'">'.esc_html($display)."</option>";
 
 		// Close continent optgroup
-		if ( !empty( $zone['city'] ) && ( !isset($zonen[$key + 1]) || (isset( $zonen[$key + 1] ) && $zonen[$key + 1]['continent'] !== $zone['continent']) ) ) {
+		if ( ! empty($zone['city']) && ( ! isset($zonen[$key + 1]) || (isset($zonen[$key + 1]) && $zonen[$key + 1]['continent'] !== $zone['continent']))) {
 			$structure[] = '</optgroup>';
 		}
 	}
 
 	// Do UTC
-	$structure[] = '<optgroup label="'. esc_attr__( 'UTC' ) .'">';
+	$structure[] = '<optgroup label="'.esc_attr__('UTC').'">';
 	$selected = '';
-	if ( 'UTC' === $selected_zone )
+	if ('UTC' === $selected_zone)
 		$selected = 'selected="selected" ';
-	$structure[] = '<option ' . $selected . 'value="' . esc_attr( 'UTC' ) . '">' . __('UTC') . '</option>';
+	$structure[] = '<option '.$selected.'value="'.esc_attr('UTC').'">'.__('UTC').'</option>';
 	$structure[] = '</optgroup>';
 
 	// Do manual UTC offsets
-	$structure[] = '<optgroup label="'. esc_attr__( 'Manual Offsets' ) .'">';
-	$offset_range = array (-12, -11.5, -11, -10.5, -10, -9.5, -9, -8.5, -8, -7.5, -7, -6.5, -6, -5.5, -5, -4.5, -4, -3.5, -3, -2.5, -2, -1.5, -1, -0.5,
+	$structure[] = '<optgroup label="'.esc_attr__('Manual Offsets').'">';
+	$offset_range = array(-12, -11.5, -11, -10.5, -10, -9.5, -9, -8.5, -8, -7.5, -7, -6.5, -6, -5.5, -5, -4.5, -4, -3.5, -3, -2.5, -2, -1.5, -1, -0.5,
 		0, 0.5, 1, 1.5, 2, 2.5, 3, 3.5, 4, 4.5, 5, 5.5, 5.75, 6, 6.5, 7, 7.5, 8, 8.5, 8.75, 9, 9.5, 10, 10.5, 11, 11.5, 12, 12.75, 13, 13.75, 14);
-	foreach ( $offset_range as $offset ) {
-		if ( 0 <= $offset )
-			$offset_name = '+' . $offset;
+	foreach ($offset_range as $offset) {
+		if (0 <= $offset)
+			$offset_name = '+'.$offset;
 		else
 			$offset_name = (string) $offset;
 
 		$offset_value = $offset_name;
-		$offset_name = str_replace(array('.25','.5','.75'), array(':15',':30',':45'), $offset_name);
-		$offset_name = 'UTC' . $offset_name;
-		$offset_value = 'UTC' . $offset_value;
+		$offset_name = str_replace(array('.25', '.5', '.75'), array(':15', ':30', ':45'), $offset_name);
+		$offset_name = 'UTC'.$offset_name;
+		$offset_value = 'UTC'.$offset_value;
 		$selected = '';
-		if ( $offset_value === $selected_zone )
+		if ($offset_value === $selected_zone)
 			$selected = 'selected="selected" ';
-		$structure[] = '<option ' . $selected . 'value="' . esc_attr( $offset_value ) . '">' . esc_html( $offset_name ) . "</option>";
+		$structure[] = '<option '.$selected.'value="'.esc_attr($offset_value).'">'.esc_html($offset_name)."</option>";
 
 	}
 	$structure[] = '</optgroup>';
 
-	return join( "\n", $structure );
+	return join("\n", $structure);
 }
 
 /**
@@ -4493,7 +4493,7 @@ 
  * @param string $str Header comment to clean up.
  * @return string
  */
-function _cleanup_header_comment( $str ) {
+function _cleanup_header_comment($str) {
 	return trim(preg_replace("/\s*(?:\*\/|\?>).*/", '', $str));
 }
 
@@ -4510,18 +4510,18 @@ 
 function wp_scheduled_delete() {
 	global $wpdb;
 
-	$delete_timestamp = time() - ( DAY_IN_SECONDS * EMPTY_TRASH_DAYS );
+	$delete_timestamp = time() - (DAY_IN_SECONDS * EMPTY_TRASH_DAYS);
 
 	$posts_to_delete = $wpdb->get_results($wpdb->prepare("SELECT post_id FROM $wpdb->postmeta WHERE meta_key = '_wp_trash_meta_time' AND meta_value < '%d'", $delete_timestamp), ARRAY_A);
 
-	foreach ( (array) $posts_to_delete as $post ) {
+	foreach ((array) $posts_to_delete as $post) {
 		$post_id = (int) $post['post_id'];
-		if ( !$post_id )
+		if ( ! $post_id)
 			continue;
 
 		$del_post = get_post($post_id);
 
-		if ( !$del_post || 'trash' != $del_post->post_status ) {
+		if ( ! $del_post || 'trash' != $del_post->post_status) {
 			delete_post_meta($post_id, '_wp_trash_meta_status');
 			delete_post_meta($post_id, '_wp_trash_meta_time');
 		} else {
@@ -4531,18 +4531,18 @@ 
 
 	$comments_to_delete = $wpdb->get_results($wpdb->prepare("SELECT comment_id FROM $wpdb->commentmeta WHERE meta_key = '_wp_trash_meta_time' AND meta_value < '%d'", $delete_timestamp), ARRAY_A);
 
-	foreach ( (array) $comments_to_delete as $comment ) {
+	foreach ((array) $comments_to_delete as $comment) {
 		$comment_id = (int) $comment['comment_id'];
-		if ( !$comment_id )
+		if ( ! $comment_id)
 			continue;
 
 		$del_comment = get_comment($comment_id);
 
-		if ( !$del_comment || 'trash' != $del_comment->comment_approved ) {
+		if ( ! $del_comment || 'trash' != $del_comment->comment_approved) {
 			delete_comment_meta($comment_id, '_wp_trash_meta_time');
 			delete_comment_meta($comment_id, '_wp_trash_meta_status');
 		} else {
-			wp_delete_comment( $del_comment );
+			wp_delete_comment($del_comment);
 		}
 	}
 }
@@ -4567,18 +4567,18 @@ 
  *                                Default empty.
  * @return array Array of file headers in `HeaderKey => Header Value` format.
  */
-function get_file_data( $file, $default_headers, $context = '' ) {
+function get_file_data($file, $default_headers, $context = '') {
 	// We don't need to write to the file, so just open for reading.
-	$fp = fopen( $file, 'r' );
+	$fp = fopen($file, 'r');
 
 	// Pull only the first 8kiB of the file in.
-	$file_data = fread( $fp, 8192 );
+	$file_data = fread($fp, 8192);
 
 	// PHP will close file handle, but we are good citizens.
-	fclose( $fp );
+	fclose($fp);
 
 	// Make sure we catch CR-only line endings.
-	$file_data = str_replace( "\r", "\n", $file_data );
+	$file_data = str_replace("\r", "\n", $file_data);
 
 	/**
 	 * Filter extra file headers by context.
@@ -4590,18 +4590,18 @@ 
 	 *
 	 * @param array $extra_context_headers Empty array by default.
 	 */
-	if ( $context && $extra_headers = apply_filters( "extra_{$context}_headers", array() ) ) {
-		$extra_headers = array_combine( $extra_headers, $extra_headers ); // keys equal values
-		$all_headers = array_merge( $extra_headers, (array) $default_headers );
+	if ($context && $extra_headers = apply_filters("extra_{$context}_headers", array())) {
+		$extra_headers = array_combine($extra_headers, $extra_headers); // keys equal values
+		$all_headers = array_merge($extra_headers, (array) $default_headers);
 	} else {
 		$all_headers = $default_headers;
 	}
 
-	foreach ( $all_headers as $field => $regex ) {
-		if ( preg_match( '/^[ \t\/*#@]*' . preg_quote( $regex, '/' ) . ':(.*)$/mi', $file_data, $match ) && $match[1] )
-			$all_headers[ $field ] = _cleanup_header_comment( $match[1] );
+	foreach ($all_headers as $field => $regex) {
+		if (preg_match('/^[ \t\/*#@]*'.preg_quote($regex, '/').':(.*)$/mi', $file_data, $match) && $match[1])
+			$all_headers[$field] = _cleanup_header_comment($match[1]);
 		else
-			$all_headers[ $field ] = '';
+			$all_headers[$field] = '';
 	}
 
 	return $all_headers;
@@ -4700,7 +4700,7 @@ 
  * @see http://src.chromium.org/viewvc/chrome?view=rev&revision=6985
  */
 function send_nosniff_header() {
-	@header( 'X-Content-Type-Options: nosniff' );
+	@header('X-Content-Type-Options: nosniff');
 }
 
 /**
@@ -4712,8 +4712,8 @@ 
  * @param string $column Database column.
  * @return string SQL clause.
  */
-function _wp_mysql_week( $column ) {
-	switch ( $start_of_week = (int) get_option( 'start_of_week' ) ) {
+function _wp_mysql_week($column) {
+	switch ($start_of_week = (int) get_option('start_of_week')) {
 	case 1 :
 		return "WEEK( $column, 1 )";
 	case 2 :
@@ -4741,13 +4741,13 @@ 
  * @param array    $callback_args Optional. Additional arguments to send to $callback.
  * @return array IDs of all members of loop.
  */
-function wp_find_hierarchy_loop( $callback, $start, $start_parent, $callback_args = array() ) {
-	$override = is_null( $start_parent ) ? array() : array( $start => $start_parent );
+function wp_find_hierarchy_loop($callback, $start, $start_parent, $callback_args = array()) {
+	$override = is_null($start_parent) ? array() : array($start => $start_parent);
 
-	if ( !$arbitrary_loop_member = wp_find_hierarchy_loop_tortoise_hare( $callback, $start, $override, $callback_args ) )
+	if ( ! $arbitrary_loop_member = wp_find_hierarchy_loop_tortoise_hare($callback, $start, $override, $callback_args))
 		return array();
 
-	return wp_find_hierarchy_loop_tortoise_hare( $callback, $arbitrary_loop_member, $override, $callback_args, true );
+	return wp_find_hierarchy_loop_tortoise_hare($callback, $arbitrary_loop_member, $override, $callback_args, true);
 }
 
 /**
@@ -4770,7 +4770,7 @@ 
  * @return mixed Scalar ID of some arbitrary member of the loop, or array of IDs of all members of loop if
  *               $_return_loop
  */
-function wp_find_hierarchy_loop_tortoise_hare( $callback, $start, $override = array(), $callback_args = array(), $_return_loop = false ) {
+function wp_find_hierarchy_loop_tortoise_hare($callback, $start, $override = array(), $callback_args = array(), $_return_loop = false) {
 	$tortoise = $hare = $evanescent_hare = $start;
 	$return = array();
 
@@ -4779,19 +4779,19 @@ 
 	while (
 		$tortoise
 	&&
-		( $evanescent_hare = isset( $override[$hare] ) ? $override[$hare] : call_user_func_array( $callback, array_merge( array( $hare ), $callback_args ) ) )
+		($evanescent_hare = isset($override[$hare]) ? $override[$hare] : call_user_func_array($callback, array_merge(array($hare), $callback_args)))
 	&&
-		( $hare = isset( $override[$evanescent_hare] ) ? $override[$evanescent_hare] : call_user_func_array( $callback, array_merge( array( $evanescent_hare ), $callback_args ) ) )
+		($hare = isset($override[$evanescent_hare]) ? $override[$evanescent_hare] : call_user_func_array($callback, array_merge(array($evanescent_hare), $callback_args)))
 	) {
-		if ( $_return_loop )
+		if ($_return_loop)
 			$return[$tortoise] = $return[$evanescent_hare] = $return[$hare] = true;
 
 		// tortoise got lapped - must be a loop
-		if ( $tortoise == $evanescent_hare || $tortoise == $hare )
+		if ($tortoise == $evanescent_hare || $tortoise == $hare)
 			return $_return_loop ? $return : $tortoise;
 
 		// Increment tortoise by one step
-		$tortoise = isset( $override[$tortoise] ) ? $override[$tortoise] : call_user_func_array( $callback, array_merge( array( $tortoise ), $callback_args ) );
+		$tortoise = isset($override[$tortoise]) ? $override[$tortoise] : call_user_func_array($callback, array_merge(array($tortoise), $callback_args));
 	}
 
 	return false;
@@ -4805,7 +4805,7 @@ 
  * @see https://developer.mozilla.org/en/the_x-frame-options_response_header
  */
 function send_frame_options_header() {
-	@header( 'X-Frame-Options: SAMEORIGIN' );
+	@header('X-Frame-Options: SAMEORIGIN');
 }
 
 /**
@@ -4826,8 +4826,8 @@ 
 function wp_allowed_protocols() {
 	static $protocols = array();
 
-	if ( empty( $protocols ) ) {
-		$protocols = array( 'http', 'https', 'ftp', 'ftps', 'mailto', 'news', 'irc', 'gopher', 'nntp', 'feed', 'telnet', 'mms', 'rtsp', 'svn', 'tel', 'fax', 'xmpp', 'webcal' );
+	if (empty($protocols)) {
+		$protocols = array('http', 'https', 'ftp', 'ftps', 'mailto', 'news', 'irc', 'gopher', 'nntp', 'feed', 'telnet', 'mms', 'rtsp', 'svn', 'tel', 'fax', 'xmpp', 'webcal');
 
 		/**
 		 * Filter the list of protocols allowed in HTML attributes.
@@ -4836,7 +4836,7 @@ 
 		 *
 		 * @param array $protocols Array of allowed protocols e.g. 'http', 'ftp', 'tel', and more.
 		 */
-		$protocols = apply_filters( 'kses_allowed_protocols', $protocols );
+		$protocols = apply_filters('kses_allowed_protocols', $protocols);
 	}
 
 	return $protocols;
@@ -4859,36 +4859,36 @@ 
  * @return string|array Either a string containing a reversed comma separated trace or an array
  *                      of individual calls.
  */
-function wp_debug_backtrace_summary( $ignore_class = null, $skip_frames = 0, $pretty = true ) {
-	if ( version_compare( PHP_VERSION, '5.2.5', '>=' ) )
-		$trace = debug_backtrace( false );
+function wp_debug_backtrace_summary($ignore_class = null, $skip_frames = 0, $pretty = true) {
+	if (version_compare(PHP_VERSION, '5.2.5', '>='))
+		$trace = debug_backtrace(false);
 	else
 		$trace = debug_backtrace();
 
 	$caller = array();
-	$check_class = ! is_null( $ignore_class );
+	$check_class = ! is_null($ignore_class);
 	$skip_frames++; // skip this function
 
-	foreach ( $trace as $call ) {
-		if ( $skip_frames > 0 ) {
+	foreach ($trace as $call) {
+		if ($skip_frames > 0) {
 			$skip_frames--;
-		} elseif ( isset( $call['class'] ) ) {
-			if ( $check_class && $ignore_class == $call['class'] )
+		} elseif (isset($call['class'])) {
+			if ($check_class && $ignore_class == $call['class'])
 				continue; // Filter out calls
 
 			$caller[] = "{$call['class']}{$call['type']}{$call['function']}";
 		} else {
-			if ( in_array( $call['function'], array( 'do_action', 'apply_filters' ) ) ) {
+			if (in_array($call['function'], array('do_action', 'apply_filters'))) {
 				$caller[] = "{$call['function']}('{$call['args'][0]}')";
-			} elseif ( in_array( $call['function'], array( 'include', 'include_once', 'require', 'require_once' ) ) ) {
-				$caller[] = $call['function'] . "('" . str_replace( array( WP_CONTENT_DIR, ABSPATH ) , '', $call['args'][0] ) . "')";
+			} elseif (in_array($call['function'], array('include', 'include_once', 'require', 'require_once'))) {
+				$caller[] = $call['function']."('".str_replace(array(WP_CONTENT_DIR, ABSPATH), '', $call['args'][0])."')";
 			} else {
 				$caller[] = $call['function'];
 			}
 		}
 	}
-	if ( $pretty )
-		return join( ', ', array_reverse( $caller ) );
+	if ($pretty)
+		return join(', ', array_reverse($caller));
 	else
 		return $caller;
 }
@@ -4904,11 +4904,11 @@ 
  *
  * @return array List of ids not present in the cache.
  */
-function _get_non_cached_ids( $object_ids, $cache_key ) {
+function _get_non_cached_ids($object_ids, $cache_key) {
 	$clean = array();
-	foreach ( $object_ids as $id ) {
+	foreach ($object_ids as $id) {
 		$id = (int) $id;
-		if ( !wp_cache_get( $id, $cache_key ) ) {
+		if ( ! wp_cache_get($id, $cache_key)) {
 			$clean[] = $id;
 		}
 	}
@@ -4925,15 +4925,15 @@ 
  * @return bool Whether the device is able to upload files.
  */
 function _device_can_upload() {
-	if ( ! wp_is_mobile() )
+	if ( ! wp_is_mobile())
 		return true;
 
 	$ua = $_SERVER['HTTP_USER_AGENT'];
 
-	if ( strpos($ua, 'iPhone') !== false
+	if (strpos($ua, 'iPhone') !== false
 		|| strpos($ua, 'iPad') !== false
-		|| strpos($ua, 'iPod') !== false ) {
-			return preg_match( '#OS ([\d_]+) like Mac OS X#', $ua, $version ) && version_compare( $version[1], '6', '>=' );
+		|| strpos($ua, 'iPod') !== false) {
+			return preg_match('#OS ([\d_]+) like Mac OS X#', $ua, $version) && version_compare($version[1], '6', '>=');
 	}
 
 	return true;
@@ -4945,11 +4945,11 @@ 
  * @param string $path The resource path or URL.
  * @return bool True if the path is a stream URL.
  */
-function wp_is_stream( $path ) {
+function wp_is_stream($path) {
 	$wrappers = stream_get_wrappers();
-	$wrappers_re = '(' . join('|', $wrappers) . ')';
+	$wrappers_re = '('.join('|', $wrappers).')';
 
-	return preg_match( "!^$wrappers_re://!", $path ) === 1;
+	return preg_match("!^$wrappers_re://!", $path) === 1;
 }
 
 /**
@@ -4965,7 +4965,7 @@ 
  * @param  string $source_date The date to filter.
  * @return bool True if valid date, false if not valid date.
  */
-function wp_checkdate( $month, $day, $year, $source_date ) {
+function wp_checkdate($month, $day, $year, $source_date) {
 	/**
 	 * Filter whether the given date is valid for the Gregorian calendar.
 	 *
@@ -4974,7 +4974,7 @@ 
 	 * @param bool   $checkdate   Whether the given date is valid.
 	 * @param string $source_date Date to check.
 	 */
-	return apply_filters( 'wp_checkdate', checkdate( $month, $day, $year ), $source_date );
+	return apply_filters('wp_checkdate', checkdate($month, $day, $year), $source_date);
 }
 
 /**
@@ -4989,15 +4989,15 @@ 
  * @since 3.6.0
  */
 function wp_auth_check_load() {
-	if ( ! is_admin() && ! is_user_logged_in() )
+	if ( ! is_admin() && ! is_user_logged_in())
 		return;
 
-	if ( defined( 'IFRAME_REQUEST' ) )
+	if (defined('IFRAME_REQUEST'))
 		return;
 
 	$screen = get_current_screen();
-	$hidden = array( 'update', 'update-network', 'update-core', 'update-core-network', 'upgrade', 'upgrade-network', 'network' );
-	$show = ! in_array( $screen->id, $hidden );
+	$hidden = array('update', 'update-network', 'update-core', 'update-core-network', 'upgrade', 'upgrade-network', 'network');
+	$show = ! in_array($screen->id, $hidden);
 
 	/**
 	 * Filter whether to load the authentication check.
@@ -5010,12 +5010,12 @@ 
 	 * @param bool      $show   Whether to load the authentication check.
 	 * @param WP_Screen $screen The current screen object.
 	 */
-	if ( apply_filters( 'wp_auth_check_load', $show, $screen ) ) {
-		wp_enqueue_style( 'wp-auth-check' );
-		wp_enqueue_script( 'wp-auth-check' );
+	if (apply_filters('wp_auth_check_load', $show, $screen)) {
+		wp_enqueue_style('wp-auth-check');
+		wp_enqueue_script('wp-auth-check');
 
-		add_action( 'admin_print_footer_scripts', 'wp_auth_check_html', 5 );
-		add_action( 'wp_print_footer_scripts', 'wp_auth_check_html', 5 );
+		add_action('admin_print_footer_scripts', 'wp_auth_check_html', 5);
+		add_action('wp_print_footer_scripts', 'wp_auth_check_html', 5);
 	}
 }
 
@@ -5026,8 +5026,8 @@ 
  */
 function wp_auth_check_html() {
 	$login_url = wp_login_url();
-	$current_domain = ( is_ssl() ? 'https://' : 'http://' ) . $_SERVER['HTTP_HOST'];
-	$same_domain = ( strpos( $login_url, $current_domain ) === 0 );
+	$current_domain = (is_ssl() ? 'https://' : 'http://').$_SERVER['HTTP_HOST'];
+	$same_domain = (strpos($login_url, $current_domain) === 0);
 
 	/**
 	 * Filter whether the authentication check originated at the same domain.
@@ -5036,26 +5036,26 @@ 
 	 *
 	 * @param bool $same_domain Whether the authentication check originated at the same domain.
 	 */
-	$same_domain = apply_filters( 'wp_auth_check_same_domain', $same_domain );
+	$same_domain = apply_filters('wp_auth_check_same_domain', $same_domain);
 	$wrap_class = $same_domain ? 'hidden' : 'hidden fallback';
 
 	?>
 	<div id="wp-auth-check-wrap" class="<?php echo $wrap_class; ?>">
 	<div id="wp-auth-check-bg"></div>
 	<div id="wp-auth-check">
-	<button type="button" class="wp-auth-check-close button-link"><span class="screen-reader-text"><?php _e( 'Close dialog' ); ?></span></button>
+	<button type="button" class="wp-auth-check-close button-link"><span class="screen-reader-text"><?php _e('Close dialog'); ?></span></button>
 	<?php
 
-	if ( $same_domain ) {
+	if ($same_domain) {
 		?>
-		<div id="wp-auth-check-form" class="loading" data-src="<?php echo esc_url( add_query_arg( array( 'interim-login' => 1 ), $login_url ) ); ?>"></div>
+		<div id="wp-auth-check-form" class="loading" data-src="<?php echo esc_url(add_query_arg(array('interim-login' => 1), $login_url)); ?>"></div>
 		<?php
 	}
 
 	?>
 	<div class="wp-auth-fallback">
 		<p><b class="wp-auth-fallback-expired" tabindex="0"><?php _e('Session expired'); ?></b></p>
-		<p><a href="<?php echo esc_url( $login_url ); ?>" target="_blank"><?php _e('Please log in again.'); ?></a>
+		<p><a href="<?php echo esc_url($login_url); ?>" target="_blank"><?php _e('Please log in again.'); ?></a>
 		<?php _e('The login page will open in a new window. After logging in you can close it and return to this page.'); ?></p>
 	</div>
 	</div>
@@ -5076,8 +5076,8 @@ 
  * @param array $response  The Heartbeat response.
  * @return array $response The Heartbeat response with 'wp-auth-check' value set.
  */
-function wp_auth_check( $response ) {
-	$response['wp-auth-check'] = is_user_logged_in() && empty( $GLOBALS['login_grace_period'] );
+function wp_auth_check($response) {
+	$response['wp-auth-check'] = is_user_logged_in() && empty($GLOBALS['login_grace_period']);
 	return $response;
 }
 
@@ -5097,10 +5097,10 @@ 
  * @param string $tag An HTML tag name. Example: 'video'.
  * @return string Tag RegEx.
  */
-function get_tag_regex( $tag ) {
-	if ( empty( $tag ) )
+function get_tag_regex($tag) {
+	if (empty($tag))
 		return;
-	return sprintf( '<%1$s[^<]*(?:>[\s\S]*<\/%1$s>|\s*\/>)', tag_escape( $tag ) );
+	return sprintf('<%1$s[^<]*(?:>[\s\S]*<\/%1$s>|\s*\/>)', tag_escape($tag));
 }
 
 /**
@@ -5115,13 +5115,13 @@ 
  * @param string $charset A charset name.
  * @return string The canonical form of the charset.
  */
-function _canonical_charset( $charset ) {
-	if ( 'UTF-8' === $charset || 'utf-8' === $charset || 'utf8' === $charset ||
-		'UTF8' === $charset )
+function _canonical_charset($charset) {
+	if ('UTF-8' === $charset || 'utf-8' === $charset || 'utf8' === $charset ||
+		'UTF8' === $charset)
 		return 'UTF-8';
 
-	if ( 'ISO-8859-1' === $charset || 'iso-8859-1' === $charset ||
-		'iso8859-1' === $charset || 'ISO8859-1' === $charset )
+	if ('ISO-8859-1' === $charset || 'iso-8859-1' === $charset ||
+		'iso8859-1' === $charset || 'ISO8859-1' === $charset)
 		return 'ISO-8859-1';
 
 	return $charset;
@@ -5153,25 +5153,25 @@ 
  * @param bool $reset Optional. Whether to reset the encoding back to a previously-set encoding.
  *                    Default false.
  */
-function mbstring_binary_safe_encoding( $reset = false ) {
+function mbstring_binary_safe_encoding($reset = false) {
 	static $encodings = array();
 	static $overloaded = null;
 
-	if ( is_null( $overloaded ) )
-		$overloaded = function_exists( 'mb_internal_encoding' ) && ( ini_get( 'mbstring.func_overload' ) & 2 );
+	if (is_null($overloaded))
+		$overloaded = function_exists('mb_internal_encoding') && (ini_get('mbstring.func_overload') & 2);
 
-	if ( false === $overloaded )
+	if (false === $overloaded)
 		return;
 
-	if ( ! $reset ) {
+	if ( ! $reset) {
 		$encoding = mb_internal_encoding();
-		array_push( $encodings, $encoding );
-		mb_internal_encoding( 'ISO-8859-1' );
+		array_push($encodings, $encoding);
+		mb_internal_encoding('ISO-8859-1');
 	}
 
-	if ( $reset && $encodings ) {
-		$encoding = array_pop( $encodings );
-		mb_internal_encoding( $encoding );
+	if ($reset && $encodings) {
+		$encoding = array_pop($encodings);
+		mb_internal_encoding($encoding);
 	}
 }
 
@@ -5183,7 +5183,7 @@ 
  * @since 3.7.0
  */
 function reset_mbstring_encoding() {
-	mbstring_binary_safe_encoding( true );
+	mbstring_binary_safe_encoding(true);
 }
 
 /**
@@ -5196,12 +5196,12 @@ 
  * @param mixed $var Boolean value to validate.
  * @return bool Whether the value is validated.
  */
-function wp_validate_boolean( $var ) {
-	if ( is_bool( $var ) ) {
+function wp_validate_boolean($var) {
+	if (is_bool($var)) {
 		return $var;
 	}
 
-	if ( is_string( $var ) && 'false' === strtolower( $var ) ) {
+	if (is_string($var) && 'false' === strtolower($var)) {
 		return false;
 	}
 
@@ -5215,7 +5215,7 @@ 
  *
  * @param string $file The path to the file to delete.
  */
-function wp_delete_file( $file ) {
+function wp_delete_file($file) {
 	/**
 	 * Filter the path of the file to delete.
 	 *
@@ -5223,9 +5223,9 @@ 
 	 *
 	 * @param string $medium Path to the file to delete.
 	 */
-	$delete = apply_filters( 'wp_delete_file', $file );
-	if ( ! empty( $delete ) ) {
-		@unlink( $delete );
+	$delete = apply_filters('wp_delete_file', $file);
+	if ( ! empty($delete)) {
+		@unlink($delete);
 	}
 }
 
@@ -5239,12 +5239,12 @@ 
 function wp_post_preview_js() {
 	global $post;
 
-	if ( ! is_preview() || empty( $post ) ) {
+	if ( ! is_preview() || empty($post)) {
 		return;
 	}
 
 	// Has to match the window name used in post_submit_meta_box()
-	$name = 'wp-preview-' . (int) $post->ID;
+	$name = 'wp-preview-'.(int) $post->ID;
 
 	?>
 	<script>
@@ -5274,9 +5274,9 @@ 
  * @param string $date_string Date string to parse and format.
  * @return string Date formatted for ISO8601/RFC3339.
  */
-function mysql_to_rfc3339( $date_string ) {
-	$formatted = mysql2date( 'c', $date_string, false );
+function mysql_to_rfc3339($date_string) {
+	$formatted = mysql2date('c', $date_string, false);
 
 	// Strip timezone information
-	return preg_replace( '/(?:Z|[+-]\d{2}(?::\d{2})?)$/', '', $formatted );
+	return preg_replace('/(?:Z|[+-]\d{2}(?::\d{2})?)$/', '', $formatted);
 }

Braces +522 added lines, -369 removed lines

@@ -24,22 +24,26 @@ 
  * @return string|int|bool Formatted date string or Unix timestamp. False if $date is empty.
  */
 function mysql2date( $format, $date, $translate = true ) {
-	if ( empty( $date ) )
-		return false;
+	if ( empty( $date ) ) {
+			return false;
+	}
 
-	if ( 'G' == $format )
-		return strtotime( $date . ' +0000' );
+	if ( 'G' == $format ) {
+			return strtotime( $date . ' +0000' );
+	}
 
 	$i = strtotime( $date );
 
-	if ( 'U' == $format )
-		return $i;
+	if ( 'U' == $format ) {
+			return $i;
+	}
 
-	if ( $translate )
-		return date_i18n( $format, $i );
-	else
-		return date( $format, $i );
-}
+	if ( $translate ) {
+			return date_i18n( $format, $i );
+	} else {
+			return date( $format, $i );
+	}
+	}
 
 /**
  * Retrieve the current time based on specified type.
@@ -91,10 +95,11 @@ 
 	$i = $unixtimestamp;
 
 	if ( false === $i ) {
-		if ( ! $gmt )
-			$i = current_time( 'timestamp' );
-		else
-			$i = time();
+		if ( ! $gmt ) {
+					$i = current_time( 'timestamp' );
+		} else {
+					$i = time();
+		}
 		// we should not let date() interfere with our
 		// specially computed timestamp
 		$gmt = true;
@@ -297,11 +302,13 @@ 
 	// The day of the week from the timestamp.
 	$weekday = date( 'w', $day );
 
-	if ( !is_numeric($start_of_week) )
-		$start_of_week = get_option( 'start_of_week' );
+	if ( !is_numeric($start_of_week) ) {
+			$start_of_week = get_option( 'start_of_week' );
+	}
 
-	if ( $weekday < $start_of_week )
-		$weekday += 7;
+	if ( $weekday < $start_of_week ) {
+			$weekday += 7;
+	}
 
 	// The most recent week start day on or before $day.
 	$start = $day - DAY_IN_SECONDS * ( $weekday - $start_of_week );
@@ -320,8 +327,10 @@ 
  * @return mixed Unserialized data can be any type.
  */
 function maybe_unserialize( $original ) {
-	if ( is_serialized( $original ) ) // don't attempt to unserialize data that wasn't serialized going in
+	if ( is_serialized( $original ) ) {
+		// don't attempt to unserialize data that wasn't serialized going in
 		return @unserialize( $original );
+	}
 	return $original;
 }
 
@@ -361,13 +370,16 @@ 
 		$semicolon = strpos( $data, ';' );
 		$brace     = strpos( $data, '}' );
 		// Either ; or } must exist.
-		if ( false === $semicolon && false === $brace )
-			return false;
+		if ( false === $semicolon && false === $brace ) {
+					return false;
+		}
 		// But neither must be in the first X characters.
-		if ( false !== $semicolon && $semicolon < 3 )
-			return false;
-		if ( false !== $brace && $brace < 4 )
-			return false;
+		if ( false !== $semicolon && $semicolon < 3 ) {
+					return false;
+		}
+		if ( false !== $brace && $brace < 4 ) {
+					return false;
+		}
 	}
 	$token = $data[0];
 	switch ( $token ) {
@@ -430,14 +442,16 @@ 
  * @return mixed A scalar data
  */
 function maybe_serialize( $data ) {
-	if ( is_array( $data ) || is_object( $data ) )
-		return serialize( $data );
+	if ( is_array( $data ) || is_object( $data ) ) {
+			return serialize( $data );
+	}
 
 	// Double serialization is required for backward compatibility.
 	// See https://core.trac.wordpress.org/ticket/12930
 	// Also the world will end. See WP 3.6.1.
-	if ( is_serialized( $data, false ) )
-		return serialize( $data );
+	if ( is_serialized( $data, false ) ) {
+			return serialize( $data );
+	}
 
 	return $data;
 }
@@ -565,20 +579,23 @@ 
 	foreach ( $pung as $link_test ) {
 		if ( ! in_array( $link_test, $post_links_temp ) ) { // link no longer in post
 			$mids = $wpdb->get_col( $wpdb->prepare("SELECT meta_id FROM $wpdb->postmeta WHERE post_id = %d AND meta_key = 'enclosure' AND meta_value LIKE %s", $post_ID, $wpdb->esc_like( $link_test ) . '%') );
-			foreach ( $mids as $mid )
-				delete_metadata_by_mid( 'post', $mid );
+			foreach ( $mids as $mid ) {
+							delete_metadata_by_mid( 'post', $mid );
+			}
 		}
 	}
 
 	foreach ( (array) $post_links_temp as $link_test ) {
 		if ( !in_array( $link_test, $pung ) ) { // If we haven't pung it already
 			$test = @parse_url( $link_test );
-			if ( false === $test )
-				continue;
-			if ( isset( $test['query'] ) )
-				$post_links[] = $link_test;
-			elseif ( isset($test['path']) && ( $test['path'] != '/' ) &&  ($test['path'] != '' ) )
-				$post_links[] = $link_test;
+			if ( false === $test ) {
+							continue;
+			}
+			if ( isset( $test['query'] ) ) {
+							$post_links[] = $link_test;
+			} elseif ( isset($test['path']) && ( $test['path'] != '/' ) &&  ($test['path'] != '' ) ) {
+							$post_links[] = $link_test;
+			}
 		}
 	}
 
@@ -636,13 +653,15 @@ 
  * @return bool|string False on failure, headers on success.
  */
 function wp_get_http_headers( $url, $deprecated = false ) {
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '2.7' );
+	if ( !empty( $deprecated ) ) {
+			_deprecated_argument( __FUNCTION__, '2.7' );
+	}
 
 	$response = wp_safe_remote_head( $url );
 
-	if ( is_wp_error( $response ) )
-		return false;
+	if ( is_wp_error( $response ) ) {
+			return false;
+	}
 
 	return wp_remote_retrieve_headers( $response );
 }
@@ -660,11 +679,12 @@ 
  */
 function is_new_day() {
 	global $currentday, $previousday;
-	if ( $currentday != $previousday )
-		return 1;
-	else
-		return 0;
-}
+	if ( $currentday != $previousday ) {
+			return 1;
+	} else {
+			return 0;
+	}
+	}
 
 /**
  * Build URL query based on an associative and, or indexed array.
@@ -707,27 +727,33 @@ 
 	$ret = array();
 
 	foreach ( (array) $data as $k => $v ) {
-		if ( $urlencode)
-			$k = urlencode($k);
-		if ( is_int($k) && $prefix != null )
-			$k = $prefix.$k;
-		if ( !empty($key) )
-			$k = $key . '%5B' . $k . '%5D';
-		if ( $v === null )
-			continue;
-		elseif ( $v === false )
-			$v = '0';
+		if ( $urlencode) {
+					$k = urlencode($k);
+		}
+		if ( is_int($k) && $prefix != null ) {
+					$k = $prefix.$k;
+		}
+		if ( !empty($key) ) {
+					$k = $key . '%5B' . $k . '%5D';
+		}
+		if ( $v === null ) {
+					continue;
+		} elseif ( $v === false ) {
+					$v = '0';
+		}
 
-		if ( is_array($v) || is_object($v) )
-			array_push($ret,_http_build_query($v, '', $sep, $k, $urlencode));
-		elseif ( $urlencode )
-			array_push($ret, $k.'='.urlencode($v));
-		else
-			array_push($ret, $k.'='.$v);
+		if ( is_array($v) || is_object($v) ) {
+					array_push($ret,_http_build_query($v, '', $sep, $k, $urlencode));
+		} elseif ( $urlencode ) {
+					array_push($ret, $k.'='.urlencode($v));
+		} else {
+					array_push($ret, $k.'='.$v);
+		}
 	}
 
-	if ( null === $sep )
-		$sep = ini_get('arg_separator.output');
+	if ( null === $sep ) {
+			$sep = ini_get('arg_separator.output');
+	}
 
 	return implode($sep, $ret);
 }
@@ -770,21 +796,24 @@ 
 function add_query_arg() {
 	$args = func_get_args();
 	if ( is_array( $args[0] ) ) {
-		if ( count( $args ) < 2 || false === $args[1] )
-			$uri = $_SERVER['REQUEST_URI'];
-		else
-			$uri = $args[1];
+		if ( count( $args ) < 2 || false === $args[1] ) {
+					$uri = $_SERVER['REQUEST_URI'];
+		} else {
+					$uri = $args[1];
+		}
 	} else {
-		if ( count( $args ) < 3 || false === $args[2] )
-			$uri = $_SERVER['REQUEST_URI'];
-		else
-			$uri = $args[2];
+		if ( count( $args ) < 3 || false === $args[2] ) {
+					$uri = $_SERVER['REQUEST_URI'];
+		} else {
+					$uri = $args[2];
+		}
 	}
 
-	if ( $frag = strstr( $uri, '#' ) )
-		$uri = substr( $uri, 0, -strlen( $frag ) );
-	else
-		$frag = '';
+	if ( $frag = strstr( $uri, '#' ) ) {
+			$uri = substr( $uri, 0, -strlen( $frag ) );
+	} else {
+			$frag = '';
+	}
 
 	if ( 0 === stripos( $uri, 'http://' ) ) {
 		$protocol = 'http://';
@@ -818,8 +847,9 @@ 
 	}
 
 	foreach ( $qs as $k => $v ) {
-		if ( $v === false )
-			unset( $qs[$k] );
+		if ( $v === false ) {
+					unset( $qs[$k] );
+		}
 	}
 
 	$ret = build_query( $qs );
@@ -841,8 +871,9 @@ 
  */
 function remove_query_arg( $key, $query = false ) {
 	if ( is_array( $key ) ) { // removing multiple keys
-		foreach ( $key as $k )
-			$query = add_query_arg( $k, false, $query );
+		foreach ( $key as $k ) {
+					$query = add_query_arg( $k, false, $query );
+		}
 		return $query;
 	}
 	return add_query_arg( $key, false, $query );
@@ -922,16 +953,18 @@ 
 function wp_remote_fopen( $uri ) {
 	$parsed_url = @parse_url( $uri );
 
-	if ( !$parsed_url || !is_array( $parsed_url ) )
-		return false;
+	if ( !$parsed_url || !is_array( $parsed_url ) ) {
+			return false;
+	}
 
 	$options = array();
 	$options['timeout'] = 10;
 
 	$response = wp_safe_remote_get( $uri, $options );
 
-	if ( is_wp_error( $response ) )
-		return false;
+	if ( is_wp_error( $response ) ) {
+			return false;
+	}
 
 	return wp_remote_retrieve_body( $response );
 }
@@ -951,9 +984,10 @@ 
 	global $wp, $wp_query, $wp_the_query;
 	$wp->main( $query_vars );
 
-	if ( !isset($wp_the_query) )
-		$wp_the_query = $wp_query;
-}
+	if ( !isset($wp_the_query) ) {
+			$wp_the_query = $wp_query;
+	}
+	}
 
 /**
  * Retrieve the description for the HTTP status.
@@ -1038,11 +1072,12 @@ 
 		);
 	}
 
-	if ( isset( $wp_header_to_desc[$code] ) )
-		return $wp_header_to_desc[$code];
-	else
-		return '';
-}
+	if ( isset( $wp_header_to_desc[$code] ) ) {
+			return $wp_header_to_desc[$code];
+	} else {
+			return '';
+	}
+	}
 
 /**
  * Set HTTP status header.
@@ -1066,8 +1101,8 @@ 
 
 	$protocol = wp_get_server_protocol();
 	$status_header = "$protocol $code $description";
-	if ( function_exists( 'apply_filters' ) )
-
+	if ( function_exists( 'apply_filters' ) ) {
+	
 		/**
 		 * Filter an HTTP status header.
 		 *
@@ -1079,6 +1114,7 @@ 
 		 * @param string $protocol      Server protocol.
 		 */
 		$status_header = apply_filters( 'status_header', $status_header, $code, $description, $protocol );
+	}
 
 	@header( $status_header, true, $code );
 }
@@ -1152,9 +1188,10 @@ 
 		}
 	}
 
-	foreach ( $headers as $name => $field_value )
-		@header("{$name}: {$field_value}");
-}
+	foreach ( $headers as $name => $field_value ) {
+			@header("{$name}: {$field_value}");
+	}
+	}
 
 /**
  * Set the headers for caching for 10 days with JavaScript content type.
@@ -1217,8 +1254,9 @@ 
 	// Remove the pad, if present.
 	$feed = preg_replace( '/^_+/', '', $feed );
 
-	if ( $feed == '' || $feed == 'feed' )
-		$feed = get_default_feed();
+	if ( $feed == '' || $feed == 'feed' ) {
+			$feed = get_default_feed();
+	}
 
 	if ( ! has_action( "do_feed_{$feed}" ) ) {
 		wp_die( __( 'ERROR: This is not a valid feed template.' ), '', array( 'response' => 404 ) );
@@ -1271,11 +1309,12 @@ 
  * @param bool $for_comments True for the comment feed, false for normal feed.
  */
 function do_feed_rss2( $for_comments ) {
-	if ( $for_comments )
-		load_template( ABSPATH . WPINC . '/feed-rss2-comments.php' );
-	else
-		load_template( ABSPATH . WPINC . '/feed-rss2.php' );
-}
+	if ( $for_comments ) {
+			load_template( ABSPATH . WPINC . '/feed-rss2-comments.php' );
+	} else {
+			load_template( ABSPATH . WPINC . '/feed-rss2.php' );
+	}
+	}
 
 /**
  * Load either Atom comment feed or Atom posts feed.
@@ -1287,11 +1326,12 @@ 
  * @param bool $for_comments True for the comment feed, false for normal feed.
  */
 function do_feed_atom( $for_comments ) {
-	if ($for_comments)
-		load_template( ABSPATH . WPINC . '/feed-atom-comments.php');
-	else
-		load_template( ABSPATH . WPINC . '/feed-atom.php' );
-}
+	if ($for_comments) {
+			load_template( ABSPATH . WPINC . '/feed-atom-comments.php');
+	} else {
+			load_template( ABSPATH . WPINC . '/feed-atom.php' );
+	}
+	}
 
 /**
  * Display the robots.txt file content.
@@ -1355,29 +1395,33 @@ 
 	 * Check cache first. If options table goes away and we have true
 	 * cached, oh well.
 	 */
-	if ( wp_cache_get( 'is_blog_installed' ) )
-		return true;
+	if ( wp_cache_get( 'is_blog_installed' ) ) {
+			return true;
+	}
 
 	$suppress = $wpdb->suppress_errors();
 	if ( ! wp_installing() ) {
 		$alloptions = wp_load_alloptions();
 	}
 	// If siteurl is not set to autoload, check it specifically
-	if ( !isset( $alloptions['siteurl'] ) )
-		$installed = $wpdb->get_var( "SELECT option_value FROM $wpdb->options WHERE option_name = 'siteurl'" );
-	else
-		$installed = $alloptions['siteurl'];
+	if ( !isset( $alloptions['siteurl'] ) ) {
+			$installed = $wpdb->get_var( "SELECT option_value FROM $wpdb->options WHERE option_name = 'siteurl'" );
+	} else {
+			$installed = $alloptions['siteurl'];
+	}
 	$wpdb->suppress_errors( $suppress );
 
 	$installed = !empty( $installed );
 	wp_cache_set( 'is_blog_installed', $installed );
 
-	if ( $installed )
-		return true;
+	if ( $installed ) {
+			return true;
+	}
 
 	// If visiting repair.php, return true and let it take over.
-	if ( defined( 'WP_REPAIRING' ) )
-		return true;
+	if ( defined( 'WP_REPAIRING' ) ) {
+			return true;
+	}
 
 	$suppress = $wpdb->suppress_errors();
 
@@ -1389,13 +1433,16 @@ 
 	$wp_tables = $wpdb->tables();
 	foreach ( $wp_tables as $table ) {
 		// The existence of custom user tables shouldn't suggest an insane state or prevent a clean install.
-		if ( defined( 'CUSTOM_USER_TABLE' ) && CUSTOM_USER_TABLE == $table )
-			continue;
-		if ( defined( 'CUSTOM_USER_META_TABLE' ) && CUSTOM_USER_META_TABLE == $table )
-			continue;
+		if ( defined( 'CUSTOM_USER_TABLE' ) && CUSTOM_USER_TABLE == $table ) {
+					continue;
+		}
+		if ( defined( 'CUSTOM_USER_META_TABLE' ) && CUSTOM_USER_META_TABLE == $table ) {
+					continue;
+		}
 
-		if ( ! $wpdb->get_results( "DESCRIBE $table;" ) )
-			continue;
+		if ( ! $wpdb->get_results( "DESCRIBE $table;" ) ) {
+					continue;
+		}
 
 		// One or more tables exist. We are insane.
 
@@ -1458,11 +1505,13 @@ 
 	$name = esc_attr( $name );
 	$nonce_field = '<input type="hidden" id="' . $name . '" name="' . $name . '" value="' . wp_create_nonce( $action ) . '" />';
 
-	if ( $referer )
-		$nonce_field .= wp_referer_field( false );
+	if ( $referer ) {
+			$nonce_field .= wp_referer_field( false );
+	}
 
-	if ( $echo )
-		echo $nonce_field;
+	if ( $echo ) {
+			echo $nonce_field;
+	}
 
 	return $nonce_field;
 }
@@ -1481,8 +1530,9 @@ 
 function wp_referer_field( $echo = true ) {
 	$referer_field = '<input type="hidden" name="_wp_http_referer" value="'. esc_attr( wp_unslash( $_SERVER['REQUEST_URI'] ) ) . '" />';
 
-	if ( $echo )
-		echo $referer_field;
+	if ( $echo ) {
+			echo $referer_field;
+	}
 	return $referer_field;
 }
 
@@ -1505,8 +1555,9 @@ 
 		$ref = 'previous' == $jump_back_to ? wp_get_referer() : wp_unslash( $_SERVER['REQUEST_URI'] );
 	}
 	$orig_referer_field = '<input type="hidden" name="_wp_original_http_referer" value="' . esc_attr( $ref ) . '" />';
-	if ( $echo )
-		echo $orig_referer_field;
+	if ( $echo ) {
+			echo $orig_referer_field;
+	}
 	return $orig_referer_field;
 }
 
@@ -1560,8 +1611,9 @@ 
  * @return string|false False if no original referer or original referer if set.
  */
 function wp_get_original_referer() {
-	if ( ! empty( $_REQUEST['_wp_original_http_referer'] ) && function_exists( 'wp_validate_redirect' ) )
-		return wp_validate_redirect( wp_unslash( $_REQUEST['_wp_original_http_referer'] ), false );
+	if ( ! empty( $_REQUEST['_wp_original_http_referer'] ) && function_exists( 'wp_validate_redirect' ) ) {
+			return wp_validate_redirect( wp_unslash( $_REQUEST['_wp_original_http_referer'] ), false );
+	}
 	return false;
 }
 
@@ -1596,11 +1648,13 @@ 
 	 * Use rtrim() instead of untrailingslashit to avoid formatting.php dependency.
 	 */
 	$target = rtrim($target, '/');
-	if ( empty($target) )
-		$target = '/';
+	if ( empty($target) ) {
+			$target = '/';
+	}
 
-	if ( file_exists( $target ) )
-		return @is_dir( $target );
+	if ( file_exists( $target ) ) {
+			return @is_dir( $target );
+	}
 
 	// We need to find the permissions of the parent folder that exists and inherit that.
 	$target_parent = dirname( $target );
@@ -1649,15 +1703,18 @@ 
 	 * This is definitive if true but fails if $path does not exist or contains
 	 * a symbolic link.
 	 */
-	if ( realpath($path) == $path )
-		return true;
+	if ( realpath($path) == $path ) {
+			return true;
+	}
 
-	if ( strlen($path) == 0 || $path[0] == '.' )
-		return false;
+	if ( strlen($path) == 0 || $path[0] == '.' ) {
+			return false;
+	}
 
 	// Windows allows absolute paths like this.
-	if ( preg_match('#^[a-zA-Z]:\\\\#', $path) )
-		return true;
+	if ( preg_match('#^[a-zA-Z]:\\\\#', $path) ) {
+			return true;
+	}
 
 	// A path starting with / or \ is absolute; anything else is relative.
 	return ( $path[0] == '/' || $path[0] == '\\' );
@@ -1676,8 +1733,9 @@ 
  * @return string The path with the base or absolute path.
  */
 function path_join( $base, $path ) {
-	if ( path_is_absolute($path) )
-		return $path;
+	if ( path_is_absolute($path) ) {
+			return $path;
+	}
 
 	return rtrim($base, '/') . '/' . ltrim($path, '/');
 }
@@ -1724,25 +1782,30 @@ 
  */
 function get_temp_dir() {
 	static $temp = '';
-	if ( defined('WP_TEMP_DIR') )
-		return trailingslashit(WP_TEMP_DIR);
+	if ( defined('WP_TEMP_DIR') ) {
+			return trailingslashit(WP_TEMP_DIR);
+	}
 
-	if ( $temp )
-		return trailingslashit( $temp );
+	if ( $temp ) {
+			return trailingslashit( $temp );
+	}
 
 	if ( function_exists('sys_get_temp_dir') ) {
 		$temp = sys_get_temp_dir();
-		if ( @is_dir( $temp ) && wp_is_writable( $temp ) )
-			return trailingslashit( $temp );
+		if ( @is_dir( $temp ) && wp_is_writable( $temp ) ) {
+					return trailingslashit( $temp );
+		}
 	}
 
 	$temp = ini_get('upload_tmp_dir');
-	if ( @is_dir( $temp ) && wp_is_writable( $temp ) )
-		return trailingslashit( $temp );
+	if ( @is_dir( $temp ) && wp_is_writable( $temp ) ) {
+			return trailingslashit( $temp );
+	}
 
 	$temp = WP_CONTENT_DIR . '/';
-	if ( is_dir( $temp ) && wp_is_writable( $temp ) )
-		return $temp;
+	if ( is_dir( $temp ) && wp_is_writable( $temp ) ) {
+			return $temp;
+	}
 
 	return '/tmp/';
 }
@@ -1761,11 +1824,12 @@ 
  * @return bool Whether the path is writable.
  */
 function wp_is_writable( $path ) {
-	if ( 'WIN' === strtoupper( substr( PHP_OS, 0, 3 ) ) )
-		return win_is_writable( $path );
-	else
-		return @is_writable( $path );
-}
+	if ( 'WIN' === strtoupper( substr( PHP_OS, 0, 3 ) ) ) {
+			return win_is_writable( $path );
+	} else {
+			return @is_writable( $path );
+	}
+	}
 
 /**
  * Workaround for Windows bug in is_writable() function
@@ -1793,11 +1857,13 @@ 
 	// check tmp file for read/write capabilities
 	$should_delete_tmp_file = !file_exists( $path );
 	$f = @fopen( $path, 'a' );
-	if ( $f === false )
-		return false;
+	if ( $f === false ) {
+			return false;
+	}
 	fclose( $f );
-	if ( $should_delete_tmp_file )
-		unlink( $path );
+	if ( $should_delete_tmp_file ) {
+			unlink( $path );
+	}
 	return true;
 }
 
@@ -1921,10 +1987,11 @@ 
 	}
 
 	if ( !$url = get_option( 'upload_url_path' ) ) {
-		if ( empty($upload_path) || ( 'wp-content/uploads' == $upload_path ) || ( $upload_path == $dir ) )
-			$url = WP_CONTENT_URL . '/uploads';
-		else
-			$url = trailingslashit( $siteurl ) . $upload_path;
+		if ( empty($upload_path) || ( 'wp-content/uploads' == $upload_path ) || ( $upload_path == $dir ) ) {
+					$url = WP_CONTENT_URL . '/uploads';
+		} else {
+					$url = trailingslashit( $siteurl ) . $upload_path;
+		}
 	}
 
 	/*
@@ -1949,10 +2016,11 @@ 
 			 * had wp-content/uploads for the main site.)
 			 */
 
-			if ( defined( 'MULTISITE' ) )
-				$ms_dir = '/sites/' . get_current_blog_id();
-			else
-				$ms_dir = '/' . get_current_blog_id();
+			if ( defined( 'MULTISITE' ) ) {
+							$ms_dir = '/sites/' . get_current_blog_id();
+			} else {
+							$ms_dir = '/' . get_current_blog_id();
+			}
 
 			$dir .= $ms_dir;
 			$url .= $ms_dir;
@@ -1972,10 +2040,11 @@ 
 			 * rewriting in multisite, the resulting URL is /files. (#WP22702 for background.)
 			 */
 
-			if ( defined( 'BLOGUPLOADDIR' ) )
-				$dir = untrailingslashit( BLOGUPLOADDIR );
-			else
-				$dir = ABSPATH . UPLOADS;
+			if ( defined( 'BLOGUPLOADDIR' ) ) {
+							$dir = untrailingslashit( BLOGUPLOADDIR );
+			} else {
+							$dir = ABSPATH . UPLOADS;
+			}
 			$url = trailingslashit( $siteurl ) . 'files';
 		}
 	}
@@ -1986,8 +2055,9 @@ 
 	$subdir = '';
 	if ( get_option( 'uploads_use_yearmonth_folders' ) ) {
 		// Generate the yearly and monthly dirs
-		if ( !$time )
-			$time = current_time( 'mysql' );
+		if ( !$time ) {
+					$time = current_time( 'mysql' );
+		}
 		$y = substr( $time, 0, 4 );
 		$m = substr( $time, 5, 2 );
 		$subdir = "/$y/$m";
@@ -2033,8 +2103,9 @@ 
 	$name = basename($filename, $ext);
 
 	// Edge case: if file is named '.ext', treat as an empty name.
-	if ( $name === $ext )
-		$name = '';
+	if ( $name === $ext ) {
+			$name = '';
+	}
 
 	/*
 	 * Increment the file number until we have a unique file to save in $dir.
@@ -2108,20 +2179,24 @@ 
  * @return array
  */
 function wp_upload_bits( $name, $deprecated, $bits, $time = null ) {
-	if ( !empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '2.0' );
+	if ( !empty( $deprecated ) ) {
+			_deprecated_argument( __FUNCTION__, '2.0' );
+	}
 
-	if ( empty( $name ) )
-		return array( 'error' => __( 'Empty filename' ) );
+	if ( empty( $name ) ) {
+			return array( 'error' => __( 'Empty filename' ) );
+	}
 
 	$wp_filetype = wp_check_filetype( $name );
-	if ( ! $wp_filetype['ext'] && ! current_user_can( 'unfiltered_upload' ) )
-		return array( 'error' => __( 'Invalid file type' ) );
+	if ( ! $wp_filetype['ext'] && ! current_user_can( 'unfiltered_upload' ) ) {
+			return array( 'error' => __( 'Invalid file type' ) );
+	}
 
 	$upload = wp_upload_dir( $time );
 
-	if ( $upload['error'] !== false )
-		return $upload;
+	if ( $upload['error'] !== false ) {
+			return $upload;
+	}
 
 	/**
 	 * Filter whether to treat the upload bits as an error.
@@ -2143,18 +2218,20 @@ 
 
 	$new_file = $upload['path'] . "/$filename";
 	if ( ! wp_mkdir_p( dirname( $new_file ) ) ) {
-		if ( 0 === strpos( $upload['basedir'], ABSPATH ) )
-			$error_path = str_replace( ABSPATH, '', $upload['basedir'] ) . $upload['subdir'];
-		else
-			$error_path = basename( $upload['basedir'] ) . $upload['subdir'];
+		if ( 0 === strpos( $upload['basedir'], ABSPATH ) ) {
+					$error_path = str_replace( ABSPATH, '', $upload['basedir'] ) . $upload['subdir'];
+		} else {
+					$error_path = basename( $upload['basedir'] ) . $upload['subdir'];
+		}
 
 		$message = sprintf( __( 'Unable to create directory %s. Is its parent directory writable by the server?' ), $error_path );
 		return array( 'error' => $message );
 	}
 
 	$ifp = @ fopen( $new_file, 'wb' );
-	if ( ! $ifp )
-		return array( 'error' => sprintf( __( 'Could not write file %s' ), $new_file ) );
+	if ( ! $ifp ) {
+			return array( 'error' => sprintf( __( 'Could not write file %s' ), $new_file ) );
+	}
 
 	@fwrite( $ifp, $bits );
 	fclose( $ifp );
@@ -2207,10 +2284,11 @@ 
 		'code'        => array( 'css', 'htm',  'html', 'php',  'js' ),
 	) );
 
-	foreach ( $ext2type as $type => $exts )
-		if ( in_array( $ext, $exts ) )
+	foreach ( $ext2type as $type => $exts ) {
+			if ( in_array( $ext, $exts ) )
 			return $type;
-}
+	}
+	}
 
 /**
  * Retrieve the file type from the file name.
@@ -2224,8 +2302,9 @@ 
  * @return array Values with extension first and mime type.
  */
 function wp_check_filetype( $filename, $mimes = null ) {
-	if ( empty($mimes) )
-		$mimes = get_allowed_mime_types();
+	if ( empty($mimes) ) {
+			$mimes = get_allowed_mime_types();
+	}
 	$type = false;
 	$ext = false;
 
@@ -2464,11 +2543,13 @@ 
 	$t = wp_get_mime_types();
 
 	unset( $t['swf'], $t['exe'] );
-	if ( function_exists( 'current_user_can' ) )
-		$unfiltered = $user ? user_can( $user, 'unfiltered_html' ) : current_user_can( 'unfiltered_html' );
+	if ( function_exists( 'current_user_can' ) ) {
+			$unfiltered = $user ? user_can( $user, 'unfiltered_html' ) : current_user_can( 'unfiltered_html' );
+	}
 
-	if ( empty( $unfiltered ) )
-		unset( $t['htm|html'] );
+	if ( empty( $unfiltered ) ) {
+			unset( $t['htm|html'] );
+	}
 
 	/**
 	 * Filter list of allowed mime types and file extensions.
@@ -2500,8 +2581,9 @@ 
 		$html .= sprintf( __( "Do you really want to <a href='%s'>log out</a>?"), wp_logout_url( $redirect_to ) );
 	} else {
 		$html = __( 'Are you sure you want to do this?' );
-		if ( wp_get_referer() )
-			$html .= "</p><p><a href='" . esc_url( remove_query_arg( 'updated', wp_get_referer() ) ) . "'>" . __( 'Please try again.' ) . "</a>";
+		if ( wp_get_referer() ) {
+					$html .= "</p><p><a href='" . esc_url( remove_query_arg( 'updated', wp_get_referer() ) ) . "'>" . __( 'Please try again.' ) . "</a>";
+		}
 	}
 
 	wp_die( $html, __( 'WordPress Failure Notice' ), 403 );
@@ -2603,8 +2685,9 @@ 
 	if ( function_exists( 'is_wp_error' ) && is_wp_error( $message ) ) {
 		if ( empty( $title ) ) {
 			$error_data = $message->get_error_data();
-			if ( is_array( $error_data ) && isset( $error_data['title'] ) )
-				$title = $error_data['title'];
+			if ( is_array( $error_data ) && isset( $error_data['title'] ) ) {
+							$title = $error_data['title'];
+			}
 		}
 		$errors = $message->get_error_messages();
 		switch ( count( $errors ) ) {
@@ -2634,19 +2717,26 @@ 
 			header( 'Content-Type: text/html; charset=utf-8' );
 		}
 
-		if ( empty($title) )
-			$title = $have_gettext ? __('WordPress &rsaquo; Error') : 'WordPress &rsaquo; Error';
+		if ( empty($title) ) {
+					$title = $have_gettext ? __('WordPress &rsaquo; Error') : 'WordPress &rsaquo; Error';
+		}
 
 		$text_direction = 'ltr';
-		if ( isset($r['text_direction']) && 'rtl' == $r['text_direction'] )
-			$text_direction = 'rtl';
-		elseif ( function_exists( 'is_rtl' ) && is_rtl() )
-			$text_direction = 'rtl';
-?>
+		if ( isset($r['text_direction']) && 'rtl' == $r['text_direction'] ) {
+					$text_direction = 'rtl';
+		} elseif ( function_exists( 'is_rtl' ) && is_rtl() ) {
+					$text_direction = 'rtl';
+		}
+		?>
 <!DOCTYPE html>
 <!-- Ticket #11289, IE bug fix: always pad the error page with enough characters such that it is greater than 512 bytes, even after gzip compression abcdefghijklmnopqrstuvwxyz1234567890aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz11223344556677889900abacbcbdcdcededfefegfgfhghgihihjijikjkjlklkmlmlnmnmononpopoqpqprqrqsrsrtstsubcbcdcdedefefgfabcadefbghicjkldmnoepqrfstugvwxhyz1i234j567k890laabmbccnddeoeffpgghqhiirjjksklltmmnunoovppqwqrrxsstytuuzvvw0wxx1yyz2z113223434455666777889890091abc2def3ghi4jkl5mno6pqr7stu8vwx9yz11aab2bcc3dd4ee5ff6gg7hh8ii9j0jk1kl2lmm3nnoo4p5pq6qrr7ss8tt9uuvv0wwx1x2yyzz13aba4cbcb5dcdc6dedfef8egf9gfh0ghg1ihi2hji3jik4jkj5lkl6kml7mln8mnm9ono
 -->
-<html xmlns="http://www.w3.org/1999/xhtml" <?php if ( function_exists( 'language_attributes' ) && function_exists( 'is_rtl' ) ) language_attributes(); else echo "dir='$text_direction'"; ?>>
+<html xmlns="http://www.w3.org/1999/xhtml" <?php if ( function_exists( 'language_attributes' ) && function_exists( 'is_rtl' ) ) {
+	language_attributes();
+} else {
+	echo "dir='$text_direction'";
+}
+?>>
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<meta name="viewport" content="width=device-width">
@@ -2815,8 +2905,9 @@ 
  * @param string $message Optional. Response to print. Default empty.
  */
 function _ajax_wp_die_handler( $message = '' ) {
-	if ( is_scalar( $message ) )
-		die( (string) $message );
+	if ( is_scalar( $message ) ) {
+			die( (string) $message );
+	}
 	die( '0' );
 }
 
@@ -2831,8 +2922,9 @@ 
  * @param string $message Optional. Response to print. Default empty.
  */
 function _scalar_wp_die_handler( $message = '' ) {
-	if ( is_scalar( $message ) )
-		die( (string) $message );
+	if ( is_scalar( $message ) ) {
+			die( (string) $message );
+	}
 	die();
 }
 
@@ -3038,11 +3130,12 @@ 
 function wp_send_json( $response ) {
 	@header( 'Content-Type: application/json; charset=' . get_option( 'blog_charset' ) );
 	echo wp_json_encode( $response );
-	if ( defined( 'DOING_AJAX' ) && DOING_AJAX )
-		wp_die();
-	else
-		die;
-}
+	if ( defined( 'DOING_AJAX' ) && DOING_AJAX ) {
+			wp_die();
+	} else {
+			die;
+	}
+	}
 
 /**
  * Send a JSON response back to an Ajax request, indicating success.
@@ -3054,8 +3147,9 @@ 
 function wp_send_json_success( $data = null ) {
 	$response = array( 'success' => true );
 
-	if ( isset( $data ) )
-		$response['data'] = $data;
+	if ( isset( $data ) ) {
+			$response['data'] = $data;
+	}
 
 	wp_send_json( $response );
 }
@@ -3111,8 +3205,9 @@ 
  * @return string Homepage location.
  */
 function _config_wp_home( $url = '' ) {
-	if ( defined( 'WP_HOME' ) )
-		return untrailingslashit( WP_HOME );
+	if ( defined( 'WP_HOME' ) ) {
+			return untrailingslashit( WP_HOME );
+	}
 	return $url;
 }
 
@@ -3132,8 +3227,9 @@ 
  * @return string The WordPress Site URL.
  */
 function _config_wp_siteurl( $url = '' ) {
-	if ( defined( 'WP_SITEURL' ) )
-		return untrailingslashit( WP_SITEURL );
+	if ( defined( 'WP_SITEURL' ) ) {
+			return untrailingslashit( WP_SITEURL );
+	}
 	return $url;
 }
 
@@ -3197,8 +3293,9 @@ 
 	global $wpsmiliestrans, $wp_smiliessearch;
 
 	// don't bother setting up smilies if they are disabled
-	if ( !get_option( 'use_smilies' ) )
-		return;
+	if ( !get_option( 'use_smilies' ) ) {
+			return;
+	}
 
 	if ( !isset( $wpsmiliestrans ) ) {
 		$wpsmiliestrans = array(
@@ -3302,15 +3399,17 @@ 
  * @return array Merged user defined values with defaults.
  */
 function wp_parse_args( $args, $defaults = '' ) {
-	if ( is_object( $args ) )
-		$r = get_object_vars( $args );
-	elseif ( is_array( $args ) )
-		$r =& $args;
-	else
-		wp_parse_str( $args, $r );
-
-	if ( is_array( $defaults ) )
-		return array_merge( $defaults, $r );
+	if ( is_object( $args ) ) {
+			$r = get_object_vars( $args );
+	} elseif ( is_array( $args ) ) {
+			$r =& $args;
+	} else {
+			wp_parse_str( $args, $r );
+	}
+
+	if ( is_array( $defaults ) ) {
+			return array_merge( $defaults, $r );
+	}
 	return $r;
 }
 
@@ -3323,8 +3422,9 @@ 
  * @return array Sanitized array of IDs.
  */
 function wp_parse_id_list( $list ) {
-	if ( !is_array($list) )
-		$list = preg_split('/[\s,]+/', $list);
+	if ( !is_array($list) ) {
+			$list = preg_split('/[\s,]+/', $list);
+	}
 
 	return array_unique(array_map('absint', $list));
 }
@@ -3340,9 +3440,10 @@ 
  */
 function wp_array_slice_assoc( $array, $keys ) {
 	$slice = array();
-	foreach ( $keys as $key )
-		if ( isset( $array[ $key ] ) )
+	foreach ( $keys as $key ) {
+			if ( isset( $array[ $key ] ) )
 			$slice[ $key ] = $array[ $key ];
+	}
 
 	return $slice;
 }
@@ -3382,13 +3483,15 @@ 
  * @return array A list of objects or object fields.
  */
 function wp_filter_object_list( $list, $args = array(), $operator = 'and', $field = false ) {
-	if ( ! is_array( $list ) )
-		return array();
+	if ( ! is_array( $list ) ) {
+			return array();
+	}
 
 	$list = wp_list_filter( $list, $args, $operator );
 
-	if ( $field )
-		$list = wp_list_pluck( $list, $field );
+	if ( $field ) {
+			$list = wp_list_pluck( $list, $field );
+	}
 
 	return $list;
 }
@@ -3408,11 +3511,13 @@ 
  * @return array Array of found values.
  */
 function wp_list_filter( $list, $args = array(), $operator = 'AND' ) {
-	if ( ! is_array( $list ) )
-		return array();
+	if ( ! is_array( $list ) ) {
+			return array();
+	}
 
-	if ( empty( $args ) )
-		return $list;
+	if ( empty( $args ) ) {
+			return $list;
+	}
 
 	$operator = strtoupper( $operator );
 	$count = count( $args );
@@ -3423,8 +3528,9 @@ 
 
 		$matched = 0;
 		foreach ( $args as $m_key => $m_value ) {
-			if ( array_key_exists( $m_key, $to_match ) && $m_value == $to_match[ $m_key ] )
-				$matched++;
+			if ( array_key_exists( $m_key, $to_match ) && $m_value == $to_match[ $m_key ] ) {
+							$matched++;
+			}
 		}
 
 		if ( ( 'AND' == $operator && $matched == $count )
@@ -3533,8 +3639,9 @@ 
 function wp_widgets_add_menu() {
 	global $submenu;
 
-	if ( ! current_theme_supports( 'widgets' ) )
-		return;
+	if ( ! current_theme_supports( 'widgets' ) ) {
+			return;
+	}
 
 	$submenu['themes.php'][7] = array( __( 'Widgets' ), 'edit_theme_options', 'widgets.php' );
 	ksort( $submenu['themes.php'], SORT_NUMERIC );
@@ -3549,9 +3656,10 @@ 
  */
 function wp_ob_end_flush_all() {
 	$levels = ob_get_level();
-	for ($i=0; $i<$levels; $i++)
-		ob_end_flush();
-}
+	for ($i=0; $i<$levels; $i++) {
+			ob_end_flush();
+	}
+	}
 
 /**
  * Load custom DB error or display WordPress DB error.
@@ -3583,8 +3691,9 @@ 
 	}
 
 	// If installing or in the admin, provide the verbose message.
-	if ( wp_installing() || defined( 'WP_ADMIN' ) )
-		wp_die($wpdb->error);
+	if ( wp_installing() || defined( 'WP_ADMIN' ) ) {
+			wp_die($wpdb->error);
+	}
 
 	// Otherwise, be terse.
 	status_header( 500 );
@@ -3592,7 +3701,10 @@ 
 	header( 'Content-Type: text/html; charset=utf-8' );
 ?>
 <!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"<?php if ( is_rtl() ) echo ' dir="rtl"'; ?>>
+<html xmlns="http://www.w3.org/1999/xhtml"<?php if ( is_rtl() ) {
+	echo ' dir="rtl"';
+}
+?>>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<title><?php _e( 'Database Error' ); ?></title>
@@ -3658,15 +3770,17 @@ 
 	 */
 	if ( WP_DEBUG && apply_filters( 'deprecated_function_trigger_error', true ) ) {
 		if ( function_exists( '__' ) ) {
-			if ( ! is_null( $replacement ) )
-				trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.'), $function, $version, $replacement ) );
-			else
-				trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.'), $function, $version ) );
+			if ( ! is_null( $replacement ) ) {
+							trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.'), $function, $version, $replacement ) );
+			} else {
+							trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.'), $function, $version ) );
+			}
 		} else {
-			if ( ! is_null( $replacement ) )
-				trigger_error( sprintf( '%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.', $function, $version, $replacement ) );
-			else
-				trigger_error( sprintf( '%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.', $function, $version ) );
+			if ( ! is_null( $replacement ) ) {
+							trigger_error( sprintf( '%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.', $function, $version, $replacement ) );
+			} else {
+							trigger_error( sprintf( '%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.', $function, $version ) );
+			}
 		}
 	}
 }
@@ -3782,15 +3896,17 @@ 
 	if ( WP_DEBUG && apply_filters( 'deprecated_file_trigger_error', true ) ) {
 		$message = empty( $message ) ? '' : ' ' . $message;
 		if ( function_exists( '__' ) ) {
-			if ( ! is_null( $replacement ) )
-				trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.'), $file, $version, $replacement ) . $message );
-			else
-				trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.'), $file, $version ) . $message );
+			if ( ! is_null( $replacement ) ) {
+							trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.'), $file, $version, $replacement ) . $message );
+			} else {
+							trigger_error( sprintf( __('%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.'), $file, $version ) . $message );
+			}
 		} else {
-			if ( ! is_null( $replacement ) )
-				trigger_error( sprintf( '%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.', $file, $version, $replacement ) . $message );
-			else
-				trigger_error( sprintf( '%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.', $file, $version ) . $message );
+			if ( ! is_null( $replacement ) ) {
+							trigger_error( sprintf( '%1$s is <strong>deprecated</strong> since version %2$s! Use %3$s instead.', $file, $version, $replacement ) . $message );
+			} else {
+							trigger_error( sprintf( '%1$s is <strong>deprecated</strong> since version %2$s with no alternative available.', $file, $version ) . $message );
+			}
 		}
 	}
 }
@@ -3842,15 +3958,17 @@ 
 	 */
 	if ( WP_DEBUG && apply_filters( 'deprecated_argument_trigger_error', true ) ) {
 		if ( function_exists( '__' ) ) {
-			if ( ! is_null( $message ) )
-				trigger_error( sprintf( __('%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s! %3$s'), $function, $version, $message ) );
-			else
-				trigger_error( sprintf( __('%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s with no alternative available.'), $function, $version ) );
+			if ( ! is_null( $message ) ) {
+							trigger_error( sprintf( __('%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s! %3$s'), $function, $version, $message ) );
+			} else {
+							trigger_error( sprintf( __('%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s with no alternative available.'), $function, $version ) );
+			}
 		} else {
-			if ( ! is_null( $message ) )
-				trigger_error( sprintf( '%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s! %3$s', $function, $version, $message ) );
-			else
-				trigger_error( sprintf( '%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s with no alternative available.', $function, $version ) );
+			if ( ! is_null( $message ) ) {
+							trigger_error( sprintf( '%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s! %3$s', $function, $version, $message ) );
+			} else {
+							trigger_error( sprintf( '%1$s was called with an argument that is <strong>deprecated</strong> since version %2$s with no alternative available.', $function, $version ) );
+			}
 		}
 	}
 }
@@ -3936,19 +4054,22 @@ 
 function apache_mod_loaded($mod, $default = false) {
 	global $is_apache;
 
-	if ( !$is_apache )
-		return false;
+	if ( !$is_apache ) {
+			return false;
+	}
 
 	if ( function_exists( 'apache_get_modules' ) ) {
 		$mods = apache_get_modules();
-		if ( in_array($mod, $mods) )
-			return true;
+		if ( in_array($mod, $mods) ) {
+					return true;
+		}
 	} elseif ( function_exists( 'phpinfo' ) && false === strpos( ini_get( 'disable_functions' ), 'phpinfo' ) ) {
 			ob_start();
 			phpinfo(8);
 			$phpinfo = ob_get_clean();
-			if ( false !== strpos($phpinfo, $mod) )
-				return true;
+			if ( false !== strpos($phpinfo, $mod) ) {
+							return true;
+			}
 	}
 	return $default;
 }
@@ -4004,17 +4125,21 @@ 
  * @return int 0 means nothing is wrong, greater than 0 means something was wrong.
  */
 function validate_file( $file, $allowed_files = '' ) {
-	if ( false !== strpos( $file, '..' ) )
-		return 1;
+	if ( false !== strpos( $file, '..' ) ) {
+			return 1;
+	}
 
-	if ( false !== strpos( $file, './' ) )
-		return 1;
+	if ( false !== strpos( $file, './' ) ) {
+			return 1;
+	}
 
-	if ( ! empty( $allowed_files ) && ! in_array( $file, $allowed_files ) )
-		return 3;
+	if ( ! empty( $allowed_files ) && ! in_array( $file, $allowed_files ) ) {
+			return 3;
+	}
 
-	if (':' == substr( $file, 1, 1 ) )
-		return 2;
+	if (':' == substr( $file, 1, 1 ) ) {
+			return 2;
+	}
 
 	return 0;
 }
@@ -4028,10 +4153,12 @@ 
  */
 function is_ssl() {
 	if ( isset($_SERVER['HTTPS']) ) {
-		if ( 'on' == strtolower($_SERVER['HTTPS']) )
-			return true;
-		if ( '1' == $_SERVER['HTTPS'] )
-			return true;
+		if ( 'on' == strtolower($_SERVER['HTTPS']) ) {
+					return true;
+		}
+		if ( '1' == $_SERVER['HTTPS'] ) {
+					return true;
+		}
 	} elseif ( isset($_SERVER['SERVER_PORT']) && ( '443' == $_SERVER['SERVER_PORT'] ) ) {
 		return true;
 	}
@@ -4129,8 +4256,9 @@ 
 function wp_suspend_cache_addition( $suspend = null ) {
 	static $_suspend = false;
 
-	if ( is_bool( $suspend ) )
-		$_suspend = $suspend;
+	if ( is_bool( $suspend ) ) {
+			$_suspend = $suspend;
+	}
 
 	return $_suspend;
 }
@@ -4173,11 +4301,13 @@ 
 	// This is the current network's information; 'site' is old terminology.
 	global $current_site;
 
-	if ( ! is_multisite() )
-		return true;
+	if ( ! is_multisite() ) {
+			return true;
+	}
 
-	if ( ! $site_id )
-		$site_id = get_current_blog_id();
+	if ( ! $site_id ) {
+			$site_id = get_current_blog_id();
+	}
 
 	return (int) $site_id === (int) $current_site->blog_id;
 }
@@ -4256,8 +4386,9 @@ 
  * @return bool True if multisite and global terms enabled.
  */
 function global_terms_enabled() {
-	if ( ! is_multisite() )
-		return false;
+	if ( ! is_multisite() ) {
+			return false;
+	}
 
 	static $global_terms = null;
 	if ( is_null( $global_terms ) ) {
@@ -4273,10 +4404,11 @@ 
 		 * @param null $enabled Whether global terms are enabled.
 		 */
 		$filter = apply_filters( 'global_terms_enabled', null );
-		if ( ! is_null( $filter ) )
-			$global_terms = (bool) $filter;
-		else
-			$global_terms = (bool) get_site_option( 'global_terms_enabled', false );
+		if ( ! is_null( $filter ) ) {
+					$global_terms = (bool) $filter;
+		} else {
+					$global_terms = (bool) get_site_option( 'global_terms_enabled', false );
+		}
 	}
 	return $global_terms;
 }
@@ -4452,8 +4584,9 @@ 
 	// Do UTC
 	$structure[] = '<optgroup label="'. esc_attr__( 'UTC' ) .'">';
 	$selected = '';
-	if ( 'UTC' === $selected_zone )
-		$selected = 'selected="selected" ';
+	if ( 'UTC' === $selected_zone ) {
+			$selected = 'selected="selected" ';
+	}
 	$structure[] = '<option ' . $selected . 'value="' . esc_attr( 'UTC' ) . '">' . __('UTC') . '</option>';
 	$structure[] = '</optgroup>';
 
@@ -4462,18 +4595,20 @@ 
 	$offset_range = array (-12, -11.5, -11, -10.5, -10, -9.5, -9, -8.5, -8, -7.5, -7, -6.5, -6, -5.5, -5, -4.5, -4, -3.5, -3, -2.5, -2, -1.5, -1, -0.5,
 		0, 0.5, 1, 1.5, 2, 2.5, 3, 3.5, 4, 4.5, 5, 5.5, 5.75, 6, 6.5, 7, 7.5, 8, 8.5, 8.75, 9, 9.5, 10, 10.5, 11, 11.5, 12, 12.75, 13, 13.75, 14);
 	foreach ( $offset_range as $offset ) {
-		if ( 0 <= $offset )
-			$offset_name = '+' . $offset;
-		else
-			$offset_name = (string) $offset;
+		if ( 0 <= $offset ) {
+					$offset_name = '+' . $offset;
+		} else {
+					$offset_name = (string) $offset;
+		}
 
 		$offset_value = $offset_name;
 		$offset_name = str_replace(array('.25','.5','.75'), array(':15',':30',':45'), $offset_name);
 		$offset_name = 'UTC' . $offset_name;
 		$offset_value = 'UTC' . $offset_value;
 		$selected = '';
-		if ( $offset_value === $selected_zone )
-			$selected = 'selected="selected" ';
+		if ( $offset_value === $selected_zone ) {
+					$selected = 'selected="selected" ';
+		}
 		$structure[] = '<option ' . $selected . 'value="' . esc_attr( $offset_value ) . '">' . esc_html( $offset_name ) . "</option>";
 
 	}
@@ -4516,8 +4651,9 @@ 
 
 	foreach ( (array) $posts_to_delete as $post ) {
 		$post_id = (int) $post['post_id'];
-		if ( !$post_id )
-			continue;
+		if ( !$post_id ) {
+					continue;
+		}
 
 		$del_post = get_post($post_id);
 
@@ -4533,8 +4669,9 @@ 
 
 	foreach ( (array) $comments_to_delete as $comment ) {
 		$comment_id = (int) $comment['comment_id'];
-		if ( !$comment_id )
-			continue;
+		if ( !$comment_id ) {
+					continue;
+		}
 
 		$del_comment = get_comment($comment_id);
 
@@ -4598,10 +4735,11 @@ 
 	}
 
 	foreach ( $all_headers as $field => $regex ) {
-		if ( preg_match( '/^[ \t\/*#@]*' . preg_quote( $regex, '/' ) . ':(.*)$/mi', $file_data, $match ) && $match[1] )
-			$all_headers[ $field ] = _cleanup_header_comment( $match[1] );
-		else
-			$all_headers[ $field ] = '';
+		if ( preg_match( '/^[ \t\/*#@]*' . preg_quote( $regex, '/' ) . ':(.*)$/mi', $file_data, $match ) && $match[1] ) {
+					$all_headers[ $field ] = _cleanup_header_comment( $match[1] );
+		} else {
+					$all_headers[ $field ] = '';
+		}
 	}
 
 	return $all_headers;
@@ -4744,8 +4882,9 @@ 
 function wp_find_hierarchy_loop( $callback, $start, $start_parent, $callback_args = array() ) {
 	$override = is_null( $start_parent ) ? array() : array( $start => $start_parent );
 
-	if ( !$arbitrary_loop_member = wp_find_hierarchy_loop_tortoise_hare( $callback, $start, $override, $callback_args ) )
-		return array();
+	if ( !$arbitrary_loop_member = wp_find_hierarchy_loop_tortoise_hare( $callback, $start, $override, $callback_args ) ) {
+			return array();
+	}
 
 	return wp_find_hierarchy_loop_tortoise_hare( $callback, $arbitrary_loop_member, $override, $callback_args, true );
 }
@@ -4783,12 +4922,14 @@ 
 	&&
 		( $hare = isset( $override[$evanescent_hare] ) ? $override[$evanescent_hare] : call_user_func_array( $callback, array_merge( array( $evanescent_hare ), $callback_args ) ) )
 	) {
-		if ( $_return_loop )
-			$return[$tortoise] = $return[$evanescent_hare] = $return[$hare] = true;
+		if ( $_return_loop ) {
+					$return[$tortoise] = $return[$evanescent_hare] = $return[$hare] = true;
+		}
 
 		// tortoise got lapped - must be a loop
-		if ( $tortoise == $evanescent_hare || $tortoise == $hare )
-			return $_return_loop ? $return : $tortoise;
+		if ( $tortoise == $evanescent_hare || $tortoise == $hare ) {
+					return $_return_loop ? $return : $tortoise;
+		}
 
 		// Increment tortoise by one step
 		$tortoise = isset( $override[$tortoise] ) ? $override[$tortoise] : call_user_func_array( $callback, array_merge( array( $tortoise ), $callback_args ) );
@@ -4860,10 +5001,11 @@ 
  *                      of individual calls.
  */
 function wp_debug_backtrace_summary( $ignore_class = null, $skip_frames = 0, $pretty = true ) {
-	if ( version_compare( PHP_VERSION, '5.2.5', '>=' ) )
-		$trace = debug_backtrace( false );
-	else
-		$trace = debug_backtrace();
+	if ( version_compare( PHP_VERSION, '5.2.5', '>=' ) ) {
+			$trace = debug_backtrace( false );
+	} else {
+			$trace = debug_backtrace();
+	}
 
 	$caller = array();
 	$check_class = ! is_null( $ignore_class );
@@ -4873,8 +5015,10 @@ 
 		if ( $skip_frames > 0 ) {
 			$skip_frames--;
 		} elseif ( isset( $call['class'] ) ) {
-			if ( $check_class && $ignore_class == $call['class'] )
-				continue; // Filter out calls
+			if ( $check_class && $ignore_class == $call['class'] ) {
+							continue;
+			}
+			// Filter out calls
 
 			$caller[] = "{$call['class']}{$call['type']}{$call['function']}";
 		} else {
@@ -4887,11 +5031,12 @@ 
 			}
 		}
 	}
-	if ( $pretty )
-		return join( ', ', array_reverse( $caller ) );
-	else
-		return $caller;
-}
+	if ( $pretty ) {
+			return join( ', ', array_reverse( $caller ) );
+	} else {
+			return $caller;
+	}
+	}
 
 /**
  * Retrieve ids that are not already present in the cache.
@@ -4925,8 +5070,9 @@ 
  * @return bool Whether the device is able to upload files.
  */
 function _device_can_upload() {
-	if ( ! wp_is_mobile() )
-		return true;
+	if ( ! wp_is_mobile() ) {
+			return true;
+	}
 
 	$ua = $_SERVER['HTTP_USER_AGENT'];
 
@@ -4989,11 +5135,13 @@ 
  * @since 3.6.0
  */
 function wp_auth_check_load() {
-	if ( ! is_admin() && ! is_user_logged_in() )
-		return;
+	if ( ! is_admin() && ! is_user_logged_in() ) {
+			return;
+	}
 
-	if ( defined( 'IFRAME_REQUEST' ) )
-		return;
+	if ( defined( 'IFRAME_REQUEST' ) ) {
+			return;
+	}
 
 	$screen = get_current_screen();
 	$hidden = array( 'update', 'update-network', 'update-core', 'update-core-network', 'upgrade', 'upgrade-network', 'network' );
@@ -5098,8 +5246,9 @@ 
  * @return string Tag RegEx.
  */
 function get_tag_regex( $tag ) {
-	if ( empty( $tag ) )
-		return;
+	if ( empty( $tag ) ) {
+			return;
+	}
 	return sprintf( '<%1$s[^<]*(?:>[\s\S]*<\/%1$s>|\s*\/>)', tag_escape( $tag ) );
 }
 
@@ -5117,12 +5266,14 @@ 
  */
 function _canonical_charset( $charset ) {
 	if ( 'UTF-8' === $charset || 'utf-8' === $charset || 'utf8' === $charset ||
-		'UTF8' === $charset )
-		return 'UTF-8';
+		'UTF8' === $charset ) {
+			return 'UTF-8';
+	}
 
 	if ( 'ISO-8859-1' === $charset || 'iso-8859-1' === $charset ||
-		'iso8859-1' === $charset || 'ISO8859-1' === $charset )
-		return 'ISO-8859-1';
+		'iso8859-1' === $charset || 'ISO8859-1' === $charset ) {
+			return 'ISO-8859-1';
+	}
 
 	return $charset;
 }
@@ -5157,11 +5308,13 @@ 
 	static $encodings = array();
 	static $overloaded = null;
 
-	if ( is_null( $overloaded ) )
-		$overloaded = function_exists( 'mb_internal_encoding' ) && ( ini_get( 'mbstring.func_overload' ) & 2 );
+	if ( is_null( $overloaded ) ) {
+			$overloaded = function_exists( 'mb_internal_encoding' ) && ( ini_get( 'mbstring.func_overload' ) & 2 );
+	}
 
-	if ( false === $overloaded )
-		return;
+	if ( false === $overloaded ) {
+			return;
+	}
 
 	if ( ! $reset ) {
 		$encoding = mb_internal_encoding();

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

Doc Comments +1 added lines, -1 removed lines

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

Indentation +7 added lines, -7 removed lines

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

Spacing +54 added lines, -54 removed lines

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

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

Doc Comments +3 added lines, -3 removed lines

@@ -36,7 +36,7 @@ 
  *
  * @since 2.6.0
  *
- * @param string|bool|array $handles Styles to be printed. Default 'false'.
+ * @param string $handles Styles to be printed. Default 'false'.
  * @return array On success, a processed array of WP_Dependencies items; otherwise, an empty array.
  */
 function wp_print_styles( $handles = false ) {
@@ -147,7 +147,7 @@ 
  * @param string           $handle Name of the stylesheet. Should be unique.
  * @param string           $src    Full URL of the stylesheet, or path of the stylesheet relative to the WordPress root directory.
  * @param array            $deps   Optional. An array of registered stylesheet handles this stylesheet depends on. Default empty array.
- * @param string|bool|null $ver    Optional. String specifying stylesheet version number, if it has one, which is added to the URL
+ * @param string|null $ver    Optional. String specifying stylesheet version number, if it has one, which is added to the URL
  *                                 as a query string for cache busting purposes. If version is set to false, a version
  *                                 number is automatically added equal to current installed WordPress version.
  *                                 If set to null, no version is added.
@@ -217,7 +217,7 @@ 
  * @param string $handle Name of the stylesheet.
  * @param string $key    Name of data point for which we're storing a value.
  *                       Accepts 'conditional', 'rtl' and 'suffix', 'alt' and 'title'.
- * @param mixed  $value  String containing the CSS data to be added.
+ * @param string  $value  String containing the CSS data to be added.
  * @return bool True on success, false on failure.
  */
 function wp_style_add_data( $handle, $key, $value ) {

Indentation +7 added lines, -7 removed lines

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

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.

Spacing +730 added lines, -730 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 $name Name of the specific header file to use.
 	 */
-	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 $name Name of the specific footer file to use.
 	 */
-	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 $name Name of the specific sidebar file to use.
 	 */
-	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 $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';
 
 	/**
 	 * Filter 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) {
 		/**
 		 * Filter 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 A log out 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');
 
 	/**
 	 * Filter the logout URL.
@@ -315,7 +315,7 @@ 
 	 * @param string $logout_url The Log Out 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);
 }
 
 /**
@@ -330,10 +330,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);
 
 	/**
@@ -346,7 +346,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);
 }
 
 /**
@@ -364,7 +364,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'));
 }
 
 /**
@@ -398,16 +398,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' ),
-		'label_password' => __( 'Password' ),
-		'label_remember' => __( 'Remember Me' ),
-		'label_log_in' => __( 'Log In' ),
+		'label_username' => __('Username or Email'),
+		'label_password' => __('Password'),
+		'label_remember' => __('Remember Me'),
+		'label_log_in' => __('Log In'),
 		'id_username' => 'user_login',
 		'id_password' => 'user_pass',
 		'id_remember' => 'rememberme',
@@ -427,7 +427,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));
 
 	/**
 	 * Filter content to display at the top of the login form.
@@ -439,7 +439,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);
 
 	/**
 	 * Filter content to display in the middle of the login form.
@@ -452,7 +452,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);
 
 	/**
 	 * Filter content to display at the bottom of the login form.
@@ -464,29 +464,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-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-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;
@@ -500,13 +500,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'));
 
 	/**
 	 * Filter the Lost Password URL.
@@ -516,7 +516,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);
 }
 
 /**
@@ -532,14 +532,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 = '';
 	}
@@ -554,9 +554,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;
@@ -579,7 +579,7 @@ 
 	 *
 	 * @since 1.5.0
 	 */
-	do_action( 'wp_meta' );
+	do_action('wp_meta');
 }
 
 /**
@@ -591,8 +591,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');
 }
 
 /**
@@ -642,17 +642,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', sprintf(
+			_deprecated_argument(__FUNCTION__, '2.2', 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;
@@ -681,7 +681,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();
@@ -712,21 +712,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', sprintf(
+			_deprecated_argument(__FUNCTION__, '2.2', 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';
@@ -744,8 +744,8 @@ 
 		strpos($show, 'home') === false)
 		$url = false;
 
-	if ( 'display' == $filter ) {
-		if ( $url ) {
+	if ('display' == $filter) {
+		if ($url) {
 			/**
 			 * Filter the URL returned by get_bloginfo().
 			 *
@@ -754,7 +754,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 {
 			/**
 			 * Filter the site information returned by get_bloginfo().
@@ -764,7 +764,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);
 		}
 	}
 
@@ -781,23 +781,23 @@ 
  * @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 ) {
-	if ( is_multisite() && (int) $blog_id !== get_current_blog_id() ) {
-		switch_to_blog( $blog_id );
+function get_site_icon_url($size = 512, $url = '', $blog_id = 0) {
+	if (is_multisite() && (int) $blog_id !== get_current_blog_id()) {
+		switch_to_blog($blog_id);
 	}
 
-	$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 ( is_multisite() && ms_is_switched() ) {
+	if (is_multisite() && ms_is_switched()) {
 		restore_current_blog();
 	}
 
@@ -810,7 +810,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);
 }
 
 /**
@@ -822,8 +822,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));
 }
 
 /**
@@ -834,8 +834,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);
 }
 
 /**
@@ -846,14 +846,14 @@ 
  * @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 ) {
-	if ( is_multisite() && (int) $blog_id !== get_current_blog_id() ) {
-		switch_to_blog( $blog_id );
+function has_custom_logo($blog_id = 0) {
+	if (is_multisite() && (int) $blog_id !== get_current_blog_id()) {
+		switch_to_blog($blog_id);
 	}
 
-	$custom_logo_id = get_theme_mod( 'custom_logo' );
+	$custom_logo_id = get_theme_mod('custom_logo');
 
-	if ( is_multisite() && ms_is_switched() ) {
+	if (is_multisite() && ms_is_switched()) {
 		restore_current_blog();
 	}
 
@@ -868,41 +868,41 @@ 
  * @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 = '';
 
-	if ( is_multisite() && (int) $blog_id !== get_current_blog_id() ) {
-		switch_to_blog( $blog_id );
+	if (is_multisite() && (int) $blog_id !== get_current_blog_id()) {
+		switch_to_blog($blog_id);
 	}
 
-	$custom_logo_id = get_theme_mod( 'custom_logo' );
-	$size           = get_theme_support( 'custom-logo', 'size' );
+	$custom_logo_id = get_theme_mod('custom_logo');
+	$size           = get_theme_support('custom-logo', 'size');
 
-	if ( ! $size ) {
+	if ( ! $size) {
 		$size = 'full';
 	}
 
 	// 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, $size, 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, $size, false, array(
 				'class'     => "custom-logo attachment-$size",
 				'data-size' => $size,
 				'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" data-size="%2$s" /></a>',
-			esc_url( home_url( '/' ) ),
-			esc_attr( $size )
+	elseif (is_customize_preview()) {
+		$html = sprintf('<a href="%1$s" class="custom-logo-link" style="display:none;"><img class="custom-logo" data-size="%2$s" /></a>',
+			esc_url(home_url('/')),
+			esc_attr($size)
 		);
 	}
 
-	if ( is_multisite() && ms_is_switched() ) {
+	if (is_multisite() && ms_is_switched()) {
 		restore_current_blog();
 	}
 
@@ -914,7 +914,7 @@ 
 	 * @param string $html Custom logo HTML output.
 	 * @param string $size Size specified in add_theme_support declaration, or 'full' default.
 	 */
-	return apply_filters( 'get_custom_logo', $html, $size );
+	return apply_filters('get_custom_logo', $html, $size);
 }
 
 /**
@@ -924,8 +924,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);
 }
 
 /**
@@ -950,8 +950,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;
 	}
 
@@ -962,62 +962,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');
 	}
 
 	/**
@@ -1027,7 +1027,7 @@ 
 	 *
 	 * @param string $sep Document title separator. Default '-'.
 	 */
-	$sep = apply_filters( 'document_title_separator', '-' );
+	$sep = apply_filters('document_title_separator', '-');
 
 	/**
 	 * Filter the parts of the document title.
@@ -1043,13 +1043,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;
 }
@@ -1063,11 +1063,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";
 }
 
 /**
@@ -1095,94 +1095,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 ";
 	}
 
@@ -1193,14 +1193,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);
 	}
 
 	/**
@@ -1212,10 +1212,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;
@@ -1238,10 +1238,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;
 
 	/**
@@ -1252,11 +1252,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;
 }
 
 /**
@@ -1271,15 +1271,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);
 
 	/**
 	 * Filter the post type archive title.
@@ -1289,12 +1289,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;
 }
 
 /**
@@ -1310,8 +1310,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);
 }
 
 /**
@@ -1327,8 +1327,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);
 }
 
 /**
@@ -1344,13 +1344,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()) {
 		/**
 		 * Filter the category archive page title.
 		 *
@@ -1358,8 +1358,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()) {
 		/**
 		 * Filter the tag archive page title.
 		 *
@@ -1367,8 +1367,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()) {
 		/**
 		 * Filter the custom taxonomy archive page title.
 		 *
@@ -1376,18 +1376,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;
 }
 
 /**
@@ -1406,27 +1406,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;
 }
@@ -1441,11 +1441,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;
 	}
 }
 
@@ -1457,46 +1457,46 @@ 
  * @return string Archive title.
  */
 function get_the_archive_title() {
-	if ( is_category() ) {
-		$title = sprintf( __( 'Category: %s' ), single_cat_title( '', false ) );
-	} elseif ( is_tag() ) {
-		$title = sprintf( __( 'Tag: %s' ), single_tag_title( '', false ) );
-	} elseif ( is_author() ) {
-		$title = sprintf( __( 'Author: %s' ), '<span class="vcard">' . get_the_author() . '</span>' );
-	} elseif ( is_year() ) {
-		$title = sprintf( __( 'Year: %s' ), get_the_date( _x( 'Y', 'yearly archives date format' ) ) );
-	} elseif ( is_month() ) {
-		$title = sprintf( __( 'Month: %s' ), get_the_date( _x( 'F Y', 'monthly archives date format' ) ) );
-	} elseif ( is_day() ) {
-		$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' );
+	if (is_category()) {
+		$title = sprintf(__('Category: %s'), single_cat_title('', false));
+	} elseif (is_tag()) {
+		$title = sprintf(__('Tag: %s'), single_tag_title('', false));
+	} elseif (is_author()) {
+		$title = sprintf(__('Author: %s'), '<span class="vcard">'.get_the_author().'</span>');
+	} elseif (is_year()) {
+		$title = sprintf(__('Year: %s'), get_the_date(_x('Y', 'yearly archives date format')));
+	} elseif (is_month()) {
+		$title = sprintf(__('Month: %s'), get_the_date(_x('F Y', 'monthly archives date format')));
+	} elseif (is_day()) {
+		$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() ) {
-		$title = sprintf( __( 'Archives: %s' ), post_type_archive_title( '', false ) );
-	} elseif ( is_tax() ) {
-		$tax = get_taxonomy( get_queried_object()->taxonomy );
+	} elseif (is_post_type_archive()) {
+		$title = sprintf(__('Archives: %s'), post_type_archive_title('', false));
+	} elseif (is_tax()) {
+		$tax = get_taxonomy(get_queried_object()->taxonomy);
 		/* translators: 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');
 	}
 
 	/**
@@ -1506,7 +1506,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);
 }
 
 /**
@@ -1519,10 +1519,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;
 	}
 }
 
@@ -1543,7 +1543,7 @@ 
 	 *
 	 * @param string $description Archive description to be displayed.
 	 */
-	return apply_filters( 'get_the_archive_description', term_description() );
+	return apply_filters('get_the_archive_description', term_description());
 }
 
 /**
@@ -1584,7 +1584,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)
@@ -1605,7 +1605,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);
 }
 
 /**
@@ -1643,7 +1643,7 @@ 
  * }
  * @return string|void String when retrieving.
  */
-function wp_get_archives( $args = '' ) {
+function wp_get_archives($args = '') {
 	global $wpdb, $wp_locale;
 
 	$defaults = array(
@@ -1654,32 +1654,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']);
 
 	/**
 	 * Filter the SQL WHERE clause for retrieving archives.
@@ -1689,7 +1689,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);
 
 	/**
 	 * Filter the SQL JOIN clause for retrieving archives.
@@ -1699,142 +1699,142 @@ 
 	 * @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' );
-	if ( ! $last_changed ) {
+	$last_changed = wp_cache_get('last_changed', 'posts');
+	if ( ! $last_changed) {
 		$last_changed = microtime();
-		wp_cache_set( 'last_changed', $last_changed, 'posts' );
+		wp_cache_set('last_changed', $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            = sprintf( '%1$s/%2$s%3$sm%4$s%5$s%6$sw%7$s%8$d', home_url(), '', '?', '=', $arc_year, '&amp;', '=', $result->week );
-					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            = sprintf('%1$s/%2$s%3$sm%4$s%5$s%6$sw%7$s%8$d', home_url(), '', '?', '=', $arc_year, '&amp;', '=', $result->week);
+					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;
@@ -1851,7 +1851,7 @@ 
  */
 function calendar_week_mod($num) {
 	$base = 7;
-	return ($num - $base*floor($num/$base));
+	return ($num - $base * floor($num / $base));
 }
 
 /**
@@ -1873,17 +1873,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;
 		}
@@ -1891,51 +1891,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
@@ -1956,21 +1956,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>";
 	}
 
@@ -1981,9 +1981,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>';
@@ -1991,9 +1991,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>';
@@ -2013,43 +2013,43 @@ 
 		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}" ) );
-			$label = sprintf( __( 'Posts published on %s' ), $date_format );
+			$date_format = date(_x('F j, Y', 'daily archives date format'), strtotime("{$thisyear}-{$thismonth}-{$day}"));
+			$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 {
@@ -2057,21 +2057,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) {
 		/**
 		 * Filter the HTML calendar output.
 		 *
@@ -2079,11 +2079,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);
 }
 
 /**
@@ -2093,7 +2093,7 @@ 
  * @since 2.1.0
  */
 function delete_get_calendar_cache() {
-	wp_cache_delete( 'get_calendar', 'calendar' );
+	wp_cache_delete('get_calendar', 'calendar');
 }
 
 /**
@@ -2111,16 +2111,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 *****/
@@ -2131,7 +2131,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);
 }
 
 /**
@@ -2157,11 +2157,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;
 
 		/**
@@ -2175,9 +2175,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;
@@ -2196,17 +2196,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);
 	}
 
 	/**
@@ -2219,7 +2219,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);
 }
 
 /**
@@ -2233,8 +2233,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;
 
 	/**
 	 * Filter the date a post was last modified for display.
@@ -2247,9 +2247,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;
@@ -2265,7 +2265,7 @@ 
  * @return string
  */
 function get_the_modified_date($d = '') {
-	if ( '' == $d )
+	if ('' == $d)
 		$the_time = get_post_modified_time(get_option('date_format'), null, null, true);
 	else
 		$the_time = get_post_modified_time($d, null, null, true);
@@ -2279,7 +2279,7 @@ 
 	 * @param string $d        PHP date format. Defaults to value specified in
 	 *                         'date_format' option.
 	 */
-	return apply_filters( 'get_the_modified_date', $the_time, $d );
+	return apply_filters('get_the_modified_date', $the_time, $d);
 }
 
 /**
@@ -2289,7 +2289,7 @@ 
  *
  * @param string $d Either 'G', 'U', or php date format.
  */
-function the_time( $d = '' ) {
+function the_time($d = '') {
 	/**
 	 * Filter the time a post was written for display.
 	 *
@@ -2299,7 +2299,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);
 }
 
 /**
@@ -2313,14 +2313,14 @@ 
  * @param int|WP_Post $post WP_Post object or ID. Default is global $post object.
  * @return false|string Formatted date string or Unix timestamp. 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);
@@ -2336,7 +2336,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);
 }
 
 /**
@@ -2351,14 +2351,14 @@ 
  * @param bool        $translate Whether to translate the time string. Default false.
  * @return false|string|int Formatted date string or Unix timestamp. 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;
@@ -2375,7 +2375,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);
 }
 
 /**
@@ -2396,7 +2396,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);
 }
 
 /**
@@ -2408,7 +2408,7 @@ 
  * @return string
  */
 function get_the_modified_time($d = '') {
-	if ( '' == $d )
+	if ('' == $d)
 		$the_time = get_post_modified_time(get_option('time_format'), null, null, true);
 	else
 		$the_time = get_post_modified_time($d, null, null, true);
@@ -2423,7 +2423,7 @@ 
 	 *                         written. Accepts 'G', 'U', or php date format. Defaults
 	 *                         to value specified in 'time_format' option.
 	 */
-	return apply_filters( 'get_the_modified_time', $the_time, $d );
+	return apply_filters('get_the_modified_time', $the_time, $d);
 }
 
 /**
@@ -2438,14 +2438,14 @@ 
  * @param bool        $translate Whether to translate the time string. Default false.
  * @return false|string Formatted date string or Unix timestamp. 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;
@@ -2460,7 +2460,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);
 }
 
 /**
@@ -2472,7 +2472,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));
 
 	/**
 	 * Filter the weekday on which the post was written, for display.
@@ -2481,7 +2481,7 @@ 
 	 *
 	 * @param string $the_weekday
 	 */
-	echo apply_filters( 'the_weekday', $the_weekday );
+	echo apply_filters('the_weekday', $the_weekday);
 }
 
 /**
@@ -2499,12 +2499,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;
 	}
@@ -2518,7 +2518,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;
 }
 
@@ -2533,7 +2533,7 @@ 
 	 *
 	 * @since 1.5.0
 	 */
-	do_action( 'wp_head' );
+	do_action('wp_head');
 }
 
 /**
@@ -2547,7 +2547,7 @@ 
 	 *
 	 * @since 1.5.1
 	 */
-	do_action( 'wp_footer' );
+	do_action('wp_footer');
 }
 
 /**
@@ -2557,8 +2557,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(
@@ -2570,7 +2570,7 @@ 
 		'comstitle'	=> __('%1$s %2$s Comments Feed'),
 	);
 
-	$args = wp_parse_args( $args, $defaults );
+	$args = wp_parse_args($args, $defaults);
 
 	/**
 	 * Filter whether to display the posts feed link.
@@ -2579,8 +2579,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";
 	}
 
 	/**
@@ -2590,8 +2590,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";
 	}
 }
 
@@ -2602,7 +2602,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'),
@@ -2622,60 +2622,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";
 }
 
 /**
@@ -2685,7 +2685,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";
 }
 
 /**
@@ -2696,7 +2696,7 @@ 
  */
 function wlwmanifest_link() {
 	echo '<link rel="wlwmanifest" type="application/wlwmanifest+xml" href="',
-		includes_url( 'wlwmanifest.xml' ), '" /> ', "\n";
+		includes_url('wlwmanifest.xml'), '" /> ', "\n";
 }
 
 /**
@@ -2712,7 +2712,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();
 }
 
@@ -2736,15 +2736,15 @@ 
  * @link http://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(
-		sprintf( '<link rel="icon" href="%s" sizes="32x32" />', esc_url( get_site_icon_url( 32 ) ) ),
-		sprintf( '<link rel="icon" href="%s" sizes="192x192" />', esc_url( get_site_icon_url( 192 ) ) ),
-		sprintf( '<link rel="apple-touch-icon-precomposed" href="%s" />', esc_url( get_site_icon_url( 180 ) ) ),
-		sprintf( '<meta name="msapplication-TileImage" content="%s" />', esc_url( get_site_icon_url( 270 ) ) ),
+		sprintf('<link rel="icon" href="%s" sizes="32x32" />', esc_url(get_site_icon_url(32))),
+		sprintf('<link rel="icon" href="%s" sizes="192x192" />', esc_url(get_site_icon_url(192))),
+		sprintf('<link rel="apple-touch-icon-precomposed" href="%s" />', esc_url(get_site_icon_url(180))),
+		sprintf('<meta name="msapplication-TileImage" content="%s" />', esc_url(get_site_icon_url(270))),
 	);
 
 	/**
@@ -2754,10 +2754,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";
 	}
 }
@@ -2782,13 +2782,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;
 			}
 		}
@@ -2801,7 +2801,7 @@ 
 	 *
 	 * @param bool $wp_rich_edit Whether the user can access to the rich (Visual) editor.
 	 */
-	return apply_filters( 'user_can_richedit', $wp_rich_edit );
+	return apply_filters('user_can_richedit', $wp_rich_edit);
 }
 
 /**
@@ -2816,9 +2816,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;
 	}
 
 	/**
@@ -2828,7 +2828,7 @@ 
 	 *
 	 * @param array $r An array of editors. Accepts 'tinymce', 'html', 'test'.
 	 */
-	return apply_filters( 'wp_default_editor', $r );
+	return apply_filters('wp_default_editor', $r);
 }
 
 /**
@@ -2850,9 +2850,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);
 }
@@ -2869,7 +2869,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) {
 	/**
 	 * Filter the contents of the search query variable.
 	 *
@@ -2877,10 +2877,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;
 }
 
@@ -2900,7 +2900,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)));
 }
 
 /**
@@ -2913,17 +2913,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\"";
 	}
 
@@ -2938,7 +2938,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);
 }
 
 /**
@@ -2952,8 +2952,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);
 }
 
 /**
@@ -3031,23 +3031,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)
@@ -3067,42 +3067,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'];
@@ -3110,11 +3110,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'];
 
 		/**
@@ -3124,40 +3124,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 || -1 == $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 || -1 == $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;
 
@@ -3200,10 +3200,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(
@@ -3225,56 +3225,56 @@ 
 	$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( $GLOBALS['wp_version'], '-src' ) )
+	if (false !== strpos($GLOBALS['wp_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')
 	);
 
 }
@@ -3289,13 +3289,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);
 
 	/**
 	 * Filter the URI of a WordPress admin CSS file.
@@ -3305,7 +3305,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);
 }
 
 /**
@@ -3328,15 +3328,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;
 	}
 
@@ -3351,11 +3351,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");
 	}
 }
 
@@ -3369,11 +3369,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');
 }
 
 /**
@@ -3389,7 +3389,7 @@ 
 	 *
 	 * @param string $generator_type The XHTML generator.
 	 */
-	the_generator( apply_filters( 'wp_generator_type', 'xhtml' ) );
+	the_generator(apply_filters('wp_generator_type', 'xhtml'));
 }
 
 /**
@@ -3402,7 +3402,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) {
 	/**
 	 * Filter the output of the XHTML generator tag for display.
 	 *
@@ -3412,7 +3412,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";
 }
 
 /**
@@ -3427,14 +3427,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';
@@ -3454,27 +3454,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;
 	}
 
@@ -3489,7 +3489,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);
 }
 
 /**
@@ -3504,8 +3504,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');
 }
 
 /**
@@ -3520,8 +3520,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');
 }
 
 /**
@@ -3536,8 +3536,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');
 }
 
 /**
@@ -3554,13 +3554,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;
@@ -3576,12 +3576,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 +202 added lines, -145 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 ) {
 		/**
@@ -330,11 +335,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);
+	}
 
 	/**
 	 * Filter the login URL.
@@ -486,11 +493,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
@@ -534,10 +542,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 {
@@ -698,7 +707,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');
@@ -741,8 +752,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 ) {
@@ -1241,8 +1253,9 @@ 
 function single_post_title( $prefix = '', $display = true ) {
 	$_post = get_queried_object();
 
-	if ( !isset($_post->post_title) )
-		return;
+	if ( !isset($_post->post_title) ) {
+			return;
+	}
 
 	/**
 	 * Filter the page title for a single post.
@@ -1253,11 +1266,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.
@@ -1272,12 +1286,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 );
 
@@ -1291,11 +1307,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.
@@ -1347,8 +1364,9 @@ 
 function single_term_title( $prefix = '', $display = true ) {
 	$term = get_queried_object();
 
-	if ( !$term )
-		return;
+	if ( !$term ) {
+			return;
+	}
 
 	if ( is_category() ) {
 		/**
@@ -1381,14 +1399,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.
@@ -1421,13 +1441,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;
 }
 
@@ -1583,14 +1605,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";
+	}
 
 	/**
 	 * Filter the archive link content.
@@ -2177,10 +2201,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;
+		}
 	}
 }
 
@@ -2249,10 +2274,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;
+	}
 
 }
 
@@ -2265,10 +2291,11 @@ 
  * @return string
  */
 function get_the_modified_date($d = '') {
-	if ( '' == $d )
-		$the_time = get_post_modified_time(get_option('date_format'), null, null, true);
-	else
-		$the_time = get_post_modified_time($d, null, null, true);
+	if ( '' == $d ) {
+			$the_time = get_post_modified_time(get_option('date_format'), null, null, true);
+	} else {
+			$the_time = get_post_modified_time($d, null, null, true);
+	}
 
 	/**
 	 * Filter the date a post was last modified.
@@ -2320,10 +2347,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);
+	}
 
 	/**
 	 * Filter the time a post was written.
@@ -2358,10 +2386,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);
 
@@ -2408,10 +2437,11 @@ 
  * @return string
  */
 function get_the_modified_time($d = '') {
-	if ( '' == $d )
-		$the_time = get_post_modified_time(get_option('time_format'), null, null, true);
-	else
-		$the_time = get_post_modified_time($d, null, null, true);
+	if ( '' == $d ) {
+			$the_time = get_post_modified_time(get_option('time_format'), null, null, true);
+	} else {
+			$the_time = get_post_modified_time($d, null, null, true);
+	}
 
 	/**
 	 * Filter the localized time a post was last modified.
@@ -2445,10 +2475,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);
 
 	/**
@@ -2558,8 +2589,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 */
@@ -2634,8 +2666,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 );
@@ -2670,13 +2703,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.
@@ -2712,9 +2747,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.
@@ -2851,8 +2887,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);
 }
@@ -2879,8 +2916,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;
 }
 
@@ -2916,15 +2954,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);
@@ -3113,8 +3154,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'];
 
 		/**
@@ -3130,12 +3172,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 */
@@ -3150,8 +3195,9 @@ 
 	if ( $args['prev_next'] && $current && ( $current < $total || -1 == $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 */
@@ -3203,8 +3249,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,
@@ -3232,8 +3279,9 @@ 
 	);
 
 	// Other color schemes are not available when running out of src
-	if ( false !== strpos( $GLOBALS['wp_version'], '-src' ) )
-		return;
+	if ( false !== strpos( $GLOBALS['wp_version'], '-src' ) ) {
+			return;
+	}
 
 	wp_admin_css_color( 'light', _x( 'Light', 'admin color scheme' ),
 		admin_url( "css/colors/light/colors$suffix.css" ),
@@ -3333,10 +3381,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;
 	}
 
@@ -3372,9 +3423,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' );
+	}
+	}
 
 /**
  * Display the XHTML generator that is generated on the wp_head hook.
@@ -3431,8 +3483,9 @@ 
 	if ( empty( $type ) ) {
 
 		$current_filter = current_filter();
-		if ( empty( $current_filter ) )
-			return;
+		if ( empty( $current_filter ) ) {
+					return;
+		}
 
 		switch ( $current_filter ) {
 			case 'rss2_head' :
@@ -3555,13 +3608,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;
 }
@@ -3577,11 +3632,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/link-template.php

Doc Comments +10 added lines, -10 removed lines

@@ -12,7 +12,7 @@ 
  * @since 1.2.0
  * @since 4.4.0 Added the `$post` parameter.
  *
- * @param int|WP_Post $post Optional. Post ID or post object. Default is the global `$post`.
+ * @param integer $post Optional. Post ID or post object. Default is the global `$post`.
  */
 function the_permalink( $post = 0 ) {
 	/**
@@ -96,7 +96,7 @@ 
  *
  * @see get_permalink()
  *
- * @param int|WP_Post $post      Optional. Post ID or post object. Default is the global `$post`.
+ * @param integer $post      Optional. Post ID or post object. Default is the global `$post`.
  * @param bool        $leavename Optional. Whether to keep post name or page name. Default false.
  *
  * @return string|false The permalink URL or false if post does not exist.
@@ -110,7 +110,7 @@ 
  *
  * @since 1.0.0
  *
- * @param int|WP_Post $post      Optional. Post ID or post object. Default is the global `$post`.
+ * @param integer $post      Optional. Post ID or post object. Default is the global `$post`.
  * @param bool        $leavename Optional. Whether to keep post name or page name. Default false.
  * @return string|false The permalink URL or false if post does not exist.
  */
@@ -1377,7 +1377,7 @@ 
  *
  * @since 2.3.0
  *
- * @param int|WP_Comment $comment_id Optional. Comment ID or WP_Comment object.
+ * @param integer $comment_id Optional. Comment ID or WP_Comment object.
  * @return string|void The edit comment link URL for the given comment.
  */
 function get_edit_comment_link( $comment_id = 0 ) {
@@ -1437,7 +1437,7 @@ 
  *
  * @since 2.7.0
  *
- * @param int|stdClass $link Optional. Bookmark ID.
+ * @param integer $link Optional. Bookmark ID.
  * @return string|void The edit bookmark link URL.
  */
 function get_edit_bookmark_link( $link = 0 ) {
@@ -1535,7 +1535,7 @@ 
  * @since 1.5.0
  *
  * @param bool         $in_same_term   Optional. Whether post should be in a same taxonomy term.
- * @param array|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs.
+ * @param string $excluded_terms Optional. Array or comma-separated list of excluded term IDs.
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
  * @return null|string|WP_Post Post object if successful. Null if global $post is not set. Empty string if no corresponding post exists.
  */
@@ -1549,7 +1549,7 @@ 
  * @since 1.5.0
  *
  * @param bool         $in_same_term   Optional. Whether post should be in a same taxonomy term.
- * @param array|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs.
+ * @param string $excluded_terms Optional. Array or comma-separated list of excluded term IDs.
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
  * @return null|string|WP_Post Post object if successful. Null if global $post is not set. Empty string if no corresponding post exists.
  */
@@ -1570,7 +1570,7 @@ 
  * @param array|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs.
  * @param bool         $previous       Optional. Whether to retrieve previous post.
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
- * @return null|string|WP_Post Post object if successful. Null if global $post is not set. Empty string if no corresponding post exists.
+ * @return integer Post object if successful. Null if global $post is not set. Empty string if no corresponding post exists.
  */
 function get_adjacent_post( $in_same_term = false, $excluded_terms = '', $previous = true, $taxonomy = 'category' ) {
 	global $wpdb;
@@ -1852,7 +1852,7 @@ 
  * @since 2.8.0
  *
  * @param bool         $in_same_term   Optional. Whether returned post should be in a same taxonomy term.
- * @param array|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs.
+ * @param string $excluded_terms Optional. Array or comma-separated list of excluded term IDs.
  * @param bool         $start          Optional. Whether to retrieve first or last post.
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
  * @return null|array Array containing the boundary post object if successful, null otherwise.
@@ -2732,7 +2732,7 @@ 
  * @global WP_Rewrite $wp_rewrite
  *
  * @param string|array $args Optional args. See paginate_links().
- * @return string|void Markup for pagination links.
+ * @return string Markup for pagination links.
  */
 function paginate_comments_links($args = array()) {
 	global $wp_rewrite;

Spacing +785 added lines, -785 removed lines

@@ -14,7 +14,7 @@ 
  *
  * @param int|WP_Post $post Optional. Post ID or post object. Default is the global `$post`.
  */
-function the_permalink( $post = 0 ) {
+function the_permalink($post = 0) {
 	/**
 	 * Filter the display of the permalink for the current post.
 	 *
@@ -24,7 +24,7 @@ 
 	 * @param string      $permalink The permalink for the current post.
 	 * @param int|WP_Post $post      Post ID, WP_Post object, or 0. Default 0.
 	 */
-	echo esc_url( apply_filters( 'the_permalink', get_permalink( $post ), $post ) );
+	echo esc_url(apply_filters('the_permalink', get_permalink($post), $post));
 }
 
 /**
@@ -44,7 +44,7 @@ 
  */
 function user_trailingslashit($string, $type_of_url = '') {
 	global $wp_rewrite;
-	if ( $wp_rewrite->use_trailing_slashes )
+	if ($wp_rewrite->use_trailing_slashes)
 		$string = trailingslashit($string);
 	else
 		$string = untrailingslashit($string);
@@ -60,7 +60,7 @@ 
 	 *                            'single_feed', 'single_paged', 'feed', 'category', 'page', 'year',
 	 *                            'month', 'day', 'paged', 'post_type_archive'.
 	 */
-	return apply_filters( 'user_trailingslashit', $string, $type_of_url );
+	return apply_filters('user_trailingslashit', $string, $type_of_url);
 }
 
 /**
@@ -73,16 +73,16 @@ 
  *
  * @param string $mode Permalink mode can be either 'title', 'id', or default, which is 'id'.
  */
-function permalink_anchor( $mode = 'id' ) {
+function permalink_anchor($mode = 'id') {
 	$post = get_post();
-	switch ( strtolower( $mode ) ) {
+	switch (strtolower($mode)) {
 		case 'title':
-			$title = sanitize_title( $post->post_title ) . '-' . $post->ID;
+			$title = sanitize_title($post->post_title).'-'.$post->ID;
 			echo '<a id="'.$title.'"></a>';
 			break;
 		case 'id':
 		default:
-			echo '<a id="post-' . $post->ID . '"></a>';
+			echo '<a id="post-'.$post->ID.'"></a>';
 			break;
 	}
 }
@@ -101,8 +101,8 @@ 
  *
  * @return string|false The permalink URL or false if post does not exist.
  */
-function get_the_permalink( $post = 0, $leavename = false ) {
-	return get_permalink( $post, $leavename );
+function get_the_permalink($post = 0, $leavename = false) {
+	return get_permalink($post, $leavename);
 }
 
 /**
@@ -114,7 +114,7 @@ 
  * @param bool        $leavename Optional. Whether to keep post name or page name. Default false.
  * @return string|false The permalink URL or false if post does not exist.
  */
-function get_permalink( $post = 0, $leavename = false ) {
+function get_permalink($post = 0, $leavename = false) {
 	$rewritecode = array(
 		'%year%',
 		'%monthnum%',
@@ -122,28 +122,28 @@ 
 		'%hour%',
 		'%minute%',
 		'%second%',
-		$leavename? '' : '%postname%',
+		$leavename ? '' : '%postname%',
 		'%post_id%',
 		'%category%',
 		'%author%',
-		$leavename? '' : '%pagename%',
+		$leavename ? '' : '%pagename%',
 	);
 
-	if ( is_object( $post ) && isset( $post->filter ) && 'sample' == $post->filter ) {
+	if (is_object($post) && isset($post->filter) && 'sample' == $post->filter) {
 		$sample = true;
 	} else {
-		$post = get_post( $post );
+		$post = get_post($post);
 		$sample = false;
 	}
 
-	if ( empty($post->ID) )
+	if (empty($post->ID))
 		return false;
 
-	if ( $post->post_type == 'page' )
+	if ($post->post_type == 'page')
 		return get_page_link($post, $leavename, $sample);
-	elseif ( $post->post_type == 'attachment' )
-		return get_attachment_link( $post, $leavename );
-	elseif ( in_array($post->post_type, get_post_types( array('_builtin' => false) ) ) )
+	elseif ($post->post_type == 'attachment')
+		return get_attachment_link($post, $leavename);
+	elseif (in_array($post->post_type, get_post_types(array('_builtin' => false))))
 		return get_post_permalink($post, $leavename, $sample);
 
 	$permalink = get_option('permalink_structure');
@@ -159,15 +159,15 @@ 
 	 * @param WP_Post $post      The post in question.
 	 * @param bool    $leavename Whether to keep the post name.
 	 */
-	$permalink = apply_filters( 'pre_post_link', $permalink, $post, $leavename );
+	$permalink = apply_filters('pre_post_link', $permalink, $post, $leavename);
 
-	if ( '' != $permalink && !in_array( $post->post_status, array( 'draft', 'pending', 'auto-draft', 'future' ) ) ) {
+	if ('' != $permalink && ! in_array($post->post_status, array('draft', 'pending', 'auto-draft', 'future'))) {
 		$unixtime = strtotime($post->post_date);
 
 		$category = '';
-		if ( strpos($permalink, '%category%') !== false ) {
+		if (strpos($permalink, '%category%') !== false) {
 			$cats = get_the_category($post->ID);
-			if ( $cats ) {
+			if ($cats) {
 				usort($cats, '_usort_terms_by_ID'); // order by ID
 
 				/**
@@ -179,28 +179,28 @@ 
 				 * @param array    $cats Array of all categories associated with the post.
 				 * @param WP_Post  $post The post in question.
 				 */
-				$category_object = apply_filters( 'post_link_category', $cats[0], $cats, $post );
+				$category_object = apply_filters('post_link_category', $cats[0], $cats, $post);
 
-				$category_object = get_term( $category_object, 'category' );
+				$category_object = get_term($category_object, 'category');
 				$category = $category_object->slug;
-				if ( $parent = $category_object->parent )
-					$category = get_category_parents($parent, false, '/', true) . $category;
+				if ($parent = $category_object->parent)
+					$category = get_category_parents($parent, false, '/', true).$category;
 			}
 			// show default category in permalinks, without
 			// having to assign it explicitly
-			if ( empty($category) ) {
-				$default_category = get_term( get_option( 'default_category' ), 'category' );
-				$category = is_wp_error( $default_category ) ? '' : $default_category->slug;
+			if (empty($category)) {
+				$default_category = get_term(get_option('default_category'), 'category');
+				$category = is_wp_error($default_category) ? '' : $default_category->slug;
 			}
 		}
 
 		$author = '';
-		if ( strpos($permalink, '%author%') !== false ) {
+		if (strpos($permalink, '%author%') !== false) {
 			$authordata = get_userdata($post->post_author);
 			$author = $authordata->user_nicename;
 		}
 
-		$date = explode(" ",date('Y m d H i s', $unixtime));
+		$date = explode(" ", date('Y m d H i s', $unixtime));
 		$rewritereplace =
 		array(
 			$date[0],
@@ -215,10 +215,10 @@ 
 			$author,
 			$post->post_name,
 		);
-		$permalink = home_url( str_replace($rewritecode, $rewritereplace, $permalink) );
+		$permalink = home_url(str_replace($rewritecode, $rewritereplace, $permalink));
 		$permalink = user_trailingslashit($permalink, 'single');
 	} else { // if they're not using the fancy permalink option
-		$permalink = home_url('?p=' . $post->ID);
+		$permalink = home_url('?p='.$post->ID);
 	}
 
 	/**
@@ -232,7 +232,7 @@ 
 	 * @param WP_Post $post      The post in question.
 	 * @param bool    $leavename Whether to keep the post name.
 	 */
-	return apply_filters( 'post_link', $permalink, $post, $leavename );
+	return apply_filters('post_link', $permalink, $post, $leavename);
 }
 
 /**
@@ -247,33 +247,33 @@ 
  * @param bool $sample    Optional, defaults to false. Is it a sample permalink.
  * @return string|WP_Error The post permalink.
  */
-function get_post_permalink( $id = 0, $leavename = false, $sample = false ) {
+function get_post_permalink($id = 0, $leavename = false, $sample = false) {
 	global $wp_rewrite;
 
 	$post = get_post($id);
 
-	if ( is_wp_error( $post ) )
+	if (is_wp_error($post))
 		return $post;
 
 	$post_link = $wp_rewrite->get_extra_permastruct($post->post_type);
 
 	$slug = $post->post_name;
 
-	$draft_or_pending = get_post_status( $id ) && in_array( get_post_status( $id ), array( 'draft', 'pending', 'auto-draft', 'future' ) );
+	$draft_or_pending = get_post_status($id) && in_array(get_post_status($id), array('draft', 'pending', 'auto-draft', 'future'));
 
 	$post_type = get_post_type_object($post->post_type);
 
-	if ( $post_type->hierarchical ) {
-		$slug = get_page_uri( $id );
+	if ($post_type->hierarchical) {
+		$slug = get_page_uri($id);
 	}
 
-	if ( !empty($post_link) && ( !$draft_or_pending || $sample ) ) {
-		if ( ! $leavename ) {
+	if ( ! empty($post_link) && ( ! $draft_or_pending || $sample)) {
+		if ( ! $leavename) {
 			$post_link = str_replace("%$post->post_type%", $slug, $post_link);
 		}
-		$post_link = home_url( user_trailingslashit($post_link) );
+		$post_link = home_url(user_trailingslashit($post_link));
 	} else {
-		if ( $post_type->query_var && ( isset($post->post_status) && !$draft_or_pending ) )
+		if ($post_type->query_var && (isset($post->post_status) && ! $draft_or_pending))
 			$post_link = add_query_arg($post_type->query_var, $slug, '');
 		else
 			$post_link = add_query_arg(array('post_type' => $post->post_type, 'p' => $post->ID), '');
@@ -290,7 +290,7 @@ 
 	 * @param bool    $leavename Whether to keep the post name.
 	 * @param bool    $sample    Is it a sample permalink.
 	 */
-	return apply_filters( 'post_type_link', $post_link, $post, $leavename, $sample );
+	return apply_filters('post_type_link', $post_link, $post, $leavename, $sample);
 }
 
 /**
@@ -305,13 +305,13 @@ 
  * @param bool       $sample    Optional, defaults to false. Is it a sample permalink.
  * @return string The page permalink.
  */
-function get_page_link( $post = false, $leavename = false, $sample = false ) {
-	$post = get_post( $post );
+function get_page_link($post = false, $leavename = false, $sample = false) {
+	$post = get_post($post);
 
-	if ( 'page' == get_option( 'show_on_front' ) && $post->ID == get_option( 'page_on_front' ) )
+	if ('page' == get_option('show_on_front') && $post->ID == get_option('page_on_front'))
 		$link = home_url('/');
 	else
-		$link = _get_page_link( $post, $leavename, $sample );
+		$link = _get_page_link($post, $leavename, $sample);
 
 	/**
 	 * Filter the permalink for a page.
@@ -322,7 +322,7 @@ 
 	 * @param int    $post_id The ID of the page.
 	 * @param bool   $sample  Is it a sample permalink.
 	 */
-	return apply_filters( 'page_link', $link, $post->ID, $sample );
+	return apply_filters('page_link', $link, $post->ID, $sample);
 }
 
 /**
@@ -340,24 +340,24 @@ 
  * @param bool       $sample    Optional. Sample permalink.
  * @return string The page permalink.
  */
-function _get_page_link( $post = false, $leavename = false, $sample = false ) {
+function _get_page_link($post = false, $leavename = false, $sample = false) {
 	global $wp_rewrite;
 
-	$post = get_post( $post );
+	$post = get_post($post);
 
-	$draft_or_pending = in_array( $post->post_status, array( 'draft', 'pending', 'auto-draft' ) );
+	$draft_or_pending = in_array($post->post_status, array('draft', 'pending', 'auto-draft'));
 
 	$link = $wp_rewrite->get_page_permastruct();
 
-	if ( !empty($link) && ( ( isset($post->post_status) && !$draft_or_pending ) || $sample ) ) {
-		if ( ! $leavename ) {
-			$link = str_replace('%pagename%', get_page_uri( $post ), $link);
+	if ( ! empty($link) && ((isset($post->post_status) && ! $draft_or_pending) || $sample)) {
+		if ( ! $leavename) {
+			$link = str_replace('%pagename%', get_page_uri($post), $link);
 		}
 
 		$link = home_url($link);
 		$link = user_trailingslashit($link, 'page');
 	} else {
-		$link = home_url( '?page_id=' . $post->ID );
+		$link = home_url('?page_id='.$post->ID);
 	}
 
 	/**
@@ -368,7 +368,7 @@ 
 	 * @param string $link    The page's permalink.
 	 * @param int    $post_id The ID of the page.
 	 */
-	return apply_filters( '_get_page_link', $link, $post->ID );
+	return apply_filters('_get_page_link', $link, $post->ID);
 }
 
 /**
@@ -384,39 +384,39 @@ 
  * @param bool       $leavename Optional. Leave name.
  * @return string The attachment permalink.
  */
-function get_attachment_link( $post = null, $leavename = false ) {
+function get_attachment_link($post = null, $leavename = false) {
 	global $wp_rewrite;
 
 	$link = false;
 
-	$post = get_post( $post );
-	$parent = ( $post->post_parent > 0 && $post->post_parent != $post->ID ) ? get_post( $post->post_parent ) : false;
-	if ( $parent && ! in_array( $parent->post_type, get_post_types() ) ) {
+	$post = get_post($post);
+	$parent = ($post->post_parent > 0 && $post->post_parent != $post->ID) ? get_post($post->post_parent) : false;
+	if ($parent && ! in_array($parent->post_type, get_post_types())) {
 		$parent = false;
 	}
 
-	if ( $wp_rewrite->using_permalinks() && $parent ) {
-		if ( 'page' == $parent->post_type )
-			$parentlink = _get_page_link( $post->post_parent ); // Ignores page_on_front
+	if ($wp_rewrite->using_permalinks() && $parent) {
+		if ('page' == $parent->post_type)
+			$parentlink = _get_page_link($post->post_parent); // Ignores page_on_front
 		else
-			$parentlink = get_permalink( $post->post_parent );
+			$parentlink = get_permalink($post->post_parent);
 
-		if ( is_numeric($post->post_name) || false !== strpos(get_option('permalink_structure'), '%category%') )
-			$name = 'attachment/' . $post->post_name; // <permalink>/<int>/ is paged so we use the explicit attachment marker
+		if (is_numeric($post->post_name) || false !== strpos(get_option('permalink_structure'), '%category%'))
+			$name = 'attachment/'.$post->post_name; // <permalink>/<int>/ is paged so we use the explicit attachment marker
 		else
 			$name = $post->post_name;
 
-		if ( strpos($parentlink, '?') === false )
-			$link = user_trailingslashit( trailingslashit($parentlink) . '%postname%' );
+		if (strpos($parentlink, '?') === false)
+			$link = user_trailingslashit(trailingslashit($parentlink).'%postname%');
 
-		if ( ! $leavename )
-			$link = str_replace( '%postname%', $name, $link );
-	} elseif ( $wp_rewrite->using_permalinks() && ! $leavename ) {
-		$link = home_url( user_trailingslashit( $post->post_name ) );
+		if ( ! $leavename)
+			$link = str_replace('%postname%', $name, $link);
+	} elseif ($wp_rewrite->using_permalinks() && ! $leavename) {
+		$link = home_url(user_trailingslashit($post->post_name));
 	}
 
-	if ( ! $link )
-		$link = home_url( '/?attachment_id=' . $post->ID );
+	if ( ! $link)
+		$link = home_url('/?attachment_id='.$post->ID);
 
 	/**
 	 * Filter the permalink for an attachment.
@@ -426,7 +426,7 @@ 
 	 * @param string $link    The attachment's permalink.
 	 * @param int    $post_id Attachment ID.
 	 */
-	return apply_filters( 'attachment_link', $link, $post->ID );
+	return apply_filters('attachment_link', $link, $post->ID);
 }
 
 /**
@@ -441,14 +441,14 @@ 
  */
 function get_year_link($year) {
 	global $wp_rewrite;
-	if ( !$year )
+	if ( ! $year)
 		$year = gmdate('Y', current_time('timestamp'));
 	$yearlink = $wp_rewrite->get_year_permastruct();
-	if ( !empty($yearlink) ) {
+	if ( ! empty($yearlink)) {
 		$yearlink = str_replace('%year%', $year, $yearlink);
-		$yearlink = home_url( user_trailingslashit( $yearlink, 'year' ) );
+		$yearlink = home_url(user_trailingslashit($yearlink, 'year'));
 	} else {
-		$yearlink = home_url( '?m=' . $year );
+		$yearlink = home_url('?m='.$year);
 	}
 
 	/**
@@ -459,7 +459,7 @@ 
 	 * @param string $yearlink Permalink for the year archive.
 	 * @param int    $year     Year for the archive.
 	 */
-	return apply_filters( 'year_link', $yearlink, $year );
+	return apply_filters('year_link', $yearlink, $year);
 }
 
 /**
@@ -475,17 +475,17 @@ 
  */
 function get_month_link($year, $month) {
 	global $wp_rewrite;
-	if ( !$year )
+	if ( ! $year)
 		$year = gmdate('Y', current_time('timestamp'));
-	if ( !$month )
+	if ( ! $month)
 		$month = gmdate('m', current_time('timestamp'));
 	$monthlink = $wp_rewrite->get_month_permastruct();
-	if ( !empty($monthlink) ) {
+	if ( ! empty($monthlink)) {
 		$monthlink = str_replace('%year%', $year, $monthlink);
 		$monthlink = str_replace('%monthnum%', zeroise(intval($month), 2), $monthlink);
-		$monthlink = home_url( user_trailingslashit( $monthlink, 'month' ) );
+		$monthlink = home_url(user_trailingslashit($monthlink, 'month'));
 	} else {
-		$monthlink = home_url( '?m=' . $year . zeroise( $month, 2 ) );
+		$monthlink = home_url('?m='.$year.zeroise($month, 2));
 	}
 
 	/**
@@ -497,7 +497,7 @@ 
 	 * @param int    $year      Year for the archive.
 	 * @param int    $month     The month for the archive.
 	 */
-	return apply_filters( 'month_link', $monthlink, $year, $month );
+	return apply_filters('month_link', $monthlink, $year, $month);
 }
 
 /**
@@ -514,21 +514,21 @@ 
  */
 function get_day_link($year, $month, $day) {
 	global $wp_rewrite;
-	if ( !$year )
+	if ( ! $year)
 		$year = gmdate('Y', current_time('timestamp'));
-	if ( !$month )
+	if ( ! $month)
 		$month = gmdate('m', current_time('timestamp'));
-	if ( !$day )
+	if ( ! $day)
 		$day = gmdate('j', current_time('timestamp'));
 
 	$daylink = $wp_rewrite->get_day_permastruct();
-	if ( !empty($daylink) ) {
+	if ( ! empty($daylink)) {
 		$daylink = str_replace('%year%', $year, $daylink);
 		$daylink = str_replace('%monthnum%', zeroise(intval($month), 2), $daylink);
 		$daylink = str_replace('%day%', zeroise(intval($day), 2), $daylink);
-		$daylink = home_url( user_trailingslashit( $daylink, 'day' ) );
+		$daylink = home_url(user_trailingslashit($daylink, 'day'));
 	} else {
-		$daylink = home_url( '?m=' . $year . zeroise( $month, 2 ) . zeroise( $day, 2 ) );
+		$daylink = home_url('?m='.$year.zeroise($month, 2).zeroise($day, 2));
 	}
 
 	/**
@@ -541,7 +541,7 @@ 
 	 * @param int    $month   Month for the archive.
 	 * @param int    $day     The day for the archive.
 	 */
-	return apply_filters( 'day_link', $daylink, $year, $month, $day );
+	return apply_filters('day_link', $daylink, $year, $month, $day);
 }
 
 /**
@@ -552,8 +552,8 @@ 
  * @param string $anchor The link's anchor text.
  * @param string $feed   Optional, defaults to default feed. Feed type.
  */
-function the_feed_link( $anchor, $feed = '' ) {
-	$link = '<a href="' . esc_url( get_feed_link( $feed ) ) . '">' . $anchor . '</a>';
+function the_feed_link($anchor, $feed = '') {
+	$link = '<a href="'.esc_url(get_feed_link($feed)).'">'.$anchor.'</a>';
 
 	/**
 	 * Filter the feed link anchor tag.
@@ -564,7 +564,7 @@ 
 	 * @param string $feed The feed type, or an empty string for the
 	 *                     default feed type.
 	 */
-	echo apply_filters( 'the_feed_link', $link, $feed );
+	echo apply_filters('the_feed_link', $link, $feed);
 }
 
 /**
@@ -581,23 +581,23 @@ 
 	global $wp_rewrite;
 
 	$permalink = $wp_rewrite->get_feed_permastruct();
-	if ( '' != $permalink ) {
-		if ( false !== strpos($feed, 'comments_') ) {
+	if ('' != $permalink) {
+		if (false !== strpos($feed, 'comments_')) {
 			$feed = str_replace('comments_', '', $feed);
 			$permalink = $wp_rewrite->get_comment_feed_permastruct();
 		}
 
-		if ( get_default_feed() == $feed )
+		if (get_default_feed() == $feed)
 			$feed = '';
 
 		$permalink = str_replace('%feed%', $feed, $permalink);
 		$permalink = preg_replace('#/+#', '/', "/$permalink");
-		$output =  home_url( user_trailingslashit($permalink, 'feed') );
+		$output = home_url(user_trailingslashit($permalink, 'feed'));
 	} else {
-		if ( empty($feed) )
+		if (empty($feed))
 			$feed = get_default_feed();
 
-		if ( false !== strpos($feed, 'comments_') )
+		if (false !== strpos($feed, 'comments_'))
 			$feed = str_replace('comments_', 'comments-', $feed);
 
 		$output = home_url("?feed={$feed}");
@@ -611,7 +611,7 @@ 
 	 * @param string $output The feed permalink.
 	 * @param string $feed   Feed type.
 	 */
-	return apply_filters( 'feed_link', $output, $feed );
+	return apply_filters('feed_link', $output, $feed);
 }
 
 /**
@@ -624,42 +624,42 @@ 
  * @return string The permalink for the comments feed for the given post.
  */
 function get_post_comments_feed_link($post_id = 0, $feed = '') {
-	$post_id = absint( $post_id );
+	$post_id = absint($post_id);
 
-	if ( ! $post_id )
+	if ( ! $post_id)
 		$post_id = get_the_ID();
 
-	if ( empty( $feed ) )
+	if (empty($feed))
 		$feed = get_default_feed();
 
-	$post = get_post( $post_id );
+	$post = get_post($post_id);
 	$unattached = 'attachment' === $post->post_type && 0 === (int) $post->post_parent;
 
-	if ( '' != get_option('permalink_structure') ) {
-		if ( 'page' == get_option('show_on_front') && $post_id == get_option('page_on_front') )
-			$url = _get_page_link( $post_id );
+	if ('' != get_option('permalink_structure')) {
+		if ('page' == get_option('show_on_front') && $post_id == get_option('page_on_front'))
+			$url = _get_page_link($post_id);
 		else
 			$url = get_permalink($post_id);
 
-		if ( $unattached ) {
-			$url =  home_url( '/feed/' );
-			if ( $feed !== get_default_feed() ) {
+		if ($unattached) {
+			$url = home_url('/feed/');
+			if ($feed !== get_default_feed()) {
 				$url .= "$feed/";
 			}
-			$url = add_query_arg( 'attachment_id', $post_id, $url );
+			$url = add_query_arg('attachment_id', $post_id, $url);
 		} else {
-			$url = trailingslashit($url) . 'feed';
-			if ( $feed != get_default_feed() )
+			$url = trailingslashit($url).'feed';
+			if ($feed != get_default_feed())
 				$url .= "/$feed";
 			$url = user_trailingslashit($url, 'single_feed');
 		}
 	} else {
-		if ( $unattached ) {
-			$url = add_query_arg( array( 'feed' => $feed, 'attachment_id' => $post_id ), home_url( '/' ) );
-		} elseif ( 'page' == $post->post_type ) {
-			$url = add_query_arg( array( 'feed' => $feed, 'page_id' => $post_id ), home_url( '/' ) );
+		if ($unattached) {
+			$url = add_query_arg(array('feed' => $feed, 'attachment_id' => $post_id), home_url('/'));
+		} elseif ('page' == $post->post_type) {
+			$url = add_query_arg(array('feed' => $feed, 'page_id' => $post_id), home_url('/'));
 		} else {
-			$url = add_query_arg( array( 'feed' => $feed, 'p' => $post_id ), home_url( '/' ) );
+			$url = add_query_arg(array('feed' => $feed, 'p' => $post_id), home_url('/'));
 		}
 	}
 
@@ -670,7 +670,7 @@ 
 	 *
 	 * @param string $url Post comments feed permalink.
 	 */
-	return apply_filters( 'post_comments_feed_link', $url );
+	return apply_filters('post_comments_feed_link', $url);
 }
 
 /**
@@ -686,13 +686,13 @@ 
  * @param int    $post_id   Optional post ID. Default to current post.
  * @param string $feed      Optional. Feed format.
  */
-function post_comments_feed_link( $link_text = '', $post_id = '', $feed = '' ) {
-	$url = get_post_comments_feed_link( $post_id, $feed );
-	if ( empty( $link_text ) ) {
+function post_comments_feed_link($link_text = '', $post_id = '', $feed = '') {
+	$url = get_post_comments_feed_link($post_id, $feed);
+	if (empty($link_text)) {
 		$link_text = __('Comments Feed');
 	}
 
-	$link = '<a href="' . esc_url( $url ) . '">' . $link_text . '</a>';
+	$link = '<a href="'.esc_url($url).'">'.$link_text.'</a>';
 	/**
 	 * Filter the post comment feed link anchor tag.
 	 *
@@ -702,7 +702,7 @@ 
 	 * @param int    $post_id Post ID.
 	 * @param string $feed    The feed type, or an empty string for the default feed type.
 	 */
-	echo apply_filters( 'post_comments_feed_link_html', $link, $post_id, $feed );
+	echo apply_filters('post_comments_feed_link_html', $link, $post_id, $feed);
 }
 
 /**
@@ -717,23 +717,23 @@ 
  * @param string $feed      Optional. Feed type.
  * @return string Link to the feed for the author specified by $author_id.
  */
-function get_author_feed_link( $author_id, $feed = '' ) {
+function get_author_feed_link($author_id, $feed = '') {
 	$author_id = (int) $author_id;
 	$permalink_structure = get_option('permalink_structure');
 
-	if ( empty($feed) )
+	if (empty($feed))
 		$feed = get_default_feed();
 
-	if ( '' == $permalink_structure ) {
-		$link = home_url("?feed=$feed&amp;author=" . $author_id);
+	if ('' == $permalink_structure) {
+		$link = home_url("?feed=$feed&amp;author=".$author_id);
 	} else {
 		$link = get_author_posts_url($author_id);
-		if ( $feed == get_default_feed() )
+		if ($feed == get_default_feed())
 			$feed_link = 'feed';
 		else
 			$feed_link = "feed/$feed";
 
-		$link = trailingslashit($link) . user_trailingslashit($feed_link, 'feed');
+		$link = trailingslashit($link).user_trailingslashit($feed_link, 'feed');
 	}
 
 	/**
@@ -744,7 +744,7 @@ 
 	 * @param string $link The author feed link.
 	 * @param string $feed Feed type.
 	 */
-	$link = apply_filters( 'author_feed_link', $link, $feed );
+	$link = apply_filters('author_feed_link', $link, $feed);
 
 	return $link;
 }
@@ -761,8 +761,8 @@ 
  * @param string $feed   Optional. Feed type.
  * @return string Link to the feed for the category specified by $cat_id.
  */
-function get_category_feed_link( $cat_id, $feed = '' ) {
-	return get_term_feed_link( $cat_id, 'category', $feed );
+function get_category_feed_link($cat_id, $feed = '') {
+	return get_term_feed_link($cat_id, 'category', $feed);
 }
 
 /**
@@ -778,40 +778,40 @@ 
  * @param string $feed     Optional. Feed type.
  * @return string|false Link to the feed for the term specified by $term_id and $taxonomy.
  */
-function get_term_feed_link( $term_id, $taxonomy = 'category', $feed = '' ) {
-	$term_id = ( int ) $term_id;
+function get_term_feed_link($term_id, $taxonomy = 'category', $feed = '') {
+	$term_id = (int) $term_id;
 
-	$term = get_term( $term_id, $taxonomy  );
+	$term = get_term($term_id, $taxonomy);
 
-	if ( empty( $term ) || is_wp_error( $term ) )
+	if (empty($term) || is_wp_error($term))
 		return false;
 
-	if ( empty( $feed ) )
+	if (empty($feed))
 		$feed = get_default_feed();
 
-	$permalink_structure = get_option( 'permalink_structure' );
+	$permalink_structure = get_option('permalink_structure');
 
-	if ( '' == $permalink_structure ) {
-		if ( 'category' == $taxonomy ) {
+	if ('' == $permalink_structure) {
+		if ('category' == $taxonomy) {
 			$link = home_url("?feed=$feed&amp;cat=$term_id");
 		}
-		elseif ( 'post_tag' == $taxonomy ) {
+		elseif ('post_tag' == $taxonomy) {
 			$link = home_url("?feed=$feed&amp;tag=$term->slug");
 		} else {
-			$t = get_taxonomy( $taxonomy );
+			$t = get_taxonomy($taxonomy);
 			$link = home_url("?feed=$feed&amp;$t->query_var=$term->slug");
 		}
 	} else {
-		$link = get_term_link( $term_id, $term->taxonomy );
-		if ( $feed == get_default_feed() )
+		$link = get_term_link($term_id, $term->taxonomy);
+		if ($feed == get_default_feed())
 			$feed_link = 'feed';
 		else
 			$feed_link = "feed/$feed";
 
-		$link = trailingslashit( $link ) . user_trailingslashit( $feed_link, 'feed' );
+		$link = trailingslashit($link).user_trailingslashit($feed_link, 'feed');
 	}
 
-	if ( 'category' == $taxonomy ) {
+	if ('category' == $taxonomy) {
 		/**
 		 * Filter the category feed link.
 		 *
@@ -820,8 +820,8 @@ 
 		 * @param string $link The category feed link.
 		 * @param string $feed Feed type.
 		 */
-		$link = apply_filters( 'category_feed_link', $link, $feed );
-	} elseif ( 'post_tag' == $taxonomy ) {
+		$link = apply_filters('category_feed_link', $link, $feed);
+	} elseif ('post_tag' == $taxonomy) {
 		/**
 		 * Filter the post tag feed link.
 		 *
@@ -830,7 +830,7 @@ 
 		 * @param string $link The tag feed link.
 		 * @param string $feed Feed type.
 		 */
-		$link = apply_filters( 'tag_feed_link', $link, $feed );
+		$link = apply_filters('tag_feed_link', $link, $feed);
 	} else {
 		/**
 		 * Filter the feed link for a taxonomy other than 'category' or 'post_tag'.
@@ -841,7 +841,7 @@ 
 		 * @param string $feed Feed type.
 		 * @param string $feed The taxonomy name.
 		 */
-		$link = apply_filters( 'taxonomy_feed_link', $link, $feed, $taxonomy );
+		$link = apply_filters('taxonomy_feed_link', $link, $feed, $taxonomy);
 	}
 
 	return $link;
@@ -856,8 +856,8 @@ 
  * @param string $feed   Optional. Feed type.
  * @return string The feed permalink for the given tag.
  */
-function get_tag_feed_link( $tag_id, $feed = '' ) {
-	return get_term_feed_link( $tag_id, 'post_tag', $feed );
+function get_tag_feed_link($tag_id, $feed = '') {
+	return get_term_feed_link($tag_id, 'post_tag', $feed);
 }
 
 /**
@@ -869,7 +869,7 @@ 
  * @param string $taxonomy Taxonomy
  * @return string The edit tag link URL for the given tag.
  */
-function get_edit_tag_link( $tag_id, $taxonomy = 'post_tag' ) {
+function get_edit_tag_link($tag_id, $taxonomy = 'post_tag') {
 	/**
 	 * Filter the edit link for a tag (or term in another taxonomy).
 	 *
@@ -877,7 +877,7 @@ 
 	 *
 	 * @param string $link The term edit link.
 	 */
-	return apply_filters( 'get_edit_tag_link', get_edit_term_link( $tag_id, $taxonomy ) );
+	return apply_filters('get_edit_tag_link', get_edit_term_link($tag_id, $taxonomy));
 }
 
 /**
@@ -890,8 +890,8 @@ 
  * @param string $after  Optional. Display after edit link.
  * @param object $tag    Tag object.
  */
-function edit_tag_link( $link = '', $before = '', $after = '', $tag = null ) {
-	$link = edit_term_link( $link, '', '', $tag, false );
+function edit_tag_link($link = '', $before = '', $after = '', $tag = null) {
+	$link = edit_term_link($link, '', '', $tag, false);
 
 	/**
 	 * Filter the anchor tag for the edit link for a tag (or term in another taxonomy).
@@ -900,7 +900,7 @@ 
 	 *
 	 * @param string $link The anchor tag for the edit link.
 	 */
-	echo $before . apply_filters( 'edit_tag_link', $link ) . $after;
+	echo $before.apply_filters('edit_tag_link', $link).$after;
 }
 
 /**
@@ -915,14 +915,14 @@ 
  *                            Defaults to the first object_type associated with the taxonomy.
  * @return string|null The edit term link URL for the given term, or null on failure.
  */
-function get_edit_term_link( $term_id, $taxonomy = '', $object_type = '' ) {
-	$term = get_term( $term_id, $taxonomy );
-	if ( ! $term || is_wp_error( $term ) ) {
+function get_edit_term_link($term_id, $taxonomy = '', $object_type = '') {
+	$term = get_term($term_id, $taxonomy);
+	if ( ! $term || is_wp_error($term)) {
 		return;
 	}
 
-	$tax = get_taxonomy( $term->taxonomy );
-	if ( ! $tax || ! current_user_can( $tax->cap->edit_terms ) ) {
+	$tax = get_taxonomy($term->taxonomy);
+	if ( ! $tax || ! current_user_can($tax->cap->edit_terms)) {
 		return;
 	}
 
@@ -931,14 +931,14 @@ 
 		'tag_ID'   => $term->term_id,
 	);
 
-	if ( $object_type ) {
+	if ($object_type) {
 		$args['post_type'] = $object_type;
-	} elseif ( ! empty( $tax->object_type ) ) {
-		$args['post_type'] = reset( $tax->object_type );
+	} elseif ( ! empty($tax->object_type)) {
+		$args['post_type'] = reset($tax->object_type);
 	}
 
-	if ( $tax->show_ui ) {
-		$location = add_query_arg( $args, admin_url( 'term.php' ) );
+	if ($tax->show_ui) {
+		$location = add_query_arg($args, admin_url('term.php'));
 	} else {
 		$location = '';
 	}
@@ -953,7 +953,7 @@ 
 	 * @param string $taxonomy    Taxonomy name.
 	 * @param string $object_type The object type (eg. the post type).
 	 */
-	return apply_filters( 'get_edit_term_link', $location, $term_id, $taxonomy, $object_type );
+	return apply_filters('get_edit_term_link', $location, $term_id, $taxonomy, $object_type);
 }
 
 /**
@@ -968,21 +968,21 @@ 
  * @param bool   $echo   Optional. Whether or not to echo the return. Default true.
  * @return string|void HTML content.
  */
-function edit_term_link( $link = '', $before = '', $after = '', $term = null, $echo = true ) {
-	if ( is_null( $term ) )
+function edit_term_link($link = '', $before = '', $after = '', $term = null, $echo = true) {
+	if (is_null($term))
 		$term = get_queried_object();
 
-	if ( ! $term )
+	if ( ! $term)
 		return;
 
-	$tax = get_taxonomy( $term->taxonomy );
-	if ( ! current_user_can( $tax->cap->edit_terms ) )
+	$tax = get_taxonomy($term->taxonomy);
+	if ( ! current_user_can($tax->cap->edit_terms))
 		return;
 
-	if ( empty( $link ) )
+	if (empty($link))
 		$link = __('Edit This');
 
-	$link = '<a href="' . get_edit_term_link( $term->term_id, $term->taxonomy ) . '">' . $link . '</a>';
+	$link = '<a href="'.get_edit_term_link($term->term_id, $term->taxonomy).'">'.$link.'</a>';
 
 	/**
 	 * Filter the anchor tag for the edit link of a term.
@@ -992,9 +992,9 @@ 
 	 * @param string $link    The anchor tag for the edit link.
 	 * @param int    $term_id Term ID.
 	 */
-	$link = $before . apply_filters( 'edit_term_link', $link, $term->term_id ) . $after;
+	$link = $before.apply_filters('edit_term_link', $link, $term->term_id).$after;
 
-	if ( $echo )
+	if ($echo)
 		echo $link;
 	else
 		return $link;
@@ -1010,23 +1010,23 @@ 
  * @param string $query Optional. The query string to use. If empty the current query is used.
  * @return string The search permalink.
  */
-function get_search_link( $query = '' ) {
+function get_search_link($query = '') {
 	global $wp_rewrite;
 
-	if ( empty($query) )
-		$search = get_search_query( false );
+	if (empty($query))
+		$search = get_search_query(false);
 	else
 		$search = stripslashes($query);
 
 	$permastruct = $wp_rewrite->get_search_permastruct();
 
-	if ( empty( $permastruct ) ) {
-		$link = home_url('?s=' . urlencode($search) );
+	if (empty($permastruct)) {
+		$link = home_url('?s='.urlencode($search));
 	} else {
 		$search = urlencode($search);
 		$search = str_replace('%2F', '/', $search); // %2F(/) is not valid within a URL, send it un-encoded.
-		$link = str_replace( '%search%', $search, $permastruct );
-		$link = home_url( user_trailingslashit( $link, 'search' ) );
+		$link = str_replace('%search%', $search, $permastruct);
+		$link = home_url(user_trailingslashit($link, 'search'));
 	}
 
 	/**
@@ -1037,7 +1037,7 @@ 
 	 * @param string $link   Search permalink.
 	 * @param string $search The URL-encoded search term.
 	 */
-	return apply_filters( 'search_link', $link, $search );
+	return apply_filters('search_link', $link, $search);
 }
 
 /**
@@ -1055,12 +1055,12 @@ 
 	global $wp_rewrite;
 	$link = get_search_link($search_query);
 
-	if ( empty($feed) )
+	if (empty($feed))
 		$feed = get_default_feed();
 
 	$permastruct = $wp_rewrite->get_search_permastruct();
 
-	if ( empty($permastruct) ) {
+	if (empty($permastruct)) {
 		$link = add_query_arg('feed', $feed, $link);
 	} else {
 		$link = trailingslashit($link);
@@ -1076,7 +1076,7 @@ 
 	 * @param string $feed Feed type.
 	 * @param string $type The search type. One of 'posts' or 'comments'.
 	 */
-	return apply_filters( 'search_feed_link', $link, $feed, 'posts' );
+	return apply_filters('search_feed_link', $link, $feed, 'posts');
 }
 
 /**
@@ -1093,20 +1093,20 @@ 
 function get_search_comments_feed_link($search_query = '', $feed = '') {
 	global $wp_rewrite;
 
-	if ( empty($feed) )
+	if (empty($feed))
 		$feed = get_default_feed();
 
 	$link = get_search_feed_link($search_query, $feed);
 
 	$permastruct = $wp_rewrite->get_search_permastruct();
 
-	if ( empty($permastruct) )
-		$link = add_query_arg('feed', 'comments-' . $feed, $link);
+	if (empty($permastruct))
+		$link = add_query_arg('feed', 'comments-'.$feed, $link);
 	else
 		$link = add_query_arg('withcomments', 1, $link);
 
 	/** This filter is documented in wp-includes/link-template.php */
-	return apply_filters( 'search_feed_link', $link, $feed, 'comments' );
+	return apply_filters('search_feed_link', $link, $feed, 'comments');
 }
 
 /**
@@ -1120,36 +1120,36 @@ 
  * @param string $post_type Post type.
  * @return string|false The post type archive permalink.
  */
-function get_post_type_archive_link( $post_type ) {
+function get_post_type_archive_link($post_type) {
 	global $wp_rewrite;
-	if ( ! $post_type_obj = get_post_type_object( $post_type ) )
+	if ( ! $post_type_obj = get_post_type_object($post_type))
 		return false;
 
-	if ( 'post' === $post_type ) {
-		$show_on_front = get_option( 'show_on_front' );
-		$page_for_posts  = get_option( 'page_for_posts' );
+	if ('post' === $post_type) {
+		$show_on_front = get_option('show_on_front');
+		$page_for_posts = get_option('page_for_posts');
 
-		if ( 'page' == $show_on_front && $page_for_posts ) {
-			$link = get_permalink( $page_for_posts );
+		if ('page' == $show_on_front && $page_for_posts) {
+			$link = get_permalink($page_for_posts);
 		} else {
 			$link = get_home_url();
 		}
 		/** This filter is documented in wp-includes/link-template.php */
-		return apply_filters( 'post_type_archive_link', $link, $post_type );
+		return apply_filters('post_type_archive_link', $link, $post_type);
 	}
 
-	if ( ! $post_type_obj->has_archive )
+	if ( ! $post_type_obj->has_archive)
 		return false;
 
-	if ( get_option( 'permalink_structure' ) && is_array( $post_type_obj->rewrite ) ) {
-		$struct = ( true === $post_type_obj->has_archive ) ? $post_type_obj->rewrite['slug'] : $post_type_obj->has_archive;
-		if ( $post_type_obj->rewrite['with_front'] )
-			$struct = $wp_rewrite->front . $struct;
+	if (get_option('permalink_structure') && is_array($post_type_obj->rewrite)) {
+		$struct = (true === $post_type_obj->has_archive) ? $post_type_obj->rewrite['slug'] : $post_type_obj->has_archive;
+		if ($post_type_obj->rewrite['with_front'])
+			$struct = $wp_rewrite->front.$struct;
 		else
-			$struct = $wp_rewrite->root . $struct;
-		$link = home_url( user_trailingslashit( $struct, 'post_type_archive' ) );
+			$struct = $wp_rewrite->root.$struct;
+		$link = home_url(user_trailingslashit($struct, 'post_type_archive'));
 	} else {
-		$link = home_url( '?post_type=' . $post_type );
+		$link = home_url('?post_type='.$post_type);
 	}
 
 	/**
@@ -1160,7 +1160,7 @@ 
 	 * @param string $link      The post type archive permalink.
 	 * @param string $post_type Post type name.
 	 */
-	return apply_filters( 'post_type_archive_link', $link, $post_type );
+	return apply_filters('post_type_archive_link', $link, $post_type);
 }
 
 /**
@@ -1172,22 +1172,22 @@ 
  * @param string $feed      Optional. Feed type
  * @return string|false The post type feed permalink.
  */
-function get_post_type_archive_feed_link( $post_type, $feed = '' ) {
+function get_post_type_archive_feed_link($post_type, $feed = '') {
 	$default_feed = get_default_feed();
-	if ( empty( $feed ) )
+	if (empty($feed))
 		$feed = $default_feed;
 
-	if ( ! $link = get_post_type_archive_link( $post_type ) )
+	if ( ! $link = get_post_type_archive_link($post_type))
 		return false;
 
-	$post_type_obj = get_post_type_object( $post_type );
-	if ( get_option( 'permalink_structure' ) && is_array( $post_type_obj->rewrite ) && $post_type_obj->rewrite['feeds'] ) {
-		$link = trailingslashit( $link );
+	$post_type_obj = get_post_type_object($post_type);
+	if (get_option('permalink_structure') && is_array($post_type_obj->rewrite) && $post_type_obj->rewrite['feeds']) {
+		$link = trailingslashit($link);
 		$link .= 'feed/';
-		if ( $feed != $default_feed )
+		if ($feed != $default_feed)
 			$link .= "$feed/";
 	} else {
-		$link = add_query_arg( 'feed', $feed, $link );
+		$link = add_query_arg('feed', $feed, $link);
 	}
 
 	/**
@@ -1198,7 +1198,7 @@ 
 	 * @param string $link The post type archive feed link.
 	 * @param string $feed Feed type.
 	 */
-	return apply_filters( 'post_type_archive_feed_link', $link, $feed );
+	return apply_filters('post_type_archive_feed_link', $link, $feed);
 }
 
 /**
@@ -1213,20 +1213,20 @@ 
  * @param string      $preview_link Optional. Base preview link to be used if it should differ from the post permalink.
  * @return string URL used for the post preview.
  */
-function get_preview_post_link( $post = null, $query_args = array(), $preview_link = '' ) {
-	$post = get_post( $post );
-	if ( ! $post ) {
+function get_preview_post_link($post = null, $query_args = array(), $preview_link = '') {
+	$post = get_post($post);
+	if ( ! $post) {
 		return;
 	}
 
-	$post_type_object = get_post_type_object( $post->post_type );
-	if ( is_post_type_viewable( $post_type_object ) ) {
-		if ( ! $preview_link ) {
-			$preview_link = set_url_scheme( get_permalink( $post ) );
+	$post_type_object = get_post_type_object($post->post_type);
+	if (is_post_type_viewable($post_type_object)) {
+		if ( ! $preview_link) {
+			$preview_link = set_url_scheme(get_permalink($post));
 		}
 
 		$query_args['preview'] = 'true';
-		$preview_link = add_query_arg( $query_args, $preview_link );
+		$preview_link = add_query_arg($query_args, $preview_link);
 	}
 
 	/**
@@ -1238,7 +1238,7 @@ 
 	 * @param string  $preview_link URL used for the post preview.
 	 * @param WP_Post $post         Post object.
 	 */
-	return apply_filters( 'preview_post_link', $preview_link, $post );
+	return apply_filters('preview_post_link', $preview_link, $post);
 }
 
 /**
@@ -1254,26 +1254,26 @@ 
  * @return string|null The edit post link for the given post. null if the post type is invalid or does
  *                     not allow an editing UI.
  */
-function get_edit_post_link( $id = 0, $context = 'display' ) {
-	if ( ! $post = get_post( $id ) )
+function get_edit_post_link($id = 0, $context = 'display') {
+	if ( ! $post = get_post($id))
 		return;
 
-	if ( 'revision' === $post->post_type )
+	if ('revision' === $post->post_type)
 		$action = '';
-	elseif ( 'display' == $context )
+	elseif ('display' == $context)
 		$action = '&amp;action=edit';
 	else
 		$action = '&action=edit';
 
-	$post_type_object = get_post_type_object( $post->post_type );
-	if ( !$post_type_object )
+	$post_type_object = get_post_type_object($post->post_type);
+	if ( ! $post_type_object)
 		return;
 
-	if ( !current_user_can( 'edit_post', $post->ID ) )
+	if ( ! current_user_can('edit_post', $post->ID))
 		return;
 
-	if ( $post_type_object->_edit_link ) {
-		$link = admin_url( sprintf( $post_type_object->_edit_link . $action, $post->ID ) );
+	if ($post_type_object->_edit_link) {
+		$link = admin_url(sprintf($post_type_object->_edit_link.$action, $post->ID));
 	} else {
 		$link = '';
 	}
@@ -1288,7 +1288,7 @@ 
 	 * @param string $context The link context. If set to 'display' then ampersands
 	 *                        are encoded.
 	 */
-	return apply_filters( 'get_edit_post_link', $link, $post->ID, $context );
+	return apply_filters('get_edit_post_link', $link, $post->ID, $context);
 }
 
 /**
@@ -1303,20 +1303,20 @@ 
  * @param int    $id     Optional. Post ID.
  * @param string $class  Optional. Add custom class to link.
  */
-function edit_post_link( $text = null, $before = '', $after = '', $id = 0, $class = 'post-edit-link' ) {
-	if ( ! $post = get_post( $id ) ) {
+function edit_post_link($text = null, $before = '', $after = '', $id = 0, $class = 'post-edit-link') {
+	if ( ! $post = get_post($id)) {
 		return;
 	}
 
-	if ( ! $url = get_edit_post_link( $post->ID ) ) {
+	if ( ! $url = get_edit_post_link($post->ID)) {
 		return;
 	}
 
-	if ( null === $text ) {
-		$text = __( 'Edit This' );
+	if (null === $text) {
+		$text = __('Edit This');
 	}
 
-	$link = '<a class="' . esc_attr( $class ) . '" href="' . esc_url( $url ) . '">' . $text . '</a>';
+	$link = '<a class="'.esc_attr($class).'" href="'.esc_url($url).'">'.$text.'</a>';
 
 	/**
 	 * Filter the post edit link anchor tag.
@@ -1327,7 +1327,7 @@ 
 	 * @param int    $post_id Post ID.
 	 * @param string $text    Anchor text.
 	 */
-	echo $before . apply_filters( 'edit_post_link', $link, $post->ID, $text ) . $after;
+	echo $before.apply_filters('edit_post_link', $link, $post->ID, $text).$after;
 }
 
 /**
@@ -1342,23 +1342,23 @@ 
  * @param bool   $force_delete Whether to bypass trash and force deletion. Default is false.
  * @return string|void The delete post link URL for the given post.
  */
-function get_delete_post_link( $id = 0, $deprecated = '', $force_delete = false ) {
-	if ( ! empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '3.0' );
+function get_delete_post_link($id = 0, $deprecated = '', $force_delete = false) {
+	if ( ! empty($deprecated))
+		_deprecated_argument(__FUNCTION__, '3.0');
 
-	if ( !$post = get_post( $id ) )
+	if ( ! $post = get_post($id))
 		return;
 
-	$post_type_object = get_post_type_object( $post->post_type );
-	if ( !$post_type_object )
+	$post_type_object = get_post_type_object($post->post_type);
+	if ( ! $post_type_object)
 		return;
 
-	if ( !current_user_can( 'delete_post', $post->ID ) )
+	if ( ! current_user_can('delete_post', $post->ID))
 		return;
 
-	$action = ( $force_delete || !EMPTY_TRASH_DAYS ) ? 'delete' : 'trash';
+	$action = ($force_delete || ! EMPTY_TRASH_DAYS) ? 'delete' : 'trash';
 
-	$delete_link = add_query_arg( 'action', $action, admin_url( sprintf( $post_type_object->_edit_link, $post->ID ) ) );
+	$delete_link = add_query_arg('action', $action, admin_url(sprintf($post_type_object->_edit_link, $post->ID)));
 
 	/**
 	 * Filter the post delete link.
@@ -1369,7 +1369,7 @@ 
 	 * @param int    $post_id      Post ID.
 	 * @param bool   $force_delete Whether to bypass the trash and force deletion. Default false.
 	 */
-	return apply_filters( 'get_delete_post_link', wp_nonce_url( $delete_link, "$action-post_{$post->ID}" ), $post->ID, $force_delete );
+	return apply_filters('get_delete_post_link', wp_nonce_url($delete_link, "$action-post_{$post->ID}"), $post->ID, $force_delete);
 }
 
 /**
@@ -1380,13 +1380,13 @@ 
  * @param int|WP_Comment $comment_id Optional. Comment ID or WP_Comment object.
  * @return string|void The edit comment link URL for the given comment.
  */
-function get_edit_comment_link( $comment_id = 0 ) {
-	$comment = get_comment( $comment_id );
+function get_edit_comment_link($comment_id = 0) {
+	$comment = get_comment($comment_id);
 
-	if ( !current_user_can( 'edit_comment', $comment->comment_ID ) )
+	if ( ! current_user_can('edit_comment', $comment->comment_ID))
 		return;
 
-	$location = admin_url('comment.php?action=editcomment&amp;c=') . $comment->comment_ID;
+	$location = admin_url('comment.php?action=editcomment&amp;c=').$comment->comment_ID;
 
 	/**
 	 * Filter the comment edit link.
@@ -1395,7 +1395,7 @@ 
 	 *
 	 * @param string $location The edit link.
 	 */
-	return apply_filters( 'get_edit_comment_link', $location );
+	return apply_filters('get_edit_comment_link', $location);
 }
 
 /**
@@ -1407,18 +1407,18 @@ 
  * @param string $before Optional. Display before edit link.
  * @param string $after  Optional. Display after edit link.
  */
-function edit_comment_link( $text = null, $before = '', $after = '' ) {
+function edit_comment_link($text = null, $before = '', $after = '') {
 	$comment = get_comment();
 
-	if ( ! current_user_can( 'edit_comment', $comment->comment_ID ) ) {
+	if ( ! current_user_can('edit_comment', $comment->comment_ID)) {
 		return;
 	}
 
-	if ( null === $text ) {
-		$text = __( 'Edit This' );
+	if (null === $text) {
+		$text = __('Edit This');
 	}
 
-	$link = '<a class="comment-edit-link" href="' . esc_url( get_edit_comment_link( $comment ) ) . '">' . $text . '</a>';
+	$link = '<a class="comment-edit-link" href="'.esc_url(get_edit_comment_link($comment)).'">'.$text.'</a>';
 
 	/**
 	 * Filter the comment edit link anchor tag.
@@ -1429,7 +1429,7 @@ 
 	 * @param int    $comment_id Comment ID.
 	 * @param string $text       Anchor text.
 	 */
-	echo $before . apply_filters( 'edit_comment_link', $link, $comment->comment_ID, $text ) . $after;
+	echo $before.apply_filters('edit_comment_link', $link, $comment->comment_ID, $text).$after;
 }
 
 /**
@@ -1440,13 +1440,13 @@ 
  * @param int|stdClass $link Optional. Bookmark ID.
  * @return string|void The edit bookmark link URL.
  */
-function get_edit_bookmark_link( $link = 0 ) {
-	$link = get_bookmark( $link );
+function get_edit_bookmark_link($link = 0) {
+	$link = get_bookmark($link);
 
-	if ( !current_user_can('manage_links') )
+	if ( ! current_user_can('manage_links'))
 		return;
 
-	$location = admin_url('link.php?action=edit&amp;link_id=') . $link->link_id;
+	$location = admin_url('link.php?action=edit&amp;link_id=').$link->link_id;
 
 	/**
 	 * Filter the bookmark edit link.
@@ -1456,7 +1456,7 @@ 
 	 * @param string $location The edit link.
 	 * @param int    $link_id  Bookmark ID.
 	 */
-	return apply_filters( 'get_edit_bookmark_link', $location, $link->link_id );
+	return apply_filters('get_edit_bookmark_link', $location, $link->link_id);
 }
 
 /**
@@ -1469,16 +1469,16 @@ 
  * @param string $after    Optional. Display after edit link.
  * @param int    $bookmark Optional. Bookmark ID.
  */
-function edit_bookmark_link( $link = '', $before = '', $after = '', $bookmark = null ) {
+function edit_bookmark_link($link = '', $before = '', $after = '', $bookmark = null) {
 	$bookmark = get_bookmark($bookmark);
 
-	if ( !current_user_can('manage_links') )
+	if ( ! current_user_can('manage_links'))
 		return;
 
-	if ( empty($link) )
+	if (empty($link))
 		$link = __('Edit This');
 
-	$link = '<a href="' . esc_url( get_edit_bookmark_link( $bookmark ) ) . '">' . $link . '</a>';
+	$link = '<a href="'.esc_url(get_edit_bookmark_link($bookmark)).'">'.$link.'</a>';
 
 	/**
 	 * Filter the bookmark edit link anchor tag.
@@ -1488,7 +1488,7 @@ 
 	 * @param string $link    Anchor tag for the edit link.
 	 * @param int    $link_id Bookmark ID.
 	 */
-	echo $before . apply_filters( 'edit_bookmark_link', $link, $bookmark->link_id ) . $after;
+	echo $before.apply_filters('edit_bookmark_link', $link, $bookmark->link_id).$after;
 }
 
 /**
@@ -1499,22 +1499,22 @@ 
  * @param int $user_id Optional. User ID. Defaults to the current user.
  * @return string URL to edit user page or empty string.
  */
-function get_edit_user_link( $user_id = null ) {
-	if ( ! $user_id )
+function get_edit_user_link($user_id = null) {
+	if ( ! $user_id)
 		$user_id = get_current_user_id();
 
-	if ( empty( $user_id ) || ! current_user_can( 'edit_user', $user_id ) )
+	if (empty($user_id) || ! current_user_can('edit_user', $user_id))
 		return '';
 
-	$user = get_userdata( $user_id );
+	$user = get_userdata($user_id);
 
-	if ( ! $user )
+	if ( ! $user)
 		return '';
 
-	if ( get_current_user_id() == $user->ID )
-		$link = get_edit_profile_url( $user->ID );
+	if (get_current_user_id() == $user->ID)
+		$link = get_edit_profile_url($user->ID);
 	else
-		$link = add_query_arg( 'user_id', $user->ID, self_admin_url( 'user-edit.php' ) );
+		$link = add_query_arg('user_id', $user->ID, self_admin_url('user-edit.php'));
 
 	/**
 	 * Filter the user edit link.
@@ -1524,7 +1524,7 @@ 
 	 * @param string $link    The edit link.
 	 * @param int    $user_id User ID.
 	 */
-	return apply_filters( 'get_edit_user_link', $link, $user->ID );
+	return apply_filters('get_edit_user_link', $link, $user->ID);
 }
 
 // Navigation links
@@ -1539,8 +1539,8 @@ 
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
  * @return null|string|WP_Post Post object if successful. Null if global $post is not set. Empty string if no corresponding post exists.
  */
-function get_previous_post( $in_same_term = false, $excluded_terms = '', $taxonomy = 'category' ) {
-	return get_adjacent_post( $in_same_term, $excluded_terms, true, $taxonomy );
+function get_previous_post($in_same_term = false, $excluded_terms = '', $taxonomy = 'category') {
+	return get_adjacent_post($in_same_term, $excluded_terms, true, $taxonomy);
 }
 
 /**
@@ -1553,8 +1553,8 @@ 
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
  * @return null|string|WP_Post Post object if successful. Null if global $post is not set. Empty string if no corresponding post exists.
  */
-function get_next_post( $in_same_term = false, $excluded_terms = '', $taxonomy = 'category' ) {
-	return get_adjacent_post( $in_same_term, $excluded_terms, false, $taxonomy );
+function get_next_post($in_same_term = false, $excluded_terms = '', $taxonomy = 'category') {
+	return get_adjacent_post($in_same_term, $excluded_terms, false, $taxonomy);
 }
 
 /**
@@ -1572,10 +1572,10 @@ 
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
  * @return null|string|WP_Post Post object if successful. Null if global $post is not set. Empty string if no corresponding post exists.
  */
-function get_adjacent_post( $in_same_term = false, $excluded_terms = '', $previous = true, $taxonomy = 'category' ) {
+function get_adjacent_post($in_same_term = false, $excluded_terms = '', $previous = true, $taxonomy = 'category') {
 	global $wpdb;
 
-	if ( ( ! $post = get_post() ) || ! taxonomy_exists( $taxonomy ) )
+	if (( ! $post = get_post()) || ! taxonomy_exists($taxonomy))
 		return null;
 
 	$current_post_date = $post->post_date;
@@ -1584,35 +1584,35 @@ 
 	$where = '';
 	$adjacent = $previous ? 'previous' : 'next';
 
-	if ( $in_same_term || ! empty( $excluded_terms ) ) {
-		if ( ! empty( $excluded_terms ) && ! is_array( $excluded_terms ) ) {
+	if ($in_same_term || ! empty($excluded_terms)) {
+		if ( ! empty($excluded_terms) && ! is_array($excluded_terms)) {
 			// back-compat, $excluded_terms used to be $excluded_terms with IDs separated by " and "
-			if ( false !== strpos( $excluded_terms, ' and ' ) ) {
-				_deprecated_argument( __FUNCTION__, '3.3', sprintf( __( 'Use commas instead of %s to separate excluded terms.' ), "'and'" ) );
-				$excluded_terms = explode( ' and ', $excluded_terms );
+			if (false !== strpos($excluded_terms, ' and ')) {
+				_deprecated_argument(__FUNCTION__, '3.3', sprintf(__('Use commas instead of %s to separate excluded terms.'), "'and'"));
+				$excluded_terms = explode(' and ', $excluded_terms);
 			} else {
-				$excluded_terms = explode( ',', $excluded_terms );
+				$excluded_terms = explode(',', $excluded_terms);
 			}
 
-			$excluded_terms = array_map( 'intval', $excluded_terms );
+			$excluded_terms = array_map('intval', $excluded_terms);
 		}
 
-		if ( $in_same_term ) {
+		if ($in_same_term) {
 			$join .= " INNER JOIN $wpdb->term_relationships AS tr ON p.ID = tr.object_id INNER JOIN $wpdb->term_taxonomy tt ON tr.term_taxonomy_id = tt.term_taxonomy_id";
-			$where .= $wpdb->prepare( "AND tt.taxonomy = %s", $taxonomy );
+			$where .= $wpdb->prepare("AND tt.taxonomy = %s", $taxonomy);
 
-			if ( ! is_object_in_taxonomy( $post->post_type, $taxonomy ) )
+			if ( ! is_object_in_taxonomy($post->post_type, $taxonomy))
 				return '';
-			$term_array = wp_get_object_terms( $post->ID, $taxonomy, array( 'fields' => 'ids' ) );
+			$term_array = wp_get_object_terms($post->ID, $taxonomy, array('fields' => 'ids'));
 
 			// Remove any exclusions from the term array to include.
-			$term_array = array_diff( $term_array, (array) $excluded_terms );
-			$term_array = array_map( 'intval', $term_array );
+			$term_array = array_diff($term_array, (array) $excluded_terms);
+			$term_array = array_map('intval', $term_array);
 
-			if ( ! $term_array || is_wp_error( $term_array ) )
+			if ( ! $term_array || is_wp_error($term_array))
 				return '';
 
-			$where .= " AND tt.term_id IN (" . implode( ',', $term_array ) . ")";
+			$where .= " AND tt.term_id IN (".implode(',', $term_array).")";
 		}
 
 		/**
@@ -1625,21 +1625,21 @@ 
 		 *
 		 * @param string $excluded_terms Array of excluded term IDs.
 		 */
-		$excluded_terms = apply_filters( "get_{$adjacent}_post_excluded_terms", $excluded_terms );
+		$excluded_terms = apply_filters("get_{$adjacent}_post_excluded_terms", $excluded_terms);
 
-		if ( ! empty( $excluded_terms ) ) {
-			$where .= " AND p.ID NOT IN ( SELECT tr.object_id FROM $wpdb->term_relationships tr LEFT JOIN $wpdb->term_taxonomy tt ON (tr.term_taxonomy_id = tt.term_taxonomy_id) WHERE tt.term_id IN (" . implode( ',', array_map( 'intval', $excluded_terms ) ) . ') )';
+		if ( ! empty($excluded_terms)) {
+			$where .= " AND p.ID NOT IN ( SELECT tr.object_id FROM $wpdb->term_relationships tr LEFT JOIN $wpdb->term_taxonomy tt ON (tr.term_taxonomy_id = tt.term_taxonomy_id) WHERE tt.term_id IN (".implode(',', array_map('intval', $excluded_terms)).') )';
 		}
 	}
 
 	// 'post_status' clause depends on the current user.
-	if ( is_user_logged_in() ) {
+	if (is_user_logged_in()) {
 		$user_id = get_current_user_id();
 
-		$post_type_object = get_post_type_object( $post->post_type );
-		if ( empty( $post_type_object ) ) {
+		$post_type_object = get_post_type_object($post->post_type);
+		if (empty($post_type_object)) {
 			$post_type_cap    = $post->post_type;
-			$read_private_cap = 'read_private_' . $post_type_cap . 's';
+			$read_private_cap = 'read_private_'.$post_type_cap.'s';
 		} else {
 			$read_private_cap = $post_type_object->cap->read_private_posts;
 		}
@@ -1648,13 +1648,13 @@ 
 		 * Results should include private posts belonging to the current user, or private posts where the
 		 * current user has the 'read_private_posts' cap.
 		 */
-		$private_states = get_post_stati( array( 'private' => true ) );
+		$private_states = get_post_stati(array('private' => true));
 		$where .= " AND ( p.post_status = 'publish'";
-		foreach ( (array) $private_states as $state ) {
-			if ( current_user_can( $read_private_cap ) ) {
-				$where .= $wpdb->prepare( " OR p.post_status = %s", $state );
+		foreach ((array) $private_states as $state) {
+			if (current_user_can($read_private_cap)) {
+				$where .= $wpdb->prepare(" OR p.post_status = %s", $state);
 			} else {
-				$where .= $wpdb->prepare( " OR (p.post_author = %d AND p.post_status = %s)", $user_id, $state );
+				$where .= $wpdb->prepare(" OR (p.post_author = %d AND p.post_status = %s)", $user_id, $state);
 			}
 		}
 		$where .= " )";
@@ -1680,7 +1680,7 @@ 
 	 * @param string  $taxonomy       Taxonomy. Used to identify the term used when `$in_same_term` is true.
 	 * @param WP_Post $post           WP_Post object.
 	 */
-	$join = apply_filters( "get_{$adjacent}_post_join", $join, $in_same_term, $excluded_terms, $taxonomy, $post );
+	$join = apply_filters("get_{$adjacent}_post_join", $join, $in_same_term, $excluded_terms, $taxonomy, $post);
 
 	/**
 	 * Filter the WHERE clause in the SQL for an adjacent post query.
@@ -1697,7 +1697,7 @@ 
 	 * @param string $taxonomy       Taxonomy. Used to identify the term used when `$in_same_term` is true.
 	 * @param WP_Post $post           WP_Post object.
 	 */
-	$where = apply_filters( "get_{$adjacent}_post_where", $wpdb->prepare( "WHERE p.post_date $op %s AND p.post_type = %s $where", $current_post_date, $post->post_type ), $in_same_term, $excluded_terms, $taxonomy, $post );
+	$where = apply_filters("get_{$adjacent}_post_where", $wpdb->prepare("WHERE p.post_date $op %s AND p.post_type = %s $where", $current_post_date, $post->post_type), $in_same_term, $excluded_terms, $taxonomy, $post);
 
 	/**
 	 * Filter the ORDER BY clause in the SQL for an adjacent post query.
@@ -1711,25 +1711,25 @@ 
 	 * @param string $order_by The `ORDER BY` clause in the SQL.
 	 * @param WP_Post $post    WP_Post object.
 	 */
-	$sort  = apply_filters( "get_{$adjacent}_post_sort", "ORDER BY p.post_date $order LIMIT 1", $post );
+	$sort  = apply_filters("get_{$adjacent}_post_sort", "ORDER BY p.post_date $order LIMIT 1", $post);
 
 	$query = "SELECT p.ID FROM $wpdb->posts AS p $join $where $sort";
-	$query_key = 'adjacent_post_' . md5( $query );
-	$result = wp_cache_get( $query_key, 'counts' );
-	if ( false !== $result ) {
-		if ( $result )
-			$result = get_post( $result );
+	$query_key = 'adjacent_post_'.md5($query);
+	$result = wp_cache_get($query_key, 'counts');
+	if (false !== $result) {
+		if ($result)
+			$result = get_post($result);
 		return $result;
 	}
 
-	$result = $wpdb->get_var( $query );
-	if ( null === $result )
+	$result = $wpdb->get_var($query);
+	if (null === $result)
 		$result = '';
 
-	wp_cache_set( $query_key, $result, 'counts' );
+	wp_cache_set($query_key, $result, 'counts');
 
-	if ( $result )
-		$result = get_post( $result );
+	if ($result)
+		$result = get_post($result);
 
 	return $result;
 }
@@ -1748,28 +1748,28 @@ 
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
  * @return string|void The adjacent post relational link URL.
  */
-function get_adjacent_post_rel_link( $title = '%title', $in_same_term = false, $excluded_terms = '', $previous = true, $taxonomy = 'category' ) {
-	if ( $previous && is_attachment() && $post = get_post() )
-		$post = get_post( $post->post_parent );
+function get_adjacent_post_rel_link($title = '%title', $in_same_term = false, $excluded_terms = '', $previous = true, $taxonomy = 'category') {
+	if ($previous && is_attachment() && $post = get_post())
+		$post = get_post($post->post_parent);
 	else
-		$post = get_adjacent_post( $in_same_term, $excluded_terms, $previous, $taxonomy );
+		$post = get_adjacent_post($in_same_term, $excluded_terms, $previous, $taxonomy);
 
-	if ( empty( $post ) )
+	if (empty($post))
 		return;
 
-	$post_title = the_title_attribute( array( 'echo' => false, 'post' => $post ) );
+	$post_title = the_title_attribute(array('echo' => false, 'post' => $post));
 
-	if ( empty( $post_title ) )
-		$post_title = $previous ? __( 'Previous Post' ) : __( 'Next Post' );
+	if (empty($post_title))
+		$post_title = $previous ? __('Previous Post') : __('Next Post');
 
-	$date = mysql2date( get_option( 'date_format' ), $post->post_date );
+	$date = mysql2date(get_option('date_format'), $post->post_date);
 
-	$title = str_replace( '%title', $post_title, $title );
-	$title = str_replace( '%date', $date, $title );
+	$title = str_replace('%title', $post_title, $title);
+	$title = str_replace('%date', $date, $title);
 
 	$link = $previous ? "<link rel='prev' title='" : "<link rel='next' title='";
-	$link .= esc_attr( $title );
-	$link .= "' href='" . get_permalink( $post ) . "' />\n";
+	$link .= esc_attr($title);
+	$link .= "' href='".get_permalink($post)."' />\n";
 
 	$adjacent = $previous ? 'previous' : 'next';
 
@@ -1783,7 +1783,7 @@ 
 	 *
 	 * @param string $link The relational link.
 	 */
-	return apply_filters( "{$adjacent}_post_rel_link", $link );
+	return apply_filters("{$adjacent}_post_rel_link", $link);
 }
 
 /**
@@ -1796,9 +1796,9 @@ 
  * @param array|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs.
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
  */
-function adjacent_posts_rel_link( $title = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category' ) {
-	echo get_adjacent_post_rel_link( $title, $in_same_term, $excluded_terms, true, $taxonomy );
-	echo get_adjacent_post_rel_link( $title, $in_same_term, $excluded_terms, false, $taxonomy );
+function adjacent_posts_rel_link($title = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category') {
+	echo get_adjacent_post_rel_link($title, $in_same_term, $excluded_terms, true, $taxonomy);
+	echo get_adjacent_post_rel_link($title, $in_same_term, $excluded_terms, false, $taxonomy);
 }
 
 /**
@@ -1809,7 +1809,7 @@ 
  *
  */
 function adjacent_posts_rel_link_wp_head() {
-	if ( ! is_single() || is_attachment() ) {
+	if ( ! is_single() || is_attachment()) {
 		return;
 	}
 	adjacent_posts_rel_link();
@@ -1825,8 +1825,8 @@ 
  * @param array|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs.
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
  */
-function next_post_rel_link( $title = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category' ) {
-	echo get_adjacent_post_rel_link( $title, $in_same_term, $excluded_terms, false, $taxonomy );
+function next_post_rel_link($title = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category') {
+	echo get_adjacent_post_rel_link($title, $in_same_term, $excluded_terms, false, $taxonomy);
 }
 
 /**
@@ -1839,8 +1839,8 @@ 
  * @param array|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs. Default true.
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
  */
-function prev_post_rel_link( $title = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category' ) {
-	echo get_adjacent_post_rel_link( $title, $in_same_term, $excluded_terms, true, $taxonomy );
+function prev_post_rel_link($title = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category') {
+	echo get_adjacent_post_rel_link($title, $in_same_term, $excluded_terms, true, $taxonomy);
 }
 
 /**
@@ -1857,9 +1857,9 @@ 
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
  * @return null|array Array containing the boundary post object if successful, null otherwise.
  */
-function get_boundary_post( $in_same_term = false, $excluded_terms = '', $start = true, $taxonomy = 'category' ) {
+function get_boundary_post($in_same_term = false, $excluded_terms = '', $start = true, $taxonomy = 'category') {
 	$post = get_post();
-	if ( ! $post || ! is_single() || is_attachment() || ! taxonomy_exists( $taxonomy ) )
+	if ( ! $post || ! is_single() || is_attachment() || ! taxonomy_exists($taxonomy))
 		return null;
 
 	$query_args = array(
@@ -1871,34 +1871,34 @@ 
 
 	$term_array = array();
 
-	if ( ! is_array( $excluded_terms ) ) {
-		if ( ! empty( $excluded_terms ) )
-			$excluded_terms = explode( ',', $excluded_terms );
+	if ( ! is_array($excluded_terms)) {
+		if ( ! empty($excluded_terms))
+			$excluded_terms = explode(',', $excluded_terms);
 		else
 			$excluded_terms = array();
 	}
 
-	if ( $in_same_term || ! empty( $excluded_terms ) ) {
-		if ( $in_same_term )
-			$term_array = wp_get_object_terms( $post->ID, $taxonomy, array( 'fields' => 'ids' ) );
+	if ($in_same_term || ! empty($excluded_terms)) {
+		if ($in_same_term)
+			$term_array = wp_get_object_terms($post->ID, $taxonomy, array('fields' => 'ids'));
 
-		if ( ! empty( $excluded_terms ) ) {
-			$excluded_terms = array_map( 'intval', $excluded_terms );
-			$excluded_terms = array_diff( $excluded_terms, $term_array );
+		if ( ! empty($excluded_terms)) {
+			$excluded_terms = array_map('intval', $excluded_terms);
+			$excluded_terms = array_diff($excluded_terms, $term_array);
 
 			$inverse_terms = array();
-			foreach ( $excluded_terms as $excluded_term )
+			foreach ($excluded_terms as $excluded_term)
 				$inverse_terms[] = $excluded_term * -1;
 			$excluded_terms = $inverse_terms;
 		}
 
-		$query_args[ 'tax_query' ] = array( array(
+		$query_args['tax_query'] = array(array(
 			'taxonomy' => $taxonomy,
-			'terms' => array_merge( $term_array, $excluded_terms )
-		) );
+			'terms' => array_merge($term_array, $excluded_terms)
+		));
 	}
 
-	return get_posts( $query_args );
+	return get_posts($query_args);
 }
 
 /**
@@ -1913,8 +1913,8 @@ 
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
  * @return string The link URL of the previous post in relation to the current post.
  */
-function get_previous_post_link( $format = '&laquo; %link', $link = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category' ) {
-	return get_adjacent_post_link( $format, $link, $in_same_term, $excluded_terms, true, $taxonomy );
+function get_previous_post_link($format = '&laquo; %link', $link = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category') {
+	return get_adjacent_post_link($format, $link, $in_same_term, $excluded_terms, true, $taxonomy);
 }
 
 /**
@@ -1929,8 +1929,8 @@ 
  * @param array|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs.
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
  */
-function previous_post_link( $format = '&laquo; %link', $link = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category' ) {
-	echo get_previous_post_link( $format, $link, $in_same_term, $excluded_terms, $taxonomy );
+function previous_post_link($format = '&laquo; %link', $link = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category') {
+	echo get_previous_post_link($format, $link, $in_same_term, $excluded_terms, $taxonomy);
 }
 
 /**
@@ -1945,8 +1945,8 @@ 
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
  * @return string The link URL of the next post in relation to the current post.
  */
-function get_next_post_link( $format = '%link &raquo;', $link = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category' ) {
-	return get_adjacent_post_link( $format, $link, $in_same_term, $excluded_terms, false, $taxonomy );
+function get_next_post_link($format = '%link &raquo;', $link = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category') {
+	return get_adjacent_post_link($format, $link, $in_same_term, $excluded_terms, false, $taxonomy);
 }
 
 /**
@@ -1961,8 +1961,8 @@ 
  * @param array|string $excluded_terms Optional. Array or comma-separated list of excluded term IDs.
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
  */
-function next_post_link( $format = '%link &raquo;', $link = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category' ) {
-	 echo get_next_post_link( $format, $link, $in_same_term, $excluded_terms, $taxonomy );
+function next_post_link($format = '%link &raquo;', $link = '%title', $in_same_term = false, $excluded_terms = '', $taxonomy = 'category') {
+	 echo get_next_post_link($format, $link, $in_same_term, $excluded_terms, $taxonomy);
 }
 
 /**
@@ -1980,32 +1980,32 @@ 
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
  * @return string The link URL of the previous or next post in relation to the current post.
  */
-function get_adjacent_post_link( $format, $link, $in_same_term = false, $excluded_terms = '', $previous = true, $taxonomy = 'category' ) {
-	if ( $previous && is_attachment() )
-		$post = get_post( get_post()->post_parent );
+function get_adjacent_post_link($format, $link, $in_same_term = false, $excluded_terms = '', $previous = true, $taxonomy = 'category') {
+	if ($previous && is_attachment())
+		$post = get_post(get_post()->post_parent);
 	else
-		$post = get_adjacent_post( $in_same_term, $excluded_terms, $previous, $taxonomy );
+		$post = get_adjacent_post($in_same_term, $excluded_terms, $previous, $taxonomy);
 
-	if ( ! $post ) {
+	if ( ! $post) {
 		$output = '';
 	} else {
 		$title = $post->post_title;
 
-		if ( empty( $post->post_title ) )
-			$title = $previous ? __( 'Previous Post' ) : __( 'Next Post' );
+		if (empty($post->post_title))
+			$title = $previous ? __('Previous Post') : __('Next Post');
 
 		/** This filter is documented in wp-includes/post-template.php */
-		$title = apply_filters( 'the_title', $title, $post->ID );
+		$title = apply_filters('the_title', $title, $post->ID);
 
-		$date = mysql2date( get_option( 'date_format' ), $post->post_date );
+		$date = mysql2date(get_option('date_format'), $post->post_date);
 		$rel = $previous ? 'prev' : 'next';
 
-		$string = '<a href="' . get_permalink( $post ) . '" rel="'.$rel.'">';
-		$inlink = str_replace( '%title', $title, $link );
-		$inlink = str_replace( '%date', $date, $inlink );
-		$inlink = $string . $inlink . '</a>';
+		$string = '<a href="'.get_permalink($post).'" rel="'.$rel.'">';
+		$inlink = str_replace('%title', $title, $link);
+		$inlink = str_replace('%date', $date, $inlink);
+		$inlink = $string.$inlink.'</a>';
 
-		$output = str_replace( '%link', $inlink, $format );
+		$output = str_replace('%link', $inlink, $format);
 	}
 
 	$adjacent = $previous ? 'previous' : 'next';
@@ -2025,7 +2025,7 @@ 
 	 * @param WP_Post $post     The adjacent post.
 	 * @param string  $adjacent Whether the post is previous or next.
 	 */
-	return apply_filters( "{$adjacent}_post_link", $output, $format, $link, $post, $adjacent );
+	return apply_filters("{$adjacent}_post_link", $output, $format, $link, $post, $adjacent);
 }
 
 /**
@@ -2042,8 +2042,8 @@ 
  * @param bool         $previous       Optional. Whether to display link to previous or next post. Default true.
  * @param string       $taxonomy       Optional. Taxonomy, if $in_same_term is true. Default 'category'.
  */
-function adjacent_post_link( $format, $link, $in_same_term = false, $excluded_terms = '', $previous = true, $taxonomy = 'category' ) {
-	echo get_adjacent_post_link( $format, $link, $in_same_term, $excluded_terms, $previous, $taxonomy );
+function adjacent_post_link($format, $link, $in_same_term = false, $excluded_terms = '', $previous = true, $taxonomy = 'category') {
+	echo get_adjacent_post_link($format, $link, $in_same_term, $excluded_terms, $previous, $taxonomy);
 }
 
 /**
@@ -2058,53 +2058,53 @@ 
  * 	                    Otherwise, prepares the URL with esc_url_raw().
  * @return string The link URL for the given page number.
  */
-function get_pagenum_link($pagenum = 1, $escape = true ) {
+function get_pagenum_link($pagenum = 1, $escape = true) {
 	global $wp_rewrite;
 
 	$pagenum = (int) $pagenum;
 
-	$request = remove_query_arg( 'paged' );
+	$request = remove_query_arg('paged');
 
 	$home_root = parse_url(home_url());
-	$home_root = ( isset($home_root['path']) ) ? $home_root['path'] : '';
-	$home_root = preg_quote( $home_root, '|' );
+	$home_root = (isset($home_root['path'])) ? $home_root['path'] : '';
+	$home_root = preg_quote($home_root, '|');
 
-	$request = preg_replace('|^'. $home_root . '|i', '', $request);
+	$request = preg_replace('|^'.$home_root.'|i', '', $request);
 	$request = preg_replace('|^/+|', '', $request);
 
-	if ( !$wp_rewrite->using_permalinks() || is_admin() ) {
-		$base = trailingslashit( get_bloginfo( 'url' ) );
+	if ( ! $wp_rewrite->using_permalinks() || is_admin()) {
+		$base = trailingslashit(get_bloginfo('url'));
 
-		if ( $pagenum > 1 ) {
-			$result = add_query_arg( 'paged', $pagenum, $base . $request );
+		if ($pagenum > 1) {
+			$result = add_query_arg('paged', $pagenum, $base.$request);
 		} else {
-			$result = $base . $request;
+			$result = $base.$request;
 		}
 	} else {
 		$qs_regex = '|\?.*?$|';
-		preg_match( $qs_regex, $request, $qs_match );
+		preg_match($qs_regex, $request, $qs_match);
 
-		if ( !empty( $qs_match[0] ) ) {
+		if ( ! empty($qs_match[0])) {
 			$query_string = $qs_match[0];
-			$request = preg_replace( $qs_regex, '', $request );
+			$request = preg_replace($qs_regex, '', $request);
 		} else {
 			$query_string = '';
 		}
 
-		$request = preg_replace( "|$wp_rewrite->pagination_base/\d+/?$|", '', $request);
-		$request = preg_replace( '|^' . preg_quote( $wp_rewrite->index, '|' ) . '|i', '', $request);
+		$request = preg_replace("|$wp_rewrite->pagination_base/\d+/?$|", '', $request);
+		$request = preg_replace('|^'.preg_quote($wp_rewrite->index, '|').'|i', '', $request);
 		$request = ltrim($request, '/');
 
-		$base = trailingslashit( get_bloginfo( 'url' ) );
+		$base = trailingslashit(get_bloginfo('url'));
 
-		if ( $wp_rewrite->using_index_permalinks() && ( $pagenum > 1 || '' != $request ) )
-			$base .= $wp_rewrite->index . '/';
+		if ($wp_rewrite->using_index_permalinks() && ($pagenum > 1 || '' != $request))
+			$base .= $wp_rewrite->index.'/';
 
-		if ( $pagenum > 1 ) {
-			$request = ( ( !empty( $request ) ) ? trailingslashit( $request ) : $request ) . user_trailingslashit( $wp_rewrite->pagination_base . "/" . $pagenum, 'paged' );
+		if ($pagenum > 1) {
+			$request = (( ! empty($request)) ? trailingslashit($request) : $request).user_trailingslashit($wp_rewrite->pagination_base."/".$pagenum, 'paged');
 		}
 
-		$result = $base . $request . $query_string;
+		$result = $base.$request.$query_string;
 	}
 
 	/**
@@ -2114,12 +2114,12 @@ 
 	 *
 	 * @param string $result The page number link.
 	 */
-	$result = apply_filters( 'get_pagenum_link', $result );
+	$result = apply_filters('get_pagenum_link', $result);
 
-	if ( $escape )
-		return esc_url( $result );
+	if ($escape)
+		return esc_url($result);
 	else
-		return esc_url_raw( $result );
+		return esc_url_raw($result);
 }
 
 /**
@@ -2137,11 +2137,11 @@ 
 function get_next_posts_page_link($max_page = 0) {
 	global $paged;
 
-	if ( !is_single() ) {
-		if ( !$paged )
+	if ( ! is_single()) {
+		if ( ! $paged)
 			$paged = 1;
 		$nextpage = intval($paged) + 1;
-		if ( !$max_page || $max_page >= $nextpage )
+		if ( ! $max_page || $max_page >= $nextpage)
 			return get_pagenum_link($nextpage);
 	}
 }
@@ -2155,10 +2155,10 @@ 
  * @param bool  $echo     Optional. Echo or return;
  * @return string|void The link URL for next posts page if `$echo = false`.
  */
-function next_posts( $max_page = 0, $echo = true ) {
-	$output = esc_url( get_next_posts_page_link( $max_page ) );
+function next_posts($max_page = 0, $echo = true) {
+	$output = esc_url(get_next_posts_page_link($max_page));
 
-	if ( $echo )
+	if ($echo)
 		echo $output;
 	else
 		return $output;
@@ -2176,21 +2176,21 @@ 
  * @param int    $max_page Optional. Max pages.
  * @return string|void HTML-formatted next posts page link.
  */
-function get_next_posts_link( $label = null, $max_page = 0 ) {
+function get_next_posts_link($label = null, $max_page = 0) {
 	global $paged, $wp_query;
 
-	if ( !$max_page )
+	if ( ! $max_page)
 		$max_page = $wp_query->max_num_pages;
 
-	if ( !$paged )
+	if ( ! $paged)
 		$paged = 1;
 
 	$nextpage = intval($paged) + 1;
 
-	if ( null === $label )
-		$label = __( 'Next Page &raquo;' );
+	if (null === $label)
+		$label = __('Next Page &raquo;');
 
-	if ( !is_single() && ( $nextpage <= $max_page ) ) {
+	if ( ! is_single() && ($nextpage <= $max_page)) {
 		/**
 		 * Filter the anchor tag attributes for the next posts page link.
 		 *
@@ -2198,9 +2198,9 @@ 
 		 *
 		 * @param string $attributes Attributes for the anchor tag.
 		 */
-		$attr = apply_filters( 'next_posts_link_attributes', '' );
+		$attr = apply_filters('next_posts_link_attributes', '');
 
-		return '<a href="' . next_posts( $max_page, false ) . "\" $attr>" . preg_replace('/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $label) . '</a>';
+		return '<a href="'.next_posts($max_page, false)."\" $attr>".preg_replace('/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $label).'</a>';
 	}
 }
 
@@ -2212,8 +2212,8 @@ 
  * @param string $label    Content for link text.
  * @param int    $max_page Optional. Max pages.
  */
-function next_posts_link( $label = null, $max_page = 0 ) {
-	echo get_next_posts_link( $label, $max_page );
+function next_posts_link($label = null, $max_page = 0) {
+	echo get_next_posts_link($label, $max_page);
 }
 
 /**
@@ -2232,9 +2232,9 @@ 
 function get_previous_posts_page_link() {
 	global $paged;
 
-	if ( !is_single() ) {
+	if ( ! is_single()) {
 		$nextpage = intval($paged) - 1;
-		if ( $nextpage < 1 )
+		if ($nextpage < 1)
 			$nextpage = 1;
 		return get_pagenum_link($nextpage);
 	}
@@ -2248,10 +2248,10 @@ 
  * @param bool $echo Optional. Echo or return;
  * @return string|void The previous posts page link if `$echo = false`.
  */
-function previous_posts( $echo = true ) {
-	$output = esc_url( get_previous_posts_page_link() );
+function previous_posts($echo = true) {
+	$output = esc_url(get_previous_posts_page_link());
 
-	if ( $echo )
+	if ($echo)
 		echo $output;
 	else
 		return $output;
@@ -2267,13 +2267,13 @@ 
  * @param string $label Optional. Previous page link text.
  * @return string|void HTML-formatted previous page link.
  */
-function get_previous_posts_link( $label = null ) {
+function get_previous_posts_link($label = null) {
 	global $paged;
 
-	if ( null === $label )
-		$label = __( '&laquo; Previous Page' );
+	if (null === $label)
+		$label = __('&laquo; Previous Page');
 
-	if ( !is_single() && $paged > 1 ) {
+	if ( ! is_single() && $paged > 1) {
 		/**
 		 * Filter the anchor tag attributes for the previous posts page link.
 		 *
@@ -2281,8 +2281,8 @@ 
 		 *
 		 * @param string $attributes Attributes for the anchor tag.
 		 */
-		$attr = apply_filters( 'previous_posts_link_attributes', '' );
-		return '<a href="' . previous_posts( false ) . "\" $attr>". preg_replace( '/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $label ) .'</a>';
+		$attr = apply_filters('previous_posts_link_attributes', '');
+		return '<a href="'.previous_posts(false)."\" $attr>".preg_replace('/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $label).'</a>';
 	}
 }
 
@@ -2293,8 +2293,8 @@ 
  *
  * @param string $label Optional. Previous page link text.
  */
-function previous_posts_link( $label = null ) {
-	echo get_previous_posts_link( $label );
+function previous_posts_link($label = null) {
+	echo get_previous_posts_link($label);
 }
 
 /**
@@ -2307,18 +2307,18 @@ 
  * @param string|array $args Optional args.
  * @return string The posts link navigation.
  */
-function get_posts_nav_link( $args = array() ) {
+function get_posts_nav_link($args = array()) {
 	global $wp_query;
 
 	$return = '';
 
-	if ( !is_singular() ) {
+	if ( ! is_singular()) {
 		$defaults = array(
 			'sep' => ' &#8212; ',
 			'prelabel' => __('&laquo; Previous Page'),
 			'nxtlabel' => __('Next Page &raquo;'),
 		);
-		$args = wp_parse_args( $args, $defaults );
+		$args = wp_parse_args($args, $defaults);
 
 		$max_num_pages = $wp_query->max_num_pages;
 		$paged = get_query_var('paged');
@@ -2328,7 +2328,7 @@ 
 			$args['sep'] = '';
 		}
 
-		if ( $max_num_pages > 1 ) {
+		if ($max_num_pages > 1) {
 			$return = get_previous_posts_link($args['prelabel']);
 			$return .= preg_replace('/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $args['sep']);
 			$return .= get_next_posts_link($args['nxtlabel']);
@@ -2347,8 +2347,8 @@ 
  * @param string $prelabel Optional. Label for previous pages.
  * @param string $nxtlabel Optional Label for next pages.
  */
-function posts_nav_link( $sep = '', $prelabel = '', $nxtlabel = '' ) {
-	$args = array_filter( compact('sep', 'prelabel', 'nxtlabel') );
+function posts_nav_link($sep = '', $prelabel = '', $nxtlabel = '') {
+	$args = array_filter(compact('sep', 'prelabel', 'nxtlabel'));
 	echo get_posts_nav_link($args);
 }
 
@@ -2370,15 +2370,15 @@ 
  * }
  * @return string Markup for post links.
  */
-function get_the_post_navigation( $args = array() ) {
-	$args = wp_parse_args( $args, array(
+function get_the_post_navigation($args = array()) {
+	$args = wp_parse_args($args, array(
 		'prev_text'          => '%title',
 		'next_text'          => '%title',
 		'in_same_term'       => false,
 		'excluded_terms'     => '',
 		'taxonomy'           => 'category',
-		'screen_reader_text' => __( 'Post navigation' ),
-	) );
+		'screen_reader_text' => __('Post navigation'),
+	));
 
 	$navigation = '';
 
@@ -2399,8 +2399,8 @@ 
 	);
 
 	// Only add markup if there's somewhere to navigate to.
-	if ( $previous || $next ) {
-		$navigation = _navigation_markup( $previous . $next, 'post-navigation', $args['screen_reader_text'] );
+	if ($previous || $next) {
+		$navigation = _navigation_markup($previous.$next, 'post-navigation', $args['screen_reader_text']);
 	}
 
 	return $navigation;
@@ -2414,8 +2414,8 @@ 
  * @param array $args Optional. See {@see get_the_post_navigation()} for available
  *                    arguments. Default empty array.
  */
-function the_post_navigation( $args = array() ) {
-	echo get_the_post_navigation( $args );
+function the_post_navigation($args = array()) {
+	echo get_the_post_navigation($args);
 }
 
 /**
@@ -2437,29 +2437,29 @@ 
  * }
  * @return string Markup for posts links.
  */
-function get_the_posts_navigation( $args = array() ) {
+function get_the_posts_navigation($args = array()) {
 	$navigation = '';
 
 	// Don't print empty markup if there's only one page.
-	if ( $GLOBALS['wp_query']->max_num_pages > 1 ) {
-		$args = wp_parse_args( $args, array(
-			'prev_text'          => __( 'Older posts' ),
-			'next_text'          => __( 'Newer posts' ),
-			'screen_reader_text' => __( 'Posts navigation' ),
-		) );
-
-		$next_link = get_previous_posts_link( $args['next_text'] );
-		$prev_link = get_next_posts_link( $args['prev_text'] );
-
-		if ( $prev_link ) {
-			$navigation .= '<div class="nav-previous">' . $prev_link . '</div>';
+	if ($GLOBALS['wp_query']->max_num_pages > 1) {
+		$args = wp_parse_args($args, array(
+			'prev_text'          => __('Older posts'),
+			'next_text'          => __('Newer posts'),
+			'screen_reader_text' => __('Posts navigation'),
+		));
+
+		$next_link = get_previous_posts_link($args['next_text']);
+		$prev_link = get_next_posts_link($args['prev_text']);
+
+		if ($prev_link) {
+			$navigation .= '<div class="nav-previous">'.$prev_link.'</div>';
 		}
 
-		if ( $next_link ) {
-			$navigation .= '<div class="nav-next">' . $next_link . '</div>';
+		if ($next_link) {
+			$navigation .= '<div class="nav-next">'.$next_link.'</div>';
 		}
 
-		$navigation = _navigation_markup( $navigation, 'posts-navigation', $args['screen_reader_text'] );
+		$navigation = _navigation_markup($navigation, 'posts-navigation', $args['screen_reader_text']);
 	}
 
 	return $navigation;
@@ -2473,8 +2473,8 @@ 
  * @param array $args Optional. See {@see get_the_posts_navigation()} for available
  *                    arguments. Default empty array.
  */
-function the_posts_navigation( $args = array() ) {
-	echo get_the_posts_navigation( $args );
+function the_posts_navigation($args = array()) {
+	echo get_the_posts_navigation($args);
 }
 
 /**
@@ -2491,28 +2491,28 @@ 
  * }
  * @return string Markup for pagination links.
  */
-function get_the_posts_pagination( $args = array() ) {
+function get_the_posts_pagination($args = array()) {
 	$navigation = '';
 
 	// Don't print empty markup if there's only one page.
-	if ( $GLOBALS['wp_query']->max_num_pages > 1 ) {
-		$args = wp_parse_args( $args, array(
+	if ($GLOBALS['wp_query']->max_num_pages > 1) {
+		$args = wp_parse_args($args, array(
 			'mid_size'           => 1,
-			'prev_text'          => _x( 'Previous', 'previous post' ),
-			'next_text'          => _x( 'Next', 'next post' ),
-			'screen_reader_text' => __( 'Posts navigation' ),
-		) );
+			'prev_text'          => _x('Previous', 'previous post'),
+			'next_text'          => _x('Next', 'next post'),
+			'screen_reader_text' => __('Posts navigation'),
+		));
 
 		// Make sure we get a string back. Plain is the next best thing.
-		if ( isset( $args['type'] ) && 'array' == $args['type'] ) {
+		if (isset($args['type']) && 'array' == $args['type']) {
 			$args['type'] = 'plain';
 		}
 
 		// Set up paginated links.
-		$links = paginate_links( $args );
+		$links = paginate_links($args);
 
-		if ( $links ) {
-			$navigation = _navigation_markup( $links, 'pagination', $args['screen_reader_text'] );
+		if ($links) {
+			$navigation = _navigation_markup($links, 'pagination', $args['screen_reader_text']);
 		}
 	}
 
@@ -2528,8 +2528,8 @@ 
  * @param array $args Optional. See {@see get_the_posts_pagination()} for available arguments.
  *                    Default empty array.
  */
-function the_posts_pagination( $args = array() ) {
-	echo get_the_posts_pagination( $args );
+function the_posts_pagination($args = array()) {
+	echo get_the_posts_pagination($args);
 }
 
 /**
@@ -2543,9 +2543,9 @@ 
  * @param string $screen_reader_text Optional. Screen reader text for nav element. Default: 'Posts navigation'.
  * @return string Navigation template tag.
  */
-function _navigation_markup( $links, $class = 'posts-navigation', $screen_reader_text = '' ) {
-	if ( empty( $screen_reader_text ) ) {
-		$screen_reader_text = __( 'Posts navigation' );
+function _navigation_markup($links, $class = 'posts-navigation', $screen_reader_text = '') {
+	if (empty($screen_reader_text)) {
+		$screen_reader_text = __('Posts navigation');
 	}
 
 	$template = '
@@ -2572,9 +2572,9 @@ 
 	 * @param string $class    The class passed by the calling function.
 	 * @return string Navigation template.
 	 */
-	$template = apply_filters( 'navigation_markup_template', $template, $class );
+	$template = apply_filters('navigation_markup_template', $template, $class);
 
-	return sprintf( $template, sanitize_html_class( $class ), esc_html( $screen_reader_text ), $links );
+	return sprintf($template, sanitize_html_class($class), esc_html($screen_reader_text), $links);
 }
 
 /**
@@ -2588,25 +2588,25 @@ 
  * @param int $max_page Optional. The maximum number of comment pages.
  * @return string The comments page number link URL.
  */
-function get_comments_pagenum_link( $pagenum = 1, $max_page = 0 ) {
+function get_comments_pagenum_link($pagenum = 1, $max_page = 0) {
 	global $wp_rewrite;
 
 	$pagenum = (int) $pagenum;
 
 	$result = get_permalink();
 
-	if ( 'newest' == get_option('default_comments_page') ) {
-		if ( $pagenum != $max_page ) {
-			if ( $wp_rewrite->using_permalinks() )
-				$result = user_trailingslashit( trailingslashit($result) . $wp_rewrite->comments_pagination_base . '-' . $pagenum, 'commentpaged');
+	if ('newest' == get_option('default_comments_page')) {
+		if ($pagenum != $max_page) {
+			if ($wp_rewrite->using_permalinks())
+				$result = user_trailingslashit(trailingslashit($result).$wp_rewrite->comments_pagination_base.'-'.$pagenum, 'commentpaged');
 			else
-				$result = add_query_arg( 'cpage', $pagenum, $result );
+				$result = add_query_arg('cpage', $pagenum, $result);
 		}
-	} elseif ( $pagenum > 1 ) {
-		if ( $wp_rewrite->using_permalinks() )
-			$result = user_trailingslashit( trailingslashit($result) . $wp_rewrite->comments_pagination_base . '-' . $pagenum, 'commentpaged');
+	} elseif ($pagenum > 1) {
+		if ($wp_rewrite->using_permalinks())
+			$result = user_trailingslashit(trailingslashit($result).$wp_rewrite->comments_pagination_base.'-'.$pagenum, 'commentpaged');
 		else
-			$result = add_query_arg( 'cpage', $pagenum, $result );
+			$result = add_query_arg('cpage', $pagenum, $result);
 	}
 
 	$result .= '#comments';
@@ -2618,7 +2618,7 @@ 
 	 *
 	 * @param string $result The comments page number link.
 	 */
-	return apply_filters( 'get_comments_pagenum_link', $result );
+	return apply_filters('get_comments_pagenum_link', $result);
 }
 
 /**
@@ -2632,30 +2632,30 @@ 
  * @param int    $max_page Optional. Max page.
  * @return string|void HTML-formatted link for the next page of comments.
  */
-function get_next_comments_link( $label = '', $max_page = 0 ) {
+function get_next_comments_link($label = '', $max_page = 0) {
 	global $wp_query;
 
-	if ( ! is_singular() )
+	if ( ! is_singular())
 		return;
 
 	$page = get_query_var('cpage');
 
-	if ( ! $page ) {
+	if ( ! $page) {
 		$page = 1;
 	}
 
 	$nextpage = intval($page) + 1;
 
-	if ( empty($max_page) )
+	if (empty($max_page))
 		$max_page = $wp_query->max_num_comment_pages;
 
-	if ( empty($max_page) )
+	if (empty($max_page))
 		$max_page = get_comment_pages_count();
 
-	if ( $nextpage > $max_page )
+	if ($nextpage > $max_page)
 		return;
 
-	if ( empty($label) )
+	if (empty($label))
 		$label = __('Newer Comments &raquo;');
 
 	/**
@@ -2665,7 +2665,7 @@ 
 	 *
 	 * @param string $attributes Attributes for the anchor tag.
 	 */
-	return '<a href="' . esc_url( get_comments_pagenum_link( $nextpage, $max_page ) ) . '" ' . apply_filters( 'next_comments_link_attributes', '' ) . '>'. preg_replace('/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $label) .'</a>';
+	return '<a href="'.esc_url(get_comments_pagenum_link($nextpage, $max_page)).'" '.apply_filters('next_comments_link_attributes', '').'>'.preg_replace('/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $label).'</a>';
 }
 
 /**
@@ -2676,8 +2676,8 @@ 
  * @param string $label    Optional. Label for link text.
  * @param int    $max_page Optional. Max page.
  */
-function next_comments_link( $label = '', $max_page = 0 ) {
-	echo get_next_comments_link( $label, $max_page );
+function next_comments_link($label = '', $max_page = 0) {
+	echo get_next_comments_link($label, $max_page);
 }
 
 /**
@@ -2688,18 +2688,18 @@ 
  * @param string $label Optional. Label for comments link text.
  * @return string|void HTML-formatted link for the previous page of comments.
  */
-function get_previous_comments_link( $label = '' ) {
-	if ( ! is_singular() )
+function get_previous_comments_link($label = '') {
+	if ( ! is_singular())
 		return;
 
 	$page = get_query_var('cpage');
 
-	if ( intval($page) <= 1 )
+	if (intval($page) <= 1)
 		return;
 
 	$prevpage = intval($page) - 1;
 
-	if ( empty($label) )
+	if (empty($label))
 		$label = __('&laquo; Older Comments');
 
 	/**
@@ -2709,7 +2709,7 @@ 
 	 *
 	 * @param string $attributes Attributes for the anchor tag.
 	 */
-	return '<a href="' . esc_url( get_comments_pagenum_link( $prevpage ) ) . '" ' . apply_filters( 'previous_comments_link_attributes', '' ) . '>' . preg_replace('/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $label) .'</a>';
+	return '<a href="'.esc_url(get_comments_pagenum_link($prevpage)).'" '.apply_filters('previous_comments_link_attributes', '').'>'.preg_replace('/&([^#])(?![a-z]{1,8};)/i', '&#038;$1', $label).'</a>';
 }
 
 /**
@@ -2719,8 +2719,8 @@ 
  *
  * @param string $label Optional. Label for comments link text.
  */
-function previous_comments_link( $label = '' ) {
-	echo get_previous_comments_link( $label );
+function previous_comments_link($label = '') {
+	echo get_previous_comments_link($label);
 }
 
 /**
@@ -2737,28 +2737,28 @@ 
 function paginate_comments_links($args = array()) {
 	global $wp_rewrite;
 
-	if ( ! is_singular() )
+	if ( ! is_singular())
 		return;
 
 	$page = get_query_var('cpage');
-	if ( !$page )
+	if ( ! $page)
 		$page = 1;
 	$max_page = get_comment_pages_count();
 	$defaults = array(
-		'base' => add_query_arg( 'cpage', '%#%' ),
+		'base' => add_query_arg('cpage', '%#%'),
 		'format' => '',
 		'total' => $max_page,
 		'current' => $page,
 		'echo' => true,
 		'add_fragment' => '#comments'
 	);
-	if ( $wp_rewrite->using_permalinks() )
-		$defaults['base'] = user_trailingslashit(trailingslashit(get_permalink()) . $wp_rewrite->comments_pagination_base . '-%#%', 'commentpaged');
+	if ($wp_rewrite->using_permalinks())
+		$defaults['base'] = user_trailingslashit(trailingslashit(get_permalink()).$wp_rewrite->comments_pagination_base.'-%#%', 'commentpaged');
 
-	$args = wp_parse_args( $args, $defaults );
-	$page_links = paginate_links( $args );
+	$args = wp_parse_args($args, $defaults);
+	$page_links = paginate_links($args);
 
-	if ( $args['echo'] )
+	if ($args['echo'])
 		echo $page_links;
 	else
 		return $page_links;
@@ -2778,29 +2778,29 @@ 
  * }
  * @return string Markup for comments links.
  */
-function get_the_comments_navigation( $args = array() ) {
+function get_the_comments_navigation($args = array()) {
 	$navigation = '';
 
 	// Are there comments to navigate through?
-	if ( get_comment_pages_count() > 1 ) {
-		$args = wp_parse_args( $args, array(
-			'prev_text'          => __( 'Older comments' ),
-			'next_text'          => __( 'Newer comments' ),
-			'screen_reader_text' => __( 'Comments navigation' ),
-		) );
-
-		$prev_link = get_previous_comments_link( $args['prev_text'] );
-		$next_link = get_next_comments_link( $args['next_text'] );
-
-		if ( $prev_link ) {
-			$navigation .= '<div class="nav-previous">' . $prev_link . '</div>';
+	if (get_comment_pages_count() > 1) {
+		$args = wp_parse_args($args, array(
+			'prev_text'          => __('Older comments'),
+			'next_text'          => __('Newer comments'),
+			'screen_reader_text' => __('Comments navigation'),
+		));
+
+		$prev_link = get_previous_comments_link($args['prev_text']);
+		$next_link = get_next_comments_link($args['next_text']);
+
+		if ($prev_link) {
+			$navigation .= '<div class="nav-previous">'.$prev_link.'</div>';
 		}
 
-		if ( $next_link ) {
-			$navigation .= '<div class="nav-next">' . $next_link . '</div>';
+		if ($next_link) {
+			$navigation .= '<div class="nav-next">'.$next_link.'</div>';
 		}
 
-		$navigation = _navigation_markup( $navigation, 'comment-navigation', $args['screen_reader_text'] );
+		$navigation = _navigation_markup($navigation, 'comment-navigation', $args['screen_reader_text']);
 	}
 
 	return $navigation;
@@ -2813,8 +2813,8 @@ 
  *
  * @param array $args See {@see get_the_comments_navigation()} for available arguments.
  */
-function the_comments_navigation( $args = array() ) {
-	echo get_the_comments_navigation( $args );
+function the_comments_navigation($args = array()) {
+	echo get_the_comments_navigation($args);
 }
 
 /**
@@ -2832,20 +2832,20 @@ 
  * }
  * @return string Markup for pagination links.
  */
-function get_the_comments_pagination( $args = array() ) {
+function get_the_comments_pagination($args = array()) {
 	$navigation = '';
-	$args       = wp_parse_args( $args, array(
-		'screen_reader_text' => __( 'Comments navigation' ),
-	) );
+	$args       = wp_parse_args($args, array(
+		'screen_reader_text' => __('Comments navigation'),
+	));
 	$args['echo'] = false;
 
 	// Make sure we get plain links, so we get a string we can work with.
 	$args['type'] = 'plain';
 
-	$links = paginate_comments_links( $args );
+	$links = paginate_comments_links($args);
 
-	if ( $links ) {
-		$navigation = _navigation_markup( $links, 'comments-pagination', $args['screen_reader_text'] );
+	if ($links) {
+		$navigation = _navigation_markup($links, 'comments-pagination', $args['screen_reader_text']);
 	}
 
 	return $navigation;
@@ -2859,8 +2859,8 @@ 
  *
  * @param array $args See {@see get_the_comments_pagination()} for available arguments.
  */
-function the_comments_pagination( $args = array() ) {
-	echo get_the_comments_pagination( $args );
+function the_comments_pagination($args = array()) {
+	echo get_the_comments_pagination($args);
 }
 
 /**
@@ -2879,11 +2879,11 @@ 
 function get_shortcut_link() {
 	global $is_IE, $wp_version;
 
-	include_once( ABSPATH . 'wp-admin/includes/class-wp-press-this.php' );
+	include_once(ABSPATH.'wp-admin/includes/class-wp-press-this.php');
 	$bookmarklet_version = $GLOBALS['wp_press_this']->version;
 	$link = '';
 
-	if ( $is_IE ) {
+	if ($is_IE) {
 		/**
 		 * Return the old/shorter bookmarklet code for MSIE 8 and lower,
 		 * since they only support a max length of ~2000 characters for
@@ -2893,27 +2893,27 @@ 
 		 */
 		$ua = $_SERVER['HTTP_USER_AGENT'];
 
-		if ( ! empty( $ua ) && preg_match( '/\bMSIE (\d)/', $ua, $matches ) && (int) $matches[1] <= 8 ) {
-			$url = wp_json_encode( admin_url( 'press-this.php' ) );
+		if ( ! empty($ua) && preg_match('/\bMSIE (\d)/', $ua, $matches) && (int) $matches[1] <= 8) {
+			$url = wp_json_encode(admin_url('press-this.php'));
 
-			$link = 'javascript:var d=document,w=window,e=w.getSelection,k=d.getSelection,x=d.selection,' .
-				's=(e?e():(k)?k():(x?x.createRange().text:0)),f=' . $url . ',l=d.location,e=encodeURIComponent,' .
-				'u=f+"?u="+e(l.href)+"&t="+e(d.title)+"&s="+e(s)+"&v=' . $bookmarklet_version . '";' .
-				'a=function(){if(!w.open(u,"t","toolbar=0,resizable=1,scrollbars=1,status=1,width=600,height=700"))l.href=u;};' .
+			$link = 'javascript:var d=document,w=window,e=w.getSelection,k=d.getSelection,x=d.selection,'.
+				's=(e?e():(k)?k():(x?x.createRange().text:0)),f='.$url.',l=d.location,e=encodeURIComponent,'.
+				'u=f+"?u="+e(l.href)+"&t="+e(d.title)+"&s="+e(s)+"&v='.$bookmarklet_version.'";'.
+				'a=function(){if(!w.open(u,"t","toolbar=0,resizable=1,scrollbars=1,status=1,width=600,height=700"))l.href=u;};'.
 				'if(/Firefox/.test(navigator.userAgent))setTimeout(a,0);else a();void(0)';
 		}
 	}
 
-	if ( empty( $link ) ) {
-		$src = @file_get_contents( ABSPATH . 'wp-admin/js/bookmarklet.min.js' );
+	if (empty($link)) {
+		$src = @file_get_contents(ABSPATH.'wp-admin/js/bookmarklet.min.js');
 
-		if ( $src ) {
-			$url = wp_json_encode( admin_url( 'press-this.php' ) . '?v=' . $bookmarklet_version );
-			$link = 'javascript:' . str_replace( 'window.pt_url', $url, $src );
+		if ($src) {
+			$url = wp_json_encode(admin_url('press-this.php').'?v='.$bookmarklet_version);
+			$link = 'javascript:'.str_replace('window.pt_url', $url, $src);
 		}
 	}
 
-	$link = str_replace( array( "\r", "\n", "\t" ),  '', $link );
+	$link = str_replace(array("\r", "\n", "\t"), '', $link);
 
 	/**
 	 * Filter the Press This bookmarklet link.
@@ -2922,7 +2922,7 @@ 
 	 *
 	 * @param string $link The Press This bookmarklet link.
 	 */
-	return apply_filters( 'shortcut_link', $link );
+	return apply_filters('shortcut_link', $link);
 }
 
 /**
@@ -2939,8 +2939,8 @@ 
  *                             'http', 'https', 'relative', 'rest', or null. Default null.
  * @return string Home url link with optional path appended.
  */
-function home_url( $path = '', $scheme = null ) {
-	return get_home_url( null, $path, $scheme );
+function home_url($path = '', $scheme = null) {
+	return get_home_url(null, $path, $scheme);
 }
 
 /**
@@ -2961,30 +2961,30 @@ 
  *                              'http', 'https', 'relative', 'rest', or null. Default null.
  * @return string Home URL link with optional path appended.
  */
-function get_home_url( $blog_id = null, $path = '', $scheme = null ) {
+function get_home_url($blog_id = null, $path = '', $scheme = null) {
 	global $pagenow;
 
 	$orig_scheme = $scheme;
 
-	if ( empty( $blog_id ) || !is_multisite() ) {
-		$url = get_option( 'home' );
+	if (empty($blog_id) || ! is_multisite()) {
+		$url = get_option('home');
 	} else {
-		switch_to_blog( $blog_id );
-		$url = get_option( 'home' );
+		switch_to_blog($blog_id);
+		$url = get_option('home');
 		restore_current_blog();
 	}
 
-	if ( ! in_array( $scheme, array( 'http', 'https', 'relative' ) ) ) {
-		if ( is_ssl() && ! is_admin() && 'wp-login.php' !== $pagenow )
+	if ( ! in_array($scheme, array('http', 'https', 'relative'))) {
+		if (is_ssl() && ! is_admin() && 'wp-login.php' !== $pagenow)
 			$scheme = 'https';
 		else
-			$scheme = parse_url( $url, PHP_URL_SCHEME );
+			$scheme = parse_url($url, PHP_URL_SCHEME);
 	}
 
-	$url = set_url_scheme( $url, $scheme );
+	$url = set_url_scheme($url, $scheme);
 
-	if ( $path && is_string( $path ) )
-		$url .= '/' . ltrim( $path, '/' );
+	if ($path && is_string($path))
+		$url .= '/'.ltrim($path, '/');
 
 	/**
 	 * Filter the home URL.
@@ -2997,7 +2997,7 @@ 
 	 *                                 'relative', 'rest', or null.
 	 * @param int|null    $blog_id     Site ID, or null for the current site.
 	 */
-	return apply_filters( 'home_url', $url, $path, $orig_scheme, $blog_id );
+	return apply_filters('home_url', $url, $path, $orig_scheme, $blog_id);
 }
 
 /**
@@ -3014,8 +3014,8 @@ 
  * @param string $scheme Optional. Scheme to give the site url context. See set_url_scheme().
  * @return string Site url link with optional path appended.
  */
-function site_url( $path = '', $scheme = null ) {
-	return get_site_url( null, $path, $scheme );
+function site_url($path = '', $scheme = null) {
+	return get_site_url(null, $path, $scheme);
 }
 
 /**
@@ -3035,19 +3035,19 @@ 
  *                        'relative'. Default null.
  * @return string Site url link with optional path appended.
  */
-function get_site_url( $blog_id = null, $path = '', $scheme = null ) {
-	if ( empty( $blog_id ) || !is_multisite() ) {
-		$url = get_option( 'siteurl' );
+function get_site_url($blog_id = null, $path = '', $scheme = null) {
+	if (empty($blog_id) || ! is_multisite()) {
+		$url = get_option('siteurl');
 	} else {
-		switch_to_blog( $blog_id );
-		$url = get_option( 'siteurl' );
+		switch_to_blog($blog_id);
+		$url = get_option('siteurl');
 		restore_current_blog();
 	}
 
-	$url = set_url_scheme( $url, $scheme );
+	$url = set_url_scheme($url, $scheme);
 
-	if ( $path && is_string( $path ) )
-		$url .= '/' . ltrim( $path, '/' );
+	if ($path && is_string($path))
+		$url .= '/'.ltrim($path, '/');
 
 	/**
 	 * Filter the site URL.
@@ -3060,7 +3060,7 @@ 
 	 *                             'login_post', 'admin', 'relative' or null.
 	 * @param int|null    $blog_id Site ID, or null for the current site.
 	 */
-	return apply_filters( 'site_url', $url, $path, $scheme, $blog_id );
+	return apply_filters('site_url', $url, $path, $scheme, $blog_id);
 }
 
 /**
@@ -3072,8 +3072,8 @@ 
  * @param string $scheme The scheme to use. Default is 'admin', which obeys force_ssl_admin() and is_ssl(). 'http' or 'https' can be passed to force those schemes.
  * @return string Admin url link with optional path appended.
  */
-function admin_url( $path = '', $scheme = 'admin' ) {
-	return get_admin_url( null, $path, $scheme );
+function admin_url($path = '', $scheme = 'admin') {
+	return get_admin_url(null, $path, $scheme);
 }
 
 /**
@@ -3088,11 +3088,11 @@ 
  *                        {@see force_ssl_admin()} and {@see is_ssl()}.
  * @return string Admin url link with optional path appended.
  */
-function get_admin_url( $blog_id = null, $path = '', $scheme = 'admin' ) {
+function get_admin_url($blog_id = null, $path = '', $scheme = 'admin') {
 	$url = get_site_url($blog_id, 'wp-admin/', $scheme);
 
-	if ( $path && is_string( $path ) )
-		$url .= ltrim( $path, '/' );
+	if ($path && is_string($path))
+		$url .= ltrim($path, '/');
 
 	/**
 	 * Filter the admin area URL.
@@ -3103,7 +3103,7 @@ 
 	 * @param string   $path    Path relative to the admin area URL. Blank string if no path is specified.
 	 * @param int|null $blog_id Site ID, or null for the current site.
 	 */
-	return apply_filters( 'admin_url', $url, $path, $blog_id );
+	return apply_filters('admin_url', $url, $path, $blog_id);
 }
 
 /**
@@ -3115,10 +3115,10 @@ 
  * @param string $scheme Optional. Scheme to give the includes url context.
  * @return string Includes url link with optional path appended.
  */
-function includes_url( $path = '', $scheme = null ) {
-	$url = site_url( '/' . WPINC . '/', $scheme );
+function includes_url($path = '', $scheme = null) {
+	$url = site_url('/'.WPINC.'/', $scheme);
 
-	if ( $path && is_string( $path ) )
+	if ($path && is_string($path))
 		$url .= ltrim($path, '/');
 
 	/**
@@ -3130,7 +3130,7 @@ 
 	 * @param string $path Path relative to the URL to the wp-includes directory. Blank string
 	 *                     if no path is specified.
 	 */
-	return apply_filters( 'includes_url', $url, $path );
+	return apply_filters('includes_url', $url, $path);
 }
 
 /**
@@ -3142,10 +3142,10 @@ 
  * @return string Content url link with optional path appended.
  */
 function content_url($path = '') {
-	$url = set_url_scheme( WP_CONTENT_URL );
+	$url = set_url_scheme(WP_CONTENT_URL);
 
-	if ( $path && is_string( $path ) )
-		$url .= '/' . ltrim($path, '/');
+	if ($path && is_string($path))
+		$url .= '/'.ltrim($path, '/');
 
 	/**
 	 * Filter the URL to the content directory.
@@ -3156,7 +3156,7 @@ 
 	 * @param string $path Path relative to the URL to the content directory. Blank string
 	 *                     if no path is specified.
 	 */
-	return apply_filters( 'content_url', $url, $path);
+	return apply_filters('content_url', $url, $path);
 }
 
 /**
@@ -3173,28 +3173,28 @@ 
  *                        Typically this is done by passing `__FILE__` as the argument.
  * @return string Plugins URL link with optional paths appended.
  */
-function plugins_url( $path = '', $plugin = '' ) {
+function plugins_url($path = '', $plugin = '') {
 
-	$path = wp_normalize_path( $path );
-	$plugin = wp_normalize_path( $plugin );
-	$mu_plugin_dir = wp_normalize_path( WPMU_PLUGIN_DIR );
+	$path = wp_normalize_path($path);
+	$plugin = wp_normalize_path($plugin);
+	$mu_plugin_dir = wp_normalize_path(WPMU_PLUGIN_DIR);
 
-	if ( !empty($plugin) && 0 === strpos($plugin, $mu_plugin_dir) )
+	if ( ! empty($plugin) && 0 === strpos($plugin, $mu_plugin_dir))
 		$url = WPMU_PLUGIN_URL;
 	else
 		$url = WP_PLUGIN_URL;
 
 
-	$url = set_url_scheme( $url );
+	$url = set_url_scheme($url);
 
-	if ( !empty($plugin) && is_string($plugin) ) {
+	if ( ! empty($plugin) && is_string($plugin)) {
 		$folder = dirname(plugin_basename($plugin));
-		if ( '.' != $folder )
-			$url .= '/' . ltrim($folder, '/');
+		if ('.' != $folder)
+			$url .= '/'.ltrim($folder, '/');
 	}
 
-	if ( $path && is_string( $path ) )
-		$url .= '/' . ltrim($path, '/');
+	if ($path && is_string($path))
+		$url .= '/'.ltrim($path, '/');
 
 	/**
 	 * Filter the URL to the plugins directory.
@@ -3207,7 +3207,7 @@ 
 	 * @param string $plugin The plugin file path to be relative to. Blank string if no plugin
 	 *                       is specified.
 	 */
-	return apply_filters( 'plugins_url', $url, $path, $plugin );
+	return apply_filters('plugins_url', $url, $path, $plugin);
 }
 
 /**
@@ -3223,19 +3223,19 @@ 
  * @param string $scheme Optional. Scheme to give the site url context. See set_url_scheme().
  * @return string Site url link with optional path appended.
  */
-function network_site_url( $path = '', $scheme = null ) {
-	if ( ! is_multisite() )
+function network_site_url($path = '', $scheme = null) {
+	if ( ! is_multisite())
 		return site_url($path, $scheme);
 
 	$current_site = get_current_site();
 
-	if ( 'relative' == $scheme )
+	if ('relative' == $scheme)
 		$url = $current_site->path;
 	else
-		$url = set_url_scheme( 'http://' . $current_site->domain . $current_site->path, $scheme );
+		$url = set_url_scheme('http://'.$current_site->domain.$current_site->path, $scheme);
 
-	if ( $path && is_string( $path ) )
-		$url .= ltrim( $path, '/' );
+	if ($path && is_string($path))
+		$url .= ltrim($path, '/');
 
 	/**
 	 * Filter the network site URL.
@@ -3248,7 +3248,7 @@ 
 	 * @param string|null $scheme Scheme to give the URL context. Accepts 'http', 'https',
 	 *                            'relative' or null.
 	 */
-	return apply_filters( 'network_site_url', $url, $path, $scheme );
+	return apply_filters('network_site_url', $url, $path, $scheme);
 }
 
 /**
@@ -3265,23 +3265,23 @@ 
  *                        'http', 'https', or 'relative'. Default null.
  * @return string Home url link with optional path appended.
  */
-function network_home_url( $path = '', $scheme = null ) {
-	if ( ! is_multisite() )
+function network_home_url($path = '', $scheme = null) {
+	if ( ! is_multisite())
 		return home_url($path, $scheme);
 
 	$current_site = get_current_site();
 	$orig_scheme = $scheme;
 
-	if ( ! in_array( $scheme, array( 'http', 'https', 'relative' ) ) )
+	if ( ! in_array($scheme, array('http', 'https', 'relative')))
 		$scheme = is_ssl() && ! is_admin() ? 'https' : 'http';
 
-	if ( 'relative' == $scheme )
+	if ('relative' == $scheme)
 		$url = $current_site->path;
 	else
-		$url = set_url_scheme( 'http://' . $current_site->domain . $current_site->path, $scheme );
+		$url = set_url_scheme('http://'.$current_site->domain.$current_site->path, $scheme);
 
-	if ( $path && is_string( $path ) )
-		$url .= ltrim( $path, '/' );
+	if ($path && is_string($path))
+		$url .= ltrim($path, '/');
 
 	/**
 	 * Filter the network home URL.
@@ -3294,7 +3294,7 @@ 
 	 * @param string|null $orig_scheme Scheme to give the URL context. Accepts 'http', 'https',
 	 *                                 'relative' or null.
 	 */
-	return apply_filters( 'network_home_url', $url, $path, $orig_scheme);
+	return apply_filters('network_home_url', $url, $path, $orig_scheme);
 }
 
 /**
@@ -3306,13 +3306,13 @@ 
  * @param string $scheme The scheme to use. Default is 'admin', which obeys force_ssl_admin() and is_ssl(). 'http' or 'https' can be passed to force those schemes.
  * @return string Admin url link with optional path appended.
  */
-function network_admin_url( $path = '', $scheme = 'admin' ) {
-	if ( ! is_multisite() )
-		return admin_url( $path, $scheme );
+function network_admin_url($path = '', $scheme = 'admin') {
+	if ( ! is_multisite())
+		return admin_url($path, $scheme);
 
 	$url = network_site_url('wp-admin/network/', $scheme);
 
-	if ( $path && is_string( $path ) )
+	if ($path && is_string($path))
 		$url .= ltrim($path, '/');
 
 	/**
@@ -3324,7 +3324,7 @@ 
 	 * @param string $path Path relative to the network admin URL. Blank string if
 	 *                     no path is specified.
 	 */
-	return apply_filters( 'network_admin_url', $url, $path );
+	return apply_filters('network_admin_url', $url, $path);
 }
 
 /**
@@ -3336,10 +3336,10 @@ 
  * @param string $scheme The scheme to use. Default is 'admin', which obeys force_ssl_admin() and is_ssl(). 'http' or 'https' can be passed to force those schemes.
  * @return string Admin url link with optional path appended.
  */
-function user_admin_url( $path = '', $scheme = 'admin' ) {
+function user_admin_url($path = '', $scheme = 'admin') {
 	$url = network_site_url('wp-admin/user/', $scheme);
 
-	if ( $path && is_string( $path ) )
+	if ($path && is_string($path))
 		$url .= ltrim($path, '/');
 
 	/**
@@ -3351,7 +3351,7 @@ 
 	 * @param string $path Path relative to the URL. Blank string if
 	 *                     no path is specified.
 	 */
-	return apply_filters( 'user_admin_url', $url, $path );
+	return apply_filters('user_admin_url', $url, $path);
 }
 
 /**
@@ -3364,9 +3364,9 @@ 
  * @return string Admin url link with optional path appended.
  */
 function self_admin_url($path = '', $scheme = 'admin') {
-	if ( is_network_admin() )
+	if (is_network_admin())
 		return network_admin_url($path, $scheme);
-	elseif ( is_user_admin() )
+	elseif (is_user_admin())
 		return user_admin_url($path, $scheme);
 	else
 		return admin_url($path, $scheme);
@@ -3383,27 +3383,27 @@ 
  *                            'login_post', 'admin', 'relative', 'rest', 'rpc', or null. Default null.
  * @return string $url URL with chosen scheme.
  */
-function set_url_scheme( $url, $scheme = null ) {
+function set_url_scheme($url, $scheme = null) {
 	$orig_scheme = $scheme;
 
-	if ( ! $scheme ) {
+	if ( ! $scheme) {
 		$scheme = is_ssl() ? 'https' : 'http';
-	} elseif ( $scheme === 'admin' || $scheme === 'login' || $scheme === 'login_post' || $scheme === 'rpc' ) {
+	} elseif ($scheme === 'admin' || $scheme === 'login' || $scheme === 'login_post' || $scheme === 'rpc') {
 		$scheme = is_ssl() || force_ssl_admin() ? 'https' : 'http';
-	} elseif ( $scheme !== 'http' && $scheme !== 'https' && $scheme !== 'relative' ) {
+	} elseif ($scheme !== 'http' && $scheme !== 'https' && $scheme !== 'relative') {
 		$scheme = is_ssl() ? 'https' : 'http';
 	}
 
-	$url = trim( $url );
-	if ( substr( $url, 0, 2 ) === '//' )
-		$url = 'http:' . $url;
+	$url = trim($url);
+	if (substr($url, 0, 2) === '//')
+		$url = 'http:'.$url;
 
-	if ( 'relative' == $scheme ) {
-		$url = ltrim( preg_replace( '#^\w+://[^/]*#', '', $url ) );
-		if ( $url !== '' && $url[0] === '/' )
-			$url = '/' . ltrim($url , "/ \t\n\r\0\x0B" );
+	if ('relative' == $scheme) {
+		$url = ltrim(preg_replace('#^\w+://[^/]*#', '', $url));
+		if ($url !== '' && $url[0] === '/')
+			$url = '/'.ltrim($url, "/ \t\n\r\0\x0B");
 	} else {
-		$url = preg_replace( '#^\w+://#', $scheme . '://', $url );
+		$url = preg_replace('#^\w+://#', $scheme.'://', $url);
 	}
 
 	/**
@@ -3416,7 +3416,7 @@ 
 	 * @param string|null $orig_scheme Scheme requested for the URL. One of 'http', 'https', 'login',
 	 *                                 'login_post', 'admin', 'relative', 'rest', 'rpc', or null.
 	 */
-	return apply_filters( 'set_url_scheme', $url, $scheme, $orig_scheme );
+	return apply_filters('set_url_scheme', $url, $scheme, $orig_scheme);
 }
 
 /**
@@ -3433,24 +3433,24 @@ 
  * @param string $scheme  The scheme to use. Default is 'admin', which obeys force_ssl_admin() and is_ssl(). 'http' or 'https' can be passed to force those schemes.
  * @return string Dashboard url link with optional path appended.
  */
-function get_dashboard_url( $user_id = 0, $path = '', $scheme = 'admin' ) {
+function get_dashboard_url($user_id = 0, $path = '', $scheme = 'admin') {
 	$user_id = $user_id ? (int) $user_id : get_current_user_id();
 
-	$blogs = get_blogs_of_user( $user_id );
-	if ( ! is_super_admin() && empty($blogs) ) {
-		$url = user_admin_url( $path, $scheme );
-	} elseif ( ! is_multisite() ) {
-		$url = admin_url( $path, $scheme );
+	$blogs = get_blogs_of_user($user_id);
+	if ( ! is_super_admin() && empty($blogs)) {
+		$url = user_admin_url($path, $scheme);
+	} elseif ( ! is_multisite()) {
+		$url = admin_url($path, $scheme);
 	} else {
 		$current_blog = get_current_blog_id();
-		if ( $current_blog  && ( is_super_admin( $user_id ) || in_array( $current_blog, array_keys( $blogs ) ) ) ) {
-			$url = admin_url( $path, $scheme );
+		if ($current_blog && (is_super_admin($user_id) || in_array($current_blog, array_keys($blogs)))) {
+			$url = admin_url($path, $scheme);
 		} else {
-			$active = get_active_blog_for_user( $user_id );
-			if ( $active )
-				$url = get_admin_url( $active->blog_id, $path, $scheme );
+			$active = get_active_blog_for_user($user_id);
+			if ($active)
+				$url = get_admin_url($active->blog_id, $path, $scheme);
 			else
-				$url = user_admin_url( $path, $scheme );
+				$url = user_admin_url($path, $scheme);
 		}
 	}
 
@@ -3465,7 +3465,7 @@ 
 	 * @param string $scheme  Scheme to give the URL context. Accepts 'http', 'https', 'login',
 	 *                        'login_post', 'admin', 'relative' or null.
 	 */
-	return apply_filters( 'user_dashboard_url', $url, $user_id, $path, $scheme);
+	return apply_filters('user_dashboard_url', $url, $user_id, $path, $scheme);
 }
 
 /**
@@ -3478,15 +3478,15 @@ 
  *                        'http' or 'https' can be passed to force those schemes.
  * @return string Dashboard url link with optional path appended.
  */
-function get_edit_profile_url( $user_id = 0, $scheme = 'admin' ) {
+function get_edit_profile_url($user_id = 0, $scheme = 'admin') {
 	$user_id = $user_id ? (int) $user_id : get_current_user_id();
 
-	if ( is_user_admin() )
-		$url = user_admin_url( 'profile.php', $scheme );
-	elseif ( is_network_admin() )
-		$url = network_admin_url( 'profile.php', $scheme );
+	if (is_user_admin())
+		$url = user_admin_url('profile.php', $scheme);
+	elseif (is_network_admin())
+		$url = network_admin_url('profile.php', $scheme);
 	else
-		$url = get_dashboard_url( $user_id, 'profile.php', $scheme );
+		$url = get_dashboard_url($user_id, 'profile.php', $scheme);
 
 	/**
 	 * Filter the URL for a user's profile editor.
@@ -3498,7 +3498,7 @@ 
 	 * @param string $scheme  Scheme to give the URL context. Accepts 'http', 'https', 'login',
 	 *                        'login_post', 'admin', 'relative' or null.
 	 */
-	return apply_filters( 'edit_profile_url', $url, $user_id, $scheme);
+	return apply_filters('edit_profile_url', $url, $user_id, $scheme);
 }
 
 /**
@@ -3507,30 +3507,30 @@ 
  * @since 2.9.0
  */
 function rel_canonical() {
-	if ( ! is_singular() ) {
+	if ( ! is_singular()) {
 		return;
 	}
 
-	if ( ! $id = get_queried_object_id() ) {
+	if ( ! $id = get_queried_object_id()) {
 		return;
 	}
 
-	$url = get_permalink( $id );
+	$url = get_permalink($id);
 
-	$page = get_query_var( 'page' );
-	if ( $page >= 2 ) {
-		if ( '' == get_option( 'permalink_structure' ) ) {
-			$url = add_query_arg( 'page', $page, $url );
+	$page = get_query_var('page');
+	if ($page >= 2) {
+		if ('' == get_option('permalink_structure')) {
+			$url = add_query_arg('page', $page, $url);
 		} else {
-			$url = trailingslashit( $url ) . user_trailingslashit( $page, 'single_paged' );
+			$url = trailingslashit($url).user_trailingslashit($page, 'single_paged');
 		}
 	}
 
-	$cpage = get_query_var( 'cpage' );
-	if ( $cpage ) {
-		$url = get_comments_pagenum_link( $cpage );
+	$cpage = get_query_var('cpage');
+	if ($cpage) {
+		$url = get_comments_pagenum_link($cpage);
 	}
-	echo '<link rel="canonical" href="' . esc_url( $url ) . "\" />\n";
+	echo '<link rel="canonical" href="'.esc_url($url)."\" />\n";
 }
 
 /**
@@ -3565,32 +3565,32 @@ 
 	 * @param string      $context     The context for the link. One of 'post' or 'query',
 	 * @param bool        $allow_slugs Whether to allow post slugs in the shortlink.
 	 */
-	$shortlink = apply_filters( 'pre_get_shortlink', false, $id, $context, $allow_slugs );
+	$shortlink = apply_filters('pre_get_shortlink', false, $id, $context, $allow_slugs);
 
-	if ( false !== $shortlink ) {
+	if (false !== $shortlink) {
 		return $shortlink;
 	}
 
 	$post_id = 0;
-	if ( 'query' == $context && is_singular() ) {
+	if ('query' == $context && is_singular()) {
 		$post_id = get_queried_object_id();
-		$post = get_post( $post_id );
-	} elseif ( 'post' == $context ) {
-		$post = get_post( $id );
-		if ( ! empty( $post->ID ) )
+		$post = get_post($post_id);
+	} elseif ('post' == $context) {
+		$post = get_post($id);
+		if ( ! empty($post->ID))
 			$post_id = $post->ID;
 	}
 
 	$shortlink = '';
 
 	// Return p= link for all public post types.
-	if ( ! empty( $post_id ) ) {
-		$post_type = get_post_type_object( $post->post_type );
+	if ( ! empty($post_id)) {
+		$post_type = get_post_type_object($post->post_type);
 
-		if ( 'page' === $post->post_type && $post->ID == get_option( 'page_on_front' ) && 'page' == get_option( 'show_on_front' ) ) {
-			$shortlink = home_url( '/' );
-		} elseif ( $post_type->public ) {
-			$shortlink = home_url( '?p=' . $post_id );
+		if ('page' === $post->post_type && $post->ID == get_option('page_on_front') && 'page' == get_option('show_on_front')) {
+			$shortlink = home_url('/');
+		} elseif ($post_type->public) {
+			$shortlink = home_url('?p='.$post_id);
 		}
 	}
 
@@ -3604,7 +3604,7 @@ 
 	 * @param string $context     The context for the link. One of 'post' or 'query',
 	 * @param bool   $allow_slugs Whether to allow post slugs in the shortlink. Not used by default.
 	 */
-	return apply_filters( 'get_shortlink', $shortlink, $id, $context, $allow_slugs );
+	return apply_filters('get_shortlink', $shortlink, $id, $context, $allow_slugs);
 }
 
 /**
@@ -3615,12 +3615,12 @@ 
  * @since 3.0.0
  */
 function wp_shortlink_wp_head() {
-	$shortlink = wp_get_shortlink( 0, 'query' );
+	$shortlink = wp_get_shortlink(0, 'query');
 
-	if ( empty( $shortlink ) )
+	if (empty($shortlink))
 		return;
 
-	echo "<link rel='shortlink' href='" . esc_url( $shortlink ) . "' />\n";
+	echo "<link rel='shortlink' href='".esc_url($shortlink)."' />\n";
 }
 
 /**
@@ -3631,15 +3631,15 @@ 
  * @since 3.0.0
  */
 function wp_shortlink_header() {
-	if ( headers_sent() )
+	if (headers_sent())
 		return;
 
 	$shortlink = wp_get_shortlink(0, 'query');
 
-	if ( empty($shortlink) )
+	if (empty($shortlink))
 		return;
 
-	header('Link: <' . $shortlink . '>; rel=shortlink', false);
+	header('Link: <'.$shortlink.'>; rel=shortlink', false);
 }
 
 /**
@@ -3656,19 +3656,19 @@ 
  * @param string $before Optional HTML to display before the link.
  * @param string $after  Optional HTML to display after the link.
  */
-function the_shortlink( $text = '', $title = '', $before = '', $after = '' ) {
+function the_shortlink($text = '', $title = '', $before = '', $after = '') {
 	$post = get_post();
 
-	if ( empty( $text ) )
+	if (empty($text))
 		$text = __('This is the short link.');
 
-	if ( empty( $title ) )
-		$title = the_title_attribute( array( 'echo' => false ) );
+	if (empty($title))
+		$title = the_title_attribute(array('echo' => false));
 
-	$shortlink = wp_get_shortlink( $post->ID );
+	$shortlink = wp_get_shortlink($post->ID);
 
-	if ( !empty( $shortlink ) ) {
-		$link = '<a rel="shortlink" href="' . esc_url( $shortlink ) . '" title="' . $title . '">' . $text . '</a>';
+	if ( ! empty($shortlink)) {
+		$link = '<a rel="shortlink" href="'.esc_url($shortlink).'" title="'.$title.'">'.$text.'</a>';
 
 		/**
 		 * Filter the shortlink anchor tag for a post.
@@ -3680,7 +3680,7 @@ 
 		 * @param string $text      Shortlink's text.
 		 * @param string $title     Shortlink's title attribute.
 		 */
-		$link = apply_filters( 'the_shortlink', $link, $shortlink, $text, $title );
+		$link = apply_filters('the_shortlink', $link, $shortlink, $text, $title);
 		echo $before, $link, $after;
 	}
 }
@@ -3713,8 +3713,8 @@ 
  * }
  * @return false|string The URL of the avatar we found, or false if we couldn't find an avatar.
  */
-function get_avatar_url( $id_or_email, $args = null ) {
-	$args = get_avatar_data( $id_or_email, $args );
+function get_avatar_url($id_or_email, $args = null) {
+	$args = get_avatar_data($id_or_email, $args);
 	return $args['url'];
 }
 
@@ -3754,51 +3754,51 @@ 
  *     @type string $url          The URL of the avatar we found.
  * }
  */
-function get_avatar_data( $id_or_email, $args = null ) {
-	$args = wp_parse_args( $args, array(
+function get_avatar_data($id_or_email, $args = null) {
+	$args = wp_parse_args($args, array(
 		'size'           => 96,
 		'height'         => null,
 		'width'          => null,
-		'default'        => get_option( 'avatar_default', 'mystery' ),
+		'default'        => get_option('avatar_default', 'mystery'),
 		'force_default'  => false,
-		'rating'         => get_option( 'avatar_rating' ),
+		'rating'         => get_option('avatar_rating'),
 		'scheme'         => null,
 		'processed_args' => null, // if used, should be a reference
 		'extra_attr'     => '',
-	) );
+	));
 
-	if ( is_numeric( $args['size'] ) ) {
-		$args['size'] = absint( $args['size'] );
-		if ( ! $args['size'] ) {
+	if (is_numeric($args['size'])) {
+		$args['size'] = absint($args['size']);
+		if ( ! $args['size']) {
 			$args['size'] = 96;
 		}
 	} else {
 		$args['size'] = 96;
 	}
 
-	if ( is_numeric( $args['height'] ) ) {
-		$args['height'] = absint( $args['height'] );
-		if ( ! $args['height'] ) {
+	if (is_numeric($args['height'])) {
+		$args['height'] = absint($args['height']);
+		if ( ! $args['height']) {
 			$args['height'] = $args['size'];
 		}
 	} else {
 		$args['height'] = $args['size'];
 	}
 
-	if ( is_numeric( $args['width'] ) ) {
-		$args['width'] = absint( $args['width'] );
-		if ( ! $args['width'] ) {
+	if (is_numeric($args['width'])) {
+		$args['width'] = absint($args['width']);
+		if ( ! $args['width']) {
 			$args['width'] = $args['size'];
 		}
 	} else {
 		$args['width'] = $args['size'];
 	}
 
-	if ( empty( $args['default'] ) ) {
-		$args['default'] = get_option( 'avatar_default', 'mystery' );
+	if (empty($args['default'])) {
+		$args['default'] = get_option('avatar_default', 'mystery');
 	}
 
-	switch ( $args['default'] ) {
+	switch ($args['default']) {
 		case 'mm' :
 		case 'mystery' :
 		case 'mysteryman' :
@@ -3811,7 +3811,7 @@ 
 
 	$args['force_default'] = (bool) $args['force_default'];
 
-	$args['rating'] = strtolower( $args['rating'] );
+	$args['rating'] = strtolower($args['rating']);
 
 	$args['found_avatar'] = false;
 
@@ -3828,38 +3828,38 @@ 
 	 * @param mixed  $id_or_email The Gravatar to retrieve. Accepts a user_id, gravatar md5 hash,
 	 *                            user email, WP_User object, WP_Post object, or WP_Comment object.
 	 */
-	$args = apply_filters( 'pre_get_avatar_data', $args, $id_or_email );
+	$args = apply_filters('pre_get_avatar_data', $args, $id_or_email);
 
-	if ( isset( $args['url'] ) && ! is_null( $args['url'] ) ) {
+	if (isset($args['url']) && ! is_null($args['url'])) {
 		/** This filter is documented in wp-includes/link-template.php */
-		return apply_filters( 'get_avatar_data', $args, $id_or_email );
+		return apply_filters('get_avatar_data', $args, $id_or_email);
 	}
 
 	$email_hash = '';
 	$user = $email = false;
 
-	if ( is_object( $id_or_email ) && isset( $id_or_email->comment_ID ) ) {
-		$id_or_email = get_comment( $id_or_email );
+	if (is_object($id_or_email) && isset($id_or_email->comment_ID)) {
+		$id_or_email = get_comment($id_or_email);
 	}
 
 	// Process the user identifier.
-	if ( is_numeric( $id_or_email ) ) {
-		$user = get_user_by( 'id', absint( $id_or_email ) );
-	} elseif ( is_string( $id_or_email ) ) {
-		if ( strpos( $id_or_email, '@md5.gravatar.com' ) ) {
+	if (is_numeric($id_or_email)) {
+		$user = get_user_by('id', absint($id_or_email));
+	} elseif (is_string($id_or_email)) {
+		if (strpos($id_or_email, '@md5.gravatar.com')) {
 			// md5 hash
-			list( $email_hash ) = explode( '@', $id_or_email );
+			list($email_hash) = explode('@', $id_or_email);
 		} else {
 			// email address
 			$email = $id_or_email;
 		}
-	} elseif ( $id_or_email instanceof WP_User ) {
+	} elseif ($id_or_email instanceof WP_User) {
 		// User Object
 		$user = $id_or_email;
-	} elseif ( $id_or_email instanceof WP_Post ) {
+	} elseif ($id_or_email instanceof WP_Post) {
 		// Post Object
-		$user = get_user_by( 'id', (int) $id_or_email->post_author );
-	} elseif ( $id_or_email instanceof WP_Comment ) {
+		$user = get_user_by('id', (int) $id_or_email->post_author);
+	} elseif ($id_or_email instanceof WP_Comment) {
 		/**
 		 * Filter the list of allowed comment types for retrieving avatars.
 		 *
@@ -3867,36 +3867,36 @@ 
 		 *
 		 * @param array $types An array of content types. Default only contains 'comment'.
 		 */
-		$allowed_comment_types = apply_filters( 'get_avatar_comment_types', array( 'comment' ) );
-		if ( ! empty( $id_or_email->comment_type ) && ! in_array( $id_or_email->comment_type, (array) $allowed_comment_types ) ) {
+		$allowed_comment_types = apply_filters('get_avatar_comment_types', array('comment'));
+		if ( ! empty($id_or_email->comment_type) && ! in_array($id_or_email->comment_type, (array) $allowed_comment_types)) {
 			$args['url'] = false;
 			/** This filter is documented in wp-includes/link-template.php */
-			return apply_filters( 'get_avatar_data', $args, $id_or_email );
+			return apply_filters('get_avatar_data', $args, $id_or_email);
 		}
 
-		if ( ! empty( $id_or_email->user_id ) ) {
-			$user = get_user_by( 'id', (int) $id_or_email->user_id );
+		if ( ! empty($id_or_email->user_id)) {
+			$user = get_user_by('id', (int) $id_or_email->user_id);
 		}
-		if ( ( ! $user || is_wp_error( $user ) ) && ! empty( $id_or_email->comment_author_email ) ) {
+		if (( ! $user || is_wp_error($user)) && ! empty($id_or_email->comment_author_email)) {
 			$email = $id_or_email->comment_author_email;
 		}
 	}
 
-	if ( ! $email_hash ) {
-		if ( $user ) {
+	if ( ! $email_hash) {
+		if ($user) {
 			$email = $user->user_email;
 		}
 
-		if ( $email ) {
-			$email_hash = md5( strtolower( trim( $email ) ) );
+		if ($email) {
+			$email_hash = md5(strtolower(trim($email)));
 		}
 	}
 
-	if ( $email_hash ) {
+	if ($email_hash) {
 		$args['found_avatar'] = true;
-		$gravatar_server = hexdec( $email_hash[0] ) % 3;
+		$gravatar_server = hexdec($email_hash[0]) % 3;
 	} else {
-		$gravatar_server = rand( 0, 2 );
+		$gravatar_server = rand(0, 2);
 	}
 
 	$url_args = array(
@@ -3906,15 +3906,15 @@ 
 		'r' => $args['rating'],
 	);
 
-	if ( is_ssl() ) {
-		$url = 'https://secure.gravatar.com/avatar/' . $email_hash;
+	if (is_ssl()) {
+		$url = 'https://secure.gravatar.com/avatar/'.$email_hash;
 	} else {
-		$url = sprintf( 'http://%d.gravatar.com/avatar/%s', $gravatar_server, $email_hash );
+		$url = sprintf('http://%d.gravatar.com/avatar/%s', $gravatar_server, $email_hash);
 	}
 
 	$url = add_query_arg(
-		rawurlencode_deep( array_filter( $url_args ) ),
-		set_url_scheme( $url, $args['scheme'] )
+		rawurlencode_deep(array_filter($url_args)),
+		set_url_scheme($url, $args['scheme'])
 	);
 
 	/**
@@ -3927,7 +3927,7 @@ 
 	 *                            user email, WP_User object, WP_Post object, or WP_Comment object.
 	 * @param array  $args        Arguments passed to get_avatar_data(), after processing.
 	 */
-	$args['url'] = apply_filters( 'get_avatar_url', $url, $id_or_email, $args );
+	$args['url'] = apply_filters('get_avatar_url', $url, $id_or_email, $args);
 
 	/**
 	 * Filter the avatar data.
@@ -3938,5 +3938,5 @@ 
 	 * @param mixed  $id_or_email The Gravatar to retrieve. Accepts a user_id, gravatar md5 hash,
 	 *                            user email, WP_User object, WP_Post object, or WP_Comment object.
 	 */
-	return apply_filters( 'get_avatar_data', $args, $id_or_email );
+	return apply_filters('get_avatar_data', $args, $id_or_email);
 }

Braces +474 added lines, -340 removed lines

@@ -44,10 +44,11 @@ 
  */
 function user_trailingslashit($string, $type_of_url = '') {
 	global $wp_rewrite;
-	if ( $wp_rewrite->use_trailing_slashes )
-		$string = trailingslashit($string);
-	else
-		$string = untrailingslashit($string);
+	if ( $wp_rewrite->use_trailing_slashes ) {
+			$string = trailingslashit($string);
+	} else {
+			$string = untrailingslashit($string);
+	}
 
 	/**
 	 * Filter the trailing slashed string, depending on whether the site is set
@@ -136,15 +137,17 @@ 
 		$sample = false;
 	}
 
-	if ( empty($post->ID) )
-		return false;
+	if ( empty($post->ID) ) {
+			return false;
+	}
 
-	if ( $post->post_type == 'page' )
-		return get_page_link($post, $leavename, $sample);
-	elseif ( $post->post_type == 'attachment' )
-		return get_attachment_link( $post, $leavename );
-	elseif ( in_array($post->post_type, get_post_types( array('_builtin' => false) ) ) )
-		return get_post_permalink($post, $leavename, $sample);
+	if ( $post->post_type == 'page' ) {
+			return get_page_link($post, $leavename, $sample);
+	} elseif ( $post->post_type == 'attachment' ) {
+			return get_attachment_link( $post, $leavename );
+	} elseif ( in_array($post->post_type, get_post_types( array('_builtin' => false) ) ) ) {
+			return get_post_permalink($post, $leavename, $sample);
+	}
 
 	$permalink = get_option('permalink_structure');
 
@@ -183,8 +186,9 @@ 
 
 				$category_object = get_term( $category_object, 'category' );
 				$category = $category_object->slug;
-				if ( $parent = $category_object->parent )
-					$category = get_category_parents($parent, false, '/', true) . $category;
+				if ( $parent = $category_object->parent ) {
+									$category = get_category_parents($parent, false, '/', true) . $category;
+				}
 			}
 			// show default category in permalinks, without
 			// having to assign it explicitly
@@ -252,8 +256,9 @@ 
 
 	$post = get_post($id);
 
-	if ( is_wp_error( $post ) )
-		return $post;
+	if ( is_wp_error( $post ) ) {
+			return $post;
+	}
 
 	$post_link = $wp_rewrite->get_extra_permastruct($post->post_type);
 
@@ -273,10 +278,11 @@ 
 		}
 		$post_link = home_url( user_trailingslashit($post_link) );
 	} else {
-		if ( $post_type->query_var && ( isset($post->post_status) && !$draft_or_pending ) )
-			$post_link = add_query_arg($post_type->query_var, $slug, '');
-		else
-			$post_link = add_query_arg(array('post_type' => $post->post_type, 'p' => $post->ID), '');
+		if ( $post_type->query_var && ( isset($post->post_status) && !$draft_or_pending ) ) {
+					$post_link = add_query_arg($post_type->query_var, $slug, '');
+		} else {
+					$post_link = add_query_arg(array('post_type' => $post->post_type, 'p' => $post->ID), '');
+		}
 		$post_link = home_url($post_link);
 	}
 
@@ -308,10 +314,11 @@ 
 function get_page_link( $post = false, $leavename = false, $sample = false ) {
 	$post = get_post( $post );
 
-	if ( 'page' == get_option( 'show_on_front' ) && $post->ID == get_option( 'page_on_front' ) )
-		$link = home_url('/');
-	else
-		$link = _get_page_link( $post, $leavename, $sample );
+	if ( 'page' == get_option( 'show_on_front' ) && $post->ID == get_option( 'page_on_front' ) ) {
+			$link = home_url('/');
+	} else {
+			$link = _get_page_link( $post, $leavename, $sample );
+	}
 
 	/**
 	 * Filter the permalink for a page.
@@ -396,27 +403,36 @@ 
 	}
 
 	if ( $wp_rewrite->using_permalinks() && $parent ) {
-		if ( 'page' == $parent->post_type )
-			$parentlink = _get_page_link( $post->post_parent ); // Ignores page_on_front
-		else
-			$parentlink = get_permalink( $post->post_parent );
+		if ( 'page' == $parent->post_type ) {
+					$parentlink = _get_page_link( $post->post_parent );
+		}
+		// Ignores page_on_front
+		else {
+					$parentlink = get_permalink( $post->post_parent );
+		}
 
-		if ( is_numeric($post->post_name) || false !== strpos(get_option('permalink_structure'), '%category%') )
-			$name = 'attachment/' . $post->post_name; // <permalink>/<int>/ is paged so we use the explicit attachment marker
-		else
-			$name = $post->post_name;
+		if ( is_numeric($post->post_name) || false !== strpos(get_option('permalink_structure'), '%category%') ) {
+					$name = 'attachment/' . $post->post_name;
+		}
+		// <permalink>/<int>/ is paged so we use the explicit attachment marker
+		else {
+					$name = $post->post_name;
+		}
 
-		if ( strpos($parentlink, '?') === false )
-			$link = user_trailingslashit( trailingslashit($parentlink) . '%postname%' );
+		if ( strpos($parentlink, '?') === false ) {
+					$link = user_trailingslashit( trailingslashit($parentlink) . '%postname%' );
+		}
 
-		if ( ! $leavename )
-			$link = str_replace( '%postname%', $name, $link );
+		if ( ! $leavename ) {
+					$link = str_replace( '%postname%', $name, $link );
+		}
 	} elseif ( $wp_rewrite->using_permalinks() && ! $leavename ) {
 		$link = home_url( user_trailingslashit( $post->post_name ) );
 	}
 
-	if ( ! $link )
-		$link = home_url( '/?attachment_id=' . $post->ID );
+	if ( ! $link ) {
+			$link = home_url( '/?attachment_id=' . $post->ID );
+	}
 
 	/**
 	 * Filter the permalink for an attachment.
@@ -441,8 +457,9 @@ 
  */
 function get_year_link($year) {
 	global $wp_rewrite;
-	if ( !$year )
-		$year = gmdate('Y', current_time('timestamp'));
+	if ( !$year ) {
+			$year = gmdate('Y', current_time('timestamp'));
+	}
 	$yearlink = $wp_rewrite->get_year_permastruct();
 	if ( !empty($yearlink) ) {
 		$yearlink = str_replace('%year%', $year, $yearlink);
@@ -475,10 +492,12 @@ 
  */
 function get_month_link($year, $month) {
 	global $wp_rewrite;
-	if ( !$year )
-		$year = gmdate('Y', current_time('timestamp'));
-	if ( !$month )
-		$month = gmdate('m', current_time('timestamp'));
+	if ( !$year ) {
+			$year = gmdate('Y', current_time('timestamp'));
+	}
+	if ( !$month ) {
+			$month = gmdate('m', current_time('timestamp'));
+	}
 	$monthlink = $wp_rewrite->get_month_permastruct();
 	if ( !empty($monthlink) ) {
 		$monthlink = str_replace('%year%', $year, $monthlink);
@@ -514,12 +533,15 @@ 
  */
 function get_day_link($year, $month, $day) {
 	global $wp_rewrite;
-	if ( !$year )
-		$year = gmdate('Y', current_time('timestamp'));
-	if ( !$month )
-		$month = gmdate('m', current_time('timestamp'));
-	if ( !$day )
-		$day = gmdate('j', current_time('timestamp'));
+	if ( !$year ) {
+			$year = gmdate('Y', current_time('timestamp'));
+	}
+	if ( !$month ) {
+			$month = gmdate('m', current_time('timestamp'));
+	}
+	if ( !$day ) {
+			$day = gmdate('j', current_time('timestamp'));
+	}
 
 	$daylink = $wp_rewrite->get_day_permastruct();
 	if ( !empty($daylink) ) {
@@ -587,18 +609,21 @@ 
 			$permalink = $wp_rewrite->get_comment_feed_permastruct();
 		}
 
-		if ( get_default_feed() == $feed )
-			$feed = '';
+		if ( get_default_feed() == $feed ) {
+					$feed = '';
+		}
 
 		$permalink = str_replace('%feed%', $feed, $permalink);
 		$permalink = preg_replace('#/+#', '/', "/$permalink");
 		$output =  home_url( user_trailingslashit($permalink, 'feed') );
 	} else {
-		if ( empty($feed) )
-			$feed = get_default_feed();
+		if ( empty($feed) ) {
+					$feed = get_default_feed();
+		}
 
-		if ( false !== strpos($feed, 'comments_') )
-			$feed = str_replace('comments_', 'comments-', $feed);
+		if ( false !== strpos($feed, 'comments_') ) {
+					$feed = str_replace('comments_', 'comments-', $feed);
+		}
 
 		$output = home_url("?feed={$feed}");
 	}
@@ -626,20 +651,23 @@ 
 function get_post_comments_feed_link($post_id = 0, $feed = '') {
 	$post_id = absint( $post_id );
 
-	if ( ! $post_id )
-		$post_id = get_the_ID();
+	if ( ! $post_id ) {
+			$post_id = get_the_ID();
+	}
 
-	if ( empty( $feed ) )
-		$feed = get_default_feed();
+	if ( empty( $feed ) ) {
+			$feed = get_default_feed();
+	}
 
 	$post = get_post( $post_id );
 	$unattached = 'attachment' === $post->post_type && 0 === (int) $post->post_parent;
 
 	if ( '' != get_option('permalink_structure') ) {
-		if ( 'page' == get_option('show_on_front') && $post_id == get_option('page_on_front') )
-			$url = _get_page_link( $post_id );
-		else
-			$url = get_permalink($post_id);
+		if ( 'page' == get_option('show_on_front') && $post_id == get_option('page_on_front') ) {
+					$url = _get_page_link( $post_id );
+		} else {
+					$url = get_permalink($post_id);
+		}
 
 		if ( $unattached ) {
 			$url =  home_url( '/feed/' );
@@ -649,8 +677,9 @@ 
 			$url = add_query_arg( 'attachment_id', $post_id, $url );
 		} else {
 			$url = trailingslashit($url) . 'feed';
-			if ( $feed != get_default_feed() )
-				$url .= "/$feed";
+			if ( $feed != get_default_feed() ) {
+							$url .= "/$feed";
+			}
 			$url = user_trailingslashit($url, 'single_feed');
 		}
 	} else {
@@ -721,17 +750,19 @@ 
 	$author_id = (int) $author_id;
 	$permalink_structure = get_option('permalink_structure');
 
-	if ( empty($feed) )
-		$feed = get_default_feed();
+	if ( empty($feed) ) {
+			$feed = get_default_feed();
+	}
 
 	if ( '' == $permalink_structure ) {
 		$link = home_url("?feed=$feed&amp;author=" . $author_id);
 	} else {
 		$link = get_author_posts_url($author_id);
-		if ( $feed == get_default_feed() )
-			$feed_link = 'feed';
-		else
-			$feed_link = "feed/$feed";
+		if ( $feed == get_default_feed() ) {
+					$feed_link = 'feed';
+		} else {
+					$feed_link = "feed/$feed";
+		}
 
 		$link = trailingslashit($link) . user_trailingslashit($feed_link, 'feed');
 	}
@@ -783,19 +814,20 @@ 
 
 	$term = get_term( $term_id, $taxonomy  );
 
-	if ( empty( $term ) || is_wp_error( $term ) )
-		return false;
+	if ( empty( $term ) || is_wp_error( $term ) ) {
+			return false;
+	}
 
-	if ( empty( $feed ) )
-		$feed = get_default_feed();
+	if ( empty( $feed ) ) {
+			$feed = get_default_feed();
+	}
 
 	$permalink_structure = get_option( 'permalink_structure' );
 
 	if ( '' == $permalink_structure ) {
 		if ( 'category' == $taxonomy ) {
 			$link = home_url("?feed=$feed&amp;cat=$term_id");
-		}
-		elseif ( 'post_tag' == $taxonomy ) {
+		} elseif ( 'post_tag' == $taxonomy ) {
 			$link = home_url("?feed=$feed&amp;tag=$term->slug");
 		} else {
 			$t = get_taxonomy( $taxonomy );
@@ -803,10 +835,11 @@ 
 		}
 	} else {
 		$link = get_term_link( $term_id, $term->taxonomy );
-		if ( $feed == get_default_feed() )
-			$feed_link = 'feed';
-		else
-			$feed_link = "feed/$feed";
+		if ( $feed == get_default_feed() ) {
+					$feed_link = 'feed';
+		} else {
+					$feed_link = "feed/$feed";
+		}
 
 		$link = trailingslashit( $link ) . user_trailingslashit( $feed_link, 'feed' );
 	}
@@ -969,18 +1002,22 @@ 
  * @return string|void HTML content.
  */
 function edit_term_link( $link = '', $before = '', $after = '', $term = null, $echo = true ) {
-	if ( is_null( $term ) )
-		$term = get_queried_object();
+	if ( is_null( $term ) ) {
+			$term = get_queried_object();
+	}
 
-	if ( ! $term )
-		return;
+	if ( ! $term ) {
+			return;
+	}
 
 	$tax = get_taxonomy( $term->taxonomy );
-	if ( ! current_user_can( $tax->cap->edit_terms ) )
-		return;
+	if ( ! current_user_can( $tax->cap->edit_terms ) ) {
+			return;
+	}
 
-	if ( empty( $link ) )
-		$link = __('Edit This');
+	if ( empty( $link ) ) {
+			$link = __('Edit This');
+	}
 
 	$link = '<a href="' . get_edit_term_link( $term->term_id, $term->taxonomy ) . '">' . $link . '</a>';
 
@@ -994,11 +1031,12 @@ 
 	 */
 	$link = $before . apply_filters( 'edit_term_link', $link, $term->term_id ) . $after;
 
-	if ( $echo )
-		echo $link;
-	else
-		return $link;
-}
+	if ( $echo ) {
+			echo $link;
+	} else {
+			return $link;
+	}
+	}
 
 /**
  * Retrieve permalink for search.
@@ -1013,10 +1051,11 @@ 
 function get_search_link( $query = '' ) {
 	global $wp_rewrite;
 
-	if ( empty($query) )
-		$search = get_search_query( false );
-	else
-		$search = stripslashes($query);
+	if ( empty($query) ) {
+			$search = get_search_query( false );
+	} else {
+			$search = stripslashes($query);
+	}
 
 	$permastruct = $wp_rewrite->get_search_permastruct();
 
@@ -1055,8 +1094,9 @@ 
 	global $wp_rewrite;
 	$link = get_search_link($search_query);
 
-	if ( empty($feed) )
-		$feed = get_default_feed();
+	if ( empty($feed) ) {
+			$feed = get_default_feed();
+	}
 
 	$permastruct = $wp_rewrite->get_search_permastruct();
 
@@ -1093,17 +1133,19 @@ 
 function get_search_comments_feed_link($search_query = '', $feed = '') {
 	global $wp_rewrite;
 
-	if ( empty($feed) )
-		$feed = get_default_feed();
+	if ( empty($feed) ) {
+			$feed = get_default_feed();
+	}
 
 	$link = get_search_feed_link($search_query, $feed);
 
 	$permastruct = $wp_rewrite->get_search_permastruct();
 
-	if ( empty($permastruct) )
-		$link = add_query_arg('feed', 'comments-' . $feed, $link);
-	else
-		$link = add_query_arg('withcomments', 1, $link);
+	if ( empty($permastruct) ) {
+			$link = add_query_arg('feed', 'comments-' . $feed, $link);
+	} else {
+			$link = add_query_arg('withcomments', 1, $link);
+	}
 
 	/** This filter is documented in wp-includes/link-template.php */
 	return apply_filters( 'search_feed_link', $link, $feed, 'comments' );
@@ -1122,8 +1164,9 @@ 
  */
 function get_post_type_archive_link( $post_type ) {
 	global $wp_rewrite;
-	if ( ! $post_type_obj = get_post_type_object( $post_type ) )
-		return false;
+	if ( ! $post_type_obj = get_post_type_object( $post_type ) ) {
+			return false;
+	}
 
 	if ( 'post' === $post_type ) {
 		$show_on_front = get_option( 'show_on_front' );
@@ -1138,15 +1181,17 @@ 
 		return apply_filters( 'post_type_archive_link', $link, $post_type );
 	}
 
-	if ( ! $post_type_obj->has_archive )
-		return false;
+	if ( ! $post_type_obj->has_archive ) {
+			return false;
+	}
 
 	if ( get_option( 'permalink_structure' ) && is_array( $post_type_obj->rewrite ) ) {
 		$struct = ( true === $post_type_obj->has_archive ) ? $post_type_obj->rewrite['slug'] : $post_type_obj->has_archive;
-		if ( $post_type_obj->rewrite['with_front'] )
-			$struct = $wp_rewrite->front . $struct;
-		else
-			$struct = $wp_rewrite->root . $struct;
+		if ( $post_type_obj->rewrite['with_front'] ) {
+					$struct = $wp_rewrite->front . $struct;
+		} else {
+					$struct = $wp_rewrite->root . $struct;
+		}
 		$link = home_url( user_trailingslashit( $struct, 'post_type_archive' ) );
 	} else {
 		$link = home_url( '?post_type=' . $post_type );
@@ -1174,18 +1219,21 @@ 
  */
 function get_post_type_archive_feed_link( $post_type, $feed = '' ) {
 	$default_feed = get_default_feed();
-	if ( empty( $feed ) )
-		$feed = $default_feed;
+	if ( empty( $feed ) ) {
+			$feed = $default_feed;
+	}
 
-	if ( ! $link = get_post_type_archive_link( $post_type ) )
-		return false;
+	if ( ! $link = get_post_type_archive_link( $post_type ) ) {
+			return false;
+	}
 
 	$post_type_obj = get_post_type_object( $post_type );
 	if ( get_option( 'permalink_structure' ) && is_array( $post_type_obj->rewrite ) && $post_type_obj->rewrite['feeds'] ) {
 		$link = trailingslashit( $link );
 		$link .= 'feed/';
-		if ( $feed != $default_feed )
-			$link .= "$feed/";
+		if ( $feed != $default_feed ) {
+					$link .= "$feed/";
+		}
 	} else {
 		$link = add_query_arg( 'feed', $feed, $link );
 	}
@@ -1255,22 +1303,26 @@ 
  *                     not allow an editing UI.
  */
 function get_edit_post_link( $id = 0, $context = 'display' ) {
-	if ( ! $post = get_post( $id ) )
-		return;
+	if ( ! $post = get_post( $id ) ) {
+			return;
+	}
 
-	if ( 'revision' === $post->post_type )
-		$action = '';
-	elseif ( 'display' == $context )
-		$action = '&amp;action=edit';
-	else
-		$action = '&action=edit';
+	if ( 'revision' === $post->post_type ) {
+			$action = '';
+	} elseif ( 'display' == $context ) {
+			$action = '&amp;action=edit';
+	} else {
+			$action = '&action=edit';
+	}
 
 	$post_type_object = get_post_type_object( $post->post_type );
-	if ( !$post_type_object )
-		return;
+	if ( !$post_type_object ) {
+			return;
+	}
 
-	if ( !current_user_can( 'edit_post', $post->ID ) )
-		return;
+	if ( !current_user_can( 'edit_post', $post->ID ) ) {
+			return;
+	}
 
 	if ( $post_type_object->_edit_link ) {
 		$link = admin_url( sprintf( $post_type_object->_edit_link . $action, $post->ID ) );
@@ -1343,18 +1395,22 @@ 
  * @return string|void The delete post link URL for the given post.
  */
 function get_delete_post_link( $id = 0, $deprecated = '', $force_delete = false ) {
-	if ( ! empty( $deprecated ) )
-		_deprecated_argument( __FUNCTION__, '3.0' );
+	if ( ! empty( $deprecated ) ) {
+			_deprecated_argument( __FUNCTION__, '3.0' );
+	}
 
-	if ( !$post = get_post( $id ) )
-		return;
+	if ( !$post = get_post( $id ) ) {
+			return;
+	}
 
 	$post_type_object = get_post_type_object( $post->post_type );
-	if ( !$post_type_object )
-		return;
+	if ( !$post_type_object ) {
+			return;
+	}
 
-	if ( !current_user_can( 'delete_post', $post->ID ) )
-		return;
+	if ( !current_user_can( 'delete_post', $post->ID ) ) {
+			return;
+	}
 
 	$action = ( $force_delete || !EMPTY_TRASH_DAYS ) ? 'delete' : 'trash';
 
@@ -1383,8 +1439,9 @@ 
 function get_edit_comment_link( $comment_id = 0 ) {
 	$comment = get_comment( $comment_id );
 
-	if ( !current_user_can( 'edit_comment', $comment->comment_ID ) )
-		return;
+	if ( !current_user_can( 'edit_comment', $comment->comment_ID ) ) {
+			return;
+	}
 
 	$location = admin_url('comment.php?action=editcomment&amp;c=') . $comment->comment_ID;
 
@@ -1443,8 +1500,9 @@ 
 function get_edit_bookmark_link( $link = 0 ) {
 	$link = get_bookmark( $link );
 
-	if ( !current_user_can('manage_links') )
-		return;
+	if ( !current_user_can('manage_links') ) {
+			return;
+	}
 
 	$location = admin_url('link.php?action=edit&amp;link_id=') . $link->link_id;
 
@@ -1472,11 +1530,13 @@ 
 function edit_bookmark_link( $link = '', $before = '', $after = '', $bookmark = null ) {
 	$bookmark = get_bookmark($bookmark);
 
-	if ( !current_user_can('manage_links') )
-		return;
+	if ( !current_user_can('manage_links') ) {
+			return;
+	}
 
-	if ( empty($link) )
-		$link = __('Edit This');
+	if ( empty($link) ) {
+			$link = __('Edit This');
+	}
 
 	$link = '<a href="' . esc_url( get_edit_bookmark_link( $bookmark ) ) . '">' . $link . '</a>';
 
@@ -1500,21 +1560,25 @@ 
  * @return string URL to edit user page or empty string.
  */
 function get_edit_user_link( $user_id = null ) {
-	if ( ! $user_id )
-		$user_id = get_current_user_id();
+	if ( ! $user_id ) {
+			$user_id = get_current_user_id();
+	}
 
-	if ( empty( $user_id ) || ! current_user_can( 'edit_user', $user_id ) )
-		return '';
+	if ( empty( $user_id ) || ! current_user_can( 'edit_user', $user_id ) ) {
+			return '';
+	}
 
 	$user = get_userdata( $user_id );
 
-	if ( ! $user )
-		return '';
+	if ( ! $user ) {
+			return '';
+	}
 
-	if ( get_current_user_id() == $user->ID )
-		$link = get_edit_profile_url( $user->ID );
-	else
-		$link = add_query_arg( 'user_id', $user->ID, self_admin_url( 'user-edit.php' ) );
+	if ( get_current_user_id() == $user->ID ) {
+			$link = get_edit_profile_url( $user->ID );
+	} else {
+			$link = add_query_arg( 'user_id', $user->ID, self_admin_url( 'user-edit.php' ) );
+	}
 
 	/**
 	 * Filter the user edit link.
@@ -1575,8 +1639,9 @@ 
 function get_adjacent_post( $in_same_term = false, $excluded_terms = '', $previous = true, $taxonomy = 'category' ) {
 	global $wpdb;
 
-	if ( ( ! $post = get_post() ) || ! taxonomy_exists( $taxonomy ) )
-		return null;
+	if ( ( ! $post = get_post() ) || ! taxonomy_exists( $taxonomy ) ) {
+			return null;
+	}
 
 	$current_post_date = $post->post_date;
 
@@ -1601,16 +1666,18 @@ 
 			$join .= " INNER JOIN $wpdb->term_relationships AS tr ON p.ID = tr.object_id INNER JOIN $wpdb->term_taxonomy tt ON tr.term_taxonomy_id = tt.term_taxonomy_id";
 			$where .= $wpdb->prepare( "AND tt.taxonomy = %s", $taxonomy );
 
-			if ( ! is_object_in_taxonomy( $post->post_type, $taxonomy ) )
-				return '';
+			if ( ! is_object_in_taxonomy( $post->post_type, $taxonomy ) ) {
+							return '';
+			}
 			$term_array = wp_get_object_terms( $post->ID, $taxonomy, array( 'fields' => 'ids' ) );
 
 			// Remove any exclusions from the term array to include.
 			$term_array = array_diff( $term_array, (array) $excluded_terms );
 			$term_array = array_map( 'intval', $term_array );
 
-			if ( ! $term_array || is_wp_error( $term_array ) )
-				return '';
+			if ( ! $term_array || is_wp_error( $term_array ) ) {
+							return '';
+			}
 
 			$where .= " AND tt.term_id IN (" . implode( ',', $term_array ) . ")";
 		}
@@ -1717,19 +1784,22 @@ 
 	$query_key = 'adjacent_post_' . md5( $query );
 	$result = wp_cache_get( $query_key, 'counts' );
 	if ( false !== $result ) {
-		if ( $result )
-			$result = get_post( $result );
+		if ( $result ) {
+					$result = get_post( $result );
+		}
 		return $result;
 	}
 
 	$result = $wpdb->get_var( $query );
-	if ( null === $result )
-		$result = '';
+	if ( null === $result ) {
+			$result = '';
+	}
 
 	wp_cache_set( $query_key, $result, 'counts' );
 
-	if ( $result )
-		$result = get_post( $result );
+	if ( $result ) {
+			$result = get_post( $result );
+	}
 
 	return $result;
 }
@@ -1749,18 +1819,21 @@ 
  * @return string|void The adjacent post relational link URL.
  */
 function get_adjacent_post_rel_link( $title = '%title', $in_same_term = false, $excluded_terms = '', $previous = true, $taxonomy = 'category' ) {
-	if ( $previous && is_attachment() && $post = get_post() )
-		$post = get_post( $post->post_parent );
-	else
-		$post = get_adjacent_post( $in_same_term, $excluded_terms, $previous, $taxonomy );
+	if ( $previous && is_attachment() && $post = get_post() ) {
+			$post = get_post( $post->post_parent );
+	} else {
+			$post = get_adjacent_post( $in_same_term, $excluded_terms, $previous, $taxonomy );
+	}
 
-	if ( empty( $post ) )
-		return;
+	if ( empty( $post ) ) {
+			return;
+	}
 
 	$post_title = the_title_attribute( array( 'echo' => false, 'post' => $post ) );
 
-	if ( empty( $post_title ) )
-		$post_title = $previous ? __( 'Previous Post' ) : __( 'Next Post' );
+	if ( empty( $post_title ) ) {
+			$post_title = $previous ? __( 'Previous Post' ) : __( 'Next Post' );
+	}
 
 	$date = mysql2date( get_option( 'date_format' ), $post->post_date );
 
@@ -1859,8 +1932,9 @@ 
  */
 function get_boundary_post( $in_same_term = false, $excluded_terms = '', $start = true, $taxonomy = 'category' ) {
 	$post = get_post();
-	if ( ! $post || ! is_single() || is_attachment() || ! taxonomy_exists( $taxonomy ) )
-		return null;
+	if ( ! $post || ! is_single() || is_attachment() || ! taxonomy_exists( $taxonomy ) ) {
+			return null;
+	}
 
 	$query_args = array(
 		'posts_per_page' => 1,
@@ -1872,23 +1946,26 @@ 
 	$term_array = array();
 
 	if ( ! is_array( $excluded_terms ) ) {
-		if ( ! empty( $excluded_terms ) )
-			$excluded_terms = explode( ',', $excluded_terms );
-		else
-			$excluded_terms = array();
+		if ( ! empty( $excluded_terms ) ) {
+					$excluded_terms = explode( ',', $excluded_terms );
+		} else {
+					$excluded_terms = array();
+		}
 	}
 
 	if ( $in_same_term || ! empty( $excluded_terms ) ) {
-		if ( $in_same_term )
-			$term_array = wp_get_object_terms( $post->ID, $taxonomy, array( 'fields' => 'ids' ) );
+		if ( $in_same_term ) {
+					$term_array = wp_get_object_terms( $post->ID, $taxonomy, array( 'fields' => 'ids' ) );
+		}
 
 		if ( ! empty( $excluded_terms ) ) {
 			$excluded_terms = array_map( 'intval', $excluded_terms );
 			$excluded_terms = array_diff( $excluded_terms, $term_array );
 
 			$inverse_terms = array();
-			foreach ( $excluded_terms as $excluded_term )
-				$inverse_terms[] = $excluded_term * -1;
+			foreach ( $excluded_terms as $excluded_term ) {
+							$inverse_terms[] = $excluded_term * -1;
+			}
 			$excluded_terms = $inverse_terms;
 		}
 
@@ -1981,18 +2058,20 @@ 
  * @return string The link URL of the previous or next post in relation to the current post.
  */
 function get_adjacent_post_link( $format, $link, $in_same_term = false, $excluded_terms = '', $previous = true, $taxonomy = 'category' ) {
-	if ( $previous && is_attachment() )
-		$post = get_post( get_post()->post_parent );
-	else
-		$post = get_adjacent_post( $in_same_term, $excluded_terms, $previous, $taxonomy );
+	if ( $previous && is_attachment() ) {
+			$post = get_post( get_post()->post_parent );
+	} else {
+			$post = get_adjacent_post( $in_same_term, $excluded_terms, $previous, $taxonomy );
+	}
 
 	if ( ! $post ) {
 		$output = '';
 	} else {
 		$title = $post->post_title;
 
-		if ( empty( $post->post_title ) )
-			$title = $previous ? __( 'Previous Post' ) : __( 'Next Post' );
+		if ( empty( $post->post_title ) ) {
+					$title = $previous ? __( 'Previous Post' ) : __( 'Next Post' );
+		}
 
 		/** This filter is documented in wp-includes/post-template.php */
 		$title = apply_filters( 'the_title', $title, $post->ID );
@@ -2097,8 +2176,9 @@ 
 
 		$base = trailingslashit( get_bloginfo( 'url' ) );
 
-		if ( $wp_rewrite->using_index_permalinks() && ( $pagenum > 1 || '' != $request ) )
-			$base .= $wp_rewrite->index . '/';
+		if ( $wp_rewrite->using_index_permalinks() && ( $pagenum > 1 || '' != $request ) ) {
+					$base .= $wp_rewrite->index . '/';
+		}
 
 		if ( $pagenum > 1 ) {
 			$request = ( ( !empty( $request ) ) ? trailingslashit( $request ) : $request ) . user_trailingslashit( $wp_rewrite->pagination_base . "/" . $pagenum, 'paged' );
@@ -2116,11 +2196,12 @@ 
 	 */
 	$result = apply_filters( 'get_pagenum_link', $result );
 
-	if ( $escape )
-		return esc_url( $result );
-	else
-		return esc_url_raw( $result );
-}
+	if ( $escape ) {
+			return esc_url( $result );
+	} else {
+			return esc_url_raw( $result );
+	}
+	}
 
 /**
  * Retrieve next posts page link.
@@ -2138,11 +2219,13 @@ 
 	global $paged;
 
 	if ( !is_single() ) {
-		if ( !$paged )
-			$paged = 1;
+		if ( !$paged ) {
+					$paged = 1;
+		}
 		$nextpage = intval($paged) + 1;
-		if ( !$max_page || $max_page >= $nextpage )
-			return get_pagenum_link($nextpage);
+		if ( !$max_page || $max_page >= $nextpage ) {
+					return get_pagenum_link($nextpage);
+		}
 	}
 }
 
@@ -2158,11 +2241,12 @@ 
 function next_posts( $max_page = 0, $echo = true ) {
 	$output = esc_url( get_next_posts_page_link( $max_page ) );
 
-	if ( $echo )
-		echo $output;
-	else
-		return $output;
-}
+	if ( $echo ) {
+			echo $output;
+	} else {
+			return $output;
+	}
+	}
 
 /**
  * Return the next posts page link.
@@ -2179,16 +2263,19 @@ 
 function get_next_posts_link( $label = null, $max_page = 0 ) {
 	global $paged, $wp_query;
 
-	if ( !$max_page )
-		$max_page = $wp_query->max_num_pages;
+	if ( !$max_page ) {
+			$max_page = $wp_query->max_num_pages;
+	}
 
-	if ( !$paged )
-		$paged = 1;
+	if ( !$paged ) {
+			$paged = 1;
+	}
 
 	$nextpage = intval($paged) + 1;
 
-	if ( null === $label )
-		$label = __( 'Next Page &raquo;' );
+	if ( null === $label ) {
+			$label = __( 'Next Page &raquo;' );
+	}
 
 	if ( !is_single() && ( $nextpage <= $max_page ) ) {
 		/**
@@ -2234,8 +2321,9 @@ 
 
 	if ( !is_single() ) {
 		$nextpage = intval($paged) - 1;
-		if ( $nextpage < 1 )
-			$nextpage = 1;
+		if ( $nextpage < 1 ) {
+					$nextpage = 1;
+		}
 		return get_pagenum_link($nextpage);
 	}
 }
@@ -2251,11 +2339,12 @@ 
 function previous_posts( $echo = true ) {
 	$output = esc_url( get_previous_posts_page_link() );
 
-	if ( $echo )
-		echo $output;
-	else
-		return $output;
-}
+	if ( $echo ) {
+			echo $output;
+	} else {
+			return $output;
+	}
+	}
 
 /**
  * Return the previous posts page link.
@@ -2270,8 +2359,9 @@ 
 function get_previous_posts_link( $label = null ) {
 	global $paged;
 
-	if ( null === $label )
-		$label = __( '&laquo; Previous Page' );
+	if ( null === $label ) {
+			$label = __( '&laquo; Previous Page' );
+	}
 
 	if ( !is_single() && $paged > 1 ) {
 		/**
@@ -2597,16 +2687,18 @@ 
 
 	if ( 'newest' == get_option('default_comments_page') ) {
 		if ( $pagenum != $max_page ) {
-			if ( $wp_rewrite->using_permalinks() )
-				$result = user_trailingslashit( trailingslashit($result) . $wp_rewrite->comments_pagination_base . '-' . $pagenum, 'commentpaged');
-			else
-				$result = add_query_arg( 'cpage', $pagenum, $result );
+			if ( $wp_rewrite->using_permalinks() ) {
+							$result = user_trailingslashit( trailingslashit($result) . $wp_rewrite->comments_pagination_base . '-' . $pagenum, 'commentpaged');
+			} else {
+							$result = add_query_arg( 'cpage', $pagenum, $result );
+			}
 		}
 	} elseif ( $pagenum > 1 ) {
-		if ( $wp_rewrite->using_permalinks() )
-			$result = user_trailingslashit( trailingslashit($result) . $wp_rewrite->comments_pagination_base . '-' . $pagenum, 'commentpaged');
-		else
-			$result = add_query_arg( 'cpage', $pagenum, $result );
+		if ( $wp_rewrite->using_permalinks() ) {
+					$result = user_trailingslashit( trailingslashit($result) . $wp_rewrite->comments_pagination_base . '-' . $pagenum, 'commentpaged');
+		} else {
+					$result = add_query_arg( 'cpage', $pagenum, $result );
+		}
 	}
 
 	$result .= '#comments';
@@ -2635,8 +2727,9 @@ 
 function get_next_comments_link( $label = '', $max_page = 0 ) {
 	global $wp_query;
 
-	if ( ! is_singular() )
-		return;
+	if ( ! is_singular() ) {
+			return;
+	}
 
 	$page = get_query_var('cpage');
 
@@ -2646,17 +2739,21 @@ 
 
 	$nextpage = intval($page) + 1;
 
-	if ( empty($max_page) )
-		$max_page = $wp_query->max_num_comment_pages;
+	if ( empty($max_page) ) {
+			$max_page = $wp_query->max_num_comment_pages;
+	}
 
-	if ( empty($max_page) )
-		$max_page = get_comment_pages_count();
+	if ( empty($max_page) ) {
+			$max_page = get_comment_pages_count();
+	}
 
-	if ( $nextpage > $max_page )
-		return;
+	if ( $nextpage > $max_page ) {
+			return;
+	}
 
-	if ( empty($label) )
-		$label = __('Newer Comments &raquo;');
+	if ( empty($label) ) {
+			$label = __('Newer Comments &raquo;');
+	}
 
 	/**
 	 * Filter the anchor tag attributes for the next comments page link.
@@ -2689,18 +2786,21 @@ 
  * @return string|void HTML-formatted link for the previous page of comments.
  */
 function get_previous_comments_link( $label = '' ) {
-	if ( ! is_singular() )
-		return;
+	if ( ! is_singular() ) {
+			return;
+	}
 
 	$page = get_query_var('cpage');
 
-	if ( intval($page) <= 1 )
-		return;
+	if ( intval($page) <= 1 ) {
+			return;
+	}
 
 	$prevpage = intval($page) - 1;
 
-	if ( empty($label) )
-		$label = __('&laquo; Older Comments');
+	if ( empty($label) ) {
+			$label = __('&laquo; Older Comments');
+	}
 
 	/**
 	 * Filter the anchor tag attributes for the previous comments page link.
@@ -2737,12 +2837,14 @@ 
 function paginate_comments_links($args = array()) {
 	global $wp_rewrite;
 
-	if ( ! is_singular() )
-		return;
+	if ( ! is_singular() ) {
+			return;
+	}
 
 	$page = get_query_var('cpage');
-	if ( !$page )
-		$page = 1;
+	if ( !$page ) {
+			$page = 1;
+	}
 	$max_page = get_comment_pages_count();
 	$defaults = array(
 		'base' => add_query_arg( 'cpage', '%#%' ),
@@ -2752,17 +2854,19 @@ 
 		'echo' => true,
 		'add_fragment' => '#comments'
 	);
-	if ( $wp_rewrite->using_permalinks() )
-		$defaults['base'] = user_trailingslashit(trailingslashit(get_permalink()) . $wp_rewrite->comments_pagination_base . '-%#%', 'commentpaged');
+	if ( $wp_rewrite->using_permalinks() ) {
+			$defaults['base'] = user_trailingslashit(trailingslashit(get_permalink()) . $wp_rewrite->comments_pagination_base . '-%#%', 'commentpaged');
+	}
 
 	$args = wp_parse_args( $args, $defaults );
 	$page_links = paginate_links( $args );
 
-	if ( $args['echo'] )
-		echo $page_links;
-	else
-		return $page_links;
-}
+	if ( $args['echo'] ) {
+			echo $page_links;
+	} else {
+			return $page_links;
+	}
+	}
 
 /**
  * Returns navigation to next/previous set of comments when applicable.
@@ -2975,16 +3079,18 @@ 
 	}
 
 	if ( ! in_array( $scheme, array( 'http', 'https', 'relative' ) ) ) {
-		if ( is_ssl() && ! is_admin() && 'wp-login.php' !== $pagenow )
-			$scheme = 'https';
-		else
-			$scheme = parse_url( $url, PHP_URL_SCHEME );
+		if ( is_ssl() && ! is_admin() && 'wp-login.php' !== $pagenow ) {
+					$scheme = 'https';
+		} else {
+					$scheme = parse_url( $url, PHP_URL_SCHEME );
+		}
 	}
 
 	$url = set_url_scheme( $url, $scheme );
 
-	if ( $path && is_string( $path ) )
-		$url .= '/' . ltrim( $path, '/' );
+	if ( $path && is_string( $path ) ) {
+			$url .= '/' . ltrim( $path, '/' );
+	}
 
 	/**
 	 * Filter the home URL.
@@ -3046,8 +3152,9 @@ 
 
 	$url = set_url_scheme( $url, $scheme );
 
-	if ( $path && is_string( $path ) )
-		$url .= '/' . ltrim( $path, '/' );
+	if ( $path && is_string( $path ) ) {
+			$url .= '/' . ltrim( $path, '/' );
+	}
 
 	/**
 	 * Filter the site URL.
@@ -3091,8 +3198,9 @@ 
 function get_admin_url( $blog_id = null, $path = '', $scheme = 'admin' ) {
 	$url = get_site_url($blog_id, 'wp-admin/', $scheme);
 
-	if ( $path && is_string( $path ) )
-		$url .= ltrim( $path, '/' );
+	if ( $path && is_string( $path ) ) {
+			$url .= ltrim( $path, '/' );
+	}
 
 	/**
 	 * Filter the admin area URL.
@@ -3118,8 +3226,9 @@ 
 function includes_url( $path = '', $scheme = null ) {
 	$url = site_url( '/' . WPINC . '/', $scheme );
 
-	if ( $path && is_string( $path ) )
-		$url .= ltrim($path, '/');
+	if ( $path && is_string( $path ) ) {
+			$url .= ltrim($path, '/');
+	}
 
 	/**
 	 * Filter the URL to the includes directory.
@@ -3144,8 +3253,9 @@ 
 function content_url($path = '') {
 	$url = set_url_scheme( WP_CONTENT_URL );
 
-	if ( $path && is_string( $path ) )
-		$url .= '/' . ltrim($path, '/');
+	if ( $path && is_string( $path ) ) {
+			$url .= '/' . ltrim($path, '/');
+	}
 
 	/**
 	 * Filter the URL to the content directory.
@@ -3179,22 +3289,25 @@ 
 	$plugin = wp_normalize_path( $plugin );
 	$mu_plugin_dir = wp_normalize_path( WPMU_PLUGIN_DIR );
 
-	if ( !empty($plugin) && 0 === strpos($plugin, $mu_plugin_dir) )
-		$url = WPMU_PLUGIN_URL;
-	else
-		$url = WP_PLUGIN_URL;
+	if ( !empty($plugin) && 0 === strpos($plugin, $mu_plugin_dir) ) {
+			$url = WPMU_PLUGIN_URL;
+	} else {
+			$url = WP_PLUGIN_URL;
+	}
 
 
 	$url = set_url_scheme( $url );
 
 	if ( !empty($plugin) && is_string($plugin) ) {
 		$folder = dirname(plugin_basename($plugin));
-		if ( '.' != $folder )
-			$url .= '/' . ltrim($folder, '/');
+		if ( '.' != $folder ) {
+					$url .= '/' . ltrim($folder, '/');
+		}
 	}
 
-	if ( $path && is_string( $path ) )
-		$url .= '/' . ltrim($path, '/');
+	if ( $path && is_string( $path ) ) {
+			$url .= '/' . ltrim($path, '/');
+	}
 
 	/**
 	 * Filter the URL to the plugins directory.
@@ -3224,18 +3337,21 @@ 
  * @return string Site url link with optional path appended.
  */
 function network_site_url( $path = '', $scheme = null ) {
-	if ( ! is_multisite() )
-		return site_url($path, $scheme);
+	if ( ! is_multisite() ) {
+			return site_url($path, $scheme);
+	}
 
 	$current_site = get_current_site();
 
-	if ( 'relative' == $scheme )
-		$url = $current_site->path;
-	else
-		$url = set_url_scheme( 'http://' . $current_site->domain . $current_site->path, $scheme );
+	if ( 'relative' == $scheme ) {
+			$url = $current_site->path;
+	} else {
+			$url = set_url_scheme( 'http://' . $current_site->domain . $current_site->path, $scheme );
+	}
 
-	if ( $path && is_string( $path ) )
-		$url .= ltrim( $path, '/' );
+	if ( $path && is_string( $path ) ) {
+			$url .= ltrim( $path, '/' );
+	}
 
 	/**
 	 * Filter the network site URL.
@@ -3266,22 +3382,26 @@ 
  * @return string Home url link with optional path appended.
  */
 function network_home_url( $path = '', $scheme = null ) {
-	if ( ! is_multisite() )
-		return home_url($path, $scheme);
+	if ( ! is_multisite() ) {
+			return home_url($path, $scheme);
+	}
 
 	$current_site = get_current_site();
 	$orig_scheme = $scheme;
 
-	if ( ! in_array( $scheme, array( 'http', 'https', 'relative' ) ) )
-		$scheme = is_ssl() && ! is_admin() ? 'https' : 'http';
+	if ( ! in_array( $scheme, array( 'http', 'https', 'relative' ) ) ) {
+			$scheme = is_ssl() && ! is_admin() ? 'https' : 'http';
+	}
 
-	if ( 'relative' == $scheme )
-		$url = $current_site->path;
-	else
-		$url = set_url_scheme( 'http://' . $current_site->domain . $current_site->path, $scheme );
+	if ( 'relative' == $scheme ) {
+			$url = $current_site->path;
+	} else {
+			$url = set_url_scheme( 'http://' . $current_site->domain . $current_site->path, $scheme );
+	}
 
-	if ( $path && is_string( $path ) )
-		$url .= ltrim( $path, '/' );
+	if ( $path && is_string( $path ) ) {
+			$url .= ltrim( $path, '/' );
+	}
 
 	/**
 	 * Filter the network home URL.
@@ -3307,13 +3427,15 @@ 
  * @return string Admin url link with optional path appended.
  */
 function network_admin_url( $path = '', $scheme = 'admin' ) {
-	if ( ! is_multisite() )
-		return admin_url( $path, $scheme );
+	if ( ! is_multisite() ) {
+			return admin_url( $path, $scheme );
+	}
 
 	$url = network_site_url('wp-admin/network/', $scheme);
 
-	if ( $path && is_string( $path ) )
-		$url .= ltrim($path, '/');
+	if ( $path && is_string( $path ) ) {
+			$url .= ltrim($path, '/');
+	}
 
 	/**
 	 * Filter the network admin URL.
@@ -3339,8 +3461,9 @@ 
 function user_admin_url( $path = '', $scheme = 'admin' ) {
 	$url = network_site_url('wp-admin/user/', $scheme);
 
-	if ( $path && is_string( $path ) )
-		$url .= ltrim($path, '/');
+	if ( $path && is_string( $path ) ) {
+			$url .= ltrim($path, '/');
+	}
 
 	/**
 	 * Filter the user admin URL for the current user.
@@ -3364,13 +3487,14 @@ 
  * @return string Admin url link with optional path appended.
  */
 function self_admin_url($path = '', $scheme = 'admin') {
-	if ( is_network_admin() )
-		return network_admin_url($path, $scheme);
-	elseif ( is_user_admin() )
-		return user_admin_url($path, $scheme);
-	else
-		return admin_url($path, $scheme);
-}
+	if ( is_network_admin() ) {
+			return network_admin_url($path, $scheme);
+	} elseif ( is_user_admin() ) {
+			return user_admin_url($path, $scheme);
+	} else {
+			return admin_url($path, $scheme);
+	}
+	}
 
 /**
  * Sets the scheme for a URL.
@@ -3395,13 +3519,15 @@ 
 	}
 
 	$url = trim( $url );
-	if ( substr( $url, 0, 2 ) === '//' )
-		$url = 'http:' . $url;
+	if ( substr( $url, 0, 2 ) === '//' ) {
+			$url = 'http:' . $url;
+	}
 
 	if ( 'relative' == $scheme ) {
 		$url = ltrim( preg_replace( '#^\w+://[^/]*#', '', $url ) );
-		if ( $url !== '' && $url[0] === '/' )
-			$url = '/' . ltrim($url , "/ \t\n\r\0\x0B" );
+		if ( $url !== '' && $url[0] === '/' ) {
+					$url = '/' . ltrim($url , "/ \t\n\r\0\x0B" );
+		}
 	} else {
 		$url = preg_replace( '#^\w+://#', $scheme . '://', $url );
 	}
@@ -3447,10 +3573,11 @@ 
 			$url = admin_url( $path, $scheme );
 		} else {
 			$active = get_active_blog_for_user( $user_id );
-			if ( $active )
-				$url = get_admin_url( $active->blog_id, $path, $scheme );
-			else
-				$url = user_admin_url( $path, $scheme );
+			if ( $active ) {
+							$url = get_admin_url( $active->blog_id, $path, $scheme );
+			} else {
+							$url = user_admin_url( $path, $scheme );
+			}
 		}
 	}
 
@@ -3481,12 +3608,13 @@ 
 function get_edit_profile_url( $user_id = 0, $scheme = 'admin' ) {
 	$user_id = $user_id ? (int) $user_id : get_current_user_id();
 
-	if ( is_user_admin() )
-		$url = user_admin_url( 'profile.php', $scheme );
-	elseif ( is_network_admin() )
-		$url = network_admin_url( 'profile.php', $scheme );
-	else
-		$url = get_dashboard_url( $user_id, 'profile.php', $scheme );
+	if ( is_user_admin() ) {
+			$url = user_admin_url( 'profile.php', $scheme );
+	} elseif ( is_network_admin() ) {
+			$url = network_admin_url( 'profile.php', $scheme );
+	} else {
+			$url = get_dashboard_url( $user_id, 'profile.php', $scheme );
+	}
 
 	/**
 	 * Filter the URL for a user's profile editor.
@@ -3577,8 +3705,9 @@ 
 		$post = get_post( $post_id );
 	} elseif ( 'post' == $context ) {
 		$post = get_post( $id );
-		if ( ! empty( $post->ID ) )
-			$post_id = $post->ID;
+		if ( ! empty( $post->ID ) ) {
+					$post_id = $post->ID;
+		}
 	}
 
 	$shortlink = '';
@@ -3617,8 +3746,9 @@ 
 function wp_shortlink_wp_head() {
 	$shortlink = wp_get_shortlink( 0, 'query' );
 
-	if ( empty( $shortlink ) )
-		return;
+	if ( empty( $shortlink ) ) {
+			return;
+	}
 
 	echo "<link rel='shortlink' href='" . esc_url( $shortlink ) . "' />\n";
 }
@@ -3631,13 +3761,15 @@ 
  * @since 3.0.0
  */
 function wp_shortlink_header() {
-	if ( headers_sent() )
-		return;
+	if ( headers_sent() ) {
+			return;
+	}
 
 	$shortlink = wp_get_shortlink(0, 'query');
 
-	if ( empty($shortlink) )
-		return;
+	if ( empty($shortlink) ) {
+			return;
+	}
 
 	header('Link: <' . $shortlink . '>; rel=shortlink', false);
 }
@@ -3659,11 +3791,13 @@ 
 function the_shortlink( $text = '', $title = '', $before = '', $after = '' ) {
 	$post = get_post();
 
-	if ( empty( $text ) )
-		$text = __('This is the short link.');
+	if ( empty( $text ) ) {
+			$text = __('This is the short link.');
+	}
 
-	if ( empty( $title ) )
-		$title = the_title_attribute( array( 'echo' => false ) );
+	if ( empty( $title ) ) {
+			$title = the_title_attribute( array( 'echo' => false ) );
+	}
 
 	$shortlink = wp_get_shortlink( $post->ID );
 

src/wp-includes/media.php

Doc Comments +8 added lines, -8 removed lines

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

Indentation +30 added lines, -30 removed lines

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

Spacing +895 added lines, -895 removed lines

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

Braces +153 added lines, -108 removed lines

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

src/wp-includes/ms-functions.php

Doc Comments +2 added lines, -2 removed lines

@@ -1861,7 +1861,7 @@ 
  * @since MU
  *
  * @param array|string $deprecated Not used.
- * @return array The current site's domain
+ * @return string[] The current site's domain
  */
 function redirect_this_site( $deprecated = '' ) {
 	return array( get_current_site()->domain );
@@ -2139,7 +2139,7 @@ 
  *
  * @staticvar bool $forced_content
  *
- * @param bool $force
+ * @param string|boolean $force
  * @return bool True if forced, false if not forced.
  */
 function force_ssl_content( $force = '' ) {

Spacing +511 added lines, -511 removed lines

@@ -39,45 +39,45 @@ 
  * @param int $user_id The unique ID of the user
  * @return WP_Site|void The blog object
  */
-function get_active_blog_for_user( $user_id ) {
+function get_active_blog_for_user($user_id) {
 	global $wpdb;
-	$blogs = get_blogs_of_user( $user_id );
-	if ( empty( $blogs ) )
+	$blogs = get_blogs_of_user($user_id);
+	if (empty($blogs))
 		return;
 
-	if ( !is_multisite() )
+	if ( ! is_multisite())
 		return $blogs[$wpdb->blogid];
 
-	$primary_blog = get_user_meta( $user_id, 'primary_blog', true );
+	$primary_blog = get_user_meta($user_id, 'primary_blog', true);
 	$first_blog = current($blogs);
-	if ( false !== $primary_blog ) {
-		if ( ! isset( $blogs[ $primary_blog ] ) ) {
-			update_user_meta( $user_id, 'primary_blog', $first_blog->userblog_id );
-			$primary = get_blog_details( $first_blog->userblog_id );
+	if (false !== $primary_blog) {
+		if ( ! isset($blogs[$primary_blog])) {
+			update_user_meta($user_id, 'primary_blog', $first_blog->userblog_id);
+			$primary = get_blog_details($first_blog->userblog_id);
 		} else {
-			$primary = get_blog_details( $primary_blog );
+			$primary = get_blog_details($primary_blog);
 		}
 	} else {
 		//TODO Review this call to add_user_to_blog too - to get here the user must have a role on this blog?
-		add_user_to_blog( $first_blog->userblog_id, $user_id, 'subscriber' );
-		update_user_meta( $user_id, 'primary_blog', $first_blog->userblog_id );
+		add_user_to_blog($first_blog->userblog_id, $user_id, 'subscriber');
+		update_user_meta($user_id, 'primary_blog', $first_blog->userblog_id);
 		$primary = $first_blog;
 	}
 
-	if ( ( ! is_object( $primary ) ) || ( $primary->archived == 1 || $primary->spam == 1 || $primary->deleted == 1 ) ) {
-		$blogs = get_blogs_of_user( $user_id, true ); // if a user's primary blog is shut down, check their other blogs.
+	if (( ! is_object($primary)) || ($primary->archived == 1 || $primary->spam == 1 || $primary->deleted == 1)) {
+		$blogs = get_blogs_of_user($user_id, true); // if a user's primary blog is shut down, check their other blogs.
 		$ret = false;
-		if ( is_array( $blogs ) && count( $blogs ) > 0 ) {
-			foreach ( (array) $blogs as $blog_id => $blog ) {
-				if ( $blog->site_id != $wpdb->siteid )
+		if (is_array($blogs) && count($blogs) > 0) {
+			foreach ((array) $blogs as $blog_id => $blog) {
+				if ($blog->site_id != $wpdb->siteid)
 					continue;
-				$details = get_blog_details( $blog_id );
-				if ( is_object( $details ) && $details->archived == 0 && $details->spam == 0 && $details->deleted == 0 ) {
+				$details = get_blog_details($blog_id);
+				if (is_object($details) && $details->archived == 0 && $details->spam == 0 && $details->deleted == 0) {
 					$ret = $blog;
-					if ( get_user_meta( $user_id , 'primary_blog', true ) != $blog_id )
-						update_user_meta( $user_id, 'primary_blog', $blog_id );
-					if ( !get_user_meta($user_id , 'source_domain', true) )
-						update_user_meta( $user_id, 'source_domain', $blog->domain );
+					if (get_user_meta($user_id, 'primary_blog', true) != $blog_id)
+						update_user_meta($user_id, 'primary_blog', $blog_id);
+					if ( ! get_user_meta($user_id, 'source_domain', true))
+						update_user_meta($user_id, 'source_domain', $blog->domain);
 					break;
 				}
 			}
@@ -100,7 +100,7 @@ 
  * @return int
  */
 function get_user_count() {
-	return get_site_option( 'user_count' );
+	return get_site_option('user_count');
 }
 
 /**
@@ -113,11 +113,11 @@ 
  * @param int $network_id Deprecated, not supported.
  * @return int
  */
-function get_blog_count( $network_id = 0 ) {
-	if ( func_num_args() )
-		_deprecated_argument( __FUNCTION__, '3.1' );
+function get_blog_count($network_id = 0) {
+	if (func_num_args())
+		_deprecated_argument(__FUNCTION__, '3.1');
 
-	return get_site_option( 'blog_count' );
+	return get_site_option('blog_count');
 }
 
 /**
@@ -129,9 +129,9 @@ 
  * @param int $post_id ID of the post you're looking for.
  * @return WP_Post|null WP_Post on success or null on failure
  */
-function get_blog_post( $blog_id, $post_id ) {
-	switch_to_blog( $blog_id );
-	$post = get_post( $post_id );
+function get_blog_post($blog_id, $post_id) {
+	switch_to_blog($blog_id);
+	$post = get_post($post_id);
 	restore_current_blog();
 
 	return $post;
@@ -150,17 +150,17 @@ 
  * @param string $role    The role you want the user to have
  * @return true|WP_Error
  */
-function add_user_to_blog( $blog_id, $user_id, $role ) {
+function add_user_to_blog($blog_id, $user_id, $role) {
 	switch_to_blog($blog_id);
 
-	$user = get_userdata( $user_id );
+	$user = get_userdata($user_id);
 
-	if ( ! $user ) {
+	if ( ! $user) {
 		restore_current_blog();
-		return new WP_Error( 'user_does_not_exist', __( 'The requested user does not exist.' ) );
+		return new WP_Error('user_does_not_exist', __('The requested user does not exist.'));
 	}
 
-	if ( !get_user_meta($user_id, 'primary_blog', true) ) {
+	if ( ! get_user_meta($user_id, 'primary_blog', true)) {
 		update_user_meta($user_id, 'primary_blog', $blog_id);
 		$details = get_blog_details($blog_id);
 		update_user_meta($user_id, 'source_domain', $details->domain);
@@ -177,9 +177,9 @@ 
 	 * @param string $role    User role.
 	 * @param int    $blog_id Blog ID.
 	 */
-	do_action( 'add_user_to_blog', $user_id, $role, $blog_id );
-	wp_cache_delete( $user_id, 'users' );
-	wp_cache_delete( $blog_id . '_user_count', 'blog-details' );
+	do_action('add_user_to_blog', $user_id, $role, $blog_id);
+	wp_cache_delete($user_id, 'users');
+	wp_cache_delete($blog_id.'_user_count', 'blog-details');
 	restore_current_blog();
 	return true;
 }
@@ -214,17 +214,17 @@ 
 	 * @param int $user_id User ID.
 	 * @param int $blog_id Blog ID.
 	 */
-	do_action( 'remove_user_from_blog', $user_id, $blog_id );
+	do_action('remove_user_from_blog', $user_id, $blog_id);
 
 	// If being removed from the primary blog, set a new primary if the user is assigned
 	// to multiple blogs.
 	$primary_blog = get_user_meta($user_id, 'primary_blog', true);
-	if ( $primary_blog == $blog_id ) {
+	if ($primary_blog == $blog_id) {
 		$new_id = '';
 		$new_domain = '';
 		$blogs = get_blogs_of_user($user_id);
-		foreach ( (array) $blogs as $blog ) {
-			if ( $blog->userblog_id == $blog_id )
+		foreach ((array) $blogs as $blog) {
+			if ($blog->userblog_id == $blog_id)
 				continue;
 			$new_id = $blog->userblog_id;
 			$new_domain = $blog->domain;
@@ -236,8 +236,8 @@ 
 	}
 
 	// wp_revoke_user($user_id);
-	$user = get_userdata( $user_id );
-	if ( ! $user ) {
+	$user = get_userdata($user_id);
+	if ( ! $user) {
 		restore_current_blog();
 		return new WP_Error('user_does_not_exist', __('That user does not exist.'));
 	}
@@ -245,24 +245,24 @@ 
 	$user->remove_all_caps();
 
 	$blogs = get_blogs_of_user($user_id);
-	if ( count($blogs) == 0 ) {
+	if (count($blogs) == 0) {
 		update_user_meta($user_id, 'primary_blog', '');
 		update_user_meta($user_id, 'source_domain', '');
 	}
 
-	if ( $reassign != '' ) {
+	if ($reassign != '') {
 		$reassign = (int) $reassign;
-		$post_ids = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_author = %d", $user_id ) );
-		$link_ids = $wpdb->get_col( $wpdb->prepare( "SELECT link_id FROM $wpdb->links WHERE link_owner = %d", $user_id ) );
+		$post_ids = $wpdb->get_col($wpdb->prepare("SELECT ID FROM $wpdb->posts WHERE post_author = %d", $user_id));
+		$link_ids = $wpdb->get_col($wpdb->prepare("SELECT link_id FROM $wpdb->links WHERE link_owner = %d", $user_id));
 
-		if ( ! empty( $post_ids ) ) {
-			$wpdb->query( $wpdb->prepare( "UPDATE $wpdb->posts SET post_author = %d WHERE post_author = %d", $reassign, $user_id ) );
-			array_walk( $post_ids, 'clean_post_cache' );
+		if ( ! empty($post_ids)) {
+			$wpdb->query($wpdb->prepare("UPDATE $wpdb->posts SET post_author = %d WHERE post_author = %d", $reassign, $user_id));
+			array_walk($post_ids, 'clean_post_cache');
 		}
 
-		if ( ! empty( $link_ids ) ) {
-			$wpdb->query( $wpdb->prepare( "UPDATE $wpdb->links SET link_owner = %d WHERE link_owner = %d", $reassign, $user_id ) );
-			array_walk( $link_ids, 'clean_bookmark_cache' );
+		if ( ! empty($link_ids)) {
+			$wpdb->query($wpdb->prepare("UPDATE $wpdb->links SET link_owner = %d WHERE link_owner = %d", $reassign, $user_id));
+			array_walk($link_ids, 'clean_bookmark_cache');
 		}
 	}
 
@@ -280,9 +280,9 @@ 
  * @param int $post_id ID of the desired post.
  * @return string The post's permalink
  */
-function get_blog_permalink( $blog_id, $post_id ) {
-	switch_to_blog( $blog_id );
-	$link = get_permalink( $post_id );
+function get_blog_permalink($blog_id, $post_id) {
+	switch_to_blog($blog_id);
+	$link = get_permalink($post_id);
 	restore_current_blog();
 
 	return $link;
@@ -304,26 +304,26 @@ 
  * @param string $path   Optional. Not required for subdomain installations.
  * @return int 0 if no blog found, otherwise the ID of the matching blog
  */
-function get_blog_id_from_url( $domain, $path = '/' ) {
+function get_blog_id_from_url($domain, $path = '/') {
 	global $wpdb;
 
-	$domain = strtolower( $domain );
-	$path = strtolower( $path );
-	$id = wp_cache_get( md5( $domain . $path ), 'blog-id-cache' );
+	$domain = strtolower($domain);
+	$path = strtolower($path);
+	$id = wp_cache_get(md5($domain.$path), 'blog-id-cache');
 
-	if ( $id == -1 ) // blog does not exist
+	if ($id == -1) // blog does not exist
 		return 0;
-	elseif ( $id )
+	elseif ($id)
 		return (int) $id;
 
-	$id = $wpdb->get_var( $wpdb->prepare( "SELECT blog_id FROM $wpdb->blogs WHERE domain = %s and path = %s /* get_blog_id_from_url */", $domain, $path ) );
+	$id = $wpdb->get_var($wpdb->prepare("SELECT blog_id FROM $wpdb->blogs WHERE domain = %s and path = %s /* get_blog_id_from_url */", $domain, $path));
 
-	if ( ! $id ) {
-		wp_cache_set( md5( $domain . $path ), -1, 'blog-id-cache' );
+	if ( ! $id) {
+		wp_cache_set(md5($domain.$path), -1, 'blog-id-cache');
 		return 0;
 	}
 
-	wp_cache_set( md5( $domain . $path ), $id, 'blog-id-cache' );
+	wp_cache_set(md5($domain.$path), $id, 'blog-id-cache');
 
 	return $id;
 }
@@ -343,30 +343,30 @@ 
  * @param string $user_email The email provided by the user at registration.
  * @return bool Returns true when the email address is banned.
  */
-function is_email_address_unsafe( $user_email ) {
-	$banned_names = get_site_option( 'banned_email_domains' );
-	if ( $banned_names && ! is_array( $banned_names ) )
-		$banned_names = explode( "\n", $banned_names );
+function is_email_address_unsafe($user_email) {
+	$banned_names = get_site_option('banned_email_domains');
+	if ($banned_names && ! is_array($banned_names))
+		$banned_names = explode("\n", $banned_names);
 
 	$is_email_address_unsafe = false;
 
-	if ( $banned_names && is_array( $banned_names ) ) {
-		$banned_names = array_map( 'strtolower', $banned_names );
-		$normalized_email = strtolower( $user_email );
+	if ($banned_names && is_array($banned_names)) {
+		$banned_names = array_map('strtolower', $banned_names);
+		$normalized_email = strtolower($user_email);
 
-		list( $email_local_part, $email_domain ) = explode( '@', $normalized_email );
+		list($email_local_part, $email_domain) = explode('@', $normalized_email);
 
-		foreach ( $banned_names as $banned_domain ) {
-			if ( ! $banned_domain )
+		foreach ($banned_names as $banned_domain) {
+			if ( ! $banned_domain)
 				continue;
 
-			if ( $email_domain == $banned_domain ) {
+			if ($email_domain == $banned_domain) {
 				$is_email_address_unsafe = true;
 				break;
 			}
 
 			$dotted_domain = ".$banned_domain";
-			if ( $dotted_domain === substr( $normalized_email, -strlen( $dotted_domain ) ) ) {
+			if ($dotted_domain === substr($normalized_email, -strlen($dotted_domain))) {
 				$is_email_address_unsafe = true;
 				break;
 			}
@@ -381,7 +381,7 @@ 
 	 * @param bool   $is_email_address_unsafe Whether the email address is "unsafe". Default false.
 	 * @param string $user_email              User email address.
 	 */
-	return apply_filters( 'is_email_address_unsafe', $is_email_address_unsafe, $user_email );
+	return apply_filters('is_email_address_unsafe', $is_email_address_unsafe, $user_email);
 }
 
 /**
@@ -410,86 +410,86 @@ 
 	$errors = new WP_Error();
 
 	$orig_username = $user_name;
-	$user_name = preg_replace( '/\s+/', '', sanitize_user( $user_name, true ) );
+	$user_name = preg_replace('/\s+/', '', sanitize_user($user_name, true));
 
-	if ( $user_name != $orig_username || preg_match( '/[^a-z0-9]/', $user_name ) ) {
-		$errors->add( 'user_name', __( 'Usernames can only contain lowercase letters (a-z) and numbers.' ) );
+	if ($user_name != $orig_username || preg_match('/[^a-z0-9]/', $user_name)) {
+		$errors->add('user_name', __('Usernames can only contain lowercase letters (a-z) and numbers.'));
 		$user_name = $orig_username;
 	}
 
-	$user_email = sanitize_email( $user_email );
+	$user_email = sanitize_email($user_email);
 
-	if ( empty( $user_name ) )
-	   	$errors->add('user_name', __( 'Please enter a username.' ) );
+	if (empty($user_name))
+	   	$errors->add('user_name', __('Please enter a username.'));
 
-	$illegal_names = get_site_option( 'illegal_names' );
-	if ( ! is_array( $illegal_names ) ) {
-		$illegal_names = array(  'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator' );
-		add_site_option( 'illegal_names', $illegal_names );
+	$illegal_names = get_site_option('illegal_names');
+	if ( ! is_array($illegal_names)) {
+		$illegal_names = array('www', 'web', 'root', 'admin', 'main', 'invite', 'administrator');
+		add_site_option('illegal_names', $illegal_names);
 	}
-	if ( in_array( $user_name, $illegal_names ) ) {
-		$errors->add( 'user_name',  __( 'Sorry, that username is not allowed.' ) );
+	if (in_array($user_name, $illegal_names)) {
+		$errors->add('user_name', __('Sorry, that username is not allowed.'));
 	}
 
 	/** This filter is documented in wp-includes/user.php */
-	$illegal_logins = (array) apply_filters( 'illegal_user_logins', array() );
+	$illegal_logins = (array) apply_filters('illegal_user_logins', array());
 
-	if ( in_array( strtolower( $user_name ), array_map( 'strtolower', $illegal_logins ) ) ) {
-		$errors->add( 'user_name',  __( 'Sorry, that username is not allowed.' ) );
+	if (in_array(strtolower($user_name), array_map('strtolower', $illegal_logins))) {
+		$errors->add('user_name', __('Sorry, that username is not allowed.'));
 	}
 
-	if ( is_email_address_unsafe( $user_email ) )
-		$errors->add('user_email',  __('You cannot use that email address to signup. We are having problems with them blocking some of our email. Please use another email provider.'));
+	if (is_email_address_unsafe($user_email))
+		$errors->add('user_email', __('You cannot use that email address to signup. We are having problems with them blocking some of our email. Please use another email provider.'));
 
-	if ( strlen( $user_name ) < 4 )
-		$errors->add('user_name',  __( 'Username must be at least 4 characters.' ) );
+	if (strlen($user_name) < 4)
+		$errors->add('user_name', __('Username must be at least 4 characters.'));
 
-	if ( strlen( $user_name ) > 60 ) {
-		$errors->add( 'user_name', __( 'Username may not be longer than 60 characters.' ) );
+	if (strlen($user_name) > 60) {
+		$errors->add('user_name', __('Username may not be longer than 60 characters.'));
 	}
 
 	// all numeric?
-	if ( preg_match( '/^[0-9]*$/', $user_name ) )
+	if (preg_match('/^[0-9]*$/', $user_name))
 		$errors->add('user_name', __('Sorry, usernames must have letters too!'));
 
-	if ( !is_email( $user_email ) )
-		$errors->add('user_email', __( 'Please enter a valid email address.' ) );
+	if ( ! is_email($user_email))
+		$errors->add('user_email', __('Please enter a valid email address.'));
 
-	$limited_email_domains = get_site_option( 'limited_email_domains' );
-	if ( is_array( $limited_email_domains ) && ! empty( $limited_email_domains ) ) {
-		$emaildomain = substr( $user_email, 1 + strpos( $user_email, '@' ) );
-		if ( ! in_array( $emaildomain, $limited_email_domains ) ) {
+	$limited_email_domains = get_site_option('limited_email_domains');
+	if (is_array($limited_email_domains) && ! empty($limited_email_domains)) {
+		$emaildomain = substr($user_email, 1 + strpos($user_email, '@'));
+		if ( ! in_array($emaildomain, $limited_email_domains)) {
 			$errors->add('user_email', __('Sorry, that email address is not allowed!'));
 		}
 	}
 
 	// Check if the username has been used already.
-	if ( username_exists($user_name) )
-		$errors->add( 'user_name', __( 'Sorry, that username already exists!' ) );
+	if (username_exists($user_name))
+		$errors->add('user_name', __('Sorry, that username already exists!'));
 
 	// Check if the email address has been used already.
-	if ( email_exists($user_email) )
-		$errors->add( 'user_email', __( 'Sorry, that email address is already used!' ) );
+	if (email_exists($user_email))
+		$errors->add('user_email', __('Sorry, that email address is already used!'));
 
 	// Has someone already signed up for this username?
-	$signup = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->signups WHERE user_login = %s", $user_name) );
-	if ( $signup != null ) {
-		$registered_at =  mysql2date('U', $signup->registered);
-		$now = current_time( 'timestamp', true );
+	$signup = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->signups WHERE user_login = %s", $user_name));
+	if ($signup != null) {
+		$registered_at = mysql2date('U', $signup->registered);
+		$now = current_time('timestamp', true);
 		$diff = $now - $registered_at;
 		// If registered more than two days ago, cancel registration and let this signup go through.
-		if ( $diff > 2 * DAY_IN_SECONDS )
-			$wpdb->delete( $wpdb->signups, array( 'user_login' => $user_name ) );
+		if ($diff > 2 * DAY_IN_SECONDS)
+			$wpdb->delete($wpdb->signups, array('user_login' => $user_name));
 		else
 			$errors->add('user_name', __('That username is currently reserved but may be available in a couple of days.'));
 	}
 
-	$signup = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->signups WHERE user_email = %s", $user_email) );
-	if ( $signup != null ) {
-		$diff = current_time( 'timestamp', true ) - mysql2date('U', $signup->registered);
+	$signup = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->signups WHERE user_email = %s", $user_email));
+	if ($signup != null) {
+		$diff = current_time('timestamp', true) - mysql2date('U', $signup->registered);
 		// If registered more than two days ago, cancel registration and let this signup go through.
-		if ( $diff > 2 * DAY_IN_SECONDS )
-			$wpdb->delete( $wpdb->signups, array( 'user_email' => $user_email ) );
+		if ($diff > 2 * DAY_IN_SECONDS)
+			$wpdb->delete($wpdb->signups, array('user_email' => $user_email));
 		else
 			$errors->add('user_email', __('That email address has already been used. Please check your inbox for an activation email. It will become available in a couple of days if you do nothing.'));
 	}
@@ -513,7 +513,7 @@ 
 	 *     @type WP_Error $errors        WP_Error object containing any errors found.
 	 * }
 	 */
-	return apply_filters( 'wpmu_validate_user_signup', $result );
+	return apply_filters('wpmu_validate_user_signup', $result);
 }
 
 /**
@@ -540,48 +540,48 @@ 
  * @param WP_User|string $user       Optional. The user object to check against the new site name.
  * @return array Contains the new site data and error messages.
  */
-function wpmu_validate_blog_signup( $blogname, $blog_title, $user = '' ) {
+function wpmu_validate_blog_signup($blogname, $blog_title, $user = '') {
 	global $wpdb, $domain;
 
 	$current_site = get_current_site();
 	$base = $current_site->path;
 
-	$blog_title = strip_tags( $blog_title );
+	$blog_title = strip_tags($blog_title);
 
 	$errors = new WP_Error();
-	$illegal_names = get_site_option( 'illegal_names' );
-	if ( $illegal_names == false ) {
-		$illegal_names = array( 'www', 'web', 'root', 'admin', 'main', 'invite', 'administrator' );
-		add_site_option( 'illegal_names', $illegal_names );
+	$illegal_names = get_site_option('illegal_names');
+	if ($illegal_names == false) {
+		$illegal_names = array('www', 'web', 'root', 'admin', 'main', 'invite', 'administrator');
+		add_site_option('illegal_names', $illegal_names);
 	}
 
 	/*
 	 * On sub dir installs, some names are so illegal, only a filter can
 	 * spring them from jail.
 	 */
-	if ( ! is_subdomain_install() ) {
-		$illegal_names = array_merge( $illegal_names, get_subdirectory_reserved_names() );
+	if ( ! is_subdomain_install()) {
+		$illegal_names = array_merge($illegal_names, get_subdirectory_reserved_names());
 	}
 
-	if ( empty( $blogname ) )
-		$errors->add('blogname', __( 'Please enter a site name.' ) );
+	if (empty($blogname))
+		$errors->add('blogname', __('Please enter a site name.'));
 
-	if ( preg_match( '/[^a-z0-9]+/', $blogname ) ) {
-		$errors->add( 'blogname', __( 'Site names can only contain lowercase letters (a-z) and numbers.' ) );
+	if (preg_match('/[^a-z0-9]+/', $blogname)) {
+		$errors->add('blogname', __('Site names can only contain lowercase letters (a-z) and numbers.'));
 	}
 
-	if ( in_array( $blogname, $illegal_names ) )
-		$errors->add('blogname',  __( 'That name is not allowed.' ) );
+	if (in_array($blogname, $illegal_names))
+		$errors->add('blogname', __('That name is not allowed.'));
 
-	if ( strlen( $blogname ) < 4 && !is_super_admin() )
-		$errors->add('blogname',  __( 'Site name must be at least 4 characters.' ) );
+	if (strlen($blogname) < 4 && ! is_super_admin())
+		$errors->add('blogname', __('Site name must be at least 4 characters.'));
 
 	// do not allow users to create a blog that conflicts with a page on the main blog.
-	if ( !is_subdomain_install() && $wpdb->get_var( $wpdb->prepare( "SELECT post_name FROM " . $wpdb->get_blog_prefix( $current_site->blog_id ) . "posts WHERE post_type = 'page' AND post_name = %s", $blogname ) ) )
-		$errors->add( 'blogname', __( 'Sorry, you may not use that site name.' ) );
+	if ( ! is_subdomain_install() && $wpdb->get_var($wpdb->prepare("SELECT post_name FROM ".$wpdb->get_blog_prefix($current_site->blog_id)."posts WHERE post_type = 'page' AND post_name = %s", $blogname)))
+		$errors->add('blogname', __('Sorry, you may not use that site name.'));
 
 	// all numeric?
-	if ( preg_match( '/^[0-9]*$/', $blogname ) )
+	if (preg_match('/^[0-9]*$/', $blogname))
 		$errors->add('blogname', __('Sorry, site names must have letters too!'));
 
 	/**
@@ -594,36 +594,36 @@ 
 	 *
 	 * @param string $blogname Site name.
 	 */
-	$blogname = apply_filters( 'newblogname', $blogname );
+	$blogname = apply_filters('newblogname', $blogname);
 
-	$blog_title = wp_unslash(  $blog_title );
+	$blog_title = wp_unslash($blog_title);
 
-	if ( empty( $blog_title ) )
-		$errors->add('blog_title', __( 'Please enter a site title.' ) );
+	if (empty($blog_title))
+		$errors->add('blog_title', __('Please enter a site title.'));
 
 	// Check if the domain/path has been used already.
-	if ( is_subdomain_install() ) {
-		$mydomain = $blogname . '.' . preg_replace( '|^www\.|', '', $domain );
+	if (is_subdomain_install()) {
+		$mydomain = $blogname.'.'.preg_replace('|^www\.|', '', $domain);
 		$path = $base;
 	} else {
 		$mydomain = "$domain";
 		$path = $base.$blogname.'/';
 	}
-	if ( domain_exists($mydomain, $path, $current_site->id) )
-		$errors->add( 'blogname', __( 'Sorry, that site already exists!' ) );
+	if (domain_exists($mydomain, $path, $current_site->id))
+		$errors->add('blogname', __('Sorry, that site already exists!'));
 
-	if ( username_exists( $blogname ) ) {
-		if ( ! is_object( $user ) || ( is_object($user) && ( $user->user_login != $blogname ) ) )
-			$errors->add( 'blogname', __( 'Sorry, that site is reserved!' ) );
+	if (username_exists($blogname)) {
+		if ( ! is_object($user) || (is_object($user) && ($user->user_login != $blogname)))
+			$errors->add('blogname', __('Sorry, that site is reserved!'));
 	}
 
 	// Has someone already signed up for this domain?
-	$signup = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->signups WHERE domain = %s AND path = %s", $mydomain, $path) ); // TODO: Check email too?
-	if ( ! empty($signup) ) {
-		$diff = current_time( 'timestamp', true ) - mysql2date('U', $signup->registered);
+	$signup = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->signups WHERE domain = %s AND path = %s", $mydomain, $path)); // TODO: Check email too?
+	if ( ! empty($signup)) {
+		$diff = current_time('timestamp', true) - mysql2date('U', $signup->registered);
 		// If registered more than two days ago, cancel registration and let this signup go through.
-		if ( $diff > 2 * DAY_IN_SECONDS )
-			$wpdb->delete( $wpdb->signups, array( 'domain' => $mydomain , 'path' => $path ) );
+		if ($diff > 2 * DAY_IN_SECONDS)
+			$wpdb->delete($wpdb->signups, array('domain' => $mydomain, 'path' => $path));
 		else
 			$errors->add('blogname', __('That site is currently reserved but may be available in a couple days.'));
 	}
@@ -646,7 +646,7 @@ 
 	 *     @type WP_Error       $errors     WP_Error containing any errors found.
 	 * }
 	 */
-	return apply_filters( 'wpmu_validate_blog_signup', $result );
+	return apply_filters('wpmu_validate_blog_signup', $result);
 }
 
 /**
@@ -663,13 +663,13 @@ 
  * @param string $user_email The user's email address.
  * @param array  $meta       By default, contains the requested privacy setting and lang_id.
  */
-function wpmu_signup_blog( $domain, $path, $title, $user, $user_email, $meta = array() )  {
+function wpmu_signup_blog($domain, $path, $title, $user, $user_email, $meta = array()) {
 	global $wpdb;
 
-	$key = substr( md5( time() . rand() . $domain ), 0, 16 );
+	$key = substr(md5(time().rand().$domain), 0, 16);
 	$meta = serialize($meta);
 
-	$wpdb->insert( $wpdb->signups, array(
+	$wpdb->insert($wpdb->signups, array(
 		'domain' => $domain,
 		'path' => $path,
 		'title' => $title,
@@ -678,7 +678,7 @@ 
 		'registered' => current_time('mysql', true),
 		'activation_key' => $key,
 		'meta' => $meta
-	) );
+	));
 
 	/**
 	 * Fires after site signup information has been written to the database.
@@ -693,7 +693,7 @@ 
 	 * @param string $key        The user's activation key
 	 * @param array  $meta       By default, contains the requested privacy setting and lang_id.
 	 */
-	do_action( 'after_signup_site', $domain, $path, $title, $user, $user_email, $key, $meta );
+	do_action('after_signup_site', $domain, $path, $title, $user, $user_email, $key, $meta);
 }
 
 /**
@@ -710,16 +710,16 @@ 
  * @param string $user_email The user's email address.
  * @param array  $meta       By default, this is an empty array.
  */
-function wpmu_signup_user( $user, $user_email, $meta = array() ) {
+function wpmu_signup_user($user, $user_email, $meta = array()) {
 	global $wpdb;
 
 	// Format data
-	$user = preg_replace( '/\s+/', '', sanitize_user( $user, true ) );
-	$user_email = sanitize_email( $user_email );
-	$key = substr( md5( time() . rand() . $user_email ), 0, 16 );
+	$user = preg_replace('/\s+/', '', sanitize_user($user, true));
+	$user_email = sanitize_email($user_email);
+	$key = substr(md5(time().rand().$user_email), 0, 16);
 	$meta = serialize($meta);
 
-	$wpdb->insert( $wpdb->signups, array(
+	$wpdb->insert($wpdb->signups, array(
 		'domain' => '',
 		'path' => '',
 		'title' => '',
@@ -728,7 +728,7 @@ 
 		'registered' => current_time('mysql', true),
 		'activation_key' => $key,
 		'meta' => $meta
-	) );
+	));
 
 	/**
 	 * Fires after a user's signup information has been written to the database.
@@ -740,7 +740,7 @@ 
 	 * @param string $key        The user's activation key
 	 * @param array  $meta       Additional signup meta. By default, this is an empty array.
 	 */
-	do_action( 'after_signup_user', $user, $user_email, $key, $meta );
+	do_action('after_signup_user', $user, $user_email, $key, $meta);
 }
 
 /**
@@ -767,7 +767,7 @@ 
  * @param array  $meta       By default, contains the requested privacy setting and lang_id.
  * @return bool
  */
-function wpmu_signup_blog_notification( $domain, $path, $title, $user, $user_email, $key, $meta = array() ) {
+function wpmu_signup_blog_notification($domain, $path, $title, $user, $user_email, $key, $meta = array()) {
 	/**
 	 * Filter whether to bypass the new site email notification.
 	 *
@@ -781,22 +781,22 @@ 
 	 * @param string      $key        Activation key created in wpmu_signup_blog().
 	 * @param array       $meta       By default, contains the requested privacy setting and lang_id.
 	 */
-	if ( ! apply_filters( 'wpmu_signup_blog_notification', $domain, $path, $title, $user, $user_email, $key, $meta ) ) {
+	if ( ! apply_filters('wpmu_signup_blog_notification', $domain, $path, $title, $user, $user_email, $key, $meta)) {
 		return false;
 	}
 
 	// Send email with activation link.
-	if ( !is_subdomain_install() || get_current_site()->id != 1 )
+	if ( ! is_subdomain_install() || get_current_site()->id != 1)
 		$activate_url = network_site_url("wp-activate.php?key=$key");
 	else
 		$activate_url = "http://{$domain}{$path}wp-activate.php?key=$key"; // @todo use *_url() API
 
 	$activate_url = esc_url($activate_url);
-	$admin_email = get_site_option( 'admin_email' );
-	if ( $admin_email == '' )
-		$admin_email = 'support@' . $_SERVER['SERVER_NAME'];
-	$from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
-	$message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
+	$admin_email = get_site_option('admin_email');
+	if ($admin_email == '')
+		$admin_email = 'support@'.$_SERVER['SERVER_NAME'];
+	$from_name = get_site_option('site_name') == '' ? 'WordPress' : esc_html(get_site_option('site_name'));
+	$message_headers = "From: \"{$from_name}\" <{$admin_email}>\n"."Content-Type: text/plain; charset=\"".get_option('blog_charset')."\"\n";
 	$message = sprintf(
 		/**
 		 * Filter the message content of the new blog notification email.
@@ -814,12 +814,12 @@ 
 		 * @param string $key        Activation key created in wpmu_signup_blog().
 		 * @param array  $meta       By default, contains the requested privacy setting and lang_id.
 		 */
-		apply_filters( 'wpmu_signup_blog_notification_email',
-			__( "To activate your blog, please click the following link:\n\n%s\n\nAfter you activate, you will receive *another email* with your login.\n\nAfter you activate, you can visit your site here:\n\n%s" ),
+		apply_filters('wpmu_signup_blog_notification_email',
+			__("To activate your blog, please click the following link:\n\n%s\n\nAfter you activate, you will receive *another email* with your login.\n\nAfter you activate, you can visit your site here:\n\n%s"),
 			$domain, $path, $title, $user, $user_email, $key, $meta
 		),
 		$activate_url,
-		esc_url( "http://{$domain}{$path}" ),
+		esc_url("http://{$domain}{$path}"),
 		$key
 	);
 	// TODO: Don't hard code activation link.
@@ -838,14 +838,14 @@ 
 		 * @param string $key        Activation key created in wpmu_signup_blog().
 		 * @param array  $meta       By default, contains the requested privacy setting and lang_id.
 		 */
-		apply_filters( 'wpmu_signup_blog_notification_subject',
-			__( '[%1$s] Activate %2$s' ),
+		apply_filters('wpmu_signup_blog_notification_subject',
+			__('[%1$s] Activate %2$s'),
 			$domain, $path, $title, $user, $user_email, $key, $meta
 		),
 		$from_name,
-		esc_url( 'http://' . $domain . $path )
+		esc_url('http://'.$domain.$path)
 	);
-	wp_mail( $user_email, wp_specialchars_decode( $subject ), $message, $message_headers );
+	wp_mail($user_email, wp_specialchars_decode($subject), $message, $message_headers);
 	return true;
 }
 
@@ -870,7 +870,7 @@ 
  * @param array  $meta       By default, an empty array.
  * @return bool
  */
-function wpmu_signup_user_notification( $user, $user_email, $key, $meta = array() ) {
+function wpmu_signup_user_notification($user, $user_email, $key, $meta = array()) {
 	/**
 	 * Filter whether to bypass the email notification for new user sign-up.
 	 *
@@ -881,15 +881,15 @@ 
 	 * @param string $key        Activation key created in wpmu_signup_user().
 	 * @param array  $meta       Signup meta data.
 	 */
-	if ( ! apply_filters( 'wpmu_signup_user_notification', $user, $user_email, $key, $meta ) )
+	if ( ! apply_filters('wpmu_signup_user_notification', $user, $user_email, $key, $meta))
 		return false;
 
 	// Send email with activation link.
-	$admin_email = get_site_option( 'admin_email' );
-	if ( $admin_email == '' )
-		$admin_email = 'support@' . $_SERVER['SERVER_NAME'];
-	$from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
-	$message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
+	$admin_email = get_site_option('admin_email');
+	if ($admin_email == '')
+		$admin_email = 'support@'.$_SERVER['SERVER_NAME'];
+	$from_name = get_site_option('site_name') == '' ? 'WordPress' : esc_html(get_site_option('site_name'));
+	$message_headers = "From: \"{$from_name}\" <{$admin_email}>\n"."Content-Type: text/plain; charset=\"".get_option('blog_charset')."\"\n";
 	$message = sprintf(
 		/**
 		 * Filter the content of the notification email for new user sign-up.
@@ -904,11 +904,11 @@ 
 		 * @param string $key        Activation key created in wpmu_signup_user().
 		 * @param array  $meta       Signup meta data.
 		 */
-		apply_filters( 'wpmu_signup_user_notification_email',
-			__( "To activate your user, please click the following link:\n\n%s\n\nAfter you activate, you will receive *another email* with your login." ),
+		apply_filters('wpmu_signup_user_notification_email',
+			__("To activate your user, please click the following link:\n\n%s\n\nAfter you activate, you will receive *another email* with your login."),
 			$user, $user_email, $key, $meta
 		),
-		site_url( "wp-activate.php?key=$key" )
+		site_url("wp-activate.php?key=$key")
 	);
 	// TODO: Don't hard code activation link.
 	$subject = sprintf(
@@ -923,14 +923,14 @@ 
 		 * @param string $key        Activation key created in wpmu_signup_user().
 		 * @param array  $meta       Signup meta data.
 		 */
-		apply_filters( 'wpmu_signup_user_notification_subject',
-			__( '[%1$s] Activate %2$s' ),
+		apply_filters('wpmu_signup_user_notification_subject',
+			__('[%1$s] Activate %2$s'),
 			$user, $user_email, $key, $meta
 		),
 		$from_name,
 		$user
 	);
-	wp_mail( $user_email, wp_specialchars_decode( $subject ), $message, $message_headers );
+	wp_mail($user_email, wp_specialchars_decode($subject), $message, $message_headers);
 	return true;
 }
 
@@ -952,38 +952,38 @@ 
 function wpmu_activate_signup($key) {
 	global $wpdb;
 
-	$signup = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->signups WHERE activation_key = %s", $key) );
+	$signup = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->signups WHERE activation_key = %s", $key));
 
-	if ( empty( $signup ) )
-		return new WP_Error( 'invalid_key', __( 'Invalid activation key.' ) );
+	if (empty($signup))
+		return new WP_Error('invalid_key', __('Invalid activation key.'));
 
-	if ( $signup->active ) {
-		if ( empty( $signup->domain ) )
-			return new WP_Error( 'already_active', __( 'The user is already active.' ), $signup );
+	if ($signup->active) {
+		if (empty($signup->domain))
+			return new WP_Error('already_active', __('The user is already active.'), $signup);
 		else
-			return new WP_Error( 'already_active', __( 'The site is already active.' ), $signup );
+			return new WP_Error('already_active', __('The site is already active.'), $signup);
 	}
 
 	$meta = maybe_unserialize($signup->meta);
-	$password = wp_generate_password( 12, false );
+	$password = wp_generate_password(12, false);
 
 	$user_id = username_exists($signup->user_login);
 
-	if ( ! $user_id )
+	if ( ! $user_id)
 		$user_id = wpmu_create_user($signup->user_login, $password, $signup->user_email);
 	else
 		$user_already_exists = true;
 
-	if ( ! $user_id )
+	if ( ! $user_id)
 		return new WP_Error('create_user', __('Could not create user'), $signup);
 
 	$now = current_time('mysql', true);
 
-	if ( empty($signup->domain) ) {
-		$wpdb->update( $wpdb->signups, array('active' => 1, 'activated' => $now), array('activation_key' => $key) );
+	if (empty($signup->domain)) {
+		$wpdb->update($wpdb->signups, array('active' => 1, 'activated' => $now), array('activation_key' => $key));
 
-		if ( isset( $user_already_exists ) )
-			return new WP_Error( 'user_already_exists', __( 'That username is already activated.' ), $signup);
+		if (isset($user_already_exists))
+			return new WP_Error('user_already_exists', __('That username is already activated.'), $signup);
 
 		/**
 		 * Fires immediately after a new user is activated.
@@ -994,24 +994,24 @@ 
 		 * @param int   $password User password.
 		 * @param array $meta     Signup meta data.
 		 */
-		do_action( 'wpmu_activate_user', $user_id, $password, $meta );
-		return array( 'user_id' => $user_id, 'password' => $password, 'meta' => $meta );
+		do_action('wpmu_activate_user', $user_id, $password, $meta);
+		return array('user_id' => $user_id, 'password' => $password, 'meta' => $meta);
 	}
 
-	$blog_id = wpmu_create_blog( $signup->domain, $signup->path, $signup->title, $user_id, $meta, $wpdb->siteid );
+	$blog_id = wpmu_create_blog($signup->domain, $signup->path, $signup->title, $user_id, $meta, $wpdb->siteid);
 
 	// TODO: What to do if we create a user but cannot create a blog?
-	if ( is_wp_error($blog_id) ) {
+	if (is_wp_error($blog_id)) {
 		// If blog is taken, that means a previous attempt to activate this blog failed in between creating the blog and
 		// setting the activation flag. Let's just set the active flag and instruct the user to reset their password.
-		if ( 'blog_taken' == $blog_id->get_error_code() ) {
-			$blog_id->add_data( $signup );
-			$wpdb->update( $wpdb->signups, array( 'active' => 1, 'activated' => $now ), array( 'activation_key' => $key ) );
+		if ('blog_taken' == $blog_id->get_error_code()) {
+			$blog_id->add_data($signup);
+			$wpdb->update($wpdb->signups, array('active' => 1, 'activated' => $now), array('activation_key' => $key));
 		}
 		return $blog_id;
 	}
 
-	$wpdb->update( $wpdb->signups, array('active' => 1, 'activated' => $now), array('activation_key' => $key) );
+	$wpdb->update($wpdb->signups, array('active' => 1, 'activated' => $now), array('activation_key' => $key));
 	/**
 	 * Fires immediately after a site is activated.
 	 *
@@ -1023,7 +1023,7 @@ 
 	 * @param string $signup_title  Site title.
 	 * @param array  $meta          Signup meta data.
 	 */
-	do_action( 'wpmu_activate_blog', $blog_id, $user_id, $password, $signup->title, $meta );
+	do_action('wpmu_activate_blog', $blog_id, $user_id, $password, $signup->title, $meta);
 
 	return array('blog_id' => $blog_id, 'user_id' => $user_id, 'password' => $password, 'title' => $signup->title, 'meta' => $meta);
 }
@@ -1043,16 +1043,16 @@ 
  * @param string $email     The new user's email address.
  * @return int|false Returns false on failure, or int $user_id on success
  */
-function wpmu_create_user( $user_name, $password, $email ) {
-	$user_name = preg_replace( '/\s+/', '', sanitize_user( $user_name, true ) );
+function wpmu_create_user($user_name, $password, $email) {
+	$user_name = preg_replace('/\s+/', '', sanitize_user($user_name, true));
 
-	$user_id = wp_create_user( $user_name, $password, $email );
-	if ( is_wp_error( $user_id ) )
+	$user_id = wp_create_user($user_name, $password, $email);
+	if (is_wp_error($user_id))
 		return false;
 
 	// Newly created users have no roles or caps until they are added to a blog.
-	delete_user_option( $user_id, 'capabilities' );
-	delete_user_option( $user_id, 'user_level' );
+	delete_user_option($user_id, 'capabilities');
+	delete_user_option($user_id, 'user_level');
 
 	/**
 	 * Fires immediately after a new user is created.
@@ -1061,7 +1061,7 @@ 
 	 *
 	 * @param int $user_id User ID.
 	 */
-	do_action( 'wpmu_new_user', $user_id );
+	do_action('wpmu_new_user', $user_id);
 
 	return $user_id;
 }
@@ -1088,30 +1088,30 @@ 
  * @param int    $site_id Optional. Only relevant on multi-network installs.
  * @return int|WP_Error Returns WP_Error object on failure, int $blog_id on success
  */
-function wpmu_create_blog( $domain, $path, $title, $user_id, $meta = array(), $site_id = 1 ) {
-	$defaults = array( 'public' => 0 );
-	$meta = wp_parse_args( $meta, $defaults );
+function wpmu_create_blog($domain, $path, $title, $user_id, $meta = array(), $site_id = 1) {
+	$defaults = array('public' => 0);
+	$meta = wp_parse_args($meta, $defaults);
 
-	$domain = preg_replace( '/\s+/', '', sanitize_user( $domain, true ) );
+	$domain = preg_replace('/\s+/', '', sanitize_user($domain, true));
 
-	if ( is_subdomain_install() )
-		$domain = str_replace( '@', '', $domain );
+	if (is_subdomain_install())
+		$domain = str_replace('@', '', $domain);
 
-	$title = strip_tags( $title );
+	$title = strip_tags($title);
 	$user_id = (int) $user_id;
 
-	if ( empty($path) )
+	if (empty($path))
 		$path = '/';
 
 	// Check if the domain has been used already. We should return an error message.
-	if ( domain_exists($domain, $path, $site_id) )
-		return new WP_Error( 'blog_taken', __( 'Sorry, that site already exists!' ) );
+	if (domain_exists($domain, $path, $site_id))
+		return new WP_Error('blog_taken', __('Sorry, that site already exists!'));
 
-	if ( ! wp_installing() ) {
-		wp_installing( true );
+	if ( ! wp_installing()) {
+		wp_installing(true);
 	}
 
-	if ( ! $blog_id = insert_blog($domain, $path, $site_id) )
+	if ( ! $blog_id = insert_blog($domain, $path, $site_id))
 		return new WP_Error('insert_blog', __('Could not create site.'));
 
 	switch_to_blog($blog_id);
@@ -1120,18 +1120,18 @@ 
 
 	add_user_to_blog($blog_id, $user_id, 'administrator');
 
-	foreach ( $meta as $key => $value ) {
-		if ( in_array( $key, array( 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id' ) ) )
-			update_blog_status( $blog_id, $key, $value );
+	foreach ($meta as $key => $value) {
+		if (in_array($key, array('public', 'archived', 'mature', 'spam', 'deleted', 'lang_id')))
+			update_blog_status($blog_id, $key, $value);
 		else
-			update_option( $key, $value );
+			update_option($key, $value);
 	}
 
-	add_option( 'WPLANG', get_site_option( 'WPLANG' ) );
-	update_option( 'blog_public', (int) $meta['public'] );
+	add_option('WPLANG', get_site_option('WPLANG'));
+	update_option('blog_public', (int) $meta['public']);
 
-	if ( ! is_super_admin( $user_id ) && ! get_user_meta( $user_id, 'primary_blog', true ) )
-		update_user_meta( $user_id, 'primary_blog', $blog_id );
+	if ( ! is_super_admin($user_id) && ! get_user_meta($user_id, 'primary_blog', true))
+		update_user_meta($user_id, 'primary_blog', $blog_id);
 
 	restore_current_blog();
 	/**
@@ -1146,7 +1146,7 @@ 
 	 * @param int    $site_id Site ID. Only relevant on multi-network installs.
 	 * @param array  $meta    Meta data. Used to set initial site options.
 	 */
-	do_action( 'wpmu_new_blog', $blog_id, $user_id, $domain, $path, $site_id, $meta );
+	do_action('wpmu_new_blog', $blog_id, $user_id, $domain, $path, $site_id, $meta);
 
 	return $blog_id;
 }
@@ -1163,26 +1163,26 @@ 
  * @param string $deprecated Not used.
  * @return bool
  */
-function newblog_notify_siteadmin( $blog_id, $deprecated = '' ) {
-	if ( get_site_option( 'registrationnotification' ) != 'yes' )
+function newblog_notify_siteadmin($blog_id, $deprecated = '') {
+	if (get_site_option('registrationnotification') != 'yes')
 		return false;
 
-	$email = get_site_option( 'admin_email' );
-	if ( is_email($email) == false )
+	$email = get_site_option('admin_email');
+	if (is_email($email) == false)
 		return false;
 
 	$options_site_url = esc_url(network_admin_url('settings.php'));
 
-	switch_to_blog( $blog_id );
-	$blogname = get_option( 'blogname' );
+	switch_to_blog($blog_id);
+	$blogname = get_option('blogname');
 	$siteurl = site_url();
 	restore_current_blog();
 
-	$msg = sprintf( __( 'New Site: %1$s
+	$msg = sprintf(__('New Site: %1$s
 URL: %2$s
 Remote IP: %3$s
 
-Disable these notifications: %4$s' ), $blogname, $siteurl, wp_unslash( $_SERVER['REMOTE_ADDR'] ), $options_site_url);
+Disable these notifications: %4$s' ), $blogname, $siteurl, wp_unslash($_SERVER['REMOTE_ADDR']), $options_site_url);
 	/**
 	 * Filter the message body of the new site activation email sent
 	 * to the network administrator.
@@ -1191,9 +1191,9 @@ 
 	 *
 	 * @param string $msg Email body.
 	 */
-	$msg = apply_filters( 'newblog_notify_siteadmin', $msg );
+	$msg = apply_filters('newblog_notify_siteadmin', $msg);
 
-	wp_mail( $email, sprintf( __( 'New Site Registration: %s' ), $siteurl ), $msg );
+	wp_mail($email, sprintf(__('New Site Registration: %s'), $siteurl), $msg);
 	return true;
 }
 
@@ -1208,22 +1208,22 @@ 
  * @param int $user_id The new user's ID.
  * @return bool
  */
-function newuser_notify_siteadmin( $user_id ) {
-	if ( get_site_option( 'registrationnotification' ) != 'yes' )
+function newuser_notify_siteadmin($user_id) {
+	if (get_site_option('registrationnotification') != 'yes')
 		return false;
 
-	$email = get_site_option( 'admin_email' );
+	$email = get_site_option('admin_email');
 
-	if ( is_email($email) == false )
+	if (is_email($email) == false)
 		return false;
 
-	$user = get_userdata( $user_id );
+	$user = get_userdata($user_id);
 
 	$options_site_url = esc_url(network_admin_url('settings.php'));
 	$msg = sprintf(__('New User: %1$s
 Remote IP: %2$s
 
-Disable these notifications: %3$s'), $user->user_login, wp_unslash( $_SERVER['REMOTE_ADDR'] ), $options_site_url);
+Disable these notifications: %3$s'), $user->user_login, wp_unslash($_SERVER['REMOTE_ADDR']), $options_site_url);
 
 	/**
 	 * Filter the message body of the new user activation email sent
@@ -1234,8 +1234,8 @@ 
 	 * @param string  $msg  Email body.
 	 * @param WP_User $user WP_User instance of the new user.
 	 */
-	$msg = apply_filters( 'newuser_notify_siteadmin', $msg, $user );
-	wp_mail( $email, sprintf(__('New User Registration: %s'), $user->user_login), $msg );
+	$msg = apply_filters('newuser_notify_siteadmin', $msg, $user);
+	wp_mail($email, sprintf(__('New User Registration: %s'), $user->user_login), $msg);
 	return true;
 }
 
@@ -1256,8 +1256,8 @@ 
  */
 function domain_exists($domain, $path, $site_id = 1) {
 	global $wpdb;
-	$path = trailingslashit( $path );
-	$result = $wpdb->get_var( $wpdb->prepare("SELECT blog_id FROM $wpdb->blogs WHERE domain = %s AND path = %s AND site_id = %d", $domain, $path, $site_id) );
+	$path = trailingslashit($path);
+	$result = $wpdb->get_var($wpdb->prepare("SELECT blog_id FROM $wpdb->blogs WHERE domain = %s AND path = %s AND site_id = %d", $domain, $path, $site_id));
 
 	/**
 	 * Filter whether a blogname is taken.
@@ -1269,7 +1269,7 @@ 
 	 * @param string   $path    Path to be checked.
 	 * @param int      $site_id Site ID. Relevant only on multi-network installs.
 	 */
-	return apply_filters( 'domain_exists', $result, $domain, $path, $site_id );
+	return apply_filters('domain_exists', $result, $domain, $path, $site_id);
 }
 
 /**
@@ -1293,12 +1293,12 @@ 
 	$path = trailingslashit($path);
 	$site_id = (int) $site_id;
 
-	$result = $wpdb->insert( $wpdb->blogs, array('site_id' => $site_id, 'domain' => $domain, 'path' => $path, 'registered' => current_time('mysql')) );
-	if ( ! $result )
+	$result = $wpdb->insert($wpdb->blogs, array('site_id' => $site_id, 'domain' => $domain, 'path' => $path, 'registered' => current_time('mysql')));
+	if ( ! $result)
 		return false;
 
 	$blog_id = $wpdb->insert_id;
-	refresh_blog_details( $blog_id );
+	refresh_blog_details($blog_id);
 
 	wp_maybe_update_network_site_counts();
 
@@ -1320,57 +1320,57 @@ 
  * @param int    $blog_id    The value returned by insert_blog().
  * @param string $blog_title The title of the new site.
  */
-function install_blog( $blog_id, $blog_title = '' ) {
+function install_blog($blog_id, $blog_title = '') {
 	global $wpdb, $wp_roles, $current_site;
 
 	// Cast for security
 	$blog_id = (int) $blog_id;
 
-	require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+	require_once(ABSPATH.'wp-admin/includes/upgrade.php');
 
 	$suppress = $wpdb->suppress_errors();
-	if ( $wpdb->get_results( "DESCRIBE {$wpdb->posts}" ) )
-		die( '<h1>' . __( 'Already Installed' ) . '</h1><p>' . __( 'You appear to have already installed WordPress. To reinstall please clear your old database tables first.' ) . '</p></body></html>' );
-	$wpdb->suppress_errors( $suppress );
+	if ($wpdb->get_results("DESCRIBE {$wpdb->posts}"))
+		die('<h1>'.__('Already Installed').'</h1><p>'.__('You appear to have already installed WordPress. To reinstall please clear your old database tables first.').'</p></body></html>');
+	$wpdb->suppress_errors($suppress);
 
-	$url = get_blogaddress_by_id( $blog_id );
+	$url = get_blogaddress_by_id($blog_id);
 
 	// Set everything up
-	make_db_current_silent( 'blog' );
+	make_db_current_silent('blog');
 	populate_options();
 	populate_roles();
 
 	// populate_roles() clears previous role definitions so we start over.
 	$wp_roles = new WP_Roles();
 
-	$siteurl = $home = untrailingslashit( $url );
+	$siteurl = $home = untrailingslashit($url);
 
-	if ( ! is_subdomain_install() ) {
+	if ( ! is_subdomain_install()) {
 
- 		if ( 'https' === parse_url( get_site_option( 'siteurl' ), PHP_URL_SCHEME ) ) {
- 			$siteurl = set_url_scheme( $siteurl, 'https' );
+ 		if ('https' === parse_url(get_site_option('siteurl'), PHP_URL_SCHEME)) {
+ 			$siteurl = set_url_scheme($siteurl, 'https');
  		}
- 		if ( 'https' === parse_url( get_home_url( $current_site->blog_id ), PHP_URL_SCHEME ) ) {
- 			$home = set_url_scheme( $home, 'https' );
+ 		if ('https' === parse_url(get_home_url($current_site->blog_id), PHP_URL_SCHEME)) {
+ 			$home = set_url_scheme($home, 'https');
  		}
 
 	}
 
-	update_option( 'siteurl', $siteurl );
-	update_option( 'home', $home );
+	update_option('siteurl', $siteurl);
+	update_option('home', $home);
 
-	if ( get_site_option( 'ms_files_rewriting' ) )
-		update_option( 'upload_path', UPLOADBLOGSDIR . "/$blog_id/files" );
+	if (get_site_option('ms_files_rewriting'))
+		update_option('upload_path', UPLOADBLOGSDIR."/$blog_id/files");
 	else
-		update_option( 'upload_path', get_blog_option( get_current_site()->blog_id, 'upload_path' ) );
+		update_option('upload_path', get_blog_option(get_current_site()->blog_id, 'upload_path'));
 
-	update_option( 'blogname', wp_unslash( $blog_title ) );
-	update_option( 'admin_email', '' );
+	update_option('blogname', wp_unslash($blog_title));
+	update_option('admin_email', '');
 
 	// remove all perms
 	$table_prefix = $wpdb->get_blog_prefix();
-	delete_metadata( 'user', 0, $table_prefix . 'user_level',   null, true ); // delete all
-	delete_metadata( 'user', 0, $table_prefix . 'capabilities', null, true ); // delete all
+	delete_metadata('user', 0, $table_prefix.'user_level', null, true); // delete all
+	delete_metadata('user', 0, $table_prefix.'capabilities', null, true); // delete all
 }
 
 /**
@@ -1390,13 +1390,13 @@ 
 function install_blog_defaults($blog_id, $user_id) {
 	global $wpdb;
 
-	require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
+	require_once(ABSPATH.'wp-admin/includes/upgrade.php');
 
 	$suppress = $wpdb->suppress_errors();
 
 	wp_install_defaults($user_id);
 
-	$wpdb->suppress_errors( $suppress );
+	$wpdb->suppress_errors($suppress);
 }
 
 /**
@@ -1416,7 +1416,7 @@ 
  * @param array  $meta     Optional. Not used in the default function, but is passed along to hooks for customization.
  * @return bool
  */
-function wpmu_welcome_notification( $blog_id, $user_id, $password, $title, $meta = array() ) {
+function wpmu_welcome_notification($blog_id, $user_id, $password, $title, $meta = array()) {
 	$current_site = get_current_site();
 
 	/**
@@ -1432,13 +1432,13 @@ 
 	 * @param string   $title    Site title.
 	 * @param array    $meta     Signup meta data.
 	 */
-	if ( ! apply_filters( 'wpmu_welcome_notification', $blog_id, $user_id, $password, $title, $meta ) )
+	if ( ! apply_filters('wpmu_welcome_notification', $blog_id, $user_id, $password, $title, $meta))
 		return false;
 
-	$welcome_email = get_site_option( 'welcome_email' );
-	if ( $welcome_email == false ) {
+	$welcome_email = get_site_option('welcome_email');
+	if ($welcome_email == false) {
 		/* translators: Do not translate USERNAME, SITE_NAME, BLOG_URL, PASSWORD: those are placeholders. */
-		$welcome_email = __( 'Howdy USERNAME,
+		$welcome_email = __('Howdy USERNAME,
 
 Your new SITE_NAME site has been successfully set up at:
 BLOG_URL
@@ -1455,13 +1455,13 @@ 
 	}
 
 	$url = get_blogaddress_by_id($blog_id);
-	$user = get_userdata( $user_id );
+	$user = get_userdata($user_id);
 
-	$welcome_email = str_replace( 'SITE_NAME', $current_site->site_name, $welcome_email );
-	$welcome_email = str_replace( 'BLOG_TITLE', $title, $welcome_email );
-	$welcome_email = str_replace( 'BLOG_URL', $url, $welcome_email );
-	$welcome_email = str_replace( 'USERNAME', $user->user_login, $welcome_email );
-	$welcome_email = str_replace( 'PASSWORD', $password, $welcome_email );
+	$welcome_email = str_replace('SITE_NAME', $current_site->site_name, $welcome_email);
+	$welcome_email = str_replace('BLOG_TITLE', $title, $welcome_email);
+	$welcome_email = str_replace('BLOG_URL', $url, $welcome_email);
+	$welcome_email = str_replace('USERNAME', $user->user_login, $welcome_email);
+	$welcome_email = str_replace('PASSWORD', $password, $welcome_email);
 
 	/**
 	 * Filter the content of the welcome email after site activation.
@@ -1477,17 +1477,17 @@ 
 	 * @param string $title         Site title.
 	 * @param array  $meta          Signup meta data.
 	 */
-	$welcome_email = apply_filters( 'update_welcome_email', $welcome_email, $blog_id, $user_id, $password, $title, $meta );
-	$admin_email = get_site_option( 'admin_email' );
+	$welcome_email = apply_filters('update_welcome_email', $welcome_email, $blog_id, $user_id, $password, $title, $meta);
+	$admin_email = get_site_option('admin_email');
 
-	if ( $admin_email == '' )
-		$admin_email = 'support@' . $_SERVER['SERVER_NAME'];
+	if ($admin_email == '')
+		$admin_email = 'support@'.$_SERVER['SERVER_NAME'];
 
-	$from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
-	$message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
+	$from_name = get_site_option('site_name') == '' ? 'WordPress' : esc_html(get_site_option('site_name'));
+	$message_headers = "From: \"{$from_name}\" <{$admin_email}>\n"."Content-Type: text/plain; charset=\"".get_option('blog_charset')."\"\n";
 	$message = $welcome_email;
 
-	if ( empty( $current_site->site_name ) )
+	if (empty($current_site->site_name))
 		$current_site->site_name = 'WordPress';
 
 	/**
@@ -1497,8 +1497,8 @@ 
 	 *
 	 * @param string $subject Subject of the email.
 	 */
-	$subject = apply_filters( 'update_welcome_subject', sprintf( __( 'New %1$s Site: %2$s' ), $current_site->site_name, wp_unslash( $title ) ) );
-	wp_mail( $user->user_email, wp_specialchars_decode( $subject ), $message, $message_headers );
+	$subject = apply_filters('update_welcome_subject', sprintf(__('New %1$s Site: %2$s'), $current_site->site_name, wp_unslash($title)));
+	wp_mail($user->user_email, wp_specialchars_decode($subject), $message, $message_headers);
 	return true;
 }
 
@@ -1517,7 +1517,7 @@ 
  * @param array  $meta     Optional. Not used in the default function, but is passed along to hooks for customization.
  * @return bool
  */
-function wpmu_welcome_user_notification( $user_id, $password, $meta = array() ) {
+function wpmu_welcome_user_notification($user_id, $password, $meta = array()) {
 	$current_site = get_current_site();
 
 	/**
@@ -1531,12 +1531,12 @@ 
 	 * @param string $password User password.
 	 * @param array  $meta     Signup meta data.
 	 */
-	if ( ! apply_filters( 'wpmu_welcome_user_notification', $user_id, $password, $meta ) )
+	if ( ! apply_filters('wpmu_welcome_user_notification', $user_id, $password, $meta))
 		return false;
 
-	$welcome_email = get_site_option( 'welcome_user_email' );
+	$welcome_email = get_site_option('welcome_user_email');
 
-	$user = get_userdata( $user_id );
+	$user = get_userdata($user_id);
 
 	/**
 	 * Filters the content of the welcome email after user activation.
@@ -1550,22 +1550,22 @@ 
 	 * @param string $password      User password.
 	 * @param array  $meta          Signup meta data.
 	 */
-	$welcome_email = apply_filters( 'update_welcome_user_email', $welcome_email, $user_id, $password, $meta );
-	$welcome_email = str_replace( 'SITE_NAME', $current_site->site_name, $welcome_email );
-	$welcome_email = str_replace( 'USERNAME', $user->user_login, $welcome_email );
-	$welcome_email = str_replace( 'PASSWORD', $password, $welcome_email );
-	$welcome_email = str_replace( 'LOGINLINK', wp_login_url(), $welcome_email );
+	$welcome_email = apply_filters('update_welcome_user_email', $welcome_email, $user_id, $password, $meta);
+	$welcome_email = str_replace('SITE_NAME', $current_site->site_name, $welcome_email);
+	$welcome_email = str_replace('USERNAME', $user->user_login, $welcome_email);
+	$welcome_email = str_replace('PASSWORD', $password, $welcome_email);
+	$welcome_email = str_replace('LOGINLINK', wp_login_url(), $welcome_email);
 
-	$admin_email = get_site_option( 'admin_email' );
+	$admin_email = get_site_option('admin_email');
 
-	if ( $admin_email == '' )
-		$admin_email = 'support@' . $_SERVER['SERVER_NAME'];
+	if ($admin_email == '')
+		$admin_email = 'support@'.$_SERVER['SERVER_NAME'];
 
-	$from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
-	$message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
+	$from_name = get_site_option('site_name') == '' ? 'WordPress' : esc_html(get_site_option('site_name'));
+	$message_headers = "From: \"{$from_name}\" <{$admin_email}>\n"."Content-Type: text/plain; charset=\"".get_option('blog_charset')."\"\n";
 	$message = $welcome_email;
 
-	if ( empty( $current_site->site_name ) )
+	if (empty($current_site->site_name))
 		$current_site->site_name = 'WordPress';
 
 	/**
@@ -1575,8 +1575,8 @@ 
 	 *
 	 * @param string $subject Subject of the email.
 	 */
-	$subject = apply_filters( 'update_welcome_user_subject', sprintf( __( 'New %1$s User: %2$s' ), $current_site->site_name, $user->user_login) );
-	wp_mail( $user->user_email, wp_specialchars_decode( $subject ), $message, $message_headers );
+	$subject = apply_filters('update_welcome_user_subject', sprintf(__('New %1$s User: %2$s'), $current_site->site_name, $user->user_login));
+	wp_mail($user->user_email, wp_specialchars_decode($subject), $message, $message_headers);
 	return true;
 }
 
@@ -1612,26 +1612,26 @@ 
  * @param int $user_id
  * @return array Contains the blog_id, post_id, post_date_gmt, and post_gmt_ts
  */
-function get_most_recent_post_of_user( $user_id ) {
+function get_most_recent_post_of_user($user_id) {
 	global $wpdb;
 
-	$user_blogs = get_blogs_of_user( (int) $user_id );
+	$user_blogs = get_blogs_of_user((int) $user_id);
 	$most_recent_post = array();
 
 	// Walk through each blog and get the most recent post
 	// published by $user_id
-	foreach ( (array) $user_blogs as $blog ) {
-		$prefix = $wpdb->get_blog_prefix( $blog->userblog_id );
-		$recent_post = $wpdb->get_row( $wpdb->prepare("SELECT ID, post_date_gmt FROM {$prefix}posts WHERE post_author = %d AND post_type = 'post' AND post_status = 'publish' ORDER BY post_date_gmt DESC LIMIT 1", $user_id ), ARRAY_A);
+	foreach ((array) $user_blogs as $blog) {
+		$prefix = $wpdb->get_blog_prefix($blog->userblog_id);
+		$recent_post = $wpdb->get_row($wpdb->prepare("SELECT ID, post_date_gmt FROM {$prefix}posts WHERE post_author = %d AND post_type = 'post' AND post_status = 'publish' ORDER BY post_date_gmt DESC LIMIT 1", $user_id), ARRAY_A);
 
 		// Make sure we found a post
-		if ( isset($recent_post['ID']) ) {
+		if (isset($recent_post['ID'])) {
 			$post_gmt_ts = strtotime($recent_post['post_date_gmt']);
 
 			// If this is the first post checked or if this post is
 			// newer than the current recent post, make it the new
 			// most recent post.
-			if ( !isset($most_recent_post['post_gmt_ts']) || ( $post_gmt_ts > $most_recent_post['post_gmt_ts'] ) ) {
+			if ( ! isset($most_recent_post['post_gmt_ts']) || ($post_gmt_ts > $most_recent_post['post_gmt_ts'])) {
 				$most_recent_post = array(
 					'blog_id'		=> $blog->userblog_id,
 					'post_id'		=> $recent_post['ID'],
@@ -1658,24 +1658,24 @@ 
  * @param string $directory Full path of a directory.
  * @return int Size of the directory in MB.
  */
-function get_dirsize( $directory ) {
-	$dirsize = get_transient( 'dirsize_cache' );
-	if ( is_array( $dirsize ) && isset( $dirsize[ $directory ][ 'size' ] ) )
-		return $dirsize[ $directory ][ 'size' ];
+function get_dirsize($directory) {
+	$dirsize = get_transient('dirsize_cache');
+	if (is_array($dirsize) && isset($dirsize[$directory]['size']))
+		return $dirsize[$directory]['size'];
 
-	if ( ! is_array( $dirsize ) )
+	if ( ! is_array($dirsize))
 		$dirsize = array();
 
 	// Exclude individual site directories from the total when checking the main site,
 	// as they are subdirectories and should not be counted.
-	if ( is_main_site() ) {
-		$dirsize[ $directory ][ 'size' ] = recurse_dirsize( $directory, $directory . '/sites' );
+	if (is_main_site()) {
+		$dirsize[$directory]['size'] = recurse_dirsize($directory, $directory.'/sites');
 	} else {
-		$dirsize[ $directory ][ 'size' ] = recurse_dirsize( $directory );
+		$dirsize[$directory]['size'] = recurse_dirsize($directory);
 	}
 
-	set_transient( 'dirsize_cache', $dirsize, HOUR_IN_SECONDS );
-	return $dirsize[ $directory ][ 'size' ];
+	set_transient('dirsize_cache', $dirsize, HOUR_IN_SECONDS);
+	return $dirsize[$directory]['size'];
 }
 
 /**
@@ -1691,23 +1691,23 @@ 
  * @param string $exclude   Optional. Full path of a subdirectory to exclude from the total.
  * @return int|false Size in MB if a valid directory. False if not.
  */
-function recurse_dirsize( $directory, $exclude = null ) {
+function recurse_dirsize($directory, $exclude = null) {
 	$size = 0;
 
-	$directory = untrailingslashit( $directory );
+	$directory = untrailingslashit($directory);
 
-	if ( ! file_exists( $directory ) || ! is_dir( $directory ) || ! is_readable( $directory ) || $directory === $exclude ) {
+	if ( ! file_exists($directory) || ! is_dir($directory) || ! is_readable($directory) || $directory === $exclude) {
 		return false;
 	}
 
 	if ($handle = opendir($directory)) {
-		while(($file = readdir($handle)) !== false) {
+		while (($file = readdir($handle)) !== false) {
 			$path = $directory.'/'.$file;
 			if ($file != '.' && $file != '..') {
 				if (is_file($path)) {
 					$size += filesize($path);
 				} elseif (is_dir($path)) {
-					$handlesize = recurse_dirsize( $path, $exclude );
+					$handlesize = recurse_dirsize($path, $exclude);
 					if ($handlesize > 0)
 						$size += $handlesize;
 				}
@@ -1732,12 +1732,12 @@ 
  * @param array $mimes
  * @return array
  */
-function check_upload_mimes( $mimes ) {
-	$site_exts = explode( ' ', get_site_option( 'upload_filetypes', 'jpg jpeg png gif' ) );
+function check_upload_mimes($mimes) {
+	$site_exts = explode(' ', get_site_option('upload_filetypes', 'jpg jpeg png gif'));
 	$site_mimes = array();
-	foreach ( $site_exts as $ext ) {
-		foreach ( $mimes as $ext_pattern => $mime ) {
-			if ( $ext != '' && strpos( $ext_pattern, $ext ) !== false )
+	foreach ($site_exts as $ext) {
+		foreach ($mimes as $ext_pattern => $mime) {
+			if ($ext != '' && strpos($ext_pattern, $ext) !== false)
 				$site_mimes[$ext_pattern] = $mime;
 		}
 	}
@@ -1758,9 +1758,9 @@ 
  *
  * @param string $deprecated Not used.
  */
-function update_posts_count( $deprecated = '' ) {
+function update_posts_count($deprecated = '') {
 	global $wpdb;
-	update_option( 'post_count', (int) $wpdb->get_var( "SELECT COUNT(ID) FROM {$wpdb->posts} WHERE post_status = 'publish' and post_type = 'post'" ) );
+	update_option('post_count', (int) $wpdb->get_var("SELECT COUNT(ID) FROM {$wpdb->posts} WHERE post_status = 'publish' and post_type = 'post'"));
 }
 
 /**
@@ -1773,11 +1773,11 @@ 
  * @param int $blog_id
  * @param int $user_id
  */
-function wpmu_log_new_registrations( $blog_id, $user_id ) {
+function wpmu_log_new_registrations($blog_id, $user_id) {
 	global $wpdb;
-	$user = get_userdata( (int) $user_id );
-	if ( $user )
-		$wpdb->insert( $wpdb->registration_log, array('email' => $user->user_email, 'IP' => preg_replace( '/[^0-9., ]/', '', wp_unslash( $_SERVER['REMOTE_ADDR'] ) ), 'blog_id' => $blog_id, 'date_registered' => current_time('mysql')) );
+	$user = get_userdata((int) $user_id);
+	if ($user)
+		$wpdb->insert($wpdb->registration_log, array('email' => $user->user_email, 'IP' => preg_replace('/[^0-9., ]/', '', wp_unslash($_SERVER['REMOTE_ADDR'])), 'blog_id' => $blog_id, 'date_registered' => current_time('mysql')));
 }
 
 /**
@@ -1794,61 +1794,61 @@ 
  * @param string $deprecated Not used.
  * @return int An ID from the global terms table mapped from $term_id.
  */
-function global_terms( $term_id, $deprecated = '' ) {
+function global_terms($term_id, $deprecated = '') {
 	global $wpdb;
 	static $global_terms_recurse = null;
 
-	if ( !global_terms_enabled() )
+	if ( ! global_terms_enabled())
 		return $term_id;
 
 	// prevent a race condition
 	$recurse_start = false;
-	if ( $global_terms_recurse === null ) {
+	if ($global_terms_recurse === null) {
 		$recurse_start = true;
 		$global_terms_recurse = 1;
-	} elseif ( 10 < $global_terms_recurse++ ) {
+	} elseif (10 < $global_terms_recurse++) {
 		return $term_id;
 	}
 
-	$term_id = intval( $term_id );
-	$c = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM $wpdb->terms WHERE term_id = %d", $term_id ) );
+	$term_id = intval($term_id);
+	$c = $wpdb->get_row($wpdb->prepare("SELECT * FROM $wpdb->terms WHERE term_id = %d", $term_id));
 
-	$global_id = $wpdb->get_var( $wpdb->prepare( "SELECT cat_ID FROM $wpdb->sitecategories WHERE category_nicename = %s", $c->slug ) );
-	if ( $global_id == null ) {
-		$used_global_id = $wpdb->get_var( $wpdb->prepare( "SELECT cat_ID FROM $wpdb->sitecategories WHERE cat_ID = %d", $c->term_id ) );
-		if ( null == $used_global_id ) {
-			$wpdb->insert( $wpdb->sitecategories, array( 'cat_ID' => $term_id, 'cat_name' => $c->name, 'category_nicename' => $c->slug ) );
+	$global_id = $wpdb->get_var($wpdb->prepare("SELECT cat_ID FROM $wpdb->sitecategories WHERE category_nicename = %s", $c->slug));
+	if ($global_id == null) {
+		$used_global_id = $wpdb->get_var($wpdb->prepare("SELECT cat_ID FROM $wpdb->sitecategories WHERE cat_ID = %d", $c->term_id));
+		if (null == $used_global_id) {
+			$wpdb->insert($wpdb->sitecategories, array('cat_ID' => $term_id, 'cat_name' => $c->name, 'category_nicename' => $c->slug));
 			$global_id = $wpdb->insert_id;
-			if ( empty( $global_id ) )
+			if (empty($global_id))
 				return $term_id;
 		} else {
-			$max_global_id = $wpdb->get_var( "SELECT MAX(cat_ID) FROM $wpdb->sitecategories" );
-			$max_local_id = $wpdb->get_var( "SELECT MAX(term_id) FROM $wpdb->terms" );
-			$new_global_id = max( $max_global_id, $max_local_id ) + mt_rand( 100, 400 );
-			$wpdb->insert( $wpdb->sitecategories, array( 'cat_ID' => $new_global_id, 'cat_name' => $c->name, 'category_nicename' => $c->slug ) );
+			$max_global_id = $wpdb->get_var("SELECT MAX(cat_ID) FROM $wpdb->sitecategories");
+			$max_local_id = $wpdb->get_var("SELECT MAX(term_id) FROM $wpdb->terms");
+			$new_global_id = max($max_global_id, $max_local_id) + mt_rand(100, 400);
+			$wpdb->insert($wpdb->sitecategories, array('cat_ID' => $new_global_id, 'cat_name' => $c->name, 'category_nicename' => $c->slug));
 			$global_id = $wpdb->insert_id;
 		}
-	} elseif ( $global_id != $term_id ) {
-		$local_id = $wpdb->get_var( $wpdb->prepare( "SELECT term_id FROM $wpdb->terms WHERE term_id = %d", $global_id ) );
-		if ( null != $local_id ) {
-			global_terms( $local_id );
-			if ( 10 < $global_terms_recurse ) {
+	} elseif ($global_id != $term_id) {
+		$local_id = $wpdb->get_var($wpdb->prepare("SELECT term_id FROM $wpdb->terms WHERE term_id = %d", $global_id));
+		if (null != $local_id) {
+			global_terms($local_id);
+			if (10 < $global_terms_recurse) {
 				$global_id = $term_id;
 			}
 		}
 	}
 
-	if ( $global_id != $term_id ) {
-		if ( get_option( 'default_category' ) == $term_id )
-			update_option( 'default_category', $global_id );
+	if ($global_id != $term_id) {
+		if (get_option('default_category') == $term_id)
+			update_option('default_category', $global_id);
 
-		$wpdb->update( $wpdb->terms, array('term_id' => $global_id), array('term_id' => $term_id) );
-		$wpdb->update( $wpdb->term_taxonomy, array('term_id' => $global_id), array('term_id' => $term_id) );
-		$wpdb->update( $wpdb->term_taxonomy, array('parent' => $global_id), array('parent' => $term_id) );
+		$wpdb->update($wpdb->terms, array('term_id' => $global_id), array('term_id' => $term_id));
+		$wpdb->update($wpdb->term_taxonomy, array('term_id' => $global_id), array('term_id' => $term_id));
+		$wpdb->update($wpdb->term_taxonomy, array('parent' => $global_id), array('parent' => $term_id));
 
 		clean_term_cache($term_id);
 	}
-	if ( $recurse_start )
+	if ($recurse_start)
 		$global_terms_recurse = null;
 
 	return $global_id;
@@ -1863,8 +1863,8 @@ 
  * @param array|string $deprecated Not used.
  * @return array The current site's domain
  */
-function redirect_this_site( $deprecated = '' ) {
-	return array( get_current_site()->domain );
+function redirect_this_site($deprecated = '') {
+	return array(get_current_site()->domain);
 }
 
 /**
@@ -1877,12 +1877,12 @@ 
  * @param array $upload
  * @return string|array If the upload is under the size limit, $upload is returned. Otherwise returns an error message.
  */
-function upload_is_file_too_big( $upload ) {
-	if ( ! is_array( $upload ) || defined( 'WP_IMPORTING' ) || get_site_option( 'upload_space_check_disabled' ) )
+function upload_is_file_too_big($upload) {
+	if ( ! is_array($upload) || defined('WP_IMPORTING') || get_site_option('upload_space_check_disabled'))
 		return $upload;
 
-	if ( strlen( $upload['bits'] )  > ( KB_IN_BYTES * get_site_option( 'fileupload_maxk', 1500 ) ) ) {
-		return sprintf( __( 'This file is too big. Files must be less than %d KB in size.' ) . '<br />', get_site_option( 'fileupload_maxk', 1500 ) );
+	if (strlen($upload['bits']) > (KB_IN_BYTES * get_site_option('fileupload_maxk', 1500))) {
+		return sprintf(__('This file is too big. Files must be less than %d KB in size.').'<br />', get_site_option('fileupload_maxk', 1500));
 	}
 
 	return $upload;
@@ -1896,7 +1896,7 @@ 
 function signup_nonce_fields() {
 	$id = mt_rand();
 	echo "<input type='hidden' name='signup_form_id' value='{$id}' />";
-	wp_nonce_field('signup_form_' . $id, '_signup_form', false);
+	wp_nonce_field('signup_form_'.$id, '_signup_form', false);
 }
 
 /**
@@ -1907,12 +1907,12 @@ 
  * @param array $result
  * @return array
  */
-function signup_nonce_check( $result ) {
-	if ( !strpos( $_SERVER[ 'PHP_SELF' ], 'wp-signup.php' ) )
+function signup_nonce_check($result) {
+	if ( ! strpos($_SERVER['PHP_SELF'], 'wp-signup.php'))
 		return $result;
 
-	if ( wp_create_nonce('signup_form_' . $_POST[ 'signup_form_id' ]) != $_POST['_signup_form'] )
-		wp_die( __( 'Please try again.' ) );
+	if (wp_create_nonce('signup_form_'.$_POST['signup_form_id']) != $_POST['_signup_form'])
+		wp_die(__('Please try again.'));
 
 	return $result;
 }
@@ -1932,10 +1932,10 @@ 
 	 *
 	 * @param string $no_blog_redirect The redirect URL defined in NOBLOGREDIRECT.
 	 */
-	if ( is_main_site() && is_404() && defined( 'NOBLOGREDIRECT' ) && ( $destination = apply_filters( 'blog_redirect_404', NOBLOGREDIRECT ) ) ) {
-		if ( $destination == '%siteurl%' )
+	if (is_main_site() && is_404() && defined('NOBLOGREDIRECT') && ($destination = apply_filters('blog_redirect_404', NOBLOGREDIRECT))) {
+		if ($destination == '%siteurl%')
 			$destination = network_home_url();
-		wp_redirect( $destination );
+		wp_redirect($destination);
 		exit();
 	}
 }
@@ -1950,23 +1950,23 @@ 
  * @since MU
  */
 function maybe_add_existing_user_to_blog() {
-	if ( false === strpos( $_SERVER[ 'REQUEST_URI' ], '/newbloguser/' ) )
+	if (false === strpos($_SERVER['REQUEST_URI'], '/newbloguser/'))
 		return;
 
-	$parts = explode( '/', $_SERVER[ 'REQUEST_URI' ] );
-	$key = array_pop( $parts );
+	$parts = explode('/', $_SERVER['REQUEST_URI']);
+	$key = array_pop($parts);
 
-	if ( $key == '' )
-		$key = array_pop( $parts );
+	if ($key == '')
+		$key = array_pop($parts);
 
-	$details = get_option( 'new_user_' . $key );
-	if ( !empty( $details ) )
-		delete_option( 'new_user_' . $key );
+	$details = get_option('new_user_'.$key);
+	if ( ! empty($details))
+		delete_option('new_user_'.$key);
 
-	if ( empty( $details ) || is_wp_error( add_existing_user_to_blog( $details ) ) )
-		wp_die( sprintf(__('An error occurred adding you to this site. Back to the <a href="%s">homepage</a>.'), home_url() ) );
+	if (empty($details) || is_wp_error(add_existing_user_to_blog($details)))
+		wp_die(sprintf(__('An error occurred adding you to this site. Back to the <a href="%s">homepage</a>.'), home_url()));
 
-	wp_die( sprintf( __( 'You have been added to this site. Please visit the <a href="%s">homepage</a> or <a href="%s">log in</a> using your username and password.' ), home_url(), admin_url() ), __( 'WordPress &rsaquo; Success' ), array( 'response' => 200 ) );
+	wp_die(sprintf(__('You have been added to this site. Please visit the <a href="%s">homepage</a> or <a href="%s">log in</a> using your username and password.'), home_url(), admin_url()), __('WordPress &rsaquo; Success'), array('response' => 200));
 }
 
 /**
@@ -1979,11 +1979,11 @@ 
  * @param array $details
  * @return true|WP_Error|void
  */
-function add_existing_user_to_blog( $details = false ) {
+function add_existing_user_to_blog($details = false) {
 	global $blog_id;
 
-	if ( is_array( $details ) ) {
-		$result = add_user_to_blog( $blog_id, $details[ 'user_id' ], $details[ 'role' ] );
+	if (is_array($details)) {
+		$result = add_user_to_blog($blog_id, $details['user_id'], $details['role']);
 		/**
 		 * Fires immediately after an existing user is added to a site.
 		 *
@@ -1992,7 +1992,7 @@ 
 		 * @param int   $user_id User ID.
 		 * @param mixed $result  True on success or a WP_Error object if the user doesn't exist.
 		 */
-		do_action( 'added_existing_user', $details['user_id'], $result );
+		do_action('added_existing_user', $details['user_id'], $result);
 		return $result;
 	}
 }
@@ -2010,13 +2010,13 @@ 
  * @param mixed $password Ignored.
  * @param array $meta
  */
-function add_new_user_to_blog( $user_id, $password, $meta ) {
-	if ( !empty( $meta[ 'add_to_blog' ] ) ) {
-		$blog_id = $meta[ 'add_to_blog' ];
-		$role = $meta[ 'new_role' ];
+function add_new_user_to_blog($user_id, $password, $meta) {
+	if ( ! empty($meta['add_to_blog'])) {
+		$blog_id = $meta['add_to_blog'];
+		$role = $meta['new_role'];
 		remove_user_from_blog($user_id, get_current_site()->blog_id); // remove user from main blog.
-		add_user_to_blog( $blog_id, $user_id, $role );
-		update_user_meta( $user_id, 'primary_blog', $blog_id );
+		add_user_to_blog($blog_id, $user_id, $role);
+		update_user_meta($user_id, 'primary_blog', $blog_id);
 	}
 }
 
@@ -2027,7 +2027,7 @@ 
  *
  * @param PHPMailer $phpmailer The PHPMailer instance, passed by reference.
  */
-function fix_phpmailer_messageid( $phpmailer ) {
+function fix_phpmailer_messageid($phpmailer) {
 	$phpmailer->Hostname = get_current_site()->domain;
 }
 
@@ -2040,16 +2040,16 @@ 
  * 	                           or user login name as a string.
  * @return bool
  */
-function is_user_spammy( $user = null ) {
-    if ( ! ( $user instanceof WP_User ) ) {
-		if ( $user ) {
-			$user = get_user_by( 'login', $user );
+function is_user_spammy($user = null) {
+    if ( ! ($user instanceof WP_User)) {
+		if ($user) {
+			$user = get_user_by('login', $user);
 		} else {
 			$user = wp_get_current_user();
 		}
 	}
 
-	return $user && isset( $user->spam ) && 1 == $user->spam;
+	return $user && isset($user->spam) && 1 == $user->spam;
 }
 
 /**
@@ -2062,8 +2062,8 @@ 
  * @param int $old_value
  * @param int $value     The new public value
  */
-function update_blog_public( $old_value, $value ) {
-	update_blog_status( get_current_blog_id(), 'public', (int) $value );
+function update_blog_public($old_value, $value) {
+	update_blog_status(get_current_blog_id(), 'public', (int) $value);
 }
 
 /**
@@ -2078,16 +2078,16 @@ 
  * @param int    $blog_id Optional. Defaults to current blog.
  * @return bool
  */
-function is_user_option_local( $key, $user_id = 0, $blog_id = 0 ) {
+function is_user_option_local($key, $user_id = 0, $blog_id = 0) {
 	global $wpdb;
 
 	$current_user = wp_get_current_user();
-	if ( $blog_id == 0 ) {
+	if ($blog_id == 0) {
 		$blog_id = $wpdb->blogid;
 	}
-	$local_key = $wpdb->get_blog_prefix( $blog_id ) . $key;
+	$local_key = $wpdb->get_blog_prefix($blog_id).$key;
 
-	return isset( $current_user->$local_key );
+	return isset($current_user->$local_key);
 }
 
 /**
@@ -2099,7 +2099,7 @@ 
  */
 function users_can_register_signup_filter() {
 	$registration = get_site_option('registration');
-	return ( $registration == 'all' || $registration == 'user' );
+	return ($registration == 'all' || $registration == 'user');
 }
 
 /**
@@ -2110,12 +2110,12 @@ 
  * @param string $text
  * @return string
  */
-function welcome_user_msg_filter( $text ) {
-	if ( !$text ) {
-		remove_filter( 'site_option_welcome_user_email', 'welcome_user_msg_filter' );
+function welcome_user_msg_filter($text) {
+	if ( ! $text) {
+		remove_filter('site_option_welcome_user_email', 'welcome_user_msg_filter');
 
 		/* translators: Do not translate USERNAME, PASSWORD, LOGINLINK, SITE_NAME: those are placeholders. */
-		$text = __( 'Howdy USERNAME,
+		$text = __('Howdy USERNAME,
 
 Your new account is set up.
 
@@ -2127,7 +2127,7 @@ 
 Thanks!
 
 --The Team @ SITE_NAME' );
-		update_site_option( 'welcome_user_email', $text );
+		update_site_option('welcome_user_email', $text);
 	}
 	return $text;
 }
@@ -2142,10 +2142,10 @@ 
  * @param bool $force
  * @return bool True if forced, false if not forced.
  */
-function force_ssl_content( $force = '' ) {
+function force_ssl_content($force = '') {
 	static $forced_content = false;
 
-	if ( '' != $force ) {
+	if ('' != $force) {
 		$old_forced = $forced_content;
 		$forced_content = $force;
 		return $old_forced;
@@ -2164,12 +2164,12 @@ 
  * @param string $url URL
  * @return string URL with https as the scheme
  */
-function filter_SSL( $url ) {
-	if ( ! is_string( $url ) )
-		return get_bloginfo( 'url' ); // Return home blog url with proper scheme
+function filter_SSL($url) {
+	if ( ! is_string($url))
+		return get_bloginfo('url'); // Return home blog url with proper scheme
 
-	if ( force_ssl_content() && is_ssl() )
-		$url = set_url_scheme( $url, 'https' );
+	if (force_ssl_content() && is_ssl())
+		$url = set_url_scheme($url, 'https');
 
 	return $url;
 }
@@ -2180,10 +2180,10 @@ 
  * @since 3.1.0
  */
 function wp_schedule_update_network_counts() {
-	if ( !is_main_site() )
+	if ( ! is_main_site())
 		return;
 
-	if ( ! wp_next_scheduled('update_network_counts') && ! wp_installing() )
+	if ( ! wp_next_scheduled('update_network_counts') && ! wp_installing())
 		wp_schedule_event(time(), 'twicedaily', 'update_network_counts');
 }
 
@@ -2206,7 +2206,7 @@ 
  * @since 3.7.0
  */
 function wp_maybe_update_network_site_counts() {
-	$is_small_network = ! wp_is_large_network( 'sites' );
+	$is_small_network = ! wp_is_large_network('sites');
 
 	/**
 	 * Filter whether to update network site or user counts when a new site is created.
@@ -2218,7 +2218,7 @@ 
 	 * @param bool   $small_network Whether the network is considered small.
 	 * @param string $context       Context. Either 'users' or 'sites'.
 	 */
-	if ( ! apply_filters( 'enable_live_network_counts', $is_small_network, 'sites' ) )
+	if ( ! apply_filters('enable_live_network_counts', $is_small_network, 'sites'))
 		return;
 
 	wp_update_network_site_counts();
@@ -2233,10 +2233,10 @@ 
  * @since 3.7.0
  */
 function wp_maybe_update_network_user_counts() {
-	$is_small_network = ! wp_is_large_network( 'users' );
+	$is_small_network = ! wp_is_large_network('users');
 
 	/** This filter is documented in wp-includes/ms-functions.php */
-	if ( ! apply_filters( 'enable_live_network_counts', $is_small_network, 'users' ) )
+	if ( ! apply_filters('enable_live_network_counts', $is_small_network, 'users'))
 		return;
 
 	wp_update_network_user_counts();
@@ -2252,8 +2252,8 @@ 
 function wp_update_network_site_counts() {
 	global $wpdb;
 
-	$count = $wpdb->get_var( $wpdb->prepare("SELECT COUNT(blog_id) as c FROM $wpdb->blogs WHERE site_id = %d AND spam = '0' AND deleted = '0' and archived = '0'", $wpdb->siteid) );
-	update_site_option( 'blog_count', $count );
+	$count = $wpdb->get_var($wpdb->prepare("SELECT COUNT(blog_id) as c FROM $wpdb->blogs WHERE site_id = %d AND spam = '0' AND deleted = '0' and archived = '0'", $wpdb->siteid));
+	update_site_option('blog_count', $count);
 }
 
 /**
@@ -2266,8 +2266,8 @@ 
 function wp_update_network_user_counts() {
 	global $wpdb;
 
-	$count = $wpdb->get_var( "SELECT COUNT(ID) as c FROM $wpdb->users WHERE spam = '0' AND deleted = '0'" );
-	update_site_option( 'user_count', $count );
+	$count = $wpdb->get_var("SELECT COUNT(ID) as c FROM $wpdb->users WHERE spam = '0' AND deleted = '0'");
+	update_site_option('user_count', $count);
 }
 
 /**
@@ -2285,10 +2285,10 @@ 
 	 *
 	 * @param int|bool $space_used The amount of used space, in megabytes. Default false.
 	 */
-	$space_used = apply_filters( 'pre_get_space_used', false );
-	if ( false === $space_used ) {
+	$space_used = apply_filters('pre_get_space_used', false);
+	if (false === $space_used) {
 		$upload_dir = wp_upload_dir();
-		$space_used = get_dirsize( $upload_dir['basedir'] ) / MB_IN_BYTES;
+		$space_used = get_dirsize($upload_dir['basedir']) / MB_IN_BYTES;
 	}
 
 	return $space_used;
@@ -2302,12 +2302,12 @@ 
  * @return int Quota in megabytes
  */
 function get_space_allowed() {
-	$space_allowed = get_option( 'blog_upload_space' );
+	$space_allowed = get_option('blog_upload_space');
 
-	if ( ! is_numeric( $space_allowed ) )
-		$space_allowed = get_site_option( 'blog_upload_space' );
+	if ( ! is_numeric($space_allowed))
+		$space_allowed = get_site_option('blog_upload_space');
 
-	if ( ! is_numeric( $space_allowed ) )
+	if ( ! is_numeric($space_allowed))
 		$space_allowed = 100;
 
 	/**
@@ -2317,7 +2317,7 @@ 
 	 *
 	 * @param int $space_allowed Upload quota in megabytes for the current blog.
 	 */
-	return apply_filters( 'get_space_allowed', $space_allowed );
+	return apply_filters('get_space_allowed', $space_allowed);
 }
 
 /**
@@ -2329,16 +2329,16 @@ 
  */
 function get_upload_space_available() {
 	$allowed = get_space_allowed();
-	if ( $allowed < 0 ) {
+	if ($allowed < 0) {
 		$allowed = 0;
 	}
 	$space_allowed = $allowed * MB_IN_BYTES;
-	if ( get_site_option( 'upload_space_check_disabled' ) )
+	if (get_site_option('upload_space_check_disabled'))
 		return $space_allowed;
 
 	$space_used = get_space_used() * MB_IN_BYTES;
 
-	if ( ( $space_allowed - $space_used ) <= 0 )
+	if (($space_allowed - $space_used) <= 0)
 		return 0;
 
 	return $space_allowed - $space_used;
@@ -2351,7 +2351,7 @@ 
  * @return bool True if space is available, false otherwise.
  */
 function is_upload_space_available() {
-	if ( get_site_option( 'upload_space_check_disabled' ) )
+	if (get_site_option('upload_space_check_disabled'))
 		return true;
 
 	return (bool) get_upload_space_available();
@@ -2365,12 +2365,12 @@ 
  * @param  int $size Upload size limit in bytes.
  * @return int       Upload size limit in bytes.
  */
-function upload_size_limit_filter( $size ) {
-	$fileupload_maxk = KB_IN_BYTES * get_site_option( 'fileupload_maxk', 1500 );
-	if ( get_site_option( 'upload_space_check_disabled' ) )
-		return min( $size, $fileupload_maxk );
+function upload_size_limit_filter($size) {
+	$fileupload_maxk = KB_IN_BYTES * get_site_option('fileupload_maxk', 1500);
+	if (get_site_option('upload_space_check_disabled'))
+		return min($size, $fileupload_maxk);
 
-	return min( $size, $fileupload_maxk, get_upload_space_available() );
+	return min($size, $fileupload_maxk, get_upload_space_available());
 }
 
 /**
@@ -2383,8 +2383,8 @@ 
  * @param string $using 'sites or 'users'. Default is 'sites'.
  * @return bool True if the network meets the criteria for large. False otherwise.
  */
-function wp_is_large_network( $using = 'sites' ) {
-	if ( 'users' == $using ) {
+function wp_is_large_network($using = 'sites') {
+	if ('users' == $using) {
 		$count = get_user_count();
 		/**
 		 * Filter whether the network is considered large.
@@ -2395,12 +2395,12 @@ 
 		 * @param string $component        The component to count. Accepts 'users', or 'sites'.
 		 * @param int    $count            The count of items for the component.
 		 */
-		return apply_filters( 'wp_is_large_network', $count > 10000, 'users', $count );
+		return apply_filters('wp_is_large_network', $count > 10000, 'users', $count);
 	}
 
 	$count = get_blog_count();
 	/** This filter is documented in wp-includes/ms-functions.php */
-	return apply_filters( 'wp_is_large_network', $count > 10000, 'sites', $count );
+	return apply_filters('wp_is_large_network', $count > 10000, 'sites', $count);
 }
 
 
@@ -2429,10 +2429,10 @@ 
  *               site domain and path, dates registered and modified, and the language ID. Also, boolean
  *               values for whether the site is public, archived, mature, spam, and/or deleted.
  */
-function wp_get_sites( $args = array() ) {
+function wp_get_sites($args = array()) {
 	global $wpdb;
 
-	if ( wp_is_large_network() )
+	if (wp_is_large_network())
 		return array();
 
 	$defaults = array(
@@ -2446,38 +2446,38 @@ 
 		'offset'     => 0,
 	);
 
-	$args = wp_parse_args( $args, $defaults );
+	$args = wp_parse_args($args, $defaults);
 
 	$query = "SELECT * FROM $wpdb->blogs WHERE 1=1 ";
 
-	if ( isset( $args['network_id'] ) && ( is_array( $args['network_id'] ) || is_numeric( $args['network_id'] ) ) ) {
-		$network_ids = implode( ',', wp_parse_id_list( $args['network_id'] ) );
+	if (isset($args['network_id']) && (is_array($args['network_id']) || is_numeric($args['network_id']))) {
+		$network_ids = implode(',', wp_parse_id_list($args['network_id']));
 		$query .= "AND site_id IN ($network_ids) ";
 	}
 
-	if ( isset( $args['public'] ) )
-		$query .= $wpdb->prepare( "AND public = %d ", $args['public'] );
+	if (isset($args['public']))
+		$query .= $wpdb->prepare("AND public = %d ", $args['public']);
 
-	if ( isset( $args['archived'] ) )
-		$query .= $wpdb->prepare( "AND archived = %d ", $args['archived'] );
+	if (isset($args['archived']))
+		$query .= $wpdb->prepare("AND archived = %d ", $args['archived']);
 
-	if ( isset( $args['mature'] ) )
-		$query .= $wpdb->prepare( "AND mature = %d ", $args['mature'] );
+	if (isset($args['mature']))
+		$query .= $wpdb->prepare("AND mature = %d ", $args['mature']);
 
-	if ( isset( $args['spam'] ) )
-		$query .= $wpdb->prepare( "AND spam = %d ", $args['spam'] );
+	if (isset($args['spam']))
+		$query .= $wpdb->prepare("AND spam = %d ", $args['spam']);
 
-	if ( isset( $args['deleted'] ) )
-		$query .= $wpdb->prepare( "AND deleted = %d ", $args['deleted'] );
+	if (isset($args['deleted']))
+		$query .= $wpdb->prepare("AND deleted = %d ", $args['deleted']);
 
-	if ( isset( $args['limit'] ) && $args['limit'] ) {
-		if ( isset( $args['offset'] ) && $args['offset'] )
-			$query .= $wpdb->prepare( "LIMIT %d , %d ", $args['offset'], $args['limit'] );
+	if (isset($args['limit']) && $args['limit']) {
+		if (isset($args['offset']) && $args['offset'])
+			$query .= $wpdb->prepare("LIMIT %d , %d ", $args['offset'], $args['limit']);
 		else
-			$query .= $wpdb->prepare( "LIMIT %d ", $args['limit'] );
+			$query .= $wpdb->prepare("LIMIT %d ", $args['limit']);
 	}
 
-	$site_results = $wpdb->get_results( $query, ARRAY_A );
+	$site_results = $wpdb->get_results($query, ARRAY_A);
 
 	return $site_results;
 }
@@ -2504,5 +2504,5 @@ 
 	 *
 	 * @param array $subdirectory_reserved_names Array of reserved names.
 	 */
-	return apply_filters( 'subdirectory_reserved_names', $names );
+	return apply_filters('subdirectory_reserved_names', $names);
 }

Braces +303 added lines, -207 removed lines

@@ -42,11 +42,13 @@ 
 function get_active_blog_for_user( $user_id ) {
 	global $wpdb;
 	$blogs = get_blogs_of_user( $user_id );
-	if ( empty( $blogs ) )
-		return;
+	if ( empty( $blogs ) ) {
+			return;
+	}
 
-	if ( !is_multisite() )
-		return $blogs[$wpdb->blogid];
+	if ( !is_multisite() ) {
+			return $blogs[$wpdb->blogid];
+	}
 
 	$primary_blog = get_user_meta( $user_id, 'primary_blog', true );
 	$first_blog = current($blogs);
@@ -69,15 +71,18 @@ 
 		$ret = false;
 		if ( is_array( $blogs ) && count( $blogs ) > 0 ) {
 			foreach ( (array) $blogs as $blog_id => $blog ) {
-				if ( $blog->site_id != $wpdb->siteid )
-					continue;
+				if ( $blog->site_id != $wpdb->siteid ) {
+									continue;
+				}
 				$details = get_blog_details( $blog_id );
 				if ( is_object( $details ) && $details->archived == 0 && $details->spam == 0 && $details->deleted == 0 ) {
 					$ret = $blog;
-					if ( get_user_meta( $user_id , 'primary_blog', true ) != $blog_id )
-						update_user_meta( $user_id, 'primary_blog', $blog_id );
-					if ( !get_user_meta($user_id , 'source_domain', true) )
-						update_user_meta( $user_id, 'source_domain', $blog->domain );
+					if ( get_user_meta( $user_id , 'primary_blog', true ) != $blog_id ) {
+											update_user_meta( $user_id, 'primary_blog', $blog_id );
+					}
+					if ( !get_user_meta($user_id , 'source_domain', true) ) {
+											update_user_meta( $user_id, 'source_domain', $blog->domain );
+					}
 					break;
 				}
 			}
@@ -114,8 +119,9 @@ 
  * @return int
  */
 function get_blog_count( $network_id = 0 ) {
-	if ( func_num_args() )
-		_deprecated_argument( __FUNCTION__, '3.1' );
+	if ( func_num_args() ) {
+			_deprecated_argument( __FUNCTION__, '3.1' );
+	}
 
 	return get_site_option( 'blog_count' );
 }
@@ -224,8 +230,9 @@ 
 		$new_domain = '';
 		$blogs = get_blogs_of_user($user_id);
 		foreach ( (array) $blogs as $blog ) {
-			if ( $blog->userblog_id == $blog_id )
-				continue;
+			if ( $blog->userblog_id == $blog_id ) {
+							continue;
+			}
 			$new_id = $blog->userblog_id;
 			$new_domain = $blog->domain;
 			break;
@@ -311,10 +318,12 @@ 
 	$path = strtolower( $path );
 	$id = wp_cache_get( md5( $domain . $path ), 'blog-id-cache' );
 
-	if ( $id == -1 ) // blog does not exist
+	if ( $id == -1 ) {
+		// blog does not exist
 		return 0;
-	elseif ( $id )
-		return (int) $id;
+	} elseif ( $id ) {
+			return (int) $id;
+	}
 
 	$id = $wpdb->get_var( $wpdb->prepare( "SELECT blog_id FROM $wpdb->blogs WHERE domain = %s and path = %s /* get_blog_id_from_url */", $domain, $path ) );
 
@@ -345,8 +354,9 @@ 
  */
 function is_email_address_unsafe( $user_email ) {
 	$banned_names = get_site_option( 'banned_email_domains' );
-	if ( $banned_names && ! is_array( $banned_names ) )
-		$banned_names = explode( "\n", $banned_names );
+	if ( $banned_names && ! is_array( $banned_names ) ) {
+			$banned_names = explode( "\n", $banned_names );
+	}
 
 	$is_email_address_unsafe = false;
 
@@ -357,8 +367,9 @@ 
 		list( $email_local_part, $email_domain ) = explode( '@', $normalized_email );
 
 		foreach ( $banned_names as $banned_domain ) {
-			if ( ! $banned_domain )
-				continue;
+			if ( ! $banned_domain ) {
+							continue;
+			}
 
 			if ( $email_domain == $banned_domain ) {
 				$is_email_address_unsafe = true;
@@ -419,8 +430,9 @@ 
 
 	$user_email = sanitize_email( $user_email );
 
-	if ( empty( $user_name ) )
-	   	$errors->add('user_name', __( 'Please enter a username.' ) );
+	if ( empty( $user_name ) ) {
+		   	$errors->add('user_name', __( 'Please enter a username.' ) );
+	}
 
 	$illegal_names = get_site_option( 'illegal_names' );
 	if ( ! is_array( $illegal_names ) ) {
@@ -438,22 +450,26 @@ 
 		$errors->add( 'user_name',  __( 'Sorry, that username is not allowed.' ) );
 	}
 
-	if ( is_email_address_unsafe( $user_email ) )
-		$errors->add('user_email',  __('You cannot use that email address to signup. We are having problems with them blocking some of our email. Please use another email provider.'));
+	if ( is_email_address_unsafe( $user_email ) ) {
+			$errors->add('user_email',  __('You cannot use that email address to signup. We are having problems with them blocking some of our email. Please use another email provider.'));
+	}
 
-	if ( strlen( $user_name ) < 4 )
-		$errors->add('user_name',  __( 'Username must be at least 4 characters.' ) );
+	if ( strlen( $user_name ) < 4 ) {
+			$errors->add('user_name',  __( 'Username must be at least 4 characters.' ) );
+	}
 
 	if ( strlen( $user_name ) > 60 ) {
 		$errors->add( 'user_name', __( 'Username may not be longer than 60 characters.' ) );
 	}
 
 	// all numeric?
-	if ( preg_match( '/^[0-9]*$/', $user_name ) )
-		$errors->add('user_name', __('Sorry, usernames must have letters too!'));
+	if ( preg_match( '/^[0-9]*$/', $user_name ) ) {
+			$errors->add('user_name', __('Sorry, usernames must have letters too!'));
+	}
 
-	if ( !is_email( $user_email ) )
-		$errors->add('user_email', __( 'Please enter a valid email address.' ) );
+	if ( !is_email( $user_email ) ) {
+			$errors->add('user_email', __( 'Please enter a valid email address.' ) );
+	}
 
 	$limited_email_domains = get_site_option( 'limited_email_domains' );
 	if ( is_array( $limited_email_domains ) && ! empty( $limited_email_domains ) ) {
@@ -464,12 +480,14 @@ 
 	}
 
 	// Check if the username has been used already.
-	if ( username_exists($user_name) )
-		$errors->add( 'user_name', __( 'Sorry, that username already exists!' ) );
+	if ( username_exists($user_name) ) {
+			$errors->add( 'user_name', __( 'Sorry, that username already exists!' ) );
+	}
 
 	// Check if the email address has been used already.
-	if ( email_exists($user_email) )
-		$errors->add( 'user_email', __( 'Sorry, that email address is already used!' ) );
+	if ( email_exists($user_email) ) {
+			$errors->add( 'user_email', __( 'Sorry, that email address is already used!' ) );
+	}
 
 	// Has someone already signed up for this username?
 	$signup = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->signups WHERE user_login = %s", $user_name) );
@@ -478,20 +496,22 @@ 
 		$now = current_time( 'timestamp', true );
 		$diff = $now - $registered_at;
 		// If registered more than two days ago, cancel registration and let this signup go through.
-		if ( $diff > 2 * DAY_IN_SECONDS )
-			$wpdb->delete( $wpdb->signups, array( 'user_login' => $user_name ) );
-		else
-			$errors->add('user_name', __('That username is currently reserved but may be available in a couple of days.'));
+		if ( $diff > 2 * DAY_IN_SECONDS ) {
+					$wpdb->delete( $wpdb->signups, array( 'user_login' => $user_name ) );
+		} else {
+					$errors->add('user_name', __('That username is currently reserved but may be available in a couple of days.'));
+		}
 	}
 
 	$signup = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->signups WHERE user_email = %s", $user_email) );
 	if ( $signup != null ) {
 		$diff = current_time( 'timestamp', true ) - mysql2date('U', $signup->registered);
 		// If registered more than two days ago, cancel registration and let this signup go through.
-		if ( $diff > 2 * DAY_IN_SECONDS )
-			$wpdb->delete( $wpdb->signups, array( 'user_email' => $user_email ) );
-		else
-			$errors->add('user_email', __('That email address has already been used. Please check your inbox for an activation email. It will become available in a couple of days if you do nothing.'));
+		if ( $diff > 2 * DAY_IN_SECONDS ) {
+					$wpdb->delete( $wpdb->signups, array( 'user_email' => $user_email ) );
+		} else {
+					$errors->add('user_email', __('That email address has already been used. Please check your inbox for an activation email. It will become available in a couple of days if you do nothing.'));
+		}
 	}
 
 	$result = array('user_name' => $user_name, 'orig_username' => $orig_username, 'user_email' => $user_email, 'errors' => $errors);
@@ -563,26 +583,31 @@ 
 		$illegal_names = array_merge( $illegal_names, get_subdirectory_reserved_names() );
 	}
 
-	if ( empty( $blogname ) )
-		$errors->add('blogname', __( 'Please enter a site name.' ) );
+	if ( empty( $blogname ) ) {
+			$errors->add('blogname', __( 'Please enter a site name.' ) );
+	}
 
 	if ( preg_match( '/[^a-z0-9]+/', $blogname ) ) {
 		$errors->add( 'blogname', __( 'Site names can only contain lowercase letters (a-z) and numbers.' ) );
 	}
 
-	if ( in_array( $blogname, $illegal_names ) )
-		$errors->add('blogname',  __( 'That name is not allowed.' ) );
+	if ( in_array( $blogname, $illegal_names ) ) {
+			$errors->add('blogname',  __( 'That name is not allowed.' ) );
+	}
 
-	if ( strlen( $blogname ) < 4 && !is_super_admin() )
-		$errors->add('blogname',  __( 'Site name must be at least 4 characters.' ) );
+	if ( strlen( $blogname ) < 4 && !is_super_admin() ) {
+			$errors->add('blogname',  __( 'Site name must be at least 4 characters.' ) );
+	}
 
 	// do not allow users to create a blog that conflicts with a page on the main blog.
-	if ( !is_subdomain_install() && $wpdb->get_var( $wpdb->prepare( "SELECT post_name FROM " . $wpdb->get_blog_prefix( $current_site->blog_id ) . "posts WHERE post_type = 'page' AND post_name = %s", $blogname ) ) )
-		$errors->add( 'blogname', __( 'Sorry, you may not use that site name.' ) );
+	if ( !is_subdomain_install() && $wpdb->get_var( $wpdb->prepare( "SELECT post_name FROM " . $wpdb->get_blog_prefix( $current_site->blog_id ) . "posts WHERE post_type = 'page' AND post_name = %s", $blogname ) ) ) {
+			$errors->add( 'blogname', __( 'Sorry, you may not use that site name.' ) );
+	}
 
 	// all numeric?
-	if ( preg_match( '/^[0-9]*$/', $blogname ) )
-		$errors->add('blogname', __('Sorry, site names must have letters too!'));
+	if ( preg_match( '/^[0-9]*$/', $blogname ) ) {
+			$errors->add('blogname', __('Sorry, site names must have letters too!'));
+	}
 
 	/**
 	 * Filter the new site name during registration.
@@ -598,8 +623,9 @@ 
 
 	$blog_title = wp_unslash(  $blog_title );
 
-	if ( empty( $blog_title ) )
-		$errors->add('blog_title', __( 'Please enter a site title.' ) );
+	if ( empty( $blog_title ) ) {
+			$errors->add('blog_title', __( 'Please enter a site title.' ) );
+	}
 
 	// Check if the domain/path has been used already.
 	if ( is_subdomain_install() ) {
@@ -609,12 +635,14 @@ 
 		$mydomain = "$domain";
 		$path = $base.$blogname.'/';
 	}
-	if ( domain_exists($mydomain, $path, $current_site->id) )
-		$errors->add( 'blogname', __( 'Sorry, that site already exists!' ) );
+	if ( domain_exists($mydomain, $path, $current_site->id) ) {
+			$errors->add( 'blogname', __( 'Sorry, that site already exists!' ) );
+	}
 
 	if ( username_exists( $blogname ) ) {
-		if ( ! is_object( $user ) || ( is_object($user) && ( $user->user_login != $blogname ) ) )
-			$errors->add( 'blogname', __( 'Sorry, that site is reserved!' ) );
+		if ( ! is_object( $user ) || ( is_object($user) && ( $user->user_login != $blogname ) ) ) {
+					$errors->add( 'blogname', __( 'Sorry, that site is reserved!' ) );
+		}
 	}
 
 	// Has someone already signed up for this domain?
@@ -622,10 +650,11 @@ 
 	if ( ! empty($signup) ) {
 		$diff = current_time( 'timestamp', true ) - mysql2date('U', $signup->registered);
 		// If registered more than two days ago, cancel registration and let this signup go through.
-		if ( $diff > 2 * DAY_IN_SECONDS )
-			$wpdb->delete( $wpdb->signups, array( 'domain' => $mydomain , 'path' => $path ) );
-		else
-			$errors->add('blogname', __('That site is currently reserved but may be available in a couple days.'));
+		if ( $diff > 2 * DAY_IN_SECONDS ) {
+					$wpdb->delete( $wpdb->signups, array( 'domain' => $mydomain , 'path' => $path ) );
+		} else {
+					$errors->add('blogname', __('That site is currently reserved but may be available in a couple days.'));
+		}
 	}
 
 	$result = array('domain' => $mydomain, 'path' => $path, 'blogname' => $blogname, 'blog_title' => $blog_title, 'user' => $user, 'errors' => $errors);
@@ -786,15 +815,18 @@ 
 	}
 
 	// Send email with activation link.
-	if ( !is_subdomain_install() || get_current_site()->id != 1 )
-		$activate_url = network_site_url("wp-activate.php?key=$key");
-	else
-		$activate_url = "http://{$domain}{$path}wp-activate.php?key=$key"; // @todo use *_url() API
+	if ( !is_subdomain_install() || get_current_site()->id != 1 ) {
+			$activate_url = network_site_url("wp-activate.php?key=$key");
+	} else {
+			$activate_url = "http://{$domain}{$path}wp-activate.php?key=$key";
+	}
+	// @todo use *_url() API
 
 	$activate_url = esc_url($activate_url);
 	$admin_email = get_site_option( 'admin_email' );
-	if ( $admin_email == '' )
-		$admin_email = 'support@' . $_SERVER['SERVER_NAME'];
+	if ( $admin_email == '' ) {
+			$admin_email = 'support@' . $_SERVER['SERVER_NAME'];
+	}
 	$from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
 	$message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
 	$message = sprintf(
@@ -881,13 +913,15 @@ 
 	 * @param string $key        Activation key created in wpmu_signup_user().
 	 * @param array  $meta       Signup meta data.
 	 */
-	if ( ! apply_filters( 'wpmu_signup_user_notification', $user, $user_email, $key, $meta ) )
-		return false;
+	if ( ! apply_filters( 'wpmu_signup_user_notification', $user, $user_email, $key, $meta ) ) {
+			return false;
+	}
 
 	// Send email with activation link.
 	$admin_email = get_site_option( 'admin_email' );
-	if ( $admin_email == '' )
-		$admin_email = 'support@' . $_SERVER['SERVER_NAME'];
+	if ( $admin_email == '' ) {
+			$admin_email = 'support@' . $_SERVER['SERVER_NAME'];
+	}
 	$from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
 	$message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
 	$message = sprintf(
@@ -954,14 +988,16 @@ 
 
 	$signup = $wpdb->get_row( $wpdb->prepare("SELECT * FROM $wpdb->signups WHERE activation_key = %s", $key) );
 
-	if ( empty( $signup ) )
-		return new WP_Error( 'invalid_key', __( 'Invalid activation key.' ) );
+	if ( empty( $signup ) ) {
+			return new WP_Error( 'invalid_key', __( 'Invalid activation key.' ) );
+	}
 
 	if ( $signup->active ) {
-		if ( empty( $signup->domain ) )
-			return new WP_Error( 'already_active', __( 'The user is already active.' ), $signup );
-		else
-			return new WP_Error( 'already_active', __( 'The site is already active.' ), $signup );
+		if ( empty( $signup->domain ) ) {
+					return new WP_Error( 'already_active', __( 'The user is already active.' ), $signup );
+		} else {
+					return new WP_Error( 'already_active', __( 'The site is already active.' ), $signup );
+		}
 	}
 
 	$meta = maybe_unserialize($signup->meta);
@@ -969,21 +1005,24 @@ 
 
 	$user_id = username_exists($signup->user_login);
 
-	if ( ! $user_id )
-		$user_id = wpmu_create_user($signup->user_login, $password, $signup->user_email);
-	else
-		$user_already_exists = true;
+	if ( ! $user_id ) {
+			$user_id = wpmu_create_user($signup->user_login, $password, $signup->user_email);
+	} else {
+			$user_already_exists = true;
+	}
 
-	if ( ! $user_id )
-		return new WP_Error('create_user', __('Could not create user'), $signup);
+	if ( ! $user_id ) {
+			return new WP_Error('create_user', __('Could not create user'), $signup);
+	}
 
 	$now = current_time('mysql', true);
 
 	if ( empty($signup->domain) ) {
 		$wpdb->update( $wpdb->signups, array('active' => 1, 'activated' => $now), array('activation_key' => $key) );
 
-		if ( isset( $user_already_exists ) )
-			return new WP_Error( 'user_already_exists', __( 'That username is already activated.' ), $signup);
+		if ( isset( $user_already_exists ) ) {
+					return new WP_Error( 'user_already_exists', __( 'That username is already activated.' ), $signup);
+		}
 
 		/**
 		 * Fires immediately after a new user is activated.
@@ -1047,8 +1086,9 @@ 
 	$user_name = preg_replace( '/\s+/', '', sanitize_user( $user_name, true ) );
 
 	$user_id = wp_create_user( $user_name, $password, $email );
-	if ( is_wp_error( $user_id ) )
-		return false;
+	if ( is_wp_error( $user_id ) ) {
+			return false;
+	}
 
 	// Newly created users have no roles or caps until they are added to a blog.
 	delete_user_option( $user_id, 'capabilities' );
@@ -1094,25 +1134,29 @@ 
 
 	$domain = preg_replace( '/\s+/', '', sanitize_user( $domain, true ) );
 
-	if ( is_subdomain_install() )
-		$domain = str_replace( '@', '', $domain );
+	if ( is_subdomain_install() ) {
+			$domain = str_replace( '@', '', $domain );
+	}
 
 	$title = strip_tags( $title );
 	$user_id = (int) $user_id;
 
-	if ( empty($path) )
-		$path = '/';
+	if ( empty($path) ) {
+			$path = '/';
+	}
 
 	// Check if the domain has been used already. We should return an error message.
-	if ( domain_exists($domain, $path, $site_id) )
-		return new WP_Error( 'blog_taken', __( 'Sorry, that site already exists!' ) );
+	if ( domain_exists($domain, $path, $site_id) ) {
+			return new WP_Error( 'blog_taken', __( 'Sorry, that site already exists!' ) );
+	}
 
 	if ( ! wp_installing() ) {
 		wp_installing( true );
 	}
 
-	if ( ! $blog_id = insert_blog($domain, $path, $site_id) )
-		return new WP_Error('insert_blog', __('Could not create site.'));
+	if ( ! $blog_id = insert_blog($domain, $path, $site_id) ) {
+			return new WP_Error('insert_blog', __('Could not create site.'));
+	}
 
 	switch_to_blog($blog_id);
 	install_blog($blog_id, $title);
@@ -1121,17 +1165,19 @@ 
 	add_user_to_blog($blog_id, $user_id, 'administrator');
 
 	foreach ( $meta as $key => $value ) {
-		if ( in_array( $key, array( 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id' ) ) )
-			update_blog_status( $blog_id, $key, $value );
-		else
-			update_option( $key, $value );
+		if ( in_array( $key, array( 'public', 'archived', 'mature', 'spam', 'deleted', 'lang_id' ) ) ) {
+					update_blog_status( $blog_id, $key, $value );
+		} else {
+					update_option( $key, $value );
+		}
 	}
 
 	add_option( 'WPLANG', get_site_option( 'WPLANG' ) );
 	update_option( 'blog_public', (int) $meta['public'] );
 
-	if ( ! is_super_admin( $user_id ) && ! get_user_meta( $user_id, 'primary_blog', true ) )
-		update_user_meta( $user_id, 'primary_blog', $blog_id );
+	if ( ! is_super_admin( $user_id ) && ! get_user_meta( $user_id, 'primary_blog', true ) ) {
+			update_user_meta( $user_id, 'primary_blog', $blog_id );
+	}
 
 	restore_current_blog();
 	/**
@@ -1164,12 +1210,14 @@ 
  * @return bool
  */
 function newblog_notify_siteadmin( $blog_id, $deprecated = '' ) {
-	if ( get_site_option( 'registrationnotification' ) != 'yes' )
-		return false;
+	if ( get_site_option( 'registrationnotification' ) != 'yes' ) {
+			return false;
+	}
 
 	$email = get_site_option( 'admin_email' );
-	if ( is_email($email) == false )
-		return false;
+	if ( is_email($email) == false ) {
+			return false;
+	}
 
 	$options_site_url = esc_url(network_admin_url('settings.php'));
 
@@ -1209,13 +1257,15 @@ 
  * @return bool
  */
 function newuser_notify_siteadmin( $user_id ) {
-	if ( get_site_option( 'registrationnotification' ) != 'yes' )
-		return false;
+	if ( get_site_option( 'registrationnotification' ) != 'yes' ) {
+			return false;
+	}
 
 	$email = get_site_option( 'admin_email' );
 
-	if ( is_email($email) == false )
-		return false;
+	if ( is_email($email) == false ) {
+			return false;
+	}
 
 	$user = get_userdata( $user_id );
 
@@ -1294,8 +1344,9 @@ 
 	$site_id = (int) $site_id;
 
 	$result = $wpdb->insert( $wpdb->blogs, array('site_id' => $site_id, 'domain' => $domain, 'path' => $path, 'registered' => current_time('mysql')) );
-	if ( ! $result )
-		return false;
+	if ( ! $result ) {
+			return false;
+	}
 
 	$blog_id = $wpdb->insert_id;
 	refresh_blog_details( $blog_id );
@@ -1329,8 +1380,9 @@ 
 	require_once( ABSPATH . 'wp-admin/includes/upgrade.php' );
 
 	$suppress = $wpdb->suppress_errors();
-	if ( $wpdb->get_results( "DESCRIBE {$wpdb->posts}" ) )
-		die( '<h1>' . __( 'Already Installed' ) . '</h1><p>' . __( 'You appear to have already installed WordPress. To reinstall please clear your old database tables first.' ) . '</p></body></html>' );
+	if ( $wpdb->get_results( "DESCRIBE {$wpdb->posts}" ) ) {
+			die( '<h1>' . __( 'Already Installed' ) . '</h1><p>' . __( 'You appear to have already installed WordPress. To reinstall please clear your old database tables first.' ) . '</p></body></html>' );
+	}
 	$wpdb->suppress_errors( $suppress );
 
 	$url = get_blogaddress_by_id( $blog_id );
@@ -1359,10 +1411,11 @@ 
 	update_option( 'siteurl', $siteurl );
 	update_option( 'home', $home );
 
-	if ( get_site_option( 'ms_files_rewriting' ) )
-		update_option( 'upload_path', UPLOADBLOGSDIR . "/$blog_id/files" );
-	else
-		update_option( 'upload_path', get_blog_option( get_current_site()->blog_id, 'upload_path' ) );
+	if ( get_site_option( 'ms_files_rewriting' ) ) {
+			update_option( 'upload_path', UPLOADBLOGSDIR . "/$blog_id/files" );
+	} else {
+			update_option( 'upload_path', get_blog_option( get_current_site()->blog_id, 'upload_path' ) );
+	}
 
 	update_option( 'blogname', wp_unslash( $blog_title ) );
 	update_option( 'admin_email', '' );
@@ -1432,8 +1485,9 @@ 
 	 * @param string   $title    Site title.
 	 * @param array    $meta     Signup meta data.
 	 */
-	if ( ! apply_filters( 'wpmu_welcome_notification', $blog_id, $user_id, $password, $title, $meta ) )
-		return false;
+	if ( ! apply_filters( 'wpmu_welcome_notification', $blog_id, $user_id, $password, $title, $meta ) ) {
+			return false;
+	}
 
 	$welcome_email = get_site_option( 'welcome_email' );
 	if ( $welcome_email == false ) {
@@ -1480,15 +1534,17 @@ 
 	$welcome_email = apply_filters( 'update_welcome_email', $welcome_email, $blog_id, $user_id, $password, $title, $meta );
 	$admin_email = get_site_option( 'admin_email' );
 
-	if ( $admin_email == '' )
-		$admin_email = 'support@' . $_SERVER['SERVER_NAME'];
+	if ( $admin_email == '' ) {
+			$admin_email = 'support@' . $_SERVER['SERVER_NAME'];
+	}
 
 	$from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
 	$message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
 	$message = $welcome_email;
 
-	if ( empty( $current_site->site_name ) )
-		$current_site->site_name = 'WordPress';
+	if ( empty( $current_site->site_name ) ) {
+			$current_site->site_name = 'WordPress';
+	}
 
 	/**
 	 * Filter the subject of the welcome email after site activation.
@@ -1531,8 +1587,9 @@ 
 	 * @param string $password User password.
 	 * @param array  $meta     Signup meta data.
 	 */
-	if ( ! apply_filters( 'wpmu_welcome_user_notification', $user_id, $password, $meta ) )
-		return false;
+	if ( ! apply_filters( 'wpmu_welcome_user_notification', $user_id, $password, $meta ) ) {
+			return false;
+	}
 
 	$welcome_email = get_site_option( 'welcome_user_email' );
 
@@ -1558,15 +1615,17 @@ 
 
 	$admin_email = get_site_option( 'admin_email' );
 
-	if ( $admin_email == '' )
-		$admin_email = 'support@' . $_SERVER['SERVER_NAME'];
+	if ( $admin_email == '' ) {
+			$admin_email = 'support@' . $_SERVER['SERVER_NAME'];
+	}
 
 	$from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
 	$message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
 	$message = $welcome_email;
 
-	if ( empty( $current_site->site_name ) )
-		$current_site->site_name = 'WordPress';
+	if ( empty( $current_site->site_name ) ) {
+			$current_site->site_name = 'WordPress';
+	}
 
 	/**
 	 * Filter the subject of the welcome email after user activation.
@@ -1660,11 +1719,13 @@ 
  */
 function get_dirsize( $directory ) {
 	$dirsize = get_transient( 'dirsize_cache' );
-	if ( is_array( $dirsize ) && isset( $dirsize[ $directory ][ 'size' ] ) )
-		return $dirsize[ $directory ][ 'size' ];
+	if ( is_array( $dirsize ) && isset( $dirsize[ $directory ][ 'size' ] ) ) {
+			return $dirsize[ $directory ][ 'size' ];
+	}
 
-	if ( ! is_array( $dirsize ) )
-		$dirsize = array();
+	if ( ! is_array( $dirsize ) ) {
+			$dirsize = array();
+	}
 
 	// Exclude individual site directories from the total when checking the main site,
 	// as they are subdirectories and should not be counted.
@@ -1708,8 +1769,9 @@ 
 					$size += filesize($path);
 				} elseif (is_dir($path)) {
 					$handlesize = recurse_dirsize( $path, $exclude );
-					if ($handlesize > 0)
-						$size += $handlesize;
+					if ($handlesize > 0) {
+											$size += $handlesize;
+					}
 				}
 			}
 		}
@@ -1737,8 +1799,9 @@ 
 	$site_mimes = array();
 	foreach ( $site_exts as $ext ) {
 		foreach ( $mimes as $ext_pattern => $mime ) {
-			if ( $ext != '' && strpos( $ext_pattern, $ext ) !== false )
-				$site_mimes[$ext_pattern] = $mime;
+			if ( $ext != '' && strpos( $ext_pattern, $ext ) !== false ) {
+							$site_mimes[$ext_pattern] = $mime;
+			}
 		}
 	}
 	return $site_mimes;
@@ -1776,9 +1839,10 @@ 
 function wpmu_log_new_registrations( $blog_id, $user_id ) {
 	global $wpdb;
 	$user = get_userdata( (int) $user_id );
-	if ( $user )
-		$wpdb->insert( $wpdb->registration_log, array('email' => $user->user_email, 'IP' => preg_replace( '/[^0-9., ]/', '', wp_unslash( $_SERVER['REMOTE_ADDR'] ) ), 'blog_id' => $blog_id, 'date_registered' => current_time('mysql')) );
-}
+	if ( $user ) {
+			$wpdb->insert( $wpdb->registration_log, array('email' => $user->user_email, 'IP' => preg_replace( '/[^0-9., ]/', '', wp_unslash( $_SERVER['REMOTE_ADDR'] ) ), 'blog_id' => $blog_id, 'date_registered' => current_time('mysql')) );
+	}
+	}
 
 /**
  * Maintains a canonical list of terms by syncing terms created for each blog with the global terms table.
@@ -1798,8 +1862,9 @@ 
 	global $wpdb;
 	static $global_terms_recurse = null;
 
-	if ( !global_terms_enabled() )
-		return $term_id;
+	if ( !global_terms_enabled() ) {
+			return $term_id;
+	}
 
 	// prevent a race condition
 	$recurse_start = false;
@@ -1819,8 +1884,9 @@ 
 		if ( null == $used_global_id ) {
 			$wpdb->insert( $wpdb->sitecategories, array( 'cat_ID' => $term_id, 'cat_name' => $c->name, 'category_nicename' => $c->slug ) );
 			$global_id = $wpdb->insert_id;
-			if ( empty( $global_id ) )
-				return $term_id;
+			if ( empty( $global_id ) ) {
+							return $term_id;
+			}
 		} else {
 			$max_global_id = $wpdb->get_var( "SELECT MAX(cat_ID) FROM $wpdb->sitecategories" );
 			$max_local_id = $wpdb->get_var( "SELECT MAX(term_id) FROM $wpdb->terms" );
@@ -1839,8 +1905,9 @@ 
 	}
 
 	if ( $global_id != $term_id ) {
-		if ( get_option( 'default_category' ) == $term_id )
-			update_option( 'default_category', $global_id );
+		if ( get_option( 'default_category' ) == $term_id ) {
+					update_option( 'default_category', $global_id );
+		}
 
 		$wpdb->update( $wpdb->terms, array('term_id' => $global_id), array('term_id' => $term_id) );
 		$wpdb->update( $wpdb->term_taxonomy, array('term_id' => $global_id), array('term_id' => $term_id) );
@@ -1848,8 +1915,9 @@ 
 
 		clean_term_cache($term_id);
 	}
-	if ( $recurse_start )
-		$global_terms_recurse = null;
+	if ( $recurse_start ) {
+			$global_terms_recurse = null;
+	}
 
 	return $global_id;
 }
@@ -1878,8 +1946,9 @@ 
  * @return string|array If the upload is under the size limit, $upload is returned. Otherwise returns an error message.
  */
 function upload_is_file_too_big( $upload ) {
-	if ( ! is_array( $upload ) || defined( 'WP_IMPORTING' ) || get_site_option( 'upload_space_check_disabled' ) )
-		return $upload;
+	if ( ! is_array( $upload ) || defined( 'WP_IMPORTING' ) || get_site_option( 'upload_space_check_disabled' ) ) {
+			return $upload;
+	}
 
 	if ( strlen( $upload['bits'] )  > ( KB_IN_BYTES * get_site_option( 'fileupload_maxk', 1500 ) ) ) {
 		return sprintf( __( 'This file is too big. Files must be less than %d KB in size.' ) . '<br />', get_site_option( 'fileupload_maxk', 1500 ) );
@@ -1908,11 +1977,13 @@ 
  * @return array
  */
 function signup_nonce_check( $result ) {
-	if ( !strpos( $_SERVER[ 'PHP_SELF' ], 'wp-signup.php' ) )
-		return $result;
+	if ( !strpos( $_SERVER[ 'PHP_SELF' ], 'wp-signup.php' ) ) {
+			return $result;
+	}
 
-	if ( wp_create_nonce('signup_form_' . $_POST[ 'signup_form_id' ]) != $_POST['_signup_form'] )
-		wp_die( __( 'Please try again.' ) );
+	if ( wp_create_nonce('signup_form_' . $_POST[ 'signup_form_id' ]) != $_POST['_signup_form'] ) {
+			wp_die( __( 'Please try again.' ) );
+	}
 
 	return $result;
 }
@@ -1933,8 +2004,9 @@ 
 	 * @param string $no_blog_redirect The redirect URL defined in NOBLOGREDIRECT.
 	 */
 	if ( is_main_site() && is_404() && defined( 'NOBLOGREDIRECT' ) && ( $destination = apply_filters( 'blog_redirect_404', NOBLOGREDIRECT ) ) ) {
-		if ( $destination == '%siteurl%' )
-			$destination = network_home_url();
+		if ( $destination == '%siteurl%' ) {
+					$destination = network_home_url();
+		}
 		wp_redirect( $destination );
 		exit();
 	}
@@ -1950,21 +2022,25 @@ 
  * @since MU
  */
 function maybe_add_existing_user_to_blog() {
-	if ( false === strpos( $_SERVER[ 'REQUEST_URI' ], '/newbloguser/' ) )
-		return;
+	if ( false === strpos( $_SERVER[ 'REQUEST_URI' ], '/newbloguser/' ) ) {
+			return;
+	}
 
 	$parts = explode( '/', $_SERVER[ 'REQUEST_URI' ] );
 	$key = array_pop( $parts );
 
-	if ( $key == '' )
-		$key = array_pop( $parts );
+	if ( $key == '' ) {
+			$key = array_pop( $parts );
+	}
 
 	$details = get_option( 'new_user_' . $key );
-	if ( !empty( $details ) )
-		delete_option( 'new_user_' . $key );
+	if ( !empty( $details ) ) {
+			delete_option( 'new_user_' . $key );
+	}
 
-	if ( empty( $details ) || is_wp_error( add_existing_user_to_blog( $details ) ) )
-		wp_die( sprintf(__('An error occurred adding you to this site. Back to the <a href="%s">homepage</a>.'), home_url() ) );
+	if ( empty( $details ) || is_wp_error( add_existing_user_to_blog( $details ) ) ) {
+			wp_die( sprintf(__('An error occurred adding you to this site. Back to the <a href="%s">homepage</a>.'), home_url() ) );
+	}
 
 	wp_die( sprintf( __( 'You have been added to this site. Please visit the <a href="%s">homepage</a> or <a href="%s">log in</a> using your username and password.' ), home_url(), admin_url() ), __( 'WordPress &rsaquo; Success' ), array( 'response' => 200 ) );
 }
@@ -2165,11 +2241,14 @@ 
  * @return string URL with https as the scheme
  */
 function filter_SSL( $url ) {
-	if ( ! is_string( $url ) )
-		return get_bloginfo( 'url' ); // Return home blog url with proper scheme
+	if ( ! is_string( $url ) ) {
+			return get_bloginfo( 'url' );
+	}
+	// Return home blog url with proper scheme
 
-	if ( force_ssl_content() && is_ssl() )
-		$url = set_url_scheme( $url, 'https' );
+	if ( force_ssl_content() && is_ssl() ) {
+			$url = set_url_scheme( $url, 'https' );
+	}
 
 	return $url;
 }
@@ -2180,12 +2259,14 @@ 
  * @since 3.1.0
  */
 function wp_schedule_update_network_counts() {
-	if ( !is_main_site() )
-		return;
+	if ( !is_main_site() ) {
+			return;
+	}
 
-	if ( ! wp_next_scheduled('update_network_counts') && ! wp_installing() )
-		wp_schedule_event(time(), 'twicedaily', 'update_network_counts');
-}
+	if ( ! wp_next_scheduled('update_network_counts') && ! wp_installing() ) {
+			wp_schedule_event(time(), 'twicedaily', 'update_network_counts');
+	}
+	}
 
 /**
  *  Update the network-wide counts for the current network.
@@ -2218,8 +2299,9 @@ 
 	 * @param bool   $small_network Whether the network is considered small.
 	 * @param string $context       Context. Either 'users' or 'sites'.
 	 */
-	if ( ! apply_filters( 'enable_live_network_counts', $is_small_network, 'sites' ) )
-		return;
+	if ( ! apply_filters( 'enable_live_network_counts', $is_small_network, 'sites' ) ) {
+			return;
+	}
 
 	wp_update_network_site_counts();
 }
@@ -2236,8 +2318,9 @@ 
 	$is_small_network = ! wp_is_large_network( 'users' );
 
 	/** This filter is documented in wp-includes/ms-functions.php */
-	if ( ! apply_filters( 'enable_live_network_counts', $is_small_network, 'users' ) )
-		return;
+	if ( ! apply_filters( 'enable_live_network_counts', $is_small_network, 'users' ) ) {
+			return;
+	}
 
 	wp_update_network_user_counts();
 }
@@ -2304,11 +2387,13 @@ 
 function get_space_allowed() {
 	$space_allowed = get_option( 'blog_upload_space' );
 
-	if ( ! is_numeric( $space_allowed ) )
-		$space_allowed = get_site_option( 'blog_upload_space' );
+	if ( ! is_numeric( $space_allowed ) ) {
+			$space_allowed = get_site_option( 'blog_upload_space' );
+	}
 
-	if ( ! is_numeric( $space_allowed ) )
-		$space_allowed = 100;
+	if ( ! is_numeric( $space_allowed ) ) {
+			$space_allowed = 100;
+	}
 
 	/**
 	 * Filter the upload quota for the current site.
@@ -2333,13 +2418,15 @@ 
 		$allowed = 0;
 	}
 	$space_allowed = $allowed * MB_IN_BYTES;
-	if ( get_site_option( 'upload_space_check_disabled' ) )
-		return $space_allowed;
+	if ( get_site_option( 'upload_space_check_disabled' ) ) {
+			return $space_allowed;
+	}
 
 	$space_used = get_space_used() * MB_IN_BYTES;
 
-	if ( ( $space_allowed - $space_used ) <= 0 )
-		return 0;
+	if ( ( $space_allowed - $space_used ) <= 0 ) {
+			return 0;
+	}
 
 	return $space_allowed - $space_used;
 }
@@ -2351,8 +2438,9 @@ 
  * @return bool True if space is available, false otherwise.
  */
 function is_upload_space_available() {
-	if ( get_site_option( 'upload_space_check_disabled' ) )
-		return true;
+	if ( get_site_option( 'upload_space_check_disabled' ) ) {
+			return true;
+	}
 
 	return (bool) get_upload_space_available();
 }
@@ -2367,8 +2455,9 @@ 
  */
 function upload_size_limit_filter( $size ) {
 	$fileupload_maxk = KB_IN_BYTES * get_site_option( 'fileupload_maxk', 1500 );
-	if ( get_site_option( 'upload_space_check_disabled' ) )
-		return min( $size, $fileupload_maxk );
+	if ( get_site_option( 'upload_space_check_disabled' ) ) {
+			return min( $size, $fileupload_maxk );
+	}
 
 	return min( $size, $fileupload_maxk, get_upload_space_available() );
 }
@@ -2432,8 +2521,9 @@ 
 function wp_get_sites( $args = array() ) {
 	global $wpdb;
 
-	if ( wp_is_large_network() )
-		return array();
+	if ( wp_is_large_network() ) {
+			return array();
+	}
 
 	$defaults = array(
 		'network_id' => $wpdb->siteid,
@@ -2455,26 +2545,32 @@ 
 		$query .= "AND site_id IN ($network_ids) ";
 	}
 
-	if ( isset( $args['public'] ) )
-		$query .= $wpdb->prepare( "AND public = %d ", $args['public'] );
+	if ( isset( $args['public'] ) ) {
+			$query .= $wpdb->prepare( "AND public = %d ", $args['public'] );
+	}
 
-	if ( isset( $args['archived'] ) )
-		$query .= $wpdb->prepare( "AND archived = %d ", $args['archived'] );
+	if ( isset( $args['archived'] ) ) {
+			$query .= $wpdb->prepare( "AND archived = %d ", $args['archived'] );
+	}
 
-	if ( isset( $args['mature'] ) )
-		$query .= $wpdb->prepare( "AND mature = %d ", $args['mature'] );
+	if ( isset( $args['mature'] ) ) {
+			$query .= $wpdb->prepare( "AND mature = %d ", $args['mature'] );
+	}
 
-	if ( isset( $args['spam'] ) )
-		$query .= $wpdb->prepare( "AND spam = %d ", $args['spam'] );
+	if ( isset( $args['spam'] ) ) {
+			$query .= $wpdb->prepare( "AND spam = %d ", $args['spam'] );
+	}
 
-	if ( isset( $args['deleted'] ) )
-		$query .= $wpdb->prepare( "AND deleted = %d ", $args['deleted'] );
+	if ( isset( $args['deleted'] ) ) {
+			$query .= $wpdb->prepare( "AND deleted = %d ", $args['deleted'] );
+	}
 
 	if ( isset( $args['limit'] ) && $args['limit'] ) {
-		if ( isset( $args['offset'] ) && $args['offset'] )
-			$query .= $wpdb->prepare( "LIMIT %d , %d ", $args['offset'], $args['limit'] );
-		else
-			$query .= $wpdb->prepare( "LIMIT %d ", $args['limit'] );
+		if ( isset( $args['offset'] ) && $args['offset'] ) {
+					$query .= $wpdb->prepare( "LIMIT %d , %d ", $args['offset'], $args['limit'] );
+		} else {
+					$query .= $wpdb->prepare( "LIMIT %d ", $args['limit'] );
+		}
 	}
 
 	$site_results = $wpdb->get_results( $query, ARRAY_A );

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) {

Spacing +520 added lines, -520 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,48 +181,48 @@ 
 	 * @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 ( 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
-	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;
 		}
@@ -231,69 +231,69 @@ 
 		$bcc = 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;
 					default:
 						// Add it to our grand headers array
-						$headers[trim( $name )] = trim( $content );
+						$headers[trim($name)] = trim($content);
 						break;
 				}
 			}
@@ -308,7 +308,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
@@ -318,14 +318,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;
 	}
 
 	/**
@@ -335,7 +335,7 @@ 
 	 *
 	 * @param string $from_email Email address to send from.
 	 */
-	$phpmailer->From = apply_filters( 'wp_mail_from', $from_email );
+	$phpmailer->From = apply_filters('wp_mail_from', $from_email);
 
 	/**
 	 * Filter the name to associate with the "from" email address.
@@ -344,24 +344,24 @@ 
 	 *
 	 * @param string $from_name Name associated with the "from" email address.
 	 */
-	$phpmailer->FromName = apply_filters( 'wp_mail_from_name', $from_name );
+	$phpmailer->FromName = apply_filters('wp_mail_from_name', $from_name);
 
 	// Set destination addresses
-	if ( !is_array( $to ) )
-		$to = explode( ',', $to );
+	if ( ! is_array($to))
+		$to = explode(',', $to);
 
-	foreach ( (array) $to as $recipient ) {
+	foreach ((array) $to as $recipient) {
 		try {
 			// Break $recipient into name and address parts if in the format "Foo <bar@baz.com>"
 			$recipient_name = '';
-			if ( preg_match( '/(.*)<(.+)>/', $recipient, $matches ) ) {
-				if ( count( $matches ) == 3 ) {
+			if (preg_match('/(.*)<(.+)>/', $recipient, $matches)) {
+				if (count($matches) == 3) {
 					$recipient_name = $matches[1];
 					$recipient = $matches[2];
 				}
 			}
-			$phpmailer->AddAddress( $recipient, $recipient_name);
-		} catch ( phpmailerException $e ) {
+			$phpmailer->AddAddress($recipient, $recipient_name);
+		} catch (phpmailerException $e) {
 			continue;
 		}
 	}
@@ -371,37 +371,37 @@ 
 	$phpmailer->Body    = $message;
 
 	// Add any CC and BCC recipients
-	if ( !empty( $cc ) ) {
-		foreach ( (array) $cc as $recipient ) {
+	if ( ! empty($cc)) {
+		foreach ((array) $cc as $recipient) {
 			try {
 				// Break $recipient into name and address parts if in the format "Foo <bar@baz.com>"
 				$recipient_name = '';
-				if ( preg_match( '/(.*)<(.+)>/', $recipient, $matches ) ) {
-					if ( count( $matches ) == 3 ) {
+				if (preg_match('/(.*)<(.+)>/', $recipient, $matches)) {
+					if (count($matches) == 3) {
 						$recipient_name = $matches[1];
 						$recipient = $matches[2];
 					}
 				}
-				$phpmailer->AddCc( $recipient, $recipient_name );
-			} catch ( phpmailerException $e ) {
+				$phpmailer->AddCc($recipient, $recipient_name);
+			} catch (phpmailerException $e) {
 				continue;
 			}
 		}
 	}
 
-	if ( !empty( $bcc ) ) {
-		foreach ( (array) $bcc as $recipient) {
+	if ( ! empty($bcc)) {
+		foreach ((array) $bcc as $recipient) {
 			try {
 				// Break $recipient into name and address parts if in the format "Foo <bar@baz.com>"
 				$recipient_name = '';
-				if ( preg_match( '/(.*)<(.+)>/', $recipient, $matches ) ) {
-					if ( count( $matches ) == 3 ) {
+				if (preg_match('/(.*)<(.+)>/', $recipient, $matches)) {
+					if (count($matches) == 3) {
 						$recipient_name = $matches[1];
 						$recipient = $matches[2];
 					}
 				}
-				$phpmailer->AddBcc( $recipient, $recipient_name );
-			} catch ( phpmailerException $e ) {
+				$phpmailer->AddBcc($recipient, $recipient_name);
+			} catch (phpmailerException $e) {
 				continue;
 			}
 		}
@@ -412,7 +412,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';
 
 	/**
@@ -422,17 +422,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
 
@@ -443,23 +443,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;
 			}
 		}
@@ -472,14 +472,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');
 
 		/**
 		 * Fires after a phpmailerException is caught.
@@ -489,14 +489,14 @@ 
 		 * @param WP_Error $error A WP_Error object with the phpmailerException code, message, and an array
 		 *                        containing the mail recipient, subject, message, headers, and attachments.
 		 */
- 		do_action( 'wp_mail_failed', new WP_Error( $e->getCode(), $e->getMessage(), $mail_error_data ) );
+ 		do_action('wp_mail_failed', new WP_Error($e->getCode(), $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.
  *
@@ -526,17 +526,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.
 		 *
@@ -545,14 +545,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.
  *
@@ -567,11 +567,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.
  *
@@ -590,7 +590,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.
 		 *
@@ -600,7 +600,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;
 	}
 
@@ -611,12 +611,12 @@ 
 	$expired = $expiration = $cookie_elements['expiration'];
 
 	// Allow a grace period for POST and AJAX requests
-	if ( defined('DOING_AJAX') || 'POST' == $_SERVER['REQUEST_METHOD'] ) {
+	if (defined('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.
 		 *
@@ -624,12 +624,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.
 		 *
@@ -637,19 +637,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.
 		 *
@@ -657,18 +657,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;
 	}
 
@@ -680,13 +680,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.
  *
@@ -698,26 +698,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;
 
 	/**
 	 * Filter the authentication cookie.
@@ -730,11 +730,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
  *
@@ -745,8 +745,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;
@@ -757,7 +757,7 @@ 
 				$cookie_name = LOGGED_IN_COOKIE;
 				break;
 			default:
-				if ( is_ssl() ) {
+				if (is_ssl()) {
 					$cookie_name = SECURE_AUTH_COOKIE;
 					$scheme = 'secure_auth';
 				} else {
@@ -766,23 +766,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.
  *
@@ -799,8 +799,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) {
 		/**
 		 * Filter the duration of the authentication cookie expiration period.
 		 *
@@ -810,25 +810,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);
 
 	/**
 	 * Filter whether the connection is secure.
@@ -838,7 +838,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);
 
 	/**
 	 * Filter whether to use a secure cookie when logged-in.
@@ -849,9 +849,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 {
@@ -859,13 +859,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.
@@ -879,7 +879,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 secure authentication cookie is set.
@@ -893,17 +893,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.
  *
@@ -915,30 +915,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.
  *
@@ -953,7 +953,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.
  *
@@ -962,7 +962,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());
 
 	/**
 	 * Filter whether to use a secure authentication redirect.
@@ -971,20 +971,20 @@ 
 	 *
 	 * @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();
 		}
 	}
 
-	if ( is_user_admin() ) {
+	if (is_user_admin()) {
 		$scheme = 'logged_in';
 	} else {
 		/**
@@ -994,10 +994,10 @@ 
 		 *
 		 * @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.
 		 *
@@ -1005,26 +1005,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);
 
@@ -1033,7 +1033,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.
  *
@@ -1047,9 +1047,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' );
+		_doing_it_wrong(__FUNCTION__, __('You should specify a nonce action to be verified by using the first parameter.'), '3.2');
 
 	$adminurl = strtolower(admin_url());
 	$referer = strtolower(wp_get_referer());
@@ -1064,10 +1064,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();
 	}
 
@@ -1075,7 +1075,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.
  *
@@ -1090,17 +1090,17 @@ 
  * @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) {
 	$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.
@@ -1111,13 +1111,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 ( defined( 'DOING_AJAX' ) && DOING_AJAX ) {
+	if ($die && false === $result) {
+		if (defined('DOING_AJAX') && DOING_AJAX) {
 			wp_die( -1 );
 		} else {
-			die( '-1' );
+			die('-1');
 		}
 	}
 
@@ -1125,7 +1125,7 @@ 
 }
 endif;
 
-if ( !function_exists('wp_redirect') ) :
+if ( ! function_exists('wp_redirect')) :
 /**
  * Redirects to another page.
  *
@@ -1148,7 +1148,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);
 
 	/**
 	 * Filter the redirect status code.
@@ -1158,14 +1158,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);
@@ -1174,7 +1174,7 @@ 
 }
 endif;
 
-if ( !function_exists('wp_sanitize_redirect') ) :
+if ( ! function_exists('wp_sanitize_redirect')) :
 /**
  * Sanitizes a URL for use in a redirect.
  *
@@ -1196,13 +1196,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);
 }
 
 /**
@@ -1217,12 +1217,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().
  *
@@ -1252,13 +1252,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.
  *
@@ -1275,33 +1275,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;
 		}
 	}
@@ -1316,16 +1316,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.
  *
@@ -1335,21 +1335,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' );
+function wp_notify_postauthor($comment_id, $deprecated = null) {
+	if (null !== $deprecated) {
+		_deprecated_argument(__FUNCTION__, '3.8');
 	}
 
-	$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;
 	}
 
@@ -1364,16 +1364,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);
 
 	/**
 	 * Filter whether to notify comment authors of their comments on their own posts.
@@ -1387,28 +1387,28 @@ 
 	 *                         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);
 	}
 
 	$comment_author_domain = @gethostbyaddr($comment->comment_author_IP);
@@ -1416,70 +1416,70 @@ 
 	// 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':
-			$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: 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':
-			$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: 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";
 
 	/**
 	 * Filter the comment notification email text.
@@ -1489,7 +1489,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);
 
 	/**
 	 * Filter the comment notification email subject.
@@ -1499,7 +1499,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);
 
 	/**
 	 * Filter the comment notification email headers.
@@ -1509,17 +1509,17 @@ 
 	 * @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);
 	}
 
 	return true;
 }
 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.
  *
@@ -1536,7 +1536,7 @@ 
 function wp_notify_moderator($comment_id) {
 	global $wpdb;
 
-	$maybe_notify = get_option( 'moderation_notify' );
+	$maybe_notify = get_option('moderation_notify');
 
 	/**
 	 * Filter whether to send the site moderator email notifications, overriding the site setting.
@@ -1546,19 +1546,19 @@ 
 	 * @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;
 	}
 
@@ -1568,49 +1568,49 @@ 
 	// 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':
-			$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: 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 .= __('Trackback excerpt: ') . "\r\n" . $comment_content . "\r\n\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 .= __('Trackback excerpt: ')."\r\n".$comment_content."\r\n\r\n";
 			break;
 		case 'pingback':
-			$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: 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 .= __('Pingback excerpt: ') . "\r\n" . $comment_content . "\r\n\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 .= __('Pingback excerpt: ')."\r\n".$comment_content."\r\n\r\n";
 			break;
 		default: // Comments
-			$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( __( '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  = 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(__('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";
 			break;
 	}
 
-	$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 )
-		$notify_message .= sprintf( __( 'Trash it: %s' ), admin_url( "comment.php?action=trash&c={$comment_id}#wpbody-content" ) ) . "\r\n";
+	if (EMPTY_TRASH_DAYS)
+		$notify_message .= sprintf(__('Trash it: %s'), admin_url("comment.php?action=trash&c={$comment_id}#wpbody-content"))."\r\n";
 	else
-		$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";
 
-	$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";
 
-	$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";
 
-	$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 = '';
 
 	/**
@@ -1621,7 +1621,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);
 
 	/**
 	 * Filter the comment moderation email text.
@@ -1631,7 +1631,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);
 
 	/**
 	 * Filter the comment moderation email subject.
@@ -1641,7 +1641,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);
 
 	/**
 	 * Filter the comment moderation email headers.
@@ -1651,17 +1651,17 @@ 
 	 * @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);
 	}
 
 	return true;
 }
 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.
  *
@@ -1669,11 +1669,11 @@ 
  *
  * @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' ) ) ) {
-		$message = sprintf(__('Password Lost and Changed for user: %s'), $user->user_login) . "\r\n";
+	if (0 !== strcasecmp($user->user_email, get_option('admin_email'))) {
+		$message = sprintf(__('Password Lost and 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);
@@ -1682,7 +1682,7 @@ 
 }
 endif;
 
-if ( !function_exists('wp_new_user_notification') ) :
+if ( ! function_exists('wp_new_user_notification')) :
 /**
  * Email login credentials to a newly-registered user.
  *
@@ -1700,54 +1700,54 @@ 
  * @param string $notify     Optional. Type of notification that should happen. Accepts 'admin' or an empty
  *                           string (admin only), 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);
 
-	$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";
+	$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);
 
 	// `$deprecated was pre-4.3 `$plaintext_pass`. An empty `$plaintext_pass` didn't sent a user notifcation.
-	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 ) ) {
-		require_once ABSPATH . WPINC . '/class-phpass.php';
-		$wp_hasher = new PasswordHash( 8, true );
+	if (empty($wp_hasher)) {
+		require_once ABSPATH.WPINC.'/class-phpass.php';
+		$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));
 
-	$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);
 }
 endif;
 
-if ( !function_exists('wp_nonce_tick') ) :
+if ( ! function_exists('wp_nonce_tick')) :
 /**
  * Get the time-dependent variable for nonce creation.
  *
@@ -1766,13 +1766,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.
  *
@@ -1786,11 +1786,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) {
 		/**
 		 * Filter whether the user who generated the nonce is logged out.
 		 *
@@ -1799,10 +1799,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;
 	}
 
@@ -1810,14 +1810,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;
 	}
 
@@ -1831,14 +1831,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.
@@ -1852,19 +1852,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.
  *
@@ -1900,9 +1900,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])) {
 		/**
 		 * Filter the WordPress salt.
 		 *
@@ -1912,19 +1912,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]);
 			}
 		}
 	}
@@ -1933,45 +1933,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.
  *
@@ -1988,7 +1988,7 @@ 
 }
 endif;
 
-if ( !function_exists('wp_hash_password') ) :
+if ( ! function_exists('wp_hash_password')) :
 /**
  * Create a hash (encrypt) of a plain text password.
  *
@@ -2005,17 +2005,17 @@ 
 function wp_hash_password($password) {
 	global $wp_hasher;
 
-	if ( empty($wp_hasher) ) {
-		require_once( ABSPATH . WPINC . '/class-phpass.php');
+	if (empty($wp_hasher)) {
+		require_once(ABSPATH.WPINC.'/class-phpass.php');
 		// 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.
  *
@@ -2042,9 +2042,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);
@@ -2060,13 +2060,13 @@ 
 		 * @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) ) {
-		require_once( ABSPATH . WPINC . '/class-phpass.php');
+	if (empty($wp_hasher)) {
+		require_once(ABSPATH.WPINC.'/class-phpass.php');
 		// By default, use the portable hash from phpass
 		$wp_hasher = new PasswordHash(8, true);
 	}
@@ -2074,11 +2074,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.
  *
@@ -2091,15 +2091,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);
 	}
 
@@ -2110,11 +2110,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
  *
@@ -2129,7 +2129,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.
@@ -2141,38 +2141,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);
 		}
 	}
 
@@ -2185,14 +2185,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.
  *
@@ -2210,17 +2210,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.
  *
@@ -2255,15 +2255,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,
@@ -2271,7 +2271,7 @@ 
 		'extra_attr'    => '',
 	);
 
-	if ( empty( $args ) ) {
+	if (empty($args)) {
 		$args = array();
 	}
 
@@ -2279,17 +2279,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);
 	}
 
 	/**
@@ -2305,36 +2305,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'];
 		}
@@ -2342,10 +2342,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']
@@ -2365,11 +2365,11 @@ 
 	 *                                       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.
  *
@@ -2397,12 +2397,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);
@@ -2410,31 +2410,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 +109 added lines, -75 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 );
 
@@ -308,8 +310,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
@@ -347,8 +350,9 @@ 
 	$phpmailer->FromName = apply_filters( 'wp_mail_from_name', $from_name );
 
 	// Set destination addresses
-	if ( !is_array( $to ) )
-		$to = explode( ',', $to );
+	if ( !is_array( $to ) ) {
+			$to = explode( ',', $to );
+	}
 
 	foreach ( (array) $to as $recipient ) {
 		try {
@@ -412,8 +416,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';
+	}
 
 	/**
 	 * Filter the wp_mail() content type.
@@ -427,12 +432,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
 
@@ -451,8 +458,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 ) ) {
@@ -766,8 +774,9 @@ 
 				}
 	    }
 
-		if ( empty($_COOKIE[$cookie_name]) )
-			return false;
+		if ( empty($_COOKIE[$cookie_name]) ) {
+					return false;
+		}
 		$cookie = $_COOKIE[$cookie_name];
 	}
 
@@ -898,9 +907,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') ) :
@@ -1048,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' );
+	if ( -1 == $action ) {
+			_doing_it_wrong( __FUNCTION__, __( 'You should specify a nonce action to be verified by using the first parameter.' ), '3.2' );
+	}
 
 	$adminurl = strtolower(admin_url());
 	$referer = strtolower(wp_get_referer());
@@ -1093,12 +1104,13 @@ 
 function check_ajax_referer( $action = -1, $query_arg = false, $die = true ) {
 	$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 );
 
@@ -1160,13 +1172,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);
 
@@ -1277,8 +1292,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;
@@ -1287,12 +1303,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'] ) ) ) {
@@ -1318,8 +1336,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;
 }
@@ -1341,8 +1360,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 );
@@ -1467,19 +1487,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";
+	}
 
 	/**
 	 * Filter the comment notification email text.
@@ -1558,8 +1581,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;
+		}
 	}
 
 	$comment_author_domain = @gethostbyaddr($comment->comment_author_IP);
@@ -1599,10 +1623,11 @@ 
 
 	$notify_message .= sprintf( __( 'Approve it: %s' ), admin_url( "comment.php?action=approve&c={$comment_id}#wpbody-content" ) ) . "\r\n";
 
-	if ( EMPTY_TRASH_DAYS )
-		$notify_message .= sprintf( __( 'Trash it: %s' ), admin_url( "comment.php?action=trash&c={$comment_id}#wpbody-content" ) ) . "\r\n";
-	else
-		$notify_message .= sprintf( __( 'Delete it: %s' ), admin_url( "comment.php?action=delete&c={$comment_id}#wpbody-content" ) ) . "\r\n";
+	if ( EMPTY_TRASH_DAYS ) {
+			$notify_message .= sprintf( __( 'Trash it: %s' ), admin_url( "comment.php?action=trash&c={$comment_id}#wpbody-content" ) ) . "\r\n";
+	} else {
+			$notify_message .= sprintf( __( 'Delete it: %s' ), admin_url( "comment.php?action=delete&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";
 
@@ -2093,10 +2118,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++ ) {
@@ -2163,10 +2190,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);
@@ -2185,8 +2213,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));
 }
@@ -2401,8 +2430,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);
@@ -2413,8 +2443,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";
 
@@ -2424,18 +2455,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>";